summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJorim Jaggi <jjaggi@google.com>2014-07-01 15:36:36 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-06-26 21:33:38 +0000
commit5dfb86bb09a1c5eebd6522426c94b92c02154779 (patch)
tree5b03bbcc2a33fb1e2ed500a01abc52fa3dfef643
parent58bbdbd1f1e2b2ed2e82caad6de6411fa2380cdc (diff)
parentfa129db84a2985f81eac4c51204180b00122b632 (diff)
downloadframeworks_base-5dfb86bb09a1c5eebd6522426c94b92c02154779.zip
frameworks_base-5dfb86bb09a1c5eebd6522426c94b92c02154779.tar.gz
frameworks_base-5dfb86bb09a1c5eebd6522426c94b92c02154779.tar.bz2
Merge "Fixed a bug on the notification appear animation"
-rw-r--r--packages/SystemUI/src/com/android/systemui/statusbar/stack/StackStateAnimator.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/stack/StackStateAnimator.java b/packages/SystemUI/src/com/android/systemui/statusbar/stack/StackStateAnimator.java
index 5efbc99..494195e 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/stack/StackStateAnimator.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/stack/StackStateAnimator.java
@@ -174,7 +174,7 @@ public class StackStateAnimator {
}
// start dimmed animation
- child.setDimmed(viewState.dimmed, mAnimationFilter.animateDimmed);
+ child.setDimmed(viewState.dimmed, mAnimationFilter.animateDimmed && !wasAdded);
// start dark animation
child.setDark(viewState.dark, mAnimationFilter.animateDark);