Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 84a3e7aa authored by Jorim Jaggi's avatar Jorim Jaggi
Browse files

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
parent b734e9d2

core/java/android/view/IWindowManager.aidl

+2 −1
Original line number Diff line number Diff line
@@ -121,7 +121,8 @@ interface IWindowManager 
    boolean isKeyguardSecure();

    boolean inKeyguardRestrictedInputMode();

    void dismissKeyguard();

    void keyguardGoingAway();

    void keyguardGoingAway(boolean disableWindowAnimations,

            boolean keyguardGoingToNotificationShade);



    void closeSystemDialogs(String reason);

core/java/android/view/WindowManagerPolicy.java

+3 −2
Original line number Diff line number Diff line
@@ -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.

core/res/res/anim/lock_screen_behind_enter_fade_in.xml

0 → 100644
+27 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

  ~ Copyright (C) 2014 The Android Open Source Project

  ~

  ~ Licensed under the Apache License, Version 2.0 (the "License");

  ~ you may not use this file except in compliance with the License.

  ~ You may obtain a copy of the License at

  ~

  ~      http://www.apache.org/licenses/LICENSE-2.0

  ~

  ~ Unless required by applicable law or agreed to in writing, software

  ~ distributed under the License is distributed on an "AS IS" BASIS,

  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

  ~ See the License for the specific language governing permissions and

  ~ limitations under the License

  -->



<alpha xmlns:android="http://schemas.android.com/apk/res/android"

    android:background="#ff000000"

    android:detachWallpaper="true"

    android:shareInterpolator="false"

    android:interpolator="@interpolator/linear"

    android:fromAlpha="0" android:toAlpha="1"

    android:fillEnabled="true" android:fillBefore="true" android:fillAfter="true"

    android:duration="250"

    android:startOffset="100">

</alpha>
 
 No newline at end of file

core/res/res/anim/lock_screen_behind_enter_wallpaper.xml

+1 −8
Original line number Diff line number Diff line
@@ -22,15 +22,8 @@ 
        android:fillEnabled="true" android:fillBefore="true"

        android:interpolator="@interpolator/decelerate_quint"

        android:duration="400"/>

    <scale

        android:fromXScale="0.94" android:toXScale="1.0"

        android:fromYScale="0.94" android:toYScale="1.0"

        android:pivotX="50%" android:pivotY="100%"

        android:fillEnabled="true" android:fillBefore="true"

        android:interpolator="@interpolator/decelerate_quint"

        android:duration="400" />



    <translate android:fromYDelta="5%" android:toYDelta="0"

    <translate android:fromYDelta="11%" android:toYDelta="0"

        android:fillEnabled="true" android:fillBefore="true" android:fillAfter="true"

        android:interpolator="@interpolator/decelerate_quint"

        android:duration="300" />

core/res/res/values/symbols.xml

+1 −0
Original line number Diff line number Diff line
@@ -1721,6 +1721,7 @@ 
  <java-symbol type="anim" name="push_up_out" />

  <java-symbol type="anim" name="lock_screen_behind_enter" />

  <java-symbol type="anim" name="lock_screen_behind_enter_wallpaper" />

  <java-symbol type="anim" name="lock_screen_behind_enter_fade_in" />

  <java-symbol type="anim" name="lock_screen_wallpaper_exit" />



  <java-symbol type="bool" name="config_alwaysUseCdmaRssi" />