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

Commit 599ffd0f authored by Diya Bera's avatar Diya Bera Committed by Android (Google) Code Review
Browse files

Merge "No scrolling required to see find sensor animation"

parents aa1e2527 bda3c064

res/layout/sfps_enroll_find_sensor_layout.xml

+2 −1
Original line number Original line Diff line number Diff line
@@ -29,7 +29,8 @@ 
        android:gravity="center_vertical"

        android:gravity="center_vertical"

        android:orientation="vertical"

        android:orientation="vertical"

        android:clipToPadding="false"

        android:clipToPadding="false"

        android:clipChildren="false">

        android:clipChildren="false"

        android:layout_marginTop="@dimen/sfps_enroll_find_sensor_lottie_margin">





        <!-- Animation res MUST be set in code because asset is dependent on device orientation -->

        <!-- Animation res MUST be set in code because asset is dependent on device orientation -->

        <com.airbnb.lottie.LottieAnimationView

        <com.airbnb.lottie.LottieAnimationView

res/values/dimens.xml

+3 −0
Original line number Original line Diff line number Diff line
@@ -407,4 +407,7 @@ 
    <dimen name="limited_vision_button_margin_top">0dp</dimen>

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

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

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

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

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



    <!-- Default margin for side fps enroll find sensor lottie -->

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

</resources>
 
</resources>

res/values/strings.xml

+6 −0
Original line number Original line Diff line number Diff line
@@ -826,6 +826,12 @@ 
    <string name="security_settings_udfps_enroll_find_sensor_title">How to set up your fingerprint</string>

    <string name="security_settings_udfps_enroll_find_sensor_title">How to set up your fingerprint</string>

    <!-- Message shown in fingerprint enrollment dialog to locate the sensor -->

    <!-- Message shown in fingerprint enrollment dialog to locate the sensor -->

    <string name="security_settings_fingerprint_enroll_find_sensor_message">It\u2019s on the back of your phone. Use your index finger.</string>

    <string name="security_settings_fingerprint_enroll_find_sensor_message">It\u2019s on the back of your phone. Use your index finger.</string>

    <!-- Message shown in SFPS enrollment dialog to locate the sensor (tablet) [CHAR LIMIT=NONE]-->

    <string name="security_settings_sfps_enroll_find_sensor_message" product="tablet">The fingerprint sensor is on the power button. It’s the flat button next to the raised volume button on the edge of the tablet.</string>

    <!-- Message shown in SFPS enrollment dialog to locate the sensor (device) [CHAR LIMIT=NONE]-->

    <string name="security_settings_sfps_enroll_find_sensor_message" product="device">The fingerprint sensor is on the power button. It’s the flat button next to the raised volume button on the edge of the device.</string>

    <!-- Message shown in SFPS enrollment dialog to locate the sensor (default) [CHAR LIMIT=NONE]-->

    <string name="security_settings_sfps_enroll_find_sensor_message" product="default">The fingerprint sensor is on the power button. It’s the flat button next to the raised volume button on the edge of the phone.</string>

    <!-- Message shown in UDFPS enrollment dialog to locate the sensor [CHAR LIMIT=NONE]-->

    <!-- Message shown in UDFPS enrollment dialog to locate the sensor [CHAR LIMIT=NONE]-->

    <string name="security_settings_udfps_enroll_find_sensor_message">The fingerprint sensor is on your screen. You\u2019ll capture your fingerprint on the next screen.</string>

    <string name="security_settings_udfps_enroll_find_sensor_message">The fingerprint sensor is on your screen. You\u2019ll capture your fingerprint on the next screen.</string>

    <!-- Button for starting fingerprint enrollment. [CHAR LIMIT=10]-->

    <!-- Button for starting fingerprint enrollment. [CHAR LIMIT=10]-->