Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d3b0ecec authored by Tadashi G. Takaoka's avatar Tadashi G. Takaoka
Browse files

Clean up public helper methods of SettingsValues 

Change-Id: I6c6087580b67f497eaaf16900f8df7a4a895b8e3
parent 8315e816

java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java

+3 −2
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ import com.android.inputmethod.latin.LatinIME; 
import com.android.inputmethod.latin.LatinImeLogger;

import com.android.inputmethod.latin.R;

import com.android.inputmethod.latin.RichInputMethodManager;

import com.android.inputmethod.latin.Settings;

import com.android.inputmethod.latin.SettingsValues;

import com.android.inputmethod.latin.SubtypeSwitcher;

import com.android.inputmethod.latin.WordComposer;
@@ -181,8 +182,8 @@ public final class KeyboardSwitcher implements KeyboardState.SwitchActions { 
        keyboardView.setKeyboard(keyboard);

        mCurrentInputView.setKeyboardGeometry(keyboard.mTopPadding);

        keyboardView.setKeyPreviewPopupEnabled(

                SettingsValues.isKeyPreviewPopupEnabled(mPrefs, mResources),

                SettingsValues.getKeyPreviewPopupDismissDelay(mPrefs, mResources));

                Settings.readKeyPreviewPopupEnabled(mPrefs, mResources),

                Settings.readKeyPreviewPopupDismissDelay(mPrefs, mResources));

        keyboardView.updateAutoCorrectionState(mIsAutoCorrectionActive);

        keyboardView.updateShortcutKey(mSubtypeSwitcher.isShortcutImeReady());

        final boolean subtypeChanged = (oldKeyboard == null)

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

+3 −9
Original line number Diff line number Diff line
@@ -400,7 +400,7 @@ public final class AdditionalSubtypeSettings extends PreferenceFragment { 
        mKeyboardLayoutSetAdapter = new KeyboardLayoutSetAdapter(context);



        final String prefSubtypes =

                SettingsValues.getPrefAdditionalSubtypes(mPrefs, getResources());

                Settings.readPrefAdditionalSubtypes(mPrefs, getResources());

        setPrefSubtypes(prefSubtypes, context);



        mIsAddingNewSubtype = (savedInstanceState != null)
@@ -564,19 +564,13 @@ public final class AdditionalSubtypeSettings extends PreferenceFragment { 
    @Override

    public void onPause() {

        super.onPause();

        final String oldSubtypes = SettingsValues.getPrefAdditionalSubtypes(mPrefs, getResources());

        final String oldSubtypes = Settings.readPrefAdditionalSubtypes(mPrefs, getResources());

        final InputMethodSubtype[] subtypes = getSubtypes();

        final String prefSubtypes = AdditionalSubtype.createPrefSubtypes(subtypes);

        if (prefSubtypes.equals(oldSubtypes)) {

            return;

        }



        final SharedPreferences.Editor editor = mPrefs.edit();

        try {

            editor.putString(Settings.PREF_CUSTOM_INPUT_STYLES, prefSubtypes);

        } finally {

            editor.apply();

        }

        Settings.writePrefAdditionalSubtypes(mPrefs, prefSubtypes);

        mRichImm.setAdditionalInputMethodSubtypes(subtypes);

    }

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

+1 −1
Original line number Diff line number Diff line
@@ -102,7 +102,7 @@ public final class AudioAndHapticFeedbackManager { 
                sound = AudioManager.FX_KEYPRESS_STANDARD;

                break;

            }

            mAudioManager.playSoundEffect(sound, mSettingsValues.mFxVolume);

            mAudioManager.playSoundEffect(sound, mSettingsValues.mKeypressSoundVolume);

        }

    }

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

+1 −1
Original line number Diff line number Diff line
@@ -1083,7 +1083,7 @@ public final class LatinIME extends InputMethodService implements KeyboardAction 
    public boolean onEvaluateFullscreenMode() {

        // Reread resource value here, because this method is called by framework anytime as needed.

        final boolean isFullscreenModeAllowed =

                SettingsValues.isFullscreenModeAllowed(getResources());

                Settings.readUseFullscreenMode(getResources());

        if (super.onEvaluateFullscreenMode() && isFullscreenModeAllowed) {

            // TODO: Remove this hack. Actually we should not really assume NO_EXTRACT_UI

            // implies NO_FULLSCREEN. However, the framework mistakenly does.  i.e. NO_EXTRACT_UI

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

+1 −1
Original line number Diff line number Diff line
@@ -75,7 +75,7 @@ public final class RichInputMethodManager { 


        // Initialize additional subtypes.

        SubtypeLocale.init(context);

        final String prefAdditionalSubtypes = SettingsValues.getPrefAdditionalSubtypes(

        final String prefAdditionalSubtypes = Settings.readPrefAdditionalSubtypes(

                prefs, context.getResources());

        final InputMethodSubtype[] additionalSubtypes =

                AdditionalSubtype.createAdditionalSubtypesArray(prefAdditionalSubtypes);