diff options
| author |   Tadashi G. Takaoka <takaoka@google.com> | 2014-12-09 09:00:12 +0000 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2014-12-09 09:00:12 +0000 |
| commit | 29cc1d1981a4e79cac9a326a0e571ed3906f67df (patch) | |
| tree | 5133913de2b54a13267e3946b31f5404766f0c8b /java/src/com/android/inputmethod/latin/settings/Settings.java | |
| parent | 3e5c66dbe7ac6adcd31a2f4f44302dcedc1bfb98 (diff) | |
| parent | be819dbe2b7a5c418530a2fa1182766a4d31d6d5 (diff) | |
| download | latinime-29cc1d1981a4e79cac9a326a0e571ed3906f67df.tar.gz latinime-29cc1d1981a4e79cac9a326a0e571ed3906f67df.tar.xz latinime-29cc1d1981a4e79cac9a326a0e571ed3906f67df.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."
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; } |