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

Commit 712b93d7 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix CTS failure for waterfall device" into sc-v2-dev am: 990528e9 

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

Change-Id: Id99b7fc08f1127ce6a60ea370b6038963a80cc00
parents 540ad63e 990528e9

services/core/java/com/android/server/wm/TaskFragment.java

+9 −1
Original line number Diff line number Diff line
@@ -1957,7 +1957,15 @@ class TaskFragment extends WindowContainer<WindowContainer> { 


            if (inOutConfig.smallestScreenWidthDp

                    == Configuration.SMALLEST_SCREEN_WIDTH_DP_UNDEFINED) {

                if (WindowConfiguration.isFloating(windowingMode)) {

                // When entering to or exiting from Pip, the PipTaskOrganizer will set the

                // windowing mode of the activity in the task to WINDOWING_MODE_FULLSCREEN and

                // temporarily set the bounds of the task to fullscreen size for transitioning.

                // It will get the wrong value if the calculation is based on this temporary

                // fullscreen bounds.

                // We should just inherit the value from parent for this temporary state.

                final boolean inPipTransition = windowingMode == WINDOWING_MODE_PINNED

                        && !mTmpFullBounds.isEmpty() && mTmpFullBounds.equals(parentBounds);

                if (WindowConfiguration.isFloating(windowingMode) && !inPipTransition) {

                    // For floating tasks, calculate the smallest width from the bounds of the task

                    inOutConfig.smallestScreenWidthDp = (int) (

                            Math.min(mTmpFullBounds.width(), mTmpFullBounds.height()) / density);