diff options
| author | George Mount <mount@google.com> | 2014-09-03 17:30:08 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-09-03 17:30:09 +0000 |
| commit | d847f1a1e3db50bd96386362369322ddda9af8f7 (patch) | |
| tree | e1c472df5703755a07f84f0672ff95dbf25f5a3b /core | |
| parent | aa924b52e94ac5757ce0ae43f844684808387579 (diff) | |
| parent | 99c82fd1de23deeb8cf640bb574c76af76429df6 (diff) | |
| download | frameworks_base-d847f1a1e3db50bd96386362369322ddda9af8f7.zip frameworks_base-d847f1a1e3db50bd96386362369322ddda9af8f7.tar.gz frameworks_base-d847f1a1e3db50bd96386362369322ddda9af8f7.tar.bz2 | |
Merge "Additional fixes for "back" with translucent windows." into lmp-dev
Diffstat (limited to 'core')
| -rw-r--r-- | core/java/android/app/ActivityTransitionState.java | 1 | ||||
| -rw-r--r-- | core/java/android/app/EnterTransitionCoordinator.java | 1 | ||||
| -rw-r--r-- | core/java/android/app/ExitTransitionCoordinator.java | 2 |
3 files changed, 4 insertions, 0 deletions
diff --git a/core/java/android/app/ActivityTransitionState.java b/core/java/android/app/ActivityTransitionState.java index 613e248..ad4a22b 100644 --- a/core/java/android/app/ActivityTransitionState.java +++ b/core/java/android/app/ActivityTransitionState.java @@ -151,6 +151,7 @@ class ActivityTransitionState { mEnterActivityOptions = options; mIsEnterTriggered = false; if (mEnterActivityOptions.isReturning()) { + restoreExitedViews(); int result = mEnterActivityOptions.getResultCode(); if (result != 0) { activity.onActivityReenter(result, mEnterActivityOptions.getResultData()); diff --git a/core/java/android/app/EnterTransitionCoordinator.java b/core/java/android/app/EnterTransitionCoordinator.java index 73fe70f..4126647 100644 --- a/core/java/android/app/EnterTransitionCoordinator.java +++ b/core/java/android/app/EnterTransitionCoordinator.java @@ -466,6 +466,7 @@ class EnterTransitionCoordinator extends ActivityTransitionCoordinator { Drawable background = getDecor().getBackground(); if (background != null) { background = background.mutate(); + getWindow().setBackgroundDrawable(background); mBackgroundAnimator = ObjectAnimator.ofInt(background, "alpha", 255); mBackgroundAnimator.setDuration(getFadeDuration()); mBackgroundAnimator.addListener(new AnimatorListenerAdapter() { diff --git a/core/java/android/app/ExitTransitionCoordinator.java b/core/java/android/app/ExitTransitionCoordinator.java index f35c6e8..231c93f 100644 --- a/core/java/android/app/ExitTransitionCoordinator.java +++ b/core/java/android/app/ExitTransitionCoordinator.java @@ -260,6 +260,8 @@ class ExitTransitionCoordinator extends ActivityTransitionCoordinator { ViewGroup decor = getDecor(); Drawable background; if (decor != null && (background = decor.getBackground()) != null) { + background = background.mutate(); + getWindow().setBackgroundDrawable(background); mBackgroundAnimator = ObjectAnimator.ofInt(background, "alpha", 0); mBackgroundAnimator.addListener(new AnimatorListenerAdapter() { @Override |