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

Commit c90de394 authored by Android Build Prod User's avatar Android Build Prod User Committed by Automerger Merge Worker
Browse files

Merge "On keyguard unoccluding, set notif scrim alpha to KEYGUARD_SCRIM_ALPHA"... 

Merge "On keyguard unoccluding, set notif scrim alpha to KEYGUARD_SCRIM_ALPHA" into sc-dev am: 0f2a769d am: 6d2b39ff

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15662498

Change-Id: Ie11b280ebea0f744d96679a1f4c7d11b59893ad1
parents 4c4b2106 6d2b39ff

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

+2 −1
Original line number Diff line number Diff line
@@ -696,7 +696,8 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener, Dump 
            }

            if (mUnOcclusionAnimationRunning && mState == ScrimState.KEYGUARD) {

                // We're unoccluding the keyguard and don't want to have a bright flash.

                mNotificationsAlpha = 0f;

                mNotificationsAlpha = KEYGUARD_SCRIM_ALPHA;

                mNotificationsTint = ScrimState.KEYGUARD.getNotifTint();

            }

        }

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

+5 −2
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 


package com.android.systemui.statusbar.phone;



import static com.android.systemui.statusbar.phone.ScrimController.KEYGUARD_SCRIM_ALPHA;

import static com.android.systemui.statusbar.phone.ScrimController.OPAQUE;

import static com.android.systemui.statusbar.phone.ScrimController.SEMI_TRANSPARENT;

import static com.android.systemui.statusbar.phone.ScrimController.TRANSPARENT;
@@ -1187,8 +1188,10 @@ public class ScrimControllerTest extends SysuiTestCase { 
        mScrimController.transitionTo(ScrimState.KEYGUARD);

        mScrimController.setUnocclusionAnimationRunning(true);



        assertAlphaAfterExpansion(mNotificationsScrim, /* alpha */ 0.0f, /* expansion */ 0.0f);

        assertAlphaAfterExpansion(mNotificationsScrim, /* alpha */ 0.0f, /* expansion */ 1.0f);

        assertAlphaAfterExpansion(mNotificationsScrim, /* alpha */ KEYGUARD_SCRIM_ALPHA,

                /* expansion */ 0.0f);

        assertAlphaAfterExpansion(mNotificationsScrim, /* alpha */ KEYGUARD_SCRIM_ALPHA,

                /* expansion */ 1.0f);



        // Verify normal behavior after

        mScrimController.setUnocclusionAnimationRunning(false);