Merge "Fix the smallest width not updated while resolving override bounds" into tm-qpr-dev am: 63a708db35
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22119684
Change-Id: Idc80e552cc0c31c689082aaba49f73b805e1c7e7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/services/core/java/com/android/server/wm/TaskFragment.java b/services/core/java/com/android/server/wm/TaskFragment.java
index abeac4b..fe02158 100644
--- a/services/core/java/com/android/server/wm/TaskFragment.java
+++ b/services/core/java/com/android/server/wm/TaskFragment.java
@@ -2246,8 +2246,8 @@
// 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 =