Skip to content

Commit a0ad979

Browse files
committed
Fix content description and clickability of image fab.
1 parent 125bac2 commit a0ad979

File tree

8 files changed

+18
-8
lines changed

8 files changed

+18
-8
lines changed

constraint-layout-start/app/src/main/res/layout/activity_main_barriers.xml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,9 @@
4444
android:layout_marginBottom="16dp"
4545
android:layout_marginEnd="16dp"
4646
android:background="@drawable/info_background"
47-
android:contentDescription="@string/placeholder"
47+
android:contentDescription="@string/fab_content_description"
48+
android:clickable="true"
49+
android:focusable="true"
4850
android:padding="5dp"
4951
android:src="@drawable/ic_star"
5052
app:layout_constraintBottom_creator="0"

constraint-layout-start/app/src/main/res/layout/activity_main_chains.xml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,9 @@
4747
android:id="@+id/favorite"
4848
android:background="@drawable/info_background"
4949
android:padding="5dp"
50-
android:contentDescription="@string/placeholder"
50+
android:contentDescription="@string/fab_content_description"
51+
android:clickable="true"
52+
android:focusable="true"
5153
app:layout_constraintTop_creator="1"
5254
app:layout_constraintRight_creator="1"
5355
app:layout_constraintBottom_creator="0"

constraint-layout-start/app/src/main/res/layout/activity_main_done.xml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,9 @@
4747
android:id="@+id/favorite"
4848
android:background="@drawable/info_background"
4949
android:padding="5dp"
50-
android:contentDescription="@string/placeholder"
50+
android:contentDescription="@string/fab_content_description"
51+
android:clickable="true"
52+
android:focusable="true"
5153
app:layout_constraintTop_creator="1"
5254
app:layout_constraintRight_creator="1"
5355
app:layout_constraintBottom_creator="0"

constraint-layout-start/app/src/main/res/layout/activity_main_inference.xml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,9 @@
4545
android:id="@+id/favorite"
4646
android:background="@drawable/info_background"
4747
android:padding="5dp"
48-
android:contentDescription="@string/placeholder"
48+
android:contentDescription="@string/fab_content_description"
49+
android:clickable="true"
50+
android:focusable="true"
4951
app:layout_constraintTop_creator="1"
5052
app:layout_constraintRight_creator="1"
5153
app:layout_constraintBottom_creator="0"

constraint-layout-start/app/src/main/res/values-de/strings.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,5 @@
1010
<string name="camera">Kamera</string>
1111
<string name="camera_value">Leica M Typ 240</string>
1212
<string name="singapore">Singapur</string>
13+
<string name="fab_content_description">Stern fabelhaft</string>
1314
</resources>

constraint-layout-start/app/src/main/res/values/strings.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@
1717
<resources>
1818
<string name="app_name">Layout Codelab</string>
1919
<string name="singapore_description">Singapore officially the Republic of Singapore, and often referred to as the Lion City, the Garden City, and the Red Dot, is a global city in Southeast Asia and the world\'s only island city-state. It lies one degree (137 km) north of the equator, at the southernmost tip of continental Asia and peninsular Malaysia, with Indonesia\'s Riau Islands to the south. Singapore\'s territory consists of the diamond-shaped main island and 62 islets.</string>
20-
<string name="placeholder">Placeholder</string>s
20+
<string name="placeholder">Placeholder</string>
21+
<string name="fab_content_description">Star FAB</string>
2122
<string name="discard">Discard</string>
2223
<string name="upload">Upload</string>
2324
<string name="camera_settings">ƒ/4 16s ISO 200</string>

constraint-layout-start/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ buildscript {
99
}
1010
}
1111
dependencies {
12-
classpath 'com.android.tools.build:gradle:3.5.2'
12+
classpath 'com.android.tools.build:gradle:3.6.1'
1313

1414
// NOTE: Do not place your application dependencies here; they belong
1515
// in the individual module build.gradle files
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Thu Nov 07 12:41:13 CET 2019
1+
#Tue Mar 24 15:28:00 PDT 2020
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-bin.zip

0 commit comments

Comments
 (0)