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

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

Merge "Don't collapse the panel post launch if we went back to sleep." into tm-dev am: a90351d7

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

Change-Id: I7afe8e8d8b8ceceef8d1df7c2bf927f760adbacc
parents eb47ff6e a90351d7
Loading
Loading
Loading
Loading
+7 −1
Original line number Diff line number Diff line
@@ -1870,7 +1870,13 @@ public class CentralSurfaces extends CoreStartable implements
        if (!mPresenter.isCollapsing()) {
            onClosingFinished();
        }
        if (launchIsFullScreen) {

        // Collapse the panel if we're launching in fullscreen, over the lockscreen. Do not do this
        // if the device has gone back to sleep - through a horrific chain of 15 or so function
        // calls, instantCollapseNotificationPanel will eventually call through to
        // StatusBar#wakeUpIfDozing, which will wake the device up even if it was put to sleep
        // during the launch animation.
        if (launchIsFullScreen && mPowerManager.isInteractive()) {
            instantCollapseNotificationPanel();
        }
    }