diff --git a/res/drawable-hdpi/ic_all_apps_bg_hand.png b/res/drawable-hdpi/ic_all_apps_bg_hand.png index 43b1bedab7..dff2f546f1 100644 Binary files a/res/drawable-hdpi/ic_all_apps_bg_hand.png and b/res/drawable-hdpi/ic_all_apps_bg_hand.png differ diff --git a/res/drawable-hdpi/ic_all_apps_bg_icon_1.png b/res/drawable-hdpi/ic_all_apps_bg_icon_1.png deleted file mode 100644 index d2c4cc123f..0000000000 Binary files a/res/drawable-hdpi/ic_all_apps_bg_icon_1.png and /dev/null differ diff --git a/res/drawable-hdpi/ic_all_apps_bg_icon_2.png b/res/drawable-hdpi/ic_all_apps_bg_icon_2.png deleted file mode 100644 index 57b74565bb..0000000000 Binary files a/res/drawable-hdpi/ic_all_apps_bg_icon_2.png and /dev/null differ diff --git a/res/drawable-hdpi/ic_all_apps_bg_icon_3.png b/res/drawable-hdpi/ic_all_apps_bg_icon_3.png deleted file mode 100644 index 54fe70b132..0000000000 Binary files a/res/drawable-hdpi/ic_all_apps_bg_icon_3.png and /dev/null differ diff --git a/res/drawable-hdpi/ic_all_apps_bg_icon_4.png b/res/drawable-hdpi/ic_all_apps_bg_icon_4.png deleted file mode 100644 index 9c0f7773b6..0000000000 Binary files a/res/drawable-hdpi/ic_all_apps_bg_icon_4.png and /dev/null differ diff --git a/res/drawable-mdpi/ic_all_apps_bg_hand.png b/res/drawable-mdpi/ic_all_apps_bg_hand.png index 8868d6b7c8..0d1d7bb81c 100644 Binary files a/res/drawable-mdpi/ic_all_apps_bg_hand.png and b/res/drawable-mdpi/ic_all_apps_bg_hand.png differ diff --git a/res/drawable-mdpi/ic_all_apps_bg_icon_1.png b/res/drawable-mdpi/ic_all_apps_bg_icon_1.png deleted file mode 100644 index 4c78288b49..0000000000 Binary files a/res/drawable-mdpi/ic_all_apps_bg_icon_1.png and /dev/null differ diff --git a/res/drawable-mdpi/ic_all_apps_bg_icon_2.png b/res/drawable-mdpi/ic_all_apps_bg_icon_2.png deleted file mode 100644 index 0ed311bcdb..0000000000 Binary files a/res/drawable-mdpi/ic_all_apps_bg_icon_2.png and /dev/null differ diff --git a/res/drawable-mdpi/ic_all_apps_bg_icon_3.png b/res/drawable-mdpi/ic_all_apps_bg_icon_3.png deleted file mode 100644 index 2aa3d4e433..0000000000 Binary files a/res/drawable-mdpi/ic_all_apps_bg_icon_3.png and /dev/null differ diff --git a/res/drawable-mdpi/ic_all_apps_bg_icon_4.png b/res/drawable-mdpi/ic_all_apps_bg_icon_4.png deleted file mode 100644 index 2cdea9cb21..0000000000 Binary files a/res/drawable-mdpi/ic_all_apps_bg_icon_4.png and /dev/null differ diff --git a/res/drawable-xhdpi/ic_all_apps_bg_hand.png b/res/drawable-xhdpi/ic_all_apps_bg_hand.png index 8a672451dd..e727d3785a 100644 Binary files a/res/drawable-xhdpi/ic_all_apps_bg_hand.png and b/res/drawable-xhdpi/ic_all_apps_bg_hand.png differ diff --git a/res/drawable-xhdpi/ic_all_apps_bg_icon_1.png b/res/drawable-xhdpi/ic_all_apps_bg_icon_1.png deleted file mode 100644 index c0ebaed5a5..0000000000 Binary files a/res/drawable-xhdpi/ic_all_apps_bg_icon_1.png and /dev/null differ diff --git a/res/drawable-xhdpi/ic_all_apps_bg_icon_2.png b/res/drawable-xhdpi/ic_all_apps_bg_icon_2.png deleted file mode 100644 index 71cf250ee7..0000000000 Binary files a/res/drawable-xhdpi/ic_all_apps_bg_icon_2.png and /dev/null differ diff --git a/res/drawable-xhdpi/ic_all_apps_bg_icon_3.png b/res/drawable-xhdpi/ic_all_apps_bg_icon_3.png deleted file mode 100644 index 3c69fc58b5..0000000000 Binary files a/res/drawable-xhdpi/ic_all_apps_bg_icon_3.png and /dev/null differ diff --git a/res/drawable-xhdpi/ic_all_apps_bg_icon_4.png b/res/drawable-xhdpi/ic_all_apps_bg_icon_4.png deleted file mode 100644 index 5f6ca38dbd..0000000000 Binary files a/res/drawable-xhdpi/ic_all_apps_bg_icon_4.png and /dev/null differ diff --git a/res/drawable-xxhdpi/ic_all_apps_bg_hand.png b/res/drawable-xxhdpi/ic_all_apps_bg_hand.png index ed694f8464..fffcc6bb69 100644 Binary files a/res/drawable-xxhdpi/ic_all_apps_bg_hand.png and b/res/drawable-xxhdpi/ic_all_apps_bg_hand.png differ diff --git a/res/drawable-xxhdpi/ic_all_apps_bg_icon_1.png b/res/drawable-xxhdpi/ic_all_apps_bg_icon_1.png deleted file mode 100644 index 5cb042786a..0000000000 Binary files a/res/drawable-xxhdpi/ic_all_apps_bg_icon_1.png and /dev/null differ diff --git a/res/drawable-xxhdpi/ic_all_apps_bg_icon_2.png b/res/drawable-xxhdpi/ic_all_apps_bg_icon_2.png deleted file mode 100644 index cd0322ba5f..0000000000 Binary files a/res/drawable-xxhdpi/ic_all_apps_bg_icon_2.png and /dev/null differ diff --git a/res/drawable-xxhdpi/ic_all_apps_bg_icon_3.png b/res/drawable-xxhdpi/ic_all_apps_bg_icon_3.png deleted file mode 100644 index 19ffc2dcca..0000000000 Binary files a/res/drawable-xxhdpi/ic_all_apps_bg_icon_3.png and /dev/null differ diff --git a/res/drawable-xxhdpi/ic_all_apps_bg_icon_4.png b/res/drawable-xxhdpi/ic_all_apps_bg_icon_4.png deleted file mode 100644 index 311c3df27b..0000000000 Binary files a/res/drawable-xxhdpi/ic_all_apps_bg_icon_4.png and /dev/null differ diff --git a/res/drawable-xxxhdpi/ic_all_apps_bg_hand.png b/res/drawable-xxxhdpi/ic_all_apps_bg_hand.png index 615374a78a..4d065d806c 100644 Binary files a/res/drawable-xxxhdpi/ic_all_apps_bg_hand.png and b/res/drawable-xxxhdpi/ic_all_apps_bg_hand.png differ diff --git a/res/drawable-xxxhdpi/ic_all_apps_bg_icon_1.png b/res/drawable-xxxhdpi/ic_all_apps_bg_icon_1.png deleted file mode 100644 index 10f8c4169e..0000000000 Binary files a/res/drawable-xxxhdpi/ic_all_apps_bg_icon_1.png and /dev/null differ diff --git a/res/drawable-xxxhdpi/ic_all_apps_bg_icon_2.png b/res/drawable-xxxhdpi/ic_all_apps_bg_icon_2.png deleted file mode 100644 index 102d9251f6..0000000000 Binary files a/res/drawable-xxxhdpi/ic_all_apps_bg_icon_2.png and /dev/null differ diff --git a/res/drawable-xxxhdpi/ic_all_apps_bg_icon_3.png b/res/drawable-xxxhdpi/ic_all_apps_bg_icon_3.png deleted file mode 100644 index 9be5b7a12c..0000000000 Binary files a/res/drawable-xxxhdpi/ic_all_apps_bg_icon_3.png and /dev/null differ diff --git a/res/drawable-xxxhdpi/ic_all_apps_bg_icon_4.png b/res/drawable-xxxhdpi/ic_all_apps_bg_icon_4.png deleted file mode 100644 index d7fb29baf3..0000000000 Binary files a/res/drawable-xxxhdpi/ic_all_apps_bg_icon_4.png and /dev/null differ diff --git a/res/drawable/ic_all_apps_bg_icon_1.xml b/res/drawable/ic_all_apps_bg_icon_1.xml new file mode 100644 index 0000000000..c9c0a7549e --- /dev/null +++ b/res/drawable/ic_all_apps_bg_icon_1.xml @@ -0,0 +1,31 @@ + + + + + + + + \ No newline at end of file diff --git a/res/drawable/ic_all_apps_bg_icon_2.xml b/res/drawable/ic_all_apps_bg_icon_2.xml new file mode 100644 index 0000000000..b6269e3ab2 --- /dev/null +++ b/res/drawable/ic_all_apps_bg_icon_2.xml @@ -0,0 +1,33 @@ + + + + + + + + \ No newline at end of file diff --git a/res/drawable/ic_all_apps_bg_icon_3.xml b/res/drawable/ic_all_apps_bg_icon_3.xml new file mode 100644 index 0000000000..4c255a9096 --- /dev/null +++ b/res/drawable/ic_all_apps_bg_icon_3.xml @@ -0,0 +1,36 @@ + + + + + + + + + diff --git a/res/drawable/ic_all_apps_bg_icon_4.xml b/res/drawable/ic_all_apps_bg_icon_4.xml new file mode 100644 index 0000000000..12e05bc6bb --- /dev/null +++ b/res/drawable/ic_all_apps_bg_icon_4.xml @@ -0,0 +1,34 @@ + + + + + + + + + \ No newline at end of file diff --git a/src/com/android/launcher3/allapps/AllAppsBackgroundDrawable.java b/src/com/android/launcher3/allapps/AllAppsBackgroundDrawable.java index dafa73fecd..cfd07e6581 100644 --- a/src/com/android/launcher3/allapps/AllAppsBackgroundDrawable.java +++ b/src/com/android/launcher3/allapps/AllAppsBackgroundDrawable.java @@ -96,14 +96,14 @@ public class AllAppsBackgroundDrawable extends Drawable { public AllAppsBackgroundDrawable(Context context) { Resources res = context.getResources(); mHand = new TransformedImageDrawable(res, R.drawable.ic_all_apps_bg_hand, - 0.575f, 0.1f, Gravity.CENTER_HORIZONTAL); + 0.575f, 0.f, Gravity.CENTER_HORIZONTAL); mIcons = new TransformedImageDrawable[4]; mIcons[0] = new TransformedImageDrawable(res, R.drawable.ic_all_apps_bg_icon_1, 0.375f, 0, Gravity.CENTER_HORIZONTAL); mIcons[1] = new TransformedImageDrawable(res, R.drawable.ic_all_apps_bg_icon_2, - 0.3125f, 0.25f, Gravity.CENTER_HORIZONTAL); + 0.3125f, 0.2f, Gravity.CENTER_HORIZONTAL); mIcons[2] = new TransformedImageDrawable(res, R.drawable.ic_all_apps_bg_icon_3, - 0.475f, 0.4f, Gravity.CENTER_HORIZONTAL); + 0.475f, 0.26f, Gravity.CENTER_HORIZONTAL); mIcons[3] = new TransformedImageDrawable(res, R.drawable.ic_all_apps_bg_icon_4, 0.7f, 0.125f, Gravity.CENTER_HORIZONTAL); mWidth = res.getDimensionPixelSize(R.dimen.all_apps_background_canvas_width);