Merge "Don't re-hide the keyguard if it isn't showing." into sc-v2-dev (0d8f1067) · Commits · e / os / android_frameworks_base

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...")
		}
		}

		/**