diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2018-05-14 21:30:40 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2018-05-14 21:30:40 +0000 |
| commit | 047437e738a4bbc892fff545f6f772e32d93062b (patch) | |
| tree | c06d7af1f37f36fb1f69b3bbc11066fa56da0f75 /quickstep | |
| parent | cabc1ff276743b45abcdf4ea0e1367d09c2e26d2 (diff) | |
| parent | 039b9d2bedf4c7dcdb40fef94dca2b9fc581a8aa (diff) | |
| download | android_packages_apps_Trebuchet-047437e738a4bbc892fff545f6f772e32d93062b.tar.gz android_packages_apps_Trebuchet-047437e738a4bbc892fff545f6f772e32d93062b.tar.bz2 android_packages_apps_Trebuchet-047437e738a4bbc892fff545f6f772e32d93062b.zip | |
Merge "Increating the scrim alpha for super-light wallpapers" into ub-launcher3-edmonton
Diffstat (limited to 'quickstep')
| -rw-r--r-- | quickstep/src/com/android/quickstep/views/ShelfScrimView.java | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/quickstep/src/com/android/quickstep/views/ShelfScrimView.java b/quickstep/src/com/android/quickstep/views/ShelfScrimView.java index b47af2d3a..69b77b453 100644 --- a/quickstep/src/com/android/quickstep/views/ShelfScrimView.java +++ b/quickstep/src/com/android/quickstep/views/ShelfScrimView.java @@ -47,6 +47,7 @@ public class ShelfScrimView extends ScrimView { private static final int THRESHOLD_ALPHA_DARK = 102; private static final int THRESHOLD_ALPHA_LIGHT = 46; + private static final int THRESHOLD_ALPHA_SUPER_LIGHT = 128; // In transposed layout, we simply draw a flat color. private boolean mDrawingFlatColor; @@ -76,8 +77,13 @@ public class ShelfScrimView extends ScrimView { mMaxScrimAlpha = OVERVIEW.getWorkspaceScrimAlpha(mLauncher); mEndAlpha = Color.alpha(mEndScrim); - mThresholdAlpha = Themes.getAttrBoolean(mLauncher, R.attr.isMainColorDark) - ? THRESHOLD_ALPHA_DARK : THRESHOLD_ALPHA_LIGHT; + if (Themes.getAttrBoolean(mLauncher, R.attr.isMainColorDark)) { + mThresholdAlpha = THRESHOLD_ALPHA_DARK; + } else if (Themes.getAttrBoolean(mLauncher, R.attr.isWorkspaceDarkText)) { + mThresholdAlpha = THRESHOLD_ALPHA_SUPER_LIGHT; + } else { + mThresholdAlpha = THRESHOLD_ALPHA_LIGHT; + } mRadius = mLauncher.getResources().getDimension(R.dimen.shelf_surface_radius); mPaint = new Paint(Paint.ANTI_ALIAS_FLAG); |