Bug 768494 - Add accessibility descriptions to various browser toolbar buttons, r=sriram

mobile/android/base/locales/en-US/android_strings.dtd

@@ -47,6 +47,10 @@
 
 <!ENTITY reload "Reload">
 <!ENTITY forward "Forward">
+<!ENTITY menu "Menu">
+<!ENTITY back "Back">
+<!ENTITY stop "Stop">
+<!ENTITY site_security "Site Security">
 
 <!ENTITY close_tab "Close Tab">
 <!ENTITY new_tab "New Tab">

mobile/android/base/resources/layout-land-v14/browser_toolbar.xml

@@ -12,9 +12,11 @@
                     android:background="@drawable/address_bar_bg">
 
         <ImageButton android:id="@+id/back"
+                     android:contentDescription="@string/back"
                      style="@style/AddressBar.ImageButton.Unused"/>
 
         <ImageButton android:id="@+id/forward"
+                     android:contentDescription="@string/forward"
                      style="@style/AddressBar.ImageButton.Unused"/>
 
         <LinearLayout android:id="@+id/menu_items"
@@ -51,6 +53,7 @@
                      android:layout_toLeftOf="@id/spacer"
                      android:gravity="center_vertical"
                      android:src="@drawable/menu"
+                     android:contentDescription="@string/menu"
                      android:background="@drawable/action_bar_button"
                      android:paddingLeft="10dip"
                      android:paddingRight="10dip"
@@ -96,6 +99,7 @@
                          android:layout_width="24dip"
                          android:layout_height="24dip"
                          android:src="@drawable/reader"
+                         android:contentDescription="@string/reader_mode"
                          android:visibility="gone"/>
 
             <ImageButton android:id="@+id/site_security"
@@ -103,6 +107,7 @@
                          android:layout_width="24dip"
                          android:layout_height="24dip"
                          android:src="@drawable/site_security_level"
+                         android:contentDescription="@string/site_security"
                          android:visibility="gone"/>
 
             <ImageButton android:id="@+id/stop"
@@ -110,6 +115,7 @@
                          android:layout_width="24dip"
                          android:layout_height="24dip"
                          android:src="@drawable/urlbar_stop"
+                         android:contentDescription="@string/stop"
                          android:visibility="gone"/>
 
         </LinearLayout>

mobile/android/base/resources/layout-sw600dp/browser_toolbar.xml

@@ -35,6 +35,7 @@
                      android:layout_alignParentRight="true"
                      android:gravity="center_vertical"
                      android:src="@drawable/menu"
+                     android:contentDescription="@string/menu"
                      android:background="@drawable/action_bar_button"
                      android:paddingLeft="14dip"
                      android:paddingRight="14dip"
@@ -73,6 +74,7 @@
                      android:layout_alignLeft="@id/awesome_bar"
                      android:paddingLeft="22dp"
                      android:src="@drawable/ic_menu_forward"
+                     android:contentDescription="@string/forward"
                      android:background="@drawable/address_bar_forward_button"/>
 
         <ImageButton android:id="@+id/back"
@@ -83,6 +85,7 @@
                      android:layout_marginLeft="-28dp"
                      android:layout_alignLeft="@id/awesome_bar"
                      android:src="@drawable/ic_menu_back"
+                     android:contentDescription="@string/back"
                      android:background="@drawable/address_bar_back_button"/>
 
         <ImageButton android:id="@+id/favicon"
@@ -106,6 +109,7 @@
                          android:layout_width="24dip"
                          android:layout_height="24dip"
                          android:src="@drawable/reader"
+                         android:contentDescription="@string/reader_mode"
                          android:visibility="gone"/>
 
             <ImageButton android:id="@+id/site_security"
@@ -113,6 +117,7 @@
                          android:layout_width="24dip"
                          android:layout_height="24dip"
                          android:src="@drawable/site_security_level"
+                         android:contentDescription="@string/site_security"
                          android:visibility="gone"/>
 
             <ImageButton android:id="@+id/stop"
@@ -120,6 +125,7 @@
                          android:layout_width="24dip"
                          android:layout_height="24dip"
                          android:src="@drawable/urlbar_stop"
+                         android:contentDescription="@string/stop"
                          android:visibility="gone"/>
 
         </LinearLayout>

mobile/android/base/resources/layout-xlarge/browser_toolbar.xml

@@ -35,6 +35,7 @@
                      android:layout_alignParentRight="true"
                      android:gravity="center_vertical"
                      android:src="@drawable/menu"
+                     android:contentDescription="@string/menu"
                      android:background="@drawable/action_bar_button"
                      android:paddingLeft="14dip"
                      android:paddingRight="14dip"
@@ -73,6 +74,7 @@
                      android:layout_alignLeft="@id/awesome_bar"
                      android:paddingLeft="22dp"
                      android:src="@drawable/ic_menu_forward"
+                     android:contentDescription="@string/forward"
                      android:background="@drawable/address_bar_forward_button"/>
 
         <ImageButton android:id="@+id/back"
@@ -83,6 +85,7 @@
                      android:layout_marginLeft="-28dp"
                      android:layout_alignLeft="@id/awesome_bar"
                      android:src="@drawable/ic_menu_back"
+                     android:contentDescription="@string/back"
                      android:background="@drawable/address_bar_back_button"/>
 
         <ImageButton android:id="@+id/favicon"
@@ -106,6 +109,7 @@
                          android:layout_width="24dip"
                          android:layout_height="24dip"
                          android:src="@drawable/reader"
+                         android:contentDescription="@string/reader_mode"
                          android:visibility="gone"/>
 
             <ImageButton android:id="@+id/site_security"
@@ -113,6 +117,7 @@
                          android:layout_width="24dip"
                          android:layout_height="24dip"
                          android:src="@drawable/site_security_level"
+                         android:contentDescription="@string/site_security"
                          android:visibility="gone"/>
 
             <ImageButton android:id="@+id/stop"
@@ -120,6 +125,7 @@
                          android:layout_width="24dip"
                          android:layout_height="24dip"
                          android:src="@drawable/urlbar_stop"
+                         android:contentDescription="@string/stop"
                          android:visibility="gone"/>
 
         </LinearLayout>

mobile/android/base/resources/layout/browser_toolbar.xml

@@ -12,9 +12,11 @@
                     android:background="@drawable/address_bar_bg">
 
         <ImageButton android:id="@+id/back"
+                     android:contentDescription="@string/back"
                      style="@style/AddressBar.ImageButton.Unused"/>
 
         <ImageButton android:id="@+id/forward"
+                     android:contentDescription="@string/forward"
                      style="@style/AddressBar.ImageButton.Unused"/>
 
         <LinearLayout android:id="@+id/menu_items"
@@ -51,6 +53,7 @@
                      android:layout_toLeftOf="@id/spacer"
                      android:gravity="center_vertical"
                      android:src="@drawable/menu"
+                     android:contentDescription="@string/menu"
                      android:background="@drawable/action_bar_button"
                      android:paddingLeft="12dip"
                      android:paddingRight="12dip"
@@ -96,6 +99,7 @@
                          android:layout_width="24dip"
                          android:layout_height="24dip"
                          android:src="@drawable/reader"
+                         android:contentDescription="@string/reader_mode"
                          android:visibility="gone"/>
 
             <ImageButton android:id="@+id/site_security"
@@ -103,6 +107,7 @@
                          android:layout_width="24dip"
                          android:layout_height="24dip"
                          android:src="@drawable/site_security_level"
+                         android:contentDescription="@string/site_security"
                          android:visibility="gone"/>
 
             <ImageButton android:id="@+id/stop"
@@ -110,6 +115,7 @@
                          android:layout_width="24dip"
                          android:layout_height="24dip"
                          android:src="@drawable/urlbar_stop"
+                         android:contentDescription="@string/stop"
                          android:visibility="gone"/>
 
         </LinearLayout>

mobile/android/base/strings.xml.in

@@ -99,6 +99,10 @@
 
   <string name="reload">&reload;</string>
   <string name="forward">&forward;</string>
+  <string name="menu">&menu;</string>
+  <string name="back">&back;</string>
+  <string name="stop">&stop;</string>
+  <string name="site_security">&site_security;</string>
   <string name="close_tab">&close_tab;</string>
   <string name="new_tab">&new_tab;</string>
   <string name="new_tab_opened">&new_tab_opened;</string>