summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/com/android/settings/inputmethod/InputMethodAndSubtypeEnabler.java23
1 files changed, 15 insertions, 8 deletions
diff --git a/src/com/android/settings/inputmethod/InputMethodAndSubtypeEnabler.java b/src/com/android/settings/inputmethod/InputMethodAndSubtypeEnabler.java
index efed8231f..e5ce98782 100644
--- a/src/com/android/settings/inputmethod/InputMethodAndSubtypeEnabler.java
+++ b/src/com/android/settings/inputmethod/InputMethodAndSubtypeEnabler.java
@@ -49,6 +49,7 @@ public class InputMethodAndSubtypeEnabler extends SettingsPreferenceFragment {
private InputMethodManager mImm;
private List<InputMethodInfo> mInputMethodProperties;
private String mInputMethodId;
+ private String mTitle;
@Override
public void onCreate(Bundle icicle) {
@@ -71,14 +72,12 @@ public class InputMethodAndSubtypeEnabler extends SettingsPreferenceFragment {
mInputMethodId = inputMethodId;
}
}
- CharSequence title = getActivity().getIntent().getStringExtra(
- Intent.EXTRA_TITLE);
- if (title == null && (arguments != null)) {
- title = arguments.getString(Intent.EXTRA_TITLE);
- }
-
- if (!TextUtils.isEmpty(title)) {
- getActivity().setTitle(title);
+ mTitle = getActivity().getIntent().getStringExtra(Intent.EXTRA_TITLE);
+ if (mTitle == null && (arguments != null)) {
+ final String title = arguments.getString(Intent.EXTRA_TITLE);
+ if (title != null) {
+ mTitle = title;
+ }
}
onCreateIMM();
@@ -86,6 +85,14 @@ public class InputMethodAndSubtypeEnabler extends SettingsPreferenceFragment {
}
@Override
+ public void onActivityCreated(Bundle icicle) {
+ super.onActivityCreated(icicle);
+ if (!TextUtils.isEmpty(mTitle)) {
+ getActivity().setTitle(mTitle);
+ }
+ }
+
+ @Override
public void onResume() {
super.onResume();
InputMethodAndSubtypeUtil.loadInputMethodSubtypeList(