Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c6452f25 authored by Tadashi G. Takaoka's avatar Tadashi G. Takaoka Committed by Android (Google) Code Review
Browse files

Merge "Remove reference to string.english_ime_name"

parents f4352c2c 9f3774c1

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

+5 −4
Original line number Diff line number Diff line
@@ -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) {

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

+5 −3
Original line number Diff line number Diff line
@@ -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);

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

+5 −4
Original line number Diff line number Diff line
@@ -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) {