From b73dd01b35238dfcb0de8d5d89577afe80e573e1 Mon Sep 17 00:00:00 2001 From: Ben Lin Date: Mon, 13 Sep 2021 15:26:14 -0700 Subject: [PATCH] Load animation for freeform windows. Now that freeform window is also organized (although via a very simple organizer), we should add it here in this check to make sure it still loads animation correctly here in the framework. Bug: 183906797 Test: Enter Freeform mode, tap on X - window now animates instead of just disappear Change-Id: Ica8de041e571510dcfc9f01f17ee87dc0467a1f1 --- services/core/java/com/android/server/wm/WindowContainer.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/services/core/java/com/android/server/wm/WindowContainer.java b/services/core/java/com/android/server/wm/WindowContainer.java index 2882a23910663..9d338e582b1fa 100644 --- a/services/core/java/com/android/server/wm/WindowContainer.java +++ b/services/core/java/com/android/server/wm/WindowContainer.java @@ -16,6 +16,7 @@ package com.android.server.wm; +import static android.app.WindowConfiguration.WINDOWING_MODE_FREEFORM; import static android.app.WindowConfiguration.WINDOWING_MODE_FULLSCREEN; import static android.content.pm.ActivityInfo.SCREEN_ORIENTATION_BEHIND; import static android.content.pm.ActivityInfo.SCREEN_ORIENTATION_UNSET; @@ -2789,7 +2790,8 @@ class WindowContainer extends ConfigurationContainer< boolean isVoiceInteraction) { if (isOrganized() // TODO(b/161711458): Clean-up when moved to shell. - && getWindowingMode() != WINDOWING_MODE_FULLSCREEN) { + && getWindowingMode() != WINDOWING_MODE_FULLSCREEN + && getWindowingMode() != WINDOWING_MODE_FREEFORM) { return null; }