aboutsummaryrefslogtreecommitdiffstats
path: root/java/src/com/android/inputmethod/latin/settings/DebugSettingsFragment.java
diff options
context:
space:
mode:
authorTadashi G. Takaoka <takaoka@google.com>2014-12-09 09:00:12 +0000
committerKen Wakasa <kwakasa@google.com>2014-12-09 19:47:00 +0900
commite84f8c3308428bb68574bb85a56b4777bfefd38c (patch)
tree35246b07ad0d78daf8a7c7d21d48633277359940 /java/src/com/android/inputmethod/latin/settings/DebugSettingsFragment.java
parent44b82abf063e5a1d144eec0e3f4c4b2b0926e0b0 (diff)
downloadlatinime-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/DebugSettingsFragment.java')
-rw-r--r--java/src/com/android/inputmethod/latin/settings/DebugSettingsFragment.java13
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