| 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 <!-- The container for the Google G is kept at a fixed width to make the hor
izonal translation | 8 <ViewStub |
| 9 calculations work. The contents are end-aligned, so when the location b
ar expands, | 9 android:id="@+id/google_g_container_stub" |
| 10 the space in the start margin will be pushed out, creating the effect o
f both margins | |
| 11 shrinking simultaneously. --> | |
| 12 <FrameLayout android:id="@+id/google_g_container" | |
| 13 android:layout_width="@dimen/location_bar_google_g_container_width" | 10 android:layout_width="@dimen/location_bar_google_g_container_width" |
| 14 android:layout_height="match_parent" > | 11 android:layout_height="match_parent" |
| 15 | 12 android:layout="@layout/location_bar_google_g" /> |
| 16 <ImageView android:id="@+id/google_g" | |
| 17 style="@style/LocationBarButton" | |
| 18 android:layout_width="@dimen/location_bar_google_g_width" | |
| 19 android:layout_height="match_parent" | |
| 20 android:layout_marginEnd="@dimen/location_bar_google_g_margin" | |
| 21 android:layout_gravity="end" | |
| 22 android:scaleType="fitCenter" | |
| 23 android:src="@drawable/googleg" | |
| 24 android:contentDescription="@null" /> | |
| 25 | |
| 26 </FrameLayout> | |
| 27 | 13 |
| 28 <ImageView android:id="@+id/incognito_badge" | 14 <ImageView android:id="@+id/incognito_badge" |
| 29 style="@style/LocationBarButton" | 15 style="@style/LocationBarButton" |
| 30 android:layout_width="wrap_content" | 16 android:layout_width="wrap_content" |
| 31 android:layout_height="match_parent" | 17 android:layout_height="match_parent" |
| 32 android:scaleType="center" | 18 android:scaleType="center" |
| 33 android:src="@drawable/ic_omnibox_incognito_badge" | 19 android:src="@drawable/ic_omnibox_incognito_badge" |
| 34 android:contentDescription="@null" | 20 android:contentDescription="@null" |
| 35 android:visibility="gone" /> | 21 android:visibility="gone" /> |
| 36 | 22 |
| (...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 94 style="@style/LocationBarButton" | 80 style="@style/LocationBarButton" |
| 95 android:layout_width="match_parent" | 81 android:layout_width="match_parent" |
| 96 android:layout_height="match_parent" | 82 android:layout_height="match_parent" |
| 97 android:scaleType="center" | 83 android:scaleType="center" |
| 98 android:src="@drawable/btn_mic" | 84 android:src="@drawable/btn_mic" |
| 99 android:visibility="invisible" | 85 android:visibility="invisible" |
| 100 android:contentDescription="@string/accessibility_toolbar_btn_mic" /
> | 86 android:contentDescription="@string/accessibility_toolbar_btn_mic" /
> |
| 101 | 87 |
| 102 </FrameLayout> | 88 </FrameLayout> |
| 103 </merge> | 89 </merge> |
| OLD | NEW |