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

Side by Side Diff: chrome/android/java/res/layout/location_bar.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-sw600dp/toolbar.xml ('k') | chrome/android/java/res/layout/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 location bar also know as URL bar -->	6 <!-- The location bar also know as URL bar -->

7 <merge xmlns:android="http://schemas.android.com/apk/res/android">	7 <merge xmlns:android="http://schemas.android.com/apk/res/android">

8 <ImageView android:id="@+id/incognito_badge"	8 <ImageView android:id="@+id/incognito_badge"

9 style="@style/LocationBarButton"	9 style="@style/LocationBarButton"

10 android:layout_width="wrap_content"	10 android:layout_width="wrap_content"

(...skipping 32 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
43 android:layout_marginStart="@dimen/location_bar_icon_width"	43 android:layout_marginStart="@dimen/location_bar_icon_width"

44 android:layout_gravity="center_vertical"	44 android:layout_gravity="center_vertical"

45 android:nextFocusForward="@+id/tab_switcher_button"	45 android:nextFocusForward="@+id/tab_switcher_button"

46 layout="@layout/url_container"	46 layout="@layout/url_container"

47 />	47 />

48 <FrameLayout android:id="@+id/url_action_container"	48 <FrameLayout android:id="@+id/url_action_container"

49 android:layout_width="@dimen/location_bar_icon_width"	49 android:layout_width="@dimen/location_bar_icon_width"

50 android:layout_height="@dimen/toolbar_height_no_shadow"	50 android:layout_height="@dimen/toolbar_height_no_shadow"

51 android:layout_gravity="end\|center_vertical"	51 android:layout_gravity="end\|center_vertical"

52 android:visibility="gone">	52 android:visibility="gone">

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

54 android:id="@+id/document_menu_button"	54 android:id="@+id/document_menu_btn_wrapper"

55 style="@style/LocationBarButton"	55 android:layout_width="fill_parent"

56 android:layout_height="match_parent"	56 android:layout_height="fill_parent" >

57 android:layout_width="match_parent"	57 <org.chromium.chrome.browser.widget.TintedImageButton

58 android:layoutDirection="locale"	58 android:id="@+id/document_menu_button"

59 android:src="@drawable/btn_menu"	59 style="@style/LocationBarButton"

60 android:contentDescription="@string/accessibility_toolbar_btn_menu" />	60 android:layout_height="match_parent"

	61 android:layout_width="match_parent"

	62 android:layoutDirection="locale"

	63 android:src="@drawable/btn_menu"

	64 android:contentDescription="@string/accessibility_toolbar_btn_menu " />

	65 <ImageView

	66 android:id="@+id/document_menu_badge"

	67 android:src="@drawable/badge_update"

	68 android:layout_height="@dimen/menu_badge_size"

	69 android:layout_width="@dimen/menu_badge_size"

	70 android:layout_marginBottom="13dp"

	71 android:layout_marginEnd="6dp"

	72 android:layout_gravity="end\|bottom"

	73 android:contentDescription="@string/accessibility_toolbar_update_b adge"

	74 android:visibility="gone" />

	75 </FrameLayout>

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

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

63 style="@style/LocationBarButton"	78 style="@style/LocationBarButton"

64 android:layout_width="match_parent"	79 android:layout_width="match_parent"

65 android:layout_height="match_parent"	80 android:layout_height="match_parent"

66 android:scaleType="center"	81 android:scaleType="center"

67 android:src="@drawable/btn_delete_url"	82 android:src="@drawable/btn_delete_url"

68 android:visibility="invisible"	83 android:visibility="invisible"

69 android:contentDescription="@string/accessibility_toolbar_btn_delete _url" />	84 android:contentDescription="@string/accessibility_toolbar_btn_delete _url" />

70 <org.chromium.chrome.browser.widget.TintedImageButton	85 <org.chromium.chrome.browser.widget.TintedImageButton

71 android:id="@+id/mic_button"	86 android:id="@+id/mic_button"

72 style="@style/LocationBarButton"	87 style="@style/LocationBarButton"

73 android:layout_width="match_parent"	88 android:layout_width="match_parent"

74 android:layout_height="match_parent"	89 android:layout_height="match_parent"

75 android:scaleType="center"	90 android:scaleType="center"

76 android:src="@drawable/btn_mic"	91 android:src="@drawable/btn_mic"

77 android:visibility="invisible"	92 android:visibility="invisible"

78 android:contentDescription="@string/accessibility_toolbar_btn_mic" / >	93 android:contentDescription="@string/accessibility_toolbar_btn_mic" / >

79 </FrameLayout>	94 </FrameLayout>

80 </merge>	95 </merge>

OLD	NEW