Snap for 9127121 from e7722ef90c to tm-qpr1-release

Change-Id: I0ba2d20fe20ca05b0b197d57970f673d3fa7f4a6

res/values-ar/strings.xml

@@ -598,7 +598,7 @@
     <string name="security_settings_udfps_enroll_fingertip_title" msgid="4123142574168831116">"ضع طرف إصبعك على المستشعر."</string>
     <string name="security_settings_udfps_enroll_left_edge_title" msgid="1944076382202470458">"ضع الحافة اليسرى لإصبعك"</string>
     <string name="security_settings_udfps_enroll_right_edge_title" msgid="9036744264606447490">"ضع الحافة اليمنى لإصبعك"</string>
-    <string name="security_settings_sfps_enroll_finger_center_title" msgid="1320688855767675739">"ضَع وسط إصبعك على أداة الاستشعار"</string>
+    <string name="security_settings_sfps_enroll_finger_center_title" msgid="1320688855767675739">"ضَع وسط بصمة إصبعك على أداة الاستشعار"</string>
     <string name="security_settings_sfps_enroll_fingertip_title" msgid="2737520837684516446">"ضع طرف إصبعك على أداة الاستشعار"</string>
     <string name="security_settings_sfps_enroll_left_edge_title" msgid="9022963735924413343">"ضع الحافة اليسرى لإصبعك على أداة الاستشعار"</string>
     <string name="security_settings_sfps_enroll_right_edge_title" msgid="823106857743394392">"أخيرًا، ضع الحافة اليمنى لإصبعك على أداة الاستشعار"</string>
@@ -3573,7 +3573,7 @@
     <string name="vpn_create" msgid="7546073242936894638">"‏إضافة ملف شخصي لشبكة افتراضية خاصة (VPN)"</string>
     <string name="vpn_menu_edit" msgid="5100387853773792379">"تعديل الملف الشخصي"</string>
     <string name="vpn_menu_delete" msgid="4455966182219039928">"حذف الملف الشخصي"</string>
-    <string name="vpn_menu_lockdown" msgid="5284041663859541007">"‏شبكة افتراضية خاصة (VPN) قيد التشغيل دائمًا"</string>
+    <string name="vpn_menu_lockdown" msgid="5284041663859541007">"‏شبكة VPN قيد التشغيل دائمًا"</string>
     <string name="vpn_no_vpns_added" msgid="7387080769821533728">"‏لم تتم إضافة أي شبكات افتراضية خاصة (VPN)."</string>
     <string name="vpn_always_on_summary" msgid="2171252372476858166">"‏متابعة الاتصال بشبكة VPN في جميع الأوقات"</string>
     <string name="vpn_always_on_summary_not_supported" msgid="9084872130449368437">"عدم التوافق مع هذا التطبيق"</string>
@@ -5390,7 +5390,7 @@
     <string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"النقر لفحص الجهاز"</string>
     <string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"للاطّلاع على الوقت والإشعارات والمعلومات الأخرى، انقر على شاشتك."</string>
     <string name="emergency_gesture_screen_title" msgid="3280543310204360902">"اتصالات الطوارئ"</string>
-    <string name="emergency_gesture_switchbar_title" msgid="7421353963329899514">"استخدام اتصالات الطوارئ"</string>
+    <string name="emergency_gesture_switchbar_title" msgid="7421353963329899514">"استخدام ميزة \"اتصالات الطوارئ\""</string>
     <string name="emergency_gesture_entrypoint_summary" msgid="4730874229911208834">"تحت إدارة <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
     <string name="emergency_gesture_screen_summary" msgid="6640521030845132507">"اضغط على زر التشغيل بسرعة 5 مرات أو أكثر لبدء تنفيذ الإجراءات أدناه."</string>
     <string name="emergency_gesture_sound_setting_title" msgid="7153948164862156536">"تشغيل إنذار العد التنازلي"</string>

res/values-vi/strings.xml

@@ -1252,7 +1252,7 @@
     <string name="wifi_p2p_settings_title" msgid="1689918226469221870">"Wi‑Fi Direct"</string>
     <string name="wifi_p2p_device_info" msgid="4304362679971797283">"Thông tin thiết bị"</string>
     <string name="wifi_p2p_persist_network" msgid="7942929491568227945">"Ghi nhớ kết nối này"</string>
-    <string name="wifi_p2p_menu_search" msgid="8383306178784876840">"Tìm kiếm thiết bị"</string>
+    <string name="wifi_p2p_menu_search" msgid="8383306178784876840">"Tìm thiết bị"</string>
     <string name="wifi_p2p_menu_searching" msgid="3428767661028761100">"Đang tìm kiếm…"</string>
     <string name="wifi_p2p_menu_rename" msgid="7059994112737743336">"Đổi tên thiết bị"</string>
     <string name="wifi_p2p_peer_devices" msgid="5158559154640283546">"Thiết bị ngang hàng"</string>

src/com/android/settings/accessibility/TextReadingPreviewController.java

@@ -112,7 +112,9 @@ class TextReadingPreviewController extends BasePreferenceController implements
         mPreviewPreference.setPreviewAdapter(pagerAdapter);
         mPreviewPreference.setCurrentItem(
                 isLayoutRtl ? PREVIEW_SAMPLE_RES_IDS.length - 1 : FRAME_INITIAL_INDEX);
-        pagerAdapter.setPreviewLayer(getPagerIndex(), LAYER_INITIAL_INDEX,
+        final int initialPagerIndex =
+                mLastFontProgress * mDisplaySizeData.getValues().size() + mLastDisplayProgress;
+        pagerAdapter.setPreviewLayer(initialPagerIndex, LAYER_INITIAL_INDEX,
                 FRAME_INITIAL_INDEX, /* animate= */ false);
     }
 
@@ -168,11 +170,13 @@ class TextReadingPreviewController extends BasePreferenceController implements
 
     private int getPagerIndex() {
         final int displayDataSize = mDisplaySizeData.getValues().size();
+        final int fontSizeProgress = mFontSizePreference.getProgress();
+        final int displaySizeProgress = mDisplaySizePreference.getProgress();
 
         // To be consistent with the {@link PreviewPagerAdapter#setPreviewLayer(int, int, int,
         // boolean)} behavior, here also needs the same design. In addition, please also refer to
         // the {@link #createConfig(Configuration)}.
-        return mLastFontProgress * displayDataSize + mLastDisplayProgress;
+        return fontSizeProgress * displayDataSize + displaySizeProgress;
     }
 
     private void tryCommitFontSizeConfig() {

src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrolling.java

@@ -286,8 +286,8 @@ public class FingerprintEnrollEnrolling extends BiometricsEnrollEnrolling {
         }
 
         mShouldShowLottie = shouldShowLottie();
-        // Only show the lottie if the current display density is the default density.
-        // Otherwise, the lottie will overlap with the settings header text.
+        // On non-SFPS devices, only show the lottie if the current display density is the default
+        // density. Otherwise, the lottie will overlap with the settings header text.
         boolean isLandscape = BiometricUtils.isReverseLandscape(getApplicationContext())
                 || BiometricUtils.isLandscape(getApplicationContext());
 
@@ -771,8 +771,6 @@ public class FingerprintEnrollEnrolling extends BiometricsEnrollEnrolling {
             CharSequence announcement = getString(
                     R.string.security_settings_sfps_enroll_progress_a11y_message, percent);
             announceEnrollmentProgress(announcement);
-            // mIllustrationLottie is only shown when current display density = default density,
-            // to prevent overlap with the settings header text.
             if (mIllustrationLottie != null) {
                 mIllustrationLottie.setContentDescription(
                         getString(
@@ -1019,9 +1017,7 @@ public class FingerprintEnrollEnrolling extends BiometricsEnrollEnrolling {
 
     private void updateOrientation(int orientation) {
         if (mCanAssumeSfps) {
-            if (mShouldShowLottie) {
-                mIllustrationLottie = findViewById(R.id.illustration_lottie);
-            }
+            mIllustrationLottie = findViewById(R.id.illustration_lottie);
         } else {
             switch(orientation) {
                 case Configuration.ORIENTATION_LANDSCAPE: {

src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFindSensor.java

@@ -168,8 +168,6 @@ public class FingerprintEnrollFindSensor extends BiometricEnrollBase implements
 
     private void updateSfpsFindSensorAnimationAsset() {
         mIllustrationLottie = findViewById(R.id.illustration_lottie);
-        LottieColorUtils.applyDynamicColors(getApplicationContext(), mIllustrationLottie);
-        mIllustrationLottie.setVisibility(View.VISIBLE);
         final int rotation = getApplicationContext().getDisplay().getRotation();
 
         switch (rotation) {
@@ -190,6 +188,9 @@ public class FingerprintEnrollFindSensor extends BiometricEnrollBase implements
                         R.raw.fingerprint_edu_lottie_landscape_top_right);
                 break;
         }
+
+        LottieColorUtils.applyDynamicColors(getApplicationContext(), mIllustrationLottie);
+        mIllustrationLottie.setVisibility(View.VISIBLE);
         mIllustrationLottie.playAnimation();
     }