diff --git a/src/com/android/settings/WirelessSettings.java b/src/com/android/settings/WirelessSettings.java index 253ed7652d3..32dc0c35711 100644 --- a/src/com/android/settings/WirelessSettings.java +++ b/src/com/android/settings/WirelessSettings.java @@ -216,56 +216,4 @@ public class WirelessSettings extends SettingsPreferenceFragment implements Inde protected int getHelpResource() { return R.string.help_url_more_networks; } - - /** - * For Search. - */ - public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = - new BaseSearchIndexProvider() { - @Override - public List getXmlResourcesToIndex( - Context context, boolean enabled) { - // Remove wireless settings from search in demo mode - if (UserManager.isDeviceInDemoMode(context)) { - return Collections.emptyList(); - } - SearchIndexableResource sir = new SearchIndexableResource(context); - sir.xmlResId = R.xml.wireless_settings; - return Arrays.asList(sir); - } - - @Override - public List getNonIndexableKeys(Context context) { - final ArrayList result = new ArrayList(); - - final UserManager um = (UserManager) context.getSystemService( - Context.USER_SERVICE); - final boolean isSecondaryUser = !um.isAdminUser(); - final boolean isWimaxEnabled = !isSecondaryUser - && context.getResources().getBoolean( - com.android.internal.R.bool.config_wimaxEnabled); - if (!isWimaxEnabled) { - result.add(KEY_WIMAX_SETTINGS); - } - - new VpnPreferenceController(context).updateNonIndexableKeys(result); - - new NfcPreferenceController(context).updateNonIndexableKeys(result); - new MobilePlanPreferenceController(context, null /* MobilePlanClickHandler */) - .updateNonIndexableKeys(result); - new MobileNetworkPreferenceController(context) - .updateNonIndexableKeys(result); - - // Remove Airplane Mode settings if it's a stationary device such as a TV. - new AirplaneModePreferenceController(context, null /* fragment */) - .updateNonIndexableKeys(result); - - new ProxyPreferenceController(context).updateNonIndexableKeys(result); - - new TetherPreferenceController(context).updateNonIndexableKeys(result); - new WifiCallingPreferenceController(context).updateNonIndexableKeys(result); - - return result; - } - }; } diff --git a/src/com/android/settings/fuelgauge/PowerUsageDetail.java b/src/com/android/settings/fuelgauge/PowerUsageDetail.java index b3f304a1963..dace4da3376 100644 --- a/src/com/android/settings/fuelgauge/PowerUsageDetail.java +++ b/src/com/android/settings/fuelgauge/PowerUsageDetail.java @@ -829,19 +829,4 @@ public class PowerUsageDetail extends PowerUsageBase implements Button.OnClickLi } } } - - public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = - new BaseSearchIndexProvider() { - @Override - public List getXmlResourcesToIndex( - Context context, boolean enabled) { - if (!FeatureFactory.getFactory(context).getDashboardFeatureProvider(context) - .isEnabled()) { - return null; - } - final SearchIndexableResource sir = new SearchIndexableResource(context); - sir.xmlResId = R.xml.power_usage_details; - return Arrays.asList(sir); - } - }; } diff --git a/src/com/android/settings/gestures/DoubleTapPowerPreferenceController.java b/src/com/android/settings/gestures/DoubleTapPowerPreferenceController.java index 213259be012..d38902e50b4 100644 --- a/src/com/android/settings/gestures/DoubleTapPowerPreferenceController.java +++ b/src/com/android/settings/gestures/DoubleTapPowerPreferenceController.java @@ -64,14 +64,4 @@ public class DoubleTapPowerPreferenceController extends GesturePreferenceControl Settings.Secure.CAMERA_DOUBLE_TAP_POWER_GESTURE_DISABLED, 0); return cameraDisabled == 0; } - - @Override - public ResultPayload getResultPayload() { - ArrayMap valueMap = new ArrayMap<>(); - valueMap.put(0, true); - valueMap.put(1, false); - - return new InlineSwitchPayload(Settings.Secure.CAMERA_DOUBLE_TAP_POWER_GESTURE_DISABLED, - ResultPayload.SettingsSource.SECURE, valueMap); - } } diff --git a/src/com/android/settings/gestures/DoubleTapScreenPreferenceController.java b/src/com/android/settings/gestures/DoubleTapScreenPreferenceController.java index 02d8dd73b01..49e8f51758e 100644 --- a/src/com/android/settings/gestures/DoubleTapScreenPreferenceController.java +++ b/src/com/android/settings/gestures/DoubleTapScreenPreferenceController.java @@ -70,14 +70,4 @@ public class DoubleTapScreenPreferenceController extends GesturePreferenceContro protected boolean isSwitchPrefEnabled() { return mAmbientConfig.pulseOnDoubleTapEnabled(mUserId); } - - @Override - public ResultPayload getResultPayload() { - ArrayMap valueMap = new ArrayMap<>(); - valueMap.put(1, true); - valueMap.put(0, false); - - return new InlineSwitchPayload(Settings.Secure.DOZE_PULSE_ON_DOUBLE_TAP, - ResultPayload.SettingsSource.SECURE, valueMap); - } } diff --git a/src/com/android/settings/gestures/DoubleTwistPreferenceController.java b/src/com/android/settings/gestures/DoubleTwistPreferenceController.java index fea1c9dab18..c5174fd536b 100644 --- a/src/com/android/settings/gestures/DoubleTwistPreferenceController.java +++ b/src/com/android/settings/gestures/DoubleTwistPreferenceController.java @@ -85,14 +85,4 @@ public class DoubleTwistPreferenceController extends GesturePreferenceController } return false; } - - @Override - public ResultPayload getResultPayload() { - ArrayMap valueMap = new ArrayMap<>(); - valueMap.put(1, true); - valueMap.put(0, false); - - return new InlineSwitchPayload(Settings.Secure.CAMERA_DOUBLE_TWIST_TO_FLIP_ENABLED, - ResultPayload.SettingsSource.SECURE, valueMap); - } } diff --git a/src/com/android/settings/gestures/GestureSettings.java b/src/com/android/settings/gestures/GestureSettings.java index db6925e8348..df8e37c78d9 100644 --- a/src/com/android/settings/gestures/GestureSettings.java +++ b/src/com/android/settings/gestures/GestureSettings.java @@ -143,51 +143,4 @@ public class GestureSettings extends DashboardFragment { mPreferences.add((GesturePreference) preference); } } - - public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = - new BaseSearchIndexProvider() { - @Override - public List getXmlResourcesToIndex(Context context, - boolean enabled) { - ArrayList result = - new ArrayList(); - - SearchIndexableResource sir = new SearchIndexableResource(context); - sir.xmlResId = R.xml.gesture_settings; - result.add(sir); - - return result; - } - - @Override - public List getNonIndexableKeys(Context context) { - ArrayList result = new ArrayList(); - - List preferenceControllers = - getPreferenceControllers(context); - for (PreferenceController controller : preferenceControllers) { - controller.updateNonIndexableKeys(result); - } - return result; - } - - @Override - public List getPreferenceControllers(Context context) { - List controllers = new ArrayList<>(); - AmbientDisplayConfiguration ambientConfig - = new AmbientDisplayConfiguration(context); - - controllers.add(new DoubleTapPowerPreferenceController(context, - null /* lifecycle */)); - controllers.add(new PickupGesturePreferenceController(context, - null /* lifecycle */, ambientConfig, UserHandle.myUserId())); - controllers.add(new DoubleTapScreenPreferenceController(context, - null /* lifecycle */, ambientConfig, UserHandle.myUserId())); - controllers.add(new SwipeToNotificationPreferenceController(context, - null /* lifecycle */)); - controllers.add(new DoubleTwistPreferenceController(context, - null /* lifecycle */)); - return controllers; - } - }; } diff --git a/src/com/android/settings/gestures/PickupGesturePreferenceController.java b/src/com/android/settings/gestures/PickupGesturePreferenceController.java index f48551e7c8b..ce20f157966 100644 --- a/src/com/android/settings/gestures/PickupGesturePreferenceController.java +++ b/src/com/android/settings/gestures/PickupGesturePreferenceController.java @@ -70,14 +70,4 @@ public class PickupGesturePreferenceController extends GesturePreferenceControll Settings.Secure.DOZE_PULSE_ON_PICK_UP, enabled ? 1 : 0); return true; } - - @Override - public ResultPayload getResultPayload() { - ArrayMap valueMap = new ArrayMap<>(); - valueMap.put(1, true); - valueMap.put(0, false); - - return new InlineSwitchPayload(Settings.Secure.DOZE_PULSE_ON_PICK_UP, - ResultPayload.SettingsSource.SECURE, valueMap); - } } diff --git a/src/com/android/settings/gestures/SwipeToNotificationPreferenceController.java b/src/com/android/settings/gestures/SwipeToNotificationPreferenceController.java index 67c8e142ad6..22b88fc15fd 100644 --- a/src/com/android/settings/gestures/SwipeToNotificationPreferenceController.java +++ b/src/com/android/settings/gestures/SwipeToNotificationPreferenceController.java @@ -63,14 +63,4 @@ public class SwipeToNotificationPreferenceController extends GesturePreferenceCo Settings.Secure.SYSTEM_NAVIGATION_KEYS_ENABLED, 0) == 1; } - - @Override - public ResultPayload getResultPayload() { - ArrayMap valueMap = new ArrayMap<>(); - valueMap.put(1, true); - valueMap.put(0, false); - - return new InlineSwitchPayload(Settings.Secure.SYSTEM_NAVIGATION_KEYS_ENABLED, - ResultPayload.SettingsSource.SECURE, valueMap); - } } diff --git a/tests/robotests/assets/grandfather_not_implementing_index_provider b/tests/robotests/assets/grandfather_not_implementing_index_provider index 05cd93b9dd5..5e134bfe386 100644 --- a/tests/robotests/assets/grandfather_not_implementing_index_provider +++ b/tests/robotests/assets/grandfather_not_implementing_index_provider @@ -2,4 +2,6 @@ com.android.settings.notification.ConfigureNotificationSettings com.android.settings.language.LanguageAndRegionSettings com.android.settings.notification.ZenModePrioritySettings com.android.settings.inputmethod.InputAndGestureSettings -com.android.settings.accounts.AccountDetailDashboardFragment \ No newline at end of file +com.android.settings.accounts.AccountDetailDashboardFragment +com.android.settings.gestures.GestureSettings +com.android.settings.fuelgauge.PowerUsageDetail \ No newline at end of file diff --git a/tests/robotests/src/com/android/settings/gestures/DoubleTapPowerPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/gestures/DoubleTapPowerPreferenceControllerTest.java index 5f7d8b506e3..bdb35221be2 100644 --- a/tests/robotests/src/com/android/settings/gestures/DoubleTapPowerPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/gestures/DoubleTapPowerPreferenceControllerTest.java @@ -93,23 +93,4 @@ public class DoubleTapPowerPreferenceControllerTest { assertThat(mController.isSwitchPrefEnabled()).isFalse(); } - - @Test - public void testPreferenceController_ProperResultPayloadType() { - final Context context = ShadowApplication.getInstance().getApplicationContext(); - mController = new DoubleTapPowerPreferenceController(context, null); - ResultPayload payload = mController.getResultPayload(); - assertThat(payload).isInstanceOf(InlineSwitchPayload.class); - } - - @Test - public void testPreferenceController_CorrectPayload() { - final Context context = ShadowApplication.getInstance().getApplicationContext(); - mController = new DoubleTapPowerPreferenceController(context, null); - InlineSwitchPayload payload = (InlineSwitchPayload) mController.getResultPayload(); - assertThat(payload.settingsUri).isEqualTo("camera_double_tap_power_gesture_disabled"); - assertThat(payload.settingSource).isEqualTo(ResultPayload.SettingsSource.SECURE); - assertThat(payload.valueMap.get(0)).isEqualTo(true); - assertThat(payload.valueMap.get(1)).isEqualTo(false); - } } diff --git a/tests/robotests/src/com/android/settings/gestures/DoubleTapScreenPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/gestures/DoubleTapScreenPreferenceControllerTest.java index 2f922d56d90..adf8b752a6f 100644 --- a/tests/robotests/src/com/android/settings/gestures/DoubleTapScreenPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/gestures/DoubleTapScreenPreferenceControllerTest.java @@ -81,19 +81,4 @@ public class DoubleTapScreenPreferenceControllerTest { assertThat(mController.isSwitchPrefEnabled()).isFalse(); } - - @Test - public void testPreferenceController_ProperResultPayloadType() { - ResultPayload payload = mController.getResultPayload(); - assertThat(payload).isInstanceOf(InlineSwitchPayload.class); - } - - @Test - public void testPreferenceController_CorrectPayload() { - InlineSwitchPayload payload = (InlineSwitchPayload) mController.getResultPayload(); - assertThat(payload.settingsUri).isEqualTo("doze_pulse_on_double_tap"); - assertThat(payload.settingSource).isEqualTo(ResultPayload.SettingsSource.SECURE); - assertThat(payload.valueMap.get(1)).isEqualTo(true); - assertThat(payload.valueMap.get(0)).isEqualTo(false); - } } diff --git a/tests/robotests/src/com/android/settings/gestures/DoubleTwistPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/gestures/DoubleTwistPreferenceControllerTest.java index ad682b2521b..9bf66558e34 100644 --- a/tests/robotests/src/com/android/settings/gestures/DoubleTwistPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/gestures/DoubleTwistPreferenceControllerTest.java @@ -113,19 +113,4 @@ public class DoubleTwistPreferenceControllerTest { assertThat(mController.isSwitchPrefEnabled()).isFalse(); } - - @Test - public void testPreferenceController_ProperResultPayloadType() { - ResultPayload payload = mController.getResultPayload(); - assertThat(payload).isInstanceOf(InlineSwitchPayload.class); - } - - @Test - public void testPreferenceController_CorrectPayload() { - InlineSwitchPayload payload = (InlineSwitchPayload) mController.getResultPayload(); - assertThat(payload.settingsUri).isEqualTo("camera_double_twist_to_flip_enabled"); - assertThat(payload.settingSource).isEqualTo(ResultPayload.SettingsSource.SECURE); - assertThat(payload.valueMap.get(1)).isEqualTo(true); - assertThat(payload.valueMap.get(0)).isEqualTo(false); - } } diff --git a/tests/robotests/src/com/android/settings/gestures/PIckupGesturePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/gestures/PIckupGesturePreferenceControllerTest.java index f112b9ef27a..9dce07441ee 100644 --- a/tests/robotests/src/com/android/settings/gestures/PIckupGesturePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/gestures/PIckupGesturePreferenceControllerTest.java @@ -83,19 +83,4 @@ public class PIckupGesturePreferenceControllerTest { assertThat(mController.isSwitchPrefEnabled()).isFalse(); } - - @Test - public void testPreferenceController_ProperResultPayloadType() { - ResultPayload payload = mController.getResultPayload(); - assertThat(payload).isInstanceOf(InlineSwitchPayload.class); - } - - @Test - public void testPreferenceController_CorrectPayload() { - InlineSwitchPayload payload = (InlineSwitchPayload) mController.getResultPayload(); - assertThat(payload.settingsUri).isEqualTo("doze_pulse_on_pick_up"); - assertThat(payload.settingSource).isEqualTo(ResultPayload.SettingsSource.SECURE); - assertThat(payload.valueMap.get(1)).isEqualTo(true); - assertThat(payload.valueMap.get(0)).isEqualTo(false); - } } diff --git a/tests/robotests/src/com/android/settings/gestures/SwipeToNotificationPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/gestures/SwipeToNotificationPreferenceControllerTest.java index 49d73ea8371..e9096673cac 100644 --- a/tests/robotests/src/com/android/settings/gestures/SwipeToNotificationPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/gestures/SwipeToNotificationPreferenceControllerTest.java @@ -89,19 +89,4 @@ public class SwipeToNotificationPreferenceControllerTest { assertThat(mController.isSwitchPrefEnabled()).isFalse(); } - - @Test - public void testPreferenceController_ProperResultPayloadType() { - ResultPayload payload = mController.getResultPayload(); - assertThat(payload).isInstanceOf(InlineSwitchPayload.class); - } - - @Test - public void testPreferenceController_CorrectPayload() { - InlineSwitchPayload payload = (InlineSwitchPayload) mController.getResultPayload(); - assertThat(payload.settingsUri).isEqualTo("system_navigation_keys_enabled"); - assertThat(payload.settingSource).isEqualTo(ResultPayload.SettingsSource.SECURE); - assertThat(payload.valueMap.get(1)).isEqualTo(true); - assertThat(payload.valueMap.get(0)).isEqualTo(false); - } } diff --git a/tests/robotests/src/com/android/settings/search/DatabaseIndexingUtilsTest.java b/tests/robotests/src/com/android/settings/search/DatabaseIndexingUtilsTest.java index a13a24e0adf..f4370fc97ca 100644 --- a/tests/robotests/src/com/android/settings/search/DatabaseIndexingUtilsTest.java +++ b/tests/robotests/src/com/android/settings/search/DatabaseIndexingUtilsTest.java @@ -72,14 +72,6 @@ public class DatabaseIndexingUtilsTest { assertThat(map).isNull(); } - @Test - public void testGetPreferenceControllerUriMap_CompatibleClass_ReturnsNotNull() { - String className = "com.android.settings.gestures.GestureSettings"; - - Map map = DatabaseIndexingUtils.getPreferenceControllerUriMap(className, mContext); - assertThat(map).isNotNull(); - } - @Test public void testGetPreferenceControllerUriMap_CompatibleClass_ReturnsValidMap() { String className = "com.android.settings.DisplaySettings"; @@ -96,7 +88,7 @@ public class DatabaseIndexingUtilsTest { } @Test - public void testGetPayloadFromMap_MatchingKey_ReturnsPayloa() { + public void testGetPayloadFromMap_MatchingKey_ReturnsPayload() { final String key = "key"; PreferenceController prefController = new PreferenceController(mContext) { @Override