mirror of
https://github.com/LawnchairLauncher/lawnchair.git
synced 2026-03-03 01:16:49 +00:00
Merge changes from topic "b/260218332-1" into tm-qpr-dev am: 5dd5296527
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/20562095 Change-Id: I92c009c2a0269d0e708d947eab4a0f9c5f5aa463 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -186,12 +186,17 @@ public class PortraitStatesTouchController extends AbstractStateChangeTouchContr
|
||||
case MotionEvent.ACTION_DOWN:
|
||||
InteractionJankMonitorWrapper.begin(
|
||||
mLauncher.getRootView(), InteractionJankMonitorWrapper.CUJ_OPEN_ALL_APPS);
|
||||
InteractionJankMonitorWrapper.begin(
|
||||
mLauncher.getRootView(),
|
||||
InteractionJankMonitorWrapper.CUJ_CLOSE_ALL_APPS_SWIPE);
|
||||
break;
|
||||
|
||||
case MotionEvent.ACTION_CANCEL:
|
||||
case MotionEvent.ACTION_UP:
|
||||
InteractionJankMonitorWrapper.cancel(
|
||||
InteractionJankMonitorWrapper.CUJ_OPEN_ALL_APPS);
|
||||
InteractionJankMonitorWrapper.cancel(
|
||||
InteractionJankMonitorWrapper.CUJ_CLOSE_ALL_APPS_SWIPE);
|
||||
break;
|
||||
}
|
||||
return super.onControllerInterceptTouchEvent(ev);
|
||||
@@ -204,6 +209,10 @@ public class PortraitStatesTouchController extends AbstractStateChangeTouchContr
|
||||
if (newToState != ALL_APPS) {
|
||||
InteractionJankMonitorWrapper.cancel(InteractionJankMonitorWrapper.CUJ_OPEN_ALL_APPS);
|
||||
}
|
||||
if (newToState != NORMAL) {
|
||||
InteractionJankMonitorWrapper.cancel(
|
||||
InteractionJankMonitorWrapper.CUJ_CLOSE_ALL_APPS_SWIPE);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -211,6 +220,9 @@ public class PortraitStatesTouchController extends AbstractStateChangeTouchContr
|
||||
super.onReachedFinalState(toState);
|
||||
if (toState == ALL_APPS) {
|
||||
InteractionJankMonitorWrapper.end(InteractionJankMonitorWrapper.CUJ_OPEN_ALL_APPS);
|
||||
} else if (toState == NORMAL) {
|
||||
InteractionJankMonitorWrapper.end(
|
||||
InteractionJankMonitorWrapper.CUJ_CLOSE_ALL_APPS_SWIPE);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -218,5 +230,7 @@ public class PortraitStatesTouchController extends AbstractStateChangeTouchContr
|
||||
protected void clearState() {
|
||||
super.clearState();
|
||||
InteractionJankMonitorWrapper.cancel(InteractionJankMonitorWrapper.CUJ_OPEN_ALL_APPS);
|
||||
InteractionJankMonitorWrapper.cancel(
|
||||
InteractionJankMonitorWrapper.CUJ_CLOSE_ALL_APPS_SWIPE);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user