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

Commit 10b78ff1 authored by Ibrahim Yilmaz's avatar Ibrahim Yilmaz Committed by Android (Google) Code Review
Browse files

Merge "Fix Stabilize HeadsUp Groups Flag" into main

parents 8dd8237f 137d50aa

packages/SystemUI/aconfig/systemui.aconfig

+10 −0
Original line number Diff line number Diff line
@@ -1947,3 +1947,13 @@ flag { 
    description: "Show a rich ongoing notification on the always-on display (depends on ui_rich_ongoing)"

    bug: "369151941"

}



flag {

    name: "stabilize_heads_up_group_v2"

    namespace: "systemui"

    description: "Stabilize heads up groups in VisualStabilityCoordinator"

    bug: "357753857"

    metadata {

      purpose: PURPOSE_BUGFIX

    }

}
 
 No newline at end of file

packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/StabilizeHeadsUpGroup.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 StabilizeHeadsUpGroup {

    /** The aconfig flag name */

    const val FLAG_NAME: String = Flags.FLAG_STABILIZE_HEADS_UP_GROUP

    const val FLAG_NAME: String = Flags.FLAG_STABILIZE_HEADS_UP_GROUP_V2



    /** A token used for dependency declaration */

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

    @JvmStatic

    inline val isEnabled

        get() = Flags.stabilizeHeadsUpGroup()

        get() = Flags.stabilizeHeadsUpGroupV2()



    /**

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