nyancrimew/LatinIME
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

am cbd59e02: Merge "Don\'t restore debug preferences"

Browse source 
* commit 'cbd59e02a97dac53ec97f59c1a638bc421ba4a52':
  Don't restore debug preferences
This commit is contained in:
Sandeep Siddhartha 2014-10-14 02:32:58 +00:00 committed by Android Git Automerger
commit 390fe20fde
3 changed files with 35 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
java/src/com/android/inputmethod/latin/BackupAgent.java
View file

@ -48,8 +48,7 @@ public final class BackupAgent extends BackupAgentHelper {
// Remove the preferences that we don't want restored. // Remove the preferences that we don't want restored.
final SharedPreferences.Editor prefEditor = getSharedPreferences( final SharedPreferences.Editor prefEditor = getSharedPreferences(
getPackageName() + PREF_SUFFIX, MODE_PRIVATE).edit(); getPackageName() + PREF_SUFFIX, MODE_PRIVATE).edit();
final String[] prefsToRemove = LocalSettingsConstants.PREFS_TO_SKIP_RESTORING; for (final String key : LocalSettingsConstants.PREFS_TO_SKIP_RESTORING) {
for (final String key : prefsToRemove) {
prefEditor.remove(key); prefEditor.remove(key);
} }
// Flush the changes to disk. // Flush the changes to disk.

26
java/src/com/android/inputmethod/latin/settings/DebugSettings.java
View file

@ -16,29 +16,37 @@
package com.android.inputmethod.latin.settings; package com.android.inputmethod.latin.settings;
/**
* Debug settings for the application.
*
* Note: Even though these settings are stored in the default shared preferences file,
* they shouldn't be restored across devices.
* If a new key is added here, it should also be blacklisted for restore in
* {@link LocalSettingsConstants}.
*/
public final class DebugSettings { public final class DebugSettings {
public static final String PREF_DEBUG_MODE = "debug_mode"; public static final String PREF_DEBUG_MODE = "debug_mode";
public static final String PREF_FORCE_NON_DISTINCT_MULTITOUCH = "force_non_distinct_multitouch"; public static final String PREF_FORCE_NON_DISTINCT_MULTITOUCH = "force_non_distinct_multitouch";
public static final String PREF_FORCE_PHYSICAL_KEYBOARD_SPECIAL_KEY = public static final String PREF_FORCE_PHYSICAL_KEYBOARD_SPECIAL_KEY =
"force_physical_keyboard_special_key"; "force_physical_keyboard_special_key";
public static final String PREF_SHOULD_SHOW_LXX_SUGGESTION_UI =
"pref_should_show_lxx_suggestion_ui";
public static final String PREF_HAS_CUSTOM_KEY_PREVIEW_ANIMATION_PARAMS = public static final String PREF_HAS_CUSTOM_KEY_PREVIEW_ANIMATION_PARAMS =
"pref_has_custom_key_preview_animation_params"; "pref_has_custom_key_preview_animation_params";
public static final String PREF_KEY_PREVIEW_SHOW_UP_START_X_SCALE = public static final String PREF_KEY_LONGPRESS_TIMEOUT = "pref_key_longpress_timeout";
"pref_key_preview_show_up_start_x_scale"; public static final String PREF_KEY_PREVIEW_DISMISS_DURATION =
public static final String PREF_KEY_PREVIEW_SHOW_UP_START_Y_SCALE = "pref_key_preview_dismiss_duration";
"pref_key_preview_show_up_start_y_scale";
public static final String PREF_KEY_PREVIEW_DISMISS_END_X_SCALE = public static final String PREF_KEY_PREVIEW_DISMISS_END_X_SCALE =
"pref_key_preview_dismiss_end_x_scale"; "pref_key_preview_dismiss_end_x_scale";
public static final String PREF_KEY_PREVIEW_DISMISS_END_Y_SCALE = public static final String PREF_KEY_PREVIEW_DISMISS_END_Y_SCALE =
"pref_key_preview_dismiss_end_y_scale"; "pref_key_preview_dismiss_end_y_scale";
public static final String PREF_KEY_PREVIEW_SHOW_UP_DURATION = public static final String PREF_KEY_PREVIEW_SHOW_UP_DURATION =
"pref_key_preview_show_up_duration"; "pref_key_preview_show_up_duration";
public static final String PREF_KEY_PREVIEW_DISMISS_DURATION = public static final String PREF_KEY_PREVIEW_SHOW_UP_START_X_SCALE =
"pref_key_preview_dismiss_duration"; "pref_key_preview_show_up_start_x_scale";
public static final String PREF_KEY_PREVIEW_SHOW_UP_START_Y_SCALE =
"pref_key_preview_show_up_start_y_scale";
public static final String PREF_SHOULD_SHOW_LXX_SUGGESTION_UI =
"pref_should_show_lxx_suggestion_ui";
public static final String PREF_SLIDING_KEY_INPUT_PREVIEW = "pref_sliding_key_input_preview"; public static final String PREF_SLIDING_KEY_INPUT_PREVIEW = "pref_sliding_key_input_preview";
public static final String PREF_KEY_LONGPRESS_TIMEOUT = "pref_key_longpress_timeout";
private DebugSettings() { private DebugSettings() {
// This class is not publicly instantiable. // This class is not publicly instantiable.

18
java/src/com/android/inputmethod/latin/settings/LocalSettingsConstants.java
View file

@ -40,6 +40,22 @@ public class LocalSettingsConstants {
// a different shared preferences file. // a different shared preferences file.
public static final String[] PREFS_TO_SKIP_RESTORING = new String[] { public static final String[] PREFS_TO_SKIP_RESTORING = new String[] {
PREF_ACCOUNT_NAME, PREF_ACCOUNT_NAME,
PREF_ENABLE_CLOUD_SYNC PREF_ENABLE_CLOUD_SYNC,
// The debug settings are not restored on a new device.
// If a feature relies on these, it should ensure that the defaults are
// correctly set for it to work on a new device.
DebugSettings.PREF_DEBUG_MODE,
DebugSettings.PREF_FORCE_NON_DISTINCT_MULTITOUCH,
DebugSettings.PREF_FORCE_PHYSICAL_KEYBOARD_SPECIAL_KEY,
DebugSettings.PREF_HAS_CUSTOM_KEY_PREVIEW_ANIMATION_PARAMS,
DebugSettings.PREF_KEY_LONGPRESS_TIMEOUT,
DebugSettings.PREF_KEY_PREVIEW_DISMISS_DURATION,
DebugSettings.PREF_KEY_PREVIEW_DISMISS_END_X_SCALE,
DebugSettings.PREF_KEY_PREVIEW_DISMISS_END_Y_SCALE,
DebugSettings.PREF_KEY_PREVIEW_SHOW_UP_DURATION,
DebugSettings.PREF_KEY_PREVIEW_SHOW_UP_START_X_SCALE,
DebugSettings.PREF_KEY_PREVIEW_SHOW_UP_START_Y_SCALE,
DebugSettings.PREF_SHOULD_SHOW_LXX_SUGGESTION_UI,
DebugSettings.PREF_SLIDING_KEY_INPUT_PREVIEW
}; };
} }