From 426f5089c9c5cdb31ee8b93d1208a5f45882404a Mon Sep 17 00:00:00 2001 From: Priyanka Advani Date: Wed, 3 May 2023 21:32:28 +0000 Subject: [PATCH 1/2] Revert "Add CUJ tracking in animation listener." Revert submission 22966073 Reason for revert: b/280664581 Reverted changes: /q/submissionid:22966073 Change-Id: I5a8d79db91e61a55a0b6df42f2bfe8a2ef126267 --- packages/SystemUI/src/com/android/keyguard/KeyguardPINView.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardPINView.java b/packages/SystemUI/src/com/android/keyguard/KeyguardPINView.java index ecce83139a435..03947542d21e5 100644 --- a/packages/SystemUI/src/com/android/keyguard/KeyguardPINView.java +++ b/packages/SystemUI/src/com/android/keyguard/KeyguardPINView.java @@ -16,7 +16,6 @@ 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; @@ -185,7 +184,6 @@ public class KeyguardPINView extends KeyguardPinBasedInputView { } mAppearAnimator.setDuration(ANIMATION_DURATION); mAppearAnimator.addUpdateListener(animation -> animate(animation.getAnimatedFraction())); - mAppearAnimator.addListener(getAnimationListener(CUJ_LOCKSCREEN_PIN_APPEAR)); mAppearAnimator.start(); } From 5b5c151a11848fbb8458f5c4f5a6a416f5245388 Mon Sep 17 00:00:00 2001 From: Priyanka Advani Date: Wed, 3 May 2023 21:32:28 +0000 Subject: [PATCH 2/2] Revert "Release USE_NEW_ACTIVITY_STARTER" Revert submission 22966073 Reason for revert: b/280664581 Reverted changes: /q/submissionid:22966073 Change-Id: I5e287501bfb0c351cd4d98cc59b6c8f57f38b1ac --- packages/SystemUI/src/com/android/systemui/flags/Flags.kt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/SystemUI/src/com/android/systemui/flags/Flags.kt b/packages/SystemUI/src/com/android/systemui/flags/Flags.kt index f0c0beff87a8e..6ca409f07f6fc 100644 --- a/packages/SystemUI/src/com/android/systemui/flags/Flags.kt +++ b/packages/SystemUI/src/com/android/systemui/flags/Flags.kt @@ -701,5 +701,6 @@ object Flags { // TODO(b/278761837): Tracking Bug @JvmField - val USE_NEW_ACTIVITY_STARTER = releasedFlag(2801, name = "use_new_activity_starter") + val USE_NEW_ACTIVITY_STARTER = unreleasedFlag(2801, name = "use_new_activity_starter", + teamfood = true) }