| commit | 53ce6a6656a294cd8b1e108c56f9572cc51e6b70 | [log] [tgz] |
|---|---|---|
| author | Vinit Nayak <peanutbutter@google.com> | Tue Aug 29 05:47:00 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Aug 29 05:47:00 2023 +0000 |
| tree | da4c936cf4115c88f1a6faeef5ed42e0133b8658 | |
| parent | b8b5ca862672a7284c009ee682dc119d6f85fbe0 [diff] | |
| parent | 1757f1b2c0431260ef4562a1ebdfa5be069ba9e3 [diff] |
Merge "Move ending CUJ_SPLIT_SCREEN_ENTER to after we show tasks to user" into udc-qpr-dev am: 1757f1b2c0 Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24575470 Change-Id: I10e3b27190f0770d0bb641137879971514447718 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;