From 75f236390190476b61a425ba5ed1a683949eaece Mon Sep 17 00:00:00 2001
From: Aaron Liu <aaronjli@google.com>
Date: Wed, 17 May 2023 08:54:18 -0700
Subject: [PATCH 1/2] Remove USE_NEW_ACTIVITY_STARTER flag

This flag is no longer used and can be cleaned up.

Fixes: 278761837
Test: make sure sysui builds.
Change-Id: I2bef5f6f82070900b2a171472428377640e04f4a
---
 packages/SystemUI/src/com/android/systemui/flags/Flags.kt | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/packages/SystemUI/src/com/android/systemui/flags/Flags.kt b/packages/SystemUI/src/com/android/systemui/flags/Flags.kt
index 524cfaa0dc299..9c9d66dea809e 100644
--- a/packages/SystemUI/src/com/android/systemui/flags/Flags.kt
+++ b/packages/SystemUI/src/com/android/systemui/flags/Flags.kt
@@ -714,8 +714,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")
 }

From 02f81b1df4612752a8fe9e2dbab61e7c5acaccfc Mon Sep 17 00:00:00 2001
From: Aaron Liu <aaronjli@google.com>
Date: Wed, 17 May 2023 10:06:58 -0700
Subject: [PATCH 2/2] Remove material U background for bouncer.

It looks like the back scrim is already this color. Adding a background
to this bouncer leads to unsavory transitions.

Fixes: 282923067
Test: open notification shade. Open bouncer from shade.
Change-Id: Iebbc5d775ac1b488c447032c9137600bb91b2c53
---
 .../res-keyguard/layout/keyguard_security_container_view.xml    | 2 --
 1 file changed, 2 deletions(-)

diff --git a/packages/SystemUI/res-keyguard/layout/keyguard_security_container_view.xml b/packages/SystemUI/res-keyguard/layout/keyguard_security_container_view.xml
index 751b07ae9a6ef..dc58d500da2f7 100644
--- a/packages/SystemUI/res-keyguard/layout/keyguard_security_container_view.xml
+++ b/packages/SystemUI/res-keyguard/layout/keyguard_security_container_view.xml
@@ -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"