diff options
| author |   Tadashi G. Takaoka <takaoka@google.com> | 2013-12-02 18:38:03 +0900 |
|---|---|---|
| committer | Tadashi G. Takaoka <takaoka@google.com> | 2013-12-02 20:01:15 +0900 |
| commit | 8c6052bce1447076dcc61ea7d44df5d67bdf5a61 (patch) | |
| tree | ab7aa4c7b5349f4683946b11b5e7110d7a430bba /java/src/com/android/inputmethod/latin/utils/ResourceUtils.java | |
| parent | 5a9c78855aa2feaafdaa62e0571ec9c53726ee51 (diff) | |
| download | latinime-8c6052bce1447076dcc61ea7d44df5d67bdf5a61.tar.gz latinime-8c6052bce1447076dcc61ea7d44df5d67bdf5a61.tar.xz latinime-8c6052bce1447076dcc61ea7d44df5d67bdf5a61.zip | |
Add config_ prefix to the resource names merged from dimens.xml
Change-Id: I6fb11b8cb52c06b805fb17d61450d7df50e4e20d
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. |