diff options
| author | Jorim Jaggi <jjaggi@google.com> | 2014-08-13 17:58:58 +0200 |
|---|---|---|
| committer | Jorim Jaggi <jjaggi@google.com> | 2014-08-14 12:29:25 +0000 |
| commit | 84a3e7aacf6dbeccf4afb36a29f2f069dca7d486 (patch) | |
| tree | 8d8cf1f070ab8972e41c7412cc9cc64fa83d2959 /core/java | |
| parent | b734e9d2b8808c541acd2be91455e48e5bcf653d (diff) | |
Use different unlock animation when going to full shade
Also fixes a bug that the notify flag was not reset, and fix the
transition for the phone/camera affordance (in these cases, no
animation is needed).
Bug: 15991916
Change-Id: Idbb4fa40f86bda597cd66cc38da838ef4f75514d
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/view/IWindowManager.aidl | 3 | ||||
| -rw-r--r-- | core/java/android/view/WindowManagerPolicy.java | 5 |
2 files changed, 5 insertions, 3 deletions
diff --git a/core/java/android/view/IWindowManager.aidl b/core/java/android/view/IWindowManager.aidl index 83767cb2bf22..7deb9c89f79f 100644 --- a/core/java/android/view/IWindowManager.aidl +++ b/core/java/android/view/IWindowManager.aidl @@ -121,7 +121,8 @@ interface IWindowManager boolean isKeyguardSecure(); boolean inKeyguardRestrictedInputMode(); void dismissKeyguard(); - void keyguardGoingAway(); + void keyguardGoingAway(boolean disableWindowAnimations, + boolean keyguardGoingToNotificationShade); void closeSystemDialogs(String reason); diff --git a/core/java/android/view/WindowManagerPolicy.java b/core/java/android/view/WindowManagerPolicy.java index a7e02e46a1a1..053fdd007e08 100644 --- a/core/java/android/view/WindowManagerPolicy.java +++ b/core/java/android/view/WindowManagerPolicy.java @@ -737,13 +737,14 @@ public interface WindowManagerPolicy { /** * Create and return an animation to re-display a force hidden window. */ - public Animation createForceHideEnterAnimation(boolean onWallpaper); + public Animation createForceHideEnterAnimation(boolean onWallpaper, + boolean goingToNotificationShade); /** * Create and return an animation to let the wallpaper disappear after being shown on a force * hiding window. */ - public Animation createForceHideWallpaperExitAnimation(); + public Animation createForceHideWallpaperExitAnimation(boolean goingToNotificationShade); /** * Called from the input reader thread before a key is enqueued. |