diff options
| author |   Tadashi G. Takaoka <takaoka@google.com> | 2013-05-15 12:53:10 -0700 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2013-05-15 12:53:10 -0700 |
| commit | c731457f8abb5342a34f27a3a5c65efc33bc3848 (patch) | |
| tree | 08120aa27d9a1308f3f388b85cf0095323ec9a0c /java/src | |
| parent | 73673b4c4133587e0d310041bb9155798dd6ec37 (diff) | |
| parent | f6b5484dcb2d69fe6a21a62fda31ff523936b492 (diff) | |
| download | latinime-c731457f8abb5342a34f27a3a5c65efc33bc3848.tar.gz latinime-c731457f8abb5342a34f27a3a5c65efc33bc3848.tar.xz latinime-c731457f8abb5342a34f27a3a5c65efc33bc3848.zip | |
am f6b5484d: am b5f67e7f: Add device specific keypress vibration duration database
* commit 'f6b5484dcb2d69fe6a21a62fda31ff523936b492':
Add device specific keypress vibration duration database
Diffstat (limited to 'java/src')
| -rw-r--r-- | java/src/com/android/inputmethod/latin/ResourceUtils.java | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/java/src/com/android/inputmethod/latin/ResourceUtils.java b/java/src/com/android/inputmethod/latin/ResourceUtils.java index 03b7efba9..a9fba5348 100644 --- a/java/src/com/android/inputmethod/latin/ResourceUtils.java +++ b/java/src/com/android/inputmethod/latin/ResourceUtils.java @@ -30,7 +30,6 @@ import java.util.HashMap; public final class ResourceUtils { private static final String TAG = ResourceUtils.class.getSimpleName(); - private static final boolean DEBUG = false; public static final float UNDEFINED_RATIO = -1.0f; public static final int UNDEFINED_DIMENSION = -1; @@ -45,6 +44,7 @@ public final class ResourceUtils { private static final String[] BUILD_KEYS_AND_VALUES = { "HARDWARE", Build.HARDWARE, "MODEL", Build.MODEL, + "BRAND", Build.BRAND, "MANUFACTURER", Build.MANUFACTURER }; private static final HashMap<String, String> sBuildKeyValues; @@ -75,12 +75,10 @@ public final class ResourceUtils { final String overrideValue = findConstantForKeyValuePairs(sBuildKeyValues, overrideArray); // The overrideValue might be an empty string. if (overrideValue != null) { - if (DEBUG) { - Log.d(TAG, "Find override value:" - + " resource="+ res.getResourceEntryName(overrideResId) - + " build=" + sBuildKeyValuesDebugString - + " override=" + overrideValue); - } + Log.i(TAG, "Find override value:" + + " resource="+ res.getResourceEntryName(overrideResId) + + " build=" + sBuildKeyValuesDebugString + + " override=" + overrideValue); sDeviceOverrideValueMap.put(key, overrideValue); return overrideValue; } @@ -91,10 +89,11 @@ public final class ResourceUtils { Log.w(TAG, "Couldn't find override value nor default value:" + " resource="+ res.getResourceEntryName(overrideResId) + " build=" + sBuildKeyValuesDebugString); - } else if (DEBUG) { - Log.d(TAG, "Found default value:" - + " resource="+ res.getResourceEntryName(overrideResId) - + " build=" + sBuildKeyValuesDebugString + " default=" + defaultValue); + } else { + Log.i(TAG, "Found default value:" + + " resource="+ res.getResourceEntryName(overrideResId) + + " build=" + sBuildKeyValuesDebugString + + " default=" + defaultValue); } sDeviceOverrideValueMap.put(key, defaultValue); return defaultValue; |