From f876301d0a460bec260a3c7a6ab260a06d5817ba Mon Sep 17 00:00:00 2001 From: Sunny Goyal Date: Tue, 23 Sep 2014 16:22:10 -0700 Subject: [PATCH] UI Fixes > Adding a scrim to the longpress cling Bug: 17573777 High level design asks (very low-risk) > Changing the dialog to use device default theme > Updating screenpanel assets Change-Id: Ia0216b60fd8cd607d83a5e7c3d7e6c8255125eda --- res/drawable-hdpi/screenpanel.9.png | Bin 137 -> 218 bytes res/drawable-hdpi/screenpanel_hover.9.png | Bin 137 -> 218 bytes res/drawable-mdpi/screenpanel.9.png | Bin 137 -> 222 bytes res/drawable-mdpi/screenpanel_hover.9.png | Bin 137 -> 220 bytes res/drawable-xhdpi/screenpanel.9.png | Bin 181 -> 273 bytes res/drawable-xhdpi/screenpanel_hover.9.png | Bin 180 -> 281 bytes res/drawable-xxhdpi/screenpanel.9.png | Bin 218 -> 346 bytes res/drawable-xxhdpi/screenpanel_hover.9.png | Bin 216 -> 334 bytes res/layout-land/longpress_cling.xml | 1 + res/layout-port/longpress_cling.xml | 3 ++- res/layout-sw600dp-port/longpress_cling.xml | 1 + res/values/colors.xml | 1 + src/com/android/launcher3/Launcher.java | 3 ++- 13 files changed, 7 insertions(+), 2 deletions(-) diff --git a/res/drawable-hdpi/screenpanel.9.png b/res/drawable-hdpi/screenpanel.9.png index bf806c3ecbf2902110d0d79c1ad8354c1da74c08..f7ae011626ecd293df313d11151c8a0a3987c5d8 100644 GIT binary patch delta 201 zcmeBVyu~;{vYw5Bf#JxO9BUxOQtadz!T|&|94Q?@K4*bPWHAE+cP9ulnx8zq7ARQb z>Eak-(fjtQBVUsPkHf|AChhajGWT|tC%UiURy@eM;IM%C=km8E_P*+whs}0==G!=x z=S#M${RD}RZqwAyKj7MsDkLo-7-#rNZ zsCnkmENQ*U`N|SXk2ZFAOB#N#ydM?IzK7xKP5%Gvc|lS@hcI}$`njxgN@xNAhWAie delta 119 zcmcb`*vU9SvVetwfgx}2k_|vAz|+Msq=GTof%(6of>c6ELTbWc{zfecMXAbv!i*9X z3SF$7K{_6r9{n#kI?>`mr{Ic;5JTT!Spg1#r4bB^W=wUQ?Kq#|3frn*{mQeG&hKFG XHb|>cdfWL7Xf}hVtDnm{r-UW|USTS2 diff --git a/res/drawable-hdpi/screenpanel_hover.9.png b/res/drawable-hdpi/screenpanel_hover.9.png index 172683754293f0be4f4c4f6ec7e4623fc15c4537..ac8e83dbd774008f189371ed3306022da3d6282a 100644 GIT binary patch delta 201 zcmeBVyu~;{vYw5Bf#JxO9BUxOQtadz!T|&|94Q?@K4*bPWHAE+cP9ulnx8zq7ARQb z>Eak-(fjtQBVUsPkHf|5oNM;9Z~wUE-m%3JNwFOhc^8}!F#mIR%h~fwd~a>=S@%S7 zT2o`*x)c6ELTbWc{zfecMXAbv!i*9X z3SF$7K{_6r9{n#k`n&KzxN^Y96-l#}St$r8cx_~GG1P80Yqn!t!5i{b-relzyh27* XqlG1twzxO|&1Ud)^>bP0l+XkKUll0- diff --git a/res/drawable-mdpi/screenpanel.9.png b/res/drawable-mdpi/screenpanel.9.png index a9bed9f488a477231796511fbce97bf615322d11..c2779fcf336b589941faa46106ebac1ed5668b8c 100644 GIT binary patch delta 205 zcmeBVyvH~}vYw5BfkFQB|3o0gQtadz!T|&|94Q?@K4*bPWHAE+cP9ulnx8zq7AV-@ z>Eak-(ff9iAz!lrkL!Hqlc!Dz7K!;y68@$$)5>_0qN-C`;^OM9u)mC*Ko@Jwc$Hi|2Zzu z+Lz8($2pm4OSEyjz&y+6%i6YF(>uU3|J(Xq0u7=qE2WjAE`Iw7bPR*1tDnm{r-UW| D#Hm0Kq~JeT!M*>HsBnZSARJIYAb?YW07L=%io_+!m~cfR13N5U|Kor_ Z007XcIF4+X?8X29002ovPDHLkV1fywFSh^y diff --git a/res/drawable-mdpi/screenpanel_hover.9.png b/res/drawable-mdpi/screenpanel_hover.9.png index ce12197985cb681b6a2c6bfdb1721a6a9b53eb24..70b30785fba849d028d693b41d23121b5bb9faad 100644 GIT binary patch delta 203 zcmeBVyu&y_vYw5BfkFQB|3o0gQtadz!T|&|94Q?@K4*bPWHAE+cP9ulnx8zq7ARQf z>Eak-(ff9iA>UyI5$F5uM&*x`EIrR%>rDQlvX{f#jLoHPnv$rghf1#$1c3Lepe(NbMQg_ z{dA!@l9QQi_PKK@?kPIwJata7_Jjq!^(L(hIfi?r(o32yF9JG+!PC{xWt~$(69Ba4 BPj&zR delta 119 zcmV--0EqwG0f_;S8E^yu006c6H|hWY08mLpK~#7FV?YA`ksu0S`rz^w3;f{1zywjs z{~rfn;D;y>#Hm0Kq~JeT!KeTGQQ-(vKsca)Kmex#0f++j6^TodG2x0t26kAy{>K4< Z006tsQm(&ANEQG9002ovPDHLkV1gPMFKPe) diff --git a/res/drawable-xhdpi/screenpanel.9.png b/res/drawable-xhdpi/screenpanel.9.png index fe604ba36c062e6944c2ec95081cd1488b64539b..53a7812060cd7d3ba5f20fb5ab23a6aaf5176bbb 100644 GIT binary patch delta 256 zcmV+b0ssEB0g(cb8Gi-<0035#XAb}X00eVFNmK|32nc)#WQYI&010qNS#tmY3yA;# z3yA?Y$;+((006T|L_t(YiS5?04#FT5h2bC65SDK64*HaRNO$*+E`(@{ONmtzZ4H-+ zlQ0x$zJv?ORjf-|xi3d;S=95~*Ps4Kn#TmB{Q^G>!*Gf*>UqK-0LGZfdw&MVs0KRc z+))Bt_Z z3pxR}zV8Vk7zxc<8-Y8#)>8u=a;@kHT!HcZ5=kGi0(b!1fFBP*Co1v)0000>q0DMVAK~#7FW55Fb%nTy`Ndyf1FsgPFcg?oV#KXO770<-~;8Gi%-008`&uY>>q0DDP9K~#7F?bJOA0x=Xt;WID6N-+L_?ssrE z>4fQm`>_^MK8p~ra3qfu)8wA|YcD^hE3Hg$_{JOpD8R%n&+mJCdBzv&xTtX)D!rO% zDAaQ^(_<&qFZ$Bw|2Ct84m#*IFVTH#6Q>lHM|&x?kaQPnsp958Eog9`fWsZX(Uhbs0$Lc%v_{? z`je92v4zUtBcEL5HF_qX{-tittfMSGddYc-to44+f*V%nFg;uKYv%E{hDw_l%MS3* zQGGb)q^sUa#;_Tee9{spxu(yU$(xf_eEp?yUR>sj^_N!oeY2PP6TL!j^HqUOaV=}a z6<@oas1ihHUOhRjD)-9bU1!3ar*87vSsrJ;{!7Lt1wXSHvrfL>mfIhDUDr9(G`n3u zFn3lOw~PV5LRc2tnnwOl+l^WGHSpbte-y{&y=&e3z0G&Kr-p5>|5L{}d73_Z>w$H< QfFZ%)>FVdQ&MBb@0A4VQu>b%7 delta 201 zcmV;)05<>H0@?wP8Gi%-002u=xk~^50HH}lK~#7F?bk61!axv4;WxWkqc(zwTBH#Y z5O3rKbASjrLGCp+h7^K9GFvF~zy8~HmJid}W+w!L1OXTy3?xd{3oA)PWMl&yH5xk# z1O#Vc?%0l|Fl#|VL-$ssR>~&&= z{m}MZ|5#Wzv|NY?3IK_Unr2}&6~ zIhZebZ0Gx<%=tx8hv26>->;^yR9&~*x`9FcDogzXHR;BM9XgkG>{V|uU^hD;s5hzL z6?snQo>Ry%$|R=fG~YdFAUb!sY94Y|}FDn*8@D>wodC(>aDa)`;q5x1NrA zxG4;s=~}pHr=9fPfS9!Ig&vWL_s!Su4zDqvA*e3<t3f`HW9vbU%)&l^s3a2 z#dZ!`t}x7CR5qHxT6TczMqIMyEBQB(I@@>Eez0b~Can|wa?NQ$pzj$xUHx3vIVCg! E01M}bz5oCK delta 199 zcmV;&067270@wkN8Gi%-002u=xk~^50G~-jK~#7F?bk61!axv4;WxWkqc(zwTBH#Y z5D%UML`Z9sdyS1DgWzIV5th3HK>+HX>en2ecWHa5jk)s)VomgQ% zw0+m#7uF3e7b1cJK%%0iSy)ZQ76CNtzYNr<*PbF0K#TQ};?V#A002ovPDHLkV1m#m BSF`{C diff --git a/res/layout-land/longpress_cling.xml b/res/layout-land/longpress_cling.xml index d1b30a8223..93bbc077a9 100644 --- a/res/layout-land/longpress_cling.xml +++ b/res/layout-land/longpress_cling.xml @@ -4,6 +4,7 @@ android:id="@+id/longpress_cling" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/cling_scrim_background" android:orientation="vertical" > + android:layout_height="match_parent" + android:background="@color/cling_scrim_background" > #DAFF0000 #DA0099CC + #80000000 #20000000 #80c6c5c5 diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java index 7098760b30..37a7f5cc83 100644 --- a/src/com/android/launcher3/Launcher.java +++ b/src/com/android/launcher3/Launcher.java @@ -73,6 +73,7 @@ import android.text.TextUtils; import android.text.method.TextKeyListener; import android.util.DisplayMetrics; import android.util.Log; +import android.view.ContextThemeWrapper; import android.view.Display; import android.view.Gravity; import android.view.HapticFeedbackConstants; @@ -2555,7 +2556,7 @@ public class Launcher extends Activity private void showBrokenAppInstallDialog(final String packageName, DialogInterface.OnClickListener onSearchClickListener) { - new AlertDialog.Builder(this) + new AlertDialog.Builder(new ContextThemeWrapper(this, android.R.style.Theme_DeviceDefault)) .setTitle(R.string.abandoned_promises_title) .setMessage(R.string.abandoned_promise_explanation) .setPositiveButton(R.string.abandoned_search, onSearchClickListener)