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

Commit 5ade2fa8 authored by Milton Wu's avatar Milton Wu
Browse files

Finetune LOCKSCREEN_TRANSITION_FROM_AOD CUJ 

Cancel LOCKSCREEN_TRANSITION_FROM_AOD CUJ when KeyguardViewMediator
setOccluded or startKeyguardExitAnimation.

Bug: 190374860
Test: atest KeyguardViewMediatorTest
Change-Id: I0c7f3d6dbf0c1bc9ac12df38c109f4a7668fea0c
parent 1d42fb2f

packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java

+4 −1
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ import static android.provider.Settings.System.SCREEN_OFF_TIMEOUT; 
import static android.view.WindowManagerPolicyConstants.KEYGUARD_GOING_AWAY_FLAG_WITH_WALLPAPER;



import static com.android.internal.config.sysui.SystemUiDeviceConfigFlags.NAV_BAR_HANDLE_SHOW_OVER_LOCKSCREEN;

import static com.android.internal.jank.InteractionJankMonitor.CUJ_LOCKSCREEN_TRANSITION_FROM_AOD;

import static com.android.internal.jank.InteractionJankMonitor.CUJ_LOCKSCREEN_UNLOCK_ANIMATION;

import static com.android.internal.widget.LockPatternUtils.StrongAuthTracker.SOME_AUTH_REQUIRED_AFTER_USER_REQUEST;

import static com.android.internal.widget.LockPatternUtils.StrongAuthTracker.STRONG_AUTH_REQUIRED_AFTER_DPM_LOCK_NOW;
@@ -123,11 +124,11 @@ import com.android.systemui.statusbar.NotificationShadeDepthController; 
import com.android.systemui.statusbar.NotificationShadeWindowController;

import com.android.systemui.statusbar.SysuiStatusBarStateController;

import com.android.systemui.statusbar.phone.BiometricUnlockController;

import com.android.systemui.statusbar.phone.CentralSurfaces;

import com.android.systemui.statusbar.phone.DozeParameters;

import com.android.systemui.statusbar.phone.KeyguardBypassController;

import com.android.systemui.statusbar.phone.NotificationPanelViewController;

import com.android.systemui.statusbar.phone.ScreenOffAnimationController;

import com.android.systemui.statusbar.phone.CentralSurfaces;

import com.android.systemui.statusbar.phone.panelstate.PanelExpansionStateManager;

import com.android.systemui.statusbar.policy.KeyguardStateController;

import com.android.systemui.statusbar.policy.UserSwitcherController;
@@ -1557,6 +1558,7 @@ public class KeyguardViewMediator extends CoreStartable implements Dumpable, 
    public void setOccluded(boolean isOccluded, boolean animate) {

        Trace.beginSection("KeyguardViewMediator#setOccluded");

        if (DEBUG) Log.d(TAG, "setOccluded " + isOccluded);

        mInteractionJankMonitor.cancel(CUJ_LOCKSCREEN_TRANSITION_FROM_AOD);

        mHandler.removeMessages(SET_OCCLUDED);

        Message msg = mHandler.obtainMessage(SET_OCCLUDED, isOccluded ? 1 : 0, animate ? 1 : 0);

        mHandler.sendMessage(msg);
@@ -2813,6 +2815,7 @@ public class KeyguardViewMediator extends CoreStartable implements Dumpable, 
            RemoteAnimationTarget[] apps, RemoteAnimationTarget[] wallpapers,

            RemoteAnimationTarget[] nonApps, IRemoteAnimationFinishedCallback finishedCallback) {

        Trace.beginSection("KeyguardViewMediator#startKeyguardExitAnimation");

        mInteractionJankMonitor.cancel(CUJ_LOCKSCREEN_TRANSITION_FROM_AOD);

        Message msg = mHandler.obtainMessage(START_KEYGUARD_EXIT_ANIM,

                new StartKeyguardExitAnimParams(transit, startTime, fadeoutDuration, apps,

                        wallpapers, nonApps, finishedCallback));