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

Commit bf1d0a37 authored by Louis Chang's avatar Louis Chang Committed by Automerger Merge Worker
Browse files

Merge "Restrict the smallest screen width dp of an embedded TF" into tm-dev am: e107722e 

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



Change-Id: I3233f54b1733834604c21f89595a3a84b56ab134
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b578b408 e107722e

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

+7 −1
Original line number Diff line number Diff line
@@ -2061,9 +2061,15 @@ class TaskFragment extends WindowContainer<WindowContainer> { 
                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

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

                    // task, because they should not be affected by insets.

                    inOutConfig.smallestScreenWidthDp = (int) (

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

                } else if (isEmbedded()) {

                    // For embedded TFs, the smallest width should be updated. Otherwise, inherit

                    // from the parent task would result in applications loaded wrong resource.

                    inOutConfig.smallestScreenWidthDp =

                            Math.min(inOutConfig.screenWidthDp, inOutConfig.screenHeightDp);

                }

                // otherwise, it will just inherit

            }