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

Commit deabe85d authored by Aaron Liu's avatar Aaron Liu Committed by Automerger Merge Worker
Browse files

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

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



Change-Id: I92f032aca9b387527affc915fbe6fd05b2d7deca
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f01dcdf9 c6ffe347

packages/SystemUI/res-keyguard/layout/keyguard_security_container_view.xml

+0 −2
Original line number Diff line number Diff line
@@ -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"

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

+0 −4
Original line number Diff line number Diff line
@@ -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")

}