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

Commit 37dc894a authored by Jeff DeCew's avatar Jeff DeCew Committed by Automerger Merge Worker
Browse files

Merge "Fix Notification redaction when power cycling a non-dozing device while... 

Merge "Fix Notification redaction when power cycling a non-dozing device while occluded." into sc-dev am: 279ecc9d

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



Change-Id: I9af5cc1f1b70733bfb87aa10562e3bb8915e29c7
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b9411538 279ecc9d

packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayoutController.java

+7 −0
Original line number Diff line number Diff line
@@ -329,6 +329,13 @@ public class NotificationStackScrollLayoutController { 
        }

    };



    /**

     * Recalculate sensitiveness without animation; called when waking up while keyguard occluded.

     */

    public void updateSensitivenessForOccludedWakeup() {

        mView.updateSensitiveness(false, mLockscreenUserManager.isAnyProfilePublicMode());

    }



    /**

     * Set the overexpansion of the panel to be applied to the view.

     */

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

+11 −0
Original line number Diff line number Diff line
@@ -4159,6 +4159,17 @@ public class StatusBar extends SystemUI implements DemoMode, 
            mWakeUpCoordinator.setFullyAwake(true);

            mBypassHeadsUpNotifier.setFullyAwake(true);

            mWakeUpCoordinator.setWakingUp(false);

            if (isOccluded() && !mDozeParameters.canControlUnlockedScreenOff()) {

                // When the keyguard is occluded we don't use the KEYGUARD state which would

                // normally cause these redaction updates.  If AOD is on, the KEYGUARD state is used

                // to show the doze, AND UnlockedScreenOffAnimationController.onFinishedWakingUp()

                // would force a KEYGUARD state that would take care of recalculating redaction.

                // So if AOD is off or unsupported we need to trigger these updates at screen on

                // when the keyguard is occluded.

                mLockscreenUserManager.updatePublicMode();

                mNotificationPanelViewController.getNotificationStackScrollLayoutController()

                        .updateSensitivenessForOccludedWakeup();

            }

            if (mLaunchCameraWhenFinishedWaking) {

                mNotificationPanelViewController.launchCamera(

                        false /* animate */, mLastCameraLaunchSource);