From 2cff4d7e4abdb192151f9b4027fc93fe28a8bdaa Mon Sep 17 00:00:00 2001 From: satok Date: Thu, 17 Mar 2011 11:37:51 +0900 Subject: Added CompatUtils for starting a language selector Change-Id: I158414efaff43d0c6abe1f9af83ed3425992dfb9 --- java/src/com/android/inputmethod/latin/Settings.java | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) (limited to 'java/src/com/android/inputmethod/latin/Settings.java') diff --git a/java/src/com/android/inputmethod/latin/Settings.java b/java/src/com/android/inputmethod/latin/Settings.java index 15ea62c7a..873b9efb5 100644 --- a/java/src/com/android/inputmethod/latin/Settings.java +++ b/java/src/com/android/inputmethod/latin/Settings.java @@ -16,11 +16,13 @@ package com.android.inputmethod.latin; +import com.android.inputmethod.compat.CompatUtils; import com.android.inputmethod.deprecated.VoiceConnector; import android.app.AlertDialog; import android.app.Dialog; import android.app.backup.BackupManager; +import android.content.Context; import android.content.DialogInterface; import android.content.Intent; import android.content.SharedPreferences; @@ -38,6 +40,7 @@ import android.text.AutoText; import android.text.TextUtils; import android.text.method.LinkMovementMethod; import android.util.Log; +import android.view.inputmethod.InputMethodManager; import android.widget.TextView; import java.util.Locale; @@ -221,16 +224,10 @@ public class Settings extends PreferenceActivity @Override public boolean onPreferenceClick(Preference pref) { if (pref == mInputLanguageSelection) { - final String action; - if (android.os.Build.VERSION.SDK_INT - >= /* android.os.Build.VERSION_CODES.HONEYCOMB */ 11) { - // Refer to android.provider.Settings.ACTION_INPUT_METHOD_SUBTYPE_SETTINGS - // TODO: Can this be a constant instead of literal String constant? - action = "android.settings.INPUT_METHOD_SUBTYPE_SETTINGS"; - } else { - action = "com.android.inputmethod.latin.INPUT_LANGUAGE_SELECTION"; - } - startActivity(new Intent(action)); + startActivity(CompatUtils.getInputLanguageSelectionIntent( + Utils.getInputMethodId( + (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE), + getApplicationInfo().packageName), 0)); return true; } return false; -- cgit v1.2.3-83-g751a