From 85081a4f7e1fe31fac4d0be313521a98c359d204 Mon Sep 17 00:00:00 2001 From: joshmccloskey Date: Tue, 9 Jul 2019 15:23:37 -0700 Subject: [PATCH 1/2] Remove highlighting for work profile Test: Manual. Fixes: 137126517 Change-Id: Iefcbf498cc0805cd130981e522177a7c16b7adfc --- .../face/FaceProfileStatusPreferenceController.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/com/android/settings/biometrics/face/FaceProfileStatusPreferenceController.java b/src/com/android/settings/biometrics/face/FaceProfileStatusPreferenceController.java index 18138d571dd..5015fba439e 100644 --- a/src/com/android/settings/biometrics/face/FaceProfileStatusPreferenceController.java +++ b/src/com/android/settings/biometrics/face/FaceProfileStatusPreferenceController.java @@ -31,6 +31,13 @@ public class FaceProfileStatusPreferenceController extends FaceStatusPreferenceC super(context, KEY_FACE_SETTINGS); } + @Override + public int getAvailabilityStatus() { + // Make the profile unsearchable so the user preference controller gets highlighted + // when searched for. + return AVAILABLE_UNSEARCHABLE; + } + @Override protected boolean isUserSupported() { return mProfileChallengeUserId != UserHandle.USER_NULL From 8bbbe545f2595505ff354f89e5b5468ebeb3308b Mon Sep 17 00:00:00 2001 From: joshmccloskey Date: Tue, 9 Jul 2019 15:28:05 -0700 Subject: [PATCH 2/2] Favor setup face in search settings. Test: Manual. Fixes: 137135217 Change-Id: I5e0a72a117e2af6d9262d07616cc539ee7a7e55e --- .../face/FaceSettingsAppPreferenceController.java | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/src/com/android/settings/biometrics/face/FaceSettingsAppPreferenceController.java b/src/com/android/settings/biometrics/face/FaceSettingsAppPreferenceController.java index 70c00e54d28..a54171e8c42 100644 --- a/src/com/android/settings/biometrics/face/FaceSettingsAppPreferenceController.java +++ b/src/com/android/settings/biometrics/face/FaceSettingsAppPreferenceController.java @@ -78,6 +78,19 @@ public class FaceSettingsAppPreferenceController extends FaceSettingsPreferenceC @Override public int getAvailabilityStatus() { - return AVAILABLE; + if(mFaceManager == null){ + return AVAILABLE_UNSEARCHABLE; + } + + // By only allowing this preference controller to be searchable when the feature is turned + // off, it will give preference to the face setup controller. + final boolean hasEnrolledUser = mFaceManager.hasEnrolledTemplates(getUserId()); + final boolean appUnlockEnabled = Settings.Secure.getIntForUser( + mContext.getContentResolver(), FACE_UNLOCK_APP_ENABLED, OFF, getUserId()) == ON; + if (hasEnrolledUser && !appUnlockEnabled) { + return AVAILABLE; + } else { + return AVAILABLE_UNSEARCHABLE; + } } }