am 8c662a7e: am 2cfbb96e: am f9453e20: Synchronize album fade away with Keyguard dismissal

* commit '8c662a7e19ed0cb0a135faeb934ccee8f4c3bdf3':
  Synchronize album fade away with Keyguard dismissal

3 files changed, 31 insertions, 14 deletions

diff --git a/packages/SystemUI/res/layout/super_status_bar.xml b/packages/SystemUI/res/layout/super_status_bar.xml
index e3ac1c1..6f64e17 100644
--- a/packages/SystemUI/res/layout/super_status_bar.xml
+++ b/packages/SystemUI/res/layout/super_status_bar.xml
@@ -26,7 +26,7 @@
     android:fitsSystemWindows="true"
     android:descendantFocusability="afterDescendants">
 
-    <FrameLayout
+    <com.android.systemui.statusbar.AlphaOptimizedFrameLayout
             android:id="@+id/backdrop"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
@@ -41,7 +41,7 @@
                    android:layout_height="match_parent"
                    android:scaleType="centerCrop"
                    android:visibility="invisible" />
-    </FrameLayout>
+    </com.android.systemui.statusbar.AlphaOptimizedFrameLayout>
 
     <View android:id="@+id/scrim_behind"
         android:layout_width="match_parent"
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBouncer.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBouncer.java
index 3aaace4..e6ffde0 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBouncer.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBouncer.java
@@ -100,7 +100,7 @@ public class KeyguardBouncer {
                     .withLayer()
 
                     // Make it disappear faster, as the focus should be on the activity behind.
-                    .setDuration(duration / 3)
+                    .setDuration(duration / 2)
                     .setInterpolator(mFadeOutInterpolator)
                     .setStartDelay(delay)
                     .withEndAction(new Runnable() {
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
index a5eed60..c523287 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
@@ -93,11 +93,13 @@ import android.view.ViewPropertyAnimator;
 import android.view.ViewStub;
 import android.view.ViewTreeObserver;
 import android.view.WindowManager;
+import android.view.animation.AccelerateDecelerateInterpolator;
 import android.view.animation.AccelerateInterpolator;
 import android.view.animation.Animation;
 import android.view.animation.AnimationUtils;
 import android.view.animation.DecelerateInterpolator;
 import android.view.animation.Interpolator;
+import android.view.animation.LinearInterpolator;
 import android.view.animation.PathInterpolator;
 import android.widget.FrameLayout;
 import android.widget.ImageView;
@@ -401,6 +403,8 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode,
     private boolean mDozing;
 
     private Interpolator mLinearOutSlowIn;
+    private Interpolator mLinearInterpolator = new LinearInterpolator();
+    private Interpolator mBackdropInterpolator = new AccelerateDecelerateInterpolator();
     private Interpolator mAlphaIn = new PathInterpolator(0f, 0.2f, 1f, 1f);
     private Interpolator mAlphaOut = new PathInterpolator(0f, 0f, 0.8f, 1f);
 
@@ -1701,7 +1705,7 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode,
                                 + " to "
                                 + mBackdropBack.getDrawable());
                     }
-                    mBackdropFront.animate().withLayer()
+                    mBackdropFront.animate()
                             .setDuration(250)
                             .alpha(0f).withEndAction(mHideBackdropFront);
                 }
@@ -1713,16 +1717,29 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode,
                 if (DEBUG_MEDIA) {
                     Log.v(TAG, "DEBUG_MEDIA: Fading out album artwork");
                 }
-                mBackdrop.animate().withLayer()
-                        .alpha(0f).withEndAction(new Runnable() {
-                    @Override
-                    public void run() {
-                        mBackdrop.setVisibility(View.GONE);
-                        mBackdropFront.animate().cancel();
-                        mBackdropBack.animate().cancel();
-                        mHandler.post(mHideBackdropFront);
-                    }
-                });
+                mBackdrop.animate()
+                        .alpha(0f)
+                        .setInterpolator(mBackdropInterpolator)
+                        .setDuration(300)
+                        .setStartDelay(0)
+                        .withEndAction(new Runnable() {
+                            @Override
+                            public void run() {
+                                mBackdrop.setVisibility(View.GONE);
+                                mBackdropFront.animate().cancel();
+                                mBackdropBack.animate().cancel();
+                                mHandler.post(mHideBackdropFront);
+                            }
+                        });
+                if (mKeyguardFadingAway) {
+                    mBackdrop.animate()
+
+                            // Make it disappear faster, as the focus should be on the activity behind.
+                            .setDuration(mKeyguardFadingAwayDuration / 2)
+                            .setStartDelay(mKeyguardFadingAwayDelay)
+                            .setInterpolator(mLinearInterpolator)
+                            .start();
+                }
             }
         }
     }