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

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: 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 unified diff | Download patch
OLDNEW
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"
11 android:layout_height="match_parent" 11 android:layout_height="match_parent"
12 android:scaleType="center" 12 android:scaleType="center"
13 android:src="@drawable/ic_omnibox_incognito_badge" 13 android:src="@drawable/ic_omnibox_incognito_badge"
14 android:contentDescription="@null" 14 android:contentDescription="@null"
15 android:visibility="gone" /> 15 android:visibility="gone" />
16
16 <FrameLayout android:id="@+id/location_bar_icon" 17 <FrameLayout android:id="@+id/location_bar_icon"
17 android:layout_width="@dimen/location_bar_icon_width" 18 android:layout_width="@dimen/location_bar_icon_width"
18 android:layout_height="match_parent" 19 android:layout_height="match_parent"
19 android:visibility="gone"> 20 android:visibility="gone" >
21
20 <ImageView android:id="@+id/navigation_button" 22 <ImageView android:id="@+id/navigation_button"
21 style="@style/LocationBarButton" 23 style="@style/LocationBarButton"
22 android:layout_width="match_parent" 24 android:layout_width="match_parent"
23 android:layout_height="match_parent" 25 android:layout_height="match_parent"
24 android:layout_gravity="center" 26 android:layout_gravity="center"
25 android:scaleType="center" 27 android:scaleType="center"
26 android:contentDescription="@string/accessibility_toolbar_btn_site_i nfo"/> 28 android:contentDescription="@string/accessibility_toolbar_btn_site_i nfo" />
29
27 <ImageButton android:id="@+id/security_button" 30 <ImageButton android:id="@+id/security_button"
28 style="@style/LocationBarButton" 31 style="@style/LocationBarButton"
29 android:layout_height="match_parent" 32 android:layout_height="match_parent"
30 android:layout_width="match_parent" 33 android:layout_width="match_parent"
31 android:scaleType="center" 34 android:scaleType="center"
32 android:layout_gravity="center" 35 android:layout_gravity="center"
33 android:alpha="0" 36 android:alpha="0"
34 android:visibility="invisible" 37 android:visibility="invisible"
35 android:contentDescription="@string/accessibility_toolbar_btn_site_i nfo" /> 38 android:contentDescription="@string/accessibility_toolbar_btn_site_i nfo" />
39
36 </FrameLayout> 40 </FrameLayout>
41
37 <include 42 <include
38 android:id="@+id/url_container" 43 android:id="@+id/url_container"
39 android:layout_width="match_parent" 44 android:layout_width="match_parent"
40 android:layout_height="match_parent" 45 android:layout_height="match_parent"
41 android:layout_marginTop="3dp" 46 android:layout_marginTop="3dp"
42 android:layout_marginBottom="3dp" 47 android:layout_marginBottom="3dp"
43 android:layout_marginStart="@dimen/location_bar_icon_width" 48 android:layout_marginStart="@dimen/location_bar_icon_width"
44 android:layout_gravity="center_vertical" 49 android:layout_gravity="center_vertical"
45 android:nextFocusForward="@+id/tab_switcher_button" 50 android:nextFocusForward="@+id/tab_switcher_button"
46 layout="@layout/url_container" 51 layout="@layout/url_container" />
47 /> 52
48 <FrameLayout android:id="@+id/url_action_container" 53 <FrameLayout android:id="@+id/url_action_container"
49 android:layout_width="@dimen/location_bar_icon_width" 54 android:layout_width="@dimen/location_bar_icon_width"
50 android:layout_height="@dimen/toolbar_height_no_shadow" 55 android:layout_height="@dimen/toolbar_height_no_shadow"
51 android:layout_gravity="end|center_vertical" 56 android:layout_gravity="end|center_vertical"
52 android:visibility="gone"> 57 android:visibility="gone" >
53 <org.chromium.chrome.browser.widget.TintedImageButton 58
54 android:id="@+id/document_menu_button" 59 <FrameLayout
55 style="@style/LocationBarButton" 60 android:id="@+id/document_menu_button_wrapper"
56 android:layout_height="match_parent" 61 android:layout_width="fill_parent"
57 android:layout_width="match_parent" 62 android:layout_height="fill_parent"
58 android:layoutDirection="locale" 63 android:layoutDirection="locale" >
59 android:src="@drawable/btn_menu" 64
60 android:contentDescription="@string/accessibility_toolbar_btn_menu" /> 65 <org.chromium.chrome.browser.widget.TintedImageButton
66 android:id="@+id/document_menu_button"
67 style="@style/LocationBarButton"
68 android:layout_height="match_parent"
69 android:layout_width="match_parent"
70 android:src="@drawable/btn_menu"
71 android:contentDescription="@string/accessibility_toolbar_btn_me nu" />
72
73 <ImageView
74 android:id="@+id/document_menu_badge"
75 style="@style/UpdateMenuBadge"
76 android:src="@drawable/badge_update"
77 android:layout_marginEnd="3.5dp"
78 android:contentDescription="@null" />
79
80 </FrameLayout>
81
61 <org.chromium.chrome.browser.widget.TintedImageButton 82 <org.chromium.chrome.browser.widget.TintedImageButton
62 android:id="@+id/delete_button" 83 android:id="@+id/delete_button"
63 style="@style/LocationBarButton" 84 style="@style/LocationBarButton"
64 android:layout_width="match_parent" 85 android:layout_width="match_parent"
65 android:layout_height="match_parent" 86 android:layout_height="match_parent"
66 android:scaleType="center" 87 android:scaleType="center"
67 android:src="@drawable/btn_delete_url" 88 android:src="@drawable/btn_delete_url"
68 android:visibility="invisible" 89 android:visibility="invisible"
69 android:contentDescription="@string/accessibility_toolbar_btn_delete _url" /> 90 android:contentDescription="@string/accessibility_toolbar_btn_delete _url" />
91
70 <org.chromium.chrome.browser.widget.TintedImageButton 92 <org.chromium.chrome.browser.widget.TintedImageButton
71 android:id="@+id/mic_button" 93 android:id="@+id/mic_button"
72 style="@style/LocationBarButton" 94 style="@style/LocationBarButton"
73 android:layout_width="match_parent" 95 android:layout_width="match_parent"
74 android:layout_height="match_parent" 96 android:layout_height="match_parent"
75 android:scaleType="center" 97 android:scaleType="center"
76 android:src="@drawable/btn_mic" 98 android:src="@drawable/btn_mic"
77 android:visibility="invisible" 99 android:visibility="invisible"
78 android:contentDescription="@string/accessibility_toolbar_btn_mic" / > 100 android:contentDescription="@string/accessibility_toolbar_btn_mic" / >
101
79 </FrameLayout> 102 </FrameLayout>
80 </merge> 103 </merge>
OLDNEW
« no previous file with comments | « chrome/android/java/res/layout-sw600dp/toolbar.xml ('k') | chrome/android/java/res/layout/menu_item.xml » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698