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

Merge "Fix wrong inset bounds" into nyc-dev

Browse Source 
am: 18e89da

* commit '18e89da19b1442bfdc001b719581257257ab73d8':
  Fix wrong inset bounds

Change-Id: I3d7d17ce3a7e958c3109a04eab491a1b62a7b73d
This commit is contained in:
Jorim Jaggi
2016-04-05 18:14:21 +00:00
committed by android-build-merger
parent 7a83ee9a32 18e89da19b
commit 78f0b88bfd
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1984,6 +1984,8 @@ public final class ActivityStackSupervisor implements DisplayListener {
mTmpConfigs.clear();
mTmpInsetBounds.clear();
final ArrayList<TaskRecord> tasks = stack.getAllTasks();
final Rect taskBounds = tempTaskBounds != null ? tempTaskBounds : bounds;
final Rect insetBounds = tempTaskInsetBounds != null ? tempTaskInsetBounds : taskBounds;
for (int i = tasks.size() - 1; i >= 0; i--) {
final TaskRecord task = tasks.get(i);
if (task.isResizeable()) {
@@ -1995,9 +1997,7 @@ public final class ActivityStackSupervisor implements DisplayListener {
fitWithinBounds(tempRect2, bounds);
task.updateOverrideConfiguration(tempRect2);
} else {
task.updateOverrideConfiguration(
tempTaskBounds != null ? tempTaskBounds : bounds,
tempTaskInsetBounds != null ? tempTaskInsetBounds : bounds);
task.updateOverrideConfiguration(taskBounds, insetBounds);
}
}