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

Commit b3c7f0e5 authored by John Reck's avatar John Reck Committed by Android Git Automerger
Browse files

am 662ad0c2: am 2c862e68: am 60746378: Merge "Remove old animation" into klp-dev 

* commit '662ad0c2':
  Remove old animation
parents 4c496f1f 662ad0c2

core/res/res/values/integers.xml

+0 −2
Original line number Diff line number Diff line
@@ -18,7 +18,5 @@ 
-->

<resources>

    <integer name="kg_carousel_angle">75</integer>

    <integer name="kg_security_flip_duration">100</integer>

    <integer name="kg_security_fade_duration">100</integer>

    <integer name="kg_glowpad_rotation_offset">0</integer>

</resources>

packages/Keyguard/res/anim/keyguard_security_animate_in.xml

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

<!-- Copyright (C) 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.

-->



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



    <scale

        android:interpolator="@android:anim/decelerate_interpolator"

        android:fromXScale="0.0"

        android:toXScale="1.0"

        android:fromYScale="1.0"

        android:toYScale="1.0"

        android:pivotX="50%"

        android:pivotY="50%"

        android:fillEnabled="true"

        android:fillAfter="true"

        android:duration="@integer/kg_security_flip_duration"

        android:startOffset="@integer/kg_security_flip_duration" />



</set>

packages/Keyguard/res/anim/keyguard_security_animate_out.xml

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

<!-- Copyright (C) 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.

-->



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



    <scale

        android:interpolator="@android:anim/accelerate_interpolator"

        android:fromXScale="1.0"

        android:toXScale="0.0"

        android:fromYScale="1.0"

        android:toYScale="1.0"

        android:pivotX="50%"

        android:pivotY="50%"

        android:fillEnabled="true"

        android:fillAfter="true"

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



</set>

packages/Keyguard/res/anim/keyguard_security_fade_in.xml

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

<!-- Copyright (C) 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.

-->



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

    android:interpolator="@android:interpolator/decelerate_quad"

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

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

packages/Keyguard/res/anim/keyguard_security_fade_out.xml

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

<!-- Copyright (C) 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.

-->

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

    android:interpolator="@android:interpolator/accelerate_quad"

    android:fromAlpha="1.0"

    android:toAlpha="0.0"

    android:duration="@integer/kg_security_fade_duration"

/>