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

Commit 15f9f6f0 authored by Yining Liu's avatar Yining Liu Committed by Android (Google) Code Review
Browse files

Merge "Use the notification_throttle_hun flag for cycling animation" into main

parents c0c8f617 f22e3145

packages/SystemUI/aconfig/systemui.aconfig

+0 −8
Original line number Original line Diff line number Diff line
@@ -25,14 +25,6 @@ flag { 
   }

   }

}

}





flag {



    name: "notification_heads_up_cycling"

    namespace: "systemui"

    description: "Heads-up notification cycling animation for the Notification Avalanche feature."

    bug: "316404716"

}



flag {

flag {

   name: "priority_people_section"

   name: "priority_people_section"

   namespace: "systemui"

   namespace: "systemui"

packages/SystemUI/src/com/android/systemui/statusbar/notification/shared/NotificationHeadsUpCycling.kt

+3 −3
Original line number Original line Diff line number Diff line
@@ -23,8 +23,8 @@ import com.android.systemui.flags.RefactorFlagUtils 
/** Helper for reading or using the heads-up cycling flag state. */

/** Helper for reading or using the heads-up cycling flag state. */

@Suppress("NOTHING_TO_INLINE")

@Suppress("NOTHING_TO_INLINE")

object NotificationHeadsUpCycling {

object NotificationHeadsUpCycling {

    /** The aconfig flag name */

    /** The aconfig flag name - enable this feature when FLAG_NOTIFICATION_THROTTLE_HUN is on. */

    const val FLAG_NAME = Flags.FLAG_NOTIFICATION_HEADS_UP_CYCLING

    const val FLAG_NAME = Flags.FLAG_NOTIFICATION_THROTTLE_HUN





    /** A token used for dependency declaration */

    /** A token used for dependency declaration */

    val token: FlagToken

    val token: FlagToken
@@ -33,7 +33,7 @@ object NotificationHeadsUpCycling { 
    /** Is the heads-up cycling animation enabled */

    /** Is the heads-up cycling animation enabled */

    @JvmStatic

    @JvmStatic

    inline val isEnabled

    inline val isEnabled

        get() = Flags.notificationHeadsUpCycling()

        get() = Flags.notificationThrottleHun()





    /** Whether to animate the bottom line when transiting from a tall HUN to a short HUN */

    /** Whether to animate the bottom line when transiting from a tall HUN to a short HUN */

    @JvmStatic

    @JvmStatic