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

Commit 545db2a2 authored by Ioana Alexandru's avatar Ioana Alexandru
Browse files

Fix shade not closing on clear all when locked 

Although we're calling NSSL#clearNotifications with closeShade=true, the
actual runnable for closing the shade leads to
ShadeControllerImpl#animateCollapseShade. This has an early return if
we're not actually on the shade, but it only checks StatusBarState.SHADE
and doesn't consider the case where we're on the lockscreen.

Fix: 328448347
Test: have lots of notifications, lock device, press clear all
Flag: NONE
Change-Id: I7e9351ae515c0577204d7c95662aeacdabcb5ca8
parent be87f2e4

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

+3 −1
Original line number Diff line number Diff line
@@ -131,7 +131,9 @@ public final class ShadeControllerImpl extends BaseShadeControllerImpl { 
    @Override

    public void animateCollapseShade(int flags, boolean force, boolean delayed,

            float speedUpFactor) {

        if (!force && mStatusBarStateController.getState() != StatusBarState.SHADE) {

        int statusBarState = mStatusBarStateController.getState();

        if (!force && statusBarState != StatusBarState.SHADE

                && statusBarState != StatusBarState.SHADE_LOCKED) {

            runPostCollapseActions();

            return;

        }