commit dcf8a6b2c6bf746c2d633e5c7d3e9692c886df91
author Jean Chalard <jchalard@google.com> Mon Dec 12 03:31:42 2011 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Mon Dec 12 03:31:42 2011 -0800
tree 498bd1e00a2f7fea901a51874d1b160bdca6595c
parent 2a659b8aa642b0832fa0ac9a93e0640592fcc239
parent d567b230b055cb69186acf1ce0a1c4e1c7b61508

Merge "Move a settings var to the settings class"

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 9d6576f..b68d482 100644
--- a/java/src/com/android/inputmethod/latin/LatinIME.java
+++ b/java/src/com/android/inputmethod/latin/LatinIME.java
@@ -1080,8 +1080,7 @@
 
     @Override
     public boolean onEvaluateFullscreenMode() {
-        return super.onEvaluateFullscreenMode()
-                && mResources.getBoolean(R.bool.config_use_fullscreen_mode);
+        return super.onEvaluateFullscreenMode() && mSettingsValues.mUseFullScreenMode;
     }
 
     @Override

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 a3fe15d..0ad1c15 100644
--- a/java/src/com/android/inputmethod/latin/SettingsValues.java
+++ b/java/src/com/android/inputmethod/latin/SettingsValues.java
@@ -41,6 +41,7 @@
     private final String mSymbolsExcludedFromWordSeparators;
     public final String mWordSeparators;
     public final CharSequence mHintToSaveText;
+    public final boolean mUseFullScreenMode;
 
     // From preferences, in the same order as xml/prefs.xml:
     public final boolean mAutoCap;
@@ -94,6 +95,7 @@
         mWordSeparators = createWordSeparators(mMagicSpaceStrippers, mMagicSpaceSwappers,
                 mSymbolsExcludedFromWordSeparators, res);
         mHintToSaveText = context.getText(R.string.hint_add_to_dictionary);
+        mUseFullScreenMode = res.getBoolean(R.bool.config_use_fullscreen_mode);
 
         // Get the settings preferences
         mAutoCap = prefs.getBoolean(Settings.PREF_AUTO_CAP, true);