diff options
author | Dianne Hackborn <hackbod@google.com> | 2012-04-12 15:17:07 -0700 |
---|---|---|
committer | Dianne Hackborn <hackbod@google.com> | 2012-04-12 15:26:11 -0700 |
commit | 0c2acffec8689f8721a454845b24a830bc37ce92 (patch) | |
tree | 5c4d68095376aabd3af04c4b7d2d78b9e9ea8c2b /policy | |
parent | ed4995d646252313323f648e44a9539d9384f901 (diff) | |
download | frameworks_base-0c2acffec8689f8721a454845b24a830bc37ce92.zip frameworks_base-0c2acffec8689f8721a454845b24a830bc37ce92.tar.gz frameworks_base-0c2acffec8689f8721a454845b24a830bc37ce92.tar.bz2 |
Clean up lock screen hide animation.
We now have an animation to apply to the thing behind the lock
screen animation when it isn't on the wallpaper, which looks
similar to the animation we use when both are on the wallpaper.
In implementing this, cleaned up the code to figure out up-front
which animation to run, getting rid of that kludgy thing that
cleared the window animation if the wallpaper was not being used
for the lower windows.
Change-Id: Ifc4c8a8894ad384124dcf4bbdaab134f1157b0f3
Diffstat (limited to 'policy')
-rwxr-xr-x | policy/src/com/android/internal/policy/impl/PhoneWindowManager.java | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java index 9ff8ee3..0a63840 100755 --- a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java +++ b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java @@ -1628,9 +1628,10 @@ public class PhoneWindowManager implements WindowManagerPolicy { return 0; } - public Animation createForceHideEnterAnimation() { - return AnimationUtils.loadAnimation(mContext, - com.android.internal.R.anim.lock_screen_behind_enter); + public Animation createForceHideEnterAnimation(boolean onWallpaper) { + return AnimationUtils.loadAnimation(mContext, onWallpaper + ? com.android.internal.R.anim.lock_screen_wallpaper_behind_enter + : com.android.internal.R.anim.lock_screen_behind_enter); } static ITelephony getTelephonyService() { |