summaryrefslogtreecommitdiffstats
path: root/packages/SystemUI/src/com
diff options
context:
space:
mode:
authorSelim Cinek <cinek@google.com>2014-05-23 17:33:00 +0200
committerSelim Cinek <cinek@google.com>2014-05-23 17:33:00 +0200
commit1efb240c1a0aeca9492cf8891794712adfdb1fa7 (patch)
tree3b12f2f8f68fee75505c011a232ce92445050a00 /packages/SystemUI/src/com
parent72b6f4d4d972e9987e9b9f4601b41283fd45d090 (diff)
downloadframeworks_base-1efb240c1a0aeca9492cf8891794712adfdb1fa7.zip
frameworks_base-1efb240c1a0aeca9492cf8891794712adfdb1fa7.tar.gz
frameworks_base-1efb240c1a0aeca9492cf8891794712adfdb1fa7.tar.bz2
The layertype was incorrectly restored with overlapping alpha animations.
This could lead to weird clipping bugs on the lockscreen. We now simply set its type to back to NONE after the animation. Bug: 15186220 Change-Id: I884b6830d748309105ed62471cb8b6dee71d51fe
Diffstat (limited to 'packages/SystemUI/src/com')
-rw-r--r--packages/SystemUI/src/com/android/systemui/statusbar/stack/StackStateAnimator.java3
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);
}