Merge changes Iebbc5d77,I2bef5f6f into udc-dev am: c6ffe34714

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

Change-Id: Ic2f16fb3aba4a252f1a1f3eb99bbf1f43b3ed399
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Aaron Liu
2023-05-18 16:52:38 +00:00
committed by Automerger Merge Worker
2 changed files with 0 additions and 6 deletions

View File

@@ -19,9 +19,7 @@
<com.android.keyguard.KeyguardSecurityContainer
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
android:id="@+id/keyguard_security_container"
android:background="?androidprv:attr/materialColorSurfaceContainer"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:clipChildren="false"

View File

@@ -717,8 +717,4 @@ object Flags {
@JvmField
val SPLIT_SHADE_SUBPIXEL_OPTIMIZATION =
unreleasedFlag(2805, "split_shade_subpixel_optimization", teamfood = true)
// TODO(b/278761837): Tracking Bug
@JvmField
val USE_NEW_ACTIVITY_STARTER = releasedFlag(2801, name = "use_new_activity_starter")
}