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

Commit 49bc5d29 authored by Matt Pietal's avatar Matt Pietal
Browse files

Flag cleanup 

Fixes: 409609131
Test: N/A
Flag: EXEMPT flag deleted
Change-Id: I799505f068e19edc735b5fd3109063a6366b1bf5
parent 7bbfe59e

packages/SystemUI/aconfig/systemui.aconfig

+0 −10
Original line number Diff line number Diff line
@@ -1620,16 +1620,6 @@ flag { 
   }

}



flag {

   name: "use_transitions_for_keyguard_occluded"

   namespace: "systemui"

   description: "Use Keyguard Transitions to set Notification Shade occlusion state"

   bug: "344716537"

   metadata {

        purpose: PURPOSE_BUGFIX

   }

}



flag {

   name: "relock_with_power_button_immediately"

   namespace: "systemui"

packages/SystemUI/src/com/android/systemui/shade/NotificationShadeWindowControllerImpl.java

+1 −1
Original line number Diff line number Diff line
@@ -364,7 +364,7 @@ public class NotificationShadeWindowControllerImpl implements NotificationShadeW 
            );

        }



        if (!SceneContainerFlag.isEnabled() && Flags.useTransitionsForKeyguardOccluded()) {

        if (!SceneContainerFlag.isEnabled()) {

            collectFlow(

                    mWindowRootView,

                    mNotificationShadeWindowModel.isKeyguardOccluded(),

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

+0 −6
Original line number Diff line number Diff line
@@ -1146,9 +1146,6 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb 
                    SysUiStatsLog.KEYGUARD_STATE_CHANGED__STATE__OCCLUDED);

            if (mCentralSurfaces.isLaunchingActivityOverLockscreen()) {

                final Runnable postCollapseAction = () -> {

                    if (!Flags.useTransitionsForKeyguardOccluded()) {

                        mNotificationShadeWindowController.setKeyguardOccluded(isOccluded);

                    }

                    reset(true /* hideBouncerWhenShowing */);

                };

                if (mCentralSurfaces.isDismissingShadeForActivityLaunch()) {
@@ -1164,9 +1161,6 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb 
            SysUiStatsLog.write(SysUiStatsLog.KEYGUARD_STATE_CHANGED,

                    SysUiStatsLog.KEYGUARD_STATE_CHANGED__STATE__SHOWN);

        }

        if (!Flags.useTransitionsForKeyguardOccluded()) {

            mNotificationShadeWindowController.setKeyguardOccluded(isOccluded);

        }



        // setDozing(false) will call reset once we stop dozing. Also, if we're going away, there's

        // no need to reset the keyguard views as we'll be gone shortly. Resetting now could cause