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

Commit 228f1455 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Stop keeping freeform activities visible." am: 82cb76f9 am: 7c0c7500 

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

Change-Id: I099612e1a8b69fbe382c2aed95e96364d5407c8c
parents 82a16c79 7c0c7500

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

+1 −8
Original line number Diff line number Diff line
@@ -16,8 +16,6 @@ 


package com.android.server.wm;



import static android.app.WindowConfiguration.WINDOWING_MODE_FREEFORM;



import static com.android.server.wm.ActivityStack.TAG_VISIBILITY;

import static com.android.server.wm.ActivityTaskManagerDebugConfig.DEBUG_VISIBILITY;
@@ -174,12 +172,7 @@ class EnsureActivitiesVisibleHelper { 
        }



        final int windowingMode = mContiner.getWindowingMode();

        if (windowingMode == WINDOWING_MODE_FREEFORM) {

            // The visibility of tasks and the activities they contain in freeform stack are

            // determined individually unlike other stacks where the visibility or fullscreen

            // status of an activity in a previous task affects other.

            mBehindFullscreenActivity = !mContainerShouldBeVisible;

        } else if (!mBehindFullscreenActivity && mContiner.isActivityTypeHome()

        if (!mBehindFullscreenActivity && mContiner.isActivityTypeHome()

                && r.isRootOfTask()) {

            if (DEBUG_VISIBILITY) Slog.v(TAG_VISIBILITY, "Home task: at " + mContiner

                    + " stackShouldBeVisible=" + mContainerShouldBeVisible