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

Commit 3539c9e7 authored by Diya Bera's avatar Diya Bera Committed by Automerger Merge Worker
Browse files

Merge "No scrolling required to see find sensor animation" into tm-qpr-dev am: 8d6aade6 

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



Change-Id: I91f462e490708b57efdd7b20ba982aa18d3301e1
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 272d5232 8d6aade6

res/layout/sfps_enroll_find_sensor_layout.xml

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

        android:orientation="vertical"

        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 -->

        <com.airbnb.lottie.LottieAnimationView

res/values/dimens.xml

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

    <dimen name="limited_vision_button_margin_bottom">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>

res/values/strings.xml

+3 −3
Original line number Diff line number Diff line
@@ -1217,11 +1217,11 @@ 
    <!-- 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>

    <!-- 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.\n\nPressing the power button turns off the screen.</string>

    <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.\n\nPressing the power button turns off the screen.</string>

    <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.\n\nPressing the power button turns off the screen.</string>

    <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]-->

    <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]-->