nyancrimew/LatinIME
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix language selection settings

Browse source 
Change-Id: I99e2039579a5bd606a8e698cdee2739465b998bc
This commit is contained in:
satok 2011-04-21 19:42:56 +09:00
parent c9c3aa219e
commit 49a11524fc
3 changed files with 5 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
java/res/xml/prefs.xml
View file

@ -64,13 +64,6 @@
android:key="subtype_settings" android:key="subtype_settings"
android:title="@string/language_selection_title" android:title="@string/language_selection_title"
android:summary="@string/language_selection_summary" /> android:summary="@string/language_selection_summary" />
<PreferenceScreen
android:key="language_selection"
android:title="@string/language_selection_title"
android:summary="@string/language_selection_summary">
<intent
android:action="com.android.inputmethod.latin.INPUT_LANGUAGE_SELECTION"/>
</PreferenceScreen>
</PreferenceCategory> </PreferenceCategory>
<PreferenceCategory <PreferenceCategory
android:title="@string/prediction_category" android:title="@string/prediction_category"

5
java/src/com/android/inputmethod/compat/CompatUtils.java
View file

@ -40,8 +40,9 @@ public class CompatUtils {
int flagsForSubtypeSettings) { int flagsForSubtypeSettings) {
final String action; final String action;
Intent intent; Intent intent;
if (android.os.Build.VERSION.SDK_INT if (InputMethodServiceCompatWrapper.CAN_HANDLE_ON_CURRENT_INPUT_METHOD_SUBTYPE_CHANGED
>= /* android.os.Build.VERSION_CODES.HONEYCOMB */ 11) { /* android.os.Build.VERSION_CODES.HONEYCOMB */
&& android.os.Build.VERSION.SDK_INT >= 11) {
// Refer to android.provider.Settings.ACTION_INPUT_METHOD_SUBTYPE_SETTINGS // Refer to android.provider.Settings.ACTION_INPUT_METHOD_SUBTYPE_SETTINGS
action = INPUT_METHOD_SUBTYPE_SETTINGS; action = INPUT_METHOD_SUBTYPE_SETTINGS;
intent = new Intent(action); intent = new Intent(action);

8
java/src/com/android/inputmethod/latin/Settings.java
View file

@ -68,7 +68,6 @@ public class Settings extends PreferenceActivity
public static final String PREF_AUTO_CORRECTION_THRESHOLD = "auto_correction_threshold"; public static final String PREF_AUTO_CORRECTION_THRESHOLD = "auto_correction_threshold";
public static final String PREF_BIGRAM_SUGGESTIONS = "bigram_suggestion"; public static final String PREF_BIGRAM_SUGGESTIONS = "bigram_suggestion";
public static final String PREF_DEBUG_SETTINGS = "debug_settings"; public static final String PREF_DEBUG_SETTINGS = "debug_settings";
public static final String PREF_LANGUAGE_SELECTION = "language_selection";
public static final String PREF_USABILITY_STUDY_MODE = "usability_study_mode"; public static final String PREF_USABILITY_STUDY_MODE = "usability_study_mode";
@ -152,7 +151,8 @@ public class Settings extends PreferenceActivity
final boolean showSubtypeSettings = getResources().getBoolean( final boolean showSubtypeSettings = getResources().getBoolean(
R.bool.config_enable_show_subtype_settings); R.bool.config_enable_show_subtype_settings);
if (!showSubtypeSettings) { if (InputMethodServiceCompatWrapper.CAN_HANDLE_ON_CURRENT_INPUT_METHOD_SUBTYPE_CHANGED
&& !showSubtypeSettings) {
generalSettings.removePreference(findPreference(PREF_SUBTYPES)); generalSettings.removePreference(findPreference(PREF_SUBTYPES));
} }
@ -185,10 +185,6 @@ public class Settings extends PreferenceActivity
if (!showUsabilityModeStudyOption) { if (!showUsabilityModeStudyOption) {
getPreferenceScreen().removePreference(findPreference(PREF_USABILITY_STUDY_MODE)); getPreferenceScreen().removePreference(findPreference(PREF_USABILITY_STUDY_MODE));
} }
if (InputMethodServiceCompatWrapper.CAN_HANDLE_ON_CURRENT_INPUT_METHOD_SUBTYPE_CHANGED) {
generalSettings.removePreference(findPreference(PREF_LANGUAGE_SELECTION));
}
} }
@Override @Override