commit 16c3e74d72ec2d18aff007cb88fcf02995918a90
author satok <satok@google.com> Fri Aug 12 11:45:52 2011 +0900
committer satok <satok@google.com> Fri Aug 12 12:46:27 2011 +0900
tree b08e1fc7b6787d9e17cc1ce25c835bdd99f1239f
parent a550058e1eccd41011d815fcd04b56ddb79b4de3

Fix the title of the input method subtype enabler

Bug: 5097548
Change-Id: If01e13bd1ab7ac851b613450018f68f7f42f1e14

src/com/android/settings/inputmethod/InputMethodAndSubtypeEnabler.java

diff --git a/src/com/android/settings/inputmethod/InputMethodAndSubtypeEnabler.java b/src/com/android/settings/inputmethod/InputMethodAndSubtypeEnabler.java
index efed823..e5ce987 100644
--- a/src/com/android/settings/inputmethod/InputMethodAndSubtypeEnabler.java
+++ b/src/com/android/settings/inputmethod/InputMethodAndSubtypeEnabler.java
@@ -49,6 +49,7 @@
     private InputMethodManager mImm;
     private List<InputMethodInfo> mInputMethodProperties;
     private String mInputMethodId;
+    private String mTitle;
 
     @Override
     public void onCreate(Bundle icicle) {
@@ -71,14 +72,12 @@
                 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 @@
     }
 
     @Override
+    public void onActivityCreated(Bundle icicle) {
+        super.onActivityCreated(icicle);
+        if (!TextUtils.isEmpty(mTitle)) {
+            getActivity().setTitle(mTitle);
+        }
+    }
+
+    @Override
     public void onResume() {
         super.onResume();
         InputMethodAndSubtypeUtil.loadInputMethodSubtypeList(