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

Commit 00fe4e5a authored by Andre Le's avatar Andre Le
Browse files

Flexiglass: Disable hideKeyguardImpl when SceneContainer is enabled 

When clicking on the Settings button on QS or notification shade while
lockscreen is on, the Intent doesn't launch successfully because
hideKeyguardImpl makes the lockscreen re-appear after collapsing
QS/notification shade. This call is not needed anymore when
SceneContainer is enabled, so we remove it to avoid the issue.

Bug: 398780316
Test: PlatformScenarioTests:android.platform.test.scenario.sysui.multiuser.OpenUserSettings
Flag: com.android.systemui.scene_container

Change-Id: Ifee63cb34e5d9afc85374f216e716fe4eb7ba65f
parent 5210ef7e

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

+2 −0
Original line number Diff line number Diff line
@@ -2235,6 +2235,8 @@ public class CentralSurfacesImpl implements CoreStartable, CentralSurfaces { 
     */

    @Override

    public boolean hideKeyguardImpl(boolean forceStateChange) {

        if (SceneContainerFlag.isEnabled()) return false;



        Trace.beginSection("CentralSurfaces#hideKeyguard");

        boolean staying = mStatusBarStateController.leaveOpenOnKeyguardHide();

        int previousState = mStatusBarStateController.getState();