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

Commit 2d9722e4 authored by Ken Wakasa's avatar Ken Wakasa
Browse files

Update the theme pref key. 

Follow up to Ia139813b

Change-Id: Ic4c2ea63041af02119dc404e704a04608d041163
parent 60e4997e

java/res/xml/prefs_for_debug.xml

+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ 
            />



    <ListPreference

            android:key="pref_keyboard_layout_20100902"

            android:key="pref_keyboard_layout_20110916"

            android:title="@string/keyboard_layout"

            android:persistent="true"

            android:entryValues="@array/keyboard_layout_modes_values"

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

+2 −3
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ public class KeyboardSwitcher implements SharedPreferences.OnSharedPreferenceCha 
    private static final boolean DEBUG_CACHE = LatinImeLogger.sDBG;

    public static final boolean DEBUG_STATE = false;



    public static final String PREF_KEYBOARD_LAYOUT = "pref_keyboard_layout_20100902";

    public static final String PREF_KEYBOARD_LAYOUT = "pref_keyboard_layout_20110916";

    private static final int[] KEYBOARD_THEMES = {

        R.style.KeyboardTheme,

        R.style.KeyboardTheme_HighContrast,
@@ -182,8 +182,7 @@ 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 = Settings.ENABLE_EXPERIMENTAL_SETTINGS

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

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

        try {

            final int themeIndex = Integer.valueOf(themeId);

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