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

Merge "Update settings together with framework changes"

Browse Source
This commit is contained in:
TreeHugger Robot
2018-12-12 20:07:39 +00:00
committed by Android (Google) Code Review
parent eac550c0ca 6bafa1d830
commit 0178e1f277
2 changed files with 4 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/com/android/settings/biometrics/face/FaceEnrollSidecar.java
View File

@@ -43,8 +43,9 @@ public class FaceEnrollSidecar extends BiometricEnrollSidecar {
if (mUserId != UserHandle.USER_NULL) { if (mUserId != UserHandle.USER_NULL) {
mFaceManager.setActiveUser(mUserId); mFaceManager.setActiveUser(mUserId);
} }
// TODO: Send the list of disabled features
mFaceManager.enroll(mToken, mEnrollmentCancel, mFaceManager.enroll(mToken, mEnrollmentCancel,
0 /* flags */, mUserId, mEnrollmentCallback); mEnrollmentCallback, new int[0] /* disabledFeatures */);
} }
private FaceManager.EnrollmentCallback mEnrollmentCallback private FaceManager.EnrollmentCallback mEnrollmentCallback

10
src/com/android/settings/biometrics/face/FaceSettingsAttentionPreferenceController.java
View File

@@ -48,7 +48,6 @@ public class FaceSettingsAttentionPreferenceController extends TogglePreferenceC
public void setToken(byte[] token) { public void setToken(byte[] token) {
mToken = token; mToken = token;
mPreference.setChecked(mFaceManager.getRequireAttention(mToken));
} }
/** /**
@@ -64,18 +63,13 @@ public class FaceSettingsAttentionPreferenceController extends TogglePreferenceC
public boolean isChecked() { public boolean isChecked() {
if (!FaceSettings.isAvailable(mContext)) { if (!FaceSettings.isAvailable(mContext)) {
return true; return true;
} else if (mToken == null) {
// The token will be null when the controller is first created, since CC has not been
// completed by the user. Once it's completed, FaceSettings will use setToken which
// will retrieve the correct value from FaceService
return true;
} }
return mFaceManager.getRequireAttention(mToken); return mFaceManager.getFeature(FaceManager.FEATURE_REQUIRE_ATTENTION);
} }
@Override @Override
public boolean setChecked(boolean isChecked) { public boolean setChecked(boolean isChecked) {
mFaceManager.setRequireAttention(isChecked, mToken); mFaceManager.setFeature(FaceManager.FEATURE_REQUIRE_ATTENTION, isChecked, mToken);
return true; return true;
} }