summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Filip Gruszczynski <gruszczy@google.com> 2015-08-01 17:05:44 +0000
committer Android Git Automerger <android-git-automerger@android.com> 2015-08-01 17:05:44 +0000
commit4b01275a8397761bb9982aa1796c7d8f952d24c7 (patch)
tree5a4398c11b2df743abfac62a940db523f96f200e
parent2b38a45bf37846d0a210369e41efd70738e3d591 (diff)
parentfe0260f2c63983ed45105a129d1d9a99e822b540 (diff)
am fe0260f2: am 6e7b9135: am 3249330c: am 00ab3578: Merge "Make enter reveal animation be zorder top." into mnc-dev
* commit 'fe0260f2c63983ed45105a129d1d9a99e822b540': Make enter reveal animation be zorder top.
-rw-r--r--services/core/java/com/android/server/wm/AppTransition.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/services/core/java/com/android/server/wm/AppTransition.java b/services/core/java/com/android/server/wm/AppTransition.java
index a57463c21f48..7bd0635a814a 100644
--- a/services/core/java/com/android/server/wm/AppTransition.java
+++ b/services/core/java/com/android/server/wm/AppTransition.java
@@ -559,6 +559,7 @@ public class AppTransition implements Dump {
set.addAnimation(clipAnimTB);
set.addAnimation(translateY);
set.addAnimation(alpha);
+ set.setZAdjustment(Animation.ZORDER_TOP);
set.initialize(appWidth, appHeight, appWidth, appHeight);
anim = set;
} else {