From f7e11e908090bd4f8ed1da4d6feb21e57e8bd9e0 Mon Sep 17 00:00:00 2001 From: Winson Chung Date: Thu, 10 Oct 2013 16:28:52 -0700 Subject: [PATCH] Fixing RTL issues with Clings. (Bug 11008488) Change-Id: I78f891eabab53d6ded18f7c843504219d71e2883 --- res/drawable-hdpi/cling.9.png | Bin 365 -> 284 bytes res/drawable-hdpi/cling_button.9.png | Bin 416 -> 450 bytes res/drawable-hdpi/cling_button_pressed.9.png | Bin 407 -> 453 bytes res/drawable-mdpi/cling.9.png | Bin 269 -> 236 bytes res/drawable-mdpi/cling_button.9.png | Bin 355 -> 356 bytes res/drawable-mdpi/cling_button_pressed.9.png | Bin 334 -> 352 bytes res/drawable-xhdpi/cling.9.png | Bin 406 -> 327 bytes res/drawable-xhdpi/cling_button.9.png | Bin 484 -> 558 bytes res/drawable-xhdpi/cling_button_pressed.9.png | Bin 466 -> 558 bytes res/drawable-xxhdpi/cling.9.png | Bin 1242 -> 1279 bytes res/drawable-xxhdpi/cling_button.9.png | Bin 1225 -> 1597 bytes .../cling_button_pressed.9.png | Bin 1225 -> 1580 bytes res/drawable/cling_arrow_end.xml | 19 ++++++++++++++ res/drawable/cling_arrow_start.xml | 19 ++++++++++++++ res/layout-port/first_run_cling.xml | 17 ++++++++----- res/layout-port/workspace_cling.xml | 14 +++++----- res/values/strings.xml | 24 +++++++++--------- 17 files changed, 68 insertions(+), 25 deletions(-) create mode 100644 res/drawable/cling_arrow_end.xml create mode 100644 res/drawable/cling_arrow_start.xml diff --git a/res/drawable-hdpi/cling.9.png b/res/drawable-hdpi/cling.9.png index 42a889fb10f80cb900d481367feffb0b3b3f344b..36fbfc8b6d22feb77641930ec977a878f9dab41d 100644 GIT binary patch delta 220 zcmV<203-kH0-OSnNPhsnNkl`<{H?-9bc95ZPGU4~RgKMEtS398J=} zIL>;}OuMPxS|b49m_()BXMXF9O4Wa2py2uTK@QH* z5FP_LI0gXJRJCRtlWXLnp%U)tkU+;(Nse?|R@km9T^1sNcKt+mTUMAOzE=zG&h6oK z(@b`a=9t7)(SN&`U@h0o0F=10T`5v=Wf5Wyy|VQHzYU@KVY zYuE@rh%XUHz(`0o^K*}FKqnHIkzJgx+TzUKj|+QuxvP*CZe6P+Hza=#6$*v#M4!Ox zw;6_&I;yog2XLIx;ll~v*Pfpb7biaks@O^Ec>v;Oqj)96D1XNwPyn>TLWpM@cn4s$ zmtONG47ZX7Qw}D$PrDC9EdT%j delta 352 zcmV-m0iXWD1E2$tNq<5~L_t(&f$f>kO2jY_hkr@xpL)AG!pJb3ZY^wP=Fu=7Dq8Iq3~7{~-f1V-rJ;yIAlPY^Z-<=S}8 zs`%w|d7aH{tejE(Ap*wxrn(qyKV6OEsx2mRO6H5hvZjZ6MSrJ0n}7oFQQCC=v$zA0 zw#7Il)0qVkfrzo`wV(i$OJLejE~lhjt*40+{z{IHrmfdv(vuJ*DFn$NGAWX5h$I&x z$%ROAA(C8(Bo`vdg@)fJ3=6?za`0$$3pRL|L$P4YG|h#wmH3=q4+w{C!$<4mf+G6pjvd^W$X4Y3Y=_Js(XTU%&3( yitor;>qiiPF$O2eUUPGnOuStp2pdTVpYp%77;JIWC(f<_0000A5Td3+ zbSa>wdp?b{J1Z|CE%IYciO*IPr3uj| z@b>u?MThpSp%VZH86DmN%S+|u%O@y!VB7&c-rP$=}0c z6U6JSklY%i4U(4Zb5noG{7WpK;!%$Bg7?qM#=;OmKmFt)vZ84Il}e17-T6_Fu;BDvl-6%mz>muGdx j8jAA&Nc~#L@>Bj3N?(Ak$=P{m00000NkvXXu0mjf1|Y6l delta 343 zcmV-d0jU1P1D6AkNq;#>L_t(&f$f>UPQx$|hkv#LRSKw3S~0co05Br4@)*1v&x6Fu zz*t2cBK`!a3Ak+>9|H?Rj1ZiwSiMimlwX|BH=N`%hzN|(w})pzUOz$D9+dCJeO9Jf zVXmI5b?OZo-o zxe!S%M3M`QutyjcqN!x((fDCN&=sPoWakk{E<}WVI9PRby$Ag~rMZA(1r=$EKd%Y=2laO;^1OX_m pF&^~o`DB;}`-vcIB{5vee*)zVW{kI5yx{-<002ovPDHLkV1lWZnEL<# diff --git a/res/drawable-mdpi/cling.9.png b/res/drawable-mdpi/cling.9.png index f6f730d8693c6d83a97130e639660ba59d4eb50e..4c0f139eeb5a82c9da5bd0e5b6db8ec5b57509ba 100644 GIT binary patch delta 171 zcmV;c095~t0_*{hNq>$>L_t(2k&V&84T3-rh2alkD8V+YKn_}fP1pgJfgRX{1?WK= zuns$r3m#mQEG+VpxlG+<|ik<`Szt_Vm_wV@3_IS*tswQ6VBH z1%UF}=GDX7kjr;Kb@x`-<^W&-pl-tOFm>Z?UwC)Z@Q^W~<3*-omcYM)EH~_d@K9boEZJNA&_GLk+ zep>$pCI)|ZR()<2UOm2+lQGR3^udxm_$OmT_(5PE%wn zscFrjn*(@RpLhL@%7H{RDYA7$wNT;c1tZ}@O<`A q0{b<>0Q}Rg0000CH>n@@f8R%FVDJbdFajg+p8$i_{fk6s72$IOgDL`j zE4h4xh6u((OKzB9h%CF+L^ZLd&()Wzw#GSM7{FDQD%r>^qUG~>vK9|d6Zxu^wHo2O p;+lrN_O#n>*c@R-c~$5S=?-veV5xMz7ZLyf002ovPDHLkV1jm^kS+iK diff --git a/res/drawable-mdpi/cling_button_pressed.9.png b/res/drawable-mdpi/cling_button_pressed.9.png index c60837d2a8e6fa110d3cbe33fe347b874f9c286f..986e669443f1ebf317b90c08ce0c1dadbcbbfe9a 100644 GIT binary patch delta 289 zcmV++0p9-30^kCWNPhtWNkl3dru)-WU#C(zRSoLwU?0_v3VSE$3I7>uTG)7pQ5c0$cqYO|qe3ekhCZ^v!bXY0 zzs9xSp)i{Y%c&cyun4nv$Nki{_$gi@u~RzLa?kA?W~!2o1o;s&`W}m!%x?8AS2L*~M&{X57&! zJm|V&;SZCg-xsgBs|XKln%?+^3-ok^EaNmfun+)fsqn~h2Y(Pe1eogx2}eltTzN~1 zu&pl_pO<$!?Ub+n9HxcFJG4S8w8B3T8a?-a(xGw)e_Lo2D{LF``wpd)t&HS|2vSNV zSB9uQDa83&&_bx2>)<+sj(e_9^3Pxu%#!Us4(aKlH3&~8Be4#=M5l(O8m50p@1KZW Vg{~;=?*IS*00>D%PDHLkV1k+~d?)|_ diff --git a/res/drawable-xhdpi/cling.9.png b/res/drawable-xhdpi/cling.9.png index 9cc03c92c6056e0ce00a09a843acbb54e4a31830..1cb468159f14f2faff28741a7a81c67c762dbef2 100644 GIT binary patch delta 264 zcmV+j0r&ov1IGf8NPht7NklXRd$^K delta 343 zcmV-d0jU1R0+s`iNPhu1Nkl9ERa{rUjZBx@lc81UGO6SrIP5(hG1P zF5r?wXw*dG5m@)bbARQKd$t;@u^7NagnZX#t4lx_+_hDlY`9qv! z-CLdZ^km*2#WSWK3%0#e2&k4Nt*At;>JHkfGCV$VF99O}#(zoHy?;s1uO3o0PO@Eg z@FS7$&}n%3RC#Bi?_9V5ch70><|$S2p6Ie1*N>@MKo7tL&~NkpzD-y2nq=t7ybmA& zM)9mLnkTm;!1R4#4bCkIJN!R?NN!1s=2|3n3$MWk$^V4K)~P+=gG7Se%0jHb)r!61 zL0Nvot*~SbZcr{Q37`UZ5cy8wPZIeKDsTs1aJ%jeJ13qFeWwuGX?VI__l7|6t0^c; pnqi4ruyHjRV-P}EJui$g;uCW&dwO|njg9~S002ovPDHLkV1kplohkqT diff --git a/res/drawable-xhdpi/cling_button.9.png b/res/drawable-xhdpi/cling_button.9.png index 1c93bc41febfa19664d903d599ab2c8b9e4f1928..4192563b509f8810c923f3f2b307023b83a70345 100644 GIT binary patch delta 495 zcmaFDypCmpXZ;0F7srr{#<#OK=G`_BX!~y+#hIfXcgx*iLivj8Jd#azPV*HbqkeGm zRJ`2HB59OTdVk^j3rZcr(HmXvm7Wq>u&^g;+R1y{IW0QBH!Af{(l}Ii!Tk7@tmI$Y zEDsy-C?(iwCaozY~(dVcSpMM`cUjDRdBX{1O9-E8iX*DaGH5X9&aTwk$^SRsc)hR7xgsmrizme8i%cj4}=NWmJ`_^C_V z6gIwC5fN&)e!;K9`KJmEEmF&l0zE6lnPK|s>*SWK%?uZ{#N_XLf87-KE6bRj>BT~G z#b^KWg6{H(YKHz{D)@Zw;zuK~`!DwGnsax8mjt6lW|beeMnihi_C0g!>{e(L_t(&f$iJRNV2`zG%2N&ijP7A zPoFc}AJ5wlMQM!*j@Qb2#%11c-PX?F;-u-8&1Rv+UMKVRaDVD=iIA`F690z?7*2gb zH17c@mdysk?%qr5f!uj?9CNf!bs~Z#;CWQxWds|V4~Bi09st0+fqS8)7=*>Hts)ra zx9GNuv3P@5VQRgSh%`(XPBkpq9n&yzG)x)|lSad&(J*N=Od1W7M#H4hFlmww+oG>T z*C**6OH$Hdaesf!t4Y#3mLv_6M#H4hFkvXwuw-{k!^8=n%yAAN0+9hI-W@alJ~8{1 zj^~8WQVqWVvM`M%tRdJ)NBf*-IM49q4D74md@$_#{K$QbXT^PggsKWJSf?z@aMf)U z`9ag&gl0pFo#p!jGN$+VHnDND0Ba07hr90dcyAE-QXZ62N^OZ${}}fJ_ZNJV+Ofj^ P00000NkvXXu0mjf@g~b_ diff --git a/res/drawable-xhdpi/cling_button_pressed.9.png b/res/drawable-xhdpi/cling_button_pressed.9.png index b5d4aaea51e427330e2dab7a6313d06acf899373..d3ce46977d68db103df42b72bd385e06e5dbbe66 100644 GIT binary patch delta 495 zcmV_+cWQVg@iz4LL0}K;r(`z#>xCMvK?CvVKemEYueD~ z8e@#f+e+t?uRniL!8ByT006f|x31LKm2PJ<{*^t);Y6X2MRRF#6@9KfGtJf{wNEnIe0RJ22o0{3Ve$iue{S!}A;l1CJ;G_F_{6L@rXva(SlFNmAx?ICF*MG2VSIokaV_~VWu+&&sYAh@@7M2ZA8OdLzsYg+}qim#>TI7Ep~SOokYSA!2YV+v_JtoFuUoui<52G lcYE?k_@Wr~3_2#smNW002ovPDHLkV1lWW`BMM@ delta 403 zcmV;E0c`%R1kwYLNq=-nL_t(&f$iH*O9DX{$MN4Yn*}XNh#7_*iq0K+Bfi$&O2>%0 zwYm}1h~>YXr-RXo^*b52h?a({b0RTW zm@=GdSh6c-Vd_|zHWsFhg=u49+E|!27N(7bX=7p9BptR#KZ$Nn(kqsvq{AZromY>f zS1d^urj3PZV}D`FP^w|cu9$_XBc99&AuM;v&PCrXGXR9J);D7@>}&K1PzKj%z!4$V z(Z0YyU`CkFfUxpJAAmK&?ylO^`)E=;4?Yk=*vcd~<($KH_q1r`M`D>6cG*5DiKzcl x`V5i7$T_r|$5pSDmr*BTj4@_!r21go4||4k1a~WI!3+QZ002ovPDHLkV1i!6!z=&* diff --git a/res/drawable-xxhdpi/cling.9.png b/res/drawable-xxhdpi/cling.9.png index 3dcf121300812d20fca5523106e45e97f763bf9f..7beae03bf43c803a5697d4eddb5d965903f03dbb 100644 GIT binary patch delta 535 zcmcb``JZ!wBnKM<14D6D)t8Nme;E~AoJ`GJjSMWDos3M(EDQ}T3@nUYoeW%!4UL^G zjf^cP+cC)~n3y>kTN<01895p`8ydPAJDIzgx*9l|xEeV+IlDQVOs+yGGR3KA8&i_J zg|mgLnTe69vAK}}*g7L4M^^(^Q%grz+mgq>8v>{S0#p}B>Dfl=4f#WAGf zR#J)r|DWTE=R8(9Mwl+isaeXpsNsfihiK!BxjyaxSRPe7>|ySBe&(b2?zVS=ZYJF~ z8$#p-(wPi}nM)7aE6n3P((2G&bG(4z%BQssZw@&`Z{Qc%~KGud1bf5nKKUc@*l)IzBVo_U=?H1EZH)LF-!b}Uxm}>ga!5=9LgFlF<3Zo z-ek;Se!yVHCiSFr(!mwXGd_gqEDkhy)iCif!?BAR5~U0Rf20_8?^m#XaF4;_f#N3S zGM)zJZwl54dRrEH=re4}=DWkV;F{)yS)T6fXIgG`PU7ZDJm}Qk=c(vs=H2owWKUy- z))r~k+z<12aQV Xt;@-y3r@2GlK_LKtDnm{r-UW|2q(PG delta 498 zcmey*d5d#`BnLAC1B1(wu45Y&|1v5#o4S~}S~!|Ix)~XmSr{5x7+4s)x;nZTo0zzm znVFbRwque}aI`dXax!#tGPE=?G&FQIb~1BzbTV-@cd~GHb91vWom_=b$|=apAJ_Z)rSd+bBqzIRVQ z{aJkRQ^w}kzyAEo-ugOy^Q-JFuWR?c{r~^}RI7%kK;xuJg8YJkTQTpK0wN9}3IZYm97SADI2zuF9;jp7_d)gL zecNSh$CkRCQ@U{F!mA@UW~X;gR*SLqi8O4@Pf!24b5BpsT^0!jK_0H#i9Oqo10BWS M>FVdQ&MBb@0A4fI<^TWy diff --git a/res/drawable-xxhdpi/cling_button.9.png b/res/drawable-xxhdpi/cling_button.9.png index 4f68a03ffb651853cf12b3b2c85a0ae4c8409115..e41287613ea8ee96f697ba22b224519a49abba56 100644 GIT binary patch delta 854 zcmX@fxtC{xBnKM<1H11k|1v7LIGLKc8W~tPI~kdnSr{5x7+4s)IvKbc8yY)X z8W~$owquf&H*+$!G&XfKax`)_G;}p~GIuj|HE=X>HF9)vc5^nFTm@HSiBrusrX+a_ zXA4&|6C+b&b0Y(=WkyDht_H5AmX5~G29`#X&6#BhJE(-&seX!N@o5GIrfg3a$B>F! zZ|?5R6Lu6h@bTu>xeX#su3oP+);sV%T&y4@<8;KhC1T^! zA9iKaZyGP*IvZQE&-S14&W^P)Wp(D8|)qwvg{* z=RU{wRhyS+HCVKZpWDBpSSI@U^q6_M;kmb)ulk-@_$AaYdM#tygRP(Td`T>o`1eG3 z&*W@)=bafP4($-<&7v z?QMb^LE*yqU>5@~PY5V{JQzU1Bm@+FP%l#Rbid<~-h(S0q9nlP_;4A#D+zmBc5U+C z_j#W(xi37uIra3kN7?@_>bag#e749^H;Vbp`seAVe=Zfd&i!$n$7Z3@Glg#q+h=q? z`?7Vbzf#q)zD+gXOrm4@+`n&6sW-SIGWkZ_iG%EgsoS)gHqGHRey zd>1zJ6i^_2^Q)4bZ!W#~5jpolDP=E*OC^T z4WD&7bNRK@MHm17{~ufSITEN@tR%=U7|6v042+i!JOQd`_jGX#skrr~{^oAJ1_d66 zK#>ouKfe91zk1~C(uKzy5AQ85-ln(KvS?Fy11k|1v7LIGLKc8W~tPI~kdnSr{5x7+4s)IvKbc8yY)X z8W~$owquf&H*>PEG&VIhax`)_G;}p~GIuj|HE=X>HF9)vc5^nFTm@HSgj3BnrX+a_ zXA4&|6C+b&b0Y(=WkBVw2Ck--j>gUgmPV7!nPmw(sD#<6J|%McD+UIpC{Gv1kcwMx z?jFn%4iq`|(Ri|_c9wTRxcRyz>mM9z4XSNyivGwM_DSn;$EuHHZXe!pMdZBsoreN*cG zb?Q<79rnsxc@=NBfB(nLCx!A@GENt7KJm0&cF*!}vtIqopTA{iaZ$9&PR7XEzfn); z>Ha>fQT^b?%YDBZmVetk{lRRdgbgptHZ|NRe)awB%C{QT36ZGjqhps-1RFBeqr6RT9 z#HYB3ctHh5fdgeZ3mGmoGB9xfISverDj-$^3y{S!fdR;35CXCU9GHMCCJzP{fdfZb zo-m&;fpF)DD=^pZeSxmnDA$PLB}8zB$O0?T_aS1b|6*6DUJ>ElAUD0auvF_-K}yVQ zp)8KA5x(vh8BR}rcrfFG`>Kl@Gh&zD>`eT%?C;x!Z2{d^zbrkODAmib_VnewfmiD- zq`p;aU(ffr7`wM5BK!BBnip0p{rako?kwEDyC`@4#kD84sQ)%Uf3No5mT&yc(egKw zbuWtAY&m}2=KY>uACi85*zd4eqS?lG-oC#k;WPWK{ntH9E00_JAV2p`WM8@PtatLK zC!MyMz@7Qd1sKf&P9AHlCvtc`E$dl=ZpG-USxPHyqmQ7cx zR-SIzc)4-yh5!HmTfbQ82-GZA666;Q + + + diff --git a/res/drawable/cling_arrow_start.xml b/res/drawable/cling_arrow_start.xml new file mode 100644 index 0000000000..ebe91830d7 --- /dev/null +++ b/res/drawable/cling_arrow_start.xml @@ -0,0 +1,19 @@ + + + + diff --git a/res/layout-port/first_run_cling.xml b/res/layout-port/first_run_cling.xml index 9baee64b70..4830e5df8d 100644 --- a/res/layout-port/first_run_cling.xml +++ b/res/layout-port/first_run_cling.xml @@ -54,11 +54,13 @@ diff --git a/res/layout-port/workspace_cling.xml b/res/layout-port/workspace_cling.xml index e61340eaed..9c000cb543 100644 --- a/res/layout-port/workspace_cling.xml +++ b/res/layout-port/workspace_cling.xml @@ -62,9 +62,9 @@ android:id="@+id/focused_hotseat_app_bubble" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_gravity="bottom|end" - android:layout_marginEnd="25dp" - android:layout_marginBottom="100dp" + android:layout_gravity="bottom|right" + android:layout_marginRight="25dp" + android:layout_marginBottom="90dp" android:orientation="vertical" android:visibility="gone"> @@ -101,7 +101,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginBottom="15dp" - android:layout_marginStart="20dp" - android:layout_gravity="bottom|start" + android:layout_marginLeft="20dp" + android:layout_gravity="bottom|left" android:onClick="dismissWorkspaceCling" /> diff --git a/res/values/strings.xml b/res/values/strings.xml index 3e2ffce608..d26a73baf9 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -230,29 +230,29 @@ s --> Widgets page %1$d of %2$d - + Welcome! - + Make yourself at home. - + - + - + Create more screens for apps and folders - + Organize your space - + Touch & hold background to manage wallpaper, widgets and settings. - + Choose some apps - + To add an app to your Home screen, touch & hold it. - + Here\'s a folder - + To create one like this, touch & hold an app, then move it over another. - + OK Error: custom workspace layout passed in but custom cling was not overwritten