nyancrimew
/
LatinIME
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

am 3d0fee4e: am c6452f25: Merge "Remove reference to string.english_ime_name" 

* commit '3d0fee4e09050676c71276cc1bbd0c8bdeaf14d1':
  Remove reference to string.english_ime_name
main
Tadashi G. Takaoka 2013-03-27 21:45:05 -07:00 committed by Android Git Automerger
parent 4bb504cedb 3d0fee4e09
commit bb679a224f
3 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
java/src/com/android/inputmethod/keyboard/internal/KeyboardTextsSet.java
View File

@ -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) {

8
tests/src/com/android/inputmethod/keyboard/internal/KeySpecParserCsvTests.java
View File

@ -56,7 +56,8 @@ public class KeySpecParserCsvTests extends InstrumentationTestCase {
return names.toArray(new String[names.size()]);
}
private static void assertArrayEquals(String message, Object[] expected, Object[] actual) {
private static void assertArrayEquals(final String message, final Object[] expected,
final Object[] actual) {
if (expected == actual) {
return;
}
@ -74,14 +75,15 @@ public class KeySpecParserCsvTests extends InstrumentationTestCase {
}
}
private void assertTextArray(String message, String value, String ... expectedArray) {
private void assertTextArray(final String message, final String value,
final String ... expectedArray) {
final String resolvedActual = KeySpecParser.resolveTextReference(value, mTextsSet);
final String[] actual = StringUtils.parseCsvString(resolvedActual);
final String[] expected = (expectedArray.length == 0) ? null : expectedArray;
assertArrayEquals(message, expected, actual);
}
private void assertError(String message, String value, String ... expected) {
private void assertError(final String message, final String value, final String ... expected) {
try {
assertTextArray(message, value, expected);
fail(message);

9
tools/maketext/res/com/android/inputmethod/keyboard/internal/KeyboardTextsSet.tmpl
View File

@ -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) {