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

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

Merge "Add flag for clipboard shared transitions" into udc-dev am: 93c08296...

Merge "Add flag for clipboard shared transitions" into udc-dev am: 93c08296 am: 51220263 am: d65c45bb

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



Change-Id: I0be2bdbad8e2bfd5e0e2cb26943da7f4a60ae5ab
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 4ce671a5 d65c45bb
Loading
Loading
Loading
Loading
+3 −0
Original line number Original line Diff line number Diff line
@@ -608,6 +608,9 @@ object Flags {
    @JvmField val CLIPBOARD_REMOTE_BEHAVIOR = releasedFlag(1701, "clipboard_remote_behavior")
    @JvmField val CLIPBOARD_REMOTE_BEHAVIOR = releasedFlag(1701, "clipboard_remote_behavior")
    // TODO(b/278714186) Tracking Bug
    // 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")
    // TODO(b/279405451): Tracking Bug
    @JvmField
    val CLIPBOARD_SHARED_TRANSITIONS = unreleasedFlag(1703, "clipboard_shared_transitions")


    // 1800 - shade container
    // 1800 - shade container
    // TODO(b/265944639): Tracking Bug
    // TODO(b/265944639): Tracking Bug