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 toolbar containing the URL bar, back button, and NTP button. | 6 <!-- The toolbar containing the URL bar, back button, and NTP button. |
7 --> | 7 --> |
8 | 8 |
9 <org.chromium.chrome.browser.toolbar.ToolbarTablet | 9 <org.chromium.chrome.browser.toolbar.ToolbarTablet |
10 xmlns:android="http://schemas.android.com/apk/res/android" | 10 xmlns:android="http://schemas.android.com/apk/res/android" |
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
42 android:id="@+id/location_bar" | 42 android:id="@+id/location_bar" |
43 android:layout_width="0dp" | 43 android:layout_width="0dp" |
44 android:layout_height="match_parent" | 44 android:layout_height="match_parent" |
45 android:layout_marginBottom="5dp" | 45 android:layout_marginBottom="5dp" |
46 android:layout_marginTop="5dp" | 46 android:layout_marginTop="5dp" |
47 android:layout_weight="1" | 47 android:layout_weight="1" |
48 android:layout_gravity="top|center" | 48 android:layout_gravity="top|center" |
49 android:background="@drawable/textbox" | 49 android:background="@drawable/textbox" |
50 android:paddingEnd="1dp" | 50 android:paddingEnd="1dp" |
51 android:paddingStart="2dp" | 51 android:paddingStart="2dp" |
52 /> | 52 /> |
gone
2015/12/08 22:24:23
nit: should go on the same line as the last attrib
Theresa
2015/12/10 03:53:17
Done.
| |
53 <ImageButton | 53 <ImageButton |
54 android:id="@+id/tab_switcher_button" | 54 android:id="@+id/tab_switcher_button" |
55 style="@style/ToolbarButton" | 55 style="@style/ToolbarButton" |
56 android:contentDescription="@string/accessibility_toolbar_btn_tabswi tcher_toggle" | 56 android:contentDescription="@string/accessibility_toolbar_btn_tabswi tcher_toggle" |
57 android:visibility="gone" /> | 57 android:visibility="gone" /> |
58 <org.chromium.chrome.browser.widget.TintedImageButton | 58 <FrameLayout |
gone
2015/12/08 22:24:23
1) Does it make sense to pull this FrameLayout + c
Theresa
2015/12/10 03:53:17
1. All of the menu_buttons have different layout_w
gone
2015/12/10 21:45:07
Looks good. If this becomes a permanent thing I g
Theresa
2015/12/11 19:44:46
Acknowledged.
| |
59 android:id="@+id/menu_button" | 59 android:layout_width="wrap_content" |
60 style="@style/ToolbarButton" | 60 android:layout_height="wrap_content" |
61 android:src="@drawable/btn_menu" | 61 android:id="@+id/menu_btn_wrapper" > |
gone
2015/12/08 22:24:23
nit: menu_button_wrapper? I think the btn_ design
Theresa
2015/12/10 03:53:17
Done.
| |
62 android:contentDescription="@string/accessibility_toolbar_btn_menu" | 62 <org.chromium.chrome.browser.widget.TintedImageButton |
63 android:layout_width="43dp" | 63 android:id="@+id/menu_button" |
64 android:paddingEnd="3.5dp" /> | 64 style="@style/ToolbarButton" |
65 android:src="@drawable/btn_menu" | |
66 android:contentDescription="@string/accessibility_toolbar_btn_me nu" | |
67 android:layout_width="43dp" | |
68 android:paddingEnd="3.5dp" /> | |
69 <ImageView | |
70 android:id="@+id/menu_badge" | |
71 android:src="@drawable/badge_update" | |
72 android:layout_height="@dimen/menu_badge_size" | |
73 android:layout_width="@dimen/menu_badge_size" | |
74 android:layout_marginBottom="14dp" | |
75 android:layout_marginEnd="9.5dp" | |
76 android:layout_gravity="end|bottom" | |
77 android:contentDescription="@string/accessibility_toolbar_update _badge" | |
gone
2015/12/08 22:24:23
I don't know if it makes sense to apply the access
Theresa
2015/12/10 03:53:17
I don't think views inherit contentDescriptions fr
gone
2015/12/10 21:45:07
You might be able to apply a @null contentDescript
Theresa
2015/12/11 19:44:46
I set the contentDescription to null and defined i
| |
78 android:visibility="gone" /> | |
79 </FrameLayout> | |
65 </LinearLayout> | 80 </LinearLayout> |
66 </org.chromium.chrome.browser.toolbar.ToolbarTablet> | 81 </org.chromium.chrome.browser.toolbar.ToolbarTablet> |
OLD | NEW |