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 | |
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" | |
13 android:layout_width="@dimen/location_bar_google_g_container_width" | |
14 android:layout_height="match_parent" > | |
15 | |
16 <ImageView android:id="@+id/google_g" | |
mdjones
2017/02/11 00:32:57
This block needs further indentation.
Bernhard Bauer
2017/02/13 17:18:01
Done.
| |
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 | |
8 <ImageView android:id="@+id/incognito_badge" | 28 <ImageView android:id="@+id/incognito_badge" |
9 style="@style/LocationBarButton" | 29 style="@style/LocationBarButton" |
10 android:layout_width="wrap_content" | 30 android:layout_width="wrap_content" |
11 android:layout_height="match_parent" | 31 android:layout_height="match_parent" |
12 android:scaleType="center" | 32 android:scaleType="center" |
13 android:src="@drawable/ic_omnibox_incognito_badge" | 33 android:src="@drawable/ic_omnibox_incognito_badge" |
14 android:contentDescription="@null" | 34 android:contentDescription="@null" |
15 android:visibility="gone" /> | 35 android:visibility="gone" /> |
16 | 36 |
17 <FrameLayout android:id="@+id/location_bar_icon" | 37 <FrameLayout android:id="@+id/location_bar_icon" |
(...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
97 style="@style/LocationBarButton" | 117 style="@style/LocationBarButton" |
98 android:layout_width="match_parent" | 118 android:layout_width="match_parent" |
99 android:layout_height="match_parent" | 119 android:layout_height="match_parent" |
100 android:scaleType="center" | 120 android:scaleType="center" |
101 android:src="@drawable/btn_mic" | 121 android:src="@drawable/btn_mic" |
102 android:visibility="invisible" | 122 android:visibility="invisible" |
103 android:contentDescription="@string/accessibility_toolbar_btn_mic" / > | 123 android:contentDescription="@string/accessibility_toolbar_btn_mic" / > |
104 | 124 |
105 </FrameLayout> | 125 </FrameLayout> |
106 </merge> | 126 </merge> |
OLD | NEW |