From aed8994f6f50a6bc0adfaa92b499ebde3a8f2a76 Mon Sep 17 00:00:00 2001 From: Fan Zhang Date: Thu, 22 Feb 2018 13:32:32 -0800 Subject: [PATCH] Rename Indexable::getAllPreferenceControllers. To getPreferenceControllers. "all" is redundant. Then internally, the old getPreferenceControllers() is renamed to createPreferenceControllers() to emphasize the controllers are created from code (versus the ones created from xml). Bug: 73668763 Test: robotest Change-Id: Ifec46aefdc2a418031c8e152028b30bdcd396fc7 --- src/com/android/settings/DisplaySettings.java | 3 ++- .../accessibility/VibrationSettings.java | 2 +- .../AppAndNotificationDashboardFragment.java | 2 +- .../applications/DefaultAppSettings.java | 2 +- .../applications/SpecialAccessSettings.java | 2 +- .../applications/assist/ManageAssist.java | 2 +- ...ancedConnectedDeviceDashboardFragment.java | 3 +-- .../usb/UsbDetailsFragment.java | 2 +- .../AutomaticStorageManagerSettings.java | 2 +- .../DevelopmentSettingsDashboardFragment.java | 2 +- .../deviceinfo/DeviceInfoSettings.java | 2 +- .../deviceinfo/StorageDashboardFragment.java | 12 ++++++---- .../aboutphone/MyDeviceInfoFragment.java | 2 +- .../display/AmbientDisplaySettings.java | 3 ++- .../android/settings/dream/DreamSettings.java | 24 +++++++++---------- .../enterprise/EnterprisePrivacySettings.java | 2 +- .../fuelgauge/SmartBatterySettings.java | 2 +- .../batterysaver/BatterySaverSettings.java | 8 ++----- .../gestures/AssistGestureSettings.java | 2 +- .../gestures/DoubleTapPowerSettings.java | 3 ++- .../gestures/DoubleTapScreenSettings.java | 3 ++- .../gestures/DoubleTwistGestureSettings.java | 2 +- .../settings/gestures/GestureSettings.java | 2 +- .../gestures/PickupGestureSettings.java | 3 ++- .../gestures/SwipeToNotificationSettings.java | 3 ++- .../language/LanguageAndInputSettings.java | 3 +-- .../settings/location/LocationSettings.java | 2 +- .../settings/location/ScanningSettings.java | 2 +- .../network/NetworkDashboardFragment.java | 2 +- .../ConfigureNotificationSettings.java | 2 +- .../settings/notification/SoundSettings.java | 3 ++- .../ZenModeAutomationSettings.java | 2 +- .../notification/ZenModeBehaviorSettings.java | 2 +- .../notification/ZenModeSettings.java | 2 +- .../search/BaseSearchIndexProvider.java | 13 ++++++---- .../search/DatabaseIndexingUtils.java | 2 +- .../android/settings/search/Indexable.java | 9 ++----- .../security/EncryptionAndCredential.java | 2 +- .../security/LockscreenDashboardFragment.java | 2 +- .../settings/security/SecuritySettings.java | 2 +- .../screenlock/ScreenLockSettings.java | 2 +- .../system/ResetDashboardFragment.java | 3 ++- ...dFragmentSearchIndexProviderInspector.java | 2 +- .../EnterprisePrivacySettingsTest.java | 2 +- .../search/BaseSearchIndexProviderTest.java | 8 +++---- .../search/indexing/FakeSettingsFragment.java | 6 ----- .../PreferenceControllerContractTest.java | 3 +-- 47 files changed, 85 insertions(+), 86 deletions(-) diff --git a/src/com/android/settings/DisplaySettings.java b/src/com/android/settings/DisplaySettings.java index e726c633421..fb5aae063cf 100644 --- a/src/com/android/settings/DisplaySettings.java +++ b/src/com/android/settings/DisplaySettings.java @@ -133,7 +133,8 @@ public class DisplaySettings extends DashboardFragment { } @Override - public List getPreferenceControllers(Context context) { + public List createPreferenceControllers( + Context context) { return buildPreferenceControllers(context, null); } }; diff --git a/src/com/android/settings/accessibility/VibrationSettings.java b/src/com/android/settings/accessibility/VibrationSettings.java index 738f2186d9a..fedb98c0ce9 100644 --- a/src/com/android/settings/accessibility/VibrationSettings.java +++ b/src/com/android/settings/accessibility/VibrationSettings.java @@ -86,7 +86,7 @@ public class VibrationSettings extends DashboardFragment { } @Override - public List getPreferenceControllers( + public List createPreferenceControllers( Context context) { return buildControllers(context, null /* lifecycle */); } diff --git a/src/com/android/settings/applications/AppAndNotificationDashboardFragment.java b/src/com/android/settings/applications/AppAndNotificationDashboardFragment.java index 7d6bdbb35f7..00640c3c88c 100644 --- a/src/com/android/settings/applications/AppAndNotificationDashboardFragment.java +++ b/src/com/android/settings/applications/AppAndNotificationDashboardFragment.java @@ -91,7 +91,7 @@ public class AppAndNotificationDashboardFragment extends DashboardFragment { } @Override - public List getPreferenceControllers( + public List createPreferenceControllers( Context context) { return buildPreferenceControllers(context, null, null /* host */); } diff --git a/src/com/android/settings/applications/DefaultAppSettings.java b/src/com/android/settings/applications/DefaultAppSettings.java index 34b635b0eb5..07467ef1121 100644 --- a/src/com/android/settings/applications/DefaultAppSettings.java +++ b/src/com/android/settings/applications/DefaultAppSettings.java @@ -109,7 +109,7 @@ public class DefaultAppSettings extends DashboardFragment { } @Override - public List getPreferenceControllers( + public List createPreferenceControllers( Context context) { return buildPreferenceControllers(context); } diff --git a/src/com/android/settings/applications/SpecialAccessSettings.java b/src/com/android/settings/applications/SpecialAccessSettings.java index 4e43c05dfae..3f1ba94581d 100644 --- a/src/com/android/settings/applications/SpecialAccessSettings.java +++ b/src/com/android/settings/applications/SpecialAccessSettings.java @@ -95,7 +95,7 @@ public class SpecialAccessSettings extends DashboardFragment { } @Override - public List getPreferenceControllers( + public List createPreferenceControllers( Context context) { return buildPreferenceControllers(context); } diff --git a/src/com/android/settings/applications/assist/ManageAssist.java b/src/com/android/settings/applications/assist/ManageAssist.java index 4126aaf0b57..3fbf756111b 100644 --- a/src/com/android/settings/applications/assist/ManageAssist.java +++ b/src/com/android/settings/applications/assist/ManageAssist.java @@ -93,7 +93,7 @@ public class ManageAssist extends DashboardFragment { } @Override - public List getPreferenceControllers( + public List createPreferenceControllers( Context context) { return buildPreferenceControllers(context, null /* lifecycle */); } diff --git a/src/com/android/settings/connecteddevice/AdvancedConnectedDeviceDashboardFragment.java b/src/com/android/settings/connecteddevice/AdvancedConnectedDeviceDashboardFragment.java index 32c2af70591..869444dd0ab 100644 --- a/src/com/android/settings/connecteddevice/AdvancedConnectedDeviceDashboardFragment.java +++ b/src/com/android/settings/connecteddevice/AdvancedConnectedDeviceDashboardFragment.java @@ -28,7 +28,6 @@ import com.android.settings.connecteddevice.usb.UsbBackend; import com.android.settings.connecteddevice.usb.UsbModePreferenceController; import com.android.settings.dashboard.DashboardFragment; import com.android.settings.nfc.NfcPreferenceController; -import com.android.settings.overlay.FeatureFactory; import com.android.settings.print.PrintSettingPreferenceController; import com.android.settings.search.BaseSearchIndexProvider; import com.android.settingslib.core.AbstractPreferenceController; @@ -123,7 +122,7 @@ public class AdvancedConnectedDeviceDashboardFragment extends DashboardFragment } @Override - public List getPreferenceControllers( + public List createPreferenceControllers( Context context) { return buildControllers(context, null /* lifecycle */); } diff --git a/src/com/android/settings/connecteddevice/usb/UsbDetailsFragment.java b/src/com/android/settings/connecteddevice/usb/UsbDetailsFragment.java index c8611880392..3cb568bada1 100644 --- a/src/com/android/settings/connecteddevice/usb/UsbDetailsFragment.java +++ b/src/com/android/settings/connecteddevice/usb/UsbDetailsFragment.java @@ -121,7 +121,7 @@ public class UsbDetailsFragment extends DashboardFragment { } @Override - public List getPreferenceControllers( + public List createPreferenceControllers( Context context) { List ret = new ArrayList<>(); ret.addAll(createControllerList(context, new UsbBackend(context), null)); diff --git a/src/com/android/settings/deletionhelper/AutomaticStorageManagerSettings.java b/src/com/android/settings/deletionhelper/AutomaticStorageManagerSettings.java index 22ecb0939c2..6a3f9d67a95 100644 --- a/src/com/android/settings/deletionhelper/AutomaticStorageManagerSettings.java +++ b/src/com/android/settings/deletionhelper/AutomaticStorageManagerSettings.java @@ -168,7 +168,7 @@ public class AutomaticStorageManagerSettings extends DashboardFragment } @Override - public List getPreferenceControllers( + public List createPreferenceControllers( Context context) { return buildPreferenceControllers(context); } diff --git a/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java b/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java index 1c9e36bfb2e..16ad75267b2 100644 --- a/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java +++ b/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java @@ -478,7 +478,7 @@ public class DevelopmentSettingsDashboardFragment extends RestrictedDashboardFra } @Override - public List getPreferenceControllers(Context + public List createPreferenceControllers(Context context) { return buildPreferenceControllers(context, null /* activity */, null /* lifecycle */, null /* devOptionsDashboardFragment */, diff --git a/src/com/android/settings/deviceinfo/DeviceInfoSettings.java b/src/com/android/settings/deviceinfo/DeviceInfoSettings.java index 79f57be0909..ac5b549679c 100644 --- a/src/com/android/settings/deviceinfo/DeviceInfoSettings.java +++ b/src/com/android/settings/deviceinfo/DeviceInfoSettings.java @@ -158,7 +158,7 @@ public class DeviceInfoSettings extends DashboardFragment implements Indexable { } @Override - public List getPreferenceControllers( + public List createPreferenceControllers( Context context) { return buildPreferenceControllers(context, null /*activity */, null /* fragment */, null /* lifecycle */); diff --git a/src/com/android/settings/deviceinfo/StorageDashboardFragment.java b/src/com/android/settings/deviceinfo/StorageDashboardFragment.java index 341c76f2e42..4fa698a66b3 100644 --- a/src/com/android/settings/deviceinfo/StorageDashboardFragment.java +++ b/src/com/android/settings/deviceinfo/StorageDashboardFragment.java @@ -58,7 +58,8 @@ import java.util.Arrays; import java.util.List; public class StorageDashboardFragment extends DashboardFragment - implements LoaderManager.LoaderCallbacks> { + implements + LoaderManager.LoaderCallbacks> { private static final String TAG = "StorageDashboardFrag"; private static final int STORAGE_JOB_ID = 0; private static final int ICON_JOB_ID = 1; @@ -223,7 +224,8 @@ public class StorageDashboardFragment extends DashboardFragment } @Override - public List getPreferenceControllers(Context context) { + public List createPreferenceControllers( + Context context) { final StorageManager sm = context.getSystemService(StorageManager.class); final UserManagerWrapper userManager = new UserManagerWrapper(context.getSystemService(UserManager.class)); @@ -354,7 +356,8 @@ public class StorageDashboardFragment extends DashboardFragment } @Override - public void onLoaderReset(Loader> loader) {} + public void onLoaderReset(Loader> loader) { + } } public final class VolumeSizeCallbacks @@ -369,7 +372,8 @@ public class StorageDashboardFragment extends DashboardFragment } @Override - public void onLoaderReset(Loader loader) {} + public void onLoaderReset(Loader loader) { + } @Override public void onLoadFinished( diff --git a/src/com/android/settings/deviceinfo/aboutphone/MyDeviceInfoFragment.java b/src/com/android/settings/deviceinfo/aboutphone/MyDeviceInfoFragment.java index 03b69a5b4ee..288e33b91a2 100644 --- a/src/com/android/settings/deviceinfo/aboutphone/MyDeviceInfoFragment.java +++ b/src/com/android/settings/deviceinfo/aboutphone/MyDeviceInfoFragment.java @@ -198,7 +198,7 @@ public class MyDeviceInfoFragment extends DashboardFragment { } @Override - public List getPreferenceControllers( + public List createPreferenceControllers( Context context) { return buildPreferenceControllers(context, null /*activity */, null /* fragment */, null /* lifecycle */); diff --git a/src/com/android/settings/display/AmbientDisplaySettings.java b/src/com/android/settings/display/AmbientDisplaySettings.java index 3cac078e5a3..fec0ef5e275 100644 --- a/src/com/android/settings/display/AmbientDisplaySettings.java +++ b/src/com/android/settings/display/AmbientDisplaySettings.java @@ -101,7 +101,8 @@ public class AmbientDisplaySettings extends DashboardFragment { } @Override - public List getPreferenceControllers(Context context) { + public List createPreferenceControllers( + Context context) { return buildPreferenceControllers(context, null, new AmbientDisplayConfiguration(context), null, null); } diff --git a/src/com/android/settings/dream/DreamSettings.java b/src/com/android/settings/dream/DreamSettings.java index c3eaa7f24ec..f8eeac33ffa 100644 --- a/src/com/android/settings/dream/DreamSettings.java +++ b/src/com/android/settings/dream/DreamSettings.java @@ -137,18 +137,18 @@ public class DreamSettings extends DashboardFragment { public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = new BaseSearchIndexProvider() { - @Override - public List getXmlResourcesToIndex( - Context context, boolean enabled) { - final SearchIndexableResource sir = new SearchIndexableResource(context); - sir.xmlResId = R.xml.dream_fragment_overview; - return Arrays.asList(sir); - } + @Override + public List getXmlResourcesToIndex( + Context context, boolean enabled) { + final SearchIndexableResource sir = new SearchIndexableResource(context); + sir.xmlResId = R.xml.dream_fragment_overview; + return Arrays.asList(sir); + } - @Override - public List getPreferenceControllers(Context context) { - return buildPreferenceControllers(context); - } - }; + @Override + public List createPreferenceControllers(Context context) { + return buildPreferenceControllers(context); + } + }; } diff --git a/src/com/android/settings/enterprise/EnterprisePrivacySettings.java b/src/com/android/settings/enterprise/EnterprisePrivacySettings.java index 0628dbb8269..cd839deb3c0 100644 --- a/src/com/android/settings/enterprise/EnterprisePrivacySettings.java +++ b/src/com/android/settings/enterprise/EnterprisePrivacySettings.java @@ -112,7 +112,7 @@ public class EnterprisePrivacySettings extends DashboardFragment { } @Override - public List getPreferenceControllers( + public List createPreferenceControllers( Context context) { return buildPreferenceControllers(context, false /* async */); } diff --git a/src/com/android/settings/fuelgauge/SmartBatterySettings.java b/src/com/android/settings/fuelgauge/SmartBatterySettings.java index 6aeb8a39135..f96842df531 100644 --- a/src/com/android/settings/fuelgauge/SmartBatterySettings.java +++ b/src/com/android/settings/fuelgauge/SmartBatterySettings.java @@ -99,7 +99,7 @@ public class SmartBatterySettings extends DashboardFragment { } @Override - public List getPreferenceControllers( + public List createPreferenceControllers( Context context) { return buildPreferenceControllers(context, null, null); } diff --git a/src/com/android/settings/fuelgauge/batterysaver/BatterySaverSettings.java b/src/com/android/settings/fuelgauge/batterysaver/BatterySaverSettings.java index 2340675554d..4d89e3e95f1 100644 --- a/src/com/android/settings/fuelgauge/batterysaver/BatterySaverSettings.java +++ b/src/com/android/settings/fuelgauge/batterysaver/BatterySaverSettings.java @@ -18,14 +18,9 @@ package com.android.settings.fuelgauge.batterysaver; import android.content.Context; import android.os.Bundle; -import android.os.PowerManager; import android.provider.SearchIndexableResource; -import android.provider.Settings.Global; -import android.support.annotation.VisibleForTesting; -import android.util.Log; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; -import com.android.internal.util.ArrayUtils; import com.android.settings.R; import com.android.settings.dashboard.DashboardFragment; import com.android.settings.search.BaseSearchIndexProvider; @@ -96,7 +91,8 @@ public class BatterySaverSettings extends DashboardFragment { } @Override - public List getPreferenceControllers(Context context) { + public List createPreferenceControllers( + Context context) { return buildPreferenceControllers(context, null); } }; diff --git a/src/com/android/settings/gestures/AssistGestureSettings.java b/src/com/android/settings/gestures/AssistGestureSettings.java index 8878f47e8f5..a4e8f1f3113 100644 --- a/src/com/android/settings/gestures/AssistGestureSettings.java +++ b/src/com/android/settings/gestures/AssistGestureSettings.java @@ -75,7 +75,7 @@ public class AssistGestureSettings extends DashboardFragment { } @Override - public List getPreferenceControllers( + public List createPreferenceControllers( Context context) { return buildPreferenceControllers(context, null /* lifecycle */); } diff --git a/src/com/android/settings/gestures/DoubleTapPowerSettings.java b/src/com/android/settings/gestures/DoubleTapPowerSettings.java index 0dca805cd04..3ddc79c6be1 100644 --- a/src/com/android/settings/gestures/DoubleTapPowerSettings.java +++ b/src/com/android/settings/gestures/DoubleTapPowerSettings.java @@ -89,7 +89,8 @@ public class DoubleTapPowerSettings extends DashboardFragment { } @Override - public List getPreferenceControllers(Context context) { + public List createPreferenceControllers( + Context context) { return buildPreferenceControllers(context, null /* lifecycle */); } }; diff --git a/src/com/android/settings/gestures/DoubleTapScreenSettings.java b/src/com/android/settings/gestures/DoubleTapScreenSettings.java index f2148b491b2..eb11fd0e969 100644 --- a/src/com/android/settings/gestures/DoubleTapScreenSettings.java +++ b/src/com/android/settings/gestures/DoubleTapScreenSettings.java @@ -97,7 +97,8 @@ public class DoubleTapScreenSettings extends DashboardFragment { } @Override - public List getPreferenceControllers(Context context) { + public List createPreferenceControllers( + Context context) { return buildPreferenceControllers(context, null /* lifecycle */); } }; diff --git a/src/com/android/settings/gestures/DoubleTwistGestureSettings.java b/src/com/android/settings/gestures/DoubleTwistGestureSettings.java index ac9de888cec..46c9a81b6fc 100644 --- a/src/com/android/settings/gestures/DoubleTwistGestureSettings.java +++ b/src/com/android/settings/gestures/DoubleTwistGestureSettings.java @@ -88,7 +88,7 @@ public class DoubleTwistGestureSettings extends DashboardFragment { } @Override - public List getPreferenceControllers(Context context) { + public List createPreferenceControllers(Context context) { return buildPreferenceControllers(context, null /* lifecycle */); } }; diff --git a/src/com/android/settings/gestures/GestureSettings.java b/src/com/android/settings/gestures/GestureSettings.java index 4d38b091222..ea787c86258 100644 --- a/src/com/android/settings/gestures/GestureSettings.java +++ b/src/com/android/settings/gestures/GestureSettings.java @@ -100,7 +100,7 @@ public class GestureSettings extends DashboardFragment { } @Override - public List getPreferenceControllers( + public List createPreferenceControllers( Context context) { return buildPreferenceControllers(context, null, new AmbientDisplayConfiguration(context)); diff --git a/src/com/android/settings/gestures/PickupGestureSettings.java b/src/com/android/settings/gestures/PickupGestureSettings.java index 1762ba8445e..fab2e6631b6 100644 --- a/src/com/android/settings/gestures/PickupGestureSettings.java +++ b/src/com/android/settings/gestures/PickupGestureSettings.java @@ -96,7 +96,8 @@ public class PickupGestureSettings extends DashboardFragment { } @Override - public List getPreferenceControllers(Context context) { + public List createPreferenceControllers( + Context context) { return buildPreferenceControllers(context, null /* lifecycle */); } }; diff --git a/src/com/android/settings/gestures/SwipeToNotificationSettings.java b/src/com/android/settings/gestures/SwipeToNotificationSettings.java index c6f346aed87..69fd019d7f0 100644 --- a/src/com/android/settings/gestures/SwipeToNotificationSettings.java +++ b/src/com/android/settings/gestures/SwipeToNotificationSettings.java @@ -89,7 +89,8 @@ public class SwipeToNotificationSettings extends DashboardFragment { } @Override - public List getPreferenceControllers(Context context) { + public List createPreferenceControllers( + Context context) { return buildPreferenceControllers(context, null /* lifecycle */); } }; diff --git a/src/com/android/settings/language/LanguageAndInputSettings.java b/src/com/android/settings/language/LanguageAndInputSettings.java index cb60ef544e3..75d204da186 100644 --- a/src/com/android/settings/language/LanguageAndInputSettings.java +++ b/src/com/android/settings/language/LanguageAndInputSettings.java @@ -21,7 +21,6 @@ import android.content.ComponentName; import android.content.ContentResolver; import android.content.Context; import android.content.pm.PackageManager; -import android.os.Bundle; import android.provider.SearchIndexableResource; import android.provider.Settings; import android.speech.tts.TtsEngines; @@ -188,7 +187,7 @@ public class LanguageAndInputSettings extends DashboardFragment { } @Override - public List getPreferenceControllers( + public List createPreferenceControllers( Context context) { return buildPreferenceControllers(context, null); } diff --git a/src/com/android/settings/location/LocationSettings.java b/src/com/android/settings/location/LocationSettings.java index 3e9c8af24d7..56c4b1835da 100644 --- a/src/com/android/settings/location/LocationSettings.java +++ b/src/com/android/settings/location/LocationSettings.java @@ -178,7 +178,7 @@ public class LocationSettings extends DashboardFragment { } @Override - public List getPreferenceControllers(Context + public List createPreferenceControllers(Context context) { return buildPreferenceControllers(context, null /* fragment */, null /* lifecycle */); diff --git a/src/com/android/settings/location/ScanningSettings.java b/src/com/android/settings/location/ScanningSettings.java index 4585870dd66..1af6e2bbeb2 100644 --- a/src/com/android/settings/location/ScanningSettings.java +++ b/src/com/android/settings/location/ScanningSettings.java @@ -77,7 +77,7 @@ public class ScanningSettings extends DashboardFragment { } @Override - public List getPreferenceControllers(Context + public List createPreferenceControllers(Context context) { return buildPreferenceControllers(context); } diff --git a/src/com/android/settings/network/NetworkDashboardFragment.java b/src/com/android/settings/network/NetworkDashboardFragment.java index 74c191006d4..822699afa3f 100644 --- a/src/com/android/settings/network/NetworkDashboardFragment.java +++ b/src/com/android/settings/network/NetworkDashboardFragment.java @@ -230,7 +230,7 @@ public class NetworkDashboardFragment extends DashboardFragment implements } @Override - public List getPreferenceControllers(Context + public List createPreferenceControllers(Context context) { return buildPreferenceControllers(context, null /* lifecycle */, null /* metricsFeatureProvider */, null /* fragment */, diff --git a/src/com/android/settings/notification/ConfigureNotificationSettings.java b/src/com/android/settings/notification/ConfigureNotificationSettings.java index a3af471c917..b5c755501ba 100644 --- a/src/com/android/settings/notification/ConfigureNotificationSettings.java +++ b/src/com/android/settings/notification/ConfigureNotificationSettings.java @@ -165,7 +165,7 @@ public class ConfigureNotificationSettings extends DashboardFragment { } @Override - public List getPreferenceControllers( + public List createPreferenceControllers( Context context) { return buildPreferenceControllers(context, null, null, null); } diff --git a/src/com/android/settings/notification/SoundSettings.java b/src/com/android/settings/notification/SoundSettings.java index 032a5cbf0c9..581907b4382 100644 --- a/src/com/android/settings/notification/SoundSettings.java +++ b/src/com/android/settings/notification/SoundSettings.java @@ -255,7 +255,8 @@ public class SoundSettings extends DashboardFragment { } @Override - public List getPreferenceControllers(Context context) { + public List createPreferenceControllers( + Context context) { return buildPreferenceControllers(context, null /* fragment */, null /* callback */, null /* lifecycle */); } diff --git a/src/com/android/settings/notification/ZenModeAutomationSettings.java b/src/com/android/settings/notification/ZenModeAutomationSettings.java index 6ce13c14635..969c8ef74b8 100644 --- a/src/com/android/settings/notification/ZenModeAutomationSettings.java +++ b/src/com/android/settings/notification/ZenModeAutomationSettings.java @@ -98,7 +98,7 @@ public class ZenModeAutomationSettings extends ZenModeSettingsBase { } @Override - public List getPreferenceControllers( + public List createPreferenceControllers( Context context) { return buildPreferenceControllers(context, null, null, null); } diff --git a/src/com/android/settings/notification/ZenModeBehaviorSettings.java b/src/com/android/settings/notification/ZenModeBehaviorSettings.java index e2e85f3b691..1733469aed4 100644 --- a/src/com/android/settings/notification/ZenModeBehaviorSettings.java +++ b/src/com/android/settings/notification/ZenModeBehaviorSettings.java @@ -97,7 +97,7 @@ public class ZenModeBehaviorSettings extends ZenModeSettingsBase implements Inde } @Override - public List getPreferenceControllers(Context context) { + public List createPreferenceControllers(Context context) { return buildPreferenceControllers(context, null); } }; diff --git a/src/com/android/settings/notification/ZenModeSettings.java b/src/com/android/settings/notification/ZenModeSettings.java index 2b48301aba2..12e8d7e508d 100644 --- a/src/com/android/settings/notification/ZenModeSettings.java +++ b/src/com/android/settings/notification/ZenModeSettings.java @@ -230,7 +230,7 @@ public class ZenModeSettings extends ZenModeSettingsBase { } @Override - public List getPreferenceControllers(Context + public List createPreferenceControllers(Context context) { return buildPreferenceControllers(context, null, null); } diff --git a/src/com/android/settings/search/BaseSearchIndexProvider.java b/src/com/android/settings/search/BaseSearchIndexProvider.java index d7577b5fc37..a2953b83f6f 100644 --- a/src/com/android/settings/search/BaseSearchIndexProvider.java +++ b/src/com/android/settings/search/BaseSearchIndexProvider.java @@ -67,7 +67,7 @@ public class BaseSearchIndexProvider implements Indexable.SearchIndexProvider { // Entire page should be suppressed, mark all keys from this page as non-indexable. return getNonIndexableKeysFromXml(context); } - final List controllers = getAllPreferenceControllers(context); + final List controllers = getPreferenceControllers(context); if (controllers != null && !controllers.isEmpty()) { final List nonIndexableKeys = new ArrayList<>(); for (AbstractPreferenceController controller : controllers) { @@ -89,9 +89,9 @@ public class BaseSearchIndexProvider implements Indexable.SearchIndexProvider { } @Override - public List getAllPreferenceControllers(Context context) { + public List getPreferenceControllers(Context context) { final List controllersFromCode = - getPreferenceControllers(context); + createPreferenceControllers(context); final List res = getXmlResourcesToIndex(context, true); if (res == null || res.isEmpty()) { return controllersFromCode; @@ -111,7 +111,12 @@ public class BaseSearchIndexProvider implements Indexable.SearchIndexProvider { return allControllers; } - public List getPreferenceControllers(Context context) { + /** + * Creates a list of {@link AbstractPreferenceController} programatically. + *

+ * This list should create controllers that are not defined in xml as a Slice controller. + */ + public List createPreferenceControllers(Context context) { return null; } diff --git a/src/com/android/settings/search/DatabaseIndexingUtils.java b/src/com/android/settings/search/DatabaseIndexingUtils.java index addc8079758..eaf69b76239 100644 --- a/src/com/android/settings/search/DatabaseIndexingUtils.java +++ b/src/com/android/settings/search/DatabaseIndexingUtils.java @@ -96,7 +96,7 @@ public class DatabaseIndexingUtils { final Indexable.SearchIndexProvider provider = getSearchIndexProvider(clazz); final List controllers = - provider.getAllPreferenceControllers(context); + provider.getPreferenceControllers(context); if (controllers == null) { return map; diff --git a/src/com/android/settings/search/Indexable.java b/src/com/android/settings/search/Indexable.java index 3b2017dd164..e157fac74aa 100644 --- a/src/com/android/settings/search/Indexable.java +++ b/src/com/android/settings/search/Indexable.java @@ -31,7 +31,6 @@ import java.util.List; * {@link Indexable.SearchIndexProvider} interface. * * See {@link android.provider.SearchIndexableResource} and {@link SearchIndexableRaw}. - * */ public interface Indexable { @@ -41,12 +40,11 @@ public interface Indexable { * * See {@link android.provider.SearchIndexableResource} * - * * @param context the context. * @param enabled hint telling if the data needs to be considered into the search results * or not. * @return a list of {@link android.provider.SearchIndexableResource} references. - * Can be null. + * Can be null. */ List getXmlResourcesToIndex(Context context, boolean enabled); @@ -69,12 +67,9 @@ public interface Indexable { List getNonIndexableKeys(Context context); /** - * @param context * @return a list of {@link AbstractPreferenceController} for ResultPayload data during * Indexing. - * - * TODO(zhfan): name is confusing(too similar to getPreferenceControllers). Rename both. */ - List getAllPreferenceControllers(Context context); + List getPreferenceControllers(Context context); } } diff --git a/src/com/android/settings/security/EncryptionAndCredential.java b/src/com/android/settings/security/EncryptionAndCredential.java index 627cf3e7a8b..a684ee7788e 100644 --- a/src/com/android/settings/security/EncryptionAndCredential.java +++ b/src/com/android/settings/security/EncryptionAndCredential.java @@ -101,7 +101,7 @@ public class EncryptionAndCredential extends DashboardFragment { } @Override - public List getPreferenceControllers(Context context) { + public List createPreferenceControllers(Context context) { return buildPreferenceControllers(context, null /* lifecycle */); } diff --git a/src/com/android/settings/security/LockscreenDashboardFragment.java b/src/com/android/settings/security/LockscreenDashboardFragment.java index c40064563a2..65be6e033b6 100644 --- a/src/com/android/settings/security/LockscreenDashboardFragment.java +++ b/src/com/android/settings/security/LockscreenDashboardFragment.java @@ -114,7 +114,7 @@ public class LockscreenDashboardFragment extends DashboardFragment } @Override - public List getPreferenceControllers( + public List createPreferenceControllers( Context context) { final List controllers = new ArrayList<>(); controllers.add(new LockScreenNotificationPreferenceController(context)); diff --git a/src/com/android/settings/security/SecuritySettings.java b/src/com/android/settings/security/SecuritySettings.java index 313b48304d9..2af2f049d18 100644 --- a/src/com/android/settings/security/SecuritySettings.java +++ b/src/com/android/settings/security/SecuritySettings.java @@ -164,7 +164,7 @@ public class SecuritySettings extends DashboardFragment { } @Override - public List getPreferenceControllers(Context + public List createPreferenceControllers(Context context) { return buildPreferenceControllers(context, null /* lifecycle */, null /* host*/); diff --git a/src/com/android/settings/security/screenlock/ScreenLockSettings.java b/src/com/android/settings/security/screenlock/ScreenLockSettings.java index 7a01aa21e04..cc17fa37697 100644 --- a/src/com/android/settings/security/screenlock/ScreenLockSettings.java +++ b/src/com/android/settings/security/screenlock/ScreenLockSettings.java @@ -99,7 +99,7 @@ public class ScreenLockSettings extends DashboardFragment } @Override - public List getPreferenceControllers( + public List createPreferenceControllers( Context context) { return buildPreferenceControllers(context, null /* parent */, null /* lifecycle */, new LockPatternUtils(context)); diff --git a/src/com/android/settings/system/ResetDashboardFragment.java b/src/com/android/settings/system/ResetDashboardFragment.java index b7b6b773181..cc67e2583ec 100644 --- a/src/com/android/settings/system/ResetDashboardFragment.java +++ b/src/com/android/settings/system/ResetDashboardFragment.java @@ -79,7 +79,8 @@ public class ResetDashboardFragment extends DashboardFragment { } @Override - public List getPreferenceControllers(Context context) { + public List createPreferenceControllers( + Context context) { return buildPreferenceControllers(context, null /* lifecycle */); } }; diff --git a/tests/robotests/src/com/android/settings/dashboard/DashboardFragmentSearchIndexProviderInspector.java b/tests/robotests/src/com/android/settings/dashboard/DashboardFragmentSearchIndexProviderInspector.java index e5db16ed6ec..3d9783da2ed 100644 --- a/tests/robotests/src/com/android/settings/dashboard/DashboardFragmentSearchIndexProviderInspector.java +++ b/tests/robotests/src/com/android/settings/dashboard/DashboardFragmentSearchIndexProviderInspector.java @@ -50,7 +50,7 @@ public class DashboardFragmentSearchIndexProviderInspector { final List controllersFromSearchIndexProvider; final List controllersFromFragment; try { - controllersFromSearchIndexProvider = provider.getAllPreferenceControllers(context); + controllersFromSearchIndexProvider = provider.getPreferenceControllers(context); } catch (Throwable e) { // Can't do much with exception, assume the test passed. return true; diff --git a/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacySettingsTest.java b/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacySettingsTest.java index b46be8c9373..b38b0f09c2e 100644 --- a/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacySettingsTest.java +++ b/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacySettingsTest.java @@ -98,7 +98,7 @@ public final class EnterprisePrivacySettingsTest { @Test public void getSearchIndexProviderPreferenceControllers() throws Exception { final List controllers - = EnterprisePrivacySettings.SEARCH_INDEX_DATA_PROVIDER.getAllPreferenceControllers( + = EnterprisePrivacySettings.SEARCH_INDEX_DATA_PROVIDER.getPreferenceControllers( ShadowApplication.getInstance().getApplicationContext()); verifyPreferenceControllers(controllers); } diff --git a/tests/robotests/src/com/android/settings/search/BaseSearchIndexProviderTest.java b/tests/robotests/src/com/android/settings/search/BaseSearchIndexProviderTest.java index 798149ad8e8..f5d379323c7 100644 --- a/tests/robotests/src/com/android/settings/search/BaseSearchIndexProviderTest.java +++ b/tests/robotests/src/com/android/settings/search/BaseSearchIndexProviderTest.java @@ -85,7 +85,7 @@ public class BaseSearchIndexProviderTest { public void getNonIndexableKeys_preferenceIsAvailable_shouldReturnEmptyList() { List controllers = new ArrayList<>(); controllers.add(new AvailablePreferenceController(mContext)); - doReturn(controllers).when(mIndexProvider).getPreferenceControllers(mContext); + doReturn(controllers).when(mIndexProvider).createPreferenceControllers(mContext); assertThat(mIndexProvider.getNonIndexableKeys(mContext)).isEqualTo(Collections.EMPTY_LIST); } @@ -104,7 +104,7 @@ public class BaseSearchIndexProviderTest { } @Override - public List getPreferenceControllers(Context context) { + public List createPreferenceControllers(Context context) { final List controllersFromCode = new ArrayList<>(); controllersFromCode.add(new BasePreferenceController(mContext, "TEST_KEY") { @Override @@ -117,7 +117,7 @@ public class BaseSearchIndexProviderTest { }; final List controllers = - provider.getAllPreferenceControllers(mContext); + provider.getPreferenceControllers(mContext); assertThat(controllers).hasSize(3); } @@ -143,7 +143,7 @@ public class BaseSearchIndexProviderTest { public void getNonIndexableKeys_preferenceIsNotAvailable_shouldReturnKey() { List controllers = new ArrayList<>(); controllers.add(new NotAvailablePreferenceController(mContext)); - doReturn(controllers).when(mIndexProvider).getPreferenceControllers(mContext); + doReturn(controllers).when(mIndexProvider).createPreferenceControllers(mContext); assertThat(mIndexProvider.getNonIndexableKeys(mContext)).contains(TEST_PREF_KEY); } diff --git a/tests/robotests/src/com/android/settings/search/indexing/FakeSettingsFragment.java b/tests/robotests/src/com/android/settings/search/indexing/FakeSettingsFragment.java index e857ae44743..ef4bf999369 100644 --- a/tests/robotests/src/com/android/settings/search/indexing/FakeSettingsFragment.java +++ b/tests/robotests/src/com/android/settings/search/indexing/FakeSettingsFragment.java @@ -116,11 +116,5 @@ public class FakeSettingsFragment extends DashboardFragment { keys.add("pref_key_3"); return keys; } - - @Override - public List - getPreferenceControllers(Context context) { - return null; - } }; } \ No newline at end of file diff --git a/tests/unit/src/com/android/settings/core/PreferenceControllerContractTest.java b/tests/unit/src/com/android/settings/core/PreferenceControllerContractTest.java index 7e26f1115b7..802a3a71caf 100644 --- a/tests/unit/src/com/android/settings/core/PreferenceControllerContractTest.java +++ b/tests/unit/src/com/android/settings/core/PreferenceControllerContractTest.java @@ -20,7 +20,6 @@ import static junit.framework.Assert.fail; import android.content.Context; import android.platform.test.annotations.Presubmit; -import android.provider.SearchIndexableResource; import android.support.test.InstrumentationRegistry; import android.support.test.filters.MediumTest; import android.support.test.runner.AndroidJUnit4; @@ -67,7 +66,7 @@ public class PreferenceControllerContractTest { } final List controllers = - provider.getAllPreferenceControllers(mContext); + provider.getPreferenceControllers(mContext); if (controllers == null) { continue; }