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 <!-- 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 | 8 |
9 <org.chromium.chrome.browser.toolbar.ToolbarTablet | 9 <org.chromium.chrome.browser.toolbar.ToolbarTablet |
10 xmlns:android="http://schemas.android.com/apk/res/android" | 10 xmlns:android="http://schemas.android.com/apk/res/android" |
11 android:layout_width="match_parent" | 11 android:layout_width="match_parent" |
12 android:layout_height="@dimen/toolbar_height_no_shadow" | 12 android:layout_height="@dimen/toolbar_height_no_shadow" |
13 android:layout_marginTop="@dimen/tab_strip_height" | 13 android:layout_marginTop="@dimen/tab_strip_height" |
14 android:background="@color/default_primary_color" > | 14 android:background="@color/default_primary_color" > |
| 15 |
15 <LinearLayout | 16 <LinearLayout |
16 android:layout_width="match_parent" | 17 android:layout_width="match_parent" |
17 android:layout_height="match_parent" | 18 android:layout_height="match_parent" |
18 android:paddingStart="4dp" | 19 android:paddingStart="4dp" |
19 android:orientation="horizontal"> | 20 android:orientation="horizontal" > |
| 21 |
20 <org.chromium.chrome.browser.toolbar.HomePageButton | 22 <org.chromium.chrome.browser.toolbar.HomePageButton |
21 android:id="@+id/home_button" | 23 android:id="@+id/home_button" |
22 style="@style/ToolbarButton" | 24 style="@style/ToolbarButton" |
23 android:src="@drawable/btn_toolbar_home" | 25 android:src="@drawable/btn_toolbar_home" |
24 android:contentDescription="@string/accessibility_toolbar_btn_home" | 26 android:contentDescription="@string/accessibility_toolbar_btn_home" |
25 android:visibility="gone" /> | 27 android:visibility="gone" /> |
| 28 |
26 <org.chromium.chrome.browser.widget.TintedImageButton | 29 <org.chromium.chrome.browser.widget.TintedImageButton |
27 android:id="@+id/back_button" | 30 android:id="@+id/back_button" |
28 style="@style/ToolbarButton" | 31 style="@style/ToolbarButton" |
29 android:src="@drawable/btn_back" | 32 android:src="@drawable/btn_back" |
30 android:contentDescription="@string/accessibility_toolbar_btn_back"
/> | 33 android:contentDescription="@string/accessibility_toolbar_btn_back"
/> |
| 34 |
31 <org.chromium.chrome.browser.widget.TintedImageButton | 35 <org.chromium.chrome.browser.widget.TintedImageButton |
32 android:id="@+id/forward_button" | 36 android:id="@+id/forward_button" |
33 style="@style/ToolbarButton" | 37 style="@style/ToolbarButton" |
34 android:src="@drawable/btn_forward" | 38 android:src="@drawable/btn_forward" |
35 android:contentDescription="@string/accessibility_toolbar_btn_forwar
d" /> | 39 android:contentDescription="@string/accessibility_toolbar_btn_forwar
d" /> |
| 40 |
36 <org.chromium.chrome.browser.widget.TintedImageButton | 41 <org.chromium.chrome.browser.widget.TintedImageButton |
37 android:id="@+id/refresh_button" | 42 android:id="@+id/refresh_button" |
38 style="@style/ToolbarButton" | 43 style="@style/ToolbarButton" |
39 android:src="@drawable/btn_toolbar_reload" | 44 android:src="@drawable/btn_toolbar_reload" |
40 android:contentDescription="@string/accessibility_btn_refresh" /> | 45 android:contentDescription="@string/accessibility_btn_refresh" /> |
| 46 |
41 <org.chromium.chrome.browser.omnibox.LocationBarTablet | 47 <org.chromium.chrome.browser.omnibox.LocationBarTablet |
42 android:id="@+id/location_bar" | 48 android:id="@+id/location_bar" |
43 android:layout_width="0dp" | 49 android:layout_width="0dp" |
44 android:layout_height="match_parent" | 50 android:layout_height="match_parent" |
45 android:layout_marginBottom="5dp" | 51 android:layout_marginBottom="5dp" |
46 android:layout_marginTop="5dp" | 52 android:layout_marginTop="5dp" |
47 android:layout_weight="1" | 53 android:layout_weight="1" |
48 android:layout_gravity="top|center" | 54 android:layout_gravity="top|center" |
49 android:background="@drawable/textbox" | 55 android:background="@drawable/textbox" |
50 android:paddingEnd="1dp" | 56 android:paddingEnd="1dp" |
51 android:paddingStart="2dp" | 57 android:paddingStart="2dp" /> |
52 /> | 58 |
53 <ImageButton | 59 <ImageButton |
54 android:id="@+id/tab_switcher_button" | 60 android:id="@+id/tab_switcher_button" |
55 style="@style/ToolbarButton" | 61 style="@style/ToolbarButton" |
56 android:contentDescription="@string/accessibility_toolbar_btn_tabswi
tcher_toggle" | 62 android:contentDescription="@string/accessibility_toolbar_btn_tabswi
tcher_toggle" |
57 android:visibility="gone" /> | 63 android:visibility="gone" /> |
58 <org.chromium.chrome.browser.widget.TintedImageButton | 64 |
59 android:id="@+id/menu_button" | 65 <FrameLayout |
60 style="@style/ToolbarButton" | 66 android:layout_width="wrap_content" |
61 android:src="@drawable/btn_menu" | 67 android:layout_height="wrap_content" |
62 android:contentDescription="@string/accessibility_toolbar_btn_menu" | 68 android:id="@+id/menu_button_wrapper" > |
63 android:layout_width="43dp" | 69 |
64 android:paddingEnd="3.5dp" /> | 70 <org.chromium.chrome.browser.widget.TintedImageButton |
| 71 android:id="@+id/menu_button" |
| 72 style="@style/ToolbarButton" |
| 73 android:src="@drawable/btn_menu" |
| 74 android:contentDescription="@string/accessibility_toolbar_btn_me
nu" |
| 75 android:layout_width="43dp" |
| 76 android:paddingEnd="3.5dp" /> |
| 77 |
| 78 <ImageView |
| 79 android:id="@+id/menu_badge" |
| 80 style="@style/UpdateMenuBadge" |
| 81 android:src="@drawable/badge_update" |
| 82 android:layout_marginEnd="8.5dp" |
| 83 android:contentDescription="@null" /> |
| 84 |
| 85 </FrameLayout> |
65 </LinearLayout> | 86 </LinearLayout> |
66 </org.chromium.chrome.browser.toolbar.ToolbarTablet> | 87 </org.chromium.chrome.browser.toolbar.ToolbarTablet> |
OLD | NEW |