| 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 <FrameLayout android:id="@+id/location_bar_icon" | 8 <FrameLayout android:id="@+id/location_bar_icon" |
| 9 android:layout_width="@dimen/location_bar_icon_width" | 9 android:layout_width="@dimen/location_bar_icon_width" |
| 10 android:layout_height="match_parent" | 10 android:layout_height="match_parent" |
| 11 android:layout_gravity="start|center_vertical"> | 11 android:layout_gravity="start|center_vertical"> |
| 12 <ImageView android:id="@+id/navigation_button" | 12 <ImageView android:id="@+id/navigation_button" |
| 13 style="@style/LocationBarButton" | 13 style="@style/LocationBarButton" |
| 14 android:layout_width="match_parent" | 14 android:layout_width="match_parent" |
| 15 android:layout_height="match_parent" | 15 android:layout_height="match_parent" |
| 16 android:layout_gravity="center_vertical" | 16 android:layout_gravity="center_vertical" |
| 17 android:src="@drawable/ic_omnibox_page" | 17 android:src="@drawable/ic_omnibox_page" |
| 18 android:scaleType="center" | 18 android:scaleType="center" |
| 19 android:contentDescription="@string/accessibility_toolbar_btn_site_i
nfo"/> | 19 android:contentDescription="@string/accessibility_toolbar_btn_site_i
nfo"/> |
| 20 <ImageButton android:id="@+id/security_button" | 20 <org.chromium.chrome.browser.widget.TintedImageButton |
| 21 android:id="@+id/security_button" |
| 21 style="@style/LocationBarButton" | 22 style="@style/LocationBarButton" |
| 22 android:layout_width="match_parent" | 23 android:layout_width="match_parent" |
| 23 android:layout_height="match_parent" | 24 android:layout_height="match_parent" |
| 24 android:scaleType="center" | 25 android:scaleType="center" |
| 25 android:layout_gravity="center" | 26 android:layout_gravity="center" |
| 26 android:alpha="0" | 27 android:alpha="0" |
| 27 android:visibility="invisible" | 28 android:visibility="invisible" |
| 28 android:contentDescription="@string/accessibility_toolbar_btn_site_i
nfo" /> | 29 android:contentDescription="@string/accessibility_toolbar_btn_site_i
nfo" /> |
| 29 </FrameLayout> | 30 </FrameLayout> |
| 30 <include layout="@layout/location_bar_status" /> | 31 <include layout="@layout/location_bar_status" /> |
| (...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 68 android:layout_width="@dimen/location_bar_icon_width" | 69 android:layout_width="@dimen/location_bar_icon_width" |
| 69 android:layout_height="match_parent" | 70 android:layout_height="match_parent" |
| 70 android:scaleType="center" | 71 android:scaleType="center" |
| 71 android:layout_gravity="end" | 72 android:layout_gravity="end" |
| 72 android:paddingStart="0dp" | 73 android:paddingStart="0dp" |
| 73 android:paddingEnd="0dp" | 74 android:paddingEnd="0dp" |
| 74 android:nextFocusForward="@+id/menu_button" | 75 android:nextFocusForward="@+id/menu_button" |
| 75 android:src="@drawable/btn_mic" | 76 android:src="@drawable/btn_mic" |
| 76 android:contentDescription="@string/accessibility_toolbar_btn_mic" /> | 77 android:contentDescription="@string/accessibility_toolbar_btn_mic" /> |
| 77 </merge> | 78 </merge> |
| OLD | NEW |