commit 48b3a5adf231c6424d5810bf5430ecfda9c4df3a
author Dave Mankoff <mankoff@google.com> Thu Nov 10 02:04:04 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Nov 10 02:04:04 2022 +0000
tree c1918d5412cd2c9f03b24de4cb8046e87a671307
parent bae2e74f7a7bfb24aa1bc66d39460d3f2cd37634
parent b3997ca3523c9f859aff04e2536cb34760a4c211

RESTRICT AUTOMERGE Resynchronize QPR flags with Main am: b3997ca352

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

Change-Id: I7dce62ae01eb4e71fd0939f1e4d2c2557df6ce28
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

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

diff --git a/packages/SystemUI/src/com/android/systemui/flags/Flags.kt b/packages/SystemUI/src/com/android/systemui/flags/Flags.kt
index 606fb70..d012bc9 100644
--- a/packages/SystemUI/src/com/android/systemui/flags/Flags.kt
+++ b/packages/SystemUI/src/com/android/systemui/flags/Flags.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021 The Android Open Source Project
+ * Copyright (C) 2022 The Android Open Source Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -134,13 +134,17 @@
     // TODO(b/255607168): Tracking Bug
     @JvmField val DOZING_MIGRATION_1 = UnreleasedFlag(213)
 
+    @JvmField val NEW_ELLIPSE_DETECTION = UnreleasedFlag(214)
+
+    @JvmField val NEW_UDFPS_OVERLAY = UnreleasedFlag(215)
+
     /**
      * Whether to enable the code powering customizable lock screen quick affordances.
      *
      * Note that this flag does not enable individual implementations of quick affordances like the
      * new camera quick affordance. Look for individual flags for those.
      */
-    @JvmField val CUSTOMIZABLE_LOCK_SCREEN_QUICK_AFFORDANCES = UnreleasedFlag(214, teamfood = false)
+    @JvmField val CUSTOMIZABLE_LOCK_SCREEN_QUICK_AFFORDANCES = UnreleasedFlag(216, teamfood = false)
 
     // 300 - power menu
     // TODO(b/254512600): Tracking Bug
@@ -173,6 +177,9 @@
     // TODO(b/254512678): Tracking Bug
     @JvmField val NEW_FOOTER_ACTIONS = ReleasedFlag(507)
 
+    // TODO(b/244064524): Tracking Bug
+    @JvmField val QS_SECONDARY_DATA_SUB_INFO = UnreleasedFlag(508, teamfood = true)
+
     // 600- status bar
     // TODO(b/254513246): Tracking Bug
     val STATUS_BAR_USER_SWITCHER = ResourceBooleanFlag(602, R.bool.flag_user_switcher_chip)
@@ -336,6 +343,9 @@
     // TODO(b/254512507): Tracking Bug
     val CHOOSER_UNBUNDLED = UnreleasedFlag(1500, teamfood = true)
 
+    // 1600 - accessibility
+    @JvmField val A11Y_FLOATING_MENU_FLING_SPRING_ANIMATIONS = UnreleasedFlag(1600)
+
     // 1700 - clipboard
     @JvmField val CLIPBOARD_OVERLAY_REFACTOR = UnreleasedFlag(1700, teamfood = true)
     @JvmField val CLIPBOARD_REMOTE_BEHAVIOR = UnreleasedFlag(1701)