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

Merge "Bring more visibility logic from stack to activity."

Browse Source
This commit is contained in:
TreeHugger Robot
2019-01-29 16:53:03 +00:00
committed by Android (Google) Code Review
parent 72a57dffef 47e576c065
commit 563a0c54cb
2 changed files with 34 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
services/core/java/com/android/server/wm/ActivityRecord.java
View File

@@ -1916,6 +1916,8 @@ final class ActivityRecord extends ConfigurationContainer {
* @return true if the input activity should be made visible, ignoring any effect Keyguard
* might have on the visibility
*
* TODO(b/123540470): Combine this method and {@link #shouldBeVisible(boolean)}.
*
* @see {@link ActivityStack#checkKeyguardVisibility}
*/
boolean shouldBeVisibleIgnoringKeyguard(boolean behindFullscreenActivity) {
@@ -1926,6 +1928,36 @@ final class ActivityRecord extends ConfigurationContainer {
return !behindFullscreenActivity || mLaunchTaskBehind;
}
boolean shouldBeVisible(boolean behindFullscreenActivity) {
// Check whether activity should be visible without Keyguard influence
visibleIgnoringKeyguard = shouldBeVisibleIgnoringKeyguard(behindFullscreenActivity);
final ActivityStack stack = getActivityStack();
if (stack == null) {
return false;
}
// Whether this activity is the top activity of this stack.
final boolean isTop = this == stack.getTopActivity();
// Exclude the case where this is the top activity in a pinned stack.
final boolean isTopNotPinnedStack = stack.isAttached()
&& stack.getDisplay().isTopNotPinnedStack(stack);
// Now check whether it's really visible depending on Keyguard state.
return stack.checkKeyguardVisibility(this,
visibleIgnoringKeyguard, isTop && isTopNotPinnedStack);
}
boolean shouldBeVisible() {
final ActivityStack stack = getActivityStack();
if (stack == null) {
return false;
}
// TODO: Use real value of behindFullscreenActivity calculated using the same logic in
// ActivityStack#ensureActivitiesVisibleLocked().
return shouldBeVisible(!stack.shouldBeVisible(null /* starting */));
}
void makeVisibleIfNeeded(ActivityRecord starting, boolean reportToClient) {
// This activity is not currently visible, but is running. Tell it to become visible.
if (mState == RESUMED || this == starting) {
@@ -2848,11 +2880,7 @@ final class ActivityRecord extends ConfigurationContainer {
return true;
}
// TODO: We should add ActivityRecord.shouldBeVisible() that checks if the activity should
// be visible based on the stack, task, and lockscreen state and use that here instead. The
// method should be based on the logic in ActivityStack.ensureActivitiesVisibleLocked().
// Skip updating configuration for activity is a stack that shouldn't be visible.
if (!stack.shouldBeVisible(null /* starting */)) {
if (!shouldBeVisible()) {
if (DEBUG_SWITCH || DEBUG_CONFIGURATION) Slog.v(TAG_CONFIGURATION,
"Skipping config check invisible stack: " + this);
return true;

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

@@ -2095,8 +2095,6 @@ class ActivityStack extends ConfigurationContainer {
final boolean stackShouldBeVisible = shouldBeVisible(starting);
boolean behindFullscreenActivity = !stackShouldBeVisible;
boolean resumeNextActivity = isFocusable() && isInStackLocked(starting) == null;
final boolean isTopNotPinnedStack =
isAttached() && getDisplay().isTopNotPinnedStack(this);
for (int taskNdx = mTaskHistory.size() - 1; taskNdx >= 0; --taskNdx) {
final TaskRecord task = mTaskHistory.get(taskNdx);
final ArrayList<ActivityRecord> activities = task.mActivities;
@@ -2114,11 +2112,7 @@ class ActivityStack extends ConfigurationContainer {
// Check whether activity should be visible without Keyguard influence
final boolean visibleIgnoringKeyguard = r.shouldBeVisibleIgnoringKeyguard(
behindFullscreenActivity);
r.visibleIgnoringKeyguard = visibleIgnoringKeyguard;
// Now check whether it's really visible depending on Keyguard state.
final boolean reallyVisible = checkKeyguardVisibility(r,
visibleIgnoringKeyguard, isTop && isTopNotPinnedStack);
final boolean reallyVisible = r.shouldBeVisible(behindFullscreenActivity);
if (visibleIgnoringKeyguard) {
behindFullscreenActivity = updateBehindFullscreen(!stackShouldBeVisible,
behindFullscreenActivity, r);