From be819dbe2b7a5c418530a2fa1182766a4d31d6d5 Mon Sep 17 00:00:00 2001 From: "Tadashi G. Takaoka" Date: Tue, 9 Dec 2014 17:53:24 +0900 Subject: Revert "Add keyboard margin options to place the keyboard dynamically." This reverts commit 8584db1461d286f8eb966c40eb0bc76e8c9df76a. Bug: 18675223 Bug: 18675476 Change-Id: I4e25d87ac261c44b1943df832115f8cca690103a --- .../inputmethod/latin/settings/DebugSettingsFragment.java | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) (limited to 'java/src/com/android/inputmethod/latin/settings/DebugSettingsFragment.java') 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 -- cgit v1.2.3-83-g751a