From a108d9fc0edd3b4f741fae595e35a246fbc700ff Mon Sep 17 00:00:00 2001
From: Michael Jurka <mikejurka@google.com>
Date: Wed, 7 Nov 2012 15:31:47 -0800
Subject: [PATCH] Final tweaks to visuals of widget picker

---
 .../appwidget_item_bg_normal.9.png            | Bin 267 -> 274 bytes
 .../appwidget_item_bg_normal.9.png            | Bin 243 -> 250 bytes
 .../appwidget_item_bg_normal.9.png            | Bin 316 -> 359 bytes
 .../KeyguardAppWidgetPickActivity.java        |  23 +++---------------
 4 files changed, 4 insertions(+), 19 deletions(-)

diff --git a/res/drawable-hdpi/appwidget_item_bg_normal.9.png b/res/drawable-hdpi/appwidget_item_bg_normal.9.png
index 6fd0e6e495f86e34a526d205da35fa48cd978ddd..36552d4ae324c91864aa67fbda9533bb1a9b8fa2 100644
GIT binary patch
delta 209
zcmV;?051QF0+IrdNq@9SL_t(oh3%F>3c@fDMgQ0;?z$3O_8_^DxA73UP%q&wU~nNc
z`EEqgR*(`yx|j!9WJvgrB!mG;WWr>u+nArN<Rj^%@B5=M=Gt}Lp+uN-?rE*P02tpT
zwzCEMVHh4w)7(o4gb-Q)Z6bhOiJ&#8z$OH$en*=)0ToaI6-rP66_B5+3JX+41*!{7
zy5blky!R)PMINSz#6|6k(0MNQM@9fQByG7OBq1`niPBB#CyXRsF@7^f!WMop00000
LNkvXXu0mjfruSH}

delta 202
zcmV;*05$)T0*eBWNq?<LL_t(oh3%Iy3Iib&MCS(+Aty-V39NE_kB}pHgS2)A7bZ;z
z#*jjcxW#{9v7*dFL}oz}gRmNX8^^Piaisom&YivYH*2l@+Au=SnIVKLfbBI!Q!hv<
z9b=3Sktz8gDF93*fWwre4pd+l0!yExU7UalsDKKnfC|iMA444iOHqO40w1lIBuXhK
zOuCpN@>PD?AOqmiiv5udz#UaBSA-;*KcU$r^&LhMPm0nneK@&2wEzGB07*qoM6N<$
Ef~&<*hX4Qo

diff --git a/res/drawable-mdpi/appwidget_item_bg_normal.9.png b/res/drawable-mdpi/appwidget_item_bg_normal.9.png
index 47009b478fdd84121fba940ca2705cb5ab126952..08a94f5dc9e73351b1f52d60535a6c7c3cbc8b0d 100644
GIT binary patch
delta 185
zcmV;q07n1w0r~-uNq?M4L_t(IjqQ~|3d0}}MgL3+byu?UEZ!-H=}EkiSIAB`WhRRz
z!A(PAI?zBLhy&_l9At#5;s832?M=s=KLRa*_x>J2csl23>%b>UDH3BG0K5R`ty<ue
zQf6jp5sOGyC(137J(!A3-o`ac@fTlM+|(QPh)pmPuiZ^VkTP?Ad`n!{mjU!>zl8u8
n=h+TYRS>O-pY3!6yg$<ke@iWXz({1S00000NkvXXu0mjfjI~eR

delta 178
zcmV;j08Rh;0rLTnNq?0|L_t(IjqQ}N3d0~6gzwiBx_0pu-1GjUOCQ9!tI(fbhbEFG
z(!~7GKo3Mg{WuRfki-UY8tp^dm_H(!7a@dejPdThm)3<fsVY)RBLD@!VcsaExSaE|
z(_}T}IzUaCf=&L$IivW4PYmAG4c~xGWCpJ7MiQ!eISRbY*DC?IVgD;$03Oq9Cm{)u
gYP`4U1o*`I2Gxxyre}({fdBvi07*qoM6N<$f^-a2EdT%j

diff --git a/res/drawable-xhdpi/appwidget_item_bg_normal.9.png b/res/drawable-xhdpi/appwidget_item_bg_normal.9.png
index 3cb534ab37119bc26f36c596d7d942225e37fd08..cbbd8f64a7b11ee1bf0e36835955dff00ae6f0d4 100644
GIT binary patch
delta 296
zcmV+@0oVS#0_OsdNPhtdNkl<ZScUDFF>Zt~5JmrZ*(ek!ZAuQpjdGhDf@{&H1tBAC
zV1C*xc$@6t$kIHCW(Hf&-wg~%;sm&Rp4;pkN5?Tm_Jy`>U%RgRY?|g8LOAr#WZO2K
zrs=!y`wsx?uNJHQ%i}m+hGB?xU55}tK1%?q$`~U6TyQUngMX;1hIyVDW4wuE4HP7y
zsudD9oj0;4a8YYq)S3W;kA@r+m1q&Ts5LHXjf-02qSm;mH7;sRQKET&HUCIai57v2
zT2qYZVfI84>$+Y=<j~6j$z*s*(PdfQ9xXT<5z%BlQL6yFBXNjKtN^~S8#|^%1;ERL
uUJeN0hC&7-<sl*@k(ez1ckFjUB=G~p!dOBp)-<;O0000<MNUMnLSTZkc7n_R

delta 252
zcmaFPw1;VeM?J$mPZ!6Kh}O3=4EdT31X#W^xN7Ko9OPf|skUx{{)eV7B4JFImU#&0
zh&x&q`0bjQ!N<)T9r3M6rL5uN=iA4>6_&_^s>qeZmcRS`@7lK9PwzOKIAq!$awYtf
z*xV`ZcR8g0@ecvbN1T(G795Kb2~A5h(sr11$=;*3wL9zaqFbdQ0Tw1QjVoPzA1u1H
zV}+UCs$Q@-kh#p|^qp?=B&|SUu(<D~XA_UuoL3jQwarDPy7v4@69&B#e~vinFud!?
zIzDFwgT^$Cd#xvg-MR#Kb9km?eYmu7eT&B<)?PKU$$Sf^uVMfKPgg&ebxsLQ0Or(j
AvH$=8

diff --git a/src/com/android/settings/KeyguardAppWidgetPickActivity.java b/src/com/android/settings/KeyguardAppWidgetPickActivity.java
index db5f115b6a0..80dbc0c7070 100644
--- a/src/com/android/settings/KeyguardAppWidgetPickActivity.java
+++ b/src/com/android/settings/KeyguardAppWidgetPickActivity.java
@@ -216,7 +216,6 @@ public class KeyguardAppWidgetPickActivity extends Activity
                             mResources.getDimensionPixelSize(R.dimen.appwidget_preview_width);
                     int appWidgetPreviewHeight =
                             mResources.getDimensionPixelSize(R.dimen.appwidget_preview_height);
-                    // TODO: fix the hspan, vspan of the default preview
                     Bitmap b = getWidgetPreview(new ComponentName(packageName, className),
                             appWidgetPreviewId, iconId,
                             appWidgetPreviewWidth, appWidgetPreviewHeight);
@@ -322,32 +321,18 @@ public class KeyguardAppWidgetPickActivity extends Activity
                     bitmapHeight = drawable.getIntrinsicHeight();
                 } else {
                     // Generate a preview image if we couldn't load one
-                    bitmapWidth = maxWidth;
-                    bitmapHeight = maxHeight;
+                    bitmapWidth = appIconSize;
+                    bitmapHeight = appIconSize;
                     defaultPreview = Bitmap.createBitmap(bitmapWidth, bitmapHeight,
                             Config.ARGB_8888);
-                    final Canvas c = sCachedAppWidgetPreviewCanvas.get();
-                    c.setBitmap(defaultPreview);
-                    c.drawColor(0xFF2D2D2D);
-                    c.setBitmap(null);
-
-                    // Draw the icon in the top left corner
-                    final float marginPercentage = 0.125f;
-                    final float finalIconSize = (bitmapHeight / 2);
-                    float iconScale = finalIconSize / appIconSize;
 
                     try {
                         Drawable icon = null;
-                        int hoffset =
-                                (int) (finalIconSize * marginPercentage);
-                        int yoffset =
-                                (int) (finalIconSize * marginPercentage);
                         if (iconId > 0)
                             icon = getFullResIcon(packageName, iconId);
                         if (icon != null) {
-                            renderDrawableToBitmap(icon, defaultPreview, hoffset,
-                                    yoffset, (int) (appIconSize * iconScale),
-                                    (int) (appIconSize * iconScale));
+                            renderDrawableToBitmap(icon, defaultPreview, 0,
+                                    0, appIconSize, appIconSize);
                         }
                     } catch (Resources.NotFoundException e) {
                     }