diff options
author | Craig Mautner <cmautner@google.com> | 2014-11-05 04:05:52 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-05 04:05:52 +0000 |
commit | 5f433b350de8d6a011fe12c6fc04a0e14ca7228f (patch) | |
tree | 08688d4518eb9094d726b49f5d79f90e0d849213 /policy/src | |
parent | 1e5275da2f04758c4857494dad4fafcae8383144 (diff) | |
parent | bf8e9884f1ea096254d04eff266aa3dfa1bc5e11 (diff) | |
download | frameworks_base-5f433b350de8d6a011fe12c6fc04a0e14ca7228f.zip frameworks_base-5f433b350de8d6a011fe12c6fc04a0e14ca7228f.tar.gz frameworks_base-5f433b350de8d6a011fe12c6fc04a0e14ca7228f.tar.bz2 |
am bf8e9884: am 26a733ce: Merge "When keyguard exits use same anim for all windows" into lmp-mr1-dev
* commit 'bf8e9884f1ea096254d04eff266aa3dfa1bc5e11':
When keyguard exits use same anim for all windows
Diffstat (limited to 'policy/src')
-rw-r--r-- | policy/src/com/android/internal/policy/impl/PhoneWindowManager.java | 26 |
1 files changed, 11 insertions, 15 deletions
diff --git a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java index 0027b06..ecc041c 100644 --- a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java +++ b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java @@ -116,6 +116,7 @@ import java.io.FileReader; import java.io.IOException; import java.io.PrintWriter; import java.util.HashSet; +import java.util.List; import static android.view.WindowManager.LayoutParams.*; import static android.view.WindowManagerPolicy.WindowManagerFuncs.LID_ABSENT; @@ -2299,24 +2300,19 @@ public class PhoneWindowManager implements WindowManagerPolicy { boolean goingToNotificationShade) { if (goingToNotificationShade) { return AnimationUtils.loadAnimation(mContext, R.anim.lock_screen_behind_enter_fade_in); - } else if (onWallpaper) { - Animation a = AnimationUtils.loadAnimation(mContext, - R.anim.lock_screen_behind_enter_wallpaper); - AnimationSet set = (AnimationSet) a; - - // TODO: Use XML interpolators when we have log interpolators available in XML. - set.getAnimations().get(0).setInterpolator(mLogDecelerateInterpolator); - set.getAnimations().get(1).setInterpolator(mLogDecelerateInterpolator); - return set; - } else { - Animation a = AnimationUtils.loadAnimation(mContext, + } + + AnimationSet set = (AnimationSet) AnimationUtils.loadAnimation(mContext, onWallpaper ? + R.anim.lock_screen_behind_enter_wallpaper : R.anim.lock_screen_behind_enter); - AnimationSet set = (AnimationSet) a; - // TODO: Use XML interpolators when we have log interpolators available in XML. - set.getAnimations().get(0).setInterpolator(mLogDecelerateInterpolator); - return set; + // TODO: Use XML interpolators when we have log interpolators available in XML. + final List<Animation> animations = set.getAnimations(); + for (int i = animations.size() - 1; i >= 0; --i) { + animations.get(i).setInterpolator(mLogDecelerateInterpolator); } + + return set; } |