From 7661614383dc17d69a9b1fd819e4d610896d5205 Mon Sep 17 00:00:00 2001 From: Sunny Goyal Date: Tue, 26 Aug 2014 10:54:08 -0700 Subject: [PATCH] Updating Clings UI issue: 16127412 Change-Id: Ie5885cabbef086e3b08811da72af88d01c4405e7 --- res/drawable-hdpi/cling_bg.9.png | Bin 0 -> 1352 bytes res/drawable-mdpi/cling_bg.9.png | Bin 0 -> 987 bytes res/drawable-xhdpi/cling_bg.9.png | Bin 0 -> 1829 bytes res/drawable-xxhdpi/cling_bg.9.png | Bin 0 -> 2936 bytes res/layout-land/longpress_cling.xml | 24 ++-- res/layout-land/migration_cling.xml | 12 +- res/layout-port/longpress_cling.xml | 15 +-- res/layout-port/migration_cling.xml | 8 +- res/layout-sw600dp-port/longpress_cling.xml | 25 ++-- res/layout-sw720dp/longpress_cling.xml | 22 ---- res/layout/longpress_cling_content.xml | 14 ++- .../longpress_cling_welcome_content.xml | 21 +++- res/values/attrs.xml | 7 -- .../android/launcher3/BorderCropDrawable.java | 90 +++++++++++++ .../android/launcher3/ClearCircleLayout.java | 118 ------------------ src/com/android/launcher3/Launcher.java | 2 +- src/com/android/launcher3/LauncherClings.java | 34 ++--- 17 files changed, 171 insertions(+), 221 deletions(-) create mode 100644 res/drawable-hdpi/cling_bg.9.png create mode 100644 res/drawable-mdpi/cling_bg.9.png create mode 100644 res/drawable-xhdpi/cling_bg.9.png create mode 100644 res/drawable-xxhdpi/cling_bg.9.png delete mode 100644 res/layout-sw720dp/longpress_cling.xml create mode 100644 src/com/android/launcher3/BorderCropDrawable.java delete mode 100644 src/com/android/launcher3/ClearCircleLayout.java diff --git a/res/drawable-hdpi/cling_bg.9.png b/res/drawable-hdpi/cling_bg.9.png new file mode 100644 index 0000000000000000000000000000000000000000..e173ba5952a290332465abe9d009df12658e103a GIT binary patch literal 1352 zcmV-O1-JT%P)PbXFRCt{2n@w{RMHqmenb{B(wPe4B z1xm225|kXg=+Uw$E^_kZiL0Fb0saK#!%~m_0ZS_)m0%1gUm@&5fK(Eq2qB_^gc7q~ zfn;}H4>Qe9l9^;yv$JIFr>bkFHZwatPx|fd>3s(gp-IFm>yhWABMwVs1>LY;iV0Xi!rQ76cJ6vZ38{Of1}u2{jyfn2aH1>d z*^LPf?B7Aoeh16yLBvADz;R3fMApBgTKxfc?-l6nFL3*h3h)q^10LZDb6|OEP%X&f zg9AHwdHWG8YY(s?#;V7OgX8?o^zWbZ*%x0?oht!lKnbe@Vg{V(irTt)FP8N-oht~y z#59v^$-c+#o!fwCfTw{j+{WS^w3tSJ)Rou;JQY`M+e)Gd@Sx^Wvt7jEBc5YmzW z45TAE=4J>Q(G6JMk~9HmNex0HM@x!;mJ|UkDFRwj1hk|GXh{*!k|JQDmo!&JEu?8y zK!;ldw4?}VNfFSJBA_KjKud~%mJ|UkDFRwj1hk|Ep^s-;QUt;z3C92F!B?bebxztVbb5NmPB&W1>h>TfZ!SS^W9LPi0=*Iznob zjb-g3zG;R-shsEd$%CBD-$bMglxXA{`6UG1gSy9MMEOszG(7s#mEEm~aAmAS&MuHi z*;v-Av|f}$u{6Z-9}aTr{4apyvzGZ$|7`k*xx1g#%^#Of~kv4)_Qwjf2^ zGh#u2s}pl%QU&aE(rZyGKf;J7=pi%j(z_L`OCL(<+MD+{IpM!2#iitNhL2~r&A%K>dcmYT`8*Q(f=izGKyG0o=@XNFSc8wO8(%Gttg zZ@EJW@~;}kLc4R5)Y_E=nDp%G=8e~r%+Gf*JW}SyE%nsC;48~s+KZ!-?I!H)OjS3v zDCQ8dlo3Y-pA^DgU0u&_k83m>eE=(75ai|`NS-cuc;z`F1N0000< KMNUMnLSTXZ7B zadW83hXg{zMU@azIUxQ77bJcH5{Di+^xP{F1p;al2{n#6RPYPnf&@mQg{Ghue>AEZ zhdTbCWNl}6riZa>*Rh-UBkd;gBdxshzM6TTov)o;wALJe0|gxt2dZ0)c>Q_PSE^s4 zvU#oZ@B_MesE%`BZ-N4lSeE3SbJN5kCvj>P^?CrMUaX7|uwAb6_dgD<+W;ECE=Gz# zcQ}@1@#!aTF&F+ADHhRMpph?jm^5*{0@?g3OW*!Ty-@-F!wBiUBJaODO(cAQK;Q%X z)1?fy4X>P8;EmUE{QhSar~@wG$&N5H7G63%gOmyUCegySPZN(W0Moz}CQmK9!URe^ z_uPhH&qUNM(h53q^b$FeOho*~u@dpYN;f*KXR0I5vFcjKf{BRVn27j|ULr?wUFjCl zNZ&V7&wabx6OhSQQR=s5px@9mcC&15-3J_++gw0&Z*?_4{p@i5?Muu@3JAG~RuZjc zM~4$g8N#*`2&TrKs#1?|YU@A^DLsT}-%!^ra5sCM+jnw66|>bdD*26XNd52~jYg4R(80EMpJevvf0xaz z2A*;;t>MwFkGgx# zs>4=p3cPX4;Z!V5EIK>1jHjyP?tR5dYPBg*#`Z{d zLogpKUD^xX*f{K0L89xo@5(%3f=>}zYlP@KRQ%STdnT&2<}q`>b%jjlLw^7O002ov JPDHLkV1gqd$S(i@ literal 0 HcmV?d00001 diff --git a/res/drawable-xhdpi/cling_bg.9.png b/res/drawable-xhdpi/cling_bg.9.png new file mode 100644 index 0000000000000000000000000000000000000000..4db356f258de1fa5a61f97358c124d920f71468a GIT binary patch literal 1829 zcmaKtX*Amj7l;3eAaR)K+^N zwM>Vk=!jZFF||~yLR!O6ds{K)`+MGd&hI|wIp>~xKi(93lC^}WvM2xm62uF5$0K?l z#Q`dG)VpKYl1G4qSrW<6ql$t0CLg&-$OYFh01!+0FCer2fd&8&>LcQDKEvyz#rZw)(~t{HQf+uNC9y#*tShi}X-G}K+@&44$Z0-iK=#dDP7Bv% z7&&ul$5y`{qRW=Od{32Icj+pC+PT)a69P5*WnbBLjjJDCR#IuUt)F=S&zqQO zR&mw4^B&&V{$@K?vUzvisB!KTD2x@X?=iwra~BJTv>o({k-5~#<()s6s`nbYxjw{q0R03F2q}NOEh?#^Cmt+@XiDRS7t?^S!mv>@x(QV znhuS0YTg|deDuU!ESt#T5EN3=>1 zQWR14Lj4-|e`FMX!$bdQ-QzrJh*0@Q(gr3sTb6{XubD!NeDwow=QJv|cWBn`LKI9EwvF^l2{h}fGzm+ql#zd$i{|C89FjH`caDcg z+yd#O5CWbsziYDyZ{Rum>Y4Ypm1J|ASgWB9S}z8wMrk>HH&sW%H@?+fjY4mOGZ}(f z2S5C@RAP-iwpZ(28M$kX%a0|v9cz%Jr)tu_D9_~m)yir`<#D}TIeF@PGjdLsE|n~= z1XGsUI5HH-;3qL?^@vT4p8D_UmgqDlatmWBCDt4QPc!qd-TcA$XKZd;bQRSdamb|) zB*HP@&UAE(<23Z8eV43L26!(2M4YcI56cY9tc7_L;%?rFXN9)!HATM%GwEE{L$=|H z>Rs_ZrJ7CStBEV55UrPWx?ajmr4DC(#@^|-4xQo5Po6IKUOjMFw$Vl@M}FK^E~n+o zYhAPApBinu{fHcj%xq|by38&*Mk)wrQk>-tFP^|=gpzY)^u&ysp5CoBU-TsU)l^kY zFDP+jRHQCa*Y~);l*D&=%LI<2cl^UK4&kqDtqi0>*LnGiUo{p4@d~0(oiR7aUFGkQ zp&C7J+oiUp!NVEH`YY}ePmXbuN3E$kCzXcQ7FZmE-v;eq&_|Vy*w>)8RPQ~x1)B}RX(K9>ugaKG;T7(u|6xAfs$1UvN&%{ zfMy4nSg^a0n*DNQ&H8ezNXYeWlz$y+&q4!IOpJ+K29wF8s!y-A3J zLJA^67(p%a4~h|fdH)<8A9opywG#n3))JXc6<>JBilU{jd!!w>IjKz1?09VkFnSG4 z)jS~OBg^S-|D6qr(Tt{L60C4-(8l!ZNMITVen@cF%_1IN(ssB;eK?-(`R-Lo*@&eR z>JGzw30=fwbF(AL?xErg z7G{&+pC#rQtpSoV6ktThh#5j-Hg=A5^=R$~SVnYvgI?$lw-rUQm+0^Jy?tCw?SAGA zIn6kQN6d{h<=cqU2g3p{7q411?cY!WrAB4}6R|_6nAnGim^$L#-KN%-G)PU?QuypS zyutH8TMMGS?(QcWk427`p`y4@;wvx1xA(bGs(H>+pA(c~4MtLR-fm*}0*urEv80w~ RkwqGV>6oU~4Lza-Sj3o@&vP7m3S(1k) zLS-kBL6#)KgD1+`J3Z(9=l$b-&w1~;-}}Ay-0%Hi9^&Ls$sQxEh;s40rG~of($GB0v33oMZJmr?tZ&_m^c+~d znIS|z3}{~}oj$$<*9Hr7)scoi6($NPl1<{ruhY(RS~tg!zu7{+1!6JW zvSAV2jd^$a;UDrkFBTMGi7M7*JZ`XX%W5v?;6f6T}q&5zo<#Q;mNpmvKg+E7IzX zl?kG<$+YD{wf|~otG_rsqw{V$uG|I62{mASQA1Zh%_GS&aN2l)cALj-iLmzr$s@YE z9qiFfRYtY2cV;aPS9d(=NoaHmk$ODF6S!8AmHi{CsKYGk;9_R#%S#A?P)cL0N*BQl zK+i?6z1Rfr9-L319Eu*^k-UmD7ZZ)ATt!?vETE5C>#7k4P`|EVqa_ zsTp>64muQL{odsXALk+ihq^6{<=>v2$T&VF?i}X_dRUQ|icYm?`YxFPb>%W8B4-zz zZ>M-H_`jMM#vkBb&y+lo;I_kk$MB6-jn@;wJ>E z{U=^L2F%7K0-Ncu_nN`z>q|z5gZ7_XFSPzl$=tq7Ea;Ag@`G_NVX{Dh z3yvP?FqF}M1=xBo zG}pGihl_B#!Qp&+8x-FGLOah?4eG6O!eQ||BY6zDlUyM6stKe8=9Y~4^~wQaS&_54 zxib|*^5IGvVe8Ih9JnS<_e9e?Rd!}s*d~2x zp&VF#B|UQ})F`%2XsGK<>G36)a!Sve+C#xI_o$BIegC<|1i5qv!H)vj$cD$FLAx`> z^M^ypKd^r-`_czzG!yhW%$S;!V7{78D;Fpi+N(<%Nd2YguWEHyU;P+75Zm6?)!Uw|x0$^>Bj`SoQ8 zOumITi?4nfoI^6J2mI2yyj9~7+}FW_XBoxCY*uUZim>gepXb*?AjIky~sqsdO>Ku2SJ{$YlV$I962O~5}?7Rk? zG!)aXrU#_G}T7Qkk;S%Tt~5l1|NMk z7*Kyc*~-$(B(eOanM!6`wEUgs^j`l5fqe!iaZfO`R0Wc0`3v8_J+w&|wN(tP4wPH| zB-gzS3u<^+r#ptn*u#6ulcs-W^o2RJgmBAiwz3N>LKv6aV4jZ!7h+^bJ4YgSgxv6j z?%qKVokBt?iqE?6RX_zl^&P@E3tJOI3tlFsKE-(~eBf3ny-EMRsut9gTGCR*owUV1 zkI3}IPBbzyFO^;}WzAD0O(8pEAhQ>yEf7=|2&UTN>64 z5*KF_x1w~o@c%6BNvX*5lsWOw%r8uYDiBw@9M5T!Lpro->p8(74QvAVO!703s zO#`N6yu0MaEu7b2$*&a?Dp-)ASCXup@zm&8D8~MF>HLqQu@$tXUP{2ts6T+z8LMwr4z4vEw3e{eTP&hXeza#L$3_t#~(fsv7a;!P{2)SdkW;f-DTA0N=^ zp{BO0Otf_YmZMTU=d`SB1UA1$NkV&*Q_-=FA}qhHKu|D@s`ibhC(91 z=lk2NMHn(X?tJ$wqv&2yhr&g*iI6Wr=J68-xwvW^Q;>`+1FwIL{QY(1d2-H|J6E#~ zT@@=_MaL#&TqUblJLb7*j!w0dqX1(J%;1DGHz>e)w!5ndl8*7 zW2pPI*% zU==5slVg(Nfjnuo8S8jyS94?Qx?NL{6X|3Xh74Mgr?W_tX^y7{Zr3p4+s-MboF?A1 zM$mUvHS2+`7YAB(Z43M17YSuK()EOIEt=%chry(?&SI4n667hL)6L1DnmRR_1OQhW zh|*ZoJ8|qkJCNv7a7(%A{4;TN-V-{k;-LeYNBnXs$Qo;)XOH=H1{q>Zftt%MvHt@1 C>pHIh literal 0 HcmV?d00001 diff --git a/res/layout-land/longpress_cling.xml b/res/layout-land/longpress_cling.xml index ffae0bead6..d1b30a8223 100644 --- a/res/layout-land/longpress_cling.xml +++ b/res/layout-land/longpress_cling.xml @@ -1,22 +1,26 @@ - + android:layout_height="match_parent" + android:orientation="vertical" > - + android:layout_height="0dp" + android:layout_weight="1" /> + android:layout_gravity="center_horizontal" + android:background="@drawable/cling_bg" /> - \ No newline at end of file + + + \ No newline at end of file diff --git a/res/layout-land/migration_cling.xml b/res/layout-land/migration_cling.xml index cc446fb68a..4765524f34 100644 --- a/res/layout-land/migration_cling.xml +++ b/res/layout-land/migration_cling.xml @@ -58,7 +58,7 @@ @@ -68,7 +68,7 @@ android:layout_height="wrap_content" android:paddingBottom="24dp" android:text="@string/migration_cling_description" - android:textColor="#E1000000" + android:textColor="#99000000" android:textSize="16sp" />