diff options
| author |   Tadashi G. Takaoka <takaoka@google.com> | 2012-04-25 14:17:49 +0900 |
|---|---|---|
| committer | Tadashi G. Takaoka <takaoka@google.com> | 2012-04-26 11:50:28 +0900 |
| commit | 27b42ced86e1c85de3d59d91a9e5c577fa552569 (patch) | |
| tree | 320d2e6c6429eded514f9c1c75f422d53c47ecee /java/src/com/android/inputmethod/latin/LocaleUtils.java | |
| parent | 49caddbdabe5ca666bdef9f842f134e30e7ffed9 (diff) | |
| download | latinime-27b42ced86e1c85de3d59d91a9e5c577fa552569.tar.gz latinime-27b42ced86e1c85de3d59d91a9e5c577fa552569.tar.xz latinime-27b42ced86e1c85de3d59d91a9e5c577fa552569.zip | |
Fix "no language" subtype name (DO NOT MERGE)
* Move SubtypeLocale.get{Full,Middle,Short}DisplayName() to
LatinLeyboardView and add unit tests (SpacebarTextTests).
* Add SubtypeLocale.getSubtypeDisplayName()
This is a cherry-pick of I57420c6a from Master.
Bug: 6393865
Change-Id: I68748189c17c73984ac4ae05a5a40fb54bf46453
Diffstat (limited to 'java/src/com/android/inputmethod/latin/LocaleUtils.java')
| -rw-r--r-- | java/src/com/android/inputmethod/latin/LocaleUtils.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/java/src/com/android/inputmethod/latin/LocaleUtils.java b/java/src/com/android/inputmethod/latin/LocaleUtils.java index f19c59a6a..b938dd336 100644 --- a/java/src/com/android/inputmethod/latin/LocaleUtils.java +++ b/java/src/com/android/inputmethod/latin/LocaleUtils.java @@ -180,13 +180,13 @@ public class LocaleUtils { try { if (newLocale != null && !newLocale.equals(oldLocale)) { conf.locale = newLocale; - res.updateConfiguration(conf, res.getDisplayMetrics()); + res.updateConfiguration(conf, null); } return job(res); } finally { if (newLocale != null && !newLocale.equals(oldLocale)) { conf.locale = oldLocale; - res.updateConfiguration(conf, res.getDisplayMetrics()); + res.updateConfiguration(conf, null); } } } |