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

Commit 346f9c19 authored by Presubmit Automerger Backend's avatar Presubmit Automerger Backend
Browse files

[automerge] Don't re-hide the keyguard if it isn't showing. 2p: c3a2eeae 

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


Change-Id: I598ee031ff7541219abde8ea2f2bd631ce4c5c58
Merged-In: I00655c2e85c46bd0c52b77094757e155b1a6f9c9
parents 75564394 c3a2eeae

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

+9 −1
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ import android.animation.AnimatorListenerAdapter 
import android.animation.ValueAnimator

import android.content.Context

import android.graphics.Matrix

import android.util.Log

import android.view.RemoteAnimationTarget

import android.view.SyncRtSurfaceTransactionApplier

import android.view.View
@@ -38,6 +39,8 @@ import com.android.systemui.statusbar.policy.KeyguardStateController 
import dagger.Lazy

import javax.inject.Inject



const val TAG = "KeyguardUnlock"



/**

 * Starting scale factor for the app/launcher surface behind the keyguard, when it's animating

 * in during keyguard exit.
@@ -254,7 +257,12 @@ class KeyguardUnlockAnimationController @Inject constructor( 
    }



    fun hideKeyguardViewAfterRemoteAnimation() {

        if (keyguardViewController.isShowing) {

            keyguardViewController.hide(surfaceBehindRemoteAnimationStartTime, 350)

        } else {

            Log.e(TAG, "#hideKeyguardViewAfterRemoteAnimation called when keyguard view is not " +

                    "showing. Ignoring...")

        }

    }



    /**