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

Merge "SecuritySettings test" into tm-qpr-dev am: 73e4742941

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19672131

Change-Id: I9bd7d32f1ada80c9bf6456905a8be6fbe1b1d4e1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Diya Bera
2022-08-31 18:56:36 +00:00
committed by Automerger Merge Worker
parent 641e7bc1cd 73e4742941
commit c18579f168
5 changed files with 228 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/com/android/settings/biometrics/combination/CombinedBiometricStatusPreferenceController.java
View File

@@ -35,7 +35,7 @@ import com.android.settingslib.RestrictedPreference;
*/
public class CombinedBiometricStatusPreferenceController extends
BiometricStatusPreferenceController implements LifecycleObserver {
private static final String KEY_BIOMETRIC_SETTINGS = "biometric_settings";
public static final String KEY_BIOMETRIC_SETTINGS = "biometric_settings";
@VisibleForTesting
RestrictedPreference mPreference;
@@ -122,4 +122,8 @@ public class CombinedBiometricStatusPreferenceController extends
protected String getSettingsClassName() {
return mCombinedBiometricStatusUtils.getSettingsClassName();
}
public void setPreferenceScreen(PreferenceScreen preferenceScreen) {
mPreferenceScreen = preferenceScreen;
}
}

5
src/com/android/settings/biometrics/face/FaceStatusPreferenceController.java
View File

@@ -38,6 +38,7 @@ public class FaceStatusPreferenceController extends BiometricStatusPreferenceCon
public static final String KEY_FACE_SETTINGS = "face_settings";
protected final FaceManager mFaceManager;
@VisibleForTesting
RestrictedPreference mPreference;
private PreferenceScreen mPreferenceScreen;
@@ -111,4 +112,8 @@ public class FaceStatusPreferenceController extends BiometricStatusPreferenceCon
protected String getSettingsClassName() {
return mFaceStatusUtils.getSettingsClassName();
}
public void setPreferenceScreen(PreferenceScreen preferenceScreen) {
mPreferenceScreen = preferenceScreen;
}
}

6
src/com/android/settings/biometrics/fingerprint/FingerprintStatusPreferenceController.java
View File

@@ -35,7 +35,7 @@ import com.android.settingslib.RestrictedPreference;
public class FingerprintStatusPreferenceController extends BiometricStatusPreferenceController
implements LifecycleObserver {
private static final String KEY_FINGERPRINT_SETTINGS = "fingerprint_settings";
public static final String KEY_FINGERPRINT_SETTINGS = "fingerprint_settings";
protected final FingerprintManager mFingerprintManager;
@VisibleForTesting
@@ -112,4 +112,8 @@ public class FingerprintStatusPreferenceController extends BiometricStatusPrefer
mPreference.setDisabledByAdmin(enforcedAdmin);
}
}
public void setPreferenceScreen(PreferenceScreen preferenceScreen) {
mPreferenceScreen = preferenceScreen;
}
}

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

@@ -40,7 +40,7 @@ import java.util.List;
public class SecuritySettings extends DashboardFragment {
private static final String TAG = "SecuritySettings";
private static final String SECURITY_CATEGORY = "security_category";
protected static final String SECURITY_CATEGORY = "security_category";
public static final int CHANGE_TRUST_AGENT_SETTINGS = 126;
public static final int UNIFY_LOCK_CONFIRM_PROFILE_REQUEST = 129;
@@ -132,4 +132,9 @@ public class SecuritySettings extends DashboardFragment {
&& !SafetyCenterManagerWrapper.get().isEnabled(context);
}
};
@Override
public Lifecycle getSettingsLifecycle() {
return super.getSettingsLifecycle();
}
}