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

Merge "DO NOT MERGE Reset top focused root task when task hidden" into rvc-qpr-dev

Browse Source
This commit is contained in:
Mady Mellor
2021-03-30 17:04:56 +00:00
committed by Android (Google) Code Review
parent 11ce805c9f 78a9f28282
commit f61739c78d
2 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
services/core/java/com/android/server/wm/Task.java
View File

@@ -4597,11 +4597,11 @@ class Task extends WindowContainer<WindowContainer> {
}
final boolean wasHidden = isForceHidden();
mForceHiddenFlags = newFlags;
if (wasHidden && isFocusableAndVisible()) {
// The change in force-hidden state will change visibility without triggering a stack
// order change, so we should reset the preferred top focusable stack to ensure it's not
// used if a new activity is started from this task.
getDisplayArea().resetPreferredTopFocusableStackIfBelow(this);
if (wasHidden != isForceHidden() && isTopActivityFocusable()) {
// The change in force-hidden state will change visibility without triggering a root
// task order change, so we should reset the preferred top focusable root task to ensure
// it's not used if a new activity is started from this task.
getDisplayArea().resetPreferredTopFocusableRootTaskIfNeeded(this);
}
return true;
}

5
services/core/java/com/android/server/wm/TaskDisplayArea.java
View File

@@ -773,9 +773,10 @@ final class TaskDisplayArea extends DisplayArea<ActivityStack> {
onStackOrderChanged(stack);
}
void resetPreferredTopFocusableStackIfBelow(Task task) {
/** Reset the mPreferredTopFocusableRootTask if it is or below the given task. */
void resetPreferredTopFocusableRootTaskIfNeeded(Task task) {
if (mPreferredTopFocusableStack != null
&& mPreferredTopFocusableStack.compareTo(task) < 0) {
&& mPreferredTopFocusableStack.compareTo(task) <= 0) {
mPreferredTopFocusableStack = null;
}
}