Merge "Deprecate resId field in SearchIndexableResources" (01ff9a80) · Commits · e / os / android_packages_apps_Settings

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

+23 −2

Original line number	Diff line number	Diff line
		@@ -25,6 +25,7 @@ import android.os.AsyncTask;
		import android.os.Bundle;
		import android.os.Handler;
		import android.os.PowerManager;
		import android.provider.SearchIndexableResource;
		import android.provider.Settings.Global;
		import android.support.annotation.VisibleForTesting;
		import android.util.Log;
		@@ -38,10 +39,16 @@ import com.android.settings.Utils;
		import com.android.settings.dashboard.conditional.BatterySaverCondition;
		import com.android.settings.dashboard.conditional.ConditionManager;
		import com.android.settings.notification.SettingPref;
		import com.android.settings.search.BaseSearchIndexProvider;
		import com.android.settings.search.Indexable;
		import com.android.settings.widget.SwitchBar;

		import java.util.Arrays;
		import java.util.List;

		public class BatterySaverSettings extends SettingsPreferenceFragment
		implements SwitchBar.OnSwitchChangeListener, BatterySaverReceiver.BatterySaverListener {
		implements SwitchBar.OnSwitchChangeListener, BatterySaverReceiver.BatterySaverListener,
		Indexable {
		private static final String TAG = "BatterySaverSettings";
		private static final boolean DEBUG = Log.isLoggable(TAG, Log.DEBUG);
		private static final String KEY_TURN_ON_AUTOMATICALLY = "turn_on_automatically";
		@@ -219,4 +226,18 @@ public class BatterySaverSettings extends SettingsPreferenceFragment
		}
		}
		}

		/**
		* For Search.
		*/
		public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
		new BaseSearchIndexProvider() {
		@Override
		public List<SearchIndexableResource> getXmlResourcesToIndex(
		Context context, boolean enabled) {
		final SearchIndexableResource sir = new SearchIndexableResource(context);
		sir.xmlResId = R.xml.battery_saver_settings;
		return Arrays.asList(sir);
		}
		};
		}

src/com/android/settings/location/LocationSettings.java

+19 −1

Original line number	Diff line number	Diff line
		@@ -27,6 +27,7 @@ import android.location.SettingInjectorService;
		import android.os.Bundle;
		import android.os.UserHandle;
		import android.os.UserManager;
		import android.provider.SearchIndexableResource;
		import android.support.v7.preference.Preference;
		import android.support.v7.preference.PreferenceCategory;
		import android.support.v7.preference.PreferenceGroup;
		@@ -40,6 +41,8 @@ import com.android.settings.SettingsActivity;
		import com.android.settings.Utils;
		import com.android.settings.applications.InstalledAppDetails;
		import com.android.settings.dashboard.SummaryLoader;
		import com.android.settings.search.BaseSearchIndexProvider;
		import com.android.settings.search.Indexable;
		import com.android.settings.widget.SwitchBar;
		import com.android.settingslib.RestrictedLockUtils;
		import com.android.settingslib.RestrictedPreference;
		@@ -47,6 +50,7 @@ import com.android.settingslib.RestrictedSwitchPreference;
		import com.android.settingslib.location.RecentLocationApps;

		import java.util.ArrayList;
		import java.util.Arrays;
		import java.util.Collections;
		import java.util.Comparator;
		import java.util.List;
		@@ -77,7 +81,7 @@ import java.util.List;
		* implementation.
		*/
		public class LocationSettings extends LocationSettingsBase
		implements SwitchBar.OnSwitchChangeListener {
		implements SwitchBar.OnSwitchChangeListener, Indexable {

		private static final String TAG = "LocationSettings";

		@@ -455,4 +459,18 @@ public class LocationSettings extends LocationSettingsBase
		return new SummaryProvider(activity, summaryLoader);
		}
		};

		/**
		* For Search.
		*/
		public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
		new BaseSearchIndexProvider() {
		@Override
		public List<SearchIndexableResource> getXmlResourcesToIndex(
		Context context, boolean enabled) {
		final SearchIndexableResource sir = new SearchIndexableResource(context);
		sir.xmlResId = R.xml.location_settings;
		return Arrays.asList(sir);
		}
		};
		}

src/com/android/settings/location/ScanningSettings.java

+26 −5

Original line number	Diff line number	Diff line
		@@ -16,6 +16,8 @@

		package com.android.settings.location;

		import android.content.Context;
		import android.provider.SearchIndexableResource;
		import android.provider.Settings.Global;
		import android.support.v14.preference.SwitchPreference;
		import android.support.v7.preference.Preference;
		@@ -24,11 +26,16 @@ import android.support.v7.preference.PreferenceScreen;
		import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
		import com.android.settings.R;
		import com.android.settings.SettingsPreferenceFragment;
		import com.android.settings.search.BaseSearchIndexProvider;
		import com.android.settings.search.Indexable;

		import java.util.Arrays;
		import java.util.List;

		/**
		* A page that configures the background scanning settings for Wi-Fi and Bluetooth.
		*/
		public class ScanningSettings extends SettingsPreferenceFragment {
		public class ScanningSettings extends SettingsPreferenceFragment implements Indexable {
		private static final String KEY_WIFI_SCAN_ALWAYS_AVAILABLE = "wifi_always_scanning";
		private static final String KEY_BLUETOOTH_SCAN_ALWAYS_AVAILABLE = "bluetooth_always_scanning";

		@@ -81,4 +88,18 @@ public class ScanningSettings extends SettingsPreferenceFragment {
		}
		return true;
		}

		/**
		* For Search.
		*/
		public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
		new BaseSearchIndexProvider() {
		@Override
		public List<SearchIndexableResource> getXmlResourcesToIndex(
		Context context, boolean enabled) {
		final SearchIndexableResource sir = new SearchIndexableResource(context);
		sir.xmlResId = R.xml.location_scanning;
		return Arrays.asList(sir);
		}
		};
		}

src/com/android/settings/notification/ZenModeBehaviorSettings.java

+22 −1

Original line number	Diff line number	Diff line
		@@ -18,7 +18,9 @@ package com.android.settings.notification;

		import android.app.NotificationManager;
		import android.app.NotificationManager.Policy;
		import android.content.Context;
		import android.os.Bundle;
		import android.provider.SearchIndexableResource;
		import android.provider.Settings;
		import android.service.notification.ZenModeConfig;
		import android.support.v14.preference.SwitchPreference;
		@@ -30,8 +32,13 @@ import android.util.Log;

		import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
		import com.android.settings.R;
		import com.android.settings.search.BaseSearchIndexProvider;
		import com.android.settings.search.Indexable;

		public class ZenModeBehaviorSettings extends ZenModeSettingsBase {
		import java.util.Arrays;
		import java.util.List;

		public class ZenModeBehaviorSettings extends ZenModeSettingsBase implements Indexable {
		private static final String KEY_ALARMS = "zen_mode_alarms";
		private static final String KEY_MEDIA = "zen_mode_media";
		private static final String KEY_REMINDERS = "zen_mode_reminders";
		@@ -303,4 +310,18 @@ public class ZenModeBehaviorSettings extends ZenModeSettingsBase {
		NotificationManager.from(mContext).setNotificationPolicy(mPolicy);
		}

		/**
		* For Search.
		*/
		public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
		new BaseSearchIndexProvider() {
		@Override
		public List<SearchIndexableResource> getXmlResourcesToIndex(
		Context context, boolean enabled) {
		final SearchIndexableResource sir = new SearchIndexableResource(context);
		sir.xmlResId = R.xml.zen_mode_behavior_settings;
		return Arrays.asList(sir);
		}
		};

		}

src/com/android/settings/notification/ZenModeSettings.java

+17 −1

Original line number	Diff line number	Diff line
		@@ -29,6 +29,7 @@ import android.content.pm.PackageManager;
		import android.content.pm.ServiceInfo;
		import android.content.res.Resources;
		import android.os.Bundle;
		import android.provider.SearchIndexableResource;
		import android.provider.Settings;
		import android.service.notification.ConditionProviderService;
		import android.service.notification.ZenModeConfig;
		@@ -41,6 +42,8 @@ import android.view.View;

		import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
		import com.android.settings.R;
		import com.android.settings.search.BaseSearchIndexProvider;
		import com.android.settings.search.Indexable;
		import com.android.settings.utils.ManagedServiceSettings;
		import com.android.settings.utils.ZenServiceListing;
		import com.android.settingslib.TwoTargetPreference;
		@@ -52,7 +55,7 @@ import java.util.List;
		import java.util.Map;
		import java.util.Map.Entry;

		public class ZenModeSettings extends ZenModeSettingsBase {
		public class ZenModeSettings extends ZenModeSettingsBase implements Indexable {

		public static final String KEY_VISUAL_SETTINGS = "zen_mode_visual_interruptions_settings";
		private static final String KEY_BEHAVIOR_SETTINGS = "zen_mode_behavior_settings";
		@@ -499,4 +502,17 @@ public class ZenModeSettings extends ZenModeSettingsBase {
		return type + rule.getName().toString();
		}
		};
		/**
		* For Search.
		*/
		public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
		new BaseSearchIndexProvider() {
		@Override
		public List<SearchIndexableResource> getXmlResourcesToIndex(
		Context context, boolean enabled) {
		final SearchIndexableResource sir = new SearchIndexableResource(context);
		sir.xmlResId = R.xml.zen_mode_settings;
		return Arrays.asList(sir);
		}
		};
		}