Bug 1132165 - Remove padding from mic drawable in editing mode and add padding to url bar. r=mfinkle
authorMichael Comella <michael.l.comella@gmail.com>
Thu, 12 Feb 2015 09:22:59 -0800
changeset 256065 f85b33641ef7662ae04a510fa00803ebe67004da
parent 256064 c4265d0b3fbf7237309d6cef9ba91421b2f4fd29
child 256066 2008ce7ec4ea70a02616da1214e4baf3f47ac10a
push id4610
push userjlund@mozilla.com
push dateMon, 30 Mar 2015 18:32:55 +0000
treeherdermozilla-beta@4df54044d9ef [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmfinkle
bugs1132165
milestone38.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
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.
mobile/android/base/resources/drawable-hdpi/ab_mic.png
mobile/android/base/resources/drawable-mdpi/ab_mic.png
mobile/android/base/resources/drawable-xhdpi/ab_mic.png
mobile/android/base/resources/drawable-xxhdpi/ab_mic.png
mobile/android/base/resources/layout/toolbar_edit_layout.xml
index b74044e6c31723a909be286150e9972af515e487..302125b841150224ce85a306bc52a868d8dd215e
GIT binary patch
literal 514
zc%17D@N?(olHy`uVBq!ia0vp^Vn8g*!3-p4uFW|Gq&5clgt!9fGiT0h+qP~0{{36F
zY}vDC&(57Yf#hB=fUtM$*Z~pQ4F*8=u3ftz3}g`q31RF;0&w-nB4}#h;+TTS;Q#;s
zUmcaE0Ud2w666=mz{<`eC@dx}Ew8AgqGo1cV{7l=5fl~?8=sJol~Y(<Q(M>2-ZgLj
z;$<t=?mlww{)dlWzkUDl`_JD(<&d>NLymj8IEGX(ZoL>A%@`=s_E22&mqPOum8n<T
zjeKt1nD_tx@mI5Q%GU8M|NX%-`hC!alXFg6Ss8p_s9O;Kikqu@SCVG*%B05=j(0_#
z2y?6ZV{JcWrts#hl5=}QOubE-(n|hpz0xwV>cV~huZ1dK7cQTbyi5L@*Cmng$#FNf
z)ZhCsGuA6BzhY|1s}s_<GN0@)uHD_bM>I>jeIb|s19eZ=RVu>#=Wj{rHD0aR$26_{
zmSuf(aK!$2jj|f!=E$l=&TMLb{ol<h6|G^Ed~eeCXp(Lr&`S)Su6{1-oD!M<Xi*To
index 789eafa87033495bcac195b1708b4c6582d3db63..67e3465d8d455eaa770f2b4daf23f24d3fc869ad
GIT binary patch
literal 337
zc%17D@N?(olHy`uVBq!ia0vp^d_XMB!3-p)-#fDmNaY0hgt!9fRjXF*-@kv`wrxOi
zHyG^Lv18Y+U3>TL1+szUo;`bj+}$vM%*F&j#aPAv|Nk$xvF0bxKBbZ%zhDMt7IqGP
zIeh~&3#)*@#OmgWljrR|f9dj*r?20A{QUjL-+#QhF04S+MV>B>ArhB+``q~&9C(<0
z-{-y*i2C>6LrhFS#^Frvq7!BchO83}3X~$0^p^U*47&I8%F~sf`R8^mUcuhQnYw(n
zq~w=%E{6<xOpTtgggMXi`mkavL%l?>^oGlY9NSh0pPVyqXW7;1V$aT0E_ryZ$69|E
Z)4jR8TA!ae9st_T;OXk;vd$@?2>|Ucrdt32
index 2277ff082b1fb38b2e349a13c79a8c0253f7eda7..00fd917dbfa83c50bda0d48fe0a4d0855aea648b
GIT binary patch
literal 578
zc%17D@N?(olHy`uVBq!ia0vp^GC-`x!3-oH7;)zUslx$2A+A9B|NsBnwr$(LfB&&#
z$2M=?ymRNyBS(%vM7C_%vS-g8AY;dl9Y7K&wR`vO?c29Q7(l7Ld-nnvKyufvT|fqe
z1d0P0KoY`+lMsN+hAW1!;S9JMxCkD=P{_s)^oB!8kY6wZBRdBt7dJ1TfS|C5q>QYb
zf}*aTm5pa)R6=5Mc3xpoMPu{S>FYLb-?#tZ(c>pho;`oz;^iw3p1*kY;q&(&zyF<i
z=zke#);muZ$B>F!S0~*LI%FWhR=>7m0Y`<C>xKr6uvJr&UA?~loquZCOv8nVdqTf2
z+r0U#@2Ad#pBJli*7%oQm@(Nnf5+Ki-|+8i&YSNORu)!PS5s5-JMu_8=~wWbKbLnj
z`aOJPKehadzqf?Qyf>jg8K!;WS$rtDd}_bK1iLlb(Z)01rAI|N$DeDQXS*RXHj;mb
z0B1sJ)SR?hR{fjbjaoOTL{D+@Sg-P!kz-ZaYPJIb`erO*x|gH4AG~!qUC3gPcYVs0
zTgeUIg#~?oPMlL=)OoVfO6YKI&(Y&|=iQJgTfSiC-RVacR`M1UtL?tH`Oo2x+_e|e
VHZrC7lmLCs;OXk;vd$@?2>^>#GQ<D?
index b59c2695f260e0c7500a840befb9af084a6ad7da..55b547547913500e06a05b4ec1dee35531f7862c
GIT binary patch
literal 856
zc%17D@N?(olHy`uVBq!ia0vp^T0m^c!3-qJ<2_>-7#P(8d_r7--2eaoH#9Wt-@pIZ
zv12=T?gTQnY}vA7$BsRF_5j&HkzKoXK^S}Y?gfhP+qZA`?%hCHI0L8v$bgd&5g-Xv
zk0u3C4+IbfoP^6F8wi(z157Otup0wl6-PD@({MbXsz>S)Fr*Sog8YIR7@0UYxp@SI
zghj-pWMq|9)HSuVb@dD^tZnQaon1V=`~!nS!?N-Uib~5Ws_W_-8k?G1yZZVkO`bA$
z{=y~8S8v;~=kT%PCr)0ucI)=td-oqaef#eH$4{TXeEa_6=da&?{w-!%yA2pU4W2HJ
zAr*{ouXtX*<RHNIz`SNY_X0-OqpmD50fm7M0WpV~I5^w_#aM)2{Qs}MX5PV&87UJc
zKW%(|>F&zyMkf=cw3O3t_9aJKGS?R_^^g85@@<!~`gxnp-{;0nIvae!=+~CT=??1d
zT{<N?K@k@=dL}v_S8QdL<+8A;>e<!qUN5`&e|X8+exI|gGaU_f#wQ<oy6Tx!U0Xr#
zZ+VG=li7OTtvM>+v1b%%W{0`4InDg7))iyds=ugzLY0lk#Alm4+tzM>smgJZ*FQ7i
z#8=)WJ^I$Wc~_ph%yB?CFO1Ve^SyM{bVb!L8#~s5yi>92i*$ahVbr`N=sxH9Kgo?k
zCSFJ8HP7Yg6ct$IkW<3-aM$U}&srN99xwe-{he)_+@uR;3k`0o*t9KoJG4ls*?-L@
zg@y0zpPPD~KK9q5<wx_eNlUg1{;(~2*<ZN*>Z`uJg|RJ<o{4jPeJjRvZqF}I#?!AN
zTXqKg^|Myn+I_)t=kI^3%RjYOFTbJh<s`zc!1!OIs^=e@k#<bF&AAhuz=&t?boFyt
I=akR{02;8)GXMYp
--- a/mobile/android/base/resources/layout/toolbar_edit_layout.xml
+++ b/mobile/android/base/resources/layout/toolbar_edit_layout.xml
@@ -1,22 +1,29 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <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"
           android:layout_width="match_parent"
           android:layout_height="match_parent"
           android:layout_weight="1.0"
           android:inputType="textUri|textNoSuggestions"
           android:imeOptions="actionGo|flagNoExtractUi|flagNoFullscreen"
           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>