| 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.ToolbarPhone | 9 <org.chromium.chrome.browser.toolbar.ToolbarPhone |
| 10 xmlns:android="http://schemas.android.com/apk/res/android" | 10 xmlns:android="http://schemas.android.com/apk/res/android" |
| (...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 51 android:layout_gravity="top" | 51 android:layout_gravity="top" |
| 52 android:contentDescription="@string/accessibility_toolbar_btn_tabswi
tcher_toggle" /> | 52 android:contentDescription="@string/accessibility_toolbar_btn_tabswi
tcher_toggle" /> |
| 53 | 53 |
| 54 <FrameLayout | 54 <FrameLayout |
| 55 android:layout_width="wrap_content" | 55 android:layout_width="wrap_content" |
| 56 android:layout_height="wrap_content" | 56 android:layout_height="wrap_content" |
| 57 android:id="@+id/menu_button_wrapper" > | 57 android:id="@+id/menu_button_wrapper" > |
| 58 | 58 |
| 59 <org.chromium.chrome.browser.widget.TintedImageButton | 59 <org.chromium.chrome.browser.widget.TintedImageButton |
| 60 android:id="@+id/menu_button" | 60 android:id="@+id/menu_button" |
| 61 style="@style/ToolbarButton" | 61 style="@style/ToolbarMenuButtonPhone" |
| 62 android:layout_gravity="top" | |
| 63 android:layout_width="42dp" | |
| 64 android:paddingEnd="4dp" | |
| 65 android:src="@drawable/btn_menu" | 62 android:src="@drawable/btn_menu" |
| 66 android:contentDescription="@string/accessibility_toolbar_btn_me
nu" | 63 android:contentDescription="@string/accessibility_toolbar_btn_me
nu" /> |
| 67 android:background="@null" /> | |
| 68 | 64 |
| 69 <ImageView | 65 <ImageView |
| 70 android:id="@+id/menu_badge" | 66 android:id="@+id/menu_badge" |
| 71 style="@style/UpdateMenuBadge" | 67 style="@style/ToolbarMenuButtonPhone" |
| 72 android:src="@drawable/badge_update" | 68 android:src="@drawable/badge_update_dark" |
| 73 android:layout_marginEnd="8.5dp" | 69 android:contentDescription="@null" |
| 74 android:contentDescription="@null" /> | 70 android:importantForAccessibility="no" |
| 71 android:visibility="invisible" /> |
| 75 </FrameLayout> | 72 </FrameLayout> |
| 76 </LinearLayout> | 73 </LinearLayout> |
| 77 | 74 |
| 78 <org.chromium.chrome.browser.widget.ToolbarProgressBar | 75 <org.chromium.chrome.browser.widget.ToolbarProgressBar |
| 79 android:id="@+id/progress" | 76 android:id="@+id/progress" |
| 80 android:layout_width="match_parent" | 77 android:layout_width="match_parent" |
| 81 android:layout_height="2dp" | 78 android:layout_height="2dp" |
| 82 chrome:progressBarColor="@color/progress_bar_foreground" | 79 chrome:progressBarColor="@color/progress_bar_foreground" |
| 83 chrome:backgroundColor="@color/progress_bar_background" /> | 80 chrome:backgroundColor="@color/progress_bar_background" /> |
| 84 | 81 |
| 85 </org.chromium.chrome.browser.toolbar.ToolbarPhone> | 82 </org.chromium.chrome.browser.toolbar.ToolbarPhone> |
| OLD | NEW |