commit cbc7168e55fd4058647af5a6ca7652bb99b299b0
author Mindy Pereira <mindyp@google.com> Thu Apr 17 23:33:33 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Apr 17 23:33:33 2014 +0000
tree 7581b810545abe98bb1ed864b50f999631f4c624
parent 0d870c11e55dd52b6fc5e2071af5b32877ecbd2b
parent 03f7f44250faea2db0147f43b6699436e540889d

am 03f7f442: am cb54f978: Merge "Update window alpha at the same time as translating" into klp-modular-dev

* commit '03f7f44250faea2db0147f43b6699436e540889d':
  Update window alpha at the same time as translating

policy/src/com/android/internal/policy/impl/PhoneWindow.java

diff --git a/policy/src/com/android/internal/policy/impl/PhoneWindow.java b/policy/src/com/android/internal/policy/impl/PhoneWindow.java
index 2cf94d0..0550dd4 100644
--- a/policy/src/com/android/internal/policy/impl/PhoneWindow.java
+++ b/policy/src/com/android/internal/policy/impl/PhoneWindow.java
@@ -3580,6 +3580,7 @@
                             SwipeDismissLayout layout, float progress, float translate) {
                         WindowManager.LayoutParams newParams = getAttributes();
                         newParams.x = (int) translate;
+                        newParams.alpha = 1 - progress;
                         setAttributes(newParams);
 
                         int flags = 0;
@@ -3595,6 +3596,7 @@
                     public void onSwipeCancelled(SwipeDismissLayout layout) {
                         WindowManager.LayoutParams newParams = getAttributes();
                         newParams.x = 0;
+                        newParams.alpha = 1;
                         setAttributes(newParams);
                         setFlags(FLAG_FULLSCREEN, FLAG_FULLSCREEN | FLAG_LAYOUT_NO_LIMITS);
                     }