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

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

Merge Android 12 QPR3 ab/8391262 

Bug: 226662282
Merged-In: I50e3649c21bb83ee9130fa98a71560fe261198a9
Change-Id: I2a97159d0de32a6262bbace7bb82b09897447bdb
parents ec1b6c30 6ca8dd1b

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/arrays.xml

+4 −15
Original line number Diff line number Diff line
@@ -104,6 +104,7 @@ 
    <item msgid="8568170800958331461">"Moenie verifieer nie"</item>

    <item msgid="5703177653586269306">"Versoek sertifikaatstatus"</item>

    <item msgid="326388247868439528">"Vereis sertifikaatstatus"</item>

    <item msgid="1090956283885790552">"Vereis statusse van alle nievertroude sertifikate"</item>

  </string-array>

  <string-array name="wifi_p2p_wps_setup">

    <item msgid="1446717102923442720">"Druk knoppie"</item>
@@ -422,10 +423,6 @@ 
    <item msgid="6485511780196327736">"Sweef oor ander programme"</item>

    <item msgid="3605616699204153590">"Navigasiebalk"</item>

  </string-array>

  <string-array name="accessibility_button_gesture_selector_titles">

    <item msgid="2370918472773154939">"Knoppie"</item>

    <item msgid="6922258575853746220">"Gebaar"</item>

  </string-array>

  <string-array name="accessibility_button_size_selector_titles">

    <item msgid="7482952318152486459">"Klein"</item>

    <item msgid="1666628329913333563">"Groot"</item>
@@ -487,21 +484,13 @@ 
    <item msgid="3164591924266309710">"Gekas (aktiwiteitkliënt)"</item>

    <item msgid="8186970968968646288">"Gekas (leeg)"</item>

  </string-array>

  <string-array name="sim_color_light">

    <item msgid="7007548668267207615">"@color/SIM_color_cyan"</item>

    <item msgid="177868870612833388">"@color/SIM_color_blue800"</item>

    <item msgid="1129898906008357171">"@color/SIM_color_green800"</item>

    <item msgid="4206364087389793587">"@color/SIM_color_purple800"</item>

    <item msgid="6728943460061940130">"@color/SIM_color_pink800"</item>

    <item msgid="968332068361935002">"@color/SIM_color_orange"</item>

  </string-array>

  <string-array name="color_picker">

    <item msgid="7216413848731287689">"Groenblou"</item>

    <item msgid="3230992859486877963">"Blougroen"</item>

    <item msgid="5661027589207588703">"Blou"</item>

    <item msgid="1219738214736244749">"Groen"</item>

    <item msgid="3795787248113275442">"Indigo"</item>

    <item msgid="6331809026622602308">"Pers"</item>

    <item msgid="6390546163902724700">"Pienk"</item>

    <item msgid="6500473130620545980">"Oranje"</item>

    <item msgid="6618900408138432102">"Rooi"</item>

  </string-array>

  <string-array name="automatic_storage_management_days">

    <item msgid="8896644025110620477">"Meer as 30 dae oud"</item>