Merge "Remove extra IndexProviders that provided bad data." (011d78ae) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/WirelessSettings.java

+0 −52

Original line number	Original line	Diff line number	Diff line
	@@ -216,56 +216,4 @@ public class WirelessSettings extends SettingsPreferenceFragment implements Inde
	protected int getHelpResource() {		protected int getHelpResource() {
	return R.string.help_url_more_networks;		return R.string.help_url_more_networks;
	}		}

	/**
	* For Search.
	*/
	public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
	new BaseSearchIndexProvider() {
	@Override
	public List<SearchIndexableResource> 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<String> getNonIndexableKeys(Context context) {
	final ArrayList<String> result = new ArrayList<String>();

	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;
	}
	};
	}		}

src/com/android/settings/fuelgauge/PowerUsageDetail.java

+0 −15

Original line number	Original line	Diff line number	Diff line
	@@ -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<SearchIndexableResource> 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);
	}
	};
	}		}

src/com/android/settings/gestures/DoubleTapPowerPreferenceController.java

+0 −10

Original line number	Original line	Diff line number	Diff line
	@@ -64,14 +64,4 @@ public class DoubleTapPowerPreferenceController extends GesturePreferenceControl
	Settings.Secure.CAMERA_DOUBLE_TAP_POWER_GESTURE_DISABLED, 0);		Settings.Secure.CAMERA_DOUBLE_TAP_POWER_GESTURE_DISABLED, 0);
	return cameraDisabled == 0;		return cameraDisabled == 0;
	}		}

	@Override
	public ResultPayload getResultPayload() {
	ArrayMap<Integer, Boolean> 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);
	}
	}		}

src/com/android/settings/gestures/DoubleTapScreenPreferenceController.java

+0 −10

Original line number	Original line	Diff line number	Diff line
	@@ -70,14 +70,4 @@ public class DoubleTapScreenPreferenceController extends GesturePreferenceContro
	protected boolean isSwitchPrefEnabled() {		protected boolean isSwitchPrefEnabled() {
	return mAmbientConfig.pulseOnDoubleTapEnabled(mUserId);		return mAmbientConfig.pulseOnDoubleTapEnabled(mUserId);
	}		}

	@Override
	public ResultPayload getResultPayload() {
	ArrayMap<Integer, Boolean> 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);
	}
	}		}

src/com/android/settings/gestures/DoubleTwistPreferenceController.java

+0 −10

Original line number	Original line	Diff line number	Diff line
	@@ -85,14 +85,4 @@ public class DoubleTwistPreferenceController extends GesturePreferenceController
	}		}
	return false;		return false;
	}		}

	@Override
	public ResultPayload getResultPayload() {
	ArrayMap<Integer, Boolean> 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);
	}
	}		}