diff options
| author | Mindy Pereira <mindyp@google.com> | 2014-04-17 22:57:23 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-04-17 22:57:23 +0000 |
| commit | 03f7f44250faea2db0147f43b6699436e540889d (patch) | |
| tree | d7d48a76040f261b339a9da4cde1aa17c426b6d3 /policy | |
| parent | 734ccfbc7b29a136e09e6a2ae788673fbd52f3b4 (diff) | |
| parent | cb54f978b565459210e80054e95becd1f8cae173 (diff) | |
| download | frameworks_base-03f7f44250faea2db0147f43b6699436e540889d.zip frameworks_base-03f7f44250faea2db0147f43b6699436e540889d.tar.gz frameworks_base-03f7f44250faea2db0147f43b6699436e540889d.tar.bz2 | |
am cb54f978: Merge "Update window alpha at the same time as translating" into klp-modular-dev
* commit 'cb54f978b565459210e80054e95becd1f8cae173':
Update window alpha at the same time as translating
Diffstat (limited to 'policy')
| -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 bed3462..56abfb4 100644 --- a/policy/src/com/android/internal/policy/impl/PhoneWindow.java +++ b/policy/src/com/android/internal/policy/impl/PhoneWindow.java @@ -3449,6 +3449,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; @@ -3464,6 +3465,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); } |