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

Commit 78c33bb4 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fixing shade expanded after unfolding and unlocking with fingerprint"... 

Merge "Fixing shade expanded after unfolding and unlocking with fingerprint" into tm-qpr-dev am: 7c093004 am: 8a7fbb9e

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



Change-Id: I72e25ee8f2b60c79568f2bfda7f2d800b2812f7b
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 5608e505 8a7fbb9e

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

+3 −1
Original line number Diff line number Diff line
@@ -1089,7 +1089,6 @@ public class CentralSurfacesImpl extends CoreStartable implements 
                    isFolded, willGoToSleep, isShadeOpen, leaveOpen));

        }

        if (leaveOpen) {

            mStatusBarStateController.setLeaveOpenOnKeyguardHide(true);

            if (mKeyguardStateController.isShowing()) {

                // When device state changes on keyguard we don't want to keep the state of

                // the shade and instead we open clean state of keyguard with shade closed.
@@ -1098,6 +1097,9 @@ public class CentralSurfacesImpl extends CoreStartable implements 
                // expanded. To prevent that we can close QS which resets QS and some parts of

                // the shade to its default state. Read more in b/201537421

                mCloseQsBeforeScreenOff = true;

            } else {

                // below makes shade stay open when going from folded to unfolded

                mStatusBarStateController.setLeaveOpenOnKeyguardHide(true);

            }

        }

    }

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

+14 −0
Original line number Diff line number Diff line
@@ -965,6 +965,7 @@ public class CentralSurfacesImplTest extends SysuiTestCase { 


    @Test

    public void deviceStateChange_unfolded_shadeOpen_setsLeaveOpenOnKeyguardHide() {

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

        setFoldedStates(FOLD_STATE_FOLDED);

        setGoToSleepStates(FOLD_STATE_FOLDED);

        when(mNotificationPanelViewController.isFullyExpanded()).thenReturn(true);
@@ -974,6 +975,19 @@ public class CentralSurfacesImplTest extends SysuiTestCase { 
        verify(mStatusBarStateController).setLeaveOpenOnKeyguardHide(true);

    }



    @Test

    public void deviceStateChange_unfolded_shadeOpen_onKeyguard_doesNotSetLeaveOpenOnKeyguardHide() {

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

        setFoldedStates(FOLD_STATE_FOLDED);

        setGoToSleepStates(FOLD_STATE_FOLDED);

        when(mNotificationPanelViewController.isFullyExpanded()).thenReturn(true);



        setDeviceState(FOLD_STATE_UNFOLDED);



        verify(mStatusBarStateController, never()).setLeaveOpenOnKeyguardHide(true);

    }





    @Test

    public void deviceStateChange_unfolded_shadeClose_doesNotSetLeaveOpenOnKeyguardHide() {

        setFoldedStates(FOLD_STATE_FOLDED);