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/DebugSettingsFragment.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/DebugSettingsFragment.java')
| -rw-r--r-- | java/src/com/android/inputmethod/latin/settings/DebugSettingsFragment.java | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/java/src/com/android/inputmethod/latin/settings/DebugSettingsFragment.java b/java/src/com/android/inputmethod/latin/settings/DebugSettingsFragment.java index 779bf47c9..b788d7fcf 100644 --- a/java/src/com/android/inputmethod/latin/settings/DebugSettingsFragment.java +++ b/java/src/com/android/inputmethod/latin/settings/DebugSettingsFragment.java @@ -89,14 +89,8 @@ public final class DebugSettingsFragment extends SubScreenFragment defaultKeyPreviewDismissEndScale); setupKeyPreviewAnimationScale(DebugSettings.PREF_KEY_PREVIEW_DISMISS_END_Y_SCALE, defaultKeyPreviewDismissEndScale); - setupKeyboardScale( + setupKeyboardHeight( DebugSettings.PREF_KEYBOARD_HEIGHT_SCALE, SettingsValues.DEFAULT_SIZE_SCALE); - setupKeyboardScale( - DebugSettings.PREF_KEYBOARD_BOTTOM_MARGIN, SettingsValues.DEFAULT_MARGIN_SCALE); - setupKeyboardScale( - DebugSettings.PREF_KEYBOARD_LEFT_MARGIN, SettingsValues.DEFAULT_MARGIN_SCALE); - setupKeyboardScale( - DebugSettings.PREF_KEYBOARD_RIGHT_MARGIN, SettingsValues.DEFAULT_MARGIN_SCALE); mServiceNeedsRestart = false; mDebugMode = (TwoStatePreference) findPreference(DebugSettings.PREF_DEBUG_MODE); @@ -259,7 +253,7 @@ public final class DebugSettingsFragment extends SubScreenFragment }); } - private void setupKeyboardScale(final String prefKey, final float defaultValue) { + private void setupKeyboardHeight(final String prefKey, final float defaultValue) { final SharedPreferences prefs = getSharedPreferences(); final SeekBarDialogPreference pref = (SeekBarDialogPreference)findPreference(prefKey); if (pref == null) { @@ -287,8 +281,7 @@ public final class DebugSettingsFragment extends SubScreenFragment @Override public int readValue(final String key) { - return getPercentageFromValue( - Settings.readKeyboardScale(prefs, key, defaultValue)); + return getPercentageFromValue(Settings.readKeyboardHeight(prefs, defaultValue)); } @Override |