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

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

Snap for 7783696 from 3da1d635 to sc-qpr1-d-release 

Change-Id: I5b6942efc25ac616a837f48c372ad303a456bddd
parents de460d15 3da1d635

libs/WindowManager/Shell/src/com/android/wm/shell/startingsurface/TaskSnapshotWindow.java

+1 −1
Original line number Diff line number Diff line
@@ -123,7 +123,7 @@ public class TaskSnapshotWindow { 
     * Ideally the delay time will be shorter when receiving

     * {@link StartingSurfaceDrawer#onImeDrawnOnTask(int)}.

     */

    private static final long MAX_DELAY_REMOVAL_TIME_IME_VISIBLE = 450;

    private static final long MAX_DELAY_REMOVAL_TIME_IME_VISIBLE = 600;



    //tmp vars for unused relayout params

    private static final Point TMP_SURFACE_SIZE = new Point();

location/java/android/location/GpsNavigationMessage.java

+2 −6
Original line number Diff line number Diff line
@@ -262,12 +262,8 @@ public class GpsNavigationMessage implements Parcelable { 
            parcel.readByteArray(data);

            navigationMessage.setData(data);



            if (parcel.dataAvail() >= Integer.SIZE) {

            int status = parcel.readInt();

            navigationMessage.setStatus((short) status);

            } else {

                navigationMessage.setStatus(STATUS_UNKNOWN);

            }



            return navigationMessage;

        }

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

+2 −0
Original line number Diff line number Diff line
@@ -1264,6 +1264,8 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener, Dump 
        pw.println(mDefaultScrimAlpha);

        pw.print("  mExpansionFraction=");

        pw.println(mPanelExpansion);

        pw.print("  mExpansionAffectsAlpha=");

        pw.println(mExpansionAffectsAlpha);



        pw.print("  mState.getMaxLightRevealScrimAlpha=");

        pw.println(mState.getMaxLightRevealScrimAlpha());

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

+5 −2
Original line number Diff line number Diff line
@@ -4466,8 +4466,11 @@ public class StatusBar extends SystemUI implements DemoMode, 
                || mKeyguardStateController.isKeyguardFadingAway();



        // Do not animate the scrim expansion when triggered by the fingerprint sensor.

        mScrimController.setExpansionAffectsAlpha(

                !mBiometricUnlockController.isBiometricUnlock());

        boolean onKeyguardOrHidingIt = mKeyguardStateController.isShowing()

                || mKeyguardStateController.isKeyguardFadingAway()

                || mKeyguardStateController.isKeyguardGoingAway();

        mScrimController.setExpansionAffectsAlpha(!(mBiometricUnlockController.isBiometricUnlock()

                        && onKeyguardOrHidingIt));



        boolean launchingAffordanceWithPreview =

                mNotificationPanelViewController.isLaunchingAffordanceWithPreview();

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

+28 −0
Original line number Diff line number Diff line
@@ -823,6 +823,34 @@ public class StatusBarTest extends SysuiTestCase { 
        verify(mScrimController).transitionTo(eq(ScrimState.UNLOCKED), any());

    }



    @Test

    public void testSetExpansionAffectsAlpha_onlyWhenHidingKeyguard() {

        mStatusBar.updateScrimController();

        verify(mScrimController).setExpansionAffectsAlpha(eq(true));



        clearInvocations(mScrimController);

        when(mBiometricUnlockController.isBiometricUnlock()).thenReturn(true);

        mStatusBar.updateScrimController();

        verify(mScrimController).setExpansionAffectsAlpha(eq(true));



        clearInvocations(mScrimController);

        when(mKeyguardStateController.isShowing()).thenReturn(true);

        mStatusBar.updateScrimController();

        verify(mScrimController).setExpansionAffectsAlpha(eq(false));



        clearInvocations(mScrimController);

        reset(mKeyguardStateController);

        when(mKeyguardStateController.isKeyguardFadingAway()).thenReturn(true);

        mStatusBar.updateScrimController();

        verify(mScrimController).setExpansionAffectsAlpha(eq(false));



        clearInvocations(mScrimController);

        reset(mKeyguardStateController);

        when(mKeyguardStateController.isKeyguardGoingAway()).thenReturn(true);

        mStatusBar.updateScrimController();

        verify(mScrimController).setExpansionAffectsAlpha(eq(false));

    }



    @Test

    public void testTransitionLaunch_noPreview_doesntGoUnlocked() {

        mStatusBar.setBarStateForTest(StatusBarState.KEYGUARD);