Merge "Consider only the top most stacks for visibility test"

This commit is contained in:
TreeHugger Robot
2017-11-10 21:26:53 +00:00
committed by Android (Google) Code Review

View File

@@ -208,6 +208,8 @@ public class SystemServicesProxy {
*
* @param isHomeStackVisible if provided, will return whether the home stack is visible
* regardless of the recents visibility
*
* TODO(winsonc): Refactor this check to just use the recents activity lifecycle
*/
public boolean isRecentsActivityVisible(MutableBoolean isHomeStackVisible) {
if (mIam == null) return false;
@@ -222,13 +224,13 @@ public class SystemServicesProxy {
final WindowConfiguration winConfig = stackInfo.configuration.windowConfiguration;
final int activityType = winConfig.getActivityType();
final int windowingMode = winConfig.getWindowingMode();
if (activityType == ACTIVITY_TYPE_HOME) {
if (homeStackInfo == null && activityType == ACTIVITY_TYPE_HOME) {
homeStackInfo = stackInfo;
} else if (activityType == ACTIVITY_TYPE_STANDARD
} else if (fullscreenStackInfo == null && activityType == ACTIVITY_TYPE_STANDARD
&& (windowingMode == WINDOWING_MODE_FULLSCREEN
|| windowingMode == WINDOWING_MODE_SPLIT_SCREEN_SECONDARY)) {
fullscreenStackInfo = stackInfo;
} else if (activityType == ACTIVITY_TYPE_RECENTS) {
} else if (recentsStackInfo == null && activityType == ACTIVITY_TYPE_RECENTS) {
recentsStackInfo = stackInfo;
}
}