am c6452f25: Merge "Remove reference to string.english_ime_name" (3d0fee4e) · Commits · e / os / android_packages_inputmethods_LatinIME

java/src/com/android/inputmethod/keyboard/internal/KeyboardTextsSet.java

+5 −4

Original line number	Original line	Diff line number	Diff line
	@@ -61,13 +61,14 @@ public final class KeyboardTextsSet {
	}		}
	}		}

	public void loadStringResources(Context context) {		public void loadStringResources(final Context context) {
	loadStringResourcesInternal(context, RESOURCE_NAMES, R.string.english_ime_name);		final int referenceId = context.getApplicationInfo().labelRes;
			loadStringResourcesInternal(context, RESOURCE_NAMES, referenceId);
	}		}

	@UsedForTesting		@UsedForTesting
	void loadStringResourcesInternal(Context context, final String[] resourceNames,		void loadStringResourcesInternal(final Context context, final String[] resourceNames,
	int referenceId) {		final int referenceId) {
	final Resources res = context.getResources();		final Resources res = context.getResources();
	final String packageName = res.getResourcePackageName(referenceId);		final String packageName = res.getResourcePackageName(referenceId);
	for (final String resName : resourceNames) {		for (final String resName : resourceNames) {

tests/src/com/android/inputmethod/keyboard/internal/KeySpecParserCsvTests.java

+5 −3

Original line number	Original line	Diff line number	Diff line
	@@ -56,7 +56,8 @@ public class KeySpecParserCsvTests extends InstrumentationTestCase {
	return names.toArray(new String[names.size()]);		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) {		if (expected == actual) {
	return;		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 resolvedActual = KeySpecParser.resolveTextReference(value, mTextsSet);
	final String[] actual = StringUtils.parseCsvString(resolvedActual);		final String[] actual = StringUtils.parseCsvString(resolvedActual);
	final String[] expected = (expectedArray.length == 0) ? null : expectedArray;		final String[] expected = (expectedArray.length == 0) ? null : expectedArray;
	assertArrayEquals(message, expected, actual);		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 {		try {
	assertTextArray(message, value, expected);		assertTextArray(message, value, expected);
	fail(message);		fail(message);

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

+5 −4

Original line number	Original line	Diff line number	Diff line
	@@ -61,13 +61,14 @@ public final class KeyboardTextsSet {
	}		}
	}		}

	public void loadStringResources(Context context) {		public void loadStringResources(final Context context) {
	loadStringResourcesInternal(context, RESOURCE_NAMES, R.string.english_ime_name);		final int referenceId = context.getApplicationInfo().labelRes;
			loadStringResourcesInternal(context, RESOURCE_NAMES, referenceId);
	}		}

	@UsedForTesting		@UsedForTesting
	void loadStringResourcesInternal(Context context, final String[] resourceNames,		void loadStringResourcesInternal(final Context context, final String[] resourceNames,
	int referenceId) {		final int referenceId) {
	final Resources res = context.getResources();		final Resources res = context.getResources();
	final String packageName = res.getResourcePackageName(referenceId);		final String packageName = res.getResourcePackageName(referenceId);
	for (final String resName : resourceNames) {		for (final String resName : resourceNames) {