diff options
| author |   Tadashi G. Takaoka <takaoka@google.com> | 2011-11-18 08:49:06 -0800 |
|---|---|---|
| committer | Tadashi G. Takaoka <takaoka@google.com> | 2011-11-18 08:51:39 -0800 |
| commit | 49cc3beb75e2916037a0f8ff2d2795f306918598 (patch) | |
| tree | b75e3ebaccd5ae1a6513ad0fee3efec2e75496fc /java/src/com/android/inputmethod/latin/Settings.java | |
| parent | a41fddc67668ab85c83dbed40602d2b2a5bd47e5 (diff) | |
| parent | 137667ed3da6c999cb7f1bcfd9e8030f06ec3713 (diff) | |
| download | latinime-49cc3beb75e2916037a0f8ff2d2795f306918598.tar.gz latinime-49cc3beb75e2916037a0f8ff2d2795f306918598.tar.xz latinime-49cc3beb75e2916037a0f8ff2d2795f306918598.zip | |
resolved conflicts for merge of 137667ed to master
Change-Id: I75fc5d278b002ab89dd2475d282d0ee4aede7817
Diffstat (limited to 'java/src/com/android/inputmethod/latin/Settings.java')
| -rw-r--r-- | java/src/com/android/inputmethod/latin/Settings.java | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/java/src/com/android/inputmethod/latin/Settings.java b/java/src/com/android/inputmethod/latin/Settings.java index 9d5d89071..e5a041f11 100644 --- a/java/src/com/android/inputmethod/latin/Settings.java +++ b/java/src/com/android/inputmethod/latin/Settings.java @@ -102,13 +102,7 @@ public class Settings extends InputMethodSettingsActivity public static class Values { // From resources: - public final int mDelayBeforeFadeoutLanguageOnSpacebar; - public final int mDelayUpdateSuggestions; public final int mDelayUpdateOldSuggestions; - public final int mDelayUpdateShiftState; - public final int mDurationOfFadeoutLanguageOnSpacebar; - public final float mFinalFadeoutFactorOfLanguageOnSpacebar; - public final long mDoubleSpacesTurnIntoPeriodTimeout; public final String mWordSeparators; public final String mMagicSpaceStrippers; public final String mMagicSpaceSwappers; @@ -148,20 +142,8 @@ public class Settings extends InputMethodSettingsActivity } // Get the resources - mDelayBeforeFadeoutLanguageOnSpacebar = res.getInteger( - R.integer.config_delay_before_fadeout_language_on_spacebar); - mDelayUpdateSuggestions = - res.getInteger(R.integer.config_delay_update_suggestions); mDelayUpdateOldSuggestions = res.getInteger( R.integer.config_delay_update_old_suggestions); - mDelayUpdateShiftState = - res.getInteger(R.integer.config_delay_update_shift_state); - mDurationOfFadeoutLanguageOnSpacebar = res.getInteger( - R.integer.config_duration_of_fadeout_language_on_spacebar); - mFinalFadeoutFactorOfLanguageOnSpacebar = res.getInteger( - R.integer.config_final_fadeout_percentage_of_language_on_spacebar) / 100.0f; - mDoubleSpacesTurnIntoPeriodTimeout = res.getInteger( - R.integer.config_double_spaces_turn_into_period_timeout); mMagicSpaceStrippers = res.getString(R.string.magic_space_stripping_symbols); mMagicSpaceSwappers = res.getString(R.string.magic_space_swapping_symbols); String wordSeparators = mMagicSpaceStrippers + mMagicSpaceSwappers |