OLD | NEW |
1 <?xml version="1.0" encoding="utf-8"?> | 1 <?xml version="1.0" encoding="utf-8"?> |
2 <!-- This Source Code Form is subject to the terms of the Mozilla Public | 2 <!-- This Source Code Form is subject to the terms of the Mozilla Public |
3 - License, v. 2.0. If a copy of the MPL was not distributed with this | 3 - License, v. 2.0. If a copy of the MPL was not distributed with this |
4 - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> | 4 - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> |
5 | 5 |
6 <merge xmlns:android="http://schemas.android.com/apk/res/android"> | 6 <merge xmlns:android="http://schemas.android.com/apk/res/android"> |
7 | 7 |
8 <!-- Note: any layout parameters setting the right edge of | 8 <!-- Note: any layout parameters setting the right edge of |
9 this View should be matched in the url_bar_translating_edge. --> | 9 this View should be matched in the url_bar_translating_edge. --> |
10 <ImageView android:id="@+id/url_bar_entry" | 10 <ImageView android:id="@+id/url_bar_entry" |
(...skipping 26 matching lines...) Expand all Loading... |
37 android:scaleType="fitXY"/> | 37 android:scaleType="fitXY"/> |
38 | 38 |
39 <org.mozilla.gecko.toolbar.ShapedButtonFrameLayout | 39 <org.mozilla.gecko.toolbar.ShapedButtonFrameLayout |
40 android:id="@+id/menu" | 40 android:id="@+id/menu" |
41 style="@style/UrlBar.ImageButton" | 41 style="@style/UrlBar.ImageButton" |
42 android:layout_alignParentRight="true" | 42 android:layout_alignParentRight="true" |
43 android:contentDescription="@string/menu" | 43 android:contentDescription="@string/menu" |
44 android:background="@drawable/shaped_button" | 44 android:background="@drawable/shaped_button" |
45 android:visibility="gone"> | 45 android:visibility="gone"> |
46 | 46 |
| 47 <!-- Using ABB color palette. See https://issues.adblockplus.org/ticket/
3769 --> |
47 <org.mozilla.gecko.widget.themed.ThemedImageView | 48 <org.mozilla.gecko.widget.themed.ThemedImageView |
48 android:id="@+id/menu_icon" | 49 android:id="@+id/menu_icon" |
49 style="@style/UrlBar.ImageButton" | 50 style="@style/Abb.BrowserToolbar.MenuIcon" |
50 android:layout_height="@dimen/browser_toolbar_menu_icon_height" | 51 android:layout_height="@dimen/browser_toolbar_menu_icon_height" |
51 android:layout_width="wrap_content" | 52 android:layout_width="wrap_content" |
52 android:scaleType="centerInside" | 53 android:scaleType="centerInside" |
53 android:layout_gravity="center" | 54 android:layout_gravity="center" |
54 android:src="@drawable/menu" | 55 android:src="@drawable/menu"/> |
55 android:tint="@color/tabs_tray_icon_grey"/> | |
56 | 56 |
57 </org.mozilla.gecko.toolbar.ShapedButtonFrameLayout> | 57 </org.mozilla.gecko.toolbar.ShapedButtonFrameLayout> |
58 | 58 |
59 <org.mozilla.gecko.toolbar.PhoneTabsButton android:id="@+id/tabs" | 59 <org.mozilla.gecko.toolbar.PhoneTabsButton android:id="@+id/tabs" |
60 style="@style/UrlBar.ImageButton" | 60 style="@style/UrlBar.ImageButton" |
61 android:layout_width="64dip" | 61 android:layout_width="64dip" |
62 android:layout_toLeftOf="@id/menu
" | 62 android:layout_toLeftOf="@id/menu
" |
63 android:layout_alignWithParentIfM
issing="true" | 63 android:layout_alignWithParentIfM
issing="true" |
64 android:background="@drawable/sha
ped_button"/> | 64 android:background="@drawable/sha
ped_button"/> |
65 | 65 |
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
104 android:paddingRight="8dp"/> | 104 android:paddingRight="8dp"/> |
105 | 105 |
106 <org.mozilla.gecko.toolbar.ToolbarDisplayLayout android:id="@+id/display_lay
out" | 106 <org.mozilla.gecko.toolbar.ToolbarDisplayLayout android:id="@+id/display_lay
out" |
107 style="@style/UrlBar.Button" | 107 style="@style/UrlBar.Button" |
108 android:layout_alignLeft="@id/url_bar_entry" | 108 android:layout_alignLeft="@id/url_bar_entry" |
109 android:layout_alignRight="@id/url_bar_entry" | 109 android:layout_alignRight="@id/url_bar_entry" |
110 android:paddingLeft="8dip" | 110 android:paddingLeft="8dip" |
111 android:paddingRight="4dip"/> | 111 android:paddingRight="4dip"/> |
112 | 112 |
113 </merge> | 113 </merge> |
OLD | NEW |