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

Merge "Fixes docked stack from being invisible from assistant stack over" into pi-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2018-05-17 20:02:50 +00:00
committed by Android (Google) Code Review
parent 7a881c36ad a51dcaae7a
commit 505267f103
2 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
packages/SystemUI/src/com/android/systemui/stackdivider/DividerView.java
View File

@@ -781,7 +781,8 @@ public class DividerView extends FrameLayout implements OnTouchListener,
mMinimizedSnapAlgorithm = null; mMinimizedSnapAlgorithm = null;
mDockedStackMinimized = minimized; mDockedStackMinimized = minimized;
initializeSnapAlgorithm(); initializeSnapAlgorithm();
if (mIsInMinimizeInteraction != minimized) { if (mIsInMinimizeInteraction != minimized || mCurrentAnimator != null) {
cancelFlingAnimation();
if (minimized) { if (minimized) {
// Relayout to recalculate the divider shadow when minimizing // Relayout to recalculate the divider shadow when minimizing
requestLayout(); requestLayout();

15
services/core/java/com/android/server/am/ActivityStack.java
View File

@@ -17,6 +17,7 @@
package com.android.server.am; package com.android.server.am;
import static android.app.ITaskStackListener.FORCED_RESIZEABLE_REASON_SPLIT_SCREEN; 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_HOME;
import static android.app.WindowConfiguration.ACTIVITY_TYPE_RECENTS; import static android.app.WindowConfiguration.ACTIVITY_TYPE_RECENTS;
import static android.app.WindowConfiguration.ACTIVITY_TYPE_STANDARD; import static android.app.WindowConfiguration.ACTIVITY_TYPE_STANDARD;
@@ -1759,10 +1760,16 @@ class ActivityStack<T extends StackWindowController> extends ConfigurationContai
// In this case the home stack isn't resizeable even though we are in split-screen // 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 // 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 // a slight hint of it in the status bar area above the non-resizeable home
// activity. // activity. In addition, if the fullscreen assistant is over primary splitscreen
if (windowingMode == WINDOWING_MODE_SPLIT_SCREEN_PRIMARY // stack, the stack should still be visible in the background as long as the recents
&& other.getActivityType() == ACTIVITY_TYPE_HOME) { // animation is running.
return true; 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)) { if (other.isStackTranslucent(starting)) {
// Can be visible behind a translucent fullscreen stack. // Can be visible behind a translucent fullscreen stack.