merge in jb-mr1-release history after reset to jb-mr1-dev
diff --git a/res/drawable-hdpi/appwidget_item_bg_normal.9.png b/res/drawable-hdpi/appwidget_item_bg_normal.9.png
index 6fd0e6e..36552d4 100644
--- a/res/drawable-hdpi/appwidget_item_bg_normal.9.png
+++ b/res/drawable-hdpi/appwidget_item_bg_normal.9.png
Binary files differ
diff --git a/res/drawable-mdpi/appwidget_item_bg_normal.9.png b/res/drawable-mdpi/appwidget_item_bg_normal.9.png
index 47009b4..08a94f5 100644
--- a/res/drawable-mdpi/appwidget_item_bg_normal.9.png
+++ b/res/drawable-mdpi/appwidget_item_bg_normal.9.png
Binary files differ
diff --git a/res/drawable-xhdpi/appwidget_item_bg_normal.9.png b/res/drawable-xhdpi/appwidget_item_bg_normal.9.png
index 3cb534a..cbbd8f6 100644
--- a/res/drawable-xhdpi/appwidget_item_bg_normal.9.png
+++ b/res/drawable-xhdpi/appwidget_item_bg_normal.9.png
Binary files differ
diff --git a/res/layout/keyguard_appwidget_picker_layout.xml b/res/layout/keyguard_appwidget_picker_layout.xml
index b678925..e533672 100644
--- a/res/layout/keyguard_appwidget_picker_layout.xml
+++ b/res/layout/keyguard_appwidget_picker_layout.xml
@@ -18,8 +18,8 @@
android:id="@+id/layout_root"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:layout_marginLeft="@dimen/keyguard_appwidget_picker_margin_left"
- android:layout_marginRight="@dimen/keyguard_appwidget_picker_margin_right"
+ android:paddingLeft="@dimen/keyguard_appwidget_picker_margin_left"
+ android:paddingRight="@dimen/keyguard_appwidget_picker_margin_right"
android:paddingTop="2dip"
android:paddingBottom="2dip"
android:orientation="vertical" >
diff --git a/src/com/android/settings/KeyguardAppWidgetPickActivity.java b/src/com/android/settings/KeyguardAppWidgetPickActivity.java
index db5f115..80dbc0c 100644
--- a/src/com/android/settings/KeyguardAppWidgetPickActivity.java
+++ b/src/com/android/settings/KeyguardAppWidgetPickActivity.java
@@ -216,7 +216,6 @@
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 @@
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) {
}
