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

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

Issue 1226833010: Clean up custom tab toolbar ellisizing and animation (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/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 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/close_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"
(...skipping 15 matching lines...) Expand all
26 android:layout_height="wrap_content" 26 android:layout_height="wrap_content"
27 android:layout_gravity="center_vertical" > 27 android:layout_gravity="center_vertical" >
28 <TextView 28 <TextView
29 android:id="@+id/title_bar" 29 android:id="@+id/title_bar"
30 android:background="@null" 30 android:background="@null"
31 android:layout_width="wrap_content" 31 android:layout_width="wrap_content"
32 android:layout_height="wrap_content" 32 android:layout_height="wrap_content"
33 android:layout_marginBottom="16dp" 33 android:layout_marginBottom="16dp"
34 android:layout_gravity="top" 34 android:layout_gravity="top"
35 android:maxLines="1" 35 android:maxLines="1"
36 android:ellipsize="end"
36 android:paddingEnd="@dimen/toolbar_edge_padding" 37 android:paddingEnd="@dimen/toolbar_edge_padding"
37 android:textSize="@dimen/custom_tabs_title_text_size" 38 android:textSize="@dimen/custom_tabs_title_text_size"
38 android:inputType="none" 39 android:inputType="none"
39 android:visibility="gone" /> 40 android:visibility="gone" />
40 <org.chromium.chrome.browser.omnibox.UrlBar 41 <org.chromium.chrome.browser.omnibox.UrlBar
41 android:id="@+id/url_bar" 42 android:id="@+id/url_bar"
42 android:background="@null" 43 android:background="@null"
43 android:layout_width="wrap_content" 44 android:layout_width="wrap_content"
44 android:layout_height="wrap_content" 45 android:layout_height="wrap_content"
45 android:layout_gravity ="bottom" 46 android:layout_gravity ="bottom"
(...skipping 25 matching lines...) Expand all
71 android:contentDescription="@string/accessibility_toolbar_btn_menu" 72 android:contentDescription="@string/accessibility_toolbar_btn_menu"
72 android:background="@null" /> 73 android:background="@null" />
73 <org.chromium.chrome.browser.widget.ToolbarProgressBar 74 <org.chromium.chrome.browser.widget.ToolbarProgressBar
74 android:id="@+id/progress" 75 android:id="@+id/progress"
75 style="@style/Widget.AppCompat.ProgressBar.Horizontal" 76 style="@style/Widget.AppCompat.ProgressBar.Horizontal"
76 android:progressDrawable="@drawable/progress_bar" 77 android:progressDrawable="@drawable/progress_bar"
77 android:layout_width="match_parent" 78 android:layout_width="match_parent"
78 android:layout_height="2dp" 79 android:layout_height="2dp"
79 android:progress="0" /> 80 android:progress="0" />
80 </org.chromium.chrome.browser.toolbar.CustomTabToolbar> 81 </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