summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Omar Elmekkawy <mekk@google.com> 2024-10-29 16:27:36 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2024-10-29 16:27:36 +0000
commit905b68141c367b80493d0129e23ab2f01ed251e2 (patch)
tree621cef0ced55a148f2906e114d4b40902320478e
parent9397c27df2d6cb9290084b1fcceff94c496ac50c (diff)
parentb0b48ea6a6ac0842009fc9377305f650ab8a8137 (diff)
Merge "[11/n] Fix a bug where tiling isn't broken on 5 app open minimize" into main
-rw-r--r--libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/tiling/DesktopTilingWindowDecoration.kt5
1 files changed, 4 insertions, 1 deletions
diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/tiling/DesktopTilingWindowDecoration.kt b/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/tiling/DesktopTilingWindowDecoration.kt
index 6ea1d14cc734..8f089dcf62d8 100644
--- a/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/tiling/DesktopTilingWindowDecoration.kt
+++ b/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/tiling/DesktopTilingWindowDecoration.kt
@@ -27,6 +27,7 @@ import android.util.Slog
import android.view.SurfaceControl
import android.view.SurfaceControl.Transaction
import android.view.WindowManager.TRANSIT_CHANGE
+import android.view.WindowManager.TRANSIT_OPEN
import android.view.WindowManager.TRANSIT_TO_BACK
import android.view.WindowManager.TRANSIT_TO_FRONT
import android.window.TransitionInfo
@@ -342,7 +343,9 @@ class DesktopTilingWindowDecoration(
private fun isMinimized(changeMode: Int, infoType: Int): Boolean {
return (changeMode == TRANSIT_TO_BACK &&
- (infoType == TRANSIT_MINIMIZE || infoType == TRANSIT_TO_BACK))
+ (infoType == TRANSIT_MINIMIZE ||
+ infoType == TRANSIT_TO_BACK ||
+ infoType == TRANSIT_OPEN))
}
class AppResizingHelper(