| commit | ccce958c18c42ce8c882d2edaf0ecc1a56cf7453 | [log] [tgz] |
|---|---|---|
| author | Vinit Nayak <peanutbutter@google.com> | Tue Aug 29 21:03:32 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Aug 29 21:03:32 2023 +0000 |
| tree | 4e36ae67174c4134ea61d9660d5ef0b3c2475631 | |
| parent | 72a6118372cc7e198a2c5c3bf915583039eaeb8c [diff] | |
| parent | 53ce6a6656a294cd8b1e108c56f9572cc51e6b70 [diff] |
Merge "Move ending CUJ_SPLIT_SCREEN_ENTER to after we show tasks to user" into udc-qpr-dev am: 1757f1b2c0 am: 53ce6a6656 Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24575470 Change-Id: Idc39633e4cb0e5eb63f298afb0ba2116b7dad52e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/quickstep/src/com/android/quickstep/views/RecentsView.java b/quickstep/src/com/android/quickstep/views/RecentsView.java index be9da34..76f9c2c 100644 --- a/quickstep/src/com/android/quickstep/views/RecentsView.java +++ b/quickstep/src/com/android/quickstep/views/RecentsView.java
@@ -4794,8 +4794,9 @@ } else { resetFromSplitSelectionState(); } + InteractionJankMonitorWrapper.end( + InteractionJankMonitorWrapper.CUJ_SPLIT_SCREEN_ENTER); }); - InteractionJankMonitorWrapper.end(InteractionJankMonitorWrapper.CUJ_SPLIT_SCREEN_ENTER); }); mSecondSplitHiddenView = containerTaskView;