| 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 location bar also know as URL bar --> | 6 <!-- The location bar also know as URL bar --> |
| 7 <merge xmlns:android="http://schemas.android.com/apk/res/android"> | 7 <merge xmlns:android="http://schemas.android.com/apk/res/android"> |
| 8 <ImageView android:id="@+id/incognito_badge" | 8 <ImageView android:id="@+id/incognito_badge" |
| 9 style="@style/LocationBarButton" | 9 style="@style/LocationBarButton" |
| 10 android:layout_width="wrap_content" | 10 android:layout_width="wrap_content" |
| (...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 66 android:id="@+id/document_menu_button" | 66 android:id="@+id/document_menu_button" |
| 67 style="@style/LocationBarButton" | 67 style="@style/LocationBarButton" |
| 68 android:layout_height="match_parent" | 68 android:layout_height="match_parent" |
| 69 android:layout_width="match_parent" | 69 android:layout_width="match_parent" |
| 70 android:src="@drawable/btn_menu" | 70 android:src="@drawable/btn_menu" |
| 71 android:contentDescription="@string/accessibility_toolbar_btn_me
nu" /> | 71 android:contentDescription="@string/accessibility_toolbar_btn_me
nu" /> |
| 72 | 72 |
| 73 <ImageView | 73 <ImageView |
| 74 android:id="@+id/document_menu_badge" | 74 android:id="@+id/document_menu_badge" |
| 75 style="@style/UpdateMenuBadge" | 75 style="@style/UpdateMenuBadge" |
| 76 android:src="@drawable/badge_update" | 76 android:src="@drawable/badge_update_dark" |
| 77 android:layout_marginEnd="3.5dp" | 77 android:layout_height="match_parent" |
| 78 android:contentDescription="@null" /> | 78 android:layout_width="match_parent" |
| 79 android:contentDescription="@null" |
| 80 android:background="@null" /> |
| 79 | 81 |
| 80 </FrameLayout> | 82 </FrameLayout> |
| 81 | 83 |
| 82 <org.chromium.chrome.browser.widget.TintedImageButton | 84 <org.chromium.chrome.browser.widget.TintedImageButton |
| 83 android:id="@+id/delete_button" | 85 android:id="@+id/delete_button" |
| 84 style="@style/LocationBarButton" | 86 style="@style/LocationBarButton" |
| 85 android:layout_width="match_parent" | 87 android:layout_width="match_parent" |
| 86 android:layout_height="match_parent" | 88 android:layout_height="match_parent" |
| 87 android:scaleType="center" | 89 android:scaleType="center" |
| 88 android:src="@drawable/btn_delete_url" | 90 android:src="@drawable/btn_delete_url" |
| 89 android:visibility="invisible" | 91 android:visibility="invisible" |
| 90 android:contentDescription="@string/accessibility_toolbar_btn_delete
_url" /> | 92 android:contentDescription="@string/accessibility_toolbar_btn_delete
_url" /> |
| 91 | 93 |
| 92 <org.chromium.chrome.browser.widget.TintedImageButton | 94 <org.chromium.chrome.browser.widget.TintedImageButton |
| 93 android:id="@+id/mic_button" | 95 android:id="@+id/mic_button" |
| 94 style="@style/LocationBarButton" | 96 style="@style/LocationBarButton" |
| 95 android:layout_width="match_parent" | 97 android:layout_width="match_parent" |
| 96 android:layout_height="match_parent" | 98 android:layout_height="match_parent" |
| 97 android:scaleType="center" | 99 android:scaleType="center" |
| 98 android:src="@drawable/btn_mic" | 100 android:src="@drawable/btn_mic" |
| 99 android:visibility="invisible" | 101 android:visibility="invisible" |
| 100 android:contentDescription="@string/accessibility_toolbar_btn_mic" /
> | 102 android:contentDescription="@string/accessibility_toolbar_btn_mic" /
> |
| 101 | 103 |
| 102 </FrameLayout> | 104 </FrameLayout> |
| 103 </merge> | 105 </merge> |
| OLD | NEW |