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

Commit 5a86dfd9 authored by Matt Pietal's avatar Matt Pietal Committed by Liana Kazanova (xWF)
Browse files

[conflict] Update user switching processes am: b00cff0f 

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



Merged-In: I32699e32fe1dbe94af2abe7e7ade5363a2b6cb55
Merged-In: I02df941d89467fc678c0749f4a2436ad8fee8b7b

Bug: 431940452


Change-Id: Ib663b14bc2fb02284813aef04ed76149c64e4deb
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 1279fd1f b00cff0f

core/java/android/app/KeyguardManager.java

+9 −0
Original line number Diff line number Diff line
@@ -181,6 +181,15 @@ public class KeyguardManager { 
     */

    public static final String EXTRA_DISALLOW_BIOMETRICS_IF_POLICY_EXISTS = "check_dpm";



    /**

     * When switching to a secure user, system server will expect a callback when the UI has

     * completed the switch.

     *

     * @hide

     */

    public static final String LOCK_ON_USER_SWITCH_CALLBACK = "onSwitchCallback";





    /**

     *

     * Password lock type, see {@link #setLock}

packages/SystemUI/src/com/android/systemui/keyguard/KeyguardUnlockAnimationController.kt

+3 −3
Original line number Diff line number Diff line
@@ -950,9 +950,9 @@ class KeyguardUnlockAnimationController @Inject constructor( 
        }



        if (!showKeyguard) {

            // Make sure we made the surface behind fully visible, just in case. It should already be

            // fully visible. The exit animation is finished, and we should not hold the leash anymore,

            // so forcing it to 1f.

            // Make sure we made the surface behind fully visible, just in case. It should already

            // be fully visible. The exit animation is finished, and we should not hold the leash

            // anymore, so forcing it to 1f.

            surfaceBehindAlpha = 1f

            setSurfaceBehindAppearAmount(1f)

packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java

+222 −64

File changed.

Preview size limit exceeded, changes collapsed.

packages/SystemUI/tests/src/com/android/systemui/keyguard/KeyguardViewMediatorTest.java

+105 −3

File changed.

Preview size limit exceeded, changes collapsed.

services/core/java/com/android/server/am/UserController.java

+20 −89

File changed.

Preview size limit exceeded, changes collapsed.