diff options
| author | Tony Wickham <twickham@google.com> | 2017-04-27 21:49:08 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-04-27 21:49:08 +0000 |
| commit | 19d2e7fc55df1fae3979615899c8b7dde95e5509 (patch) | |
| tree | 97dd2358caae191bec64ba999962bb03b766568b /src/com/android/launcher3/graphics | |
| parent | 22f8f9fc4be1c1717258851a4da30dd2f829d3c9 (diff) | |
| parent | f77a6f7fd75243999912d040470a543e825d6d12 (diff) | |
| download | android_packages_apps_Trebuchet-19d2e7fc55df1fae3979615899c8b7dde95e5509.tar.gz android_packages_apps_Trebuchet-19d2e7fc55df1fae3979615899c8b7dde95e5509.tar.bz2 android_packages_apps_Trebuchet-19d2e7fc55df1fae3979615899c8b7dde95e5509.zip | |
Re-enable badges, with all dots
am: f77a6f7fd7
Change-Id: I139ea47c73ee01a2777132f63b1d8add687579b0
Diffstat (limited to 'src/com/android/launcher3/graphics')
| -rw-r--r-- | src/com/android/launcher3/graphics/IconPalette.java | 2 | ||||
| -rw-r--r-- | src/com/android/launcher3/graphics/ShadowGenerator.java | 6 |
2 files changed, 3 insertions, 5 deletions
diff --git a/src/com/android/launcher3/graphics/IconPalette.java b/src/com/android/launcher3/graphics/IconPalette.java index 1212cba05..0182e53b9 100644 --- a/src/com/android/launcher3/graphics/IconPalette.java +++ b/src/com/android/launcher3/graphics/IconPalette.java @@ -35,7 +35,7 @@ public class IconPalette { private static final boolean DEBUG = false; private static final String TAG = "IconPalette"; - public static final IconPalette FOLDER_ICON_PALETTE = new IconPalette(Color.WHITE); + public static final IconPalette FOLDER_ICON_PALETTE = new IconPalette(Color.parseColor("#BDC1C6")); private static final float MIN_PRELOAD_COLOR_SATURATION = 0.2f; private static final float MIN_PRELOAD_COLOR_LIGHTNESS = 0.6f; diff --git a/src/com/android/launcher3/graphics/ShadowGenerator.java b/src/com/android/launcher3/graphics/ShadowGenerator.java index 5dd8d200b..469fe34e9 100644 --- a/src/com/android/launcher3/graphics/ShadowGenerator.java +++ b/src/com/android/launcher3/graphics/ShadowGenerator.java @@ -87,8 +87,6 @@ public class ShadowGenerator { float shadowRadius = height * 1f / 32; float shadowYOffset = height * 1f / 16; - int ambientShadowAlpha = AMBIENT_SHADOW_ALPHA / 2; - int keyShadowAlpha = KEY_SHADOW_ALPHA / 2; int radius = height / 2; @@ -109,11 +107,11 @@ public class ShadowGenerator { int bottom = center + height / 2; // Draw ambient shadow, center aligned within size - blurPaint.setAlpha(ambientShadowAlpha); + blurPaint.setAlpha(AMBIENT_SHADOW_ALPHA); canvas.drawRoundRect(left, top, right, bottom, radius, radius, blurPaint); // Draw key shadow, bottom aligned within size - blurPaint.setAlpha(keyShadowAlpha); + blurPaint.setAlpha(KEY_SHADOW_ALPHA); canvas.drawRoundRect(left, top + shadowYOffset, right, bottom + shadowYOffset, radius, radius, blurPaint); |