diff options
| author |   satok <satok@google.com> | 2011-04-07 12:57:10 +0900 |
|---|---|---|
| committer | satok <satok@google.com> | 2011-04-07 12:57:10 +0900 |
| commit | cc6131053f34f5d69f463ea4513cebb93453fa49 (patch) | |
| tree | 86ef06ac199cdb634d8cf94121a702308fde8606 /java/src | |
| parent | cd11fd9713c8b9da6ba36e806c512d6ce43f1a7b (diff) | |
| parent | 61393bf01cb3ebd41b7829a1294e801865910ae7 (diff) | |
| download | latinime-cc6131053f34f5d69f463ea4513cebb93453fa49.tar.gz latinime-cc6131053f34f5d69f463ea4513cebb93453fa49.tar.xz latinime-cc6131053f34f5d69f463ea4513cebb93453fa49.zip | |
Merge remote-tracking branch 'goog/master' into deldebug
Conflicts:
java/res/xml/prefs.xml
Change-Id: Id09bebfe996f0c6a4b906e7225a6d0ac0d01a9a1
Diffstat (limited to 'java/src')
| -rw-r--r-- | java/src/com/android/inputmethod/latin/Settings.java | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/java/src/com/android/inputmethod/latin/Settings.java b/java/src/com/android/inputmethod/latin/Settings.java index 488ab09c3..8f7278e3a 100644 --- a/java/src/com/android/inputmethod/latin/Settings.java +++ b/java/src/com/android/inputmethod/latin/Settings.java @@ -25,6 +25,7 @@ import android.app.AlertDialog; import android.app.Dialog; import android.app.backup.BackupManager; import android.content.DialogInterface; +import android.content.Intent; import android.content.SharedPreferences; import android.os.Bundle; import android.preference.CheckBoxPreference; @@ -65,6 +66,7 @@ public class Settings extends PreferenceActivity public static final String PREF_SHOW_SUGGESTIONS_SETTING = "show_suggestions_setting"; public static final String PREF_AUTO_CORRECTION_THRESHOLD = "auto_correction_threshold"; public static final String PREF_BIGRAM_SUGGESTIONS = "bigram_suggestion"; + public static final String PREF_DEBUG_SETTINGS = "debug_settings"; public static final String PREF_USABILITY_STUDY_MODE = "usability_study_mode"; @@ -78,6 +80,7 @@ public class Settings extends PreferenceActivity private ListPreference mShowCorrectionSuggestionsPreference; private ListPreference mAutoCorrectionThreshold; private CheckBoxPreference mBigramSuggestion; + private Preference mDebugSettingsPreference; private boolean mVoiceOn; private AlertDialog mDialog; @@ -115,6 +118,13 @@ public class Settings extends PreferenceActivity mAutoCorrectionThreshold = (ListPreference) findPreference(PREF_AUTO_CORRECTION_THRESHOLD); mBigramSuggestion = (CheckBoxPreference) findPreference(PREF_BIGRAM_SUGGESTIONS); + mDebugSettingsPreference = findPreference(PREF_DEBUG_SETTINGS); + if (mDebugSettingsPreference != null) { + final Intent debugSettingsIntent = new Intent(Intent.ACTION_MAIN); + debugSettingsIntent.setClassName(getPackageName(), DebugSettings.class.getName()); + mDebugSettingsPreference.setIntent(debugSettingsIntent); + } + ensureConsistencyOfAutoCorrectionSettings(); final PreferenceGroup generalSettings = |