Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d31c4c90 authored by Lucas Dupin's avatar Lucas Dupin Committed by android-build-merger
Browse files

Merge "Darker extracted gradients." into oc-dr1-dev am: eaac5e2f 

am: df6048a1

Change-Id: I4553cc8cd5991756e96451b417a128f7b61f041f
parents 1c0e40d2 df6048a1

packages/SystemUI/colorextraction/src/com/google/android/colorextraction/types/Tonal.java

+154 −139

File changed.

Preview size limit exceeded, changes collapsed.

packages/SystemUI/src/com/android/systemui/recents/views/RecentsView.java

+3 −2
Original line number Diff line number Diff line
@@ -878,7 +878,8 @@ public class RecentsView extends FrameLayout implements ColorExtractor.OnColorsC 
            // Recents doesn't care about the wallpaper being visible or not, it always

            // wants to scrim with wallpaper colors

            mBackgroundScrim.setColors(

                    mColorExtractor.getColors(WallpaperManager.FLAG_SYSTEM, true));

                    mColorExtractor.getColors(WallpaperManager.FLAG_SYSTEM,

                            ColorExtractor.TYPE_DARK, true));

        }

    }
@@ -886,7 +887,7 @@ public class RecentsView extends FrameLayout implements ColorExtractor.OnColorsC 
        mColorExtractor.addOnColorsChangedListener(this);

        // Getting system scrim colors ignoring wallpaper visibility since it should never be grey.

        ColorExtractor.GradientColors systemColors = mColorExtractor.getColors(

                WallpaperManager.FLAG_SYSTEM, true);

                ColorExtractor.TYPE_DARK, WallpaperManager.FLAG_SYSTEM, true);

        // We don't want to interpolate colors because we're defining the initial state.

        // Gradient should be set/ready when you open "Recents".

        mBackgroundScrim.setColors(systemColors, false);

packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimController.java

+3 −14
Original line number Diff line number Diff line
@@ -81,9 +81,7 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener, 


    private final SysuiColorExtractor mColorExtractor;

    private ColorExtractor.GradientColors mLockColors;

    private ColorExtractor.GradientColors mLockColorsDark;

    private ColorExtractor.GradientColors mSystemColors;

    private ColorExtractor.GradientColors mSystemColorsDark;

    private boolean mNeedsDrawableColorUpdate;



    protected float mScrimBehindAlpha;
@@ -135,13 +133,8 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener, 
        mColorExtractor = Dependency.get(SysuiColorExtractor.class);

        mColorExtractor.addOnColorsChangedListener(this);

        mLockColors = mColorExtractor.getColors(WallpaperManager.FLAG_LOCK,

                ColorExtractor.TYPE_NORMAL, true /* ignoreVisibility */);

        mSystemColors = mColorExtractor.getColors(WallpaperManager.FLAG_SYSTEM,

                ColorExtractor.TYPE_NORMAL, true /* ignoreVisibility */);

        // Darker gradient for the top scrim (mScrimInFront)

        mLockColorsDark = mColorExtractor.getColors(WallpaperManager.FLAG_LOCK,

                ColorExtractor.TYPE_DARK, true /* ignoreVisibility */);

        mSystemColorsDark = mColorExtractor.getColors(WallpaperManager.FLAG_SYSTEM,

        mSystemColors = mColorExtractor.getColors(WallpaperManager.FLAG_SYSTEM,

                ColorExtractor.TYPE_DARK, true /* ignoreVisibility */);

        mNeedsDrawableColorUpdate = true;
@@ -311,13 +304,13 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener, 
            mNeedsDrawableColorUpdate = false;

            if (mKeyguardShowing) {

                // Always animate color changes if we're seeing the keyguard

                mScrimInFront.setColors(mLockColorsDark);

                mScrimInFront.setColors(mLockColors);

                mScrimBehind.setColors(mLockColors);

            } else {

                // Only animate scrim color if the scrim view is actually visible

                boolean animateScrimInFront = mScrimInFront.getViewAlpha() != 0;

                boolean animateScrimBehind = mScrimBehind.getViewAlpha() != 0;

                mScrimInFront.setColors(mSystemColorsDark, animateScrimInFront);

                mScrimInFront.setColors(mSystemColors, animateScrimInFront);

                mScrimBehind.setColors(mSystemColors, animateScrimBehind);

            }

        }
@@ -663,16 +656,12 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener, 
    public void onColorsChanged(ColorExtractor colorExtractor, int which) {

        if ((which & WallpaperManager.FLAG_LOCK) != 0) {

            mLockColors = mColorExtractor.getColors(WallpaperManager.FLAG_LOCK,

                    ColorExtractor.TYPE_NORMAL, true /* ignoreVisibility */);

            mLockColorsDark = mColorExtractor.getColors(WallpaperManager.FLAG_LOCK,

                    ColorExtractor.TYPE_DARK, true /* ignoreVisibility */);

            mNeedsDrawableColorUpdate = true;

            scheduleUpdate();

        }

        if ((which & WallpaperManager.FLAG_SYSTEM) != 0) {

            mSystemColors = mColorExtractor.getColors(WallpaperManager.FLAG_SYSTEM,

                    ColorExtractor.TYPE_NORMAL, mKeyguardShowing);

            mSystemColorsDark = mColorExtractor.getColors(WallpaperManager.FLAG_SYSTEM,

                    ColorExtractor.TYPE_DARK, mKeyguardShowing);

            mNeedsDrawableColorUpdate = true;

            scheduleUpdate();