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

Merge "Don\'t show home activity when exiting split-screen with recents visible" into nyc-dev

Browse Source 
am: 5e3801a

* commit '5e3801ab359634a05ec82992934007fbb21a059a':
  Don't show home activity when exiting split-screen with recents visible
This commit is contained in:
Wale Ogunwale
2016-03-28 22:05:03 +00:00
committed by android-build-merger
parent 62c01e3740 5e3801ab35
commit ad57509579
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3089,10 +3089,14 @@ final class ActivityStack {
return false;
}
if (stack.isHomeStack()) {
final ActivityRecord top = stack.topRunningActivityLocked();
if (stack.isHomeStack() && (top == null || !top.visible)) {
// If we will be focusing on the home stack next and its current top activity isn't
// visible, then use the task return to value to determine the home task to display next.
return mStackSupervisor.moveHomeStackTaskToTop(taskToReturnTo, reason);
}
return mService.setFocusedActivityLocked(stack.topRunningActivityLocked(), myReason);
return mService.setFocusedActivityLocked(top, myReason);
}
final void stopActivityLocked(ActivityRecord r) {