diff options
3 files changed, 11 insertions, 14 deletions
diff --git a/packages/SystemUI/aconfig/systemui.aconfig b/packages/SystemUI/aconfig/systemui.aconfig index f8383d94b1ab..88cc152b3819 100644 --- a/packages/SystemUI/aconfig/systemui.aconfig +++ b/packages/SystemUI/aconfig/systemui.aconfig @@ -40,16 +40,6 @@ flag { } flag { - name: "notification_minimalism_prototype" - namespace: "systemui" - description: "Prototype of notification minimalism; the new 'Intermediate' lockscreen customization proposal." - bug: "330387368" - metadata { - purpose: PURPOSE_BUGFIX - } -} - -flag { name: "notification_view_flipper_pausing_v2" namespace: "systemui" description: "Pause ViewFlippers inside Notification custom layouts when the shade is closed." diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/shared/NotificationMinimalismPrototype.kt b/packages/SystemUI/src/com/android/systemui/statusbar/notification/shared/NotificationMinimalismPrototype.kt index 06f3db504aaf..9854facfbc49 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/shared/NotificationMinimalismPrototype.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/shared/NotificationMinimalismPrototype.kt @@ -17,23 +17,23 @@ package com.android.systemui.statusbar.notification.shared import android.os.SystemProperties -import com.android.systemui.Flags +import com.android.server.notification.Flags import com.android.systemui.flags.FlagToken import com.android.systemui.flags.RefactorFlagUtils /** Helper for reading or using the minimalism prototype flag state. */ @Suppress("NOTHING_TO_INLINE") object NotificationMinimalismPrototype { - const val FLAG_NAME = Flags.FLAG_NOTIFICATION_MINIMALISM_PROTOTYPE + const val FLAG_NAME = Flags.FLAG_NOTIFICATION_MINIMALISM /** A token used for dependency declaration */ val token: FlagToken get() = FlagToken(FLAG_NAME, isEnabled) - /** Is the heads-up cycling animation enabled */ + /** Is the notification minimalism enabled */ @JvmStatic inline val isEnabled - get() = Flags.notificationMinimalismPrototype() + get() = Flags.notificationMinimalism() /** * The prototype will (by default) use a promoter to ensure that the top unseen notification is diff --git a/services/core/java/com/android/server/notification/flags.aconfig b/services/core/java/com/android/server/notification/flags.aconfig index be3adc142fa4..7043ceb7a525 100644 --- a/services/core/java/com/android/server/notification/flags.aconfig +++ b/services/core/java/com/android/server/notification/flags.aconfig @@ -144,6 +144,13 @@ flag { } flag { + name: "notification_minimalism" + namespace: "systemui" + description: "Minimize the notifications to show on the lockscreen." + bug: "330387368" +} + +flag { name: "notification_force_group_singletons" namespace: "systemui" description: "This flag enables forced auto-grouping singleton groups" |