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

Merge "Remove sliceable attribute from biometric preference controllers." into sc-dev am: c7a0b63dd9

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

Change-Id: Ifd9ebd5877ce8020c0c977db8f6744c03ca24c70
This commit is contained in:
Joe Bolinger
2021-09-01 01:26:40 +00:00
committed by Automerger Merge Worker
parent 736bce563e c7a0b63dd9
commit bc188f609c
10 changed files with 247 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/com/android/settings/biometrics/combination/BiometricSettingsAppPreferenceController.java
View File

@@ -86,4 +86,9 @@ public class BiometricSettingsAppPreferenceController extends TogglePreferenceCo
return AVAILABLE_UNSEARCHABLE;
}
}
@Override
public final boolean isSliceable() {
return false;
}
}

5
src/com/android/settings/biometrics/combination/BiometricSettingsKeyguardPreferenceController.java
View File

@@ -68,4 +68,9 @@ public class BiometricSettingsKeyguardPreferenceController extends TogglePrefere
}
return getRestrictingAdmin() != null ? DISABLED_FOR_USER : AVAILABLE;
}
@Override
public final boolean isSliceable() {
return false;
}
}

8
src/com/android/settings/biometrics/face/FaceSettings.java
View File

@@ -44,7 +44,6 @@ import com.android.settings.overlay.FeatureFactory;
import com.android.settings.password.ChooseLockSettingsHelper;
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settingslib.core.AbstractPreferenceController;
import com.android.settingslib.core.lifecycle.Lifecycle;
import com.android.settingslib.search.SearchIndexable;
import java.util.ArrayList;
@@ -290,7 +289,7 @@ public class FaceSettings extends DashboardFragment {
if (!isFaceHardwareDetected(context)) {
return null;
}
mControllers = buildPreferenceControllers(context, getSettingsLifecycle());
mControllers = buildPreferenceControllers(context);
// There's no great way of doing this right now :/
for (AbstractPreferenceController controller : mControllers) {
if (controller instanceof FaceSettingsAttentionPreferenceController) {
@@ -309,8 +308,7 @@ public class FaceSettings extends DashboardFragment {
return mControllers;
}
private static List<AbstractPreferenceController> buildPreferenceControllers(Context context,
Lifecycle lifecycle) {
private static List<AbstractPreferenceController> buildPreferenceControllers(Context context) {
final List<AbstractPreferenceController> controllers = new ArrayList<>();
controllers.add(new FaceSettingsKeyguardPreferenceController(context));
controllers.add(new FaceSettingsAppPreferenceController(context));
@@ -328,7 +326,7 @@ public class FaceSettings extends DashboardFragment {
public List<AbstractPreferenceController> createPreferenceControllers(
Context context) {
if (isFaceHardwareDetected(context)) {
return buildPreferenceControllers(context, null /* lifecycle */);
return buildPreferenceControllers(context);
} else {
return null;
}

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

@@ -116,11 +116,6 @@ public class FaceSettingsAttentionPreferenceController extends FaceSettingsPrefe
return true;
}
@Override
public boolean isSliceable() {
return false;
}
@Override
public int getAvailabilityStatus() {
return AVAILABLE;

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

@@ -46,4 +46,9 @@ public abstract class FaceSettingsPreferenceController extends TogglePreferenceC
return RestrictedLockUtilsInternal.checkIfKeyguardFeaturesDisabled(
mContext, DevicePolicyManager.KEYGUARD_DISABLE_FACE, mUserId);
}
@Override
public final boolean isSliceable() {
return false;
}
}