PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Deprecate resId field in SearchIndexableResources

Browse Source 
Change-Id: Ie69a68beae51e35c7bc861cd124d8195c1ed39dd
Bug: 37741509
Test: robotests
This commit is contained in:
Fan Zhang
2017-10-23 15:21:09 -07:00
parent 331a4459f0
commit 89b8e5c103
13 changed files with 294 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/com/android/settings/fuelgauge/BatterySaverSettings.java
View File

@@ -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";
@@ -89,7 +96,7 @@ public class BatterySaverSettings extends SettingsPreferenceFragment
protected String getCaption(Resources res, int value) {
if (value > 0 && value < 100) {
return res.getString(R.string.battery_saver_turn_on_automatically_pct,
Utils.formatPercentage(value));
Utils.formatPercentage(value));
}
return res.getString(R.string.battery_saver_turn_on_automatically_never);
}
@@ -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);
}
};
}

20
src/com/android/settings/location/LocationSettings.java
View File

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

31
src/com/android/settings/location/ScanningSettings.java
View File

@@ -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";
@@ -56,13 +63,13 @@ public class ScanningSettings extends SettingsPreferenceFragment {
private void initPreferences() {
final SwitchPreference wifiScanAlwaysAvailable =
(SwitchPreference) findPreference(KEY_WIFI_SCAN_ALWAYS_AVAILABLE);
(SwitchPreference) findPreference(KEY_WIFI_SCAN_ALWAYS_AVAILABLE);
wifiScanAlwaysAvailable.setChecked(Global.getInt(getContentResolver(),
Global.WIFI_SCAN_ALWAYS_AVAILABLE, 0) == 1);
Global.WIFI_SCAN_ALWAYS_AVAILABLE, 0) == 1);
final SwitchPreference bleScanAlwaysAvailable =
(SwitchPreference) findPreference(KEY_BLUETOOTH_SCAN_ALWAYS_AVAILABLE);
(SwitchPreference) findPreference(KEY_BLUETOOTH_SCAN_ALWAYS_AVAILABLE);
bleScanAlwaysAvailable.setChecked(Global.getInt(getContentResolver(),
Global.BLE_SCAN_ALWAYS_AVAILABLE, 0) == 1);
Global.BLE_SCAN_ALWAYS_AVAILABLE, 0) == 1);
}
@Override
@@ -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);
}
};
}

23
src/com/android/settings/notification/ZenModeBehaviorSettings.java
View File

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

18
src/com/android/settings/notification/ZenModeSettings.java
View File

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

23
src/com/android/settings/notification/ZenModeVisualInterruptionSettings.java
View File

@@ -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.support.v14.preference.SwitchPreference;
import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceScreen;
@@ -26,8 +28,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 ZenModeVisualInterruptionSettings extends ZenModeSettingsBase {
import java.util.Arrays;
import java.util.List;
public class ZenModeVisualInterruptionSettings extends ZenModeSettingsBase implements Indexable {
private static final String KEY_SCREEN_OFF = "screenOff";
private static final String KEY_SCREEN_ON = "screenOn";
@@ -122,4 +129,18 @@ public class ZenModeVisualInterruptionSettings extends ZenModeSettingsBase {
suppressedVisualEffects);
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_visual_interruptions_settings;
return Arrays.asList(sir);
}
};
}

146
src/com/android/settings/search/SearchIndexableResources.java
View File

@@ -26,7 +26,6 @@ import com.android.settings.DeviceInfoSettings;
import com.android.settings.DisplaySettings;
import com.android.settings.EncryptionAndCredential;
import com.android.settings.LegalSettings;
import com.android.settings.R;
import com.android.settings.ScreenPinningSettings;
import com.android.settings.SecuritySettings;
import com.android.settings.accessibility.AccessibilitySettings;
@@ -108,15 +107,15 @@ public final class SearchIndexableResources {
static final HashMap<String, SearchIndexableResource> sResMap = new HashMap<>();
@VisibleForTesting
static void addIndex(Class<?> indexClass, @XmlRes int xmlResId) {
addIndex(indexClass, xmlResId, null /* targetAction */);
static void addIndex(Class<?> indexClass) {
addIndex(indexClass, null /* targetAction */);
}
@VisibleForTesting
static void addIndex(Class<?> indexClass, @XmlRes int xmlResId, String targetAction) {
static void addIndex(Class<?> indexClass, String targetAction) {
String className = indexClass.getName();
SearchIndexableResource resource = new SearchIndexableResource(0, xmlResId, className,
NO_RES_ID);
SearchIndexableResource resource = new SearchIndexableResource(
0 /* rank */, NO_RES_ID, className, NO_RES_ID);
if (!TextUtils.isEmpty(targetAction)) {
resource.intentAction = targetAction;
@@ -127,74 +126,73 @@ public final class SearchIndexableResources {
}
static {
addIndex(WifiSettings.class, NO_RES_ID);
addIndex(NetworkDashboardFragment.class, NO_RES_ID);
addIndex(ConfigureWifiSettings.class, NO_RES_ID);
addIndex(SavedAccessPointsWifiSettings.class, NO_RES_ID);
addIndex(BluetoothSettings.class, NO_RES_ID);
addIndex(SimSettings.class, NO_RES_ID);
addIndex(DataUsageSummary.class, NO_RES_ID);
addIndex(DataUsageMeteredSettings.class, NO_RES_ID);
addIndex(ScreenZoomSettings.class, NO_RES_ID);
addIndex(DisplaySettings.class, NO_RES_ID, "android.settings.DISPLAY_SETTINGS");
addIndex(AmbientDisplaySettings.class, NO_RES_ID);
addIndex(WallpaperTypeSettings.class, NO_RES_ID);
addIndex(AppAndNotificationDashboardFragment.class, NO_RES_ID);
addIndex(SoundSettings.class, NO_RES_ID, "android.settings.SOUND_SETTINGS");
addIndex(ZenModeSettings.class, R.xml.zen_mode_settings);
addIndex(StorageSettings.class, NO_RES_ID);
addIndex(PowerUsageAdvanced.class, NO_RES_ID);
addIndex(DefaultAppSettings.class, NO_RES_ID);
addIndex(ManageAssist.class, NO_RES_ID);
addIndex(SpecialAccessSettings.class, NO_RES_ID);
addIndex(UserSettings.class, NO_RES_ID);
addIndex(AssistGestureSettings.class, NO_RES_ID);
addIndex(PickupGestureSettings.class, NO_RES_ID);
addIndex(DoubleTapScreenSettings.class, NO_RES_ID);
addIndex(DoubleTapPowerSettings.class, NO_RES_ID);
addIndex(DoubleTwistGestureSettings.class, NO_RES_ID);
addIndex(SwipeToNotificationSettings.class, NO_RES_ID);
addIndex(GestureSettings.class, NO_RES_ID);
addIndex(LanguageAndInputSettings.class, NO_RES_ID);
addIndex(LocationSettings.class, R.xml.location_settings);
addIndex(ScanningSettings.class, R.xml.location_scanning);
addIndex(SecuritySettings.class, NO_RES_ID);
addIndex(EncryptionAndCredential.class, NO_RES_ID);
addIndex(ScreenPinningSettings.class, NO_RES_ID);
addIndex(UserAndAccountDashboardFragment.class, NO_RES_ID);
addIndex(VirtualKeyboardFragment.class, NO_RES_ID);
addIndex(AvailableVirtualKeyboardFragment.class, NO_RES_ID);
addIndex(PhysicalKeyboardFragment.class, NO_RES_ID);
addIndex(BackupSettingsActivity.class, NO_RES_ID);
addIndex(BackupSettingsFragment.class, NO_RES_ID);
addIndex(DateTimeSettings.class, NO_RES_ID);
addIndex(AccessibilitySettings.class, NO_RES_ID);
addIndex(PrintSettingsFragment.class, NO_RES_ID);
addIndex(DevelopmentSettingsDashboardFragment.class, NO_RES_ID);
addIndex(DeviceInfoSettings.class, NO_RES_ID);
addIndex(Status.class, NO_RES_ID);
addIndex(LegalSettings.class, NO_RES_ID);
addIndex(SystemDashboardFragment.class, NO_RES_ID);
addIndex(ResetDashboardFragment.class, NO_RES_ID);
addIndex(StorageDashboardFragment.class, NO_RES_ID);
addIndex(ConnectedDeviceDashboardFragment.class, NO_RES_ID);
addIndex(EnterprisePrivacySettings.class, NO_RES_ID);
addIndex(PaymentSettings.class, NO_RES_ID);
addIndex(TextToSpeechSettings.class, NO_RES_ID);
addIndex(TtsEnginePreferenceFragment.class, NO_RES_ID);
addIndex(MagnificationPreferenceFragment.class, NO_RES_ID);
addIndex(AccessibilityShortcutPreferenceFragment.class, NO_RES_ID);
addIndex(ChannelImportanceSettings.class, NO_RES_ID);
addIndex(DreamSettings.class, NO_RES_ID);
addIndex(SupportDashboardActivity.class, NO_RES_ID);
addIndex(AutomaticStorageManagerSettings.class, NO_RES_ID);
addIndex(ConfigureNotificationSettings.class, R.xml.configure_notification_settings);
addIndex(ZenModeBehaviorSettings.class, R.xml.zen_mode_behavior_settings);
addIndex(PowerUsageSummary.class, R.xml.power_usage_summary);
addIndex(BatterySaverSettings.class, R.xml.battery_saver_settings);
addIndex(LockscreenDashboardFragment.class, R.xml.security_lockscreen_settings);
addIndex(ZenModeVisualInterruptionSettings.class,
R.xml.zen_mode_visual_interruptions_settings);
addIndex(WifiSettings.class);
addIndex(NetworkDashboardFragment.class);
addIndex(ConfigureWifiSettings.class);
addIndex(SavedAccessPointsWifiSettings.class);
addIndex(BluetoothSettings.class);
addIndex(SimSettings.class);
addIndex(DataUsageSummary.class);
addIndex(DataUsageMeteredSettings.class);
addIndex(ScreenZoomSettings.class);
addIndex(DisplaySettings.class, "android.settings.DISPLAY_SETTINGS");
addIndex(AmbientDisplaySettings.class);
addIndex(WallpaperTypeSettings.class);
addIndex(AppAndNotificationDashboardFragment.class);
addIndex(SoundSettings.class, "android.settings.SOUND_SETTINGS");
addIndex(ZenModeSettings.class);
addIndex(StorageSettings.class);
addIndex(PowerUsageAdvanced.class);
addIndex(DefaultAppSettings.class);
addIndex(ManageAssist.class);
addIndex(SpecialAccessSettings.class);
addIndex(UserSettings.class);
addIndex(AssistGestureSettings.class);
addIndex(PickupGestureSettings.class);
addIndex(DoubleTapScreenSettings.class);
addIndex(DoubleTapPowerSettings.class);
addIndex(DoubleTwistGestureSettings.class);
addIndex(SwipeToNotificationSettings.class);
addIndex(GestureSettings.class);
addIndex(LanguageAndInputSettings.class);
addIndex(LocationSettings.class);
addIndex(ScanningSettings.class);
addIndex(SecuritySettings.class);
addIndex(EncryptionAndCredential.class);
addIndex(ScreenPinningSettings.class);
addIndex(UserAndAccountDashboardFragment.class);
addIndex(VirtualKeyboardFragment.class);
addIndex(AvailableVirtualKeyboardFragment.class);
addIndex(PhysicalKeyboardFragment.class);
addIndex(BackupSettingsActivity.class);
addIndex(BackupSettingsFragment.class);
addIndex(DateTimeSettings.class);
addIndex(AccessibilitySettings.class);
addIndex(PrintSettingsFragment.class);
addIndex(DevelopmentSettingsDashboardFragment.class);
addIndex(DeviceInfoSettings.class);
addIndex(Status.class);
addIndex(LegalSettings.class);
addIndex(SystemDashboardFragment.class);
addIndex(ResetDashboardFragment.class);
addIndex(StorageDashboardFragment.class);
addIndex(ConnectedDeviceDashboardFragment.class);
addIndex(EnterprisePrivacySettings.class);
addIndex(PaymentSettings.class);
addIndex(TextToSpeechSettings.class);
addIndex(TtsEnginePreferenceFragment.class);
addIndex(MagnificationPreferenceFragment.class);
addIndex(AccessibilityShortcutPreferenceFragment.class);
addIndex(ChannelImportanceSettings.class);
addIndex(DreamSettings.class);
addIndex(SupportDashboardActivity.class);
addIndex(AutomaticStorageManagerSettings.class);
addIndex(ConfigureNotificationSettings.class);
addIndex(PowerUsageSummary.class);
addIndex(BatterySaverSettings.class);
addIndex(LockscreenDashboardFragment.class);
addIndex(ZenModeBehaviorSettings.class);
addIndex(ZenModeVisualInterruptionSettings.class);
}
private SearchIndexableResources() {

6
src/com/android/settings/search/indexing/IndexDataConverter.java
View File

@@ -30,7 +30,6 @@ import android.util.Log;
import android.util.Xml;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settings.search.DatabaseIndexingUtils;
import com.android.settings.search.Indexable;
import com.android.settings.search.ResultPayload;
@@ -44,7 +43,6 @@ import java.io.IOException;
import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
import java.util.Locale;
import java.util.Map;
import java.util.Set;
@@ -310,8 +308,8 @@ public class IndexDataConverter {
} catch (XmlPullParserException e) {
Log.w(LOG_TAG, "XML Error parsing PreferenceScreen: ", e);
} catch (IOException e) {
Log.w(LOG_TAG, "IO Error parsing PreferenceScreen: " , e);
} catch (Resources.NotFoundException e ) {
Log.w(LOG_TAG, "IO Error parsing PreferenceScreen: ", e);
} catch (Resources.NotFoundException e) {
Log.w(LOG_TAG, "Resoucre not found error parsing PreferenceScreen: ", e);
} finally {
if (parser != null) parser.close();