diff options
| author | Mindy Pereira <mindyp@google.com> | 2014-04-17 23:33:33 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-04-17 23:33:33 +0000 |
| commit | cbc7168e55fd4058647af5a6ca7652bb99b299b0 (patch) | |
| tree | 7581b810545abe98bb1ed864b50f999631f4c624 /policy/src/com/android | |
| parent | 0d870c11e55dd52b6fc5e2071af5b32877ecbd2b (diff) | |
| parent | 03f7f44250faea2db0147f43b6699436e540889d (diff) | |
| download | frameworks_base-cbc7168e55fd4058647af5a6ca7652bb99b299b0.zip frameworks_base-cbc7168e55fd4058647af5a6ca7652bb99b299b0.tar.gz frameworks_base-cbc7168e55fd4058647af5a6ca7652bb99b299b0.tar.bz2 | |
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
Diffstat (limited to 'policy/src/com/android')
| -rw-r--r-- | policy/src/com/android/internal/policy/impl/PhoneWindow.java | 2 |
1 files changed, 2 insertions, 0 deletions
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 @@ public class PhoneWindow extends Window implements MenuBuilder.Callback { 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 class PhoneWindow extends Window implements MenuBuilder.Callback { 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); } |