From d179e40899b648ce2ceb8543678176f9a696ff30 Mon Sep 17 00:00:00 2001
From: Andy Wang <andywang@google.com>
Date: Thu, 30 Oct 2014 15:16:05 +0900
Subject: [PATCH] Stop passing through keyPrefs as it's already available.

Change-Id: I43a56beba0cf0fdf5f93c5c764edbd279ee033b2
---
 .../inputmethod/latin/settings/DebugSettingsFragment.java    | 3 +--
 .../src/com/android/inputmethod/latin/settings/Settings.java | 5 +++--
 .../android/inputmethod/latin/settings/SettingsValues.java   | 3 +--
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/java/src/com/android/inputmethod/latin/settings/DebugSettingsFragment.java b/java/src/com/android/inputmethod/latin/settings/DebugSettingsFragment.java
index 068f56df1..b788d7fcf 100644
--- a/java/src/com/android/inputmethod/latin/settings/DebugSettingsFragment.java
+++ b/java/src/com/android/inputmethod/latin/settings/DebugSettingsFragment.java
@@ -281,8 +281,7 @@ public final class DebugSettingsFragment extends SubScreenFragment
 
             @Override
             public int readValue(final String key) {
-                return getPercentageFromValue(
-                        Settings.readKeyboardHeight(prefs, key, defaultValue));
+                return getPercentageFromValue(Settings.readKeyboardHeight(prefs, defaultValue));
             }
 
             @Override
diff --git a/java/src/com/android/inputmethod/latin/settings/Settings.java b/java/src/com/android/inputmethod/latin/settings/Settings.java
index 490fa827c..0d3dab57c 100644
--- a/java/src/com/android/inputmethod/latin/settings/Settings.java
+++ b/java/src/com/android/inputmethod/latin/settings/Settings.java
@@ -368,8 +368,9 @@ public final class Settings implements SharedPreferences.OnSharedPreferenceChang
     }
 
     public static float readKeyboardHeight(final SharedPreferences prefs,
-            final String prefKey, final float defaultValue) {
-        final float percentage = prefs.getFloat(prefKey, UNDEFINED_PREFERENCE_VALUE_FLOAT);
+            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;
     }
 
diff --git a/java/src/com/android/inputmethod/latin/settings/SettingsValues.java b/java/src/com/android/inputmethod/latin/settings/SettingsValues.java
index c3755792c..5f1a7af44 100644
--- a/java/src/com/android/inputmethod/latin/settings/SettingsValues.java
+++ b/java/src/com/android/inputmethod/latin/settings/SettingsValues.java
@@ -190,8 +190,7 @@ public class SettingsValues {
         mHasCustomKeyPreviewAnimationParams = prefs.getBoolean(
                 DebugSettings.PREF_HAS_CUSTOM_KEY_PREVIEW_ANIMATION_PARAMS, false);
         mHasKeyboardResize = prefs.getBoolean(DebugSettings.PREF_RESIZE_KEYBOARD, false);
-        mKeyboardHeightScale = Settings.readKeyboardHeight(
-                prefs, DebugSettings.PREF_KEYBOARD_HEIGHT_SCALE, DEFAULT_SIZE_SCALE);
+        mKeyboardHeightScale = Settings.readKeyboardHeight(prefs, DEFAULT_SIZE_SCALE);
         mKeyPreviewShowUpDuration = Settings.readKeyPreviewAnimationDuration(
                 prefs, DebugSettings.PREF_KEY_PREVIEW_SHOW_UP_DURATION,
                 res.getInteger(R.integer.config_key_preview_show_up_duration));