am dcf8a6b2: Merge "Move a settings var to the settings class"
* commit 'dcf8a6b2c6bf746c2d633e5c7d3e9692c886df91': Move a settings var to the settings classmain
commit
261ae7aa9d
|
@ -1080,8 +1080,7 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean onEvaluateFullscreenMode() {
|
public boolean onEvaluateFullscreenMode() {
|
||||||
return super.onEvaluateFullscreenMode()
|
return super.onEvaluateFullscreenMode() && mSettingsValues.mUseFullScreenMode;
|
||||||
&& mResources.getBoolean(R.bool.config_use_fullscreen_mode);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
|
@ -41,6 +41,7 @@ public class SettingsValues {
|
||||||
private final String mSymbolsExcludedFromWordSeparators;
|
private final String mSymbolsExcludedFromWordSeparators;
|
||||||
public final String mWordSeparators;
|
public final String mWordSeparators;
|
||||||
public final CharSequence mHintToSaveText;
|
public final CharSequence mHintToSaveText;
|
||||||
|
public final boolean mUseFullScreenMode;
|
||||||
|
|
||||||
// From preferences, in the same order as xml/prefs.xml:
|
// From preferences, in the same order as xml/prefs.xml:
|
||||||
public final boolean mAutoCap;
|
public final boolean mAutoCap;
|
||||||
|
@ -94,6 +95,7 @@ public class SettingsValues {
|
||||||
mWordSeparators = createWordSeparators(mMagicSpaceStrippers, mMagicSpaceSwappers,
|
mWordSeparators = createWordSeparators(mMagicSpaceStrippers, mMagicSpaceSwappers,
|
||||||
mSymbolsExcludedFromWordSeparators, res);
|
mSymbolsExcludedFromWordSeparators, res);
|
||||||
mHintToSaveText = context.getText(R.string.hint_add_to_dictionary);
|
mHintToSaveText = context.getText(R.string.hint_add_to_dictionary);
|
||||||
|
mUseFullScreenMode = res.getBoolean(R.bool.config_use_fullscreen_mode);
|
||||||
|
|
||||||
// Get the settings preferences
|
// Get the settings preferences
|
||||||
mAutoCap = prefs.getBoolean(Settings.PREF_AUTO_CAP, true);
|
mAutoCap = prefs.getBoolean(Settings.PREF_AUTO_CAP, true);
|
||||||
|
|
Loading…
Reference in New Issue