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

Commit fdf80338 authored by Selim Cinek's avatar Selim Cinek
Browse files

Fixed the order of notifications when Bubbles are present 

Bubbles were still counted as showing in the shade, which lead
to the ordering logic not working properly anymore.

Test: atest SystemUITests
Fixes: 126580322
Change-Id: I84e7c06eb9ad91d21dc4ec2430ab71a5987563ad
parent 006e2943

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

+4 −2
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ package com.android.systemui.bubbles; 


import androidx.annotation.Nullable;



import com.android.internal.annotations.VisibleForTesting;

import com.android.systemui.statusbar.notification.collection.NotificationEntry;



import java.util.Collection;
@@ -29,12 +30,13 @@ import javax.inject.Singleton; 
 * Keeps track of active bubbles.

 */

@Singleton

class BubbleData {

public class BubbleData {



    private HashMap<String, Bubble> mBubbles = new HashMap<>();



    @VisibleForTesting

    @Inject

    BubbleData() {}

    public BubbleData() {}



    /**

     * The set of bubbles.

packages/SystemUI/src/com/android/systemui/statusbar/NotificationViewHierarchyManager.java

+13 −2
Original line number Diff line number Diff line
@@ -22,8 +22,10 @@ import android.os.Trace; 
import android.util.Log;

import android.view.View;

import android.view.ViewGroup;

import android.view.ViewParent;



import com.android.systemui.R;

import com.android.systemui.bubbles.BubbleData;

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

import com.android.systemui.statusbar.notification.NotificationEntryManager;

import com.android.systemui.statusbar.notification.VisualStabilityManager;
@@ -74,6 +76,7 @@ public class NotificationViewHierarchyManager { 
     * possible.

     */

    private final boolean mAlwaysExpandNonGroupedNotification;

    private final BubbleData mBubbleData;



    private NotificationPresenter mPresenter;

    private NotificationListContainer mListContainer;
@@ -85,7 +88,8 @@ public class NotificationViewHierarchyManager { 
            VisualStabilityManager visualStabilityManager,

            StatusBarStateController statusBarStateController,

            NotificationEntryManager notificationEntryManager,

            Lazy<ShadeController> shadeController) {

            Lazy<ShadeController> shadeController,

            BubbleData bubbleData) {

        mLockscreenUserManager = notificationLockscreenUserManager;

        mGroupManager = groupManager;

        mVisualStabilityManager = visualStabilityManager;
@@ -95,6 +99,7 @@ public class NotificationViewHierarchyManager { 
        Resources res = context.getResources();

        mAlwaysExpandNonGroupedNotification =

                res.getBoolean(R.bool.config_alwaysExpandNonGroupedNotifications);

        mBubbleData = bubbleData;

    }



    public void setUpWithPresenter(NotificationPresenter presenter,
@@ -114,7 +119,8 @@ public class NotificationViewHierarchyManager { 
        final int N = activeNotifications.size();

        for (int i = 0; i < N; i++) {

            NotificationEntry ent = activeNotifications.get(i);

            if (ent.isRowDismissed() || ent.isRowRemoved()) {

            if (ent.isRowDismissed() || ent.isRowRemoved()

                    || (mBubbleData.getBubble(ent.key) != null && !ent.showInShadeWhenBubble())) {

                // we don't want to update removed notifications because they could

                // temporarily become children if they were isolated before.

                continue;
@@ -185,6 +191,11 @@ public class NotificationViewHierarchyManager { 
            if (v.getParent() == null) {

                mVisualStabilityManager.notifyViewAddition(v);

                mListContainer.addContainerView(v);

            } else if (!mListContainer.containsView(v)) {

                // the view is added somewhere else. Let's make sure

                // the ordering works properly below, by excluding these

                toShow.remove(v);

                i--;

            }

        }

packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationListContainer.java

+8 −0
Original line number Diff line number Diff line
@@ -176,4 +176,12 @@ public interface NotificationListContainer extends ExpandableView.OnHeightChange 
     * @param row The notification to bind.

     */

    default void bindRow(ExpandableNotificationRow row) {}



    /**

     * Does this list contain a given view. True by default is fine, since we only ask this if the

     * view has a parent.

     */

    default boolean containsView(View v) {

        return true;

    }

}

packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayout.java

+5 −0
Original line number Diff line number Diff line
@@ -3272,6 +3272,11 @@ public class NotificationStackScrollLayout extends ViewGroup implements ScrollAd 
        });

    }



    @Override

    public boolean containsView(View v) {

        return v.getParent() == this;

    }



    @Override

    @ShadeViewRefactor(RefactorComponent.STATE_RESOLVER)

    public void applyExpandAnimationParams(ExpandAnimationParameters params) {

packages/SystemUI/tests/src/com/android/systemui/statusbar/NotificationViewHierarchyManagerTest.java

+2 −1
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ import androidx.test.filters.SmallTest; 
import com.android.systemui.Dependency;

import com.android.systemui.InitController;

import com.android.systemui.SysuiTestCase;

import com.android.systemui.bubbles.BubbleData;

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

import com.android.systemui.statusbar.notification.NotificationEntryManager;

import com.android.systemui.statusbar.notification.VisualStabilityManager;
@@ -97,7 +98,7 @@ public class NotificationViewHierarchyManagerTest extends SysuiTestCase { 
        mViewHierarchyManager = new NotificationViewHierarchyManager(mContext,

                mLockscreenUserManager, mGroupManager, mVisualStabilityManager,

                mock(StatusBarStateControllerImpl.class), mEntryManager,

                () -> mShadeController);

                () -> mShadeController, new BubbleData());

        Dependency.get(InitController.class).executePostInitTasks();

        mViewHierarchyManager.setUpWithPresenter(mPresenter, mListContainer);

    }