Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3638)

Unified Diff: chrome/android/java/res/layout/toolbar.xml

Issue 1505913003: Add update menu item and app menu icon badge (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rearrange field_trial.. again to facilitate command line testing Created 5 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/android/java/res/layout/menu_item.xml ('k') | chrome/android/java/res/layout/update_menu_item.xml » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/android/java/res/layout/toolbar.xml
diff --git a/chrome/android/java/res/layout/toolbar.xml b/chrome/android/java/res/layout/toolbar.xml
index 0ab520e2241e6fec5ec19ef67313c707e89ab78e..3c0da9eaf7fb8dba968c3d3c5075419e35542263 100644
--- a/chrome/android/java/res/layout/toolbar.xml
+++ b/chrome/android/java/res/layout/toolbar.xml
@@ -21,8 +21,7 @@
android:paddingEnd="16dp"
android:visibility="invisible"
android:background="?attr/selectableItemBackground"
- android:contentDescription="@string/accessibility_toolbar_btn_new_tab"
- />
+ android:contentDescription="@string/accessibility_toolbar_btn_new_tab" />
<org.chromium.chrome.browser.toolbar.HomePageButton
android:id="@+id/home_button"
@@ -31,37 +30,56 @@
android:contentDescription="@string/accessibility_toolbar_btn_home"
android:visibility="gone" />
- <org.chromium.chrome.browser.omnibox.LocationBarPhone android:id="@+id/location_bar"
+ <org.chromium.chrome.browser.omnibox.LocationBarPhone
+ android:id="@+id/location_bar"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:layout_gravity="top"
- />
+ android:layout_gravity="top" />
+
<LinearLayout android:id="@+id/toolbar_buttons"
android:orientation="horizontal"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_gravity="top|end">
+ android:layout_gravity="top|end" >
+
<Space
android:layout_width="4dp"
android:layout_height="match_parent" />
+
<ImageButton android:id="@+id/tab_switcher_button"
style="@style/ToolbarButton"
android:layout_gravity="top"
android:contentDescription="@string/accessibility_toolbar_btn_tabswitcher_toggle" />
- <org.chromium.chrome.browser.widget.TintedImageButton
- android:id="@+id/menu_button"
- style="@style/ToolbarButton"
- android:layout_gravity="top"
- android:layout_width="42dp"
- android:paddingEnd="4dp"
- android:src="@drawable/btn_menu"
- android:contentDescription="@string/accessibility_toolbar_btn_menu"
- android:background="@null" />
+
+ <FrameLayout
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:id="@+id/menu_button_wrapper" >
+
+ <org.chromium.chrome.browser.widget.TintedImageButton
+ android:id="@+id/menu_button"
+ style="@style/ToolbarButton"
+ android:layout_gravity="top"
+ android:layout_width="42dp"
+ android:paddingEnd="4dp"
+ android:src="@drawable/btn_menu"
+ android:contentDescription="@string/accessibility_toolbar_btn_menu"
+ android:background="@null" />
+
+ <ImageView
+ android:id="@+id/menu_badge"
+ style="@style/UpdateMenuBadge"
+ android:src="@drawable/badge_update"
+ android:layout_marginEnd="8.5dp"
+ android:contentDescription="@null" />
+ </FrameLayout>
</LinearLayout>
+
<org.chromium.chrome.browser.widget.ToolbarProgressBar
android:id="@+id/progress"
android:layout_width="match_parent"
android:layout_height="2dp"
chrome:progressBarColor="@color/progress_bar_foreground"
chrome:backgroundColor="@color/progress_bar_background" />
+
</org.chromium.chrome.browser.toolbar.ToolbarPhone>
« no previous file with comments | « chrome/android/java/res/layout/menu_item.xml ('k') | chrome/android/java/res/layout/update_menu_item.xml » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698