commit 698a5863fffe1bfd7d21d7957f9e811c623c8cc8
author John Reck <jreck@google.com> Mon Sep 24 00:49:44 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Mon Sep 24 00:49:44 2012 -0700
tree 8a863366529b1fedeeace5dc675bef006f0e4989
parent 840abbc976d89dcbcbf0124bae07ed42af471896
parent aac2ce07604daea0315b6caba6d286fb4cb34365

am aac2ce07: Add content description for folder up

* commit 'aac2ce07604daea0315b6caba6d286fb4cb34365':
  Add content description for folder up

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);
     }