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