commit ebfd289d99b07beaf92378a36596984f56692f30
author John Reck <jreck@google.com> Fri Sep 21 15:26:58 2012 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Fri Sep 21 15:26:59 2012 -0700
tree 78874f9dcbc098a822e15e1f26f7edfb3e3e8ebe
parent eebafd1ed09706594861805e627cc1dd53348ec1
parent efb15ea3f2215abf7e40e8fc228c9b32790c84e8

Merge "Add contentDescription for page info" into jb-mr1-dev

res/layout/new_folder_layout.xml

diff --git a/res/layout/new_folder_layout.xml b/res/layout/new_folder_layout.xml
index 230dd3d..ad9ba4b 100644
--- a/res/layout/new_folder_layout.xml
+++ b/res/layout/new_folder_layout.xml
@@ -50,6 +50,7 @@
         android:layout_height="wrap_content"
         android:gravity="center_vertical"
         android:src="@drawable/ic_tab_close"
+        android:contentDescription="@string/cancel"
         />
   </LinearLayout>
 </LinearLayout>

res/values/strings.xml

diff --git a/res/values/strings.xml b/res/values/strings.xml
index ff396ce..5720410 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1008,5 +1008,7 @@
 
     <!-- Content description for tab switcher transition [CHAR LIMIT=NONE] -->
     <string name="accessibility_transition_navscreen">Tab management</string>
+    <!-- Content description for navigating up in the bookmark folder hierarchy [CHAR LIMIT=NONE] -->
+    <string name="accessibility_button_bookmarks_folder_up">Previous folder</string>
 
 </resources>

src/com/android/browser/BreadCrumbView.java

diff --git a/src/com/android/browser/BreadCrumbView.java b/src/com/android/browser/BreadCrumbView.java
index aa77744..d331b53 100644
--- a/src/com/android/browser/BreadCrumbView.java
+++ b/src/com/android/browser/BreadCrumbView.java
@@ -179,6 +179,8 @@
                 LayoutParams.MATCH_PARENT));
         mBackButton.setOnClickListener(this);
         mBackButton.setVisibility(View.GONE);
+        mBackButton.setContentDescription(mContext.getText(
+                R.string.accessibility_button_bookmarks_folder_up));
         addView(mBackButton, 0);
     }