OLD | NEW |
1 <?xml version="1.0" encoding="utf-8"?> | 1 <?xml version="1.0" encoding="utf-8"?> |
2 <!-- Copyright 2016 The Chromium Authors. All rights reserved. | 2 <!-- Copyright 2016 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 toolbar containing the URL bar, back button, and NTP button. | 6 <!-- The toolbar containing the URL bar, back button, and NTP button. |
7 --> | 7 --> |
8 <merge xmlns:android="http://schemas.android.com/apk/res/android" | 8 <merge xmlns:android="http://schemas.android.com/apk/res/android" |
9 xmlns:chrome="http://schemas.android.com/apk/res-auto"> | 9 xmlns:chrome="http://schemas.android.com/apk/res-auto"> |
10 | 10 |
11 <org.chromium.chrome.browser.widget.newtab.NewTabButton | 11 <org.chromium.chrome.browser.widget.newtab.NewTabButton |
12 android:id="@+id/new_tab_button" | 12 android:id="@+id/new_tab_button" |
13 style="@style/ToolbarButton" | 13 style="@style/ToolbarButton" |
14 android:layout_width="wrap_content" | 14 android:layout_width="wrap_content" |
15 android:layout_gravity="start|top" | 15 android:layout_gravity="start|top" |
16 android:paddingStart="16dp" | 16 android:paddingStart="16dp" |
17 android:paddingEnd="16dp" | 17 android:paddingEnd="16dp" |
18 android:visibility="invisible" | 18 android:visibility="invisible" |
19 android:background="?attr/selectableItemBackground" | 19 android:background="?attr/selectableItemBackground" |
20 android:contentDescription="@string/accessibility_toolbar_btn_new_tab" /
> | 20 android:contentDescription="@string/accessibility_toolbar_btn_new_tab" /
> |
21 | 21 |
22 <org.chromium.chrome.browser.toolbar.HomePageButton | 22 <org.chromium.chrome.browser.toolbar.HomePageButton |
23 android:id="@+id/home_button" | 23 android:id="@+id/home_button" |
24 style="@style/ToolbarButton" | 24 style="@style/ToolbarButton" |
25 android:src="@drawable/btn_toolbar_home" | 25 android:src="@drawable/btn_toolbar_home" |
26 android:contentDescription="@string/accessibility_toolbar_btn_home" | 26 android:contentDescription="@string/accessibility_toolbar_btn_home" |
27 android:visibility="gone" /> | 27 android:visibility="gone" /> |
28 | 28 |
| 29 <org.chromium.chrome.browser.widget.TintedImageButton |
| 30 android:id="@+id/expand_sheet_button" |
| 31 style="@style/ToolbarButton" |
| 32 android:src="@drawable/ic_collapsed" |
| 33 android:contentDescription="@string/accessibility_toolbar_btn_expand" |
| 34 android:visibility="gone" /> |
| 35 |
29 <org.chromium.chrome.browser.omnibox.LocationBarPhone | 36 <org.chromium.chrome.browser.omnibox.LocationBarPhone |
30 android:id="@+id/location_bar" | 37 android:id="@+id/location_bar" |
31 android:layout_width="match_parent" | 38 android:layout_width="match_parent" |
32 android:layout_height="match_parent" | 39 android:layout_height="match_parent" |
33 android:layout_gravity="top" /> | 40 android:layout_gravity="top" /> |
34 | 41 |
35 <LinearLayout android:id="@+id/toolbar_buttons" | 42 <LinearLayout android:id="@+id/toolbar_buttons" |
36 android:orientation="horizontal" | 43 android:orientation="horizontal" |
37 android:layout_width="wrap_content" | 44 android:layout_width="wrap_content" |
38 android:layout_height="wrap_content" | 45 android:layout_height="wrap_content" |
(...skipping 23 matching lines...) Expand all Loading... |
62 android:id="@+id/menu_badge" | 69 android:id="@+id/menu_badge" |
63 style="@style/ToolbarMenuButtonPhone" | 70 style="@style/ToolbarMenuButtonPhone" |
64 android:src="@drawable/badge_update_dark" | 71 android:src="@drawable/badge_update_dark" |
65 android:contentDescription="@null" | 72 android:contentDescription="@null" |
66 android:importantForAccessibility="no" | 73 android:importantForAccessibility="no" |
67 android:visibility="invisible" /> | 74 android:visibility="invisible" /> |
68 </FrameLayout> | 75 </FrameLayout> |
69 </LinearLayout> | 76 </LinearLayout> |
70 | 77 |
71 </merge> | 78 </merge> |
OLD | NEW |