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

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

Issue 1247623004: Animate hiding security button on custom tab toolbar (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@security_margin_fix
Patch Set: respond to comments 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/toolbar/CustomTabToolbar.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 6 <org.chromium.chrome.browser.toolbar.CustomTabToolbar
7 xmlns:android="http://schemas.android.com/apk/res/android" 7 xmlns:android="http://schemas.android.com/apk/res/android"
8 xmlns:chrome="http://schemas.android.com/apk/res-auto" > 8 xmlns:chrome="http://schemas.android.com/apk/res-auto" >
9 <org.chromium.chrome.browser.widget.TintedImageButton 9 <org.chromium.chrome.browser.widget.TintedImageButton
10 android:id="@+id/close_button" 10 android:id="@+id/close_button"
11 style="@style/ToolbarButton" 11 style="@style/ToolbarButton"
12 android:layout_gravity="start|center_vertical" 12 android:layout_gravity="start|center_vertical"
13 android:contentDescription="@string/close_tab" /> 13 android:contentDescription="@string/close_tab" />
14 <FrameLayout 14 <FrameLayout
15 android:id="@+id/location_bar_frame_layout" 15 android:id="@+id/location_bar_frame_layout"
16 android:layout_width="match_parent" 16 android:layout_width="match_parent"
17 android:layout_height="wrap_content" 17 android:layout_height="wrap_content"
18 android:layout_gravity="center_vertical" > 18 android:layout_gravity="center_vertical" >
19 <ImageButton 19 <ImageButton
20 android:id="@+id/security_button" 20 android:id="@+id/security_button"
21 style="@style/LocationBarButton" 21 style="@style/LocationBarButton"
22 android:layout_width="@dimen/location_bar_icon_width" 22 android:layout_width="@dimen/location_bar_icon_width"
23 android:layout_height="match_parent" 23 android:layout_height="match_parent"
24 android:layout_gravity="center_vertical" 24 android:layout_gravity="center_vertical"
25 android:alpha="0"
26 android:contentDescription="@string/accessibility_toolbar_btn_site_i nfo" 25 android:contentDescription="@string/accessibility_toolbar_btn_site_i nfo"
27 android:scaleType="center" 26 android:scaleType="center"
28 android:visibility="gone" /> 27 android:visibility="gone" />
29 <FrameLayout 28 <FrameLayout
30 android:id="@+id/title_url_container" 29 android:id="@+id/title_url_container"
31 android:layout_width="match_parent" 30 android:layout_width="match_parent"
32 android:layout_height="wrap_content" 31 android:layout_height="wrap_content"
33 android:layout_gravity="center_vertical" 32 android:layout_gravity="center_vertical"
34 android:background="@null" > 33 android:background="@null" >
35 <TextView 34 <TextView
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
79 android:src="@drawable/btn_menu" 78 android:src="@drawable/btn_menu"
80 android:contentDescription="@string/accessibility_toolbar_btn_menu" 79 android:contentDescription="@string/accessibility_toolbar_btn_menu"
81 android:background="@null" /> 80 android:background="@null" />
82 <org.chromium.chrome.browser.widget.ToolbarProgressBar 81 <org.chromium.chrome.browser.widget.ToolbarProgressBar
83 android:id="@+id/progress" 82 android:id="@+id/progress"
84 android:layout_width="match_parent" 83 android:layout_width="match_parent"
85 android:layout_height="2dp" 84 android:layout_height="2dp"
86 chrome:progressBarColor="@color/progress_bar_foreground" 85 chrome:progressBarColor="@color/progress_bar_foreground"
87 chrome:backgroundColor="@color/progress_bar_background" /> 86 chrome:backgroundColor="@color/progress_bar_background" />
88 </org.chromium.chrome.browser.toolbar.CustomTabToolbar> 87 </org.chromium.chrome.browser.toolbar.CustomTabToolbar>
OLDNEW
« no previous file with comments | « no previous file | chrome/android/java/src/org/chromium/chrome/browser/toolbar/CustomTabToolbar.java » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698