Merge "add accessibility descriptions/events"

5 files changed, 12 insertions, 85 deletions

diff --git a/res/layout/nav_screen.xml b/res/layout/nav_screen.xml
index b4e1f152..8ff4be3e 100644
--- a/res/layout/nav_screen.xml
+++ b/res/layout/nav_screen.xml
@@ -41,6 +41,7 @@
             android:paddingRight="16dip"
             style="@style/HoloButton"
             android:gravity="center_vertical"
+            android:contentDescription="@string/accessibility_button_newtab"
             android:src="@drawable/ic_new_window_holo_dark" />
         <ImageButton
             android:id="@+id/newincognito"
@@ -50,6 +51,7 @@
             android:paddingRight="16dip"
             style="@style/HoloButton"
             android:gravity="center_vertical"
+            android:contentDescription="@string/accessibility_button_newincognitotab"
             android:src="@drawable/ic_new_incognito_holo_dark" />
         <ImageButton
             android:id="@+id/bookmarks"
@@ -57,6 +59,7 @@
             android:layout_height="match_parent"
             android:paddingLeft="16dip"
             android:paddingRight="16dip"
+            android:contentDescription="@string/accessibility_button_bookmarks"
             android:src="@drawable/ic_bookmarks_history_holo_dark"
             style="@style/HoloButton" />
         <ImageButton
@@ -67,6 +70,7 @@
             android:paddingRight="16dip"
             style="@style/HoloButton"
             android:gravity="center_vertical"
+            android:contentDescription="@string/accessibility_button_more"
             android:src="@*android:drawable/ic_menu_moreoverflow_normal_holo_dark" />
     </LinearLayout>
 </RelativeLayout>
diff --git a/res/layout/nav_tab_view.xml b/res/layout/nav_tab_view.xml
index dbf9494a..6330357d 100644
--- a/res/layout/nav_tab_view.xml
+++ b/res/layout/nav_tab_view.xml
@@ -46,6 +46,7 @@
             android:layout_gravity="center_vertical"
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
+            android:contentDescription="@string/accessibility_button_closetab"
             style="@style/HoloButton" />
     </LinearLayout>
     <ImageView
diff --git a/res/layout/tab_title.xml b/res/layout/tab_title.xml
index 589debc3..8a5e308f 100644
--- a/res/layout/tab_title.xml
+++ b/res/layout/tab_title.xml
@@ -22,6 +22,7 @@
         android:layout_height="match_parent"
         android:gravity="center_vertical"
         android:src="@drawable/ic_incognito_holo_dark"
+        android:contentDescription="@string/accessibility_state_incognito"
         android:visibility="gone" />
     <ImageView
         android:id="@+id/snapshot"
@@ -29,6 +30,7 @@
         android:layout_height="match_parent"
         android:gravity="center_vertical"
         android:src="@drawable/ic_search_category_history"
+            android:contentDescription="@string/accessibility_state_frozen"
         android:visibility="gone" />
     <ImageView
         android:id="@+id/favicon"
@@ -59,5 +61,6 @@
         android:background="?android:attr/selectableItemBackground"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:contentDescription="@string/accessibility_button_closetab"
         android:src="@drawable/ic_tab_close" />
 </merge>
diff --git a/res/layout/tab_view.xml b/res/layout/tab_view.xml
deleted file mode 100644
index 8ffb73dc..00000000
--- a/res/layout/tab_view.xml
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_height="wrap_content"
-    android:minHeight="?android:attr/listPreferredItemHeight"
-    android:layout_width="match_parent"
-    android:orientation="horizontal"
-    android:gravity="center_vertical"
-    android:paddingLeft="8dip"
-    android:paddingTop="4dip"
-    android:paddingBottom="4dip"
-    >
-    <RelativeLayout
-        android:id="@+id/list_item"
-        android:layout_width="0dip"
-        android:layout_weight="1"
-        android:layout_height="wrap_content"
-        android:background="@drawable/bookmark_list_favicon_bg">
-        <ImageView
-            android:id="@+id/thumb"
-            android:src="@drawable/thumbnail_bookmarks_widget_no_bookmark_holo"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/tab_view_thumbnail_height"
-            android:scaleType="fitXY"
-            android:cropToPadding="true" />
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_alignBottom="@id/thumb"
-            android:background="@color/tabViewTitleBackground">
-            <ImageView
-                android:id="@+id/favicon"
-                android:src="@drawable/app_web_browser_sm"
-                android:layout_width="@dimen/favicon_size"
-                android:layout_height="@dimen/favicon_size"
-                android:layout_gravity="center_vertical"
-                android:layout_marginLeft="4dip"
-                android:layout_marginRight="8dip"
-                android:layout_marginTop="4dip"
-                android:layout_marginBottom="4dip"
-                android:scaleType="fitXY" />
-            <TextView
-                android:id="@+id/label"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_vertical"
-                android:singleLine="true"
-                android:ellipsize="end"
-                android:textSize="12sp"
-                android:typeface="sans"
-                android:textColor="@android:color/white" />
-        </LinearLayout>
-    </RelativeLayout>
-    <View android:id="@+id/divider"
-        android:background="?android:attr/dividerVertical"
-        android:layout_width="1dp"
-        android:layout_height="match_parent"
-        android:layout_marginLeft="8dip"
-        android:layout_marginTop="5dip"
-        android:layout_marginBottom="5dip"
-        />
-    <view class="com.android.browser.ActiveTabsPage$CloseHolder" android:id="@+id/close"
-        android:layout_width="wrap_content"
-        android:layout_height="match_parent"
-        android:paddingLeft="12dip"
-        android:paddingRight="12dip"
-        android:background="@drawable/bookmark_thumb_selector"
-        android:src="@drawable/ic_close_window_holo_dark"
-        android:scaleType="center"
-        />
-</LinearLayout>
diff --git a/res/layout/title_bar_nav.xml b/res/layout/title_bar_nav.xml
index 5a3c10e1..5e4a3a13 100644
--- a/res/layout/title_bar_nav.xml
+++ b/res/layout/title_bar_nav.xml
@@ -49,6 +49,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
+            android:contentDescription="@string/accessibility_button_stop"
             android:src="@drawable/ic_stop_holo_dark"
             style="@style/HoloButton" />
         <com.android.browser.UrlInputView
@@ -73,6 +74,7 @@
             android:id="@+id/voice"
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
+            android:contentDescription="@string/accessibility_button_voice"
             android:src="@drawable/ic_voice_search_holo_dark"
             style="@style/HoloButton"
             android:visibility="gone" />
@@ -81,6 +83,7 @@
         android:id="@+id/tab_switcher"
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
+            android:contentDescription="@string/accessibility_button_navscreen"
         android:src="@drawable/ic_windows_holo_dark"
         style="@style/HoloButton" />
     <ImageButton
@@ -89,5 +92,6 @@
         android:layout_height="match_parent"
         style="@style/HoloButton"
         android:gravity="center_vertical"
+        android:contentDescription="@string/accessibility_button_more"
         android:src="@*android:drawable/ic_menu_moreoverflow_normal_holo_dark" />
 </com.android.browser.NavigationBarPhone>