commit 01e3b014bb97e649ff4cf5a58ce8285f7d800cc8
author Jean Chalard <jchalard@google.com> Fri Jun 08 21:15:33 2012 +0900
committer Jean Chalard <jchalard@google.com> Fri Jun 08 21:15:33 2012 +0900
tree d8dadba99f271d80350dd0ca8a68be346ca5fdc4
parent 4b9e6ee6fb408e2793e9ead5de2d6b45270d1f0d

Accept a null input attributes for reading settings.

Change-Id: I11a8e1aca3541c35d2b39b27716687fcd8ff3dc6

java/src/com/android/inputmethod/latin/LatinIME.java

diff --git a/java/src/com/android/inputmethod/latin/LatinIME.java b/java/src/com/android/inputmethod/latin/LatinIME.java
index 339c68b..5b7d658 100644
--- a/java/src/com/android/inputmethod/latin/LatinIME.java
+++ b/java/src/com/android/inputmethod/latin/LatinIME.java
@@ -400,8 +400,6 @@
         final Resources res = getResources();
         mResources = res;
 
-        // TODO: remove the following when it's not needed by updateCorrectionMode() any more
-        mInputAttributes = new InputAttributes(null, false /* isFullscreenMode */);
         loadSettings();
 
         ImfUtils.setAdditionalInputMethodSubtypes(this, mSettingsValues.getAdditionalSubtypes());

java/src/com/android/inputmethod/latin/SettingsValues.java

diff --git a/java/src/com/android/inputmethod/latin/SettingsValues.java b/java/src/com/android/inputmethod/latin/SettingsValues.java
index 0f522f2..fb3c039 100644
--- a/java/src/com/android/inputmethod/latin/SettingsValues.java
+++ b/java/src/com/android/inputmethod/latin/SettingsValues.java
@@ -188,7 +188,7 @@
 
     private int createCorrectionMode(final InputAttributes inputAttributes) {
         final boolean shouldAutoCorrect = mAutoCorrectEnabled
-                && !inputAttributes.mInputTypeNoAutoCorrect;
+                && (null == inputAttributes || !inputAttributes.mInputTypeNoAutoCorrect);
         if (mBigramSuggestionEnabled && shouldAutoCorrect) return Suggest.CORRECTION_FULL_BIGRAM;
         return shouldAutoCorrect ? Suggest.CORRECTION_FULL : Suggest.CORRECTION_NONE;
     }