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

Commit 76a1623a authored by Jorim Jaggi's avatar Jorim Jaggi
Browse files

Preparations for lockscreen launch animations 

- Update unlock animations to new spec to make the consistent with
  lockscreen launch animations.
- Introduce disappearing motion for security views which runs before
  we actually dismiss Keyguard.
- If a window is running the un-force-hide animation, treat as it
  would have the wallpaper flag set so the wallpaper stays until
  the animation is completely done.
- Run an animation on the wallpaper if the wallpaper is going away.

Bug: 15991916
Bug: 16234603
Bug: 15326120
Change-Id: I063aa4f269ddcf75b9a705e90f0c3056b541b642
parent 9a0b289f

core/java/android/view/WindowManagerPolicy.java

+7 −1
Original line number Diff line number Diff line
@@ -739,6 +739,12 @@ public interface WindowManagerPolicy { 
     */

    public Animation createForceHideEnterAnimation(boolean onWallpaper);



    /**

     * Create and return an animation to let the wallpaper disappear after being shown on a force

     * hiding window.

     */

    public Animation createForceHideWallpaperExitAnimation();



    /**

     * Called from the input reader thread before a key is enqueued.

     *

core/res/res/anim/lock_screen_behind_enter.xml

+23 −29
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

/*

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

*/

  ~ 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

  -->



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

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

    <alpha

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

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

        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" />

        android:background="#ff000000"

        android:detachWallpaper="true"

        android:shareInterpolator="false"

        android:startOffset="100">



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

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

            android:interpolator="@interpolator/decelerate_quint"

            android:duration="300" />

</set>
 
 No newline at end of file

core/res/res/anim/lock_screen_behind_enter_wallpaper.xml

0 → 100644
+37 −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

  -->



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

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

    <alpha

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

        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"

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

        android:interpolator="@interpolator/decelerate_quint"

        android:duration="300" />

</set>
 
 No newline at end of file

core/res/res/anim/lock_screen_wallpaper_exit.xml

0 → 100644
+32 −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

  -->



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

        android:shareInterpolator="false" android:startOffset="100">

    <alpha

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

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

        android:interpolator="@interpolator/fast_out_linear_in"

        android:duration="150"/>



    <!-- Empty animation so the animation has same duration as lock_screen_behind_enter animation

         -->

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

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

        android:interpolator="@interpolator/linear"

        android:duration="300" />

</set>
 
 No newline at end of file

core/res/res/values/symbols.xml

+2 −0
Original line number Diff line number Diff line
@@ -1720,6 +1720,8 @@ 
  <java-symbol type="anim" name="push_up_in" />

  <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_wallpaper_exit" />



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

  <java-symbol type="dimen" name="status_bar_icon_size" />