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

Commit 837d4900 authored by Santhosh Thangaraj's avatar Santhosh Thangaraj
Browse files

Fix status bar animates when open bubble updates 

Bug: 155499241
Test: Manual test on device and unit test

Change-Id: If1c4cd9b40bb7a1f6ea041b9abbc3110c8c6a2b2
parent 392e4a9e

packages/SystemUI/src/com/android/systemui/SystemUIFactory.java

+3 −1
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ import com.android.internal.annotations.VisibleForTesting; 
import com.android.internal.widget.LockPatternUtils;

import com.android.keyguard.KeyguardUpdateMonitor;

import com.android.keyguard.ViewMediatorCallback;

import com.android.systemui.bubbles.BubbleController;

import com.android.systemui.dagger.DaggerSystemUIRootComponent;

import com.android.systemui.dagger.DependencyProvider;

import com.android.systemui.dagger.SystemUIRootComponent;
@@ -164,7 +165,8 @@ public class SystemUIFactory { 
                wakeUpCoordinator, keyguardBypassController,

                Dependency.get(NotificationMediaManager.class),

                Dependency.get(NotificationListener.class),

                Dependency.get(DozeParameters.class));

                Dependency.get(DozeParameters.class),

                Dependency.get(BubbleController.class));

    }



    @Module

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

+12 −0
Original line number Diff line number Diff line
@@ -853,6 +853,18 @@ public class BubbleController implements ConfigurationController.ConfigurationLi 
        return (isSummary && isSuppressedSummary) || isSuppressedBubble;

    }



    /**

     * True if:

     * (1) The current notification entry same as selected bubble notification entry and the

     * stack is currently expanded.

     *

     * False otherwise.

     */

    public boolean isBubbleExpanded(NotificationEntry entry) {

        return isStackExpanded() && mBubbleData != null && mBubbleData.getSelectedBubble() != null

                && mBubbleData.getSelectedBubble().getKey().equals(entry.getKey()) ? true : false;

    }



    void promoteBubbleFromOverflow(Bubble bubble) {

        bubble.setInflateSynchronously(mInflateSynchronously);

        setIsBubble(bubble, /* isBubble */ true);

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

+8 −1
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ import com.android.internal.util.ContrastColorUtil; 
import com.android.settingslib.Utils;

import com.android.systemui.Interpolators;

import com.android.systemui.R;

import com.android.systemui.bubbles.BubbleController;

import com.android.systemui.plugins.DarkIconDispatcher;

import com.android.systemui.plugins.DarkIconDispatcher.DarkReceiver;

import com.android.systemui.plugins.statusbar.StatusBarStateController;
@@ -55,6 +56,7 @@ public class NotificationIconAreaController implements DarkReceiver, 
    private final NotificationWakeUpCoordinator mWakeUpCoordinator;

    private final KeyguardBypassController mBypassController;

    private final DozeParameters mDozeParameters;

    private final BubbleController mBubbleController;



    private int mIconSize;

    private int mIconHPadding;
@@ -101,7 +103,8 @@ public class NotificationIconAreaController implements DarkReceiver, 
            KeyguardBypassController keyguardBypassController,

            NotificationMediaManager notificationMediaManager,

            NotificationListener notificationListener,

            DozeParameters dozeParameters) {

            DozeParameters dozeParameters,

            BubbleController bubbleController) {

        mStatusBar = statusBar;

        mContrastColorUtil = ContrastColorUtil.getInstance(context);

        mContext = context;
@@ -112,6 +115,7 @@ public class NotificationIconAreaController implements DarkReceiver, 
        mWakeUpCoordinator = wakeUpCoordinator;

        wakeUpCoordinator.addListener(this);

        mBypassController = keyguardBypassController;

        mBubbleController = bubbleController;

        notificationListener.addNotificationSettingsListener(mSettingsListener);



        initializeNotificationAreaViews(context);
@@ -291,6 +295,9 @@ public class NotificationIconAreaController implements DarkReceiver, 
                        || !entry.isPulseSuppressed())) {

            return false;

        }

        if (mBubbleController.isBubbleExpanded(entry)) {

            return false;

        }

        return true;

    }

packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/NotificationIconAreaControllerTest.java

+4 −1
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ import android.testing.TestableLooper; 
import androidx.test.filters.SmallTest;



import com.android.systemui.SysuiTestCase;

import com.android.systemui.bubbles.BubbleController;

import com.android.systemui.plugins.statusbar.StatusBarStateController;

import com.android.systemui.statusbar.NotificationListener;

import com.android.systemui.statusbar.NotificationMediaManager;
@@ -60,6 +61,8 @@ public class NotificationIconAreaControllerTest extends SysuiTestCase { 
    @Mock

    NotificationShadeWindowView mNotificationShadeWindowView;

    private NotificationIconAreaController mController;

    @Mock

    private BubbleController mBubbleController;



    @Before

    public void setup() {
@@ -71,7 +74,7 @@ public class NotificationIconAreaControllerTest extends SysuiTestCase { 


        mController = new NotificationIconAreaController(mContext, mStatusBar,

                mStatusBarStateController, mWakeUpCoordinator, mKeyguardBypassController,

                mNotificationMediaManager, mListener, mDozeParameters);

                mNotificationMediaManager, mListener, mDozeParameters, mBubbleController);

    }



    @Test