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

Merge "Do not reset preferred top focusable stack before positioning"

Browse Source
This commit is contained in:
TreeHugger Robot
2020-07-03 11:56:20 +00:00
committed by Android (Google) Code Review
parent 2ecc2c55a6 1ffdf4222a
commit 8a1b80bc2a
1 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -326,14 +326,6 @@ final class TaskDisplayArea extends DisplayArea<ActivityStack> {
final boolean moveToTop = position >= getChildCount() - 1;
final boolean moveToBottom = (position == POSITION_BOTTOM || position == 0);
// Reset mPreferredTopFocusableStack before positioning to top or {@link
// ActivityStackSupervisor#updateTopResumedActivityIfNeeded()} won't update the top
// resumed activity.
final boolean wasContained = mChildren.contains(child);
if (moveToTop && wasContained && child.isFocusable()) {
mPreferredTopFocusableStack = null;
}
if (child.getWindowConfiguration().isAlwaysOnTop() && !moveToTop) {
// This stack is always-on-top, override the default behavior.
Slog.w(TAG_WM, "Ignoring move of always-on-top stack=" + this + " to bottom");
@@ -374,6 +366,9 @@ final class TaskDisplayArea extends DisplayArea<ActivityStack> {
} else if (mPreferredTopFocusableStack == child) {
mPreferredTopFocusableStack = null;
}
// Update the top resumed activity because the preferred top focusable task may be changed.
mAtmService.mStackSupervisor.updateTopResumedActivityIfNeeded();
}
/**