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

Commit 03ed8add authored by Jeff DeCew's avatar Jeff DeCew Committed by Android (Google) Code Review
Browse files

Merge "Fix ViewFlipper Pausing boolean logic to actually run the code." into main

parents 345ee86f 0297a6f7

packages/SystemUI/aconfig/systemui.aconfig

+1 −1
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ flag { 
}



flag {

   name: "notification_view_flipper_pausing"

   name: "notification_view_flipper_pausing_v2"

   namespace: "systemui"

   description: "Pause ViewFlippers inside Notification custom layouts when the shade is closed."

   bug: "309146176"

packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ui/viewbinder/NotificationViewFlipperBinder.kt

+1 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ object NotificationViewFlipperBinder { 
        viewFlipper: ViewFlipper,

        viewModel: NotificationViewFlipperViewModel,

    ): DisposableHandle {

        if (viewFlipper.isAutoStart) {

        if (!viewFlipper.isAutoStart) {

            // If the ViewFlipper is not set to AutoStart, the pause binding is meaningless

            return DisposableHandle {}

        }

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

+2 −2
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ import com.android.systemui.flags.RefactorFlagUtils 
@Suppress("NOTHING_TO_INLINE")

object NotificationViewFlipperPausing {

    /** The aconfig flag name */

    const val FLAG_NAME = Flags.FLAG_NOTIFICATION_VIEW_FLIPPER_PAUSING

    const val FLAG_NAME = Flags.FLAG_NOTIFICATION_VIEW_FLIPPER_PAUSING_V2



    /** A token used for dependency declaration */

    val token: FlagToken
@@ -33,7 +33,7 @@ object NotificationViewFlipperPausing { 
    /** Is the refactor enabled */

    @JvmStatic

    inline val isEnabled

        get() = Flags.notificationViewFlipperPausing()

        get() = Flags.notificationViewFlipperPausingV2()



    /**

     * Called to ensure code is only run when the flag is enabled. This protects users from the