Aperture: Add proper button descriptions
Change-Id: I4943cfcf968956fc3427747127460199c4e3bee3
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index ebbaea2..2ba4bbd 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -26,7 +26,7 @@
style="@style/ApertureTopBarButton"
android:layout_width="@dimen/top_view_buttons_size"
android:layout_height="@dimen/top_view_buttons_size"
- android:contentDescription="@string/flip_camera_button_description"
+ android:contentDescription="@string/timer_button_description"
android:src="@drawable/ic_timer_off"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/effectButton"
@@ -40,7 +40,7 @@
style="@style/ApertureTopBarButton"
android:layout_width="@dimen/top_view_buttons_size"
android:layout_height="@dimen/top_view_buttons_size"
- android:contentDescription="@string/flip_camera_button_description"
+ android:contentDescription="@string/effect_button_description"
android:src="@drawable/ic_effect_none"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/gridButton"
@@ -53,7 +53,7 @@
style="@style/ApertureTopBarButton"
android:layout_width="@dimen/top_view_buttons_size"
android:layout_height="@dimen/top_view_buttons_size"
- android:contentDescription="@string/flip_camera_button_description"
+ android:contentDescription="@string/grid_button_description"
android:src="@drawable/ic_grid_off"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/torchButton"
@@ -66,7 +66,7 @@
style="@style/ApertureTopBarButton"
android:layout_width="@dimen/top_view_buttons_size"
android:layout_height="@dimen/top_view_buttons_size"
- android:contentDescription="@string/flip_camera_button_description"
+ android:contentDescription="@string/torch_button_description"
android:src="@drawable/ic_torch_on"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/flashButton"
@@ -80,7 +80,7 @@
style="@style/ApertureTopBarButton"
android:layout_width="@dimen/top_view_buttons_size"
android:layout_height="@dimen/top_view_buttons_size"
- android:contentDescription="@string/flip_camera_button_description"
+ android:contentDescription="@string/flash_button_description"
android:src="@drawable/ic_flash_off"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/settingsButton"
@@ -94,7 +94,7 @@
style="@style/ApertureTopBarButton"
android:layout_width="@dimen/top_view_buttons_size"
android:layout_height="@dimen/top_view_buttons_size"
- android:contentDescription="@string/flip_camera_button_description"
+ android:contentDescription="@string/settings_button_description"
android:src="@drawable/ic_settings"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index d2d3fbf..b5ae330 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -2,10 +2,16 @@
<string name="app_name">Camera</string>
<!-- Button descriptions -->
- <string name="flip_camera_button_description">Flip camera</string>
+ <string name="timer_button_description">Timer</string>
+ <string name="effect_button_description">Effect</string>
+ <string name="grid_button_description">Grid</string>
+ <string name="torch_button_description">Torch</string>
+ <string name="flash_button_description">Flash</string>
+ <string name="settings_button_description">Settings</string>
<string name="photo_mode_button_description">Switch to photo mode</string>
- <string name="shutter_button_description">Shutter</string>
<string name="video_mode_button_description">Switch to video mode</string>
+ <string name="flip_camera_button_description">Flip camera</string>
+ <string name="shutter_button_description">Shutter</string>
<!-- Record chip -->
<string translatable="false" name="record_chip_default_text">00:00:00</string>