Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b73dd01b authored by Ben Lin's avatar Ben Lin
Browse files

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
parent e7b68347

services/core/java/com/android/server/wm/WindowContainer.java

+3 −1
Original line number Diff line number Diff line
@@ -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<E extends 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;

        }