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

Commit f085594e authored by Christian Göllner's avatar Christian Göllner Committed by Automerger Merge Worker
Browse files

Merge "Revert "ADD CUJ_LOCKSCREEN_CLOCK_MOVE_ANIMATION"" into tm-qpr-dev am: f42ff396 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21651266



Change-Id: I2d9dfe7bc18bc415f674bffaec4eea803abce4a7
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 2ee7558f f42ff396

core/java/com/android/internal/jank/InteractionJankMonitor.java

+1 −7
Original line number Diff line number Diff line
@@ -33,7 +33,6 @@ import static com.android.internal.util.FrameworkStatsLog.UIINTERACTION_FRAME_IN 
import static com.android.internal.util.FrameworkStatsLog.UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__LAUNCHER_OPEN_ALL_APPS;

import static com.android.internal.util.FrameworkStatsLog.UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__LAUNCHER_QUICK_SWITCH;

import static com.android.internal.util.FrameworkStatsLog.UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__LAUNCHER_UNLOCK_ENTRANCE_ANIMATION;

import static com.android.internal.util.FrameworkStatsLog.UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__LOCKSCREEN_CLOCK_MOVE_ANIMATION;

import static com.android.internal.util.FrameworkStatsLog.UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__LOCKSCREEN_LAUNCH_CAMERA;

import static com.android.internal.util.FrameworkStatsLog.UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__LOCKSCREEN_OCCLUSION;

import static com.android.internal.util.FrameworkStatsLog.UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__LOCKSCREEN_PASSWORD_APPEAR;
@@ -232,7 +231,6 @@ public class InteractionJankMonitor { 
    public static final int CUJ_LAUNCHER_APP_SWIPE_TO_RECENTS = 66;

    public static final int CUJ_LAUNCHER_CLOSE_ALL_APPS_SWIPE = 67;

    public static final int CUJ_LAUNCHER_CLOSE_ALL_APPS_TO_HOME = 68;

    public static final int CUJ_LOCKSCREEN_CLOCK_MOVE_ANIMATION = 70;



    private static final int NO_STATSD_LOGGING = -1;
@@ -310,7 +308,6 @@ public class InteractionJankMonitor { 
            UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__LAUNCHER_APP_SWIPE_TO_RECENTS,

            UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__LAUNCHER_CLOSE_ALL_APPS_SWIPE,

            UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__LAUNCHER_CLOSE_ALL_APPS_TO_HOME,

            UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__LOCKSCREEN_CLOCK_MOVE_ANIMATION,

    };



    private static volatile InteractionJankMonitor sInstance;
@@ -399,8 +396,7 @@ public class InteractionJankMonitor { 
            CUJ_RECENTS_SCROLLING,

            CUJ_LAUNCHER_APP_SWIPE_TO_RECENTS,

            CUJ_LAUNCHER_CLOSE_ALL_APPS_SWIPE,

            CUJ_LAUNCHER_CLOSE_ALL_APPS_TO_HOME,

            CUJ_LOCKSCREEN_CLOCK_MOVE_ANIMATION

            CUJ_LAUNCHER_CLOSE_ALL_APPS_TO_HOME

    })

    @Retention(RetentionPolicy.SOURCE)

    public @interface CujType {
@@ -921,8 +917,6 @@ public class InteractionJankMonitor { 
                return "LAUNCHER_CLOSE_ALL_APPS_SWIPE";

            case CUJ_LAUNCHER_CLOSE_ALL_APPS_TO_HOME:

                return "LAUNCHER_CLOSE_ALL_APPS_TO_HOME";

            case CUJ_LOCKSCREEN_CLOCK_MOVE_ANIMATION:

                return "CUJ_LOCKSCREEN_CLOCK_MOVE_ANIMATION";

        }

        return "UNKNOWN";

    }

packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java

+1 −23
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ import static android.view.View.VISIBLE; 
import static androidx.constraintlayout.widget.ConstraintSet.END;

import static androidx.constraintlayout.widget.ConstraintSet.PARENT_ID;



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

import static com.android.keyguard.KeyguardClockSwitch.LARGE;

import static com.android.keyguard.KeyguardClockSwitch.SMALL;

import static com.android.systemui.animation.Interpolators.EMPHASIZED_ACCELERATE;
@@ -72,7 +71,6 @@ import android.os.VibrationEffect; 
import android.provider.Settings;

import android.transition.ChangeBounds;

import android.transition.Transition;

import android.transition.TransitionListenerAdapter;

import android.transition.TransitionManager;

import android.transition.TransitionSet;

import android.transition.TransitionValues;
@@ -100,7 +98,6 @@ import android.widget.FrameLayout; 
import androidx.constraintlayout.widget.ConstraintSet;



import com.android.internal.annotations.VisibleForTesting;

import com.android.internal.jank.InteractionJankMonitor;

import com.android.internal.logging.MetricsLogger;

import com.android.internal.logging.nano.MetricsProto.MetricsEvent;

import com.android.internal.policy.SystemBarUtils;
@@ -356,7 +353,6 @@ public final class NotificationPanelViewController implements Dumpable { 
    private final NotificationGutsManager mGutsManager;

    private final AlternateBouncerInteractor mAlternateBouncerInteractor;

    private final QuickSettingsController mQsController;

    private final InteractionJankMonitor mInteractionJankMonitor;



    private long mDownTime;

    private boolean mTouchSlopExceededBeforeDown;
@@ -646,19 +642,6 @@ public final class NotificationPanelViewController implements Dumpable { 
                    step.getTransitionState() == TransitionState.RUNNING;

            };



    private final TransitionListenerAdapter mKeyguardStatusAlignmentTransitionListener =

            new TransitionListenerAdapter() {

                @Override

                public void onTransitionCancel(Transition transition) {

                    mInteractionJankMonitor.cancel(CUJ_LOCKSCREEN_CLOCK_MOVE_ANIMATION);

                }



                @Override

                public void onTransitionEnd(Transition transition) {

                    mInteractionJankMonitor.end(CUJ_LOCKSCREEN_CLOCK_MOVE_ANIMATION);

                }

            };



    @Inject

    public NotificationPanelViewController(NotificationPanelView view,

            @Main Handler handler,
@@ -723,7 +706,6 @@ public final class NotificationPanelViewController implements Dumpable { 
            NotificationStackSizeCalculator notificationStackSizeCalculator,

            UnlockedScreenOffAnimationController unlockedScreenOffAnimationController,

            ShadeTransitionController shadeTransitionController,

            InteractionJankMonitor interactionJankMonitor,

            SystemClock systemClock,

            KeyguardBottomAreaViewModel keyguardBottomAreaViewModel,

            KeyguardBottomAreaInteractor keyguardBottomAreaInteractor,
@@ -738,7 +720,6 @@ public final class NotificationPanelViewController implements Dumpable { 
            DumpManager dumpManager,

            KeyguardLongPressViewModel keyguardLongPressViewModel,

            KeyguardInteractor keyguardInteractor) {

        mInteractionJankMonitor = interactionJankMonitor;

        keyguardStateController.addCallback(new KeyguardStateController.Callback() {

            @Override

            public void onKeyguardFadingAwayChanged() {
@@ -1559,7 +1540,6 @@ public final class NotificationPanelViewController implements Dumpable { 
            int statusConstraint = shouldBeCentered ? PARENT_ID : R.id.qs_edge_guideline;

            constraintSet.connect(R.id.keyguard_status_view, END, statusConstraint, END);

            if (animate) {

                mInteractionJankMonitor.begin(mView, CUJ_LOCKSCREEN_CLOCK_MOVE_ANIMATION);

                ChangeBounds transition = new ChangeBounds();

                if (mSplitShadeEnabled) {

                    // Excluding media from the transition on split-shade, as it doesn't transition
@@ -1583,7 +1563,6 @@ public final class NotificationPanelViewController implements Dumpable { 
                    // The clock container can sometimes be null. If it is, just fall back to the

                    // old animation rather than setting up the custom animations.

                    if (clockContainerView == null || clockContainerView.getChildCount() == 0) {

                        transition.addListener(mKeyguardStatusAlignmentTransitionListener);

                        TransitionManager.beginDelayedTransition(

                                mNotificationContainerParent, transition);

                    } else {
@@ -1602,11 +1581,10 @@ public final class NotificationPanelViewController implements Dumpable { 
                        adapter.setDuration(KEYGUARD_STATUS_VIEW_CUSTOM_CLOCK_MOVE_DURATION);

                        adapter.addTarget(clockView);

                        set.addTransition(adapter);

                        set.addListener(mKeyguardStatusAlignmentTransitionListener);



                        TransitionManager.beginDelayedTransition(mNotificationContainerParent, set);

                    }

                } else {

                    transition.addListener(mKeyguardStatusAlignmentTransitionListener);

                    TransitionManager.beginDelayedTransition(

                            mNotificationContainerParent, transition);

                }

packages/SystemUI/tests/src/com/android/systemui/shade/NotificationPanelViewControllerBaseTest.java

+0 −1
Original line number Diff line number Diff line
@@ -551,7 +551,6 @@ public class NotificationPanelViewControllerBaseTest extends SysuiTestCase { 
                mNotificationStackSizeCalculator,

                mUnlockedScreenOffAnimationController,

                mShadeTransitionController,

                mInteractionJankMonitor,

                systemClock,

                mKeyguardBottomAreaViewModel,

                mKeyguardBottomAreaInteractor,