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

Commit e0c19e7f authored by Ahan Wu's avatar Ahan Wu
Browse files

Add new interaction jank hook point for cuj tests 

We already have some exsiting cuj tests for jank, but the hook points
are different, so also take these points into account.

Bug: 169221093
Bug: 169220995
Test: atest \
PlatformScenarioTests:android.platform.test.scenario.notification.OpenCloseNotificationShadeMicrobenchmark \
-- --test-arg \
com.android.tradefed.testtype.AndroidJUnitTest:device-listeners:android.device.collectors.UiInteractionFrameInfoListener \
--module-arg PlatformScenarioTests:instrumentation-arg:iterations:=10 \
--module-arg PlatformScenarioTests:instrumentation-arg:drop-cache:=false \
--module-arg PlatformScenarioTests:instrumentation-arg:kill-app:=false

Change-Id: I3cddb28360f9d0b62a2df8ee1d3ffbac645d73c9
parent e8e9fe58

packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelViewController.java

+1 −0
Original line number Original line Diff line number Diff line
@@ -1112,6 +1112,7 @@ public class NotificationPanelViewController extends PanelViewController { 
        if (isFullyCollapsed()) {

        if (isFullyCollapsed()) {

            expand(true /* animate */);

            expand(true /* animate */);

        } else {

        } else {

            traceQsJank(true /* startTracing */, false /* wasCancelled */);

            flingSettings(0 /* velocity */, FLING_EXPAND);

            flingSettings(0 /* velocity */, FLING_EXPAND);

        }

        }

    }

    }

packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelViewController.java

+2 −0
Original line number Original line Diff line number Diff line
@@ -862,6 +862,8 @@ public abstract class PanelViewController { 
                            mView.getViewTreeObserver().removeOnGlobalLayoutListener(this);

                            mView.getViewTreeObserver().removeOnGlobalLayoutListener(this);

                            if (mAnimateAfterExpanding) {

                            if (mAnimateAfterExpanding) {

                                notifyExpandingStarted();

                                notifyExpandingStarted();

                                InteractionJankMonitor.getInstance().begin(

                                        CUJ_NOTIFICATION_SHADE_EXPAND_COLLAPSE);

                                fling(0, true /* expand */);

                                fling(0, true /* expand */);

                            } else {

                            } else {

                                setExpandedFraction(1f);

                                setExpandedFraction(1f);