Snap for 7430084 from 9fee641640938b6b245e513df471747eef999c97 to sc-v2-release
Change-Id: Ib808405365e48c1b6706521f604491ba9ff9fd10
diff --git a/iconloaderlib/src/com/android/launcher3/icons/ShadowGenerator.java b/iconloaderlib/src/com/android/launcher3/icons/ShadowGenerator.java
index ccaebe7..e24f353 100644
--- a/iconloaderlib/src/com/android/launcher3/icons/ShadowGenerator.java
+++ b/iconloaderlib/src/com/android/launcher3/icons/ShadowGenerator.java
@@ -33,16 +33,16 @@
*/
public class ShadowGenerator {
- public static final boolean ENABLE_SHADOWS = false;
+ public static final boolean ENABLE_SHADOWS = true;
- public static final float BLUR_FACTOR = 0.5f/48;
+ public static final float BLUR_FACTOR = 1.5f/48;
// Percent of actual icon size
public static final float KEY_SHADOW_DISTANCE = 1f/48;
- private static final int KEY_SHADOW_ALPHA = 61;
+ private static final int KEY_SHADOW_ALPHA = 10;
// Percent of actual icon size
private static final float HALF_DISTANCE = 0.5f;
- private static final int AMBIENT_SHADOW_ALPHA = 30;
+ private static final int AMBIENT_SHADOW_ALPHA = 7;
private final int mIconSize;
diff --git a/iconloaderlib/src/com/android/launcher3/icons/ThemedIconDrawable.java b/iconloaderlib/src/com/android/launcher3/icons/ThemedIconDrawable.java
index 797a439..b2e554b 100644
--- a/iconloaderlib/src/com/android/launcher3/icons/ThemedIconDrawable.java
+++ b/iconloaderlib/src/com/android/launcher3/icons/ThemedIconDrawable.java
@@ -41,7 +41,6 @@
import androidx.annotation.Nullable;
import com.android.launcher3.icons.BitmapInfo.Extender;
-import com.android.launcher3.icons.ClockDrawableWrapper.ClockBitmapInfo;
import com.android.launcher3.icons.cache.BaseIconCache;
import java.io.ByteArrayInputStream;
@@ -287,7 +286,7 @@
int[] colors = new int[2];
if ((res.getConfiguration().uiMode & UI_MODE_NIGHT_MASK) == UI_MODE_NIGHT_YES) {
colors[0] = res.getColor(android.R.color.system_neutral1_800);
- colors[1] = res.getColor(android.R.color.system_neutral2_200);
+ colors[1] = res.getColor(android.R.color.system_accent1_100);
} else {
colors[0] = res.getColor(android.R.color.system_accent1_100);
colors[1] = res.getColor(android.R.color.system_neutral2_700);
diff --git a/iconloaderlib/src/com/android/launcher3/icons/cache/BaseIconCache.java b/iconloaderlib/src/com/android/launcher3/icons/cache/BaseIconCache.java
index c948eba..cb39490 100644
--- a/iconloaderlib/src/com/android/launcher3/icons/cache/BaseIconCache.java
+++ b/iconloaderlib/src/com/android/launcher3/icons/cache/BaseIconCache.java
@@ -510,7 +510,7 @@
* Cache class to store the actual entries on disk
*/
public static final class IconDB extends SQLiteCacheHelper {
- private static final int RELEASE_VERSION = 29;
+ private static final int RELEASE_VERSION = 30;
public static final String TABLE_NAME = "icons";
public static final String COLUMN_ROWID = "rowid";