diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml index f16a5173f2c..054e7a32550 100644 --- a/res/values-ar/strings.xml +++ b/res/values-ar/strings.xml @@ -598,7 +598,7 @@ "ضع طرف إصبعك على المستشعر." "ضع الحافة اليسرى لإصبعك" "ضع الحافة اليمنى لإصبعك" - "ضَع وسط إصبعك على أداة الاستشعار" + "ضَع وسط بصمة إصبعك على أداة الاستشعار" "ضع طرف إصبعك على أداة الاستشعار" "ضع الحافة اليسرى لإصبعك على أداة الاستشعار" "أخيرًا، ضع الحافة اليمنى لإصبعك على أداة الاستشعار" @@ -3573,7 +3573,7 @@ "‏إضافة ملف شخصي لشبكة افتراضية خاصة (VPN)" "تعديل الملف الشخصي" "حذف الملف الشخصي" - "‏شبكة افتراضية خاصة (VPN) قيد التشغيل دائمًا" + "‏شبكة VPN قيد التشغيل دائمًا" "‏لم تتم إضافة أي شبكات افتراضية خاصة (VPN)." "‏متابعة الاتصال بشبكة VPN في جميع الأوقات" "عدم التوافق مع هذا التطبيق" @@ -5390,7 +5390,7 @@ "النقر لفحص الجهاز" "للاطّلاع على الوقت والإشعارات والمعلومات الأخرى، انقر على شاشتك." "اتصالات الطوارئ" - "استخدام اتصالات الطوارئ" + "استخدام ميزة \"اتصالات الطوارئ\"" "تحت إدارة %1$s" "اضغط على زر التشغيل بسرعة 5 مرات أو أكثر لبدء تنفيذ الإجراءات أدناه." "تشغيل إنذار العد التنازلي" diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml index 2268987d13a..13a4210a696 100644 --- a/res/values-vi/strings.xml +++ b/res/values-vi/strings.xml @@ -1252,7 +1252,7 @@ "Wi‑Fi Direct" "Thông tin thiết bị" "Ghi nhớ kết nối này" - "Tìm kiếm thiết bị" + "Tìm thiết bị" "Đang tìm kiếm…" "Đổi tên thiết bị" "Thiết bị ngang hàng" diff --git a/src/com/android/settings/accessibility/TextReadingPreviewController.java b/src/com/android/settings/accessibility/TextReadingPreviewController.java index dab57babaed..29faaaa9f20 100644 --- a/src/com/android/settings/accessibility/TextReadingPreviewController.java +++ b/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() { diff --git a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrolling.java b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrolling.java index b44bc27bdda..ff385521819 100644 --- a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrolling.java +++ b/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: { diff --git a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFindSensor.java b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFindSensor.java index bb03ee4a6c1..f4576a2be0f 100644 --- a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFindSensor.java +++ b/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(); }