summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Miranda Kephart <mkephart@google.com> 2023-05-15 16:09:24 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-05-15 16:09:24 +0000
commit23533cf75f4015ec82af37f132d8c3fadcc9e3c9 (patch)
tree41480f0b3caf917d32666a5873bedf0e63013521
parente53ec8817cc30f7a7ecc3911c21cd1ad0c14e4d7 (diff)
parent2d3fbc49730a69c8ebcd65dfc33fe36148f508ba (diff)
Merge "Turn on clipboard image timeout flag in teamfood" into udc-dev am: 2d3fbc4973
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22976387 Change-Id: Iecd558f1c89707d264a03a59eef57fc1921f7198 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--packages/SystemUI/src/com/android/systemui/flags/Flags.kt3
1 files changed, 2 insertions, 1 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/flags/Flags.kt b/packages/SystemUI/src/com/android/systemui/flags/Flags.kt
index 340ed2e9c8c1..5d403e150b77 100644
--- a/packages/SystemUI/src/com/android/systemui/flags/Flags.kt
+++ b/packages/SystemUI/src/com/android/systemui/flags/Flags.kt
@@ -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")