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

Deprecate Icons from SearchIndexableResources

Browse Source 
Change-Id: Ic1b9fa1cf5c7ab171b645565a9db5db1993ac85f
Fixes: 38027997
Test: robotests
This commit is contained in:
Fan Zhang
2017-10-23 14:11:34 -07:00
parent 9d85cfe762
commit f183b6870c
2 changed files with 80 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -17,7 +17,6 @@
package com.android.settings.search; package com.android.settings.search;
import android.provider.SearchIndexableResource; import android.provider.SearchIndexableResource;
import android.support.annotation.DrawableRes;
import android.support.annotation.VisibleForTesting; import android.support.annotation.VisibleForTesting;
import android.support.annotation.XmlRes; import android.support.annotation.XmlRes;
import android.text.TextUtils; import android.text.TextUtils;
@@ -104,23 +103,21 @@ public final class SearchIndexableResources {
public static final String SUBSETTING_TARGET_PACKAGE = "subsetting_target_package"; public static final String SUBSETTING_TARGET_PACKAGE = "subsetting_target_package";
@XmlRes @XmlRes
public static final int NO_DATA_RES_ID = 0; public static final int NO_RES_ID = 0;
@VisibleForTesting @VisibleForTesting
static final HashMap<String, SearchIndexableResource> sResMap = new HashMap<>(); static final HashMap<String, SearchIndexableResource> sResMap = new HashMap<>();
@VisibleForTesting @VisibleForTesting
static void addIndex(Class<?> indexClass, @XmlRes int xmlResId, static void addIndex(Class<?> indexClass, @XmlRes int xmlResId) {
@DrawableRes int iconResId) { addIndex(indexClass, xmlResId, null /* targetAction */);
addIndex(indexClass, xmlResId, iconResId, null /* targetAction */);
} }
@VisibleForTesting @VisibleForTesting
static void addIndex(Class<?> indexClass, @XmlRes int xmlResId, static void addIndex(Class<?> indexClass, @XmlRes int xmlResId, String targetAction) {
@DrawableRes int iconResId, String targetAction) {
String className = indexClass.getName(); String className = indexClass.getName();
SearchIndexableResource resource = SearchIndexableResource resource = new SearchIndexableResource(0, xmlResId, className,
new SearchIndexableResource(0, xmlResId, className, iconResId); NO_RES_ID);
if (!TextUtils.isEmpty(targetAction)) { if (!TextUtils.isEmpty(targetAction)) {
resource.intentAction = targetAction; resource.intentAction = targetAction;
@@ -131,98 +128,75 @@ public final class SearchIndexableResources {
} }
static { static {
addIndex(WifiSettings.class, NO_DATA_RES_ID, R.drawable.ic_settings_wireless); addIndex(WifiSettings.class, NO_RES_ID);
addIndex(NetworkDashboardFragment.class, NO_DATA_RES_ID, R.drawable.ic_settings_wireless); addIndex(NetworkDashboardFragment.class, NO_RES_ID);
addIndex(ConfigureWifiSettings.class, NO_DATA_RES_ID, R.drawable.ic_settings_wireless); addIndex(ConfigureWifiSettings.class, NO_RES_ID);
addIndex(SavedAccessPointsWifiSettings.class, NO_DATA_RES_ID, addIndex(SavedAccessPointsWifiSettings.class, NO_RES_ID);
R.drawable.ic_settings_wireless); addIndex(BluetoothSettings.class, NO_RES_ID);
addIndex(BluetoothSettings.class, NO_DATA_RES_ID, R.drawable.ic_settings_bluetooth); addIndex(SimSettings.class, NO_RES_ID);
addIndex(SimSettings.class, NO_DATA_RES_ID, R.drawable.ic_sim_sd); addIndex(DataPlanUsageSummary.class, NO_RES_ID);
addIndex(DataPlanUsageSummary.class, NO_DATA_RES_ID, R.drawable.ic_settings_data_usage); addIndex(DataUsageSummary.class, NO_RES_ID);
addIndex(DataUsageSummary.class, NO_DATA_RES_ID, R.drawable.ic_settings_data_usage); addIndex(DataUsageMeteredSettings.class, NO_RES_ID);
addIndex(DataUsageMeteredSettings.class, NO_DATA_RES_ID, R.drawable.ic_settings_data_usage); addIndex(ScreenZoomSettings.class, NO_RES_ID);
addIndex(ScreenZoomSettings.class, NO_DATA_RES_ID, R.drawable.ic_settings_display); addIndex(DisplaySettings.class, NO_RES_ID, "android.settings.DISPLAY_SETTINGS");
addIndex(DisplaySettings.class, NO_DATA_RES_ID, R.drawable.ic_settings_display, addIndex(AmbientDisplaySettings.class, NO_RES_ID);
"android.settings.DISPLAY_SETTINGS"); addIndex(WallpaperTypeSettings.class, NO_RES_ID);
addIndex(AmbientDisplaySettings.class, NO_DATA_RES_ID, R.drawable.ic_settings_display); addIndex(AppAndNotificationDashboardFragment.class, NO_RES_ID);
addIndex(WallpaperTypeSettings.class, NO_DATA_RES_ID, R.drawable.ic_settings_display); addIndex(SoundSettings.class, NO_RES_ID, "android.settings.SOUND_SETTINGS");
addIndex(ConfigureNotificationSettings.class, addIndex(ZenModeSettings.class, R.xml.zen_mode_settings);
R.xml.configure_notification_settings, R.drawable.ic_settings_notifications); addIndex(StorageSettings.class, NO_RES_ID);
addIndex(AppAndNotificationDashboardFragment.class, NO_DATA_RES_ID, addIndex(PowerUsageAdvanced.class, NO_RES_ID);
R.drawable.ic_settings_applications); addIndex(DefaultAppSettings.class, NO_RES_ID);
addIndex(SoundSettings.class, NO_DATA_RES_ID, R.drawable.ic_settings_sound, addIndex(ManageAssist.class, NO_RES_ID);
"android.settings.SOUND_SETTINGS"); addIndex(SpecialAccessSettings.class, NO_RES_ID);
addIndex(ZenModeSettings.class, addIndex(UserSettings.class, NO_RES_ID);
R.xml.zen_mode_settings, R.drawable.ic_settings_notifications); addIndex(AssistGestureSettings.class, NO_RES_ID);
addIndex(ZenModeBehaviorSettings.class, addIndex(PickupGestureSettings.class, NO_RES_ID);
R.xml.zen_mode_behavior_settings, R.drawable.ic_settings_notifications); addIndex(DoubleTapScreenSettings.class, NO_RES_ID);
addIndex(StorageSettings.class, NO_DATA_RES_ID, R.drawable.ic_settings_storage); addIndex(DoubleTapPowerSettings.class, NO_RES_ID);
addIndex(PowerUsageSummary.class, addIndex(DoubleTwistGestureSettings.class, NO_RES_ID);
R.xml.power_usage_summary, R.drawable.ic_settings_battery); addIndex(SwipeToNotificationSettings.class, NO_RES_ID);
addIndex(PowerUsageAdvanced.class, NO_DATA_RES_ID, R.drawable.ic_settings_battery); addIndex(GestureSettings.class, NO_RES_ID);
addIndex(BatterySaverSettings.class, addIndex(LanguageAndInputSettings.class, NO_RES_ID);
R.xml.battery_saver_settings, R.drawable.ic_settings_battery); addIndex(LocationSettings.class, R.xml.location_settings);
addIndex(DefaultAppSettings.class, NO_DATA_RES_ID, R.drawable.ic_settings_applications); addIndex(ScanningSettings.class, R.xml.location_scanning);
addIndex(ManageAssist.class, NO_DATA_RES_ID, R.drawable.ic_settings_applications); addIndex(SecuritySettings.class, NO_RES_ID);
addIndex(SpecialAccessSettings.class, NO_DATA_RES_ID, R.drawable.ic_settings_applications); addIndex(EncryptionAndCredential.class, NO_RES_ID);
addIndex(UserSettings.class, NO_DATA_RES_ID, R.drawable.ic_settings_multiuser); addIndex(ScreenPinningSettings.class, NO_RES_ID);
addIndex(AssistGestureSettings.class, NO_DATA_RES_ID, R.drawable.ic_settings_gestures); addIndex(UserAndAccountDashboardFragment.class, NO_RES_ID);
addIndex(PickupGestureSettings.class, NO_DATA_RES_ID, R.drawable.ic_settings_gestures); addIndex(VirtualKeyboardFragment.class, NO_RES_ID);
addIndex(DoubleTapScreenSettings.class, NO_DATA_RES_ID, R.drawable.ic_settings_gestures); addIndex(AvailableVirtualKeyboardFragment.class, NO_RES_ID);
addIndex(DoubleTapPowerSettings.class, NO_DATA_RES_ID, R.drawable.ic_settings_gestures); addIndex(PhysicalKeyboardFragment.class, NO_RES_ID);
addIndex(DoubleTwistGestureSettings.class, NO_DATA_RES_ID, R.drawable.ic_settings_gestures); addIndex(BackupSettingsActivity.class, NO_RES_ID);
addIndex(SwipeToNotificationSettings.class, NO_DATA_RES_ID, addIndex(BackupSettingsFragment.class, NO_RES_ID);
R.drawable.ic_settings_gestures); addIndex(DateTimeSettings.class, NO_RES_ID);
addIndex(GestureSettings.class, NO_DATA_RES_ID, R.drawable.ic_settings_gestures); addIndex(AccessibilitySettings.class, NO_RES_ID);
addIndex(LanguageAndInputSettings.class, NO_DATA_RES_ID, R.drawable.ic_settings_language); addIndex(PrintSettingsFragment.class, NO_RES_ID);
addIndex(LocationSettings.class, R.xml.location_settings, R.drawable.ic_settings_location); addIndex(DevelopmentSettingsDashboardFragment.class, NO_RES_ID);
addIndex(ScanningSettings.class, R.xml.location_scanning, R.drawable.ic_settings_location); addIndex(DeviceInfoSettings.class, NO_RES_ID);
addIndex(SecuritySettings.class, NO_DATA_RES_ID, R.drawable.ic_settings_security); addIndex(Status.class, NO_RES_ID);
addIndex(EncryptionAndCredential.class, NO_DATA_RES_ID, R.drawable.ic_settings_security); addIndex(LegalSettings.class, NO_RES_ID);
addIndex(ScreenPinningSettings.class, NO_DATA_RES_ID, R.drawable.ic_settings_security); addIndex(SystemDashboardFragment.class, NO_RES_ID);
addIndex(UserAndAccountDashboardFragment.class, NO_DATA_RES_ID, addIndex(ResetDashboardFragment.class, NO_RES_ID);
R.drawable.ic_settings_accounts); addIndex(StorageDashboardFragment.class, NO_RES_ID);
addIndex(VirtualKeyboardFragment.class, NO_DATA_RES_ID, R.drawable.ic_settings_language); addIndex(ConnectedDeviceDashboardFragment.class, NO_RES_ID);
addIndex(AvailableVirtualKeyboardFragment.class, addIndex(EnterprisePrivacySettings.class, NO_RES_ID);
NO_DATA_RES_ID, R.drawable.ic_settings_language); addIndex(PaymentSettings.class, NO_RES_ID);
addIndex(PhysicalKeyboardFragment.class, NO_DATA_RES_ID, R.drawable.ic_settings_language); addIndex(TextToSpeechSettings.class, NO_RES_ID);
addIndex(BackupSettingsActivity.class, NO_DATA_RES_ID, R.drawable.ic_settings_backup); addIndex(TtsEnginePreferenceFragment.class, NO_RES_ID);
addIndex(BackupSettingsFragment.class, NO_DATA_RES_ID, R.drawable.ic_settings_backup); addIndex(MagnificationPreferenceFragment.class, NO_RES_ID);
addIndex(DateTimeSettings.class, NO_DATA_RES_ID, R.drawable.ic_settings_date_time); addIndex(AccessibilityShortcutPreferenceFragment.class, NO_RES_ID);
addIndex(AccessibilitySettings.class, NO_DATA_RES_ID, R.drawable.ic_settings_accessibility); addIndex(ChannelImportanceSettings.class, NO_RES_ID);
addIndex(PrintSettingsFragment.class, NO_DATA_RES_ID, R.drawable.ic_settings_print); addIndex(DreamSettings.class, NO_RES_ID);
addIndex(DevelopmentSettingsDashboardFragment.class, NO_DATA_RES_ID, addIndex(SupportDashboardActivity.class, NO_RES_ID);
R.drawable.ic_settings_development); addIndex(AutomaticStorageManagerSettings.class, NO_RES_ID);
addIndex(DeviceInfoSettings.class, NO_DATA_RES_ID, R.drawable.ic_settings_about); addIndex(ConfigureNotificationSettings.class, R.xml.configure_notification_settings);
addIndex(Status.class, NO_DATA_RES_ID, 0 /* icon */); addIndex(ZenModeBehaviorSettings.class, R.xml.zen_mode_behavior_settings);
addIndex(LegalSettings.class, NO_DATA_RES_ID, R.drawable.ic_settings_about); 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, addIndex(ZenModeVisualInterruptionSettings.class,
R.xml.zen_mode_visual_interruptions_settings, R.xml.zen_mode_visual_interruptions_settings);
R.drawable.ic_settings_notifications);
addIndex(SystemDashboardFragment.class, NO_DATA_RES_ID, R.drawable.ic_settings_about);
addIndex(ResetDashboardFragment.class, NO_DATA_RES_ID, R.drawable.ic_restore);
addIndex(StorageDashboardFragment.class, NO_DATA_RES_ID, R.drawable.ic_settings_storage);
addIndex(ConnectedDeviceDashboardFragment.class, NO_DATA_RES_ID,
R.drawable.ic_devices_other);
addIndex(EnterprisePrivacySettings.class, NO_DATA_RES_ID, R.drawable.ic_settings_about);
addIndex(PaymentSettings.class, NO_DATA_RES_ID, R.drawable.ic_settings_nfc_payment);
addIndex(TextToSpeechSettings.class, NO_DATA_RES_ID, R.drawable.ic_settings_accessibility);
addIndex(
TtsEnginePreferenceFragment.class, NO_DATA_RES_ID, R.drawable.ic_settings_language);
addIndex(LockscreenDashboardFragment.class, R.xml.security_lockscreen_settings,
R.drawable.ic_settings_security);
addIndex(MagnificationPreferenceFragment.class, NO_DATA_RES_ID,
R.drawable.ic_settings_accessibility);
addIndex(AccessibilityShortcutPreferenceFragment.class, NO_DATA_RES_ID,
R.drawable.ic_settings_accessibility);
addIndex(ChannelImportanceSettings.class, NO_DATA_RES_ID,
R.drawable.ic_settings_notifications);
addIndex(DreamSettings.class, NO_DATA_RES_ID, R.drawable.ic_settings_display);
addIndex(SupportDashboardActivity.class, NO_DATA_RES_ID, R.drawable.ic_help);
addIndex(
AutomaticStorageManagerSettings.class,
NO_DATA_RES_ID,
R.drawable.ic_settings_storage);
} }
private SearchIndexableResources() { private SearchIndexableResources() {

15
tests/robotests/src/com/android/settings/search/SearchIndexableResourcesTest.java
View File

@@ -17,12 +17,11 @@
package com.android.settings.search; package com.android.settings.search;
import static android.provider.SearchIndexablesContract.COLUMN_INDEX_NON_INDEXABLE_KEYS_KEY_VALUE; import static android.provider.SearchIndexablesContract.COLUMN_INDEX_NON_INDEXABLE_KEYS_KEY_VALUE;
import static com.android.settings.search.SearchIndexableResources.NO_DATA_RES_ID; import static com.android.settings.search.SearchIndexableResources.NO_RES_ID;
import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.Truth.assertThat;
import static org.mockito.Mockito.spy; import static org.mockito.Mockito.spy;
import android.annotation.DrawableRes;
import android.annotation.XmlRes; import android.annotation.XmlRes;
import android.database.Cursor; import android.database.Cursor;
import android.provider.SearchIndexableResource; import android.provider.SearchIndexableResource;
@@ -48,8 +47,6 @@ public class SearchIndexableResourcesTest {
@XmlRes @XmlRes
private static final int XML_RES_ID = R.xml.physical_keyboard_settings; private static final int XML_RES_ID = R.xml.physical_keyboard_settings;
@DrawableRes
private static final int ICON_RES_ID = R.drawable.ic_settings_language;
Map<String, SearchIndexableResource> sResMapCopy; Map<String, SearchIndexableResource> sResMapCopy;
@@ -72,14 +69,14 @@ public class SearchIndexableResourcesTest {
assertThat(SearchIndexableResources.getResourceByName("java.lang.String")).isNull(); assertThat(SearchIndexableResources.getResourceByName("java.lang.String")).isNull();
final int beforeCount = SearchIndexableResources.values().size(); final int beforeCount = SearchIndexableResources.values().size();
SearchIndexableResources.addIndex(java.lang.String.class, XML_RES_ID, ICON_RES_ID); SearchIndexableResources.addIndex(java.lang.String.class, XML_RES_ID);
final SearchIndexableResource index = SearchIndexableResources final SearchIndexableResource index = SearchIndexableResources
.getResourceByName("java.lang.String"); .getResourceByName("java.lang.String");
assertThat(index).isNotNull(); assertThat(index).isNotNull();
assertThat(index.className).isEqualTo("java.lang.String"); assertThat(index.className).isEqualTo("java.lang.String");
assertThat(index.xmlResId).isEqualTo(XML_RES_ID); assertThat(index.xmlResId).isEqualTo(XML_RES_ID);
assertThat(index.iconResId).isEqualTo(ICON_RES_ID); assertThat(index.iconResId).isEqualTo(NO_RES_ID);
final int afterCount = SearchIndexableResources.values().size(); final int afterCount = SearchIndexableResources.values().size();
assertThat(afterCount).isEqualTo(beforeCount + 1); assertThat(afterCount).isEqualTo(beforeCount + 1);
} }
@@ -91,14 +88,14 @@ public class SearchIndexableResourcesTest {
assertThat(index).isNotNull(); assertThat(index).isNotNull();
assertThat(index.className).isEqualTo(WifiSettings.class.getName()); assertThat(index.className).isEqualTo(WifiSettings.class.getName());
assertThat(index.xmlResId).isEqualTo(NO_DATA_RES_ID); assertThat(index.xmlResId).isEqualTo(NO_RES_ID);
assertThat(index.iconResId).isEqualTo(R.drawable.ic_settings_wireless); assertThat(index.iconResId).isEqualTo(NO_RES_ID);
} }
@Test @Test
public void testNonIndexableKeys_GetsKeyFromProvider() { public void testNonIndexableKeys_GetsKeyFromProvider() {
SearchIndexableResources.sResMap.clear(); SearchIndexableResources.sResMap.clear();
SearchIndexableResources.addIndex(FakeIndexProvider.class, 0, 0); SearchIndexableResources.addIndex(FakeIndexProvider.class, 0);
SettingsSearchIndexablesProvider provider = spy(new SettingsSearchIndexablesProvider()); SettingsSearchIndexablesProvider provider = spy(new SettingsSearchIndexablesProvider());