diff options
| author |   Tadashi G. Takaoka <takaoka@google.com> | 2014-12-09 09:00:12 +0000 |
|---|---|---|
| committer |   Ken Wakasa <kwakasa@google.com> | 2014-12-09 19:47:00 +0900 |
| commit | e84f8c3308428bb68574bb85a56b4777bfefd38c (patch) | |
| tree | 35246b07ad0d78daf8a7c7d21d48633277359940 /java/src/com/android/inputmethod/latin/settings/Settings.java | |
| parent | 44b82abf063e5a1d144eec0e3f4c4b2b0926e0b0 (diff) | |
| download | latinime-e84f8c3308428bb68574bb85a56b4777bfefd38c.tar.gz latinime-e84f8c3308428bb68574bb85a56b4777bfefd38c.tar.xz latinime-e84f8c3308428bb68574bb85a56b4777bfefd38c.zip | |
am be819dbe: Revert "Add keyboard margin options to place the keyboard dynamically."
* commit 'be819dbe2b7a5c418530a2fa1182766a4d31d6d5':
Revert "Add keyboard margin options to place the keyboard dynamically."
Change-Id: I4d0d31b04aa083e32ea86cf394444a5eec4fe647
Diffstat (limited to 'java/src/com/android/inputmethod/latin/settings/Settings.java')
| -rw-r--r-- | java/src/com/android/inputmethod/latin/settings/Settings.java | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/java/src/com/android/inputmethod/latin/settings/Settings.java b/java/src/com/android/inputmethod/latin/settings/Settings.java index 196fef4cd..0d3dab57c 100644 --- a/java/src/com/android/inputmethod/latin/settings/Settings.java +++ b/java/src/com/android/inputmethod/latin/settings/Settings.java @@ -367,9 +367,10 @@ public final class Settings implements SharedPreferences.OnSharedPreferenceChang return (milliseconds != UNDEFINED_PREFERENCE_VALUE_INT) ? milliseconds : defaultValue; } - public static float readKeyboardScale(final SharedPreferences prefs, - final String prefKey, final float defaultValue) { - final float percentage = prefs.getFloat(prefKey, UNDEFINED_PREFERENCE_VALUE_FLOAT); + public static float readKeyboardHeight(final SharedPreferences prefs, + final float defaultValue) { + final float percentage = prefs.getFloat( + DebugSettings.PREF_KEYBOARD_HEIGHT_SCALE, UNDEFINED_PREFERENCE_VALUE_FLOAT); return (percentage != UNDEFINED_PREFERENCE_VALUE_FLOAT) ? percentage : defaultValue; } |