commit 1a4645d03087e743a4704c1b5a51a9ab787bbcab
author Satoshi Kataoka <satok@google.com> Fri Aug 02 03:22:26 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Aug 02 03:22:26 2013 +0000
tree 695236b7729f5910571027f849b017979f5ae1f2
parent 066f2107a1cbdf0fb877f176afdc30353e2d9d0c
parent 660e6c96e3133f28b1fe95902674ce34ca1a35eb

Merge "Small cleanup on InputMethodInfo"

core/java/android/view/inputmethod/InputMethodInfo.java

diff --git a/core/java/android/view/inputmethod/InputMethodInfo.java b/core/java/android/view/inputmethod/InputMethodInfo.java
index 5f2b049..feaab3e 100644
--- a/core/java/android/view/inputmethod/InputMethodInfo.java
+++ b/core/java/android/view/inputmethod/InputMethodInfo.java
@@ -79,7 +79,7 @@
      */
     private final ArrayList<InputMethodSubtype> mSubtypes = new ArrayList<InputMethodSubtype>();
 
-    private boolean mIsAuxIme;
+    private final boolean mIsAuxIme;
 
     /**
      * Cavert: mForceDefault must be false for production. This flag is only for test.
@@ -113,7 +113,7 @@
         mService = service;
         ServiceInfo si = service.serviceInfo;
         mId = new ComponentName(si.packageName, si.name).flattenToShortString();
-        mIsAuxIme = true;
+        boolean isAuxIme = true;
         mForceDefault = false;
 
         PackageManager pm = context.getPackageManager();
@@ -184,7 +184,7 @@
                             .setIsAsciiCapable(a.getBoolean(com.android.internal.R.styleable
                                     .InputMethod_Subtype_isAsciiCapable, false)).build();
                     if (!subtype.isAuxiliary()) {
-                        mIsAuxIme = false;
+                        isAuxIme = false;
                     }
                     mSubtypes.add(subtype);
                 }
@@ -197,7 +197,7 @@
         }
 
         if (mSubtypes.size() == 0) {
-            mIsAuxIme = false;
+            isAuxIme = false;
         }
 
         if (additionalSubtypesMap != null && additionalSubtypesMap.containsKey(mId)) {
@@ -215,6 +215,7 @@
         }
         mSettingsActivityName = settingsActivityComponent;
         mIsDefaultResId = isDefaultResId;
+        mIsAuxIme = isAuxIme;
     }
 
     InputMethodInfo(Parcel source) {