summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Filip Gruszczynski <gruszczy@google.com> 2016-02-03 00:16:05 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2016-02-03 00:16:05 +0000
commitab28afd3df9be7ffe51373d939db820dcd59ed2d (patch)
treee9a787257d8a0434ae99a82e92952b99a82e992e
parentfe585a6baeca91269beb8f00730e549239185e22 (diff)
parent47dae5850d44f67a8cd02115f0f7033fd398e223 (diff)
Merge "Animate pinned stack resize when launching acivity with new bounds."
-rw-r--r--services/core/java/com/android/server/am/ActivityStarter.java8
1 files changed, 2 insertions, 6 deletions
diff --git a/services/core/java/com/android/server/am/ActivityStarter.java b/services/core/java/com/android/server/am/ActivityStarter.java
index 98eebeaca953..b360b897d1ee 100644
--- a/services/core/java/com/android/server/am/ActivityStarter.java
+++ b/services/core/java/com/android/server/am/ActivityStarter.java
@@ -1416,9 +1416,7 @@ class ActivityStarter {
if (mLaunchBounds != null) {
final int stackId = mTargetStack.mStackId;
if (StackId.resizeStackWithLaunchBounds(stackId)) {
- mSupervisor.resizeStackLocked(stackId, mLaunchBounds,
- null /* tempTaskBounds */, null /* tempTaskInsetBounds */,
- !PRESERVE_WINDOWS, true /* allowResizeInDockedMode */);
+ mService.resizeStack(stackId, mLaunchBounds, true, !PRESERVE_WINDOWS, ANIMATE);
} else {
mStartActivity.task.updateOverrideConfiguration(mLaunchBounds);
}
@@ -1506,9 +1504,7 @@ class ActivityStarter {
stackId = stack.mStackId;
}
if (StackId.resizeStackWithLaunchBounds(stackId)) {
- mSupervisor.resizeStackLocked(stackId, mLaunchBounds,
- null /* tempTaskBounds */, null /* tempTaskInsetBounds */,
- !PRESERVE_WINDOWS, true /* allowResizeInDockedMode */);
+ mService.resizeStack(stackId, mLaunchBounds, true, !PRESERVE_WINDOWS, ANIMATE);
}
}
mTargetStack = mInTask.stack;