From 18184eacb149f1b12b859ff8631340a9f73bf8ac Mon Sep 17 00:00:00 2001 From: "Tadashi G. Takaoka" Date: Mon, 13 May 2013 13:40:59 +0900 Subject: Support regular expression for condition pattern Bug: 8556975 Change-Id: Iffc53d6a40dd77860434c5f7f4f59af5cd1ba92b --- java/src/com/android/inputmethod/latin/ResourceUtils.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'java/src') diff --git a/java/src/com/android/inputmethod/latin/ResourceUtils.java b/java/src/com/android/inputmethod/latin/ResourceUtils.java index 488a0e313..03b7efba9 100644 --- a/java/src/com/android/inputmethod/latin/ResourceUtils.java +++ b/java/src/com/android/inputmethod/latin/ResourceUtils.java @@ -103,12 +103,12 @@ public final class ResourceUtils { /** * Find the condition that fulfills specified key value pairs from an array of * "condition,constant", and return the corresponding string constant. A condition is - * "pattern1[:pattern2...] (or an empty string for the default). A pattern is "key=value" - * string. The condition matches only if all patterns of the condition are true for the - * specified key value pairs. + * "pattern1[:pattern2...] (or an empty string for the default). A pattern is + * "key=regexp_value" string. The condition matches only if all patterns of the condition + * are true for the specified key value pairs. * * For example, "condition,constant" has the following format. - * (See {@link ResourceUtilsTests#testFindConstantForKeyValuePairsCombined()}) + * (See {@link ResourceUtilsTests#testFindConstantForKeyValuePairsRegexp()}) * - HARDWARE=mako,constantForNexus4 * - MODEL=Nexus 4:MANUFACTURER=LGE,constantForNexus4 * - ,defaultConstant @@ -156,8 +156,8 @@ public final class ResourceUtils { if (value == null) { throw new RuntimeException("Found unknown key: " + condition); } - final String patternValue = pattern.substring(posEqual + 1); - if (!value.equals(patternValue)) { + final String patternRegexpValue = pattern.substring(posEqual + 1); + if (!value.matches(patternRegexpValue)) { return false; } } -- cgit v1.2.3-83-g751a