In Private space settings when no face support show only fingerprint unlock
This contains fix for PS biometrics issue in Pixel devices without face hardware support. In private space separate lock settings page - without face support only fingerprint unlock controller is shown - with face support controller for both face and fingerprint is shown. Screenshot: -Without Face support go/ss/qhDqdyqYLCTYaJq.png go/ss/4Jw54XKJPNYm4R6.png go/ss/5LPjRQ76cVPZy7j.png -if without Fingerprint go/ss/ACGqKU7j24G3Q9Q.png -With Face support go/ss/7jV385WCFsXajZM.png go/ss/ZrGTdiYUN5MFY3r.png go/ss/6QNKqaFuZvuMJZ9.png go/ss/9ZcSvXULHuPK2ps.png go/ss/7GfABcYE4h8BkCo.png Bug: 319794904 Test: Manual Change-Id: I053e8584d036ca0d6e3d8157d0fdef6d465492aa
This commit is contained in:
@@ -24,6 +24,7 @@ import android.os.Bundle;
|
||||
import androidx.annotation.Nullable;
|
||||
|
||||
import com.android.settings.R;
|
||||
import com.android.settings.Utils;
|
||||
import com.android.settings.dashboard.DashboardFragment;
|
||||
import com.android.settings.privatespace.PrivateSpaceMaintainer;
|
||||
import com.android.settingslib.core.AbstractPreferenceController;
|
||||
@@ -71,7 +72,17 @@ public class UseOneLockSettingsFragment extends DashboardFragment {
|
||||
final List<AbstractPreferenceController> controllers = new ArrayList<>();
|
||||
controllers.add(new UseOneLockControllerSwitch(context, this));
|
||||
controllers.add(new PrivateSpaceLockController(context, this));
|
||||
controllers.add(new FaceFingerprintUnlockController(context, getSettingsLifecycle()));
|
||||
if (Utils.isMultipleBiometricsSupported(context)) {
|
||||
controllers.add(new FaceFingerprintUnlockController(context, getSettingsLifecycle()));
|
||||
} else if (Utils.hasFingerprintHardware(context)) {
|
||||
controllers.add(
|
||||
new PrivateSpaceFingerprintPreferenceController(
|
||||
context, "private_space_biometrics", getSettingsLifecycle()));
|
||||
} else if (Utils.hasFaceHardware(context)) {
|
||||
controllers.add(
|
||||
new PrivateSpaceFacePreferenceController(
|
||||
context, "private_space_biometrics", getSettingsLifecycle()));
|
||||
}
|
||||
return controllers;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user