Bug 1132165 - Remove padding from mic drawable in editing mode and add padding to url bar. r=mfinkle

The padding on the right edge had to be eyeballed - see comments.

--HG--
extra : rebase_source : 071845a461e928c85a61ec8384b40d001edff9bd
This commit is contained in:
Michael Comella 2015-02-12 09:22:59 -08:00
parent 4337afe919
commit 9fa6337f8a
5 changed files with 7 additions and 0 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 874 B

After

Width:  |  Height:  |  Size: 514 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 524 B

After

Width:  |  Height:  |  Size: 337 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 578 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.8 KiB

After

Width:  |  Height:  |  Size: 856 B

View File

@ -6,6 +6,11 @@
<merge xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:gecko="http://schemas.android.com/apk/res-auto">
<!-- Overall, we want 12dp of padding from mic to the right edge of the toolbar.
However, setting a value of 12dp (using the padding from the parent container)
does not match drawablePadding=12dp. Part of this is the url_bar_entry drawable
overlaps the EditText, but I can't figure out the rest. Thus eyeballing for
paddingRight. -->
<org.mozilla.gecko.toolbar.ToolbarEditText
android:id="@+id/url_edit_text"
style="@style/UrlBar.Title"
@ -17,6 +22,8 @@
android:selectAllOnFocus="true"
android:contentDescription="@string/url_bar_default_text"
android:drawableRight="@drawable/ab_mic"
android:drawablePadding="12dp"
android:paddingRight="8dp"
gecko:autoUpdateTheme="false"/>
</merge>