summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFilip Gruszczynski <gruszczy@google.com>2015-08-01 16:53:33 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-08-01 16:53:33 +0000
commitfe0260f2c63983ed45105a129d1d9a99e822b540 (patch)
tree05f03354cc19dc281578c5c941172f9088bd0266
parent44ffe9cb33b0ec51d411b7413d222ab251777529 (diff)
parent6e7b9135cc47181065ca6a7464cb7fc183083240 (diff)
downloadframeworks_base-fe0260f2c63983ed45105a129d1d9a99e822b540.zip
frameworks_base-fe0260f2c63983ed45105a129d1d9a99e822b540.tar.gz
frameworks_base-fe0260f2c63983ed45105a129d1d9a99e822b540.tar.bz2
am 6e7b9135: am 3249330c: am 00ab3578: Merge "Make enter reveal animation be zorder top." into mnc-dev
* commit '6e7b9135cc47181065ca6a7464cb7fc183083240': 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 a57463c..7bd0635 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 {