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

Commit 83a98965 authored by Beverly Tai's avatar Beverly Tai Committed by Automerger Merge Worker
Browse files

Merge "Update udfps icon on lockscreen and AOD" into sc-dev am: a52ca6db 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15084327

Change-Id: I23f8fb91b8c31b3908f620275ee436a3dac6d8a0
parents a70c66f5 a52ca6db

packages/SystemUI/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -94,6 +94,7 @@ android_library { 
        "SystemUI-proto",

        "dagger2",

        "jsr330",

        "lottie",

    ],

    manifest: "AndroidManifest.xml",

packages/SystemUI/res/layout/udfps_keyguard_view.xml

+24 −3
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 
  -->

<com.android.systemui.biometrics.UdfpsKeyguardView

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

    xmlns:app="http://schemas.android.com/apk/res-auto"

    android:id="@+id/udfps_animation_view"

    android:layout_width="match_parent"

    android:layout_height="match_parent">
@@ -29,8 +30,28 @@ 
        android:visibility="gone"/>



    <!-- Fingerprint -->

    <ImageView

        android:id="@+id/udfps_keyguard_animation_fp_view"



    <!-- AOD dashed fingerprint icon with moving dashes -->

    <com.airbnb.lottie.LottieAnimationView

        android:id="@+id/udfps_aod_fp"

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:layout_gravity="center"

        android:scaleType="centerCrop"

        app:lottie_autoPlay="false"

        android:padding="16dp"

        app:lottie_loop="true"

        app:lottie_rawRes="@raw/udfps_aod_fp"/>



    <!-- LockScreen fingerprint icon from 0 stroke width to full width -->

    <com.airbnb.lottie.LottieAnimationView

        android:id="@+id/udfps_lockscreen_fp"

        android:layout_width="match_parent"

        android:layout_height="match_parent"/>

        android:layout_height="match_parent"

        android:layout_gravity="center"

        android:scaleType="centerCrop"

        app:lottie_autoPlay="false"

        app:lottie_loop="false"

        android:padding="16dp"

        app:lottie_rawRes="@raw/udfps_lockscreen_fp"/>

</com.android.systemui.biometrics.UdfpsKeyguardView>

packages/SystemUI/res/raw/udfps_aod_fp.json

0 → 100644
+2445 −0

File added.

Preview size limit exceeded, changes collapsed.

packages/SystemUI/res/raw/udfps_lockscreen_fp.json

0 → 100644
+1017 −0

File added.

Preview size limit exceeded, changes collapsed.

packages/SystemUI/src/com/android/systemui/biometrics/UdfpsAnimationView.java

+6 −1
Original line number Diff line number Diff line
@@ -74,7 +74,10 @@ abstract class UdfpsAnimationView extends FrameLayout { 
        return false;

    }



    protected void updateAlpha() {

    /**

     * @return current alpha

     */

    protected int updateAlpha() {

        int alpha = calculateAlpha();

        getDrawable().setAlpha(alpha);
@@ -84,6 +87,8 @@ abstract class UdfpsAnimationView extends FrameLayout { 
        } else {

            ((ViewGroup) getParent()).setVisibility(View.VISIBLE);

        }



        return alpha;

    }



    int calculateAlpha() {