diff options
| author | 2023-03-20 01:52:37 +0000 | |
|---|---|---|
| committer | 2023-03-20 01:52:37 +0000 | |
| commit | ba91e5b25105c89d6fd583ef6df7a7ecdce736e8 (patch) | |
| tree | f25ec2b5f93728c2224e23d9f537ceae51cfe4d0 | |
| parent | e1671c0239502883939040f8ea0d168c68f792d5 (diff) | |
| parent | b9b657f58657a375ca9826965c985b8023546273 (diff) | |
Merge "Fix the smallest width not updated while resolving override bounds" into tm-qpr-dev am: 63a708db35 am: b9b657f586
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22119684
Change-Id: I51a02fb5b2007604f08fd6e13abac5768b6477b4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | services/core/java/com/android/server/wm/TaskFragment.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/services/core/java/com/android/server/wm/TaskFragment.java b/services/core/java/com/android/server/wm/TaskFragment.java index 7c57dc17e802..09d33fa73c73 100644 --- a/services/core/java/com/android/server/wm/TaskFragment.java +++ b/services/core/java/com/android/server/wm/TaskFragment.java @@ -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 = |