diff options
| author |   Tadashi G. Takaoka <takaoka@google.com> | 2013-03-27 21:45:05 -0700 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2013-03-27 21:45:05 -0700 |
| commit | bb679a224f4daf00d8f65c2903bf90a9253b5e1b (patch) | |
| tree | 4c93014828fa89011021fbf66d5fdda22601b26d /java/src | |
| parent | 4bb504cedbe3c86f7f54c98afd36e5301ff1c9f9 (diff) | |
| parent | 3d0fee4e09050676c71276cc1bbd0c8bdeaf14d1 (diff) | |
| download | latinime-bb679a224f4daf00d8f65c2903bf90a9253b5e1b.tar.gz latinime-bb679a224f4daf00d8f65c2903bf90a9253b5e1b.tar.xz latinime-bb679a224f4daf00d8f65c2903bf90a9253b5e1b.zip | |
am 3d0fee4e: am c6452f25: Merge "Remove reference to string.english_ime_name"
* commit '3d0fee4e09050676c71276cc1bbd0c8bdeaf14d1':
Remove reference to string.english_ime_name
Diffstat (limited to 'java/src')
| -rw-r--r-- | java/src/com/android/inputmethod/keyboard/internal/KeyboardTextsSet.java | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/java/src/com/android/inputmethod/keyboard/internal/KeyboardTextsSet.java b/java/src/com/android/inputmethod/keyboard/internal/KeyboardTextsSet.java index d0b382e35..e0d6a2443 100644 --- a/java/src/com/android/inputmethod/keyboard/internal/KeyboardTextsSet.java +++ b/java/src/com/android/inputmethod/keyboard/internal/KeyboardTextsSet.java @@ -61,13 +61,14 @@ public final class KeyboardTextsSet { } } - public void loadStringResources(Context context) { - loadStringResourcesInternal(context, RESOURCE_NAMES, R.string.english_ime_name); + public void loadStringResources(final Context context) { + final int referenceId = context.getApplicationInfo().labelRes; + loadStringResourcesInternal(context, RESOURCE_NAMES, referenceId); } @UsedForTesting - void loadStringResourcesInternal(Context context, final String[] resourceNames, - int referenceId) { + void loadStringResourcesInternal(final Context context, final String[] resourceNames, + final int referenceId) { final Resources res = context.getResources(); final String packageName = res.getResourcePackageName(referenceId); for (final String resName : resourceNames) { |