From 88127038178b3bbf0eb91103a31e682cc0615074 Mon Sep 17 00:00:00 2001 From: Winson Chung Date: Mon, 13 Dec 2010 12:11:33 -0800 Subject: [PATCH] Various tweaks to launcher - Removing hotdog for shadow bg protection - Adding bg protection for customization tray - Restoring holographic outlines for all apps - Small bug fixes Change-Id: I58d81bb490f78c76fcaf46122febc3c1aace854e --- .../focused_application_background.9.png | Bin 4127 -> 4125 bytes .../pressed_application_background.9.png | Bin 4075 -> 4076 bytes .../focused_application_background.9.png | Bin 3614 -> 3613 bytes .../pressed_application_background.9.png | Bin 3778 -> 3778 bytes res/layout-xlarge-land/launcher.xml | 2 +- res/layout-xlarge-port/launcher.xml | 2 +- .../all_apps_paged_view_application.xml | 2 - .../customize_paged_view_item.xml | 2 - res/values/attrs.xml | 4 - src/com/android/launcher2/BubbleTextView.java | 72 +++++++++--------- .../android/launcher2/CacheableTextView.java | 32 +++++--- src/com/android/launcher2/CellLayout.java | 1 + src/com/android/launcher2/Launcher.java | 2 +- src/com/android/launcher2/PagedViewIcon.java | 11 +-- src/com/android/launcher2/Workspace.java | 25 ++++++ 15 files changed, 90 insertions(+), 65 deletions(-) diff --git a/res/drawable-hdpi/focused_application_background.9.png b/res/drawable-hdpi/focused_application_background.9.png index ac67b06e7706bd3c4a7b26c2bd15579b83ebe5ed..01c83c37f502e8899a7a2dfac01e74a450fe7cbd 100644 GIT binary patch delta 1376 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 diff --git a/res/drawable-hdpi/pressed_application_background.9.png b/res/drawable-hdpi/pressed_application_background.9.png index fdb064aad93f860e5773574d28015b990acd8b1f..c7d0bd4006841cca8fc073978d787d2dcbd2d174 100644 GIT binary patch delta 1342 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 diff --git a/res/drawable-mdpi/focused_application_background.9.png b/res/drawable-mdpi/focused_application_background.9.png index 259f122ac5b393568f71edffd1258bde04c4c016..341a80b47c8c9341ef6cc4a32a3e9a07c7421125 100644 GIT binary patch delta 791 zcmV+y1L*vo9Gx7nzzP9Klfeoke}!K{NN=Z|m6FmAqNR;sZ6gFLQINbH3*WuW+uMD2 z2^PuT3=GR{-W@l;{AXwH-OUOY&vfQ*a*^Js0DOJKZh*%kJnsVcI^nw1-ga%gjHZQA zSHo5TlyAUify3KJd;~NC#J~fAmoc!v2+#?H98So9U1n${h)Zax08v1de?4HYSAKtg z%9C5~Ap-1nyxs}yUyZN`1E(+mvo4vp0&WS-!s~}If$FJdP7(*ddX8X#*9mtP0d@k! z03rjtt^h7HroN@hf*I2g+W=IPNx}f3=ivx%5xBPKAPNKvtt%+6Re08WGX{|UbZ!Xy z#t2Vjn3O`Q&ZX{UE*Pa^e~}7n9~o3*aU!Cw;4QCvIh852#iGw*TwWvVlqUt%NyS@&m$KM(KIS-r3uo|_($*G; z98j*xVA6R4uk^7iS7B?)lR`Sq#aLCIWJRJj2D3)CuvM{ZekuqiHkr876ky~$Hvn2l zS*grzvYU`v+RjP0#ezX4E$8CSl5f3|S}77|Rpm^q;oK76R+Dw`9M(pYm<%KYTzG!p zlfVobe_M@nz^g&CKdIjaxH`kcJdU#$X=Pp-0$A#Lq#_nADNom^ET2maC{Qifi#SpSkTy;d6ab_>(wJiDx6c zML&r*QTQRk3xWHWW-2hKTc-aLWbiz%keeGJjil&9A z%W10s%6H(4z|q}fJ^>m5V&IX$s~Fgy1?U7q4ku*5t}?U|#5uH7fGD8Ke;%;cD}R1G z=h>YP5CL{O-s}YSuSb}Lfm0ZOS(nUP0XK(c;q^mIpn9&Ev&6ygo?{r`b;7+_fSmv_ zfXD!^D}W1)sc){bU}73_8-QvuMHnFTJYK+?1#ZkbhyuYv>k7(i6`u9p!~oKtj}2+x zTEG(-2BlD{Q>A;A7mU(ke~}7v9~o3*aU`Oy;4RO4Ih(z#MF-!3!1D*(e!68k_U%V$o+g&aaVG%9DcXq~a~XOIhwZopW4(3mbS#Wos9R z98j*xV9I#}uXNj$tFSfYNueC4a;z#(vPGg6gP9{+*s9n$KNSR%HcZ}W3@~z$2LLUU ztW?I<*-c2TY^S8#;(|e?ET{6$if^@&T3IAERpmsk;ldK%R+Clm9M)Qsm<%KYUU>f8 zlfVobf3F%BfLDWN|D}E#;OYbu^Eysmq?K`L2w*2VX~Dz zPJU2g+~{E&*is`3)D`*LsGGpcA(p_k)IOzalyPy+OPS}r2R-d|d6P{;=3IfQFTq=- zIQZ8xni_;x$~jFaF|AUb?QWKAc~RPJR<|Dj>h0oP@YwtE(;%5X!2J=xQhRt}E0066;Ch7wAAy6p^4Edg?L{;|rCP@GGs zjq*(wuR=Q}&efncN~kWjsCFzxkSBq28MW1_I3%DUp}H^yoCeCxC_xA|OR8=h(}w+2 zC^CaXflX`7syVf3u&D&xlvp>1MlckB28$koqe5lP6`X&i*+Pl~Rd6`Mu5$%PnGCFg zv)UCxHm$t@ocq7frh0OKpgL)&X)gU$sl6xh7)|rTrY2Gv}!+C zb4Q;IO_E%=!yv}+^cl5Yv|}d zb8$z@{nUR-VI3V>c|pas(!e!v4cvUeal_CQ*T6M!4O}ZRIBFQ0;u^RHu7PW%fqOM@ z@%yuDS; zoZ5eQCNZwivVKx*i&bZN6|@$`;km)3fQ?n=a5x7*>XvaOYLgTP!Jg{On$*ccV&EwV zqb0^U0<%aE;TUi^wdFR;AVBS^o75aB83;_xu&cR|JYf|G3EURQEDOX)&uaqS#kwPj zvITJNcE@ela`JHE8|w%d*zCvSn6YNYEwftj?xjxJXZGKEvs{;<-n%uHZke&(n~It7 z=Q~|4JyxBYxSCh(E8QG(C}Z0PZ0;Vg{`h6Inir3xMnvrm%_Ka2B8h(k0Nfatl|T9G Q=>Px#07*qoM6N<$g1lMSaR2}S delta 994 zcmV<810DRr9l{;3?+SmL$V_aLF9(YX0|D5DyOv`E+P~F_<4g%C-~AiTyzc)d8&5w%62XK zrBT=aLIVl(1JDn+9f;2#uJO$SfbXzcdR#0zV9{;CYdyE=bEWq>iU9odxx9(v%R z$Ho04Rsi4uVCix7ZULNmz^A}TP)`wD1mFm6(F4C90RUG!aElJ-XC7F3V6v}9bUfD~*w01aO@7K}Gp9v$xg_zH02v&Asxm|r=OSv8 zbl1hJ&<=@nHK~-Ea&z4V0Tvg2>n`s=8@R8@FSj z$P5kzHmxzMrqrgvmJ)Es#JV|jf}sF3Sactp6e?@3;4FXL7Ev6ig2MrJohvv=WMCDX z)vm~7)7m@0ss9UYswW3zRF|7-n#*`K*Wb(Wm<*ue4b2Uw=3>=?xRuMIVY|Gk)2jVo z%>#WJx+JM#S%!tnDl9iGu3fQO6=ykrjm2J8)y8~>Sh|MkB+0}$WQJlH7VcFB*)P?rnm;KfotGeY2aQB zT=@L#DVD-Ex)(o@8eqIY@#;aeJK@uPwVNU}sEG!^)GvhF`yh1?M!uK&4lB2ycK#ZR zo#JRzS@@g<65o*-z{?57phlOKCyiH(Gg2Ilj!}Os?W3R=iB-8r1Hu?rW425IVSzx9 z0%uWN>WLrAo$wk}2ZIvTtQu2XsJ1!wyICTbXNG1JDeow03mR@E#zApTHZ zN^O6fNsKGBtUoHYg{reW3R;We@Z8{Hz@{p5*nbBgH!Nc%YRf4O8GEX4*2E4rL?)hw z%xsDA9f4USh~W@$DYd1lWfGuv)g9FxDVYe2y6XNLXDX8T z^;IsH9;?nBxtdq)E8QHjD{ diff --git a/res/layout-xlarge-port/launcher.xml b/res/layout-xlarge-port/launcher.xml index c5691b8cbb..d9839da76f 100644 --- a/res/layout-xlarge-port/launcher.xml +++ b/res/layout-xlarge-port/launcher.xml @@ -174,7 +174,7 @@ diff --git a/res/layout-xlarge/all_apps_paged_view_application.xml b/res/layout-xlarge/all_apps_paged_view_application.xml index a080bcecce..e5f07bf448 100644 --- a/res/layout-xlarge/all_apps_paged_view_application.xml +++ b/res/layout-xlarge/all_apps_paged_view_application.xml @@ -20,8 +20,6 @@ launcher:blurColor="#FF6B8CF0" launcher:outlineColor="#FF8CD2FF" - launcher:checkedBlurColor="#FFBBE83C" - launcher:checkedOutlineColor="#FF8CD2FF" android:id="@+id/application_icon" android:layout_width="match_parent" diff --git a/res/layout-xlarge/customize_paged_view_item.xml b/res/layout-xlarge/customize_paged_view_item.xml index 35e06c35fc..b2e5f08b3c 100644 --- a/res/layout-xlarge/customize_paged_view_item.xml +++ b/res/layout-xlarge/customize_paged_view_item.xml @@ -20,8 +20,6 @@ launcher:blurColor="#FF6B8CF0" launcher:outlineColor="#FF8CD2FF" - launcher:checkedBlurColor="#FFBBE83C" - launcher:checkedOutlineColor="#FF8CD2FF" android:id="@+id/customize_icon" android:layout_width="match_parent" diff --git a/res/values/attrs.xml b/res/values/attrs.xml index 337386916d..5e6a2ab64d 100644 --- a/res/values/attrs.xml +++ b/res/values/attrs.xml @@ -68,10 +68,6 @@ - - - -