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 |
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
43 android:layout_height="match_parent" /> | 43 android:layout_height="match_parent" /> |
44 | 44 |
45 <ImageButton android:id="@+id/tab_switcher_button" | 45 <ImageButton android:id="@+id/tab_switcher_button" |
46 style="@style/ToolbarButton" | 46 style="@style/ToolbarButton" |
47 android:layout_gravity="top" | 47 android:layout_gravity="top" |
48 android:contentDescription="@string/accessibility_toolbar_btn_tabswi
tcher_toggle_default" /> | 48 android:contentDescription="@string/accessibility_toolbar_btn_tabswi
tcher_toggle_default" /> |
49 | 49 |
50 <FrameLayout | 50 <FrameLayout |
51 android:layout_width="wrap_content" | 51 android:layout_width="wrap_content" |
52 android:layout_height="wrap_content" | 52 android:layout_height="wrap_content" |
53 android:id="@+id/menu_button_wrapper" > | 53 android:id="@+id/menu_button_wrapper"> |
54 | 54 |
55 <org.chromium.chrome.browser.widget.TintedImageButton | 55 <org.chromium.chrome.browser.widget.TintedImageButton |
56 android:id="@+id/menu_button" | 56 android:id="@+id/menu_button" |
57 style="@style/ToolbarMenuButtonPhone" | 57 style="@style/ToolbarMenuButtonPhone" |
58 android:src="@drawable/btn_menu" | 58 android:src="@drawable/btn_menu" |
59 android:contentDescription="@string/accessibility_toolbar_btn_me
nu" /> | 59 android:contentDescription="@string/accessibility_toolbar_btn_me
nu" /> |
60 | 60 |
61 <ImageView | 61 <ImageView |
62 android:id="@+id/menu_badge" | 62 android:id="@+id/menu_badge" |
63 style="@style/ToolbarMenuButtonPhone" | 63 style="@style/ToolbarMenuButtonPhone" |
64 android:src="@drawable/badge_update_dark" | 64 android:src="@drawable/badge_update_dark" |
65 android:contentDescription="@null" | 65 android:contentDescription="@null" |
66 android:importantForAccessibility="no" | 66 android:importantForAccessibility="no" |
67 android:visibility="invisible" /> | 67 android:visibility="invisible" /> |
68 </FrameLayout> | 68 </FrameLayout> |
69 </LinearLayout> | 69 </LinearLayout> |
70 | 70 |
71 </merge> | 71 </merge> |
OLD | NEW |