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

Commit 439d4b32 authored by Beverly Tai's avatar Beverly Tai Committed by Automerger Merge Worker
Browse files

Merge "Allow group changes for newly visible notifs" into rvc-dev am:...

Merge "Allow group changes for newly visible notifs" into rvc-dev am: 71e343bd am: 8308b97d am: 17b8b95e

Change-Id: I1b1b339e892bb6136a493d6bfa5c02e7dc850bc3
parents 426a0637 17b8b95e
Loading
Loading
Loading
Loading
+5 −2
Original line number Original line Diff line number Diff line
@@ -184,8 +184,11 @@ public class NotificationViewHierarchyManager implements DynamicPrivacyControlle
            mLowPriorityInflationHelper.recheckLowPriorityViewAndInflate(ent, ent.getRow());
            mLowPriorityInflationHelper.recheckLowPriorityViewAndInflate(ent, ent.getRow());
            boolean isChildInGroup = mGroupManager.isChildInGroupWithSummary(ent.getSbn());
            boolean isChildInGroup = mGroupManager.isChildInGroupWithSummary(ent.getSbn());


            boolean groupChangesAllowed = mVisualStabilityManager.areGroupChangesAllowed()
            boolean groupChangesAllowed =
                    || !ent.hasFinishedInitialization();
                    mVisualStabilityManager.areGroupChangesAllowed() // user isn't looking at notifs
                    || !ent.hasFinishedInitialization() // notif recently added
                    || !mListContainer.containsView(ent.getRow()); // notif recently unfiltered

            NotificationEntry parent = mGroupManager.getGroupSummary(ent.getSbn());
            NotificationEntry parent = mGroupManager.getGroupSummary(ent.getSbn());
            if (!groupChangesAllowed) {
            if (!groupChangesAllowed) {
                // We don't to change groups while the user is looking at them
                // We don't to change groups while the user is looking at them