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

Commit 26166789 authored by Ats Jenk's avatar Ats Jenk Committed by Automerger Merge Worker
Browse files

Merge "Fix bug with clearing bubble to expand" into tm-qpr-dev am: ebd5de1c 

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



Change-Id: I33e8b856df97e0641c7c42880bafe73447633aef
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 08f47787 ebd5de1c

libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleController.java

+0 −1
Original line number Diff line number Diff line
@@ -538,7 +538,6 @@ public class BubbleController implements ConfigurationChangeListener { 


        if (mNotifEntryToExpandOnShadeUnlock != null) {

            expandStackAndSelectBubble(mNotifEntryToExpandOnShadeUnlock);

            mNotifEntryToExpandOnShadeUnlock = null;

        }



        updateStack();

packages/SystemUI/tests/src/com/android/systemui/wmshell/BubblesTest.java

+27 −0
Original line number Diff line number Diff line
@@ -1395,6 +1395,33 @@ public class BubblesTest extends SysuiTestCase { 
        assertThat(stackView.getVisibility()).isEqualTo(View.VISIBLE);

    }



    /**

     * Test to verify behavior for following situation:

     * <ul>

     *     <li>status bar shade state is set to <code>false</code></li>

     *     <li>there is a bubble pending to be expanded</li>

     * </ul>

     * Test that duplicate status bar state updates to <code>false</code> do not clear the

     * pending bubble to be

     * expanded.

     */

    @Test

    public void testOnStatusBarStateChanged_statusBarChangeDoesNotClearExpandingBubble() {

        mBubbleController.updateBubble(mBubbleEntry);

        mBubbleController.onStatusBarStateChanged(false);

        // Set the bubble to expand once status bar state changes

        mBubbleController.expandStackAndSelectBubble(mBubbleEntry);

        // Check that stack is currently collapsed

        assertStackCollapsed();

        // Post status bar state change update with the same value

        mBubbleController.onStatusBarStateChanged(false);

        // Stack should remain collapsedb

        assertStackCollapsed();

        // Post status bar state change which should trigger bubble to expand

        mBubbleController.onStatusBarStateChanged(true);

        assertStackExpanded();

    }



    @Test

    public void testSetShouldAutoExpand_notifiesFlagChanged() {

        mBubbleController.updateBubble(mBubbleEntry);