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

Commit 494fdeaf authored by Joshua Tsuji's avatar Joshua Tsuji
Browse files

When opening from locked shade, wait for the shade to unlock before expanding. 

Bug: 159270619
Test: open notifs from a locked shade!
Change-Id: Ibc8312895c4e4321b6a98b60a24ab7c13662e239
parent 14849cfb

packages/SystemUI/src/com/android/systemui/bubbles/BubbleController.java

+33 −12
Original line number Diff line number Diff line
@@ -183,6 +183,12 @@ public class BubbleController implements ConfigurationController.ConfigurationLi 
    // Only load overflow data from disk once

    private boolean mOverflowDataLoaded = false;



    /**

     * When the shade status changes to SHADE (from anything but SHADE, like LOCKED) we'll select

     * this bubble and expand the stack.

     */

    @Nullable private NotificationEntry mNotifEntryToExpandOnShadeUnlock;



    private final NotificationInterruptStateProvider mNotificationInterruptStateProvider;

    private IStatusBarService mBarService;

    private WindowManager mWindowManager;
@@ -292,6 +298,12 @@ public class BubbleController implements ConfigurationController.ConfigurationLi 
            if (shouldCollapse) {

                collapseStack();

            }



            if (mNotifEntryToExpandOnShadeUnlock != null) {

                expandStackAndSelectBubble(mNotifEntryToExpandOnShadeUnlock);

                mNotifEntryToExpandOnShadeUnlock = null;

            }



            updateStack();

        }

    }
@@ -930,6 +942,9 @@ public class BubbleController implements ConfigurationController.ConfigurationLi 
     * @param entry the notification for the bubble to be selected

     */

    public void expandStackAndSelectBubble(NotificationEntry entry) {

        if (mStatusBarStateListener.getCurrentState() == SHADE) {

            mNotifEntryToExpandOnShadeUnlock = null;



            String key = entry.getKey();

            Bubble bubble = mBubbleData.getBubbleInStackWithKey(key);

            if (bubble != null) {
@@ -945,6 +960,12 @@ public class BubbleController implements ConfigurationController.ConfigurationLi 
                    setIsBubble(entry, true /* isBubble */, true /* autoExpand */);

                }

            }

        } else {

            // Wait until we're unlocked to expand, so that the user can see the expand animation

            // and also to work around bugs with expansion animation + shade unlock happening at the

            // same time.

            mNotifEntryToExpandOnShadeUnlock = entry;

        }

    }



    /**