diff options
| author | Sunny Goyal <sunnygoyal@google.com> | 2017-05-24 13:19:15 -0700 |
|---|---|---|
| committer | Sunny Goyal <sunnygoyal@google.com> | 2017-05-24 14:34:04 -0700 |
| commit | 368ae772018c12349d7bf1b27d8817e7644b08c2 (patch) | |
| tree | 9163783e4105f12f41bcc3a36d43ba6f58eaa064 /src/com/android/launcher3/graphics | |
| parent | 94652a207ff0ae5dcfa436bcdfad3538466fca3d (diff) | |
| download | android_packages_apps_Trebuchet-368ae772018c12349d7bf1b27d8817e7644b08c2.tar.gz android_packages_apps_Trebuchet-368ae772018c12349d7bf1b27d8817e7644b08c2.tar.bz2 android_packages_apps_Trebuchet-368ae772018c12349d7bf1b27d8817e7644b08c2.zip | |
Defining a dark theme for launcher
> Removing the code for LIGHT_STATUS_BAR as that will be controlled by the theme
> Updating icon cache to always use transparent background for low-res, as the
theme can change the bg color
Change-Id: Iab64ec29cab629ee515af22ec15b95d3f40a9df5
Diffstat (limited to 'src/com/android/launcher3/graphics')
| -rw-r--r-- | src/com/android/launcher3/graphics/GradientView.java | 2 | ||||
| -rw-r--r-- | src/com/android/launcher3/graphics/ScrimView.java | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/com/android/launcher3/graphics/GradientView.java b/src/com/android/launcher3/graphics/GradientView.java index 8f16e9366..8f9f871a4 100644 --- a/src/com/android/launcher3/graphics/GradientView.java +++ b/src/com/android/launcher3/graphics/GradientView.java @@ -42,7 +42,7 @@ public class GradientView extends View { private static final int DEFAULT_COLOR = Color.WHITE; private static final float GRADIENT_ALPHA_MASK_LENGTH_DP = 300; - private static final float FINAL_GRADIENT_ALPHA = 0.75f; + private static final int FINAL_GRADIENT_ALPHA = 0xBF; private static final boolean DEBUG = false; private static Bitmap sFinalGradientMask; diff --git a/src/com/android/launcher3/graphics/ScrimView.java b/src/com/android/launcher3/graphics/ScrimView.java index 5c739ac99..2c5b9edb7 100644 --- a/src/com/android/launcher3/graphics/ScrimView.java +++ b/src/com/android/launcher3/graphics/ScrimView.java @@ -32,6 +32,7 @@ import android.view.animation.Interpolator; import com.android.launcher3.Launcher; import com.android.launcher3.R; import com.android.launcher3.Utilities; +import com.android.launcher3.util.Themes; public class ScrimView extends View { @@ -39,9 +40,6 @@ public class ScrimView extends View { private static final int MASK_HEIGHT_DP = 300; private static final float MASK_START_LENGTH_FACTOR = 1f; - private static final float FINAL_ALPHA = 0.87f; - private static final int SCRIM_COLOR = ColorUtils.setAlphaComponent( - Color.WHITE, (int) (FINAL_ALPHA * 255)); private static final boolean APPLY_ALPHA = true; private static Bitmap sFinalScrimMask; @@ -63,18 +61,20 @@ public class ScrimView extends View { super(context, attrs); mMaskHeight = Utilities.pxFromDp(MASK_HEIGHT_DP, getResources().getDisplayMetrics()); mHeadStart = (int) (mMaskHeight * MASK_START_LENGTH_FACTOR); - mPaint.setColor(SCRIM_COLOR); mAlphaStart = Launcher.getLauncher(context) .getDeviceProfile().isVerticalBarLayout() ? 0 : 55; + int scrimColor = Themes.getAttrColor(context, R.attr.allAppsScrimColor); + int scrimAlpha = Color.alpha(scrimColor); + mPaint.setColor(scrimColor); if (sFinalScrimMask == null) { sFinalScrimMask = Utilities.convertToAlphaMask( - Utilities.createOnePixBitmap(), FINAL_ALPHA); + Utilities.createOnePixBitmap(), scrimAlpha); } if (sAlphaScrimMask == null) { Bitmap alphaMaskFromResource = BitmapFactory.decodeResource(getResources(), R.drawable.all_apps_alpha_mask); - sAlphaScrimMask = Utilities.convertToAlphaMask(alphaMaskFromResource, FINAL_ALPHA); + sAlphaScrimMask = Utilities.convertToAlphaMask(alphaMaskFromResource, scrimAlpha); } } |