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

Commit fc00d2bf authored by Tadashi G. Takaoka's avatar Tadashi G. Takaoka Committed by Android Git Automerger
Browse files

am f5caf5be: am 601a8582: Merge "Move checking non-persistent checkbox to onResume" into jb-mr2-dev 

* commit 'f5caf5be':
  Move checking non-persistent checkbox to onResume
parents cb8ed32b f5caf5be

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

+4 −4
Original line number Original line Diff line number Diff line
@@ -156,10 +156,6 @@ public final class SettingsFragment extends InputMethodSettingsFragment 
            removePreference(Settings.PREF_GESTURE_SETTINGS, getPreferenceScreen());

            removePreference(Settings.PREF_GESTURE_SETTINGS, getPreferenceScreen());

        }

        }





        final CheckBoxPreference showSetupWizardIcon =

                (CheckBoxPreference)findPreference(Settings.PREF_SHOW_SETUP_WIZARD_ICON);

        showSetupWizardIcon.setChecked(Settings.readShowSetupWizardIcon(prefs, context));



        setupKeyLongpressTimeoutSettings(prefs, res);

        setupKeyLongpressTimeoutSettings(prefs, res);

        setupKeypressVibrationDurationSettings(prefs, res);

        setupKeypressVibrationDurationSettings(prefs, res);

        setupKeypressSoundVolumeSettings(prefs, res);

        setupKeypressSoundVolumeSettings(prefs, res);
@@ -175,6 +171,10 @@ public final class SettingsFragment extends InputMethodSettingsFragment 
        } else {

        } else {

            getPreferenceScreen().removePreference(mVoicePreference);

            getPreferenceScreen().removePreference(mVoicePreference);

        }

        }

        final SharedPreferences prefs = getPreferenceManager().getSharedPreferences();

        final CheckBoxPreference showSetupWizardIcon =

                (CheckBoxPreference)findPreference(Settings.PREF_SHOW_SETUP_WIZARD_ICON);

        showSetupWizardIcon.setChecked(Settings.readShowSetupWizardIcon(prefs, getActivity()));

        updateShowCorrectionSuggestionsSummary();

        updateShowCorrectionSuggestionsSummary();

        updateKeyPreviewPopupDelaySummary();

        updateKeyPreviewPopupDelaySummary();

        updateCustomInputStylesSummary();

        updateCustomInputStylesSummary();