Merge "Fix FastBitmapDrawable disabled color filter." into sc-v2-dev
diff --git a/iconloaderlib/src/com/android/launcher3/icons/ShadowGenerator.java b/iconloaderlib/src/com/android/launcher3/icons/ShadowGenerator.java
index e24f353..96dee3b 100644
--- a/iconloaderlib/src/com/android/launcher3/icons/ShadowGenerator.java
+++ b/iconloaderlib/src/com/android/launcher3/icons/ShadowGenerator.java
@@ -35,14 +35,14 @@
public static final boolean ENABLE_SHADOWS = true;
- public static final float BLUR_FACTOR = 1.5f/48;
+ public static final float BLUR_FACTOR = 1.68f/48;
// Percent of actual icon size
public static final float KEY_SHADOW_DISTANCE = 1f/48;
- private static final int KEY_SHADOW_ALPHA = 10;
+ private static final int KEY_SHADOW_ALPHA = 7;
// Percent of actual icon size
private static final float HALF_DISTANCE = 0.5f;
- private static final int AMBIENT_SHADOW_ALPHA = 7;
+ private static final int AMBIENT_SHADOW_ALPHA = 25;
private final int mIconSize;
diff --git a/iconloaderlib/src/com/android/launcher3/icons/cache/BaseIconCache.java b/iconloaderlib/src/com/android/launcher3/icons/cache/BaseIconCache.java
index 623ebb8..ecf0bca 100644
--- a/iconloaderlib/src/com/android/launcher3/icons/cache/BaseIconCache.java
+++ b/iconloaderlib/src/com/android/launcher3/icons/cache/BaseIconCache.java
@@ -534,7 +534,7 @@
* Cache class to store the actual entries on disk
*/
public static final class IconDB extends SQLiteCacheHelper {
- private static final int RELEASE_VERSION = 31;
+ private static final int RELEASE_VERSION = 32;
public static final String TABLE_NAME = "icons";
public static final String COLUMN_ROWID = "rowid";