diff options
| author |   Tadashi G. Takaoka <takaoka@google.com> | 2014-12-09 17:53:24 +0900 |
|---|---|---|
| committer | Tadashi G. Takaoka <takaoka@google.com> | 2014-12-09 17:53:24 +0900 |
| commit | be819dbe2b7a5c418530a2fa1182766a4d31d6d5 (patch) | |
| tree | 17b6f9cbe1855864c7ef445604b209c982751957 /java/src/com/android/inputmethod/latin/settings/Settings.java | |
| parent | 45bbdc20bb613a84fef35fe685ead394c7b06d57 (diff) | |
| download | latinime-be819dbe2b7a5c418530a2fa1182766a4d31d6d5.tar.gz latinime-be819dbe2b7a5c418530a2fa1182766a4d31d6d5.tar.xz latinime-be819dbe2b7a5c418530a2fa1182766a4d31d6d5.zip | |
Revert "Add keyboard margin options to place the keyboard dynamically."
This reverts commit 8584db1461d286f8eb966c40eb0bc76e8c9df76a.
Bug: 18675223
Bug: 18675476
Change-Id: I4e25d87ac261c44b1943df832115f8cca690103a
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; } |