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

Commit 00b5e6b2 authored by Fabrice Di Meglio's avatar Fabrice Di Meglio
Browse files

This CL is not working (even after careful testing) but when I tried I was not completely ToT. 

Revert "Fix bug #15170508 When I initially load settings, all on/off toggles start in off position then move to on after pane loads"

This reverts commit 1e52db80.

Change-Id: I73bdfeba4a4b3e993e37cdae1e3733ffe272b9eb
parent 1e52db80

src/com/android/settings/DevelopmentSettings.java

+10 −5
Original line number Diff line number Diff line
@@ -168,6 +168,7 @@ public class DevelopmentSettings extends SettingsPreferenceFragment 
    private WifiManager mWifiManager;



    private SwitchBar mSwitchBar;

    private Switch mEnabledSwitch;

    private boolean mLastEnabledState;

    private boolean mHaveDebugSettings;

    private boolean mDontPokeProperties;
@@ -388,8 +389,9 @@ public class DevelopmentSettings extends SettingsPreferenceFragment 
        final SettingsActivity activity = (SettingsActivity) getActivity();



        mSwitchBar = activity.getSwitchBar();

        mEnabledSwitch = mSwitchBar.getSwitch();

        if (mUnavailable) {

            mSwitchBar.setSwitchEnabled(false);

            mEnabledSwitch.setEnabled(false);

            return;

        }

    }
@@ -442,7 +444,7 @@ public class DevelopmentSettings extends SettingsPreferenceFragment 
        final ContentResolver cr = getActivity().getContentResolver();

        mLastEnabledState = Settings.Global.getInt(cr,

                Settings.Global.DEVELOPMENT_SETTINGS_ENABLED, 0) != 0;

        mSwitchBar.setSwitchChecked(mLastEnabledState);

        mEnabledSwitch.setChecked(mLastEnabledState);

        setPrefsEnabledState(mLastEnabledState);



        if (mHaveDebugSettings && !mLastEnabledState) {
@@ -453,7 +455,7 @@ public class DevelopmentSettings extends SettingsPreferenceFragment 
            Settings.Global.putInt(getActivity().getContentResolver(),

                    Settings.Global.DEVELOPMENT_SETTINGS_ENABLED, 1);

            mLastEnabledState = true;

            mSwitchBar.setSwitchChecked(mLastEnabledState);

            mEnabledSwitch.setChecked(mLastEnabledState);

            setPrefsEnabledState(mLastEnabledState);

        }
@@ -1223,6 +1225,9 @@ public class DevelopmentSettings extends SettingsPreferenceFragment 


    @Override

    public void onSwitchChanged(Switch switchView, boolean isChecked) {

        if (switchView != mEnabledSwitch) {

            return;

        }

        if (isChecked != mLastEnabledState) {

            if (isChecked) {

                mDialogClicked = false;
@@ -1477,7 +1482,7 @@ public class DevelopmentSettings extends SettingsPreferenceFragment 
                setPrefsEnabledState(mLastEnabledState);

            } else {

                // Reset the toggle

                mSwitchBar.setSwitchChecked(false);

                mEnabledSwitch.setChecked(false);

            }

        }

    }
@@ -1491,7 +1496,7 @@ public class DevelopmentSettings extends SettingsPreferenceFragment 
            mAdbDialog = null;

        } else if (dialog == mEnableDialog) {

            if (!mDialogClicked) {

                mSwitchBar.setSwitchChecked(false);

                mEnabledSwitch.setChecked(false);

            }

            mEnableDialog = null;

        }

src/com/android/settings/DreamSettings.java

+4 −2
Original line number Diff line number Diff line
@@ -61,6 +61,7 @@ public class DreamSettings extends SettingsPreferenceFragment implements 
    private DreamBackend mBackend;

    private DreamInfoAdapter mAdapter;

    private SwitchBar mSwitchBar;

    private Switch mSwitch;

    private MenuItem[] mMenuItemsWhenEnabled;

    private boolean mRefreshing;
@@ -123,6 +124,7 @@ public class DreamSettings extends SettingsPreferenceFragment implements 


        final SettingsActivity sa = (SettingsActivity) getActivity();

        mSwitchBar = sa.getSwitchBar();

        mSwitch = mSwitchBar.getSwitch();

    }



    @Override
@@ -261,8 +263,8 @@ public class DreamSettings extends SettingsPreferenceFragment implements 
        logd("refreshFromBackend()");

        mRefreshing = true;

        boolean dreamsEnabled = mBackend.isEnabled();

        if (mSwitchBar.isSwitchChecked() != dreamsEnabled)

            mSwitchBar.setSwitchChecked(dreamsEnabled);

        if (mSwitch.isChecked() != dreamsEnabled)

            mSwitch.setChecked(dreamsEnabled);



        mAdapter.clear();

        if (dreamsEnabled) {

src/com/android/settings/accessibility/CaptionPropertiesFragment.java

+6 −4
Original line number Diff line number Diff line
@@ -70,6 +70,7 @@ public class CaptionPropertiesFragment extends SettingsPreferenceFragment 
    private SubtitleView mPreviewText;

    private View mPreviewWindow;

    private SwitchBar mSwitchBar;

    private ToggleSwitch mToggleSwitch;



    // Standard options.

    private LocalePreference mLocale;
@@ -131,7 +132,8 @@ public class CaptionPropertiesFragment extends SettingsPreferenceFragment 


        SettingsActivity activity = (SettingsActivity) getActivity();

        mSwitchBar = activity.getSwitchBar();

        mSwitchBar.setSwitchChecked(enabled);

        mToggleSwitch = mSwitchBar.getSwitch();

        mToggleSwitch.setCheckedInternal(enabled);



        mPreviewWindow = view.findViewById(R.id.preview_window);
@@ -198,10 +200,10 @@ public class CaptionPropertiesFragment extends SettingsPreferenceFragment 
    }



    protected void onInstallSwitchBarToggleSwitch() {

        mSwitchBar.setSwitchOnBeforeCheckedChangeListener(new OnBeforeCheckedChangeListener() {

        mToggleSwitch.setOnBeforeCheckedChangeListener(new OnBeforeCheckedChangeListener() {

            @Override

            public boolean onBeforeCheckedChanged(ToggleSwitch toggleSwitch, boolean checked) {

                mSwitchBar.setSwitchChecked(checked);

                toggleSwitch.setCheckedInternal(checked);

                Settings.Secure.putInt(getActivity().getContentResolver(),

                        Settings.Secure.ACCESSIBILITY_CAPTIONING_ENABLED, checked ? 1 : 0);

                getPreferenceScreen().setEnabled(checked);
@@ -220,7 +222,7 @@ public class CaptionPropertiesFragment extends SettingsPreferenceFragment 


    private void removeSwitchBarToggleSwitch() {

        mSwitchBar.hide();

        mSwitchBar.setSwitchOnBeforeCheckedChangeListener(null);

        mToggleSwitch.setOnBeforeCheckedChangeListener(null);

    }



    private void initializeAllPreferences() {

src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java

+6 −6
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ public class ToggleAccessibilityServicePreferenceFragment 
                    String settingValue = Settings.Secure.getString(getContentResolver(),

                            Settings.Secure.ENABLED_ACCESSIBILITY_SERVICES);

                    final boolean enabled = settingValue.contains(mComponentName.flattenToString());

                    mSwitchBar.setSwitchChecked(enabled);

                    mToggleSwitch.setCheckedInternal(enabled);

                }

            };
@@ -265,13 +265,13 @@ public class ToggleAccessibilityServicePreferenceFragment 
        switch (which) {

            case DialogInterface.BUTTON_POSITIVE:

                checked = (mShownDialogId == DIALOG_ID_ENABLE_WARNING);

                mSwitchBar.setSwitchChecked(checked);

                mToggleSwitch.setCheckedInternal(checked);

                getArguments().putBoolean(AccessibilitySettings.EXTRA_CHECKED, checked);

                onPreferenceToggled(mPreferenceKey, checked);

                break;

            case DialogInterface.BUTTON_NEGATIVE:

                checked = (mShownDialogId == DIALOG_ID_DISABLE_WARNING);

                mSwitchBar.setSwitchChecked(checked);

                mToggleSwitch.setCheckedInternal(checked);

                getArguments().putBoolean(AccessibilitySettings.EXTRA_CHECKED, checked);

                onPreferenceToggled(mPreferenceKey, checked);

                break;
@@ -283,15 +283,15 @@ public class ToggleAccessibilityServicePreferenceFragment 
    @Override

    protected void onInstallSwitchBarToggleSwitch() {

        super.onInstallSwitchBarToggleSwitch();

        mSwitchBar.setSwitchOnBeforeCheckedChangeListener(new OnBeforeCheckedChangeListener() {

        mToggleSwitch.setOnBeforeCheckedChangeListener(new OnBeforeCheckedChangeListener() {

                @Override

            public boolean onBeforeCheckedChanged(ToggleSwitch toggleSwitch, boolean checked) {

                if (checked) {

                    mSwitchBar.setSwitchChecked(false);

                    toggleSwitch.setCheckedInternal(false);

                    getArguments().putBoolean(AccessibilitySettings.EXTRA_CHECKED, false);

                    showDialog(DIALOG_ID_ENABLE_WARNING);

                } else {

                    mSwitchBar.setSwitchChecked(true);

                    toggleSwitch.setCheckedInternal(true);

                    getArguments().putBoolean(AccessibilitySettings.EXTRA_CHECKED, true);

                    showDialog(DIALOG_ID_DISABLE_WARNING);

                }

src/com/android/settings/accessibility/ToggleDaltonizerPreferenceFragment.java

+1 −1
Original line number Diff line number Diff line
@@ -80,7 +80,7 @@ public class ToggleDaltonizerPreferenceFragment extends ToggleFeaturePreferenceF 
    protected void onInstallSwitchBarToggleSwitch() {

        super.onInstallSwitchBarToggleSwitch();



        mSwitchBar.setSwitchChecked(

        mToggleSwitch.setCheckedInternal(

                Settings.Secure.getInt(getContentResolver(), ENABLED, 0) == 1);

        mSwitchBar.addOnSwitchChangeListener(this);

    }