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

Side by Side Diff: chrome/android/java/res/layout/location_bar.xml

Issue 2063823005: [android] New origin security indicator icons. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Optimized PNGs. Created 4 years, 6 months 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
17 <FrameLayout android:id="@+id/location_bar_icon" 17 <FrameLayout android:id="@+id/location_bar_icon"
18 android:layout_width="@dimen/location_bar_icon_width" 18 android:layout_width="@dimen/location_bar_icon_width"
19 android:layout_height="match_parent" 19 android:layout_height="match_parent"
20 android:visibility="gone" > 20 android:visibility="gone" >
21 21
22 <ImageView android:id="@+id/navigation_button" 22 <ImageView android:id="@+id/navigation_button"
23 style="@style/LocationBarButton" 23 style="@style/LocationBarButton"
24 android:layout_width="match_parent" 24 android:layout_width="match_parent"
25 android:layout_height="match_parent" 25 android:layout_height="match_parent"
26 android:layout_gravity="center" 26 android:layout_gravity="center"
27 android:scaleType="center" 27 android:scaleType="center"
28 android:contentDescription="@string/accessibility_toolbar_btn_site_i nfo" /> 28 android:contentDescription="@string/accessibility_toolbar_btn_site_i nfo" />
29 29
30 <ImageButton android:id="@+id/security_button" 30 <org.chromium.chrome.browser.widget.TintedImageButton
31 android:id="@+id/security_button"
31 style="@style/LocationBarButton" 32 style="@style/LocationBarButton"
32 android:layout_width="match_parent" 33 android:layout_width="match_parent"
33 android:layout_height="match_parent" 34 android:layout_height="match_parent"
34 android:scaleType="center" 35 android:scaleType="center"
35 android:layout_gravity="center" 36 android:layout_gravity="center"
36 android:alpha="0" 37 android:alpha="0"
37 android:visibility="invisible" 38 android:visibility="invisible"
38 android:contentDescription="@string/accessibility_toolbar_btn_site_i nfo" /> 39 android:contentDescription="@string/accessibility_toolbar_btn_site_i nfo" />
39 40
40 </FrameLayout> 41 </FrameLayout>
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
96 style="@style/LocationBarButton" 97 style="@style/LocationBarButton"
97 android:layout_width="match_parent" 98 android:layout_width="match_parent"
98 android:layout_height="match_parent" 99 android:layout_height="match_parent"
99 android:scaleType="center" 100 android:scaleType="center"
100 android:src="@drawable/btn_mic" 101 android:src="@drawable/btn_mic"
101 android:visibility="invisible" 102 android:visibility="invisible"
102 android:contentDescription="@string/accessibility_toolbar_btn_mic" / > 103 android:contentDescription="@string/accessibility_toolbar_btn_mic" / >
103 104
104 </FrameLayout> 105 </FrameLayout>
105 </merge> 106 </merge>
OLDNEW
« no previous file with comments | « chrome/android/java/res/layout/custom_tabs_toolbar.xml ('k') | chrome/android/java/res/values/colors.xml » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698