diff options
| author | Filip Gruszczynski <gruszczy@google.com> | 2014-11-21 10:21:19 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-21 10:21:19 +0000 |
| commit | 5ea0411f3900064f1d65b93bbe306525398ee4d7 (patch) | |
| tree | aff0fd304fb4c0da3f5b464784154e3fffeb3671 /core/java/android/app/ActivityThread.java | |
| parent | 5a75a660c0db30fcf0ab748d9907ec2374603232 (diff) | |
| parent | a83c5806ded083f51549ba4bf70e0c1f6a17fc61 (diff) | |
| download | frameworks_base-5ea0411f3900064f1d65b93bbe306525398ee4d7.zip frameworks_base-5ea0411f3900064f1d65b93bbe306525398ee4d7.tar.gz frameworks_base-5ea0411f3900064f1d65b93bbe306525398ee4d7.tar.bz2 | |
am a83c5806: Merge "SwipeDismissLayout makes activity opaque only after entry animation ends." into lmp-sprout-dev automerge: 96c5d37
* commit 'a83c5806ded083f51549ba4bf70e0c1f6a17fc61':
SwipeDismissLayout makes activity opaque only after entry animation ends.
Diffstat (limited to 'core/java/android/app/ActivityThread.java')
| -rw-r--r-- | core/java/android/app/ActivityThread.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/app/ActivityThread.java b/core/java/android/app/ActivityThread.java index 98a096c..b64e724 100644 --- a/core/java/android/app/ActivityThread.java +++ b/core/java/android/app/ActivityThread.java @@ -2536,7 +2536,7 @@ public final class ActivityThread { private void handleEnterAnimationComplete(IBinder token) { ActivityClientRecord r = mActivities.get(token); if (r != null) { - r.activity.onEnterAnimationComplete(); + r.activity.dispatchEnterAnimationComplete(); } } |