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

Commit 4e792fa5 authored by Jorim Jaggi's avatar Jorim Jaggi Committed by Android (Google) Code Review
Browse files

Merge "Polish animations for fingerprint icon" into mnc-dev

parents 5e0ef0d0 864e64ba

packages/Keyguard/src/com/android/keyguard/KeyguardUpdateMonitor.java

+1 −1
Original line number Diff line number Diff line
@@ -659,6 +659,7 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener { 
    }



    protected void handleScreenTurnedOn() {

        updateFingerprintListeningState();

        final int count = mCallbacks.size();

        for (int i = 0; i < count; i++) {

            KeyguardUpdateMonitorCallback cb = mCallbacks.get(i).get();
@@ -666,7 +667,6 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener { 
                cb.onScreenTurnedOn();

            }

        }

        updateFingerprintListeningState();

    }



    protected void handleScreenTurnedOff(int arg1) {

packages/SystemUI/res/anim/lockscreen_fingerprint_error_state_ridge_6_path_animation.xml→packages/SystemUI/res/anim/lockscreen_fingerprint_draw_off_ridge_1_path_animation.xml

+3 −2
Original line number Diff line number Diff line
@@ -14,12 +14,13 @@ 
  ~ See the License for the specific language governing permissions and

  ~ limitations under the License

  -->



<set

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

    <set

        android:ordering="sequentially" >

        <objectAnimator

            android:duration="16"

            android:duration="60"

            android:propertyName="trimPathStart"

            android:valueFrom="0.0"

            android:valueTo="0.0"
@@ -31,6 +32,6 @@ 
            android:valueFrom="0.0"

            android:valueTo="1.0"

            android:valueType="floatType"

            android:interpolator="@android:interpolator/linear" />

            android:interpolator="@interpolator/lockscreen_fingerprint_draw_off_animation_interpolator_1" />

    </set>

</set>

packages/SystemUI/res/anim/lockscreen_fingerprint_draw_off_ridge_2_path_animation.xml

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

<!--

  ~ Copyright (C) 2015 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" >

    <objectAnimator

        android:duration="140"

        android:propertyName="trimPathEnd"

        android:valueFrom="1.0"

        android:valueTo="0.0"

        android:valueType="floatType"

        android:interpolator="@interpolator/lockscreen_fingerprint_draw_off_animation_interpolator_0" />

</set>

packages/SystemUI/res/anim/lockscreen_fingerprint_error_state_ridge_7_path_animation.xml→packages/SystemUI/res/anim/lockscreen_fingerprint_draw_off_ridge_5_path_animation.xml

+3 −3
Original line number Diff line number Diff line
@@ -19,18 +19,18 @@ 
    <set

        android:ordering="sequentially" >

        <objectAnimator

            android:duration="33"

            android:duration="20"

            android:propertyName="trimPathStart"

            android:valueFrom="0.0"

            android:valueTo="0.0"

            android:valueType="floatType"

            android:interpolator="@android:interpolator/linear" />

        <objectAnimator

            android:duration="150"

            android:duration="180"

            android:propertyName="trimPathStart"

            android:valueFrom="0.0"

            android:valueTo="1.0"

            android:valueType="floatType"

            android:interpolator="@android:interpolator/linear" />

            android:interpolator="@interpolator/lockscreen_fingerprint_draw_off_animation_interpolator_1" />

    </set>

</set>

packages/SystemUI/res/anim/lockscreen_fingerprint_draw_off_ridge_6_path_animation.xml

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

<!--

  ~ Copyright (C) 2015 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" >

    <objectAnimator

        android:duration="190"

        android:propertyName="trimPathEnd"

        android:valueFrom="1.0"

        android:valueTo="0.0"

        android:valueType="floatType"

        android:interpolator="@interpolator/lockscreen_fingerprint_draw_off_animation_interpolator_1" />

</set>