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

Commit 0827add0 authored by Ben Lin's avatar Ben Lin Committed by Automerger Merge Worker
Browse files

Merge "Load animation for freeform windows." into sc-v2-dev am: d21de411 am: aa8e6cce 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15821780

Change-Id: I6c56f3c3bfe359b57807f251fdf99795da8f96ef
parents 52acf485 aa8e6cce

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;
@@ -2819,7 +2820,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;

        }