openkylin
/
platform_packages_apps_Launcher3
mirror of https://gitee.com/openkylin/platform_packages_apps_launcher3.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge "Do not pip when ending live tile in Overview" into sc-dev

This commit is contained in:
Tracy Zhou 2021-05-11 23:23:35 +00:00 committed by Android (Google) Code Review
parent 1553f4dfae be0bb572da
commit 6dce7b6366
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
quickstep/src/com/android/quickstep/TaskOverlayFactory.java
View File

@ -190,7 +190,8 @@ public class TaskOverlayFactory implements ResourceBasedOverride {
if (LIVE_TILE.get()) {
RecentsView recentsView = mThumbnailView.getTaskView().getRecentsView();
recentsView.switchToScreenshot(
() -> recentsView.finishRecentsAnimation(true /* toRecents */, callback));
() -> recentsView.finishRecentsAnimation(true /* toRecents */,
false /* shouldPip */, callback));
} else {
callback.run();
}

7
quickstep/src/com/android/quickstep/views/RecentsView.java
View File

@ -3370,6 +3370,11 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
}
public void finishRecentsAnimation(boolean toRecents, Runnable onFinishComplete) {
finishRecentsAnimation(toRecents, true /* shouldPip */, onFinishComplete);
}
public void finishRecentsAnimation(boolean toRecents, boolean shouldPip,
Runnable onFinishComplete) {
if (!toRecents && LIVE_TILE.get()) {
// Reset the minimized state since we force-toggled the minimized state when entering
// overview, but never actually finished the recents animation. This is a catch all for
@ -3387,7 +3392,7 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
return;
}
final boolean sendUserLeaveHint = toRecents && LIVE_TILE.get();
final boolean sendUserLeaveHint = toRecents && shouldPip;
if (sendUserLeaveHint) {
// Notify the SysUI to use fade-in animation when entering PiP from live tile.
final SystemUiProxy systemUiProxy = SystemUiProxy.INSTANCE.get(getContext());