Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Stop restoring spell checker settings"

Browse Source
This commit is contained in:
TreeHugger Robot
2018-07-03 20:34:32 +00:00
committed by Android (Google) Code Review
parent bfef432a69 1893bd162a
commit 080faba4f4
2 changed files with 3 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
core/java/android/provider/Settings.java
View File

@@ -6991,8 +6991,6 @@ public final class Settings {
*/
public static final String SELECTED_SPELL_CHECKER = "selected_spell_checker";
private static final Validator SELECTED_SPELL_CHECKER_VALIDATOR = COMPONENT_NAME_VALIDATOR;
/**
* {@link android.view.textservice.SpellCheckerSubtype#hashCode()} of the selected subtype
* of the selected spell checker service which is one of the services managed by the text
@@ -7003,9 +7001,6 @@ public final class Settings {
public static final String SELECTED_SPELL_CHECKER_SUBTYPE =
"selected_spell_checker_subtype";
private static final Validator SELECTED_SPELL_CHECKER_SUBTYPE_VALIDATOR =
ANY_INTEGER_VALIDATOR;
/**
* Whether spell checker is enabled or not.
*
@@ -7013,8 +7008,6 @@ public final class Settings {
*/
public static final String SPELL_CHECKER_ENABLED = "spell_checker_enabled";
private static final Validator SPELL_CHECKER_ENABLED_VALIDATOR = BOOLEAN_VALIDATOR;
/**
* What happens when the user presses the Power button while in-call
* and the screen is on.<br/>
@@ -8007,9 +8000,6 @@ public final class Settings {
WIFI_NETWORKS_AVAILABLE_NOTIFICATION_ON, // moved to global
WIFI_NETWORKS_AVAILABLE_REPEAT_DELAY, // moved to global
WIFI_NUM_OPEN_NETWORKS_KEPT, // moved to global
SELECTED_SPELL_CHECKER,
SELECTED_SPELL_CHECKER_SUBTYPE,
SPELL_CHECKER_ENABLED,
MOUNT_PLAY_NOTIFICATION_SND,
MOUNT_UMS_AUTOSTART,
MOUNT_UMS_PROMPT,
@@ -8134,10 +8124,6 @@ public final class Settings {
VALIDATORS.put(WIFI_NETWORKS_AVAILABLE_REPEAT_DELAY,
WIFI_NETWORKS_AVAILABLE_REPEAT_DELAY_VALIDATOR);
VALIDATORS.put(WIFI_NUM_OPEN_NETWORKS_KEPT, WIFI_NUM_OPEN_NETWORKS_KEPT_VALIDATOR);
VALIDATORS.put(SELECTED_SPELL_CHECKER, SELECTED_SPELL_CHECKER_VALIDATOR);
VALIDATORS.put(SELECTED_SPELL_CHECKER_SUBTYPE,
SELECTED_SPELL_CHECKER_SUBTYPE_VALIDATOR);
VALIDATORS.put(SPELL_CHECKER_ENABLED, SPELL_CHECKER_ENABLED_VALIDATOR);
VALIDATORS.put(MOUNT_PLAY_NOTIFICATION_SND, MOUNT_PLAY_NOTIFICATION_SND_VALIDATOR);
VALIDATORS.put(MOUNT_UMS_AUTOSTART, MOUNT_UMS_AUTOSTART_VALIDATOR);
VALIDATORS.put(MOUNT_UMS_PROMPT, MOUNT_UMS_PROMPT_VALIDATOR);

3
core/tests/coretests/src/android/provider/SettingsBackupTest.java
View File

@@ -596,12 +596,15 @@ public class SettingsBackupTest {
Settings.Secure.SEARCH_THREAD_KEEPALIVE_SECONDS,
Settings.Secure.SEARCH_WEB_RESULTS_OVERRIDE_LIMIT,
Settings.Secure.SELECTED_INPUT_METHOD_SUBTYPE,
Settings.Secure.SELECTED_SPELL_CHECKER, // Intentionally removed in Q
Settings.Secure.SELECTED_SPELL_CHECKER_SUBTYPE, // Intentionally removed in Q
Settings.Secure.SETTINGS_CLASSNAME,
Settings.Secure.SHOW_NOTE_ABOUT_NOTIFICATION_HIDING, // candidate?
Settings.Secure.SHOW_ROTATION_SUGGESTIONS,
Settings.Secure.SKIP_FIRST_USE_HINTS, // candidate?
Settings.Secure.SLEEP_TIMEOUT,
Settings.Secure.SMS_DEFAULT_APPLICATION,
Settings.Secure.SPELL_CHECKER_ENABLED, // Intentionally removed in Q
Settings.Secure.THEME_MODE,
Settings.Secure.TRUST_AGENTS_INITIALIZED,
Settings.Secure.TV_INPUT_CUSTOM_LABELS,