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

Update Security & location preference summary depending on biometrics

Browse Source 
Fixes: 110960063

Test: manual
Test: make -j56 SettingsRoboTests ROBOTEST_FILTER=SecuritySettingsTest
Change-Id: Ia9186af37c84f4ff0391d1b72043948934ed997b
This commit is contained in:
Kevin Chyn
2018-07-23 18:05:59 -07:00
parent 4fb1e1a633
commit eb0de79ffc
3 changed files with 59 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/com/android/settings/security/SecuritySettings.java
View File

@@ -21,6 +21,7 @@ import static com.android.settings.security.EncryptionStatusPreferenceController
import android.app.Activity;
import android.content.Context;
import android.content.Intent;
import android.hardware.face.FaceManager;
import android.hardware.fingerprint.FingerprintManager;
import android.provider.SearchIndexableResource;
@@ -181,7 +182,12 @@ public class SecuritySettings extends DashboardFragment {
if (listening) {
final FingerprintManager fpm =
Utils.getFingerprintManagerOrNull(mContext);
if (fpm != null && fpm.isHardwareDetected()) {
final FaceManager faceManager =
Utils.getFaceManagerOrNull(mContext);
if (faceManager != null && faceManager.isHardwareDetected()) {
mSummaryLoader.setSummary(this,
mContext.getString(R.string.security_dashboard_summary_face));
} else if (fpm != null && fpm.isHardwareDetected()) {
mSummaryLoader.setSummary(this,
mContext.getString(R.string.security_dashboard_summary));
} else {