aboutsummaryrefslogtreecommitdiffstats
path: root/java/src/com/android/inputmethod/latin/Utils.java
diff options
context:
space:
mode:
authorTadashi G. Takaoka <takaoka@google.com>2012-04-16 12:59:55 +0900
committerTadashi G. Takaoka <takaoka@google.com>2012-04-16 12:59:55 +0900
commit11a40a047fc0e72e0ad4cc6743e37e96b1bc0e7a (patch)
tree08b87ef6c3d770e441e88794fb62f328471c59eb /java/src/com/android/inputmethod/latin/Utils.java
parent423b30d59c31b08c7847c47e69b34b9d38a97706 (diff)
downloadlatinime-11a40a047fc0e72e0ad4cc6743e37e96b1bc0e7a.tar.gz
latinime-11a40a047fc0e72e0ad4cc6743e37e96b1bc0e7a.tar.xz
latinime-11a40a047fc0e72e0ad4cc6743e37e96b1bc0e7a.zip
Make Utils.getDeviceOverrideValue aware of device orientation
Bug: 6277225 Change-Id: If41fe5cbee0985b9a4740dcd5d1c6ba73b94b377
Diffstat (limited to 'java/src/com/android/inputmethod/latin/Utils.java')
-rw-r--r--java/src/com/android/inputmethod/latin/Utils.java7
1 files changed, 4 insertions, 3 deletions
diff --git a/java/src/com/android/inputmethod/latin/Utils.java b/java/src/com/android/inputmethod/latin/Utils.java
index 0485c881b..036ff74b8 100644
--- a/java/src/com/android/inputmethod/latin/Utils.java
+++ b/java/src/com/android/inputmethod/latin/Utils.java
@@ -466,11 +466,12 @@ public class Utils {
}
private static final String HARDWARE_PREFIX = Build.HARDWARE + ",";
- private static final HashMap<Integer, String> sDeviceOverrideValueMap =
- new HashMap<Integer, String>();
+ private static final HashMap<String, String> sDeviceOverrideValueMap =
+ new HashMap<String, String>();
public static String getDeviceOverrideValue(Resources res, int overrideResId, String defValue) {
- final Integer key = overrideResId;
+ final int orientation = res.getConfiguration().orientation;
+ final String key = overrideResId + "-" + orientation;
if (!sDeviceOverrideValueMap.containsKey(key)) {
String overrideValue = defValue;
for (final String element : res.getStringArray(overrideResId)) {