Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge changes from topic "presubmit-am-6bd2dc4c86ff420f9becf1b089e962a7" into sc-v2-dev-plus-aosp

Browse Source 
* changes:
  [automerge] Don't re-hide the keyguard if it isn't showing. 2p: c3a2eeaed3
  Don't re-hide the keyguard if it isn't showing.
This commit is contained in:
Josh Tsuji
2022-03-02 21:17:23 +00:00
committed by Android (Google) Code Review
parent a53e794051 346f9c19bf
commit 49ededb26d
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
packages/SystemUI/src/com/android/systemui/keyguard/KeyguardUnlockAnimationController.kt
View File

@@ -21,6 +21,7 @@ import android.animation.AnimatorListenerAdapter
import android.animation.ValueAnimator import android.animation.ValueAnimator
import android.content.Context import android.content.Context
import android.graphics.Matrix import android.graphics.Matrix
import android.util.Log
import android.view.RemoteAnimationTarget import android.view.RemoteAnimationTarget
import android.view.SyncRtSurfaceTransactionApplier import android.view.SyncRtSurfaceTransactionApplier
import android.view.View import android.view.View
@@ -38,6 +39,8 @@ import com.android.systemui.statusbar.policy.KeyguardStateController
import dagger.Lazy import dagger.Lazy
import javax.inject.Inject import javax.inject.Inject
const val TAG = "KeyguardUnlock"
/** /**
* Starting scale factor for the app/launcher surface behind the keyguard, when it's animating * Starting scale factor for the app/launcher surface behind the keyguard, when it's animating
* in during keyguard exit. * in during keyguard exit.
@@ -254,7 +257,12 @@ class KeyguardUnlockAnimationController @Inject constructor(
} }
fun hideKeyguardViewAfterRemoteAnimation() { fun hideKeyguardViewAfterRemoteAnimation() {
if (keyguardViewController.isShowing) {
keyguardViewController.hide(surfaceBehindRemoteAnimationStartTime, 350) keyguardViewController.hide(surfaceBehindRemoteAnimationStartTime, 350)
} else {
Log.e(TAG, "#hideKeyguardViewAfterRemoteAnimation called when keyguard view is not " +
"showing. Ignoring...")
}
} }
/** /**