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

Merge "Use correct task bounds after updating override config" into nyc-dev

Browse Source
This commit is contained in:
Andrii Kulian
2016-03-28 16:59:26 +00:00
committed by Android (Google) Code Review
parent 5d4b11ef18 73336d81a6
commit 650df4ae44
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1798,7 +1798,7 @@ public final class ActivityStackSupervisor implements DisplayListener {
// WM resizeTask must be done after the task is moved to the correct stack, // WM resizeTask must be done after the task is moved to the correct stack,
// because Task's setBounds() also updates dim layer's bounds, but that has // because Task's setBounds() also updates dim layer's bounds, but that has
// dependency on the stack. // dependency on the stack.
mWindowManager.resizeTask(task.taskId, bounds, task.mOverrideConfig, mWindowManager.resizeTask(task.taskId, task.mBounds, task.mOverrideConfig,
false /* relayout */, false /* forced */); false /* relayout */, false /* forced */);
} }
} }

3
services/core/java/com/android/server/am/TaskRecord.java
View File

@@ -1518,6 +1518,9 @@ final class TaskRecord {
Rect updateOverrideConfigurationFromLaunchBounds() { Rect updateOverrideConfigurationFromLaunchBounds() {
final Rect bounds = validateBounds(getLaunchBounds()); final Rect bounds = validateBounds(getLaunchBounds());
updateOverrideConfiguration(bounds); updateOverrideConfiguration(bounds);
if (bounds != null) {
bounds.set(mBounds);
}
return bounds; return bounds;
} }