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

Commit 60e4997e authored by Ken Wakasa's avatar Ken Wakasa Committed by Android (Google) Code Review
Browse files

Merge "Use the correct theme on ICS"

parents dc7974d5 dc52a562

java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java

+2 −1
Original line number Diff line number Diff line
@@ -182,7 +182,8 @@ public class KeyboardSwitcher implements SharedPreferences.OnSharedPreferenceCha 


    private static int getKeyboardThemeIndex(Context context, SharedPreferences prefs) {

        final String defaultThemeId = context.getString(R.string.config_default_keyboard_theme_id);

        final String themeId = prefs.getString(PREF_KEYBOARD_LAYOUT, defaultThemeId);

        final String themeId = Settings.ENABLE_EXPERIMENTAL_SETTINGS

                ? prefs.getString(PREF_KEYBOARD_LAYOUT, defaultThemeId) : defaultThemeId;

        try {

            final int themeIndex = Integer.valueOf(themeId);

            if (themeIndex >= 0 && themeIndex < KEYBOARD_THEMES.length)