Merge "Revert "Revert "Fall back to default keyboard theme""" (7d64bc34) · Commits · e / os / android_packages_inputmethods_LatinIME

java/res/values/keyboard-themes.xml

+2 −2

Original line number	Diff line number	Diff line
		@@ -26,10 +26,10 @@
		<item>@string/keyboard_theme_holo_blue</item>
		</string-array>
		<!-- An element must be a keyboard theme id of {@link KeyboardTheme#THEME_ID_*}. -->
		<string-array name="keyboard_theme_ids" translatable="false">
		<integer-array name="keyboard_theme_ids" translatable="false">
		<item>3</item>
		<item>4</item>
		<item>2</item>
		<item>0</item>
		</string-array>
		</integer-array>
		</resources>

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

+4 −9

Original line number	Diff line number	Diff line
		@@ -17,9 +17,7 @@
		package com.android.inputmethod.keyboard;

		import android.content.Context;
		import android.content.SharedPreferences;
		import android.content.res.Resources;
		import android.preference.PreferenceManager;
		import android.util.Log;
		import android.view.ContextThemeWrapper;
		import android.view.LayoutInflater;
		@@ -47,7 +45,6 @@ public final class KeyboardSwitcher implements KeyboardState.SwitchActions {
		private static final String TAG = KeyboardSwitcher.class.getSimpleName();

		private SubtypeSwitcher mSubtypeSwitcher;
		private SharedPreferences mPrefs;

		private InputView mCurrentInputView;
		private View mMainKeyboardFrame;
		@@ -76,13 +73,11 @@ public final class KeyboardSwitcher implements KeyboardState.SwitchActions {
		}

		public static void init(final LatinIME latinIme) {
		final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(latinIme);
		sInstance.initInternal(latinIme, prefs);
		sInstance.initInternal(latinIme);
		}

		private void initInternal(final LatinIME latinIme, final SharedPreferences prefs) {
		private void initInternal(final LatinIME latinIme) {
		mLatinIME = latinIme;
		mPrefs = prefs;
		mSubtypeSwitcher = SubtypeSwitcher.getInstance();
		mState = new KeyboardState(this);
		mIsHardwareAcceleratedDrawingEnabled =
		@@ -91,7 +86,7 @@ public final class KeyboardSwitcher implements KeyboardState.SwitchActions {

		public void updateKeyboardTheme() {
		final boolean themeUpdated = updateKeyboardThemeAndContextThemeWrapper(
		mLatinIME, KeyboardTheme.getKeyboardTheme(mPrefs));
		mLatinIME, KeyboardTheme.getKeyboardTheme(mLatinIME /* context */));
		if (themeUpdated && mKeyboardView != null) {
		mLatinIME.setInputView(onCreateInputView(mIsHardwareAcceleratedDrawingEnabled));
		}
		@@ -348,7 +343,7 @@ public final class KeyboardSwitcher implements KeyboardState.SwitchActions {
		}

		updateKeyboardThemeAndContextThemeWrapper(
		mLatinIME, KeyboardTheme.getKeyboardTheme(mPrefs));
		mLatinIME, KeyboardTheme.getKeyboardTheme(mLatinIME /* context */));
		mCurrentInputView = (InputView)LayoutInflater.from(mThemeContext).inflate(
		R.layout.input_view, null);
		mMainKeyboardFrame = mCurrentInputView.findViewById(R.id.main_keyboard_frame);

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

+47 −20

Original line number	Diff line number	Diff line
		@@ -16,14 +16,17 @@

		package com.android.inputmethod.keyboard;

		import android.content.Context;
		import android.content.SharedPreferences;
		import android.os.Build.VERSION_CODES;
		import android.preference.PreferenceManager;
		import android.util.Log;

		import com.android.inputmethod.annotations.UsedForTesting;
		import com.android.inputmethod.compat.BuildCompatUtils;
		import com.android.inputmethod.latin.R;

		import java.util.ArrayList;
		import java.util.Arrays;

		public final class KeyboardTheme implements Comparable<KeyboardTheme> {
		@@ -40,7 +43,10 @@ public final class KeyboardTheme implements Comparable<KeyboardTheme> {
		public static final int THEME_ID_LXX_DARK = 4;
		public static final int DEFAULT_THEME_ID = THEME_ID_KLP;

		private static final KeyboardTheme[] KEYBOARD_THEMES = {
		private static KeyboardTheme[] AVAILABLE_KEYBOARD_THEMES;

		@UsedForTesting
		static final KeyboardTheme[] KEYBOARD_THEMES = {
		new KeyboardTheme(THEME_ID_ICS, "ICS", R.style.KeyboardTheme_ICS,
		// This has never been selected because we support ICS or later.
		VERSION_CODES.BASE),
		@@ -93,9 +99,10 @@ public final class KeyboardTheme implements Comparable<KeyboardTheme> {
		}

		@UsedForTesting
		static KeyboardTheme searchKeyboardThemeById(final int themeId) {
		static KeyboardTheme searchKeyboardThemeById(final int themeId,
		final KeyboardTheme[] availableThemeIds) {
		// TODO: This search algorithm isn't optimal if there are many themes.
		for (final KeyboardTheme theme : KEYBOARD_THEMES) {
		for (final KeyboardTheme theme : availableThemeIds) {
		if (theme.mThemeId == themeId) {
		return theme;
		}
		@@ -105,13 +112,14 @@ public final class KeyboardTheme implements Comparable<KeyboardTheme> {

		@UsedForTesting
		static KeyboardTheme getDefaultKeyboardTheme(final SharedPreferences prefs,
		final int sdkVersion) {
		final int sdkVersion, final KeyboardTheme[] availableThemeArray) {
		final String klpThemeIdString = prefs.getString(KLP_KEYBOARD_THEME_KEY, null);
		if (klpThemeIdString != null) {
		if (sdkVersion <= VERSION_CODES.KITKAT) {
		try {
		final int themeId = Integer.parseInt(klpThemeIdString);
		final KeyboardTheme theme = searchKeyboardThemeById(themeId);
		final KeyboardTheme theme = searchKeyboardThemeById(themeId,
		availableThemeArray);
		if (theme != null) {
		return theme;
		}
		@@ -125,22 +133,21 @@ public final class KeyboardTheme implements Comparable<KeyboardTheme> {
		prefs.edit().remove(KLP_KEYBOARD_THEME_KEY).apply();
		}
		// TODO: This search algorithm isn't optimal if there are many themes.
		for (final KeyboardTheme theme : KEYBOARD_THEMES) {
		for (final KeyboardTheme theme : availableThemeArray) {
		if (sdkVersion >= theme.mMinApiVersion) {
		return theme;
		}
		}
		return searchKeyboardThemeById(DEFAULT_THEME_ID);
		return searchKeyboardThemeById(DEFAULT_THEME_ID, availableThemeArray);
		}

		public static String getKeyboardThemeName(final int themeId) {
		final KeyboardTheme theme = searchKeyboardThemeById(themeId);
		final KeyboardTheme theme = searchKeyboardThemeById(themeId, KEYBOARD_THEMES);
		return theme.mThemeName;
		}

		public static void saveKeyboardThemeId(final String themeIdString,
		final SharedPreferences prefs) {
		saveKeyboardThemeId(themeIdString, prefs, BuildCompatUtils.EFFECTIVE_SDK_INT);
		public static void saveKeyboardThemeId(final int themeId, final SharedPreferences prefs) {
		saveKeyboardThemeId(themeId, prefs, BuildCompatUtils.EFFECTIVE_SDK_INT);
		}

		@UsedForTesting
		@@ -152,25 +159,45 @@ public final class KeyboardTheme implements Comparable<KeyboardTheme> {
		}

		@UsedForTesting
		static void saveKeyboardThemeId(final String themeIdString,
		final SharedPreferences prefs, final int sdkVersion) {
		static void saveKeyboardThemeId(final int themeId, final SharedPreferences prefs,
		final int sdkVersion) {
		final String prefKey = getPreferenceKey(sdkVersion);
		prefs.edit().putString(prefKey, themeIdString).apply();
		prefs.edit().putString(prefKey, Integer.toString(themeId)).apply();
		}

		public static KeyboardTheme getKeyboardTheme(final Context context) {
		final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
		final KeyboardTheme[] availableThemeArray = getAvailableThemeArray(context);
		return getKeyboardTheme(prefs, BuildCompatUtils.EFFECTIVE_SDK_INT, availableThemeArray);
		}

		public static KeyboardTheme getKeyboardTheme(final SharedPreferences prefs) {
		return getKeyboardTheme(prefs, BuildCompatUtils.EFFECTIVE_SDK_INT);
		static KeyboardTheme[] getAvailableThemeArray(final Context context) {
		if (AVAILABLE_KEYBOARD_THEMES == null) {
		final int[] availableThemeIdStringArray = context.getResources().getIntArray(
		R.array.keyboard_theme_ids);
		final ArrayList<KeyboardTheme> availableThemeList = new ArrayList<>();
		for (final int id : availableThemeIdStringArray) {
		final KeyboardTheme theme = searchKeyboardThemeById(id, KEYBOARD_THEMES);
		if (theme != null) {
		availableThemeList.add(theme);
		}
		}
		AVAILABLE_KEYBOARD_THEMES = availableThemeList.toArray(
		new KeyboardTheme[availableThemeList.size()]);
		}
		return AVAILABLE_KEYBOARD_THEMES;
		}

		@UsedForTesting
		static KeyboardTheme getKeyboardTheme(final SharedPreferences prefs, final int sdkVersion) {
		static KeyboardTheme getKeyboardTheme(final SharedPreferences prefs, final int sdkVersion,
		final KeyboardTheme[] availableThemeArray) {
		final String lxxThemeIdString = prefs.getString(LXX_KEYBOARD_THEME_KEY, null);
		if (lxxThemeIdString == null) {
		return getDefaultKeyboardTheme(prefs, sdkVersion);
		return getDefaultKeyboardTheme(prefs, sdkVersion, availableThemeArray);
		}
		try {
		final int themeId = Integer.parseInt(lxxThemeIdString);
		final KeyboardTheme theme = searchKeyboardThemeById(themeId);
		final KeyboardTheme theme = searchKeyboardThemeById(themeId, availableThemeArray);
		if (theme != null) {
		return theme;
		}
		@@ -180,6 +207,6 @@ public final class KeyboardTheme implements Comparable<KeyboardTheme> {
		}
		// Remove preference that contains unknown or illegal theme id.
		prefs.edit().remove(LXX_KEYBOARD_THEME_KEY).apply();
		return getDefaultKeyboardTheme(prefs, sdkVersion);
		return getDefaultKeyboardTheme(prefs, sdkVersion, availableThemeArray);
		}
		}

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

+14 −16

Original line number	Diff line number	Diff line
		@@ -17,7 +17,6 @@
		package com.android.inputmethod.latin.settings;

		import android.content.Context;
		import android.content.SharedPreferences;
		import android.content.res.Resources;
		import android.os.Bundle;
		import android.preference.Preference;
		@@ -32,12 +31,12 @@ import com.android.inputmethod.latin.settings.RadioButtonPreference.OnRadioButto
		*/
		public final class ThemeSettingsFragment extends SubScreenFragment
		implements OnRadioButtonClickedListener {
		private String mSelectedThemeId;
		private int mSelectedThemeId;

		static class KeyboardThemePreference extends RadioButtonPreference {
		final String mThemeId;
		final int mThemeId;

		KeyboardThemePreference(final Context context, final String name, final String id) {
		KeyboardThemePreference(final Context context, final String name, final int id) {
		super(context);
		setTitle(name);
		mThemeId = id;
		@@ -45,14 +44,13 @@ public final class ThemeSettingsFragment extends SubScreenFragment
		}

		static void updateKeyboardThemeSummary(final Preference pref) {
		final Resources res = pref.getContext().getResources();
		final SharedPreferences prefs = pref.getSharedPreferences();
		final KeyboardTheme keyboardTheme = KeyboardTheme.getKeyboardTheme(prefs);
		final String keyboardThemeId = String.valueOf(keyboardTheme.mThemeId);
		final Context context = pref.getContext();
		final Resources res = context.getResources();
		final KeyboardTheme keyboardTheme = KeyboardTheme.getKeyboardTheme(context);
		final String[] keyboardThemeNames = res.getStringArray(R.array.keyboard_theme_names);
		final String[] keyboardThemeIds = res.getStringArray(R.array.keyboard_theme_ids);
		final int[] keyboardThemeIds = res.getIntArray(R.array.keyboard_theme_ids);
		for (int index = 0; index < keyboardThemeNames.length; index++) {
		if (keyboardThemeId.equals(keyboardThemeIds[index])) {
		if (keyboardTheme.mThemeId == keyboardThemeIds[index]) {
		pref.setSummary(keyboardThemeNames[index]);
		return;
		}
		@@ -64,18 +62,18 @@ public final class ThemeSettingsFragment extends SubScreenFragment
		super.onCreate(icicle);
		addPreferencesFromResource(R.xml.prefs_screen_theme);
		final PreferenceScreen screen = getPreferenceScreen();
		final Context context = getActivity();
		final Resources res = getResources();
		final String[] keyboardThemeNames = res.getStringArray(R.array.keyboard_theme_names);
		final String[] keyboardThemeIds = res.getStringArray(R.array.keyboard_theme_ids);
		final int[] keyboardThemeIds = res.getIntArray(R.array.keyboard_theme_ids);
		for (int index = 0; index < keyboardThemeNames.length; index++) {
		final KeyboardThemePreference pref = new KeyboardThemePreference(
		getActivity(), keyboardThemeNames[index], keyboardThemeIds[index]);
		context, keyboardThemeNames[index], keyboardThemeIds[index]);
		screen.addPreference(pref);
		pref.setOnRadioButtonClickedListener(this);
		}
		final SharedPreferences prefs = getSharedPreferences();
		final KeyboardTheme keyboardTheme = KeyboardTheme.getKeyboardTheme(prefs);
		mSelectedThemeId = String.valueOf(keyboardTheme.mThemeId);
		final KeyboardTheme keyboardTheme = KeyboardTheme.getKeyboardTheme(context);
		mSelectedThemeId = keyboardTheme.mThemeId;
		}

		@Override
		@@ -106,7 +104,7 @@ public final class ThemeSettingsFragment extends SubScreenFragment
		final Preference preference = screen.getPreference(index);
		if (preference instanceof KeyboardThemePreference) {
		final KeyboardThemePreference pref = (KeyboardThemePreference)preference;
		final boolean selected = mSelectedThemeId.equals(pref.mThemeId);
		final boolean selected = (mSelectedThemeId == pref.mThemeId);
		pref.setSelected(selected);
		}
		}

tests/src/com/android/inputmethod/keyboard/KeyboardLayoutSetTestsBase.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -51,7 +51,7 @@ public abstract class KeyboardLayoutSetTestsBase extends AndroidTestCase {
		protected void setUp() throws Exception {
		super.setUp();
		final KeyboardTheme keyboardTheme = KeyboardTheme.searchKeyboardThemeById(
		getKeyboardThemeForTests());
		getKeyboardThemeForTests(), KeyboardTheme.KEYBOARD_THEMES);
		setContext(new ContextThemeWrapper(getContext(), keyboardTheme.mStyleId));
		KeyboardLayoutSet.onKeyboardThemeChanged();