am be819dbe: Revert "Add keyboard margin options to place the keyboard dynamically."

* commit 'be819dbe2b7a5c418530a2fa1182766a4d31d6d5':
  Revert "Add keyboard margin options to place the keyboard dynamically."

1 files changed, 5 insertions, 50 deletions

diff --git a/java/src/com/android/inputmethod/latin/utils/ResourceUtils.java b/java/src/com/android/inputmethod/latin/utils/ResourceUtils.java
index 0a757877a..cc0d470df 100644
--- a/java/src/com/android/inputmethod/latin/utils/ResourceUtils.java
+++ b/java/src/com/android/inputmethod/latin/utils/ResourceUtils.java
@@ -182,63 +182,18 @@ public final class ResourceUtils {
         return matchedAll;
     }
 
-    public static int getKeyboardFrameWidth(final Resources res) {
+    public static int getDefaultKeyboardWidth(final Resources res) {
         final DisplayMetrics dm = res.getDisplayMetrics();
         return dm.widthPixels;
     }
 
-    public static int getKeyboardWidth(final Resources res, final SettingsValues settingsValues) {
-        final int frameWidth = getKeyboardFrameWidth(res);
-        if (settingsValues.mHasKeyboardResize) {
-            final float widthFraction = 1f - settingsValues.mKeyboardLeftMarginScale
-                    - settingsValues.mKeyboardRightMarginScale;
-            return (int)(frameWidth * widthFraction);
-        }
-        return frameWidth;
-    }
-
-    public static int getKeyboardFrameHeight(final Resources res,
-            final SettingsValues settingsValues) {
-        if (settingsValues.mHasKeyboardResize) {
-            return getKeyboardHeight(res, settingsValues)
-                    + getKeyboardBottomMargin(res, settingsValues);
-        }
-        return getDefaultKeyboardHeight(res);
-    }
-
     public static int getKeyboardHeight(final Resources res, final SettingsValues settingsValues) {
-        final int keyboardHeight = getDefaultKeyboardHeight(res);
-        if (settingsValues.mHasKeyboardResize) {
-            return (int)(keyboardHeight * settingsValues.mKeyboardHeightScale);
-        }
-        return keyboardHeight;
-    }
-
-    public static int getKeyboardLeftMargin(
-            final Resources res, final SettingsValues settingsValues) {
-        if (settingsValues.mHasKeyboardResize) {
-          final int frameWidth = getKeyboardFrameWidth(res);
-            return (int)(frameWidth * settingsValues.mKeyboardLeftMarginScale);
-        }
-        return 0;
-    }
-
-    public static int getKeyboardRightMargin(
-            final Resources res, final SettingsValues settingsValues) {
-        if (settingsValues.mHasKeyboardResize) {
-            final int frameWidth = getKeyboardFrameWidth(res);
-            return (int)(frameWidth * settingsValues.mKeyboardRightMarginScale);
-        }
-        return 0;
-    }
-
-    public static int getKeyboardBottomMargin(
-            final Resources res, final SettingsValues settingsValues) {
+        final int defaultKeyboardHeight = getDefaultKeyboardHeight(res);
         if (settingsValues.mHasKeyboardResize) {
-            final int defaultHeight = getDefaultKeyboardHeight(res);
-            return (int)(defaultHeight * settingsValues.mKeyboardBottomMarginScale);
+            // mKeyboardHeightScale Ranges from [.5,1.2], from xml/prefs_screen_debug.xml
+            return (int)(defaultKeyboardHeight * settingsValues.mKeyboardHeightScale);
         }
-        return 0;
+        return defaultKeyboardHeight;
     }
 
     public static int getDefaultKeyboardHeight(final Resources res) {