| 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 xmlns:gecko="http://schemas.android.com/apk/res-auto"> | 7 xmlns:gecko="http://schemas.android.com/apk/res-auto"> |
| 8 | 8 |
| 9 <ImageView android:id="@+id/url_bar_entry" | 9 <ImageView android:id="@+id/url_bar_entry" |
| 10 android:layout_width="match_parent" | 10 android:layout_width="match_parent" |
| (...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 120 | 120 |
| 121 <org.mozilla.gecko.widget.themed.ThemedFrameLayout | 121 <org.mozilla.gecko.widget.themed.ThemedFrameLayout |
| 122 android:id="@+id/menu" | 122 android:id="@+id/menu" |
| 123 style="@style/UrlBar.ImageButton" | 123 style="@style/UrlBar.ImageButton" |
| 124 android:layout_toLeftOf="@id/menu_margin" | 124 android:layout_toLeftOf="@id/menu_margin" |
| 125 android:layout_alignWithParentIfMissing="true" | 125 android:layout_alignWithParentIfMissing="true" |
| 126 android:contentDescription="@string/menu" | 126 android:contentDescription="@string/menu" |
| 127 android:background="@drawable/browser_toolbar_action_bar_button" | 127 android:background="@drawable/browser_toolbar_action_bar_button" |
| 128 android:visibility="gone"> | 128 android:visibility="gone"> |
| 129 | 129 |
| 130 <!-- Using ABB style. See https://issues.adblockplus.org/ticket/3769 --> |
| 130 <org.mozilla.gecko.widget.themed.ThemedImageView | 131 <org.mozilla.gecko.widget.themed.ThemedImageView |
| 131 android:id="@+id/menu_icon" | 132 android:id="@+id/menu_icon" |
| 132 style="@style/UrlBar.ImageButton.BrowserToolbarColors" | 133 style="@style/Abb.BrowserToolbar.MenuIcon" |
| 133 android:layout_height="@dimen/browser_toolbar_menu_icon_height" | 134 android:layout_height="@dimen/browser_toolbar_menu_icon_height" |
| 134 android:layout_width="wrap_content" | 135 android:layout_width="wrap_content" |
| 135 android:scaleType="centerInside" | 136 android:scaleType="centerInside" |
| 136 android:src="@drawable/menu" | 137 android:src="@drawable/menu" |
| 137 android:layout_gravity="center"/> | 138 android:layout_gravity="center"/> |
| 138 | 139 |
| 139 </org.mozilla.gecko.widget.themed.ThemedFrameLayout> | 140 </org.mozilla.gecko.widget.themed.ThemedFrameLayout> |
| 140 | 141 |
| 141 <!-- We draw after the menu items so when they are hidden, the cancel button
, | 142 <!-- We draw after the menu items so when they are hidden, the cancel button
, |
| 142 which is thus drawn on top, may be pressed. --> | 143 which is thus drawn on top, may be pressed. --> |
| 143 <org.mozilla.gecko.widget.themed.ThemedImageView | 144 <org.mozilla.gecko.widget.themed.ThemedImageView |
| 144 android:id="@+id/edit_cancel" | 145 android:id="@+id/edit_cancel" |
| 145 style="@style/UrlBar.ImageButton" | 146 style="@style/UrlBar.ImageButton" |
| 146 android:layout_width="@dimen/browser_toolbar_icon_width" | 147 android:layout_width="@dimen/browser_toolbar_icon_width" |
| 147 android:layout_height="@dimen/browser_toolbar_height" | 148 android:layout_height="@dimen/browser_toolbar_height" |
| 148 android:layout_weight="0.0" | 149 android:layout_weight="0.0" |
| 149 android:layout_alignParentRight="true" | 150 android:layout_alignParentRight="true" |
| 150 android:src="@drawable/close_edit_mode_selector" | 151 android:src="@drawable/close_edit_mode_selector" |
| 151 android:contentDescription="@string/edit_mode_cancel" | 152 android:contentDescription="@string/edit_mode_cancel" |
| 152 android:visibility="gone"/> | 153 android:visibility="gone"/> |
| 153 | 154 |
| 154 </merge> | 155 </merge> |
| OLD | NEW |