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

Commit 0e45e1ea authored by Alex Stetson's avatar Alex Stetson Committed by Automerger Merge Worker
Browse files

Merge "Always notify of keyguard exit animation" into udc-qpr-dev am: 350f95c8 

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



Change-Id: Ic7ccfc8d118b2a2b3e02654c5476fc4fc22d6081
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 54fa4ab4 350f95c8

services/core/java/com/android/server/policy/PhoneWindowManager.java

+3 −3
Original line number Original line Diff line number Diff line
@@ -3740,15 +3740,15 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
     */

     */

    private int handleTransitionForKeyguardLw(boolean startKeyguardExitAnimation,

    private int handleTransitionForKeyguardLw(boolean startKeyguardExitAnimation,

            boolean notifyOccluded) {

            boolean notifyOccluded) {

        int redoLayout = 0;

        if (notifyOccluded) {

        if (notifyOccluded) {

            final int redoLayout = applyKeyguardOcclusionChange();

            redoLayout = applyKeyguardOcclusionChange();

            if (redoLayout != 0) return redoLayout;

        }

        }

        if (startKeyguardExitAnimation) {

        if (startKeyguardExitAnimation) {

            if (DEBUG_KEYGUARD) Slog.d(TAG, "Starting keyguard exit animation");

            if (DEBUG_KEYGUARD) Slog.d(TAG, "Starting keyguard exit animation");

            startKeyguardExitAnimation(SystemClock.uptimeMillis());

            startKeyguardExitAnimation(SystemClock.uptimeMillis());

        }

        }

        return 0;

        return redoLayout;

    }

    }





    // There are several different flavors of "assistant" that can be launched from

    // There are several different flavors of "assistant" that can be launched from