PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Determine if devices support screen off unlock from config" into main

Browse Source
This commit is contained in:
Vincent Wang
2025-01-21 17:38:15 -08:00
committed by Android (Google) Code Review
parent dd65609fd8 5ace2018cc
commit aa39f81625
2 changed files with 9 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/com/android/settings/biometrics/fingerprint/FingerprintSettings.java
View File

@@ -681,15 +681,10 @@ public class FingerprintSettings extends SubSettings {
return false; return false;
} }
private boolean isUltrasnoicUdfps() { private boolean isScreenOffUnlcokSupported() {
mFingerprintManager = Utils.getFingerprintManagerOrNull(getActivity()); if (isUdfps()) {
if (mFingerprintManager != null) { return getContext().getResources().getBoolean(
mSensorProperties = mFingerprintManager.getSensorPropertiesInternal(); com.android.internal.R.bool.config_screen_off_udfps_enabled);
for (FingerprintSensorPropertiesInternal prop : mSensorProperties) {
if (prop.isUltrasonicUdfps()) {
return true;
}
}
} }
return false; return false;
} }
@@ -736,7 +731,7 @@ public class FingerprintSettings extends SubSettings {
// This needs to be after setting ids, otherwise // This needs to be after setting ids, otherwise
// |mRequireScreenOnToAuthPreferenceController.isChecked| is always checking the primary // |mRequireScreenOnToAuthPreferenceController.isChecked| is always checking the primary
// user instead of the user with |mUserId|. // user instead of the user with |mUserId|.
if (isSfps() || (screenOffUnlockUdfps() && isUltrasnoicUdfps())) { if (isSfps() || (screenOffUnlockUdfps() && isScreenOffUnlcokSupported())) {
scrollToPreference(fpPrefKey); scrollToPreference(fpPrefKey);
addFingerprintUnlockCategory(); addFingerprintUnlockCategory();
} }
@@ -836,7 +831,7 @@ public class FingerprintSettings extends SubSettings {
restToUnlockPreference.getOnPreferenceChangeListener()); restToUnlockPreference.getOnPreferenceChangeListener());
} }
setupFingerprintUnlockCategoryPreferencesForScreenOnToAuth(); setupFingerprintUnlockCategoryPreferencesForScreenOnToAuth();
} else if (screenOffUnlockUdfps() && isUltrasnoicUdfps()) { } else if (screenOffUnlockUdfps() && isScreenOffUnlcokSupported()) {
setupFingerprintUnlockCategoryPreferencesForScreenOffUnlock(); setupFingerprintUnlockCategoryPreferencesForScreenOffUnlock();
} }
setupExtFingerprintPreferences(); setupExtFingerprintPreferences();
@@ -905,7 +900,7 @@ public class FingerprintSettings extends SubSettings {
private void updatePreferencesAfterFingerprintRemoved() { private void updatePreferencesAfterFingerprintRemoved() {
updateAddPreference(); updateAddPreference();
if (isSfps() || (screenOffUnlockUdfps() && isUltrasnoicUdfps())) { if (isSfps() || (screenOffUnlockUdfps() && isScreenOffUnlcokSupported())) {
updateFingerprintUnlockCategoryVisibility(); updateFingerprintUnlockCategoryVisibility();
} }
updatePreferences(); updatePreferences();
@@ -1181,7 +1176,7 @@ public class FingerprintSettings extends SubSettings {
} }
} }
} else if (screenOffUnlockUdfps() && isUltrasnoicUdfps()) { } else if (screenOffUnlockUdfps() && isScreenOffUnlcokSupported()) {
for (AbstractPreferenceController controller : controllers) { for (AbstractPreferenceController controller : controllers) {
if (controller.getPreferenceKey() == KEY_FINGERPRINT_UNLOCK_CATEGORY) { if (controller.getPreferenceKey() == KEY_FINGERPRINT_UNLOCK_CATEGORY) {
mFingerprintUnlockCategoryPreferenceController = mFingerprintUnlockCategoryPreferenceController =

2
src/com/android/settings/biometrics/fingerprint/FingerprintSettingsScreenOffUnlockUdfpsPreferenceController.java
View File

@@ -59,7 +59,7 @@ public class FingerprintSettingsScreenOffUnlockUdfpsPreferenceController
return false; return false;
} }
final boolean defEnabled = mContext.getResources().getBoolean( final boolean defEnabled = mContext.getResources().getBoolean(
com.android.internal.R.bool.config_screen_off_udfps_enabled); com.android.internal.R.bool.config_screen_off_udfps_default_on);
final int value = Settings.Secure.getIntForUser( final int value = Settings.Secure.getIntForUser(
mContext.getContentResolver(), mContext.getContentResolver(),
Settings.Secure.SCREEN_OFF_UNLOCK_UDFPS_ENABLED, Settings.Secure.SCREEN_OFF_UNLOCK_UDFPS_ENABLED,