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

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

Merge "Clean SubtypeLocaleUtils a bit"

parents 1da382b8 1dfdd9b5

java/src/com/android/inputmethod/latin/settings/CustomInputStylePreference.java

+3 −1
Original line number Diff line number Diff line
@@ -346,8 +346,10 @@ final class CustomInputStylePreference extends DialogPreference 
            super(context, android.R.layout.simple_spinner_item);

            setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);



            final String[] predefinedKeyboardLayoutSet = context.getResources().getStringArray(

                    R.array.predefined_layouts);

            // TODO: Should filter out already existing combinations of locale and layout.

            for (final String layout : SubtypeLocaleUtils.getPredefinedKeyboardLayoutSet()) {

            for (final String layout : predefinedKeyboardLayoutSet) {

                // This is a dummy subtype with NO_LANGUAGE, only for display.

                final InputMethodSubtype subtype =

                        AdditionalSubtypeUtils.createDummyAdditionalSubtype(

java/src/com/android/inputmethod/latin/utils/SubtypeLocaleUtils.java

+0 −6
Original line number Diff line number Diff line
@@ -56,7 +56,6 @@ public final class SubtypeLocaleUtils { 
    private static volatile boolean sInitialized = false;

    private static final Object sInitializeLock = new Object();

    private static Resources sResources;

    private static String[] sPredefinedKeyboardLayoutSet;

    // Keyboard layout to its display name map.

    private static final HashMap<String, String> sKeyboardLayoutToDisplayNameMap = new HashMap<>();

    // Keyboard layout to subtype name resource id map.
@@ -103,7 +102,6 @@ public final class SubtypeLocaleUtils { 
        sResources = res;



        final String[] predefinedLayoutSet = res.getStringArray(R.array.predefined_layouts);

        sPredefinedKeyboardLayoutSet = predefinedLayoutSet;

        final String[] layoutDisplayNames = res.getStringArray(

                R.array.predefined_layout_display_names);

        for (int i = 0; i < predefinedLayoutSet.length; i++) {
@@ -152,10 +150,6 @@ public final class SubtypeLocaleUtils { 
        }

    }



    public static String[] getPredefinedKeyboardLayoutSet() {

        return sPredefinedKeyboardLayoutSet;

    }



    public static boolean isExceptionalLocale(final String localeString) {

        return sExceptionalLocaleToNameIdsMap.containsKey(localeString);

    }