From a11c6b5a6486c9eb93f7ba717e4b0eecc7e125f9 Mon Sep 17 00:00:00 2001 From: Joshua McCloskey Date: Fri, 13 Jan 2023 02:28:54 +0000 Subject: [PATCH 1/7] Fixed additional lottie flicker in fp settings. Test: Verified in fingerprint enrollment, the lotties no longer flicker Fixes: 265194279 Change-Id: Ia88207ce7e520c6c180acdc21d03350976c10b17 --- .../fingerprint/FingerprintEnrollEnrolling.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrolling.java b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrolling.java index 2eadc33c85f..e044ab0ada7 100644 --- a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrolling.java +++ b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrolling.java @@ -71,6 +71,7 @@ import com.android.settings.core.instrumentation.InstrumentedDialogFragment; import com.android.settingslib.display.DisplayDensityUtils; import com.airbnb.lottie.LottieAnimationView; +import com.airbnb.lottie.LottieCompositionFactory; import com.airbnb.lottie.LottieProperty; import com.airbnb.lottie.model.KeyPath; import com.google.android.setupcompat.template.FooterBarMixin; @@ -668,9 +669,12 @@ public class FingerprintEnrollEnrolling extends BiometricsEnrollEnrolling { private void configureEnrollmentStage(CharSequence description, @RawRes int lottie) { setDescriptionText(description); - mIllustrationLottie.setAnimation(lottie); - mIllustrationLottie.setVisibility(View.VISIBLE); - mIllustrationLottie.playAnimation(); + LottieCompositionFactory.fromRawRes(this, lottie) + .addListener((c) -> { + mIllustrationLottie.setComposition(c); + mIllustrationLottie.setVisibility(View.VISIBLE); + mIllustrationLottie.playAnimation(); + }); } @EnrollStage From 90794305967e1a14ef8b0d4c0bbab02df406274a Mon Sep 17 00:00:00 2001 From: Bill Yi Date: Sun, 15 Jan 2023 19:17:23 -0800 Subject: [PATCH 2/7] Import translations. DO NOT MERGE ANYWHERE Auto-generated-cl: translation import Change-Id: I53a234d7805064773be4dc133dbb7d6c81ae7075 --- res/values-ko/arrays.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/res/values-ko/arrays.xml b/res/values-ko/arrays.xml index 13371c3a5f3..7f1e36da436 100644 --- a/res/values-ko/arrays.xml +++ b/res/values-ko/arrays.xml @@ -138,7 +138,7 @@ "나쁨" "매우 약함" - "양호" + "약함" "좋음" "우수함" From 5a0d63c5cd7f9a1d1a2c4916dc87ef91d80b7b11 Mon Sep 17 00:00:00 2001 From: Jason Chiu Date: Tue, 17 Jan 2023 17:16:56 +0800 Subject: [PATCH 3/7] Update the About device icon for tablet Fix: 252728840 Test: visual Change-Id: I5e772ef30be82da276bc0d7bf97c586992723365 --- .../ic_settings_about_device.xml | 25 +++++++++++++++++++ res/drawable/ic_homepage_about.xml | 2 +- ..._info.xml => ic_settings_about_device.xml} | 0 res/xml/top_level_settings.xml | 2 +- 4 files changed, 27 insertions(+), 2 deletions(-) create mode 100644 res/drawable-sw600dp/ic_settings_about_device.xml rename res/drawable/{ic_phone_info.xml => ic_settings_about_device.xml} (100%) diff --git a/res/drawable-sw600dp/ic_settings_about_device.xml b/res/drawable-sw600dp/ic_settings_about_device.xml new file mode 100644 index 00000000000..a7164823762 --- /dev/null +++ b/res/drawable-sw600dp/ic_settings_about_device.xml @@ -0,0 +1,25 @@ + + + + diff --git a/res/drawable/ic_homepage_about.xml b/res/drawable/ic_homepage_about.xml index ef2136eed8f..459ec934265 100644 --- a/res/drawable/ic_homepage_about.xml +++ b/res/drawable/ic_homepage_about.xml @@ -29,5 +29,5 @@ android:height="@dimen/dashboard_tile_foreground_image_size" android:start="@dimen/dashboard_tile_foreground_image_inset" android:top="@dimen/dashboard_tile_foreground_image_inset" - android:drawable="@drawable/ic_phone_info" /> + android:drawable="@drawable/ic_settings_about_device" /> diff --git a/res/drawable/ic_phone_info.xml b/res/drawable/ic_settings_about_device.xml similarity index 100% rename from res/drawable/ic_phone_info.xml rename to res/drawable/ic_settings_about_device.xml diff --git a/res/xml/top_level_settings.xml b/res/xml/top_level_settings.xml index 8c82b671688..d050a1f2747 100644 --- a/res/xml/top_level_settings.xml +++ b/res/xml/top_level_settings.xml @@ -196,7 +196,7 @@ Date: Sat, 14 Jan 2023 19:18:29 +0000 Subject: [PATCH 4/7] Set default value for performant auth. Test: Manually verified its default to enabled. Bug: 265264294 Change-Id: Ibbad0165f4ef396be70d3a566ca77597c2bcbb8e Merged-In: Ibbad0165f4ef396be70d3a566ca77597c2bcbb8e --- ...rprintSettingsRequireScreenOnToAuthPreferenceController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/com/android/settings/biometrics/fingerprint/FingerprintSettingsRequireScreenOnToAuthPreferenceController.java b/src/com/android/settings/biometrics/fingerprint/FingerprintSettingsRequireScreenOnToAuthPreferenceController.java index 65070833e09..52e6d135abc 100644 --- a/src/com/android/settings/biometrics/fingerprint/FingerprintSettingsRequireScreenOnToAuthPreferenceController.java +++ b/src/com/android/settings/biometrics/fingerprint/FingerprintSettingsRequireScreenOnToAuthPreferenceController.java @@ -58,7 +58,7 @@ public class FingerprintSettingsRequireScreenOnToAuthPreferenceController getUserHandle()); if (toReturn == -1) { toReturn = mContext.getResources().getBoolean( - com.android.internal.R.bool.config_requireScreenOnToAuthEnabled) ? 1 : 0; + com.android.internal.R.bool.config_performantAuthDefault) ? 1 : 0; Settings.Secure.putIntForUser(mContext.getContentResolver(), Settings.Secure.SFPS_PERFORMANT_AUTH_ENABLED, toReturn, getUserHandle()); } From 7a77d317715f90353a58531b2a9b9c444b9b70aa Mon Sep 17 00:00:00 2001 From: Julia Reynolds Date: Tue, 17 Jan 2023 14:10:10 -0500 Subject: [PATCH 5/7] Make strings generic for multiple form factors Test: view string in Settings Fixes: 244123498 Change-Id: I8cf4eebf1400dd9faecb1a96023c6f48bd4157ed --- res/values/strings.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/res/values/strings.xml b/res/values/strings.xml index 1dc49a48019..d061432a710 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -8967,7 +8967,7 @@ You won\u2019t see or hear notifications - Your phone won\u2019t show, vibrate or make sound for new or existing notifications. Keep in mind, critical notifications for phone activity and status will still appear.\n\nWhen you turn off Do Not Disturb, find missed notifications by swiping down from the top of your screen. + Your phone won\u2019t show, vibrate or make sound for new or existing notifications. Keep in mind, critical notifications for device activity and status will still appear.\n\nWhen you turn off Do Not Disturb, find missed notifications by swiping down from the top of your screen. Custom @@ -9017,7 +9017,7 @@ Sound, vibration, and visual signs of notifications - Notifications needed for basic phone activity and status will never be hidden. + Notifications needed for basic device activity and status will never be hidden. None From bc561ec2dc7f5e0f1615122929dcc8e7606d3515 Mon Sep 17 00:00:00 2001 From: Zoey Chen Date: Wed, 18 Jan 2023 07:06:28 +0000 Subject: [PATCH 6/7] [Settings] Do not show SIM if not supported Bug: 264510592 Test: manual Change-Id: Iaf250175361d86837a62330391c4b529639c3d9d --- res/xml/network_provider_internet.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/res/xml/network_provider_internet.xml b/res/xml/network_provider_internet.xml index 981afb3b3e6..f114dc6577f 100644 --- a/res/xml/network_provider_internet.xml +++ b/res/xml/network_provider_internet.xml @@ -52,7 +52,8 @@ settings:userRestriction="no_config_mobile_networks" settings:isPreferenceVisible="@bool/config_show_sim_info" settings:allowDividerAbove="true" - settings:useAdminDisabledSummary="true" /> + settings:useAdminDisabledSummary="true" + settings:searchable="@bool/config_show_sim_info"/> Date: Tue, 17 Jan 2023 20:45:16 +0000 Subject: [PATCH 7/7] No scrolling required to see find sensor animation Changed the string security_settings_sfps_enroll_find_sensor_message. Changed the layout of the animation. Test: Manually check the position of the animation Fixes: 265023019 Change-Id: Iae3100009e4430fbff7abc4bc3c1d4b9ffca6638 Merged-In: Iae3100009e4430fbff7abc4bc3c1d4b9ffca6638 --- res/layout/sfps_enroll_find_sensor_layout.xml | 3 ++- res/values/dimens.xml | 3 +++ res/values/strings.xml | 6 +++--- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/res/layout/sfps_enroll_find_sensor_layout.xml b/res/layout/sfps_enroll_find_sensor_layout.xml index f08986e113a..b8a656e5c3e 100644 --- a/res/layout/sfps_enroll_find_sensor_layout.xml +++ b/res/layout/sfps_enroll_find_sensor_layout.xml @@ -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"> 0dp 0dp 0dp + + + 0dp diff --git a/res/values/strings.xml b/res/values/strings.xml index 1dc49a48019..063e7c1f200 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -1213,11 +1213,11 @@ It\u2019s on the back of your phone. Use your index finger. - 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. + 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. - 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. + 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. - 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. + 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. The fingerprint sensor is on your screen. You\u2019ll capture your fingerprint on the next screen.