diff options
author | Winson Chung <winsonc@google.com> | 2014-12-18 21:53:36 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-12-18 21:53:36 +0000 |
commit | 5d40d0b645e31063d08e304e4ba2880b267234b9 (patch) | |
tree | 3703043e35ea9ef5f41b5223fe52215b3ada3120 /packages/SystemUI/src | |
parent | 093dad2a47aed9f16fd4190af4b3070b49b982f1 (diff) | |
parent | 4edaa5e4b65c9bac4ab9bdc26b4cdde217a9053a (diff) | |
download | frameworks_base-5d40d0b645e31063d08e304e4ba2880b267234b9.zip frameworks_base-5d40d0b645e31063d08e304e4ba2880b267234b9.tar.gz frameworks_base-5d40d0b645e31063d08e304e4ba2880b267234b9.tar.bz2 |
am 4edaa5e4: am a320b217: Merge "Bug 18784289: Fix issue with transition animation callback." into lmp-mr1-dev
* commit '4edaa5e4b65c9bac4ab9bdc26b4cdde217a9053a':
Bug 18784289: Fix issue with transition animation callback.
Diffstat (limited to 'packages/SystemUI/src')
-rw-r--r-- | packages/SystemUI/src/com/android/systemui/recents/AlternateRecentsComponent.java | 2 | ||||
-rw-r--r-- | packages/SystemUI/src/com/android/systemui/recents/views/RecentsView.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/recents/AlternateRecentsComponent.java b/packages/SystemUI/src/com/android/systemui/recents/AlternateRecentsComponent.java index 3e6611a..10618e0 100644 --- a/packages/SystemUI/src/com/android/systemui/recents/AlternateRecentsComponent.java +++ b/packages/SystemUI/src/com/android/systemui/recents/AlternateRecentsComponent.java @@ -603,7 +603,7 @@ public class AlternateRecentsComponent implements ActivityOptions.OnAnimationSta mStartAnimationTriggered = false; return ActivityOptions.makeThumbnailAspectScaleDownAnimation(mDummyStackView, thumbnail, toTaskRect.left, toTaskRect.top, toTaskRect.width(), - toTaskRect.height(), this); + toTaskRect.height(), mHandler, this); } // If both the screenshot and thumbnail fails, then just fall back to the default transition diff --git a/packages/SystemUI/src/com/android/systemui/recents/views/RecentsView.java b/packages/SystemUI/src/com/android/systemui/recents/views/RecentsView.java index 746a7df..ee79242 100644 --- a/packages/SystemUI/src/com/android/systemui/recents/views/RecentsView.java +++ b/packages/SystemUI/src/com/android/systemui/recents/views/RecentsView.java @@ -477,7 +477,7 @@ public class RecentsView extends FrameLayout implements TaskStackView.TaskStackV } opts = ActivityOptions.makeThumbnailAspectScaleUpAnimation(sourceView, b, offsetX, offsetY, transform.rect.width(), transform.rect.height(), - animStartedListener); + sourceView.getHandler(), animStartedListener); } final ActivityOptions launchOpts = opts; |