diff options
| author | Selim Cinek <cinek@google.com> | 2014-05-23 17:33:23 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-05-23 17:33:23 +0000 |
| commit | b72b09cb5eebacc2d6915fd3fa01f113a6e86074 (patch) | |
| tree | 12fa37dc4915351500721fee1b2cac9fb290d24a /packages/SystemUI/src | |
| parent | 048aad39ba54eab3c8753fc90245406e61cc92c7 (diff) | |
| parent | 1efb240c1a0aeca9492cf8891794712adfdb1fa7 (diff) | |
| download | frameworks_base-b72b09cb5eebacc2d6915fd3fa01f113a6e86074.zip frameworks_base-b72b09cb5eebacc2d6915fd3fa01f113a6e86074.tar.gz frameworks_base-b72b09cb5eebacc2d6915fd3fa01f113a6e86074.tar.bz2 | |
Merge changes I884b6830,Iee71e4eb into lmp-preview-dev
* changes:
The layertype was incorrectly restored with overlapping alpha animations.
Decreased shadows between notifications slightly.
Diffstat (limited to 'packages/SystemUI/src')
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/statusbar/stack/StackStateAnimator.java | 3 |
1 files changed, 1 insertions, 2 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 045a99d..f019e6c 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/stack/StackStateAnimator.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/stack/StackStateAnimator.java @@ -315,14 +315,13 @@ public class StackStateAnimator { child.getAlpha(), newEndValue); animator.setInterpolator(mFastOutSlowInInterpolator); // Handle layer type - final int currentLayerType = child.getLayerType(); child.setLayerType(View.LAYER_TYPE_HARDWARE, null); animator.addListener(new AnimatorListenerAdapter() { public boolean mWasCancelled; @Override public void onAnimationEnd(Animator animation) { - child.setLayerType(currentLayerType, null); + child.setLayerType(View.LAYER_TYPE_NONE, null); if (newEndValue == 0 && !mWasCancelled) { child.setVisibility(View.INVISIBLE); } |