Add display settings dashboard to new IA.
- Added a activity-alias pointing to displaySettings as top level
setting item.
- Refactored all preference logic in DisplaySettings into
PreferenceControllers. During fragment onAttach it installs all
controllers, and during onResume it updates preference state. Each
controller listens to its own preference change event.
Bug: 31800242
Test: RunSettingsRoboTests
Change-Id: Ibc9bf200c5acce7c4ae9292340822afee27a3a28
diff --git a/src/com/android/settings/DisplaySettings.java b/src/com/android/settings/DisplaySettings.java
index 0e680bc..2e8b926 100644
--- a/src/com/android/settings/DisplaySettings.java
+++ b/src/com/android/settings/DisplaySettings.java
@@ -17,435 +17,76 @@
package com.android.settings;
import android.app.Activity;
-import android.app.ActivityManager;
-import android.app.UiModeManager;
-import android.app.admin.DevicePolicyManager;
-import android.content.ContentResolver;
import android.content.Context;
-import android.content.pm.PackageManager;
-import android.content.res.Configuration;
-import android.content.res.Resources;
-import android.hardware.Sensor;
-import android.hardware.SensorManager;
-import android.os.Build;
-import android.os.Bundle;
-import android.os.SystemProperties;
-import android.os.UserHandle;
-import android.os.UserManager;
import android.provider.SearchIndexableResource;
import android.provider.Settings;
-import android.support.v14.preference.SwitchPreference;
-import android.support.v7.preference.DropDownPreference;
-import android.support.v7.preference.ListPreference;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.Preference.OnPreferenceChangeListener;
-import android.text.TextUtils;
-import android.util.Log;
-import com.android.internal.app.NightDisplayController;
import com.android.internal.logging.MetricsProto.MetricsEvent;
-import com.android.internal.view.RotationPolicy;
-import com.android.settings.accessibility.ToggleFontSizePreferenceFragment;
+import com.android.settings.core.PreferenceController;
+import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.dashboard.SummaryLoader;
+import com.android.settings.display.AutoBrightnessPreferenceController;
+import com.android.settings.display.AutoRotatePreferenceController;
+import com.android.settings.display.CameraGesturePreferenceController;
+import com.android.settings.display.DozePreferenceController;
+import com.android.settings.display.FontSizePreferenceController;
+import com.android.settings.display.LiftToWakePreferenceController;
+import com.android.settings.display.NightDisplayPreferenceController;
+import com.android.settings.display.NightModePreferenceController;
+import com.android.settings.display.ScreenSaverPreferenceController;
+import com.android.settings.display.TapToWakePreferenceController;
+import com.android.settings.display.TimeoutPreferenceController;
+import com.android.settings.display.VrDisplayPreferenceController;
+import com.android.settings.display.WallpaperPreferenceController;
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settings.search.Indexable;
-import com.android.settingslib.RestrictedLockUtils;
-import com.android.settingslib.RestrictedPreference;
+import com.android.settingslib.drawer.CategoryKey;
import java.util.ArrayList;
import java.util.List;
-import static android.provider.Settings.Secure.CAMERA_GESTURE_DISABLED;
-import static android.provider.Settings.Secure.DOUBLE_TAP_TO_WAKE;
-import static android.provider.Settings.Secure.DOZE_ENABLED;
-import static android.provider.Settings.Secure.WAKE_GESTURE_ENABLED;
-import static android.provider.Settings.System.SCREEN_BRIGHTNESS_MODE;
-import static android.provider.Settings.System.SCREEN_BRIGHTNESS_MODE_AUTOMATIC;
-import static android.provider.Settings.System.SCREEN_BRIGHTNESS_MODE_MANUAL;
import static android.provider.Settings.System.SCREEN_OFF_TIMEOUT;
-import static com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
-public class DisplaySettings extends SettingsPreferenceFragment implements
- Preference.OnPreferenceChangeListener, Indexable {
+public class DisplaySettings extends DashboardFragment {
private static final String TAG = "DisplaySettings";
- /** If there is no setting in the provider, use this. */
- private static final int FALLBACK_SCREEN_TIMEOUT_VALUE = 30000;
-
- private static final String KEY_SCREEN_TIMEOUT = "screen_timeout";
- private static final String KEY_FONT_SIZE = "font_size";
- private static final String KEY_SCREEN_SAVER = "screensaver";
- private static final String KEY_LIFT_TO_WAKE = "lift_to_wake";
- private static final String KEY_DOZE = "doze";
- private static final String KEY_TAP_TO_WAKE = "tap_to_wake";
- private static final String KEY_AUTO_BRIGHTNESS = "auto_brightness";
- private static final String KEY_AUTO_ROTATE = "auto_rotate";
- private static final String KEY_NIGHT_DISPLAY = "night_display";
- private static final String KEY_NIGHT_MODE = "night_mode";
- private static final String KEY_CAMERA_GESTURE = "camera_gesture";
- private static final String KEY_WALLPAPER = "wallpaper";
- private static final String KEY_VR_DISPLAY_PREF = "vr_display_pref";
-
- private Preference mFontSizePref;
-
- private TimeoutListPreference mScreenTimeoutPreference;
- private ListPreference mNightModePreference;
- private Preference mScreenSaverPreference;
- private SwitchPreference mLiftToWakePreference;
- private SwitchPreference mDozePreference;
- private SwitchPreference mTapToWakePreference;
- private SwitchPreference mAutoBrightnessPreference;
- private SwitchPreference mCameraGesturePreference;
-
@Override
public int getMetricsCategory() {
return MetricsEvent.DISPLAY;
}
@Override
- public void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- final Activity activity = getActivity();
- final ContentResolver resolver = activity.getContentResolver();
-
- addPreferencesFromResource(R.xml.display_settings);
-
- mScreenSaverPreference = findPreference(KEY_SCREEN_SAVER);
- if (mScreenSaverPreference != null
- && getResources().getBoolean(
- com.android.internal.R.bool.config_dreamsSupported) == false) {
- getPreferenceScreen().removePreference(mScreenSaverPreference);
- }
-
- mScreenTimeoutPreference = (TimeoutListPreference) findPreference(KEY_SCREEN_TIMEOUT);
-
- mFontSizePref = findPreference(KEY_FONT_SIZE);
-
- if (isAutomaticBrightnessAvailable(getResources())) {
- mAutoBrightnessPreference = (SwitchPreference) findPreference(KEY_AUTO_BRIGHTNESS);
- mAutoBrightnessPreference.setOnPreferenceChangeListener(this);
- } else {
- removePreference(KEY_AUTO_BRIGHTNESS);
- }
-
- if (!NightDisplayController.isAvailable(activity)) {
- removePreference(KEY_NIGHT_DISPLAY);
- }
-
- if (isLiftToWakeAvailable(activity)) {
- mLiftToWakePreference = (SwitchPreference) findPreference(KEY_LIFT_TO_WAKE);
- mLiftToWakePreference.setOnPreferenceChangeListener(this);
- } else {
- removePreference(KEY_LIFT_TO_WAKE);
- }
-
- if (isDozeAvailable(activity)) {
- mDozePreference = (SwitchPreference) findPreference(KEY_DOZE);
- mDozePreference.setOnPreferenceChangeListener(this);
- } else {
- removePreference(KEY_DOZE);
- }
-
- if (isTapToWakeAvailable(getResources())) {
- mTapToWakePreference = (SwitchPreference) findPreference(KEY_TAP_TO_WAKE);
- mTapToWakePreference.setOnPreferenceChangeListener(this);
- } else {
- removePreference(KEY_TAP_TO_WAKE);
- }
-
- if (isCameraGestureAvailable(getResources())) {
- mCameraGesturePreference = (SwitchPreference) findPreference(KEY_CAMERA_GESTURE);
- mCameraGesturePreference.setOnPreferenceChangeListener(this);
- } else {
- removePreference(KEY_CAMERA_GESTURE);
- }
-
- if (RotationPolicy.isRotationLockToggleVisible(activity)) {
- DropDownPreference rotatePreference =
- (DropDownPreference) findPreference(KEY_AUTO_ROTATE);
- int rotateLockedResourceId;
- // The following block sets the string used when rotation is locked.
- // If the device locks specifically to portrait or landscape (rather than current
- // rotation), then we use a different string to include this information.
- if (allowAllRotations(activity)) {
- rotateLockedResourceId = R.string.display_auto_rotate_stay_in_current;
- } else {
- if (RotationPolicy.getRotationLockOrientation(activity)
- == Configuration.ORIENTATION_PORTRAIT) {
- rotateLockedResourceId =
- R.string.display_auto_rotate_stay_in_portrait;
- } else {
- rotateLockedResourceId =
- R.string.display_auto_rotate_stay_in_landscape;
- }
- }
- rotatePreference.setEntries(new CharSequence[] {
- activity.getString(R.string.display_auto_rotate_rotate),
- activity.getString(rotateLockedResourceId),
- });
- rotatePreference.setEntryValues(new CharSequence[] { "0", "1" });
- rotatePreference.setValueIndex(RotationPolicy.isRotationLocked(activity) ?
- 1 : 0);
- rotatePreference.setOnPreferenceChangeListener(new OnPreferenceChangeListener() {
- @Override
- public boolean onPreferenceChange(Preference preference, Object newValue) {
- final boolean locked = Integer.parseInt((String) newValue) != 0;
- mMetricsFeatureProvider.action(getActivity(), MetricsEvent.ACTION_ROTATION_LOCK,
- locked);
- RotationPolicy.setRotationLock(activity, locked);
- return true;
- }
- });
- } else {
- removePreference(KEY_AUTO_ROTATE);
- }
-
- if (isVrDisplayModeAvailable(activity)) {
- DropDownPreference vrDisplayPref =
- (DropDownPreference) findPreference(KEY_VR_DISPLAY_PREF);
- vrDisplayPref.setEntries(new CharSequence[] {
- activity.getString(R.string.display_vr_pref_low_persistence),
- activity.getString(R.string.display_vr_pref_off),
- });
- vrDisplayPref.setEntryValues(new CharSequence[] { "0", "1" });
-
- final Context c = activity;
- int currentUser = ActivityManager.getCurrentUser();
- int current = Settings.Secure.getIntForUser(c.getContentResolver(),
- Settings.Secure.VR_DISPLAY_MODE,
- /*default*/Settings.Secure.VR_DISPLAY_MODE_LOW_PERSISTENCE,
- currentUser);
- vrDisplayPref.setValueIndex(current);
- vrDisplayPref.setOnPreferenceChangeListener(new OnPreferenceChangeListener() {
- @Override
- public boolean onPreferenceChange(Preference preference, Object newValue) {
- int i = Integer.parseInt((String) newValue);
- int u = ActivityManager.getCurrentUser();
- if (!Settings.Secure.putIntForUser(c.getContentResolver(),
- Settings.Secure.VR_DISPLAY_MODE,
- i, u)) {
- Log.e(TAG, "Could not change setting for " +
- Settings.Secure.VR_DISPLAY_MODE);
- }
- return true;
- }
- });
- } else {
- removePreference(KEY_VR_DISPLAY_PREF);
- }
-
- mNightModePreference = (ListPreference) findPreference(KEY_NIGHT_MODE);
- if (mNightModePreference != null) {
- final UiModeManager uiManager = (UiModeManager) getSystemService(
- Context.UI_MODE_SERVICE);
- final int currentNightMode = uiManager.getNightMode();
- mNightModePreference.setValue(String.valueOf(currentNightMode));
- mNightModePreference.setOnPreferenceChangeListener(this);
- }
- }
-
- private static boolean allowAllRotations(Context context) {
- return Resources.getSystem().getBoolean(
- com.android.internal.R.bool.config_allowAllRotations);
- }
-
- private static boolean isLiftToWakeAvailable(Context context) {
- SensorManager sensors = (SensorManager) context.getSystemService(Context.SENSOR_SERVICE);
- return sensors != null && sensors.getDefaultSensor(Sensor.TYPE_WAKE_GESTURE) != null;
- }
-
- private static boolean isDozeAvailable(Context context) {
- String name = Build.IS_DEBUGGABLE ? SystemProperties.get("debug.doze.component") : null;
- if (TextUtils.isEmpty(name)) {
- name = context.getResources().getString(
- com.android.internal.R.string.config_dozeComponent);
- }
- return !TextUtils.isEmpty(name);
- }
-
- private static boolean isTapToWakeAvailable(Resources res) {
- return res.getBoolean(com.android.internal.R.bool.config_supportDoubleTapWake);
- }
-
- private static boolean isAutomaticBrightnessAvailable(Resources res) {
- return res.getBoolean(com.android.internal.R.bool.config_automatic_brightness_available);
- }
-
- private static boolean isCameraGestureAvailable(Resources res) {
- boolean configSet = res.getInteger(
- com.android.internal.R.integer.config_cameraLaunchGestureSensorType) != -1;
- return configSet &&
- !SystemProperties.getBoolean("gesture.disable_camera_launch", false);
- }
-
- private static boolean isVrDisplayModeAvailable(Context context) {
- PackageManager pm = context.getPackageManager();
- return pm.hasSystemFeature(PackageManager.FEATURE_VR_MODE_HIGH_PERFORMANCE);
- }
-
- private void updateTimeoutPreferenceDescription(long currentTimeout) {
- TimeoutListPreference preference = mScreenTimeoutPreference;
- final CharSequence[] entries = preference.getEntries();
- final CharSequence[] values = preference.getEntryValues();
- String summary;
- if (preference.isDisabledByAdmin()) {
- summary = getString(R.string.disabled_by_policy_title);
- } else {
- CharSequence timeoutDescription = getTimeoutDescription(
- currentTimeout, entries, values);
- summary = timeoutDescription == null ? ""
- : getString(R.string.screen_timeout_summary, timeoutDescription);
- }
- preference.setSummary(summary);
- }
-
- private static CharSequence getTimeoutDescription(
- long currentTimeout, CharSequence[] entries, CharSequence[] values) {
- if (currentTimeout < 0 || entries == null || values == null
- || values.length != entries.length) {
- return null;
- }
-
- for (int i = 0; i < values.length; i++) {
- long timeout = Long.parseLong(values[i].toString());
- if (currentTimeout == timeout) {
- return entries[i];
- }
- }
- return null;
+ protected String getLogTag() {
+ return TAG;
}
@Override
- public void onResume() {
- super.onResume();
- updateState();
-
- final long currentTimeout = Settings.System.getLong(getActivity().getContentResolver(),
- SCREEN_OFF_TIMEOUT, FALLBACK_SCREEN_TIMEOUT_VALUE);
- mScreenTimeoutPreference.setValue(String.valueOf(currentTimeout));
- mScreenTimeoutPreference.setOnPreferenceChangeListener(this);
- final DevicePolicyManager dpm = (DevicePolicyManager) getActivity().getSystemService(
- Context.DEVICE_POLICY_SERVICE);
- if (dpm != null) {
- final EnforcedAdmin admin = RestrictedLockUtils.checkIfMaximumTimeToLockIsSet(
- getActivity());
- final long maxTimeout = dpm
- .getMaximumTimeToLockForUserAndProfiles(UserHandle.myUserId());
- mScreenTimeoutPreference.removeUnusableTimeouts(maxTimeout, admin);
- }
- updateTimeoutPreferenceDescription(currentTimeout);
-
- disablePreferenceIfManaged(KEY_WALLPAPER, UserManager.DISALLOW_SET_WALLPAPER);
- }
-
- private void updateState() {
- updateFontSizeSummary();
- updateScreenSaverSummary();
-
- // Update auto brightness if it is available.
- if (mAutoBrightnessPreference != null) {
- int brightnessMode = Settings.System.getInt(getContentResolver(),
- SCREEN_BRIGHTNESS_MODE, SCREEN_BRIGHTNESS_MODE_MANUAL);
- mAutoBrightnessPreference.setChecked(brightnessMode != SCREEN_BRIGHTNESS_MODE_MANUAL);
- }
-
- // Update lift-to-wake if it is available.
- if (mLiftToWakePreference != null) {
- int value = Settings.Secure.getInt(getContentResolver(), WAKE_GESTURE_ENABLED, 0);
- mLiftToWakePreference.setChecked(value != 0);
- }
-
- // Update tap to wake if it is available.
- if (mTapToWakePreference != null) {
- int value = Settings.Secure.getInt(getContentResolver(), DOUBLE_TAP_TO_WAKE, 0);
- mTapToWakePreference.setChecked(value != 0);
- }
-
- // Update doze if it is available.
- if (mDozePreference != null) {
- int value = Settings.Secure.getInt(getContentResolver(), DOZE_ENABLED, 1);
- mDozePreference.setChecked(value != 0);
- }
-
- // Update camera gesture #1 if it is available.
- if (mCameraGesturePreference != null) {
- int value = Settings.Secure.getInt(getContentResolver(), CAMERA_GESTURE_DISABLED, 0);
- mCameraGesturePreference.setChecked(value == 0);
- }
- }
-
- private void updateScreenSaverSummary() {
- if (mScreenSaverPreference != null) {
- mScreenSaverPreference.setSummary(
- DreamSettings.getSummaryTextWithDreamName(getActivity()));
- }
- }
-
- private void updateFontSizeSummary() {
- final Context context = mFontSizePref.getContext();
- final float currentScale = Settings.System.getFloat(context.getContentResolver(),
- Settings.System.FONT_SCALE, 1.0f);
- final Resources res = context.getResources();
- final String[] entries = res.getStringArray(R.array.entries_font_size);
- final String[] strEntryValues = res.getStringArray(R.array.entryvalues_font_size);
- final int index = ToggleFontSizePreferenceFragment.fontSizeValueToIndex(currentScale,
- strEntryValues);
- mFontSizePref.setSummary(entries[index]);
+ protected String getCategoryKey() {
+ return CategoryKey.CATEGORY_DISPLAY;
}
@Override
- public boolean onPreferenceChange(Preference preference, Object objValue) {
- final String key = preference.getKey();
- if (KEY_SCREEN_TIMEOUT.equals(key)) {
- try {
- int value = Integer.parseInt((String) objValue);
- Settings.System.putInt(getContentResolver(), SCREEN_OFF_TIMEOUT, value);
- updateTimeoutPreferenceDescription(value);
- } catch (NumberFormatException e) {
- Log.e(TAG, "could not persist screen timeout setting", e);
- }
- }
- if (preference == mAutoBrightnessPreference) {
- boolean auto = (Boolean) objValue;
- Settings.System.putInt(getContentResolver(), SCREEN_BRIGHTNESS_MODE,
- auto ? SCREEN_BRIGHTNESS_MODE_AUTOMATIC : SCREEN_BRIGHTNESS_MODE_MANUAL);
- }
- if (preference == mLiftToWakePreference) {
- boolean value = (Boolean) objValue;
- Settings.Secure.putInt(getContentResolver(), WAKE_GESTURE_ENABLED, value ? 1 : 0);
- }
- if (preference == mDozePreference) {
- boolean value = (Boolean) objValue;
- Settings.Secure.putInt(getContentResolver(), DOZE_ENABLED, value ? 1 : 0);
- }
- if (preference == mTapToWakePreference) {
- boolean value = (Boolean) objValue;
- Settings.Secure.putInt(getContentResolver(), DOUBLE_TAP_TO_WAKE, value ? 1 : 0);
- }
- if (preference == mCameraGesturePreference) {
- boolean value = (Boolean) objValue;
- Settings.Secure.putInt(getContentResolver(), CAMERA_GESTURE_DISABLED,
- value ? 0 : 1 /* Backwards because setting is for disabling */);
- }
- if (preference == mNightModePreference) {
- try {
- final int value = Integer.parseInt((String) objValue);
- final UiModeManager uiManager = (UiModeManager) getSystemService(
- Context.UI_MODE_SERVICE);
- uiManager.setNightMode(value);
- } catch (NumberFormatException e) {
- Log.e(TAG, "could not persist night mode setting", e);
- }
- }
- return true;
+ protected int getPreferenceScreenResId() {
+ return R.xml.display_settings;
}
@Override
- public boolean onPreferenceTreeClick(Preference preference) {
- if (preference == mDozePreference) {
- mMetricsFeatureProvider.action(getActivity(), MetricsEvent.ACTION_AMBIENT_DISPLAY);
- }
- return super.onPreferenceTreeClick(preference);
+ protected List<PreferenceController> getPreferenceControllers(Context context) {
+ final List<PreferenceController> controllers = new ArrayList<>();
+ controllers.add(new AutoBrightnessPreferenceController(context));
+ controllers.add(new AutoRotatePreferenceController(context));
+ controllers.add(new CameraGesturePreferenceController(context));
+ controllers.add(new DozePreferenceController(context));
+ controllers.add(new FontSizePreferenceController(context));
+ controllers.add(new LiftToWakePreferenceController(context));
+ controllers.add(new NightDisplayPreferenceController(context));
+ controllers.add(new NightModePreferenceController(context));
+ controllers.add(new ScreenSaverPreferenceController(context));
+ controllers.add(new TapToWakePreferenceController(context));
+ controllers.add(new TimeoutPreferenceController(context));
+ controllers.add(new VrDisplayPreferenceController(context));
+ controllers.add(new WallpaperPreferenceController(context));
+ return controllers;
}
@Override
@@ -453,19 +94,6 @@
return R.string.help_uri_display;
}
- private void disablePreferenceIfManaged(String key, String restriction) {
- final RestrictedPreference pref = (RestrictedPreference) findPreference(key);
- if (pref != null) {
- pref.setDisabledByAdmin(null);
- if (RestrictedLockUtils.hasBaseUserRestriction(getActivity(), restriction,
- UserHandle.myUserId())) {
- pref.setEnabled(false);
- } else {
- pref.checkRestrictionAndSetDisabled(restriction);
- }
- }
- }
-
private static class SummaryProvider implements SummaryLoader.SummaryProvider {
private final Context mContext;
private final SummaryLoader mLoader;
@@ -484,13 +112,13 @@
private void updateSummary() {
final long currentTimeout = Settings.System.getLong(mContext.getContentResolver(),
- SCREEN_OFF_TIMEOUT, FALLBACK_SCREEN_TIMEOUT_VALUE);
+ SCREEN_OFF_TIMEOUT, TimeoutPreferenceController.FALLBACK_SCREEN_TIMEOUT_VALUE);
final CharSequence[] entries =
mContext.getResources().getTextArray(R.array.screen_timeout_entries);
final CharSequence[] values =
mContext.getResources().getTextArray(R.array.screen_timeout_values);
- final CharSequence timeoutDescription = getTimeoutDescription(
- currentTimeout, entries, values);
+ final CharSequence timeoutDescription = TimeoutPreferenceController
+ .getTimeoutDescription(currentTimeout, entries, values);
final String summary = timeoutDescription == null ? ""
: mContext.getString(R.string.display_summary, timeoutDescription);
mLoader.setSummary(this, summary);
@@ -501,7 +129,7 @@
= new SummaryLoader.SummaryProviderFactory() {
@Override
public SummaryLoader.SummaryProvider createSummaryProvider(Activity activity,
- SummaryLoader summaryLoader) {
+ SummaryLoader summaryLoader) {
return new SummaryProvider(activity, summaryLoader);
}
};
@@ -511,8 +139,7 @@
@Override
public List<SearchIndexableResource> getXmlResourcesToIndex(Context context,
boolean enabled) {
- ArrayList<SearchIndexableResource> result =
- new ArrayList<SearchIndexableResource>();
+ ArrayList<SearchIndexableResource> result = new ArrayList<>();
SearchIndexableResource sir = new SearchIndexableResource(context);
sir.xmlResId = R.xml.display_settings;
@@ -523,35 +150,22 @@
@Override
public List<String> getNonIndexableKeys(Context context) {
- ArrayList<String> result = new ArrayList<String>();
- if (!context.getResources().getBoolean(
- com.android.internal.R.bool.config_dreamsSupported)) {
- result.add(KEY_SCREEN_SAVER);
- }
- if (!isAutomaticBrightnessAvailable(context.getResources())) {
- result.add(KEY_AUTO_BRIGHTNESS);
- }
- if (!NightDisplayController.isAvailable(context)) {
- result.add(KEY_NIGHT_DISPLAY);
- }
- if (!isLiftToWakeAvailable(context)) {
- result.add(KEY_LIFT_TO_WAKE);
- }
- if (!isDozeAvailable(context)) {
- result.add(KEY_DOZE);
- }
- if (!RotationPolicy.isRotationLockToggleVisible(context)) {
- result.add(KEY_AUTO_ROTATE);
- }
- if (!isTapToWakeAvailable(context.getResources())) {
- result.add(KEY_TAP_TO_WAKE);
- }
- if (!isCameraGestureAvailable(context.getResources())) {
- result.add(KEY_CAMERA_GESTURE);
- }
- if (!isVrDisplayModeAvailable(context)) {
- result.add(KEY_VR_DISPLAY_PREF);
- }
+ ArrayList<String> result = new ArrayList<>();
+
+ new AutoBrightnessPreferenceController(context).updateNonIndexableKeys(result);
+ new AutoRotatePreferenceController(context).updateNonIndexableKeys(result);
+ new CameraGesturePreferenceController(context).updateNonIndexableKeys(result);
+ new DozePreferenceController(context).updateNonIndexableKeys(result);
+ new FontSizePreferenceController(context).updateNonIndexableKeys(result);
+ new LiftToWakePreferenceController(context).updateNonIndexableKeys(result);
+ new NightDisplayPreferenceController(context).updateNonIndexableKeys(result);
+ new NightModePreferenceController(context).updateNonIndexableKeys(result);
+ new ScreenSaverPreferenceController(context).updateNonIndexableKeys(result);
+ new TapToWakePreferenceController(context).updateNonIndexableKeys(result);
+ new TimeoutPreferenceController(context).updateNonIndexableKeys(result);
+ new VrDisplayPreferenceController(context).updateNonIndexableKeys(result);
+ new WallpaperPreferenceController(context).updateNonIndexableKeys(result);
+
return result;
}
};