diff options
| author | John Reck <jreck@google.com> | 2012-09-21 18:06:16 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-09-21 18:06:16 -0700 |
| commit | bbbadfa261663c33e77db930f6e03ef704a1eefe (patch) | |
| tree | 3275c579fe62035439d91d4a47a64a0f7fc4e71d | |
| parent | ebfd289d99b07beaf92378a36596984f56692f30 (diff) | |
| parent | 8e8cae2c29797e317a9a6c00878044f0025c0737 (diff) | |
| download | packages_apps_browser-bbbadfa261663c33e77db930f6e03ef704a1eefe.zip packages_apps_browser-bbbadfa261663c33e77db930f6e03ef704a1eefe.tar.gz packages_apps_browser-bbbadfa261663c33e77db930f6e03ef704a1eefe.tar.bz2 | |
Merge "Add contentDescription to SnapshotBar" into jb-mr1-dev
| -rw-r--r-- | res/layout-sw600dp/title_bar_snapshot.xml | 8 | ||||
| -rw-r--r-- | res/layout/title_bar_snapshot.xml | 9 |
2 files changed, 9 insertions, 8 deletions
diff --git a/res/layout-sw600dp/title_bar_snapshot.xml b/res/layout-sw600dp/title_bar_snapshot.xml index 69e3864..a2cc9d0 100644 --- a/res/layout-sw600dp/title_bar_snapshot.xml +++ b/res/layout-sw600dp/title_bar_snapshot.xml @@ -20,13 +20,12 @@ android:layout_height="wrap_content" android:orientation="horizontal" android:background="@drawable/bg_urlbar"> - <ImageButton + <ImageView android:id="@+id/date_icon" android:src="@drawable/ic_search_category_history" android:layout_width="wrap_content" android:layout_height="match_parent" - android:paddingLeft="16dip" - style="@style/HoloButton" /> + android:paddingLeft="16dip" /> <TextView android:id="@+id/date" android:layout_width="wrap_content" @@ -51,5 +50,6 @@ android:scaleType="center" android:paddingRight="16dip" style="@style/HoloButton" - android:src="@drawable/ic_bookmarks_history_holo_dark" /> + android:src="@drawable/ic_bookmarks_history_holo_dark" + android:contentDescription="@string/accessibility_button_bookmarks" /> </com.android.browser.SnapshotBar> diff --git a/res/layout/title_bar_snapshot.xml b/res/layout/title_bar_snapshot.xml index 4d6128c..0e2ab1c 100644 --- a/res/layout/title_bar_snapshot.xml +++ b/res/layout/title_bar_snapshot.xml @@ -25,14 +25,13 @@ android:layout_width="wrap_content" android:layout_height="match_parent" android:paddingLeft="8dip" /> - <ImageButton + <ImageView android:id="@+id/favicon" android:layout_width="52dip" android:layout_height="match_parent" android:paddingLeft="16dip" android:paddingRight="16dip" - android:scaleType="fitCenter" - style="@style/HoloButton" /> + android:scaleType="fitCenter" /> <FrameLayout android:id="@+id/toggle_container" android:layout_width="0dip" @@ -58,6 +57,7 @@ android:layout_width="wrap_content" android:layout_height="match_parent" android:src="@drawable/ic_windows_holo_dark" + android:contentDescription="@string/accessibility_button_navscreen" style="@style/HoloButton" /> <ImageButton android:id="@+id/more" @@ -65,5 +65,6 @@ android:layout_height="match_parent" style="@style/HoloButton" android:gravity="center_vertical" - android:src="@*android:drawable/ic_menu_moreoverflow_normal_holo_dark" /> + android:src="@*android:drawable/ic_menu_moreoverflow_normal_holo_dark" + android:contentDescription="@string/accessibility_button_more" /> </com.android.browser.SnapshotBar> |