diff options
| author | Tadashi G. Takaoka <takaoka@google.com> | 2014-11-19 13:45:21 +0900 |
|---|---|---|
| committer | LorDClockaN <davor@losinj.com> | 2015-03-18 23:47:59 +0100 |
| commit | 7d00fd2eaf775cf593c9d50261b9efcbbac32d38 (patch) | |
| tree | 3868f061f23060b17f72781d7e8d85495ac5b5b2 /tests/src/com/android/inputmethod/keyboard | |
| parent | 754be98d7c1b93b4cc8e5664eae7fd4c996115d4 (diff) | |
Cherry-picked 6fc92899d82f4d3cb30f7bb2c57133154f0babd2 from
ub-latinimegoogle-edamame-mr1-release.
Bug: 18418991
Change-Id: Id4dff41ba488635ff9af899be6d4f84ab00a96c8
Diffstat (limited to 'tests/src/com/android/inputmethod/keyboard')
| -rw-r--r-- | tests/src/com/android/inputmethod/keyboard/layout/expected/ExpectedKeyOutput.java | 3 | ||||
| -rw-r--r-- | tests/src/com/android/inputmethod/keyboard/layout/expected/ExpectedKeyVisual.java | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/expected/ExpectedKeyOutput.java b/tests/src/com/android/inputmethod/keyboard/layout/expected/ExpectedKeyOutput.java index 737d1695b..8b2bb4289 100644 --- a/tests/src/com/android/inputmethod/keyboard/layout/expected/ExpectedKeyOutput.java +++ b/tests/src/com/android/inputmethod/keyboard/layout/expected/ExpectedKeyOutput.java @@ -63,7 +63,8 @@ abstract class ExpectedKeyOutput { final String codeString = StringUtils.newSingleCodePointString(mCode); // A letter may have an upper case counterpart that consists of multiple code // points, for instance the upper case of "ß" is "SS". - return newInstance(codeString.toUpperCase(locale)); + return newInstance(StringUtils.toUpperCaseOfStringForLocale( + codeString, true /* needsToUpperCase */, locale)); } // A special negative value has no upper case. return this; diff --git a/tests/src/com/android/inputmethod/keyboard/layout/expected/ExpectedKeyVisual.java b/tests/src/com/android/inputmethod/keyboard/layout/expected/ExpectedKeyVisual.java index facdf7043..34024a5e0 100644 --- a/tests/src/com/android/inputmethod/keyboard/layout/expected/ExpectedKeyVisual.java +++ b/tests/src/com/android/inputmethod/keyboard/layout/expected/ExpectedKeyVisual.java @@ -19,6 +19,7 @@ package com.android.inputmethod.keyboard.layout.expected; import com.android.inputmethod.keyboard.Key; import com.android.inputmethod.keyboard.internal.KeyboardIconsSet; import com.android.inputmethod.keyboard.internal.MoreKeySpec; +import com.android.inputmethod.latin.utils.StringUtils; import java.util.Locale; @@ -105,7 +106,8 @@ abstract class ExpectedKeyVisual { @Override ExpectedKeyVisual toUpperCase(final Locale locale) { - return new Label(mLabel.toUpperCase(locale)); + return new Label(StringUtils.toUpperCaseOfStringForLocale( + mLabel, true /* needsToUpperCase */, locale)); } @Override |