author | Lucas Rocha <lucasr@mozilla.com> |
Mon, 18 Aug 2014 10:40:08 +0100 | |
changeset 200059 | 23edbe5bd37d20033ee6b866227ba43adf14e0ef |
parent 200058 | 24971218ad39a62176ba5c93cdd5916e67a21641 |
child 200060 | 7bba7a71eadf2aa0af13f8d4d4a1c9b5d0f89b76 |
push id | 27331 |
push user | emorley@mozilla.com |
push date | Mon, 18 Aug 2014 14:13:33 +0000 |
treeherder | mozilla-central@1338cfd64cc6 [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | margaret |
bugs | 1054264 |
milestone | 34.0a1 |
first release with | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
last release without | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
--- a/mobile/android/base/resources/layout-large-v11/browser_toolbar.xml +++ b/mobile/android/base/resources/layout-large-v11/browser_toolbar.xml @@ -111,14 +111,15 @@ <!-- We draw after the menu items so when they are hidden, the cancel button, which is thus drawn on top, may be pressed. --> <org.mozilla.gecko.widget.ThemedImageView android:id="@+id/edit_cancel" style="@style/UrlBar.ImageButton.Icon" android:layout_alignParentRight="true" android:src="@drawable/close_edit_mode_selector" + android:background="@drawable/action_bar_button" android:paddingLeft="2dp" android:paddingRight="2dp" android:contentDescription="@string/edit_mode_cancel" android:visibility="gone"/> </merge>
--- a/mobile/android/base/resources/layout/browser_toolbar.xml +++ b/mobile/android/base/resources/layout/browser_toolbar.xml @@ -93,16 +93,17 @@ <!-- Note that the edit components are invisible so that the views depending on their location can properly layout. --> <org.mozilla.gecko.widget.ThemedImageView android:id="@+id/edit_cancel" style="@style/UrlBar.ImageButton.Icon" android:layout_alignParentRight="true" android:src="@drawable/close_edit_mode_selector" android:contentDescription="@string/edit_mode_cancel" + android:background="@drawable/action_bar_button" android:visibility="invisible"/> <!-- The space to the left of the cancel button would be larger than the right because the url bar drawable contains some whitespace, so we compensate by removing some padding from the right (value determined through experimentation). --> <org.mozilla.gecko.toolbar.ToolbarEditLayout android:id="@+id/edit_layout" style="@style/UrlBar.Button" android:layout_alignLeft="@id/url_bar_entry"