Merge "Add contentDescription to SnapshotBar" into jb-mr1-dev
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>
diff --git a/res/layout/title_bar_nav.xml b/res/layout/title_bar_nav.xml
index 15568c3..2f1e0a2 100644
--- a/res/layout/title_bar_nav.xml
+++ b/res/layout/title_bar_nav.xml
@@ -46,6 +46,7 @@
android:id="@+id/iconcombo"
android:layout_width="44dip"
android:layout_height="match_parent"
+ android:contentDescription="@string/page_info"
style="@style/HoloButton">
<ImageView
android:id="@+id/favicon"
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>
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);
}