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

Commit 1216a383 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Flag removal: Remove com.android.systemui.skip_cancelling_huns_for_guts" into main

parents 99d69d82 b1898700

packages/SystemUI/aconfig/systemui.aconfig

+0 −10
Original line number Diff line number Diff line
@@ -1841,16 +1841,6 @@ flag { 
    bug: "402759931"

}



flag {

   name: "skip_cancelling_huns_for_guts"

   namespace: "systemui"

   description: "Do not cancel HUNs when GUTs are exposed"

   bug: "372227464"

   metadata {

        purpose: PURPOSE_BUGFIX

   }

}



flag {

    name: "stuck_hearing_devices_qs_tile_fix"

    namespace: "systemui"

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

+1 −4
Original line number Diff line number Diff line
@@ -722,9 +722,6 @@ public class NotificationStackScrollLayoutController implements Dumpable { 
                }



                private boolean canHeadsUpBeCancelled(ExpandableNotificationRow row) {

                    final boolean areGutsNotExposed =

                            !Flags.skipCancellingHunsForGuts() || !row.areGutsExposed();



                    final boolean cannotFullScreen = NotificationBundleUi.isEnabled()

                            ? !row.getEntryAdapter().isFullScreenCapable()

                            : (row.getEntryLegacy().getSbn().getNotification().fullScreenIntent
@@ -733,7 +730,7 @@ public class NotificationStackScrollLayoutController implements Dumpable { 
                    return row.isPinned()

                            && !canChildBeDismissed(row)

                            && cannotFullScreen

                            && areGutsNotExposed;

                            && !row.areGutsExposed();

                }



                @Override