Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Load animation for freeform windows." into sc-v2-dev

Browse Source
This commit is contained in:
Ben Lin
2021-09-20 20:56:14 +00:00
committed by Android (Google) Code Review
parent f247750dd4 b73dd01b35
commit d21de41100
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/core/java/com/android/server/wm/WindowContainer.java
View File

@@ -16,6 +16,7 @@
package com.android.server.wm; package com.android.server.wm;
import static android.app.WindowConfiguration.WINDOWING_MODE_FREEFORM;
import static android.app.WindowConfiguration.WINDOWING_MODE_FULLSCREEN; 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_BEHIND;
import static android.content.pm.ActivityInfo.SCREEN_ORIENTATION_UNSET; import static android.content.pm.ActivityInfo.SCREEN_ORIENTATION_UNSET;
@@ -2815,7 +2816,8 @@ class WindowContainer<E extends WindowContainer> extends ConfigurationContainer<
boolean isVoiceInteraction) { boolean isVoiceInteraction) {
if (isOrganized() if (isOrganized()
// TODO(b/161711458): Clean-up when moved to shell. // TODO(b/161711458): Clean-up when moved to shell.
&& getWindowingMode() != WINDOWING_MODE_FULLSCREEN) { && getWindowingMode() != WINDOWING_MODE_FULLSCREEN
&& getWindowingMode() != WINDOWING_MODE_FREEFORM) {
return null; return null;
} }