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

Commit d6c80bd8 authored by Xin Li's avatar Xin Li
Browse files

Merge Android 12 QPR 3 

Bug: 236045730
Merged-In: Ie1e14a6b697af624854a9360a60383fac63bb02c
Change-Id: Ib7885655035baa9aa6add39f7a169f7c84d48138
parents 8be3ebd1 a5a729f5

AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -2262,7 +2262,7 @@ 
        </activity>



        <activity android:name=".password.ScreenLockSuggestionActivity"

            android:exported="true"

            android:exported="false"

            android:icon="@drawable/ic_suggestion_security">

            <intent-filter android:priority="1">

                <action android:name="android.intent.action.MAIN" />

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-af/strings.xml

+3 −0
Original line number Diff line number Diff line
@@ -497,6 +497,8 @@ 
    <string name="security_settings_fingerprint_enroll_finish_title" msgid="3606325177406951457">"Vingerafdruk bygevoeg"</string>

    <string name="security_settings_fingerprint_enroll_finish_message" msgid="3469254005423998143">"Jy kan nou jou vingerafdruk gebruik om jou foon te ontsluit of te verifieer dis jy, soos wanneer jy by programme aanmeld"</string>

    <string name="security_settings_fingerprint_enroll_enrolling_skip" msgid="3004786457919122854">"Doen dit later"</string>

    <string name="security_settings_udfps_tip_fingerprint_help" msgid="7580784640741217494">"Lig en raak dan weer"</string>

    <string name="security_settings_udfps_side_fingerprint_help" msgid="2567232481013195191">"Plaas die kant van jou vingerafdruk op die sensor en hou; ruil dan om na die ander kant"</string>

    <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="352947044008973812">"Slaan vingerafdrukopstelling oor?"</string>

    <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="4876965433600560365">"Jy het gekies om jou vingerafdruk te gebruik as een manier om jou foon te ontsluit. As jy dit nou oorslaan, sal jy dit later moet opstel. Dit neem net \'n minuut of wat om op te stel."</string>

    <string name="lock_screen_pin_skip_message" product="tablet" msgid="4938798234214623521">"\'n PIN beskerm die tablet as dit verloor of gesteel word"</string>
@@ -3612,6 +3614,7 @@ 
    <string name="charging_sounds_title" msgid="5261683808537783668">"Laaiklanke en -vibrasie"</string>

    <string name="docking_sounds_title" msgid="5341616179210436159">"Dokklanke"</string>

    <string name="touch_sounds_title" msgid="2200734041857425078">"Raakklanke"</string>

    <string name="vibrate_icon_title" msgid="1281100105045362530">"Wys ikoon altyd wanneer dit in vibrasiemodus is"</string>

    <string name="vibrate_on_touch_title" msgid="9105544449810547716">"Raakvibrasie"</string>

    <string name="vibrate_on_touch_summary" msgid="664831333409399440">"Fisieke terugvoer vir tik, sleutelbord en meer"</string>

    <string name="dock_audio_media_title" msgid="6474579339356398330">"Dokluidspreker speel"</string>