OLD | NEW |
---|---|
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 14 matching lines...) Expand all Loading... | |
25 android:layout_height="wrap_content" | 25 android:layout_height="wrap_content" |
26 android:layout_gravity="center_vertical" > | 26 android:layout_gravity="center_vertical" > |
27 <TextView | 27 <TextView |
28 android:id="@+id/title_bar" | 28 android:id="@+id/title_bar" |
29 android:background="@null" | 29 android:background="@null" |
30 android:layout_width="wrap_content" | 30 android:layout_width="wrap_content" |
31 android:layout_height="wrap_content" | 31 android:layout_height="wrap_content" |
32 android:layout_marginBottom="16dp" | 32 android:layout_marginBottom="16dp" |
33 android:layout_gravity="top" | 33 android:layout_gravity="top" |
34 android:maxLines="1" | 34 android:maxLines="1" |
35 android:paddingEnd="@dimen/toolbar_edge_padding" | 35 android:ellipsize="end" |
Yusuf
2015/07/08 18:52:13
we actually still want the padding at the end.
Ian Wen
2015/07/08 18:52:50
Done.
| |
36 android:textSize="@dimen/custom_tabs_title_text_size" | 36 android:textSize="@dimen/custom_tabs_title_text_size" |
37 android:inputType="none" | 37 android:inputType="none" |
38 android:visibility="gone" /> | 38 android:visibility="gone" /> |
39 <org.chromium.chrome.browser.omnibox.UrlBar | 39 <org.chromium.chrome.browser.omnibox.UrlBar |
40 android:id="@+id/url_bar" | 40 android:id="@+id/url_bar" |
41 android:background="@null" | 41 android:background="@null" |
42 android:layout_width="wrap_content" | 42 android:layout_width="wrap_content" |
43 android:layout_height="wrap_content" | 43 android:layout_height="wrap_content" |
44 android:layout_gravity ="bottom" | 44 android:layout_gravity ="bottom" |
45 android:maxLines="1" | 45 android:maxLines="1" |
(...skipping 24 matching lines...) Expand all Loading... | |
70 android:contentDescription="@string/accessibility_toolbar_btn_menu" | 70 android:contentDescription="@string/accessibility_toolbar_btn_menu" |
71 android:background="@null" /> | 71 android:background="@null" /> |
72 <org.chromium.chrome.browser.widget.ToolbarProgressBar | 72 <org.chromium.chrome.browser.widget.ToolbarProgressBar |
73 android:id="@+id/progress" | 73 android:id="@+id/progress" |
74 style="@style/Widget.AppCompat.ProgressBar.Horizontal" | 74 style="@style/Widget.AppCompat.ProgressBar.Horizontal" |
75 android:progressDrawable="@drawable/progress_bar" | 75 android:progressDrawable="@drawable/progress_bar" |
76 android:layout_width="match_parent" | 76 android:layout_width="match_parent" |
77 android:layout_height="2dp" | 77 android:layout_height="2dp" |
78 android:progress="0" /> | 78 android:progress="0" /> |
79 </org.chromium.chrome.browser.toolbar.CustomTabToolbar> | 79 </org.chromium.chrome.browser.toolbar.CustomTabToolbar> |
OLD | NEW |