diff options
| author | George Mount <mount@google.com> | 2016-04-05 17:27:33 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-04-05 17:27:34 +0000 |
| commit | dc63f7c6248276d003d949dbbe407aafd5e7c6bf (patch) | |
| tree | 9ac1e980e1440459efc8d35350f551186be4ffab /core/java | |
| parent | 81c9ea4034186cd3ff2c387972389eb3397aba46 (diff) | |
| parent | 41fb99480c84683f44b17d2d40bcbfdb8bc12b42 (diff) | |
Merge "Restore fragment transaction animation state information." into nyc-dev
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/app/BackStackRecord.java | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/core/java/android/app/BackStackRecord.java b/core/java/android/app/BackStackRecord.java index 3a51aff37921..1e2cc2662018 100644 --- a/core/java/android/app/BackStackRecord.java +++ b/core/java/android/app/BackStackRecord.java @@ -146,6 +146,10 @@ final class BackStackState implements Parcelable { op.removed.add(r); } } + bse.mEnterAnim = op.enterAnim; + bse.mExitAnim = op.exitAnim; + bse.mPopEnterAnim = op.popEnterAnim; + bse.mPopExitAnim = op.popExitAnim; bse.addOp(op); num++; } |