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

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

Merge "Fix the smallest width not updated while resolving override bounds"... 

Merge "Fix the smallest width not updated while resolving override bounds" into tm-qpr-dev am: 63a708db am: b9b657f5 am: ba91e5b2

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



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

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

+2 −2
Original line number Diff line number Diff line
@@ -2232,8 +2232,8 @@ class TaskFragment extends WindowContainer<WindowContainer> { 
                    // task, because they should not be affected by insets.

                    inOutConfig.smallestScreenWidthDp = (int) (0.5f

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

                } else if (windowingMode == WINDOWING_MODE_MULTI_WINDOW

                        && isEmbeddedWithBoundsOverride()) {

                } else if (windowingMode == WINDOWING_MODE_MULTI_WINDOW && mIsEmbedded

                        && insideParentBounds && !resolvedBounds.equals(parentBounds)) {

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

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

                    inOutConfig.smallestScreenWidthDp =