diff options
| author |   Tadashi G. Takaoka <takaoka@google.com> | 2012-01-26 00:19:28 -0800 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2012-01-26 00:19:28 -0800 |
| commit | 4bea2e7613a8005b599fcd1deda94600227d637a (patch) | |
| tree | fd28f67bce4358bc429e5416d495ace67c1a4496 /java/src/com/android/inputmethod/latin | |
| parent | 56c3c944db8c536c3bb89ea52b921ce18ece34c0 (diff) | |
| parent | 736d740aa5966ad945d0f3ebdb48cebdfdd1ea16 (diff) | |
| download | latinime-4bea2e7613a8005b599fcd1deda94600227d637a.tar.gz latinime-4bea2e7613a8005b599fcd1deda94600227d637a.tar.xz latinime-4bea2e7613a8005b599fcd1deda94600227d637a.zip | |
am 736d740a: Merge "Get rid of Resource reference from KeyboardView, LatinKeyboardView and PointerTracker"
* commit '736d740aa5966ad945d0f3ebdb48cebdfdd1ea16':
Get rid of Resource reference from KeyboardView, LatinKeyboardView and PointerTracker
Diffstat (limited to 'java/src/com/android/inputmethod/latin')
| -rw-r--r-- | java/src/com/android/inputmethod/latin/Settings.java | 2 | ||||
| -rw-r--r-- | java/src/com/android/inputmethod/latin/SettingsValues.java | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/java/src/com/android/inputmethod/latin/Settings.java b/java/src/com/android/inputmethod/latin/Settings.java index 5af21452a..d32310096 100644 --- a/java/src/com/android/inputmethod/latin/Settings.java +++ b/java/src/com/android/inputmethod/latin/Settings.java @@ -218,7 +218,7 @@ public class Settings extends InputMethodSettingsActivity res.getString(R.string.key_preview_popup_dismiss_default_delay), }; final String popupDismissDelayDefaultValue = Integer.toString(res.getInteger( - R.integer.config_delay_after_preview)); + R.integer.config_key_preview_linger_timeout)); mKeyPreviewPopupDismissDelay.setEntries(entries); mKeyPreviewPopupDismissDelay.setEntryValues( new String[] { "0", popupDismissDelayDefaultValue }); diff --git a/java/src/com/android/inputmethod/latin/SettingsValues.java b/java/src/com/android/inputmethod/latin/SettingsValues.java index 0ae28d3fc..e6ef3962e 100644 --- a/java/src/com/android/inputmethod/latin/SettingsValues.java +++ b/java/src/com/android/inputmethod/latin/SettingsValues.java @@ -124,7 +124,7 @@ public class SettingsValues { mUsabilityStudyMode = getUsabilityStudyMode(prefs); mKeyPreviewPopupDismissDelayRawValue = prefs.getString( Settings.PREF_KEY_PREVIEW_POPUP_DISMISS_DELAY, - Integer.toString(res.getInteger(R.integer.config_delay_after_preview))); + Integer.toString(res.getInteger(R.integer.config_key_preview_linger_timeout))); mUseContactsDict = prefs.getBoolean(Settings.PREF_KEY_USE_CONTACTS_DICT, true); mAutoCorrectEnabled = isAutoCorrectEnabled(res, mAutoCorrectionThresholdRawValue); mBigramSuggestionEnabled = mAutoCorrectEnabled @@ -234,7 +234,8 @@ public class SettingsValues { Resources resources) { // TODO: use mKeyPreviewPopupDismissDelayRawValue instead of reading it again here. return Integer.parseInt(sp.getString(Settings.PREF_KEY_PREVIEW_POPUP_DISMISS_DELAY, - Integer.toString(resources.getInteger(R.integer.config_delay_after_preview)))); + Integer.toString(resources.getInteger( + R.integer.config_key_preview_linger_timeout)))); } private static boolean isBigramSuggestionEnabled(final SharedPreferences sp, |