From 1efb240c1a0aeca9492cf8891794712adfdb1fa7 Mon Sep 17 00:00:00 2001
From: Selim Cinek <cinek@google.com>
Date: Fri, 23 May 2014 17:33:00 +0200
Subject: [PATCH] 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
---
 .../android/systemui/statusbar/stack/StackStateAnimator.java   | 3 +--
 1 file changed, 1 insertion(+), 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 045a99dd01cc1..f019e6cbffd78 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);
                 }