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

Commit 8ea33a2e authored by Julia Reynolds's avatar Julia Reynolds
Browse files

Fix 'silent clear all' for bundles 

Test: manual
Flag: com.android.systemui.notification_bundle_ui
Fixes: 421790510
Change-Id: I3968833993a5815ebc7b88847a13199078e163cf
parent 64380516

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

+13 −1
Original line number Original line Diff line number Diff line
@@ -25,7 +25,11 @@ import static com.android.internal.jank.InteractionJankMonitor.CUJ_NOTIFICATION_ 
import static com.android.internal.jank.InteractionJankMonitor.CUJ_SHADE_CLEAR_ALL;

import static com.android.internal.jank.InteractionJankMonitor.CUJ_SHADE_CLEAR_ALL;

import static com.android.systemui.Flags.magneticNotificationSwipes;

import static com.android.systemui.Flags.magneticNotificationSwipes;

import static com.android.systemui.Flags.physicalNotificationMovement;

import static com.android.systemui.Flags.physicalNotificationMovement;

import static com.android.systemui.statusbar.notification.stack.NotificationPriorityBucketKt.BUCKET_NEWS;

import static com.android.systemui.statusbar.notification.stack.NotificationPriorityBucketKt.BUCKET_PROMO;

import static com.android.systemui.statusbar.notification.stack.NotificationPriorityBucketKt.BUCKET_RECS;

import static com.android.systemui.statusbar.notification.stack.NotificationPriorityBucketKt.BUCKET_SILENT;

import static com.android.systemui.statusbar.notification.stack.NotificationPriorityBucketKt.BUCKET_SILENT;

import static com.android.systemui.statusbar.notification.stack.NotificationPriorityBucketKt.BUCKET_SOCIAL;

import static com.android.systemui.statusbar.notification.stack.StackStateAnimator.ANIMATION_DURATION_SWIPE;

import static com.android.systemui.statusbar.notification.stack.StackStateAnimator.ANIMATION_DURATION_SWIPE;

import static com.android.systemui.statusbar.notification.stack.shared.model.AccessibilityScrollEvent.SCROLL_DOWN;

import static com.android.systemui.statusbar.notification.stack.shared.model.AccessibilityScrollEvent.SCROLL_DOWN;

import static com.android.systemui.statusbar.notification.stack.shared.model.AccessibilityScrollEvent.SCROLL_UP;

import static com.android.systemui.statusbar.notification.stack.shared.model.AccessibilityScrollEvent.SCROLL_UP;
@@ -6649,7 +6653,15 @@ public class NotificationStackScrollLayout 
            case ROWS_HIGH_PRIORITY:

            case ROWS_HIGH_PRIORITY:

                return bucket < BUCKET_SILENT;

                return bucket < BUCKET_SILENT;

            case ROWS_GENTLE:

            case ROWS_GENTLE:

                if (NotificationBundleUi.isEnabled()) {

                    return bucket == BUCKET_SILENT

                            || bucket == BUCKET_PROMO

                            || bucket == BUCKET_RECS

                            || bucket == BUCKET_SOCIAL

                            || bucket == BUCKET_NEWS;

                } else {

                    return bucket == BUCKET_SILENT;

                    return bucket == BUCKET_SILENT;

                }

            default:

            default:

                throw new IllegalArgumentException("Unknown selection: " + selection);

                throw new IllegalArgumentException("Unknown selection: " + selection);

        }

        }