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

Commit bbe68f54 authored by Miranda Kephart's avatar Miranda Kephart Committed by Automerger Merge Worker
Browse files

Merge "Turn on clipboard image timeout flag in teamfood" into udc-dev am: 2d3fbc49 am: d0c330e5 

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



Change-Id: I17d529f0bfb81cea6f396e18af92ae4b55befebf
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 260e5be7 d0c330e5

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

+2 −1
Original line number Diff line number Diff line
@@ -613,7 +613,8 @@ object Flags { 
    // 1700 - clipboard

    @JvmField val CLIPBOARD_REMOTE_BEHAVIOR = releasedFlag(1701, "clipboard_remote_behavior")

    // TODO(b/278714186) Tracking Bug

    @JvmField val CLIPBOARD_IMAGE_TIMEOUT = unreleasedFlag(1702, "clipboard_image_timeout")

    @JvmField val CLIPBOARD_IMAGE_TIMEOUT =

            unreleasedFlag(1702, "clipboard_image_timeout", teamfood = true)

    // TODO(b/279405451): Tracking Bug

    @JvmField

    val CLIPBOARD_SHARED_TRANSITIONS = unreleasedFlag(1703, "clipboard_shared_transitions")