chrome/android/java/res/layout/toolbar.xml - Issue 1505913003: Add update menu item and app menu icon badge

Side by Side 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: Add code create 1dp transparent border in LocatoinBarPhone 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 unified diff | Download patch

« chrome/android/java/res/layout-sw600dp/toolbar.xml ('K') | « chrome/android/java/res/layout/menu_item.xml ('k') | chrome/android/java/res/layout/update_menu_item.xml » ('j') | chrome/android/java/res/layout/update_menu_item.xml » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 <?xml version="1.0" encoding="utf-8"?>	1 <?xml version="1.0" encoding="utf-8"?>

2 <!-- Copyright 2015 The Chromium Authors. All rights reserved.	2 <!-- Copyright 2015 The Chromium Authors. All rights reserved.

3 Use of this source code is governed by a BSD-style license that can be	3 Use of this source code is governed by a BSD-style license that can be

4 found in the LICENSE file. -->	4 found in the LICENSE file. -->

5	5

6 <!-- The toolbar containing the URL bar, back button, and NTP button.	6 <!-- The toolbar containing the URL bar, back button, and NTP button.

7 -->	7 -->

8	8

9 <org.chromium.chrome.browser.toolbar.ToolbarPhone	9 <org.chromium.chrome.browser.toolbar.ToolbarPhone

10 xmlns:android="http://schemas.android.com/apk/res/android"	10 xmlns:android="http://schemas.android.com/apk/res/android"

(...skipping 30 matching lines...) Expand all Loading...
41 android:layout_width="wrap_content"	41 android:layout_width="wrap_content"

42 android:layout_height="wrap_content"	42 android:layout_height="wrap_content"

43 android:layout_gravity="top\|end">	43 android:layout_gravity="top\|end">

44 <Space	44 <Space

45 android:layout_width="4dp"	45 android:layout_width="4dp"

46 android:layout_height="match_parent" />	46 android:layout_height="match_parent" />

47 <ImageButton android:id="@+id/tab_switcher_button"	47 <ImageButton android:id="@+id/tab_switcher_button"

48 style="@style/ToolbarButton"	48 style="@style/ToolbarButton"

49 android:layout_gravity="top"	49 android:layout_gravity="top"

50 android:contentDescription="@string/accessibility_toolbar_btn_tabswi tcher_toggle" />	50 android:contentDescription="@string/accessibility_toolbar_btn_tabswi tcher_toggle" />

51 <org.chromium.chrome.browser.widget.TintedImageButton	51 <FrameLayout

52 android:id="@+id/menu_button"	52 android:layout_width="wrap_content"

53 style="@style/ToolbarButton"	53 android:layout_height="wrap_content"

54 android:layout_gravity="top"	54 android:id="@+id/menu_btn_wrapper" >

55 android:layout_width="42dp"	55 <org.chromium.chrome.browser.widget.TintedImageButton

56 android:paddingEnd="4dp"	56 android:id="@+id/menu_button"

57 android:src="@drawable/btn_menu"	57 style="@style/ToolbarButton"

58 android:contentDescription="@string/accessibility_toolbar_btn_menu"	58 android:layout_gravity="top"

59 android:background="@null" />	59 android:layout_width="42dp"

	60 android:paddingEnd="4dp"

	61 android:src="@drawable/btn_menu"

	62 android:contentDescription="@string/accessibility_toolbar_btn_me nu"

	63 android:background="@null" />

	64 <ImageView

	65 android:id="@+id/menu_badge"

	66 android:src="@drawable/badge_update"

	67 android:layout_height="@dimen/menu_badge_size"

	68 android:layout_width="@dimen/menu_badge_size"

	69 android:layout_marginBottom="14dp"

	70 android:layout_marginEnd="10dp"

	71 android:layout_gravity="end\|bottom"

	72 android:contentDescription="@string/accessibility_toolbar_update _badge"

	73 android:visibility="gone" />

	74 </FrameLayout>

60 </LinearLayout>	75 </LinearLayout>

61 <org.chromium.chrome.browser.widget.ToolbarProgressBar	76 <org.chromium.chrome.browser.widget.ToolbarProgressBar

62 android:id="@+id/progress"	77 android:id="@+id/progress"

63 android:layout_width="match_parent"	78 android:layout_width="match_parent"

64 android:layout_height="2dp"	79 android:layout_height="2dp"

65 chrome:progressBarColor="@color/progress_bar_foreground"	80 chrome:progressBarColor="@color/progress_bar_foreground"

66 chrome:backgroundColor="@color/progress_bar_background" />	81 chrome:backgroundColor="@color/progress_bar_background" />

67 </org.chromium.chrome.browser.toolbar.ToolbarPhone>	82 </org.chromium.chrome.browser.toolbar.ToolbarPhone>

OLD	NEW