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

Commit a135d46b authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Merge cherrypicks of ['googleplex-android-review.googlesource.com/24281855',... 

Merge cherrypicks of ['googleplex-android-review.googlesource.com/24281855', 'googleplex-android-review.googlesource.com/24026547', 'googleplex-android-review.googlesource.com/24284551', 'googleplex-android-review.googlesource.com/24034687'] into sparse-10656238-L31700000962567991.
SPARSE_CHANGE: Id2e796edee45dae281f867c2b1549a80984c8a8e
SPARSE_CHANGE: I35df87ef05cb75dcd551cc4899a0a9863fdcbcc7
SPARSE_CHANGE: I890d102d10a3efa230e26e4e9753f9c66b71afdb
SPARSE_CHANGE: I67149c6faa2766be6d2537f2315dd2734bdd0447

Change-Id: I54ed2b18072eccd28ec199ad06e0cc8864f09a23
parents 59d4b5a2 0b184b66

packages/SystemUI/src/com/android/keyguard/KeyguardSecurityContainer.java

+0 −2
Original line number Diff line number Diff line
@@ -786,8 +786,6 @@ public class KeyguardSecurityContainer extends ConstraintLayout { 


    void reloadColors() {

        mViewMode.reloadColors();

        setBackgroundColor(Utils.getColorAttrDefaultColor(getContext(),

                com.android.internal.R.attr.materialColorSurface));

    }



    /** Handles density or font scale changes. */

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

+7 −0
Original line number Diff line number Diff line
@@ -1509,6 +1509,13 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener, Dump 
            mColors.setSupportsDarkText(

                    ColorUtils.calculateContrast(mColors.getMainColor(), Color.WHITE) > 4.5);

        }



        int surface = Utils.getColorAttr(mScrimBehind.getContext(),

                com.android.internal.R.attr.materialColorSurface).getDefaultColor();

        for (ScrimState state : ScrimState.values()) {

            state.setSurfaceColor(surface);

        }



        mNeedsDrawableColorUpdate = true;

    }

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

+14 −1
Original line number Diff line number Diff line
@@ -122,11 +122,19 @@ public enum ScrimState { 
        @Override

        public void prepare(ScrimState previousState) {

            mBehindAlpha = mClipQsScrim ? 1 : mDefaultScrimAlpha;

            mBehindTint = mClipQsScrim ? Color.BLACK : Color.TRANSPARENT;

            mBehindTint = mClipQsScrim ? Color.BLACK : mSurfaceColor;

            mNotifAlpha = mClipQsScrim ? mDefaultScrimAlpha : 0;

            mNotifTint = Color.TRANSPARENT;

            mFrontAlpha = 0f;

        }



        @Override

        public void setSurfaceColor(int surfaceColor) {

            super.setSurfaceColor(surfaceColor);

            if (!mClipQsScrim) {

                mBehindTint = mSurfaceColor;

            }

        }

    },



    /**
@@ -295,6 +303,7 @@ public enum ScrimState { 
    int mFrontTint = Color.TRANSPARENT;

    int mBehindTint = Color.TRANSPARENT;

    int mNotifTint = Color.TRANSPARENT;

    int mSurfaceColor = Color.TRANSPARENT;



    boolean mAnimateChange = true;

    float mAodFrontScrimAlpha;
@@ -409,6 +418,10 @@ public enum ScrimState { 
        mDefaultScrimAlpha = defaultScrimAlpha;

    }



    public void setSurfaceColor(int surfaceColor) {

        mSurfaceColor = surfaceColor;

    }



    public void setWallpaperSupportsAmbientMode(boolean wallpaperSupportsAmbientMode) {

        mWallpaperSupportsAmbientMode = wallpaperSupportsAmbientMode;

    }

packages/SystemUI/src/com/android/systemui/statusbar/window/StatusBarWindowController.java

+31 −4
Original line number Diff line number Diff line
@@ -240,8 +240,10 @@ public class StatusBarWindowController { 
                    Insets.of(0, safeTouchRegionHeight, 0, 0));

        }

        lp.providedInsets = new InsetsFrameProvider[] {

                new InsetsFrameProvider(mInsetsSourceOwner, 0, statusBars()),

                new InsetsFrameProvider(mInsetsSourceOwner, 0, tappableElement()),

                new InsetsFrameProvider(mInsetsSourceOwner, 0, statusBars())

                        .setInsetsSize(getInsets(height)),

                new InsetsFrameProvider(mInsetsSourceOwner, 0, tappableElement())

                        .setInsetsSize(getInsets(height)),

                gestureInsetsProvider

        };

        return lp;
@@ -306,11 +308,36 @@ public class StatusBarWindowController { 
        mLpChanged.height =

                state.mIsLaunchAnimationRunning ? ViewGroup.LayoutParams.MATCH_PARENT : mBarHeight;

        for (int rot = Surface.ROTATION_0; rot <= Surface.ROTATION_270; rot++) {

            int height = SystemBarUtils.getStatusBarHeightForRotation(mContext, rot);

            mLpChanged.paramsForRotation[rot].height =

                    state.mIsLaunchAnimationRunning ? ViewGroup.LayoutParams.MATCH_PARENT :

                    SystemBarUtils.getStatusBarHeightForRotation(mContext, rot);

                    state.mIsLaunchAnimationRunning ? ViewGroup.LayoutParams.MATCH_PARENT : height;

            // The status bar height could change at runtime if one display has a cutout while

            // another doesn't (like some foldables). It could also change when using debug cutouts.

            // So, we need to re-fetch the height and re-apply it to the insets each time to avoid

            // bugs like b/290300359.

            InsetsFrameProvider[] providers = mLpChanged.paramsForRotation[rot].providedInsets;

            if (providers != null) {

                for (InsetsFrameProvider provider : providers) {

                    provider.setInsetsSize(getInsets(height));

                }

            }

        }

    }



    /**

     * Get the insets that should be applied to the status bar window given the current status bar

     * height.

     *

     * The status bar window height can sometimes be full-screen (see {@link #applyHeight(State)}.

     * However, the status bar *insets* should *not* be full-screen, because this would prevent apps

     * from drawing any content and can cause animations to be cancelled (see b/283958440). Instead,

     * the status bar insets should always be equal to the space occupied by the actual status bar

     * content -- setting the insets correctly will prevent window manager from unnecessarily

     * re-drawing this window and other windows. This method provides the correct insets.

     */

    private Insets getInsets(int height) {

        return Insets.of(0, height, 0, 0);

    }



    private void apply(State state) {

        if (!mIsAttached) {

packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/ScrimControllerTest.java

+51 −8
Original line number Diff line number Diff line
@@ -44,6 +44,9 @@ import static kotlinx.coroutines.flow.FlowKt.emptyFlow; 


import android.animation.Animator;

import android.app.AlarmManager;

import android.content.Context;

import android.content.res.ColorStateList;

import android.content.res.TypedArray;

import android.graphics.Color;

import android.os.Handler;

import android.testing.AndroidTestingRunner;
@@ -121,6 +124,7 @@ public class ScrimControllerTest extends SysuiTestCase { 
    private int mScrimVisibility;

    private boolean mAlwaysOnEnabled;

    private TestableLooper mLooper;

    private Context mContext;

    @Mock private AlarmManager mAlarmManager;

    @Mock private DozeParameters mDozeParameters;

    @Mock private LightBarController mLightBarController;
@@ -134,6 +138,7 @@ public class ScrimControllerTest extends SysuiTestCase { 
    @Mock private PrimaryBouncerToGoneTransitionViewModel mPrimaryBouncerToGoneTransitionViewModel;

    @Mock private KeyguardTransitionInteractor mKeyguardTransitionInteractor;

    @Mock private CoroutineDispatcher mMainDispatcher;

    @Mock private TypedArray mMockTypedArray;



    // TODO(b/204991468): Use a real PanelExpansionStateManager object once this bug is fixed. (The

    //   event-dispatch-on-registration pattern caused some of these unit tests to fail.)
@@ -182,10 +187,11 @@ public class ScrimControllerTest extends SysuiTestCase { 
            mNumEnds = 0;

            mNumCancels = 0;

        }

    };

    }



    private AnimatorListener mAnimatorListener = new AnimatorListener();



    private int mSurfaceColor = 0x112233;



    private void finishAnimationsImmediately() {

        // Execute code that will trigger animations.
@@ -214,10 +220,17 @@ public class ScrimControllerTest extends SysuiTestCase { 
    @Before

    public void setup() {

        MockitoAnnotations.initMocks(this);

        mContext = spy(getContext());

        when(mContext.obtainStyledAttributes(

                new int[]{com.android.internal.R.attr.materialColorSurface}))

                .thenReturn(mMockTypedArray);



        when(mMockTypedArray.getColorStateList(anyInt()))

                .thenAnswer((invocation) -> ColorStateList.valueOf(mSurfaceColor));



        mScrimBehind = spy(new ScrimView(getContext()));

        mScrimInFront = new ScrimView(getContext());

        mNotificationsScrim = new ScrimView(getContext());

        mScrimBehind = spy(new ScrimView(mContext));

        mScrimInFront = new ScrimView(mContext);

        mNotificationsScrim = new ScrimView(mContext);

        mAlwaysOnEnabled = true;

        mLooper = TestableLooper.get(this);

        DejankUtils.setImmediate(true);
@@ -577,7 +590,7 @@ public class ScrimControllerTest extends SysuiTestCase { 
        mScrimController.transitionTo(BOUNCER);

        finishAnimationsImmediately();

        // Front scrim should be transparent

        // Back scrim should be visible without tint

        // Back scrim should be visible and tinted to the surface color

        assertScrimAlpha(Map.of(

                mScrimInFront, TRANSPARENT,

                mNotificationsScrim, TRANSPARENT,
@@ -585,9 +598,31 @@ public class ScrimControllerTest extends SysuiTestCase { 


        assertScrimTinted(Map.of(

                mScrimInFront, false,

                mScrimBehind, false,

                mScrimBehind, true,

                mNotificationsScrim, false

        ));



        assertScrimTint(mScrimBehind, mSurfaceColor);

    }



    @Test

    public void onThemeChange_bouncerBehindTint_isUpdatedToSurfaceColor() {

        assertEquals(BOUNCER.getBehindTint(), 0x112233);

        mSurfaceColor = 0x223344;

        mConfigurationController.notifyThemeChanged();

        assertEquals(BOUNCER.getBehindTint(), 0x223344);

    }



    @Test

    public void onThemeChangeWhileClipQsScrim_bouncerBehindTint_remainsBlack() {

        mScrimController.setClipsQsScrim(true);

        mScrimController.transitionTo(BOUNCER);

        finishAnimationsImmediately();



        assertEquals(BOUNCER.getBehindTint(), Color.BLACK);

        mSurfaceColor = 0x223344;

        mConfigurationController.notifyThemeChanged();

        assertEquals(BOUNCER.getBehindTint(), Color.BLACK);

    }



    @Test
@@ -619,16 +654,17 @@ public class ScrimControllerTest extends SysuiTestCase { 


        finishAnimationsImmediately();

        // Front scrim should be transparent

        // Back scrim should be visible without tint

        // Back scrim should be visible and has a tint of surfaceColor

        assertScrimAlpha(Map.of(

                mScrimInFront, TRANSPARENT,

                mNotificationsScrim, TRANSPARENT,

                mScrimBehind, OPAQUE));

        assertScrimTinted(Map.of(

                mScrimInFront, false,

                mScrimBehind, false,

                mScrimBehind, true,

                mNotificationsScrim, false

        ));

        assertScrimTint(mScrimBehind, mSurfaceColor);

    }



    @Test
@@ -1809,6 +1845,13 @@ public class ScrimControllerTest extends SysuiTestCase { 
        assertEquals(message, hasTint, scrim.getTint() != Color.TRANSPARENT);

    }



    private void assertScrimTint(ScrimView scrim, int expectedTint) {

        String message = "Tint test failed with expected scrim tint: "

                + Integer.toHexString(expectedTint) + " and actual tint: "

                + Integer.toHexString(scrim.getTint()) + " for scrim: " + getScrimName(scrim);

        assertEquals(message, expectedTint, scrim.getTint(), 0.1);

    }



    private String getScrimName(ScrimView scrim) {

        if (scrim == mScrimInFront) {

            return "front";