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

Commit e87b9608 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... 

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

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



Change-Id: Id746985dfa8c4436b323f294b3cf36258d1f9afa
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d65672c6 6f9c7f8a

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

            }