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

Commit b1ab9691 authored by Matthew Ng's avatar Matthew Ng Committed by android-build-merger
Browse files

Merge "Fixes docked stack from being invisible from assistant stack over" into... 

Merge "Fixes docked stack from being invisible from assistant stack over" into pi-dev am: 505267f1
am: 40a36f83

Change-Id: Iccba5593abae30a414b81e5c76bef00b2d2bb1e4
parents 1ad9abc0 40a36f83

packages/SystemUI/src/com/android/systemui/stackdivider/DividerView.java

+2 −1
Original line number Diff line number Diff line
@@ -781,7 +781,8 @@ public class DividerView extends FrameLayout implements OnTouchListener, 
            mMinimizedSnapAlgorithm = null;

            mDockedStackMinimized = minimized;

            initializeSnapAlgorithm();

            if (mIsInMinimizeInteraction != minimized) {

            if (mIsInMinimizeInteraction != minimized || mCurrentAnimator != null) {

                cancelFlingAnimation();

                if (minimized) {

                    // Relayout to recalculate the divider shadow when minimizing

                    requestLayout();

services/core/java/com/android/server/am/ActivityStack.java

+11 −4
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
package com.android.server.am;



import static android.app.ITaskStackListener.FORCED_RESIZEABLE_REASON_SPLIT_SCREEN;

import static android.app.WindowConfiguration.ACTIVITY_TYPE_ASSISTANT;

import static android.app.WindowConfiguration.ACTIVITY_TYPE_HOME;

import static android.app.WindowConfiguration.ACTIVITY_TYPE_RECENTS;

import static android.app.WindowConfiguration.ACTIVITY_TYPE_STANDARD;
@@ -1759,11 +1760,17 @@ class ActivityStack<T extends StackWindowController> extends ConfigurationContai 
                // In this case the home stack isn't resizeable even though we are in split-screen

                // mode. We still want the primary splitscreen stack to be visible as there will be

                // a slight hint of it in the status bar area above the non-resizeable home

                // activity.

                if (windowingMode == WINDOWING_MODE_SPLIT_SCREEN_PRIMARY

                        && other.getActivityType() == ACTIVITY_TYPE_HOME) {

                // activity. In addition, if the fullscreen assistant is over primary splitscreen

                // stack, the stack should still be visible in the background as long as the recents

                // animation is running.

                final int activityType = other.getActivityType();

                if (windowingMode == WINDOWING_MODE_SPLIT_SCREEN_PRIMARY) {

                    if (activityType == ACTIVITY_TYPE_HOME

                            || (activityType == ACTIVITY_TYPE_ASSISTANT

                                    && mWindowManager.getRecentsAnimationController() != null)) {

                       return true;

                    }

                }

                if (other.isStackTranslucent(starting)) {

                    // Can be visible behind a translucent fullscreen stack.

                    continue;