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

Commit 8a961759 authored by Tadashi G. Takaoka's avatar Tadashi G. Takaoka Committed by Android Git Automerger
Browse files

am 86ade472: Merge "Initialize SubtypeLocale from Settings (DO NOT MERGE)" into jb-dev 

* commit '86ade472':
  Initialize SubtypeLocale from Settings (DO NOT MERGE)
parents 949d2ae5 86ade472

java/src/com/android/inputmethod/latin/Settings.java

+4 −0
Original line number Diff line number Diff line
@@ -116,6 +116,10 @@ public class Settings extends InputMethodSettingsFragment 
        final Resources res = getResources();

        final Context context = getActivity();



        // When we are called from the Settings application but we are not already running, the

        // {@link SubtypeLocale} class may not have been initialized. It is safe to call

        // {@link SubtypeLocale#init(Context)} multiple times.

        SubtypeLocale.init(context);

        mVoicePreference = (ListPreference) findPreference(PREF_VOICE_MODE);

        mShowCorrectionSuggestionsPreference =

                (ListPreference) findPreference(PREF_SHOW_SUGGESTIONS_SETTING);

java/src/com/android/inputmethod/latin/SubtypeLocale.java

+7 −1
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ public class SubtypeLocale { 
    public static final String QWERTY = "qwerty";

    public static final int UNKNOWN_KEYBOARD_LAYOUT = R.string.subtype_generic;



    private static boolean sInitialized = false;

    private static String[] sPredefinedKeyboardLayoutSet;

    // Keyboard layout to its display name map.

    private static final HashMap<String, String> sKeyboardLayoutToDisplayNameMap =
@@ -69,7 +70,10 @@ public class SubtypeLocale { 
        // Intentional empty constructor for utility class.

    }



    public static void init(Context context) {

    // Note that this initialization method can be called multiple times.

    public static synchronized void init(Context context) {

        if (sInitialized) return;



        final Resources res = context.getResources();



        final String[] predefinedLayoutSet = res.getStringArray(R.array.predefined_layouts);
@@ -109,6 +113,8 @@ public class SubtypeLocale { 
            final String keyboardLayoutSet = keyboardLayoutSetMap[i + 1];

            sLocaleAndExtraValueToKeyboardLayoutSetMap.put(key, keyboardLayoutSet);

        }



        sInitialized = true;

    }



    public static String[] getPredefinedKeyboardLayoutSet() {