diff options
| author | Filip Gruszczynski <gruszczy@google.com> | 2014-11-21 10:13:59 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2014-11-21 10:13:59 +0000 |
| commit | a83c5806ded083f51549ba4bf70e0c1f6a17fc61 (patch) | |
| tree | fa7a06623304c0e0be667a759ef2db4b89b01956 /core/java/android/app/Activity.java | |
| parent | d3e2fd99e23ca579d22508e40e4f58282ea7279e (diff) | |
| parent | 96c5d37fb5139465cdd3d882b5deba830497557a (diff) | |
| download | frameworks_base-a83c5806ded083f51549ba4bf70e0c1f6a17fc61.zip frameworks_base-a83c5806ded083f51549ba4bf70e0c1f6a17fc61.tar.gz frameworks_base-a83c5806ded083f51549ba4bf70e0c1f6a17fc61.tar.bz2 | |
Merge "SwipeDismissLayout makes activity opaque only after entry animation ends." into lmp-sprout-dev
automerge: 96c5d37
* commit '96c5d37fb5139465cdd3d882b5deba830497557a':
SwipeDismissLayout makes activity opaque only after entry animation ends.
Diffstat (limited to 'core/java/android/app/Activity.java')
| -rw-r--r-- | core/java/android/app/Activity.java | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/core/java/android/app/Activity.java b/core/java/android/app/Activity.java index 148527f..fab88a2 100644 --- a/core/java/android/app/Activity.java +++ b/core/java/android/app/Activity.java @@ -5620,6 +5620,16 @@ public class Activity extends ContextThemeWrapper } /** + * @hide + */ + public void dispatchEnterAnimationComplete() { + onEnterAnimationComplete(); + if (getWindow() != null && getWindow().getDecorView() != null) { + getWindow().getDecorView().getViewTreeObserver().dispatchOnEnterAnimationComplete(); + } + } + + /** * Adjust the current immersive mode setting. * * Note that changing this value will have no effect on the activity's |