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

Merge "Update configuration of all visible activities in a stack when resizing" into nyc-dev

Browse Source 
am: fc932b9d69

* commit 'fc932b9d699e5797fbbfac3ec09a789419ade269':
  Update configuration of all visible activities in a stack when resizing

Change-Id: I5f121bb48513d054f53d17bd7a1030adb59d2a2e
This commit is contained in:
Wale Ogunwale
2016-05-17 00:37:47 +00:00
committed by android-build-merger
parent 9db4384118 fc932b9d69
commit 52ccdf05d7
2 changed files with 45 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4383,14 +4383,49 @@ final class ActivityStack {
}
/**
* Make sure the given activity matches the current configuration. Returns
* false if the activity had to be destroyed. Returns true if the
* configuration is the same, or the activity will remain running as-is
* for whatever reason. Ensures the HistoryRecord is updated with the
* Ensures all visible activities at or below the input activity have the right configuration.
*/
void ensureVisibleActivitiesConfigurationLocked(ActivityRecord start, boolean preserveWindow) {
if (start == null || !start.visible) {
return;
}
final TaskRecord startTask = start.task;
boolean behindFullscreen = false;
boolean updatedConfig = false;
for (int taskIndex = mTaskHistory.indexOf(startTask); taskIndex >= 0; --taskIndex) {
final TaskRecord task = mTaskHistory.get(taskIndex);
final ArrayList<ActivityRecord> activities = task.mActivities;
int activityIndex =
(start.task == task) ? activities.indexOf(start) : activities.size() - 1;
for (; activityIndex >= 0; --activityIndex) {
final ActivityRecord r = activities.get(activityIndex);
updatedConfig |= ensureActivityConfigurationLocked(r, 0, preserveWindow);
if (r.fullscreen) {
behindFullscreen = true;
break;
}
}
if (behindFullscreen) {
break;
}
}
if (updatedConfig) {
// Ensure the resumed state of the focus activity if we updated the confiugaration of
// any activity.
mStackSupervisor.resumeFocusedStackTopActivityLocked();
}
}
/**
* Make sure the given activity matches the current configuration. Returns false if the activity
* had to be destroyed. Returns true if the configuration is the same, or the activity will
* remain running as-is for whatever reason. Ensures the HistoryRecord is updated with the
* correct configuration and all other bookkeeping is handled.
*/
final boolean ensureActivityConfigurationLocked(ActivityRecord r, int globalChanges,
boolean preserveWindow) {
boolean ensureActivityConfigurationLocked(
ActivityRecord r, int globalChanges, boolean preserveWindow) {
if (mConfigWillChange) {
if (DEBUG_SWITCH || DEBUG_CONFIGURATION) Slog.v(TAG_CONFIGURATION,
"Skipping config check (will change): " + r);

20
services/core/java/com/android/server/am/ActivityStackSupervisor.java
View File

@@ -2014,8 +2014,8 @@ public final class ActivityStackSupervisor implements DisplayListener {
try {
resizeStackUncheckedLocked(stack, bounds, tempTaskBounds, tempTaskInsetBounds);
if (!deferResume) {
ensureConfigurationAndResume(
stack, stack.topRunningActivityLocked(), preserveWindows);
stack.ensureVisibleActivitiesConfigurationLocked(
stack.topRunningActivityLocked(), preserveWindows);
}
} finally {
mWindowManager.continueSurfaceLayout();
@@ -2091,18 +2091,6 @@ public final class ActivityStackSupervisor implements DisplayListener {
stack.setBounds(bounds);
}
private void ensureConfigurationAndResume(ActivityStack stack, ActivityRecord r,
boolean preserveWindows) {
if (r == null || !r.visible) {
return;
}
final boolean updated = stack.ensureActivityConfigurationLocked(r, 0,
preserveWindows);
if (!updated) {
resumeFocusedStackTopActivityLocked();
}
}
void moveTasksToFullscreenStackLocked(int fromStackId, boolean onTop) {
final ActivityStack stack = getStack(fromStackId);
if (stack == null) {
@@ -2204,7 +2192,7 @@ public final class ActivityStackSupervisor implements DisplayListener {
}
}
}
ensureConfigurationAndResume(stack, r, preserveWindows);
stack.ensureVisibleActivitiesConfigurationLocked(r, preserveWindows);
} finally {
mAllowDockedStackResize = true;
mWindowManager.continueSurfaceLayout();
@@ -2230,7 +2218,7 @@ public final class ActivityStackSupervisor implements DisplayListener {
ActivityRecord r = stack.topRunningActivityLocked();
resizeStackUncheckedLocked(stack, pinnedBounds, tempPinnedTaskBounds,
null);
ensureConfigurationAndResume(stack, r, false);
stack.ensureVisibleActivitiesConfigurationLocked(r, false);
} finally {
mWindowManager.continueSurfaceLayout();
Trace.traceEnd(TRACE_TAG_ACTIVITY_MANAGER);