Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 19397f0a authored by Chris Li's avatar Chris Li Committed by Automerger Merge Worker
Browse files

Merge "Crop embedded split TaskFragment as Task" into tm-qpr-dev am: be74f343 am: 32a303a3 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20018410



Change-Id: I27bacae7cee558d8228640fa945cbeee818fe893
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents ee15019c 32a303a3

libs/WindowManager/Shell/src/com/android/wm/shell/transition/DefaultTransitionHandler.java

+6 −2
Original line number Original line Diff line number Diff line
@@ -44,6 +44,8 @@ import static android.view.WindowManager.TRANSIT_TO_FRONT; 
import static android.window.TransitionInfo.FLAG_CROSS_PROFILE_OWNER_THUMBNAIL;

import static android.window.TransitionInfo.FLAG_CROSS_PROFILE_OWNER_THUMBNAIL;

import static android.window.TransitionInfo.FLAG_CROSS_PROFILE_WORK_THUMBNAIL;

import static android.window.TransitionInfo.FLAG_CROSS_PROFILE_WORK_THUMBNAIL;

import static android.window.TransitionInfo.FLAG_DISPLAY_HAS_ALERT_WINDOWS;

import static android.window.TransitionInfo.FLAG_DISPLAY_HAS_ALERT_WINDOWS;

import static android.window.TransitionInfo.FLAG_FILLS_TASK;

import static android.window.TransitionInfo.FLAG_IN_TASK_WITH_EMBEDDED_ACTIVITY;

import static android.window.TransitionInfo.FLAG_IS_DISPLAY;

import static android.window.TransitionInfo.FLAG_IS_DISPLAY;

import static android.window.TransitionInfo.FLAG_IS_VOICE_INTERACTION;

import static android.window.TransitionInfo.FLAG_IS_VOICE_INTERACTION;

import static android.window.TransitionInfo.FLAG_IS_WALLPAPER;

import static android.window.TransitionInfo.FLAG_IS_WALLPAPER;
@@ -369,8 +371,10 @@ public class DefaultTransitionHandler implements Transitions.TransitionHandler { 
                        change.getEndAbsBounds().top - info.getRootOffset().y);

                        change.getEndAbsBounds().top - info.getRootOffset().y);

                // Seamless display transition doesn't need to animate.

                // Seamless display transition doesn't need to animate.

                if (isSeamlessDisplayChange) continue;

                if (isSeamlessDisplayChange) continue;

                if (isTask) {

                if (isTask || (change.hasFlags(FLAG_IN_TASK_WITH_EMBEDDED_ACTIVITY)

                    // Skip non-tasks since those usually have null bounds.

                        && !change.hasFlags(FLAG_FILLS_TASK))) {

                    // Update Task and embedded split window crop bounds, otherwise we may see crop

                    // on previous bounds during the rotation animation.

                    startTransaction.setWindowCrop(change.getLeash(),

                    startTransaction.setWindowCrop(change.getLeash(),

                            change.getEndAbsBounds().width(), change.getEndAbsBounds().height());

                            change.getEndAbsBounds().width(), change.getEndAbsBounds().height());

                }

                }