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

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

Merge "Put clipboard shared transitions into teamfood" into udc-qpr-dev am:... 

Merge "Put clipboard shared transitions into teamfood" into udc-qpr-dev am: 455d04ab am: 6c654ff3

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



Change-Id: I11b063344650a6539174a38b6bd295274259a2ec
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f953632c 6c654ff3

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

+2 −1
Original line number Diff line number Diff line
@@ -617,7 +617,8 @@ object Flags { 
    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")

    val CLIPBOARD_SHARED_TRANSITIONS =

            unreleasedFlag(1703, "clipboard_shared_transitions", teamfood = true)



    // TODO(b/283300105): Tracking Bug

    @JvmField val SCENE_CONTAINER = unreleasedFlag(1802, "scene_container")