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

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

Issue 1203223003: Replace return button with close button on custom tab toolbar (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 5 years, 5 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
« no previous file with comments | « no previous file | chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabActivity.java » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 <org.chromium.chrome.browser.toolbar.CustomTabToolbar xmlns:android="http://sche mas.android.com/apk/res/android"> 6 <org.chromium.chrome.browser.toolbar.CustomTabToolbar xmlns:android="http://sche mas.android.com/apk/res/android">
7 <org.chromium.chrome.browser.widget.TintedImageButton 7 <org.chromium.chrome.browser.widget.TintedImageButton
8 android:id="@+id/back_button" 8 android:id="@+id/close_button"
9 style="@style/ToolbarButton" 9 style="@style/ToolbarButton"
10 android:layout_gravity="center_vertical" 10 android:layout_gravity="center_vertical" />
11 android:src="@drawable/btn_chevron_left" />
12 <ImageButton android:id="@+id/security_button" 11 <ImageButton android:id="@+id/security_button"
13 style="@style/LocationBarButton" 12 style="@style/LocationBarButton"
14 android:layout_width="@dimen/location_bar_icon_width" 13 android:layout_width="@dimen/location_bar_icon_width"
15 android:layout_height="match_parent" 14 android:layout_height="match_parent"
16 android:layout_marginStart="48dp" 15 android:layout_marginStart="48dp"
17 android:scaleType="center" 16 android:scaleType="center"
18 android:layout_gravity="center_vertical" 17 android:layout_gravity="center_vertical"
19 android:alpha="0" 18 android:alpha="0"
20 android:visibility="gone" 19 android:visibility="gone"
21 android:contentDescription="@string/accessibility_toolbar_btn_site_info" /> 20 android:contentDescription="@string/accessibility_toolbar_btn_site_info" />
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
71 android:contentDescription="@string/accessibility_toolbar_btn_menu" 70 android:contentDescription="@string/accessibility_toolbar_btn_menu"
72 android:background="@null" /> 71 android:background="@null" />
73 <org.chromium.chrome.browser.widget.ToolbarProgressBar 72 <org.chromium.chrome.browser.widget.ToolbarProgressBar
74 android:id="@+id/progress" 73 android:id="@+id/progress"
75 style="@style/Widget.AppCompat.ProgressBar.Horizontal" 74 style="@style/Widget.AppCompat.ProgressBar.Horizontal"
76 android:progressDrawable="@drawable/progress_bar" 75 android:progressDrawable="@drawable/progress_bar"
77 android:layout_width="match_parent" 76 android:layout_width="match_parent"
78 android:layout_height="2dp" 77 android:layout_height="2dp"
79 android:progress="0" /> 78 android:progress="0" />
80 </org.chromium.chrome.browser.toolbar.CustomTabToolbar> 79 </org.chromium.chrome.browser.toolbar.CustomTabToolbar>
OLDNEW
« no previous file with comments | « no previous file | chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabActivity.java » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698