Migrate system settings page to PreferenceController and SettingsFragment.
Because ExtraSettingsLoader was migrated but this fragment was not, loading extra settings was no longer working on this page and blocking other development.
Bug: 112931076
Test: build and deploy, RunCarSettingsRoboTests
Change-Id: Ida9824cf189a3ecb25e2669401b0ad853fb9df28
diff --git a/src/com/android/car/settings/system/DeveloperOptionsEntryPreferenceController.java b/src/com/android/car/settings/system/DeveloperOptionsEntryPreferenceController.java
index 7cf27f8..9b2b22b 100644
--- a/src/com/android/car/settings/system/DeveloperOptionsEntryPreferenceController.java
+++ b/src/com/android/car/settings/system/DeveloperOptionsEntryPreferenceController.java
@@ -16,28 +16,35 @@
package com.android.car.settings.system;
+import android.car.drivingstate.CarUxRestrictions;
import android.car.userlib.CarUserManagerHelper;
import android.content.Context;
+import androidx.preference.Preference;
+
import com.android.car.settings.common.FragmentController;
-import com.android.car.settings.common.NoSetupPreferenceController;
+import com.android.car.settings.common.PreferenceController;
import com.android.car.settings.development.DevelopmentSettingsUtil;
/** Controls the visibility of the developer options setting. */
-public class DeveloperOptionsEntryPreferenceController extends NoSetupPreferenceController {
+public class DeveloperOptionsEntryPreferenceController extends PreferenceController<Preference> {
private CarUserManagerHelper mCarUserManagerHelper;
- public DeveloperOptionsEntryPreferenceController(Context context,
- String preferenceKey,
- FragmentController fragmentController) {
- super(context, preferenceKey, fragmentController);
- mCarUserManagerHelper = new CarUserManagerHelper(mContext);
+ public DeveloperOptionsEntryPreferenceController(Context context, String preferenceKey,
+ FragmentController fragmentController, CarUxRestrictions uxRestrictions) {
+ super(context, preferenceKey, fragmentController, uxRestrictions);
+ mCarUserManagerHelper = new CarUserManagerHelper(context);
}
@Override
- public int getAvailabilityStatus() {
- return DevelopmentSettingsUtil.isDevelopmentSettingsEnabled(mContext, mCarUserManagerHelper)
- ? AVAILABLE : CONDITIONALLY_UNAVAILABLE;
+ protected Class<Preference> getPreferenceType() {
+ return Preference.class;
+ }
+
+ @Override
+ protected int getAvailabilityStatus() {
+ return DevelopmentSettingsUtil.isDevelopmentSettingsEnabled(getContext(),
+ mCarUserManagerHelper) ? AVAILABLE : CONDITIONALLY_UNAVAILABLE;
}
}