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

Commit 8cdef829 authored by Jorim Jaggi's avatar Jorim Jaggi Committed by Android Git Automerger
Browse files

am 698c8194: Merge "Fade scrim in unlock animation." into lmp-preview-dev 

* commit '698c81948ed277253d567aa4c34996d2d0477992':
  Fade scrim in unlock animation.
parents 3ed851bd d48d7a6d

core/java/android/view/WindowManagerPolicy.java

+4 −1
Original line number Diff line number Diff line
@@ -1199,6 +1199,9 @@ public interface WindowManagerPolicy { 


    /**

     * Notifies the keyguard to start fading out.

     *

     * @param startTime the start time of the animation in uptime milliseconds

     * @param fadeoutDuration the duration of the exit animation, in milliseconds

     */

    public void startKeyguardExitAnimation(long fadeoutDuration);

    public void startKeyguardExitAnimation(long startTime, long fadeoutDuration);

}

core/java/com/android/internal/policy/IKeyguardService.aidl

+4 −1
Original line number Diff line number Diff line
@@ -60,6 +60,9 @@ interface IKeyguardService { 
    /**

     * Notifies that the activity behind has now been drawn and it's safe to remove the wallpaper

     * and keyguard flag.

     *

     * @param startTime the start time of the animation in uptime milliseconds

     * @param fadeoutDuration the duration of the exit animation, in milliseconds

     */

    oneway void startKeyguardExitAnimation(long fadeoutDuration);

    oneway void startKeyguardExitAnimation(long startTime, long fadeoutDuration);

}

core/res/res/anim/lock_screen_behind_enter.xml

+11 −4
Original line number Diff line number Diff line
@@ -18,10 +18,17 @@ 
-->



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

    android:background="#ff000000" android:shareInterpolator="false">

    android:detachWallpaper="true" android:shareInterpolator="false" android:startOffset="60">

    <alpha

        android:fromAlpha="1.0" android:toAlpha="1.0"

        android:fromAlpha="0.0" android:toAlpha="1.0"

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

        android:interpolator="@interpolator/decelerate_quint"

        android:duration="0"/>

        android:interpolator="@interpolator/linear_out_slow_in"

        android:duration="@integer/config_shortAnimTime"/>

    <scale

        android:fromXScale="0.95" android:toXScale="1.0"

        android:fromYScale="0.95" android:toYScale="1.0"

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

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

        android:interpolator="@interpolator/linear_out_slow_in"

        android:duration="@integer/config_shortAnimTime" />

</set>
 
 No newline at end of file

core/res/res/anim/lock_screen_wallpaper_behind_enter.xml

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

<!--

/*

** Copyright 2007, 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.

*/

-->



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

    android:detachWallpaper="true" android:shareInterpolator="false">

    <alpha

        android:fromAlpha="0.0" android:toAlpha="1.0"

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

        android:interpolator="@interpolator/decelerate_quad"

        android:startOffset="@android:integer/config_mediumAnimTime"

        android:duration="@android:integer/config_shortAnimTime"/>

</set>

core/res/res/values/symbols.xml

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

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

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

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

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



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