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

Commit 44cb4a3e authored by Beth Thibodeau's avatar Beth Thibodeau Committed by Automerger Merge Worker
Browse files

Merge "Disable Extended UMO feature flags" into udc-dev am: 63d3be16 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22895950



Change-Id: I2f8173885630e1851a4ee192dab47db416fd1107
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 594ab1b0 63d3be16

packages/SystemUI/src/com/android/systemui/flags/Flags.kt

+3 −3
Original line number Original line Diff line number Diff line
@@ -393,7 +393,7 @@ object Flags { 
    val MEDIA_TAP_TO_TRANSFER_DISMISS_GESTURE = releasedFlag(912, "media_ttt_dismiss_gesture")

    val MEDIA_TAP_TO_TRANSFER_DISMISS_GESTURE = releasedFlag(912, "media_ttt_dismiss_gesture")





    // TODO(b/266157412): Tracking Bug

    // TODO(b/266157412): Tracking Bug

    val MEDIA_RETAIN_SESSIONS = releasedFlag(913, "media_retain_sessions")

    val MEDIA_RETAIN_SESSIONS = unreleasedFlag(913, "media_retain_sessions")





    // TODO(b/266739309): Tracking Bug

    // TODO(b/266739309): Tracking Bug

    @JvmField

    @JvmField
@@ -403,10 +403,10 @@ object Flags { 
    val MEDIA_RESUME_PROGRESS = releasedFlag(915, "media_resume_progress")

    val MEDIA_RESUME_PROGRESS = releasedFlag(915, "media_resume_progress")





    // TODO(b/267166152) : Tracking Bug

    // TODO(b/267166152) : Tracking Bug

    val MEDIA_RETAIN_RECOMMENDATIONS = releasedFlag(916, "media_retain_recommendations")

    val MEDIA_RETAIN_RECOMMENDATIONS = unreleasedFlag(916, "media_retain_recommendations")





    // TODO(b/270437894): Tracking Bug

    // TODO(b/270437894): Tracking Bug

    val MEDIA_REMOTE_RESUME = releasedFlag(917, "media_remote_resume")

    val MEDIA_REMOTE_RESUME = unreleasedFlag(917, "media_remote_resume")





    // 1000 - dock

    // 1000 - dock

    val SIMULATE_DOCK_THROUGH_CHARGING = releasedFlag(1000, "simulate_dock_through_charging")

    val SIMULATE_DOCK_THROUGH_CHARGING = releasedFlag(1000, "simulate_dock_through_charging")