Merge cherrypicks of ['googleplex-android-review.googlesource.com/33937778', 'googleplex-android-review.googlesource.com/34016070'] into 25Q3-release.
Change-Id: I3e7f338f11587afdd5349d75b29a81dd38b27523
This commit is contained in:
@@ -1073,12 +1073,10 @@ public abstract class AbsSwipeUpHandler<
|
||||
}
|
||||
mHandled = true;
|
||||
|
||||
InteractionJankMonitorWrapper.begin(mRecentsView, Cuj.CUJ_LAUNCHER_QUICK_SWITCH,
|
||||
2000 /* ms timeout */);
|
||||
InteractionJankMonitorWrapper.begin(mRecentsView,
|
||||
Cuj.CUJ_LAUNCHER_APP_CLOSE_TO_HOME);
|
||||
InteractionJankMonitorWrapper.begin(mRecentsView,
|
||||
Cuj.CUJ_LAUNCHER_APP_SWIPE_TO_RECENTS);
|
||||
InteractionJankMonitorWrapper.begin(
|
||||
rv, Cuj.CUJ_LAUNCHER_QUICK_SWITCH, /* timeoutMs= */ 2000);
|
||||
InteractionJankMonitorWrapper.begin(rv, Cuj.CUJ_LAUNCHER_APP_CLOSE_TO_HOME);
|
||||
InteractionJankMonitorWrapper.begin(rv, Cuj.CUJ_LAUNCHER_APP_SWIPE_TO_RECENTS);
|
||||
|
||||
rv.post(() -> rv.getViewTreeObserver().removeOnDrawListener(this));
|
||||
}
|
||||
|
||||
@@ -1304,8 +1304,9 @@ class SystemUiProxy @Inject constructor(@ApplicationContext private val context:
|
||||
transitionInfo,
|
||||
)
|
||||
|
||||
override fun onAnimationCanceled(taskIds: IntArray?, taskSnapshots: Array<TaskSnapshot>?) =
|
||||
override fun onAnimationCanceled(taskIds: IntArray?, taskSnapshots: Array<TaskSnapshot?>?) {
|
||||
listener.onAnimationCanceled(wrap(taskIds, taskSnapshots))
|
||||
}
|
||||
|
||||
override fun onTasksAppeared(
|
||||
apps: Array<RemoteAnimationTarget>?,
|
||||
|
||||
Reference in New Issue
Block a user