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

Commit 80670f39 authored by Joshua Mccloskey's avatar Joshua Mccloskey Committed by Automerger Merge Worker
Browse files

Merge "Added lottie animations for udfps side/tip" into sc-v2-dev am: 6a6fb6b7 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16440683

Change-Id: I2e39ea48ae3511e9111dacd09b9381386763d33d
parents 51e3455f 6a6fb6b7

res/layout/udfps_enroll_enrolling.xml

+40 −9
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 


<com.google.android.setupdesign.GlifLayout

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

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

    android:id="@+id/setup_wizard_layout"

    android:layout_width="match_parent"

    android:layout_height="match_parent"
@@ -30,6 +31,35 @@ 
        android:clipChildren="false"

        android:orientation="vertical">



        <LinearLayout

            android:layout_width="match_parent"

            android:layout_height="0dp"

            android:layout_weight="1"

            android:gravity="center|bottom"

            android:orientation="vertical">



          <FrameLayout

              android:layout_width="match_parent"

              android:layout_height="wrap_content"

              android:clipChildren="false"

              android:clipToPadding="false"

              android:layout_gravity="center_horizontal|bottom">



              <!-- Animation res MUST be set in code -->

              <com.airbnb.lottie.LottieAnimationView

                  android:id="@+id/illustration_lottie"

                  android:layout_width="match_parent"

                  android:layout_height="200dp"

                  android:layout_marginTop="@dimen/udfps_lottie_translate_y"

                  android:scaleType="centerInside"

                  android:visibility="gone"

                  app:lottie_autoPlay="true"

                  app:lottie_loop="true"

                  android:clipChildren="false"

                  android:clipToPadding="false"

                  app:lottie_speed=".85" />

          </FrameLayout>



          <TextView

              android:id="@+id/error_text"

              style="@style/TextAppearance.ErrorText"
@@ -40,5 +70,6 @@ 
              android:gravity="center_horizontal"

              android:visibility="invisible" />

      </LinearLayout>

    </LinearLayout>



</com.google.android.setupdesign.GlifLayout>

res/raw/udfps_edge_hint_lottie.json

0 → 100644
+0 −0

Empty file added.

res/raw/udfps_tip_hint_lottie.json

0 → 100644
+0 −0

Empty file added.

res/values/dimens.xml

+1 −0
Original line number Diff line number Diff line
@@ -235,6 +235,7 @@ 
         fingerprint_finish_max_size = fingerprint_progress_bar_max_size

                  + (fingerprint_enrolling_content_margin_vertical x 2) -->

    <dimen name="fingerprint_finish_max_size">288dp</dimen>

    <dimen name="udfps_lottie_translate_y">0dp</dimen>



    <!-- Face -->

    <item name="face_preview_translate_y" format="float" type="dimen">0</item>

res/values/strings.xml

+4 −0
Original line number Diff line number Diff line
@@ -1084,6 +1084,10 @@ 
    <string name="security_settings_fingerprint_enroll_finish_message">Now you can use your fingerprint to unlock your phone or verify it\u2019s you, like when you sign in to apps</string>

    <!-- Button text to skip enrollment of fingerprint [CHAR LIMIT=40] -->

    <string name="security_settings_fingerprint_enroll_enrolling_skip">Do it later</string>

    <!-- Accessibility message for fingerprint enrollment asking the user to place the tip of their finger on the fingerprint sensor [CHAR LIMIT=NONE] -->

    <string name="security_settings_udfps_tip_fingerprint_help">Lift, then touch again</string>

    <!-- Accessibility message for fingerprint enrollment asking the user to place the sides of their finger on the fingerprint sensor [CHAR LIMIT=NONE] -->

    <string name="security_settings_udfps_side_fingerprint_help">Place the side of your fingerprint on the sensor and hold, then switch to the other side</string>

    <!-- Title of the dialog shown when the user tries to skip fingerprint setup, asking them to confirm the action [CHAR LIMIT=40] -->

    <string name="setup_fingerprint_enroll_enrolling_skip_title">Skip fingerprint setup?</string>

    <!-- Content of the dialog shown when the user tries to skip fingerprint setup, asking them to confirm the action [CHAR LIMIT=NONE] -->