summaryrefslogtreecommitdiff
path: root/java/com
diff options
context:
space:
mode:
Diffstat (limited to 'java/com')
-rw-r--r--java/com/android/inputmethodcommon/InputMethodSettingsImpl.java12
1 files changed, 12 insertions, 0 deletions
diff --git a/java/com/android/inputmethodcommon/InputMethodSettingsImpl.java b/java/com/android/inputmethodcommon/InputMethodSettingsImpl.java
index bdd21cf..5e7decc 100644
--- a/java/com/android/inputmethodcommon/InputMethodSettingsImpl.java
+++ b/java/com/android/inputmethodcommon/InputMethodSettingsImpl.java
@@ -61,9 +61,13 @@ import java.util.List;
.setOnPreferenceClickListener(new OnPreferenceClickListener() {
@Override
public boolean onPreferenceClick(Preference preference) {
+ final CharSequence title = getSubtypeEnablerTitle(context);
final Intent intent =
new Intent(Settings.ACTION_INPUT_METHOD_SUBTYPE_SETTINGS);
intent.putExtra(Settings.EXTRA_INPUT_METHOD_ID, imi.getId());
+ if (!TextUtils.isEmpty(title)) {
+ intent.putExtra(Intent.EXTRA_TITLE, title);
+ }
intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK
| Intent.FLAG_ACTIVITY_RESET_TASK_IF_NEEDED
| Intent.FLAG_ACTIVITY_CLEAR_TOP);
@@ -164,6 +168,14 @@ import java.util.List;
updateSubtypeEnabler();
}
+ private CharSequence getSubtypeEnablerTitle(Context context) {
+ if (mSubtypeEnablerTitleRes != 0) {
+ return context.getString(mSubtypeEnablerTitleRes);
+ } else {
+ return mSubtypeEnablerTitle;
+ }
+ }
+
private void updateSubtypeEnabler() {
if (mSubtypeEnablerPreference != null) {
if (mSubtypeEnablerTitleRes != 0) {