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

Merge "Reset top focused root task when task hidden" into sc-dev

Browse Source
This commit is contained in:
Louis Chang
2021-02-22 03:08:58 +00:00
committed by Android (Google) Code Review
parent a6c75050f3 a782799b15
commit 0b4057f0a1
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5373,11 +5373,11 @@ class Task extends WindowContainer<WindowContainer> {
}
final boolean wasHidden = isForceHidden();
mForceHiddenFlags = newFlags;
if (wasHidden && isFocusableAndVisible()) {
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().resetPreferredTopFocusableRootTaskIfBelow(this);
getDisplayArea().resetPreferredTopFocusableRootTaskIfNeeded(this);
}
return true;
}

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

@@ -974,9 +974,10 @@ final class TaskDisplayArea extends DisplayArea<WindowContainer> {
onRootTaskOrderChanged(rootTask);
}
void resetPreferredTopFocusableRootTaskIfBelow(Task task) {
/** Reset the mPreferredTopFocusableRootTask if it is or below the given task. */
void resetPreferredTopFocusableRootTaskIfNeeded(Task task) {
if (mPreferredTopFocusableRootTask != null
&& mPreferredTopFocusableRootTask.compareTo(task) < 0) {
&& mPreferredTopFocusableRootTask.compareTo(task) <= 0) {
mPreferredTopFocusableRootTask = null;
}
}