diff options
| author |   Tadashi G. Takaoka <takaoka@google.com> | 2013-12-02 11:14:06 +0000 |
|---|---|---|
| committer |   Android (Google) Code Review <android-gerrit@google.com> | 2013-12-02 11:14:07 +0000 |
| commit | 5d311f2c13aaf40e4c76b658b67b1d3e765c66fb (patch) | |
| tree | 021be343df5ff9af259684a657495388ac67668c /java/src/com/android/inputmethod/latin/utils/ResourceUtils.java | |
| parent | 576c753d25f8a1de396ece59b7b3c9b098d67e95 (diff) | |
| parent | 8c6052bce1447076dcc61ea7d44df5d67bdf5a61 (diff) | |
| download | latinime-5d311f2c13aaf40e4c76b658b67b1d3e765c66fb.tar.gz latinime-5d311f2c13aaf40e4c76b658b67b1d3e765c66fb.tar.xz latinime-5d311f2c13aaf40e4c76b658b67b1d3e765c66fb.zip | |
Merge "Add config_ prefix to the resource names merged from dimens.xml"
Diffstat (limited to 'java/src/com/android/inputmethod/latin/utils/ResourceUtils.java')
| -rw-r--r-- | java/src/com/android/inputmethod/latin/utils/ResourceUtils.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/java/src/com/android/inputmethod/latin/utils/ResourceUtils.java b/java/src/com/android/inputmethod/latin/utils/ResourceUtils.java index 22c92446a..deb28a08d 100644 --- a/java/src/com/android/inputmethod/latin/utils/ResourceUtils.java +++ b/java/src/com/android/inputmethod/latin/utils/ResourceUtils.java @@ -227,19 +227,19 @@ public final class ResourceUtils { final String keyboardHeightString = getDeviceOverrideValue(res, R.array.keyboard_heights); final float keyboardHeight; if (TextUtils.isEmpty(keyboardHeightString)) { - keyboardHeight = res.getDimension(R.dimen.keyboardHeight); + keyboardHeight = res.getDimension(R.dimen.config_default_keyboard_height); } else { keyboardHeight = Float.parseFloat(keyboardHeightString) * dm.density; } final float maxKeyboardHeight = res.getFraction( - R.fraction.maxKeyboardHeight, dm.heightPixels, dm.heightPixels); + R.fraction.config_max_keyboard_height, dm.heightPixels, dm.heightPixels); float minKeyboardHeight = res.getFraction( - R.fraction.minKeyboardHeight, dm.heightPixels, dm.heightPixels); + R.fraction.config_min_keyboard_height, dm.heightPixels, dm.heightPixels); if (minKeyboardHeight < 0.0f) { // Specified fraction was negative, so it should be calculated against display // width. minKeyboardHeight = -res.getFraction( - R.fraction.minKeyboardHeight, dm.widthPixels, dm.widthPixels); + R.fraction.config_min_keyboard_height, dm.widthPixels, dm.widthPixels); } // Keyboard height will not exceed maxKeyboardHeight and will not be less than // minKeyboardHeight. |