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

Commit 6b7cf257 authored by Amith Yamasani's avatar Amith Yamasani
Browse files

Kill the Switch on top-right after exiting Accounts & sync. 

Bug: 5564377  - Bluetooth screen showing a Switch that doesn't follow
the bluetooth setting.

This seems to have been the Switch in Accounts & sync being set as a
custom view for the Settings activity and not removed on changing
fragments.

Change-Id: I4575a769fbf5482048dbc4e912c6b6f782f505a0
parent 4b94e073

src/com/android/settings/accounts/ManageAccountsSettings.java

+12 −8
Original line number Diff line number Diff line
@@ -74,7 +74,14 @@ public class ManageAccountsSettings extends AccountPreferenceBase 
    @Override

    public void onStart() {

        super.onStart();

        AccountManager.get(getActivity()).addOnAccountsUpdatedListener(this, null, true);

        Activity activity = getActivity();

        AccountManager.get(activity).addOnAccountsUpdatedListener(this, null, true);

        activity.getActionBar().setDisplayOptions(ActionBar.DISPLAY_SHOW_CUSTOM,

                ActionBar.DISPLAY_SHOW_CUSTOM);

        activity.getActionBar().setCustomView(mAutoSyncSwitch, new ActionBar.LayoutParams(

                ActionBar.LayoutParams.WRAP_CONTENT,

                ActionBar.LayoutParams.WRAP_CONTENT,

                Gravity.CENTER_VERTICAL | Gravity.RIGHT));

    }



    @Override
@@ -100,12 +107,6 @@ public class ManageAccountsSettings extends AccountPreferenceBase 
        final int padding = activity.getResources().getDimensionPixelSize(

                R.dimen.action_bar_switch_padding);

        mAutoSyncSwitch.setPadding(0, 0, padding, 0);

        activity.getActionBar().setDisplayOptions(ActionBar.DISPLAY_SHOW_CUSTOM,

                ActionBar.DISPLAY_SHOW_CUSTOM);

        activity.getActionBar().setCustomView(mAutoSyncSwitch, new ActionBar.LayoutParams(

                ActionBar.LayoutParams.WRAP_CONTENT,

                ActionBar.LayoutParams.WRAP_CONTENT,

                Gravity.CENTER_VERTICAL | Gravity.RIGHT));

        mAutoSyncSwitch.setChecked(ContentResolver.getMasterSyncAutomatically());

        mAutoSyncSwitch.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {

            @Override
@@ -123,7 +124,10 @@ public class ManageAccountsSettings extends AccountPreferenceBase 
    @Override

    public void onStop() {

        super.onStop();

        AccountManager.get(getActivity()).removeOnAccountsUpdatedListener(this);

        final Activity activity = getActivity();

        AccountManager.get(activity).removeOnAccountsUpdatedListener(this);

        activity.getActionBar().setDisplayOptions(0, ActionBar.DISPLAY_SHOW_CUSTOM);

        activity.getActionBar().setCustomView(null);

    }



    @Override