diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 2549f6153db..0145de975c7 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -537,11 +537,11 @@ - + + android:value="com.android.settings.category.ia.system" /> + android:parentActivityName="Settings$LanguageAndInputSettingsActivity"> @@ -568,25 +568,25 @@ android:value="true" /> - + android:parentActivityName="Settings$SystemDashboardActivity"> - - + + + android:value="com.android.settings.category.ia.system"/> + android:value="com.android.settings.language.LanguageAndInputSettings"/> + android:value="true"/> + android:targetActivity="Settings$LanguageAndInputSettingsActivity"> + android:value="com.android.settings.language.LanguageAndInputSettings" /> + android:parentActivityName="Settings$LanguageAndInputSettingsActivity"> @@ -692,7 +692,7 @@ + android:parentActivityName="Settings$LanguageAndInputSettingsActivity"> @@ -955,11 +955,11 @@ - + + android:value="com.android.settings.category.ia.system" /> - + + android:value="com.android.settings.category.ia.homepage" /> + + android:parentActivityName="Settings$LanguageAndInputSettingsActivity"> @@ -1540,11 +1542,11 @@ - + + android:value="com.android.settings.category.ia.system" /> @@ -1918,11 +1920,11 @@ - + + android:value="com.android.settings.category.ia.system" /> - - - - - - - - - - - - - - - + - + + android:value="com.android.settings.category.ia.system" /> @@ -3118,21 +3100,6 @@ android:value="true" /> - - - - - - - - - - @@ -3161,78 +3128,6 @@ android:resource="@string/support_summary"/> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -3335,18 +3230,6 @@ android:value="true"/> - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/res/xml/language_settings.xml b/res/xml/language_settings.xml deleted file mode 100644 index 8aa105b2020..00000000000 --- a/res/xml/language_settings.xml +++ /dev/null @@ -1,89 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/com/android/settings/Settings.java b/src/com/android/settings/Settings.java index e92027a4e8a..a2b499dcc3f 100644 --- a/src/com/android/settings/Settings.java +++ b/src/com/android/settings/Settings.java @@ -40,7 +40,6 @@ public class Settings extends SettingsActivity { public static class PublicVolumeSettingsActivity extends SettingsActivity { /* empty */ } public static class WifiSettingsActivity extends SettingsActivity { /* empty */ } public static class WifiP2pSettingsActivity extends SettingsActivity { /* empty */ } - public static class InputMethodAndLanguageSettingsActivity extends SettingsActivity { /* empty */ } public static class AvailableVirtualKeyboardActivity extends SettingsActivity { /* empty */ } public static class KeyboardLayoutPickerActivity extends SettingsActivity { /* empty */ } public static class PhysicalKeyboardActivity extends SettingsActivity { /* empty */ } @@ -68,10 +67,7 @@ public class Settings extends SettingsActivity { } public static class BackgroundCheckSummaryActivity extends SettingsActivity { /* empty */ } public static class StorageUseActivity extends SettingsActivity { /* empty */ } - public static class DevelopmentSettingsActivity extends SettingsActivity { - public static final String DASHBOARD_ALIAS = - "com.android.settings.DevelopmentSettingsDashboardAlias"; - } + public static class DevelopmentSettingsActivity extends SettingsActivity { /* empty */ } public static class AccessibilitySettingsActivity extends SettingsActivity { /* empty */ } public static class CaptioningSettingsActivity extends SettingsActivity { /* empty */ } public static class AccessibilityInversionSettingsActivity extends SettingsActivity { /* empty */ } @@ -87,7 +83,6 @@ public class Settings extends SettingsActivity { public static class BatterySaverSettingsActivity extends SettingsActivity { /* empty */ } public static class AccountSyncSettingsActivity extends SettingsActivity { /* empty */ } public static class AccountSyncSettingsInAddAccountActivity extends SettingsActivity { /* empty */ } - public static class GestureSettingsActivity extends SettingsActivity { /* empty */ } public static class CryptKeeperSettingsActivity extends SettingsActivity { /* empty */ } public static class DeviceAdminSettingsActivity extends SettingsActivity { /* empty */ } public static class DataUsageSummaryActivity extends SettingsActivity { /* empty */ } diff --git a/src/com/android/settings/SettingsActivity.java b/src/com/android/settings/SettingsActivity.java index 00bdf5780d7..b0426addc23 100644 --- a/src/com/android/settings/SettingsActivity.java +++ b/src/com/android/settings/SettingsActivity.java @@ -951,9 +951,6 @@ public class SettingsActivity extends SettingsDrawerActivity setTileEnabled(new ComponentName(packageName, Settings.DevelopmentSettingsActivity.class.getName()), showDev, isAdmin); - setTileEnabled(new ComponentName(packageName, - Settings.DevelopmentSettingsActivity.DASHBOARD_ALIAS), - showDev, isAdmin); if (UserHandle.MU_ENABLED && !isAdmin) { // When on restricted users, disable all extra categories (but only the settings ones). @@ -981,17 +978,11 @@ public class SettingsActivity extends SettingsDrawerActivity setTileEnabled(new ComponentName(packageName, BackupSettingsActivity.class.getName()), true, isAdmin || Utils.isCarrierDemoUser(this)); - setTileEnabled(new ComponentName(packageName, - "com.android.settings.BackupResetDashboardAlias"), true, isAdmin); setTileEnabled(new ComponentName(packageName, Settings.EnterprisePrivacySettingsActivity.class.getName()), FeatureFactory.getFactory(this).getEnterprisePrivacyFeatureProvider(this) .hasDeviceOwner(), isAdmin); - setTileEnabled(new ComponentName(packageName, - "com.android.settings.EnterprisePrivacyDashboardAlias"), - FeatureFactory.getFactory(this).getEnterprisePrivacyFeatureProvider(this) - .hasDeviceOwner(), isAdmin); // Final step, refresh categories. updateCategories(); } diff --git a/src/com/android/settings/core/gateway/SettingsGateway.java b/src/com/android/settings/core/gateway/SettingsGateway.java index e0bb8bc16d9..add504eff9b 100644 --- a/src/com/android/settings/core/gateway/SettingsGateway.java +++ b/src/com/android/settings/core/gateway/SettingsGateway.java @@ -84,11 +84,9 @@ import com.android.settings.gestures.AssistGestureSettings; import com.android.settings.gestures.DoubleTapPowerSettings; import com.android.settings.gestures.DoubleTapScreenSettings; import com.android.settings.gestures.DoubleTwistGestureSettings; -import com.android.settings.gestures.GestureSettings; import com.android.settings.gestures.PickupGestureSettings; import com.android.settings.gestures.SwipeToNotificationSettings; import com.android.settings.inputmethod.AvailableVirtualKeyboardFragment; -import com.android.settings.inputmethod.InputMethodAndLanguageSettings; import com.android.settings.inputmethod.KeyboardLayoutPickerFragment; import com.android.settings.inputmethod.PhysicalKeyboardFragment; import com.android.settings.inputmethod.SpellCheckersSettings; @@ -147,7 +145,6 @@ public class SettingsGateway { VpnSettings.class.getName(), DateTimeSettings.class.getName(), LocaleListEditor.class.getName(), - InputMethodAndLanguageSettings.class.getName(), AvailableVirtualKeyboardFragment.class.getName(), LanguageAndInputSettings.class.getName(), SpellCheckersSettings.class.getName(), @@ -180,7 +177,6 @@ public class SettingsGateway { WifiDisplaySettings.class.getName(), PowerUsageSummary.class.getName(), AccountSyncSettings.class.getName(), - GestureSettings.class.getName(), AssistGestureSettings.class.getName(), SwipeToNotificationSettings.class.getName(), DoubleTapPowerSettings.class.getName(), @@ -263,11 +259,9 @@ public class SettingsGateway { Settings.StorageSettingsActivity.class.getName(), Settings.ManageApplicationsActivity.class.getName(), Settings.PowerUsageSummaryActivity.class.getName(), - Settings.GestureSettingsActivity.class.getName(), //personal_section Settings.LocationSettingsActivity.class.getName(), Settings.SecuritySettingsActivity.class.getName(), - Settings.InputMethodAndLanguageSettingsActivity.class.getName(), Settings.UserSettingsActivity.class.getName(), //system_section Settings.DateTimeSettingsActivity.class.getName(), @@ -296,9 +290,5 @@ public class SettingsGateway { "com.android.settings.DataUsageDashboardAlias", // Home page > System Settings.LanguageAndInputSettingsActivity.class.getName(), - "com.android.settings.DateTimeDashboardAlias", - "com.android.settings.AccessibilityDashboardAlias", - "com.android.settings.AboutDeviceDashboardAlias", - "com.android.settings.EnterprisePrivacyDashboardAlias", }; } diff --git a/src/com/android/settings/dashboard/DashboardFragmentRegistry.java b/src/com/android/settings/dashboard/DashboardFragmentRegistry.java index 4d0b8cf37ea..8935ee38b54 100644 --- a/src/com/android/settings/dashboard/DashboardFragmentRegistry.java +++ b/src/com/android/settings/dashboard/DashboardFragmentRegistry.java @@ -28,7 +28,6 @@ import com.android.settings.applications.AppAndNotificationDashboardFragment; import com.android.settings.connecteddevice.ConnectedDeviceDashboardFragment; import com.android.settings.deviceinfo.StorageDashboardFragment; import com.android.settings.fuelgauge.PowerUsageSummary; -import com.android.settings.inputmethod.InputMethodAndLanguageSettings; import com.android.settings.language.LanguageAndInputSettings; import com.android.settings.network.NetworkDashboardFragment; import com.android.settings.notification.SoundSettings; @@ -80,8 +79,6 @@ public class DashboardFragmentRegistry { CategoryKey.CATEGORY_ACCOUNT); PARENT_TO_CATEGORY_KEY_MAP.put( SystemDashboardFragment.class.getName(), CategoryKey.CATEGORY_SYSTEM); - PARENT_TO_CATEGORY_KEY_MAP.put(InputMethodAndLanguageSettings.class.getName(), - CategoryKey.CATEGORY_SYSTEM_LANGUAGE); PARENT_TO_CATEGORY_KEY_MAP.put(LanguageAndInputSettings.class.getName(), CategoryKey.CATEGORY_SYSTEM_LANGUAGE); PARENT_TO_CATEGORY_KEY_MAP.put(DevelopmentSettings.class.getName(), diff --git a/src/com/android/settings/gestures/GestureSettings.java b/src/com/android/settings/gestures/GestureSettings.java deleted file mode 100644 index 8c038ff5961..00000000000 --- a/src/com/android/settings/gestures/GestureSettings.java +++ /dev/null @@ -1,148 +0,0 @@ -/* - * Copyright (C) 2016 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.android.settings.gestures; - -import android.content.Context; -import android.os.Bundle; -import android.os.UserHandle; -import android.provider.SearchIndexableResource; -import android.support.v7.preference.Preference; -import android.support.v7.widget.RecyclerView; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; - -import com.android.internal.hardware.AmbientDisplayConfiguration; -import com.android.internal.logging.nano.MetricsProto.MetricsEvent; -import com.android.settings.R; -import com.android.settings.core.PreferenceController; -import com.android.settings.core.lifecycle.Lifecycle; -import com.android.settings.dashboard.DashboardFragment; -import com.android.settings.search.BaseSearchIndexProvider; -import com.android.settings.search.Indexable; - -import java.util.ArrayList; -import java.util.List; - -/** - * Top level fragment for gesture settings. - * This will create individual switch preference for each gesture and handle updates when each - * preference is updated - */ -public class GestureSettings extends DashboardFragment { - - private static final String TAG = "GestureSettings"; - private List mPreferences; - - @Override - protected int getPreferenceScreenResId() { - return R.xml.gesture_settings; - } - - @Override - protected List getPreferenceControllers(Context context) { - final AmbientDisplayConfiguration ambientConfig = new AmbientDisplayConfiguration(context); - final List controllers = new ArrayList<>(); - final Lifecycle lifecycle = getLifecycle(); - controllers.add(new AssistGesturePreferenceController(context, lifecycle)); - controllers.add(new SwipeToNotificationPreferenceController(context, lifecycle)); - controllers.add(new DoubleTapPowerPreferenceController(context, lifecycle)); - controllers.add(new DoubleTwistPreferenceController(context, lifecycle)); - controllers.add(new PickupGesturePreferenceController( - context, lifecycle, ambientConfig, UserHandle.myUserId())); - controllers.add(new DoubleTapScreenPreferenceController( - context, lifecycle, ambientConfig, UserHandle.myUserId())); - return controllers; - } - - @Override - public void onCreatePreferences(Bundle savedInstanceState, String rootKey) { - super.onCreatePreferences(savedInstanceState, rootKey); - mPreferences = new ArrayList(); - addPreferenceToTrackingList(AssistGesturePreferenceController.class); - addPreferenceToTrackingList(SwipeToNotificationPreferenceController.class); - addPreferenceToTrackingList(DoubleTapScreenPreferenceController.class); - addPreferenceToTrackingList(DoubleTwistPreferenceController.class); - addPreferenceToTrackingList(PickupGesturePreferenceController.class); - addPreferenceToTrackingList(DoubleTapPowerPreferenceController.class); - } - - @Override - public View onCreateView(LayoutInflater inflater, ViewGroup container, - Bundle savedInstanceState) { - View view = super.onCreateView(inflater, container, savedInstanceState); - RecyclerView listview = getListView(); - listview.addOnScrollListener(new RecyclerView.OnScrollListener() { - @Override - public void onScrollStateChanged(RecyclerView recyclerView, int newState) { - if (newState == RecyclerView.SCROLL_STATE_DRAGGING) { - for (GesturePreference pref : mPreferences) { - pref.setScrolling(true); - } - } else if (newState == RecyclerView.SCROLL_STATE_IDLE) { - for (GesturePreference pref : mPreferences) { - pref.setScrolling(false); - } - } - } - - @Override - public void onScrolled(RecyclerView recyclerView, int dx, int dy) { - } - }); - return view; - } - - @Override - public void onStart() { - super.onStart(); - for (GesturePreference preference : mPreferences) { - preference.onViewVisible(); - } - } - - @Override - public void onStop() { - super.onStop(); - for (GesturePreference preference : mPreferences) { - preference.onViewInvisible(); - } - } - - @Override - protected String getLogTag() { - return TAG; - } - - @Override - protected int getHelpResource() { - return R.string.help_url_gestures; - } - - @Override - public int getMetricsCategory() { - return MetricsEvent.SETTINGS_GESTURES; - } - - private void addPreferenceToTrackingList(Class clazz) { - final PreferenceController controller = getPreferenceController(clazz); - final Preference preference = findPreference(controller.getPreferenceKey()); - if (preference != null && preference instanceof GesturePreference) { - mPreferences.add((GesturePreference) preference); - } - } -} diff --git a/src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java b/src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java deleted file mode 100644 index 121af988ca1..00000000000 --- a/src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java +++ /dev/null @@ -1,251 +0,0 @@ -/* - * Copyright (C) 2008 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.android.settings.inputmethod; - -import android.app.Activity; -import android.content.Context; -import android.content.Intent; -import android.hardware.input.InputDeviceIdentifier; -import android.speech.tts.TtsEngines; -import android.support.v7.preference.Preference; - -import com.android.internal.logging.nano.MetricsProto.MetricsEvent; -import com.android.settings.R; -import com.android.settings.Settings.KeyboardLayoutPickerActivity; -import com.android.settings.Utils; -import com.android.settings.core.PreferenceController; -import com.android.settings.dashboard.DashboardFragment; -import com.android.settings.dashboard.SummaryLoader; -import com.android.settings.language.PhoneLanguagePreferenceController; -import com.android.settings.language.TtsPreferenceController; -import com.android.settings.language.UserDictionaryPreferenceController; -import com.android.settings.localepicker.LocaleFeatureProvider; -import com.android.settings.overlay.FeatureFactory; -import com.android.settings.search.BaseSearchIndexProvider; -import com.android.settings.search.Indexable; -import com.android.settings.search.SearchIndexableRaw; - -import java.util.ArrayList; -import java.util.List; - -/** - * @deprecated New features should use {@code InputAndGestureSettings} and - * {@code LanguageAndRegionSettings} instead. - */ -@Deprecated -public class InputMethodAndLanguageSettings extends DashboardFragment - implements KeyboardLayoutDialogFragment.OnSetupKeyboardLayoutsListener, Indexable { - - private static final String TAG = "IMEAndLanguageSetting"; - - private Intent mIntentWaitingForResult; - - @Override - public int getMetricsCategory() { - return MetricsEvent.INPUTMETHOD_LANGUAGE; - } - - @Override - protected String getLogTag() { - return TAG; - } - - @Override - protected int getPreferenceScreenResId() { - return R.xml.language_settings; - } - - @Override - protected List getPreferenceControllers(Context context) { - final GameControllerPreferenceController gameControllerPreferenceController = - new GameControllerPreferenceController(context); - getLifecycle().addObserver(gameControllerPreferenceController); - - final List list = new ArrayList<>(); - list.add(gameControllerPreferenceController); - list.add(new PhoneLanguagePreferenceController(context)); - list.add(new SpellCheckerPreferenceController(context)); - list.add(new UserDictionaryPreferenceController(context)); - list.add(new TtsPreferenceController(context, new TtsEngines(context))); - return list; - } - - @Override - public boolean onPreferenceTreeClick(Preference preference) { - // Input Method stuff - if (Utils.isMonkeyRunning()) { - return false; - } - return super.onPreferenceTreeClick(preference); - } - - private void showKeyboardLayoutDialog(InputDeviceIdentifier inputDeviceIdentifier) { - KeyboardLayoutDialogFragment fragment = (KeyboardLayoutDialogFragment) - getFragmentManager().findFragmentByTag("keyboardLayout"); - if (fragment == null) { - fragment = new KeyboardLayoutDialogFragment(inputDeviceIdentifier); - fragment.setTargetFragment(this, 0); - fragment.show(getActivity().getFragmentManager(), "keyboardLayout"); - } - } - - @Override - public void onSetupKeyboardLayouts(InputDeviceIdentifier inputDeviceIdentifier) { - final Intent intent = new Intent(Intent.ACTION_MAIN); - intent.setClass(getActivity(), KeyboardLayoutPickerActivity.class); - intent.putExtra(KeyboardLayoutPickerFragment.EXTRA_INPUT_DEVICE_IDENTIFIER, - inputDeviceIdentifier); - mIntentWaitingForResult = intent; - startActivityForResult(intent, 0); - } - - @Override - public void onActivityResult(int requestCode, int resultCode, Intent data) { - super.onActivityResult(requestCode, resultCode, data); - - if (mIntentWaitingForResult != null) { - InputDeviceIdentifier inputDeviceIdentifier = mIntentWaitingForResult - .getParcelableExtra(KeyboardLayoutPickerFragment.EXTRA_INPUT_DEVICE_IDENTIFIER); - mIntentWaitingForResult = null; - showKeyboardLayoutDialog(inputDeviceIdentifier); - } - } - - private static class SummaryProvider implements SummaryLoader.SummaryProvider { - - private final SummaryLoader mSummaryLoader; - private LocaleFeatureProvider mLocaleFeatureProvider; - - public SummaryProvider(Context context, SummaryLoader summaryLoader) { - mSummaryLoader = summaryLoader; - mLocaleFeatureProvider = FeatureFactory.getFactory(context).getLocaleFeatureProvider(); - } - - @Override - public void setListening(boolean listening) { - if (listening) { - String localeNames = mLocaleFeatureProvider.getLocaleNames(); - mSummaryLoader.setSummary(this, localeNames); - } - } - } - - public static final SummaryLoader.SummaryProviderFactory SUMMARY_PROVIDER_FACTORY - = new SummaryLoader.SummaryProviderFactory() { - @Override - public SummaryLoader.SummaryProvider createSummaryProvider(Activity activity, - SummaryLoader summaryLoader) { - return new SummaryProvider(activity, summaryLoader); - } - }; - - public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = - new BaseSearchIndexProvider() { - @Override - public List getRawDataToIndex(Context context, boolean enabled) { - List indexables = new ArrayList<>(); - - final String screenTitle = context.getString(R.string.language_keyboard_settings_title); - - // Locale picker. - final PhoneLanguagePreferenceController mLanguagePrefController = - new PhoneLanguagePreferenceController(context); - if (mLanguagePrefController.isAvailable()) { - String localeNames = FeatureFactory.getFactory(context).getLocaleFeatureProvider() - .getLocaleNames(); - SearchIndexableRaw indexable = new SearchIndexableRaw(context); - indexable.key = mLanguagePrefController.getPreferenceKey(); - indexable.title = context.getString(R.string.phone_language); - indexable.summaryOn = localeNames; - indexable.summaryOff = localeNames; - indexable.screenTitle = screenTitle; - indexables.add(indexable); - } - - // Spell checker. - SearchIndexableRaw indexable = new SearchIndexableRaw(context); - indexable.key = SpellCheckerPreferenceController.KEY_SPELL_CHECKERS; - indexable.title = context.getString(R.string.spellcheckers_settings_title); - indexable.screenTitle = screenTitle; - indexable.keywords = context.getString(R.string.keywords_spell_checker); - indexables.add(indexable); - - // User dictionary. - if (UserDictionaryList.getUserDictionaryLocalesSet(context) != null) { - indexable = new SearchIndexableRaw(context); - indexable.key = "user_dict_settings"; - indexable.title = context.getString(R.string.user_dict_settings_title); - indexable.screenTitle = screenTitle; - indexables.add(indexable); - } - - // Keyboard settings. - indexable = new SearchIndexableRaw(context); - indexable.key = "keyboard_settings"; - indexable.title = context.getString(R.string.keyboard_settings_category); - indexable.screenTitle = screenTitle; - indexable.keywords = context.getString(R.string.keywords_keyboard_and_ime); - indexables.add(indexable); - - if (!PhysicalKeyboardFragment.getPhysicalFullKeyboards().isEmpty()) { - // Hard keyboard category. - indexable = new SearchIndexableRaw(context); - indexable.key = "builtin_keyboard_settings"; - indexable.title = context.getString(R.string.builtin_keyboard_settings_title); - indexable.screenTitle = screenTitle; - indexables.add(indexable); - } - - // Text-to-speech. - TtsEngines ttsEngines = new TtsEngines(context); - if (!ttsEngines.getEngines().isEmpty()) { - indexable = new SearchIndexableRaw(context); - indexable.key = "tts_settings"; - indexable.title = context.getString(R.string.tts_settings_title); - indexable.screenTitle = screenTitle; - indexable.keywords = context.getString(R.string.keywords_text_to_speech_output); - indexables.add(indexable); - } - - // Pointer settings. - indexable = new SearchIndexableRaw(context); - indexable.key = "pointer_settings_category"; - indexable.title = context.getString(R.string.pointer_settings_category); - indexable.screenTitle = screenTitle; - indexables.add(indexable); - - indexable = new SearchIndexableRaw(context); - indexable.key = "pointer_speed"; - indexable.title = context.getString(R.string.pointer_speed); - indexable.screenTitle = screenTitle; - indexables.add(indexable); - - // Game controllers. - if (!new GameControllerPreferenceController(context).isAvailable()) { - indexable = new SearchIndexableRaw(context); - indexable.key = GameControllerPreferenceController.PREF_KEY; - indexable.title = context.getString(R.string.vibrate_input_devices); - indexable.summaryOn = context.getString(R.string.vibrate_input_devices_summary); - indexable.summaryOff = context.getString(R.string.vibrate_input_devices_summary); - indexable.screenTitle = screenTitle; - indexables.add(indexable); - } - - return indexables; - } - }; -} diff --git a/src/com/android/settings/search/DynamicIndexableContentMonitor.java b/src/com/android/settings/search/DynamicIndexableContentMonitor.java index 0cc26887269..c91f381de21 100644 --- a/src/com/android/settings/search/DynamicIndexableContentMonitor.java +++ b/src/com/android/settings/search/DynamicIndexableContentMonitor.java @@ -49,9 +49,9 @@ import android.view.inputmethod.InputMethodManager; import com.android.internal.content.PackageMonitor; import com.android.settings.accessibility.AccessibilitySettings; import com.android.settings.inputmethod.AvailableVirtualKeyboardFragment; -import com.android.settings.inputmethod.InputMethodAndLanguageSettings; import com.android.settings.inputmethod.PhysicalKeyboardFragment; import com.android.settings.inputmethod.VirtualKeyboardFragment; +import com.android.settings.language.LanguageAndInputSettings; import com.android.settings.print.PrintSettingsFragment; import java.util.ArrayList; @@ -423,7 +423,7 @@ public final class DynamicIndexableContentMonitor implements mContentResolver = context.getContentResolver(); mInputMethodServices.clear(); // Build index of {@link UserDictionary}. - buildIndex(InputMethodAndLanguageSettings.class, true /* rebuild */); + buildIndex(LanguageAndInputSettings.class, true /* rebuild */); // Build index of IMEs. buildIndex(VirtualKeyboardFragment.class, true /* rebuild */); buildIndex(AvailableVirtualKeyboardFragment.class, true /* rebuild */); @@ -478,7 +478,7 @@ public final class DynamicIndexableContentMonitor implements buildIndex(VirtualKeyboardFragment.class, true /* rebuild */); buildIndex(AvailableVirtualKeyboardFragment.class, true /* rebuild */); } else if (UserDictionary.Words.CONTENT_URI.equals(uri)) { - buildIndex(InputMethodAndLanguageSettings.class, true /* rebuild */); + buildIndex(LanguageAndInputSettings.class, true /* rebuild */); } } } diff --git a/src/com/android/settings/search/Ranking.java b/src/com/android/settings/search/Ranking.java index fc1b8d97cd3..40121f44023 100644 --- a/src/com/android/settings/search/Ranking.java +++ b/src/com/android/settings/search/Ranking.java @@ -41,8 +41,13 @@ import com.android.settings.display.ScreenZoomSettings; import com.android.settings.enterprise.EnterprisePrivacySettings; import com.android.settings.fuelgauge.BatterySaverSettings; import com.android.settings.fuelgauge.PowerUsageSummary; -import com.android.settings.gestures.GestureSettings; -import com.android.settings.inputmethod.InputMethodAndLanguageSettings; +import com.android.settings.gestures.AssistGestureSettings; +import com.android.settings.gestures.DoubleTapPowerSettings; +import com.android.settings.gestures.DoubleTapScreenSettings; +import com.android.settings.gestures.DoubleTwistGestureSettings; +import com.android.settings.gestures.PickupGestureSettings; +import com.android.settings.gestures.SwipeToNotificationSettings; +import com.android.settings.language.LanguageAndInputSettings; import com.android.settings.location.LocationSettings; import com.android.settings.location.ScanningSettings; import com.android.settings.notification.ConfigureNotificationSettings; @@ -154,7 +159,12 @@ public final class Ranking { sRankMap.put(UserSettings.class.getName(), RANK_USERS); // Gestures - sRankMap.put(GestureSettings.class.getName(), RANK_GESTURE); + sRankMap.put(AssistGestureSettings.class.getName(), RANK_GESTURE); + sRankMap.put(DoubleTapPowerSettings.class.getName(), RANK_GESTURE); + sRankMap.put(DoubleTapScreenSettings.class.getName(), RANK_GESTURE); + sRankMap.put(DoubleTwistGestureSettings.class.getName(), RANK_GESTURE); + sRankMap.put(PickupGestureSettings.class.getName(), RANK_GESTURE); + sRankMap.put(SwipeToNotificationSettings.class.getName(), RANK_GESTURE); // Location sRankMap.put(LocationSettings.class.getName(), RANK_LOCATION); @@ -169,7 +179,7 @@ public final class Ranking { sRankMap.put(UserAndAccountDashboardFragment.class.getName(), RANK_ACCOUNT); // IMEs - sRankMap.put(InputMethodAndLanguageSettings.class.getName(), RANK_IME); + sRankMap.put(LanguageAndInputSettings.class.getName(), RANK_IME); // Privacy sRankMap.put(PrivacySettings.class.getName(), RANK_PRIVACY); diff --git a/src/com/android/settings/search/SearchIndexableResources.java b/src/com/android/settings/search/SearchIndexableResources.java index 1968c7aff6f..12b5eae1266 100644 --- a/src/com/android/settings/search/SearchIndexableResources.java +++ b/src/com/android/settings/search/SearchIndexableResources.java @@ -44,7 +44,6 @@ import com.android.settings.connecteddevice.ConnectedDeviceDashboardFragment; import com.android.settings.datausage.DataUsageMeteredSettings; import com.android.settings.datausage.DataUsageSummary; import com.android.settings.deviceinfo.StorageDashboardFragment; -import com.android.settings.deviceinfo.StorageProfileFragment; import com.android.settings.deviceinfo.StorageSettings; import com.android.settings.display.ScreenZoomSettings; import com.android.settings.enterprise.EnterprisePrivacySettings; @@ -56,11 +55,9 @@ import com.android.settings.gestures.AssistGestureSettings; import com.android.settings.gestures.DoubleTapPowerSettings; import com.android.settings.gestures.DoubleTapScreenSettings; import com.android.settings.gestures.DoubleTwistGestureSettings; -import com.android.settings.gestures.GestureSettings; import com.android.settings.gestures.PickupGestureSettings; import com.android.settings.gestures.SwipeToNotificationSettings; import com.android.settings.inputmethod.AvailableVirtualKeyboardFragment; -import com.android.settings.inputmethod.InputMethodAndLanguageSettings; import com.android.settings.inputmethod.PhysicalKeyboardFragment; import com.android.settings.inputmethod.VirtualKeyboardFragment; import com.android.settings.language.LanguageAndInputSettings; @@ -139,7 +136,6 @@ public final class SearchIndexableResources { addIndex(SpecialAccessSettings.class, R.xml.special_access, R.drawable.ic_settings_applications); addIndex(UserSettings.class, NO_DATA_RES_ID, R.drawable.ic_settings_multiuser); - addIndex(GestureSettings.class, NO_DATA_RES_ID, R.drawable.ic_settings_gestures); addIndex(AssistGestureSettings.class, NO_DATA_RES_ID, R.drawable.ic_settings_gestures); addIndex(PickupGestureSettings.class, NO_DATA_RES_ID, R.drawable.ic_settings_gestures); addIndex(DoubleTapScreenSettings.class, NO_DATA_RES_ID, R.drawable.ic_settings_gestures); @@ -156,8 +152,6 @@ public final class SearchIndexableResources { addIndex(ScreenPinningSettings.class, NO_DATA_RES_ID, R.drawable.ic_settings_security); addIndex(UserAndAccountDashboardFragment.class, NO_DATA_RES_ID, R.drawable.ic_settings_accounts); - addIndex(InputMethodAndLanguageSettings.class, - NO_DATA_RES_ID, R.drawable.ic_settings_language); addIndex(VirtualKeyboardFragment.class, NO_DATA_RES_ID, R.drawable.ic_settings_language); addIndex(AvailableVirtualKeyboardFragment.class, NO_DATA_RES_ID, R.drawable.ic_settings_language); diff --git a/tests/app/src/com/android/settings/gesture/GestureSettingsTest.java b/tests/app/src/com/android/settings/gesture/GestureSettingsTest.java deleted file mode 100644 index 4f3a5247092..00000000000 --- a/tests/app/src/com/android/settings/gesture/GestureSettingsTest.java +++ /dev/null @@ -1,195 +0,0 @@ -/* - * Copyright (C) 2016 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package com.android.settings.gesture; - -import android.content.Context; -import android.content.Intent; -import android.provider.Settings.Secure; -import android.support.test.filters.MediumTest; -import android.support.test.uiautomator.UiDevice; -import android.support.test.uiautomator.UiObject; -import android.support.test.uiautomator.UiSelector; -import android.support.test.uiautomator.UiScrollable; -import android.test.InstrumentationTestCase; -import android.util.Log; -import android.widget.RelativeLayout; -import android.widget.Switch; - -import com.android.settings.R; - -import java.io.BufferedReader; -import java.io.InputStreamReader; - -import org.junit.Test; - -/** - * Test for Gesture preferences. - */ -@MediumTest -public class GestureSettingsTest extends InstrumentationTestCase { - - private static final String TAG = "GestureSettingsTest"; - - private UiDevice mDevice; - private Context mTargetContext; - private String mTargetPackage; - - @Override - protected void setUp() throws Exception { - super.setUp(); - mDevice = UiDevice.getInstance(getInstrumentation()); - mTargetContext = getInstrumentation().getTargetContext(); - mTargetPackage = mTargetContext.getPackageName(); - } - - @Test - public void testAmbientDisplaySwitchPreference() throws Exception { - launchSettings(); - UiObject dozeSwitch = getDozeSwitch(); - assertNotNull(dozeSwitch); - assertTrue(dozeSwitch.exists()); - assertToggleStateMatchesSettingValue(dozeSwitch, Secure.DOZE_ENABLED, 1, 1); - } - - @Test - public void testGestureSettingsExists() throws Exception { - launchMoves(); - UiObject titleObj = mDevice.findObject(new UiSelector().text( - mTargetContext.getResources().getString(R.string.gesture_preference_title))); - assertNotNull(titleObj); - assertTrue(titleObj.exists()); - } - - @Test - public void testCameraDoubleTapToggle() throws Exception { - assertSwitchToggle(mTargetContext.getResources().getString( - R.string.double_tap_power_for_camera_title), - Secure.CAMERA_DOUBLE_TAP_POWER_GESTURE_DISABLED, 0, 0); - } - - @Test - public void testCameraDoubleTwistToggle() throws Exception { - assertSwitchToggle(mTargetContext.getResources().getString( - R.string.double_twist_for_camera_mode_title), - Secure.CAMERA_DOUBLE_TWIST_TO_FLIP_ENABLED, 1, 1); - } - - @Test - public void testFingerprintSwipeToggle() throws Exception { - assertSwitchToggle(mTargetContext.getResources().getString( - R.string.fingerprint_swipe_for_notifications_title), - Secure.SYSTEM_NAVIGATION_KEYS_ENABLED, 0, 1); - } - - @Test - public void testDozeDoubleTapToggle() throws Exception { - assertSwitchToggle(mTargetContext.getResources().getString( - R.string.ambient_display_title), - Secure.DOZE_PULSE_ON_DOUBLE_TAP, 1, 1); - } - - @Test - public void testDozePickupToggle() throws Exception { - assertSwitchToggle(mTargetContext.getResources().getString( - R.string.ambient_display_pickup_title), - Secure.DOZE_PULSE_ON_PICK_UP, 1, 1); - } - - private void launchSettings() { - Intent settingsIntent = new Intent(Intent.ACTION_MAIN) - .addCategory(Intent.CATEGORY_LAUNCHER) - .setPackage(mTargetPackage) - .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); - getInstrumentation().getContext().startActivity(settingsIntent); - } - - private void launchMoves() throws Exception { - launchSettings(); - UiScrollable settings = new UiScrollable( - new UiSelector().packageName(mTargetPackage).scrollable(true)); - String titleMoves = - mTargetContext.getResources().getString(R.string.gesture_preference_title); - settings.scrollTextIntoView(titleMoves); - mDevice.findObject(new UiSelector().text(titleMoves)).click(); - } - - private void navigateToMovesSetting(String title) throws Exception { - launchMoves(); - UiScrollable moves = new UiScrollable( - new UiSelector().packageName(mTargetPackage).scrollable(true)); - moves.scrollTextIntoView(title); - } - - private UiScrollable navigateToAmbientDisplay() throws Exception { - UiScrollable settings = new UiScrollable( - new UiSelector().packageName(mTargetPackage).scrollable(true)); - String titleDisplay = - mTargetContext.getResources().getString(R.string.display_settings_title); - settings.scrollTextIntoView(titleDisplay); - mDevice.findObject(new UiSelector().text(titleDisplay)).click(); - settings.scrollTextIntoView(mTargetContext.getResources().getString(R.string.doze_title)); - return settings; - } - - private UiObject getGestureSwitch(String title) throws Exception { - UiObject titleView = mDevice.findObject(new UiSelector().text(title)); - UiObject gestureSwitch = - titleView.getFromParent(new UiSelector().className(Switch.class.getName())); - assertNotNull(gestureSwitch); - assertTrue(gestureSwitch.exists()); - return gestureSwitch; - } - - private UiObject getDozeSwitch() throws Exception { - UiScrollable settings = navigateToAmbientDisplay(); - UiObject dozeSwitch = null; - UiSelector relativeLayoutSelector = - new UiSelector().className(RelativeLayout.class.getName()); - String titleDoze = mTargetContext.getResources().getString(R.string.doze_title); - for (int i = 0; i <= settings.getChildCount(relativeLayoutSelector); i++) { - UiObject relativeLayout = settings.getChild(relativeLayoutSelector.instance(i)); - if (relativeLayout.getChildCount() != 2) { - continue; - } - UiObject obj1 = relativeLayout.getChild(new UiSelector().index(0)); - if (obj1.getText() == titleDoze) { - return relativeLayout.getFromParent( - new UiSelector().className(Switch.class.getName())); - } - } - return null; - } - - private void assertSwitchToggle(String title, String key, int defaultVal, int enabledVal) - throws Exception { - navigateToMovesSetting(title); - assertToggleStateMatchesSettingValue(getGestureSwitch(title), key, defaultVal, enabledVal); - } - - private void assertToggleStateMatchesSettingValue ( - UiObject testSwitch, String key, int defaultVal, int enabledVal) throws Exception { - // check initial state - int currentValue = Secure.getInt(mTargetContext.getContentResolver(), key, defaultVal); - boolean enabled = currentValue == enabledVal; - assertEquals(enabled, testSwitch.isChecked()); - // toggle the preference - testSwitch.click(); - assertEquals(!enabled, testSwitch.isChecked()); - int newValue = currentValue == 1 ? 0 : 1; - assertEquals(newValue, Secure.getInt(mTargetContext.getContentResolver(), key, defaultVal)); - } - -} diff --git a/tests/robotests/assets/grandfather_not_implementing_index_provider b/tests/robotests/assets/grandfather_not_implementing_index_provider index 76d1013d61b..a63bd7f4a34 100644 --- a/tests/robotests/assets/grandfather_not_implementing_index_provider +++ b/tests/robotests/assets/grandfather_not_implementing_index_provider @@ -3,6 +3,5 @@ com.android.settings.language.LanguageAndRegionSettings com.android.settings.notification.ZenModePrioritySettings com.android.settings.inputmethod.InputAndGestureSettings com.android.settings.accounts.AccountDetailDashboardFragment -com.android.settings.gestures.GestureSettings com.android.settings.fuelgauge.PowerUsageDetail com.android.settings.deviceinfo.StorageProfileFragment diff --git a/tests/robotests/src/com/android/settings/search/DynamicIndexableContentMonitorTest.java b/tests/robotests/src/com/android/settings/search/DynamicIndexableContentMonitorTest.java index 5ebc4b910fa..0bd651aad35 100644 --- a/tests/robotests/src/com/android/settings/search/DynamicIndexableContentMonitorTest.java +++ b/tests/robotests/src/com/android/settings/search/DynamicIndexableContentMonitorTest.java @@ -58,9 +58,9 @@ import com.android.settings.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import com.android.settings.accessibility.AccessibilitySettings; import com.android.settings.inputmethod.AvailableVirtualKeyboardFragment; -import com.android.settings.inputmethod.InputMethodAndLanguageSettings; import com.android.settings.inputmethod.PhysicalKeyboardFragment; import com.android.settings.inputmethod.VirtualKeyboardFragment; +import com.android.settings.language.LanguageAndInputSettings; import com.android.settings.print.PrintSettingsFragment; import com.android.settings.testutils.shadow.ShadowActivityWithLoadManager; import com.android.settings.testutils.shadow.ShadowContextImplWithRegisterReceiver; @@ -417,7 +417,7 @@ public class DynamicIndexableContentMonitorTest { final ContentObserver observer = extractContentObserver(UserDictionary.Words.CONTENT_URI); assertThat(observer).isNotNull(); - verifyRebuildIndexing(InputMethodAndLanguageSettings.class); + verifyRebuildIndexing(LanguageAndInputSettings.class); /* * When user dictionary content is changed, rebuild indexing happens. @@ -426,7 +426,7 @@ public class DynamicIndexableContentMonitorTest { observer.onChange(false /* selfChange */, UserDictionary.Words.CONTENT_URI); - verifyRebuildIndexing(InputMethodAndLanguageSettings.class); + verifyRebuildIndexing(LanguageAndInputSettings.class); } /* diff --git a/tests/robotests/src/com/android/settings/search/XmlParserUtilTest.java b/tests/robotests/src/com/android/settings/search/XmlParserUtilTest.java index 300aaaf71c1..028cbb04080 100644 --- a/tests/robotests/src/com/android/settings/search/XmlParserUtilTest.java +++ b/tests/robotests/src/com/android/settings/search/XmlParserUtilTest.java @@ -56,40 +56,40 @@ public class XmlParserUtilTest { @Test public void testDataTitleValid_ReturnsPreferenceTitle() { - XmlResourceParser parser = getChildByType(R.xml.gesture_settings, - "com.android.settings.gestures.GesturePreference"); + XmlResourceParser parser = getChildByType(R.xml.ia_display_settings, + "com.android.settings.TimeoutListPreference"); final AttributeSet attrs = Xml.asAttributeSet(parser); String title = XmlParserUtils.getDataTitle(mContext, attrs); - String expTitle = mContext.getString(R.string.assist_gesture_title); + String expTitle = mContext.getString(R.string.screen_timeout); assertThat(title).isEqualTo(expTitle); } @Test public void testDataKeywordsValid_ReturnsPreferenceKeywords() { - XmlResourceParser parser = getParentPrimedParser(R.xml.gesture_settings); + XmlResourceParser parser = getParentPrimedParser(R.xml.ia_display_settings); final AttributeSet attrs = Xml.asAttributeSet(parser); String keywords = XmlParserUtils.getDataKeywords(mContext, attrs); - String expKeywords = mContext.getString(R.string.keywords_gesture); + String expKeywords = mContext.getString(R.string.keywords_display); assertThat(keywords).isEqualTo(expKeywords); } @Test public void testDataKeyValid_ReturnsPreferenceKey() { - XmlResourceParser parser = getChildByType(R.xml.gesture_settings, - "com.android.settings.gestures.GesturePreference"); + XmlResourceParser parser = getChildByType(R.xml.ia_display_settings, + "com.android.settings.TimeoutListPreference"); final AttributeSet attrs = Xml.asAttributeSet(parser); String key = XmlParserUtils.getDataKey(mContext, attrs); - String expKey = "gesture_assist"; + String expKey = "screen_timeout"; assertThat(key).isEqualTo(expKey); } @Test public void testDataSummaryValid_ReturnsPreferenceSummary() { - XmlResourceParser parser = getChildByType(R.xml.gesture_settings, - "com.android.settings.gestures.GesturePreference"); + XmlResourceParser parser = getChildByType(R.xml.ia_display_settings, + "com.android.settings.TimeoutListPreference"); final AttributeSet attrs = Xml.asAttributeSet(parser); String summary = XmlParserUtils.getDataSummary(mContext, attrs); - String expSummary = mContext.getString(R.string.assist_gesture_summary); + String expSummary = mContext.getString(R.string.screen_timeout_summary); assertThat(summary).isEqualTo(expSummary); } @@ -128,7 +128,7 @@ public class XmlParserUtilTest { @Test public void testDataKeyInvalid_ReturnsNull() { - XmlResourceParser parser = getParentPrimedParser(R.xml.gesture_settings); + XmlResourceParser parser = getParentPrimedParser(R.xml.ia_display_settings); final AttributeSet attrs = Xml.asAttributeSet(parser); String key = XmlParserUtils.getDataKey(mContext, attrs); assertThat(key).isNull(); @@ -136,7 +136,7 @@ public class XmlParserUtilTest { @Test public void testDataSummaryInvalid_ReturnsNull() { - XmlResourceParser parser = getParentPrimedParser(R.xml.gesture_settings); + XmlResourceParser parser = getParentPrimedParser(R.xml.ia_display_settings); final AttributeSet attrs = Xml.asAttributeSet(parser); String summary = XmlParserUtils.getDataSummary(mContext, attrs); assertThat(summary).isNull(); @@ -144,7 +144,7 @@ public class XmlParserUtilTest { @Test public void testDataSummaryOffInvalid_ReturnsNull() { - XmlResourceParser parser = getParentPrimedParser(R.xml.gesture_settings); + XmlResourceParser parser = getParentPrimedParser(R.xml.ia_display_settings); final AttributeSet attrs = Xml.asAttributeSet(parser); String summaryOff = XmlParserUtils.getDataSummaryOff(mContext, attrs); assertThat(summaryOff).isNull(); @@ -152,7 +152,7 @@ public class XmlParserUtilTest { @Test public void testDataEntriesInvalid_ReturnsNull() { - XmlResourceParser parser = getParentPrimedParser(R.xml.gesture_settings); + XmlResourceParser parser = getParentPrimedParser(R.xml.ia_display_settings); final AttributeSet attrs = Xml.asAttributeSet(parser); String entries = XmlParserUtils.getDataEntries(mContext, attrs); assertThat(entries).isNull(); diff --git a/tests/robotests/src/com/android/settings/search2/CursorToSearchResultConverterTest.java b/tests/robotests/src/com/android/settings/search2/CursorToSearchResultConverterTest.java index d69ba3ee944..6f326ab52dc 100644 --- a/tests/robotests/src/com/android/settings/search2/CursorToSearchResultConverterTest.java +++ b/tests/robotests/src/com/android/settings/search2/CursorToSearchResultConverterTest.java @@ -29,7 +29,7 @@ import com.android.settings.SettingsRobolectricTestRunner; import com.android.settings.SubSettings; import com.android.settings.TestConfig; import com.android.settings.dashboard.SiteMapManager; -import com.android.settings.gestures.GestureSettings; +import com.android.settings.gestures.SwipeToNotificationSettings; import com.android.settings.search2.ResultPayload.PayloadType; import org.junit.Before; @@ -155,7 +155,7 @@ public class CursorToSearchResultConverterTest { TITLES[0], // Title SUMMARY, // Summary on SUMMARY, // summary off - GestureSettings.class.getName(), + SwipeToNotificationSettings.class.getName(), BLANK, // screen title null, // icon BLANK, // action @@ -226,7 +226,7 @@ public class CursorToSearchResultConverterTest { TITLES[0], // Title SUMMARY, // Summary on SUMMARY, // summary off - GestureSettings.class.getName(), + SwipeToNotificationSettings.class.getName(), BLANK, // screen title null, // icon BLANK, // action diff --git a/tests/robotests/src/com/android/settings/search2/DatabaseIndexingManagerTest.java b/tests/robotests/src/com/android/settings/search2/DatabaseIndexingManagerTest.java index eaaa00ef142..fdc1052c949 100644 --- a/tests/robotests/src/com/android/settings/search2/DatabaseIndexingManagerTest.java +++ b/tests/robotests/src/com/android/settings/search2/DatabaseIndexingManagerTest.java @@ -205,25 +205,25 @@ public class DatabaseIndexingManagerTest { @Test public void testAddResource_RowsInserted() { - SearchIndexableResource resource = getFakeResource(R.xml.gesture_settings); + SearchIndexableResource resource = getFakeResource(R.xml.ia_display_settings); mManager.indexOneSearchIndexableData(mDb, localeStr, resource, new HashMap<>()); Cursor cursor = mDb.rawQuery("SELECT * FROM prefs_index", null); - assertThat(cursor.getCount()).isEqualTo(7); + assertThat(cursor.getCount()).isEqualTo(16); } @Test public void testAddResourceWithNIKs_RowsInsertedDisabled() { - SearchIndexableResource resource = getFakeResource(R.xml.gesture_settings); - // Only add 2 of 6 items to be disabled. - String[] keys = {"gesture_double_tap_power", "gesture_swipe_down_fingerprint"}; + SearchIndexableResource resource = getFakeResource(R.xml.ia_display_settings); + // Only add 2 of 16 items to be disabled. + String[] keys = {"brightness", "wallpaper"}; Map> niks = getNonIndexableKeys(keys); mManager.indexOneSearchIndexableData(mDb, localeStr, resource, niks); Cursor cursor = mDb.rawQuery("SELECT * FROM prefs_index WHERE enabled = 0", null); assertThat(cursor.getCount()).isEqualTo(2); cursor = mDb.rawQuery("SELECT * FROM prefs_index WHERE enabled = 1", null); - assertThat(cursor.getCount()).isEqualTo(5); + assertThat(cursor.getCount()).isEqualTo(14); } @Test @@ -306,7 +306,7 @@ public class DatabaseIndexingManagerTest { @Test public void testAddResourceCustomSetting_RowsMatch() { - SearchIndexableResource resource = getFakeResource(R.xml.gesture_settings); + SearchIndexableResource resource = getFakeResource(R.xml.swipe_to_notification_settings); mManager.indexOneSearchIndexableData(mDb, localeStr, resource, new HashMap<>()); final String prefTitle = @@ -339,7 +339,7 @@ public class DatabaseIndexingManagerTest { assertThat(cursor.getString(9)).isEmpty(); // Screen Title assertThat(cursor.getString(10)).isEqualTo( - mContext.getString(R.string.gesture_preference_title)); + mContext.getString(R.string.fingerprint_swipe_for_notifications_title)); // Class Name assertThat(cursor.getString(11)).isEqualTo(className); // Icon @@ -477,7 +477,7 @@ public class DatabaseIndexingManagerTest { @Test public void testResourceProvider_RowInserted() { - SearchIndexableResource resource = getFakeResource(R.xml.gesture_settings); + SearchIndexableResource resource = getFakeResource(R.xml.swipe_to_notification_settings); resource.xmlResId = 0; resource.className = "com.android.settings.display.ScreenZoomSettings"; @@ -489,7 +489,7 @@ public class DatabaseIndexingManagerTest { @Test public void testResourceProvider_Matches() { - SearchIndexableResource resource = getFakeResource(R.xml.gesture_settings); + SearchIndexableResource resource = getFakeResource(R.xml.swipe_to_notification_settings); resource.xmlResId = 0; resource.className = "com.android.settings.display.ScreenZoomSettings";