diff options
| author | 2023-05-03 01:46:57 +0000 | |
|---|---|---|
| committer | 2023-05-03 01:46:57 +0000 | |
| commit | c9174e2f86bcae915585046af258fd434a8decd9 (patch) | |
| tree | 219b5596dbf466b6f81e76a426b6335a1d016d7a | |
| parent | b58b4602a66430829040d3402315676982bbc468 (diff) | |
| parent | 36d8be9e9e4608d5f70aabe72c5c9c940b1814d4 (diff) | |
Merge changes I7d682bd0,I8ed6a31e into udc-dev
* changes:
Add CUJ tracking in animation listener.
Release USE_NEW_ACTIVITY_STARTER
| -rw-r--r-- | packages/SystemUI/src/com/android/keyguard/KeyguardPINView.java | 2 | ||||
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/flags/Flags.kt | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardPINView.java b/packages/SystemUI/src/com/android/keyguard/KeyguardPINView.java index 03947542d21e..ecce83139a43 100644 --- a/packages/SystemUI/src/com/android/keyguard/KeyguardPINView.java +++ b/packages/SystemUI/src/com/android/keyguard/KeyguardPINView.java @@ -16,6 +16,7 @@ package com.android.keyguard; +import static com.android.internal.jank.InteractionJankMonitor.CUJ_LOCKSCREEN_PIN_APPEAR; import static com.android.internal.jank.InteractionJankMonitor.CUJ_LOCKSCREEN_PIN_DISAPPEAR; import static com.android.systemui.statusbar.policy.DevicePostureController.DEVICE_POSTURE_HALF_OPENED; import static com.android.systemui.statusbar.policy.DevicePostureController.DEVICE_POSTURE_UNKNOWN; @@ -184,6 +185,7 @@ public class KeyguardPINView extends KeyguardPinBasedInputView { } mAppearAnimator.setDuration(ANIMATION_DURATION); mAppearAnimator.addUpdateListener(animation -> animate(animation.getAnimatedFraction())); + mAppearAnimator.addListener(getAnimationListener(CUJ_LOCKSCREEN_PIN_APPEAR)); mAppearAnimator.start(); } diff --git a/packages/SystemUI/src/com/android/systemui/flags/Flags.kt b/packages/SystemUI/src/com/android/systemui/flags/Flags.kt index 1fafa3d97c48..d1d53cc9dd58 100644 --- a/packages/SystemUI/src/com/android/systemui/flags/Flags.kt +++ b/packages/SystemUI/src/com/android/systemui/flags/Flags.kt @@ -702,6 +702,5 @@ object Flags { // TODO(b/278761837): Tracking Bug @JvmField - val USE_NEW_ACTIVITY_STARTER = unreleasedFlag(2801, name = "use_new_activity_starter", - teamfood = true) + val USE_NEW_ACTIVITY_STARTER = releasedFlag(2801, name = "use_new_activity_starter") } |