Merge "Add support for grid lines overlay." into gb-ub-photos-denali
diff --git a/res/layout/mode_options_bottombar.xml b/res/layout/mode_options_bottombar.xml
index 8f0e50f..423cdec 100644
--- a/res/layout/mode_options_bottombar.xml
+++ b/res/layout/mode_options_bottombar.xml
@@ -70,7 +70,8 @@
             android:padding="20dp"
             android:scaleType="center"
             android:src="@drawable/ic_options_active"
-            android:background="@null" />
+            android:background="@null"
+            android:contentDescription="@string/more_options_desc" />
       </com.android.camera.widget.ModeOptionsOverlay>
 
       <!-- TODO: integrate into the mode options overlay -->
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 728873d..6751f10 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -732,6 +732,9 @@
     <string name="camera_id_back_desc">Back camera</string>
     <string name="camera_id_front_desc">Front camera</string>
 
+    <!-- Accessibility text for More Options button [CHAR_LIMIT=NONE] -->
+    <string name="more_options_desc">More Options</string>
+
     <!-- Accessibility text for cancel button [CHAR_LIMIT=NONE] -->
     <string name="cancel_button_description">Cancel</string>
     <!-- Accessibility text for done button [CHAR_LIMIT=NONE] -->