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

Commit c27efd7b authored by Vania Januar's avatar Vania Januar Committed by Android (Google) Code Review
Browse files

Merge "Invert STYLUS_BUTTONS_DISABLED to avoid double negatives."

parents e5cebf94 7584bbc0

src/com/android/settings/connecteddevice/stylus/StylusDevicesController.java

+3 −3
Original line number Diff line number Diff line
@@ -140,7 +140,7 @@ public class StylusDevicesController extends AbstractPreferenceController implem 
        pref.setIcon(R.drawable.ic_block);

        pref.setOnPreferenceClickListener(this);

        pref.setChecked(Settings.Secure.getInt(mContext.getContentResolver(),

                Settings.Secure.STYLUS_BUTTONS_DISABLED, 0) == 1);

                Settings.Secure.STYLUS_BUTTONS_ENABLED, 1) == 0);

        return pref;

    }
@@ -175,8 +175,8 @@ public class StylusDevicesController extends AbstractPreferenceController implem 
                break;

            case KEY_IGNORE_BUTTON:

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

                        Secure.STYLUS_BUTTONS_DISABLED,

                        ((SwitchPreference) preference).isChecked() ? 1 : 0);

                        Secure.STYLUS_BUTTONS_ENABLED,

                        ((SwitchPreference) preference).isChecked() ? 0 : 1);

                break;

        }

        return true;

tests/robotests/src/com/android/settings/connecteddevice/stylus/StylusDevicesControllerTest.java

+4 −4
Original line number Diff line number Diff line
@@ -364,7 +364,7 @@ public class StylusDevicesControllerTest { 
    @Test

    public void buttonsPreference_checkedWhenFlagTrue() {

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

                Settings.Secure.STYLUS_BUTTONS_DISABLED, 1);

                Settings.Secure.STYLUS_BUTTONS_ENABLED, 0);



        showScreen(mController);

        SwitchPreference buttonsPref = (SwitchPreference) mPreferenceContainer.getPreference(2);
@@ -375,7 +375,7 @@ public class StylusDevicesControllerTest { 
    @Test

    public void buttonsPreference_uncheckedWhenFlagFalse() {

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

                Settings.Secure.STYLUS_BUTTONS_DISABLED, 0);

                Settings.Secure.STYLUS_BUTTONS_ENABLED, 1);



        showScreen(mController);

        SwitchPreference buttonsPref = (SwitchPreference) mPreferenceContainer.getPreference(2);
@@ -386,7 +386,7 @@ public class StylusDevicesControllerTest { 
    @Test

    public void buttonsPreference_updatesFlagOnClick() {

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

                Settings.Secure.STYLUS_BUTTONS_DISABLED, 1);

                Settings.Secure.STYLUS_BUTTONS_ENABLED, 0);

        showScreen(mController);

        SwitchPreference buttonsPref = (SwitchPreference) mPreferenceContainer.getPreference(2);
@@ -394,7 +394,7 @@ public class StylusDevicesControllerTest { 


        assertThat(buttonsPref.isChecked()).isEqualTo(false);

        assertThat(Settings.Secure.getInt(mContext.getContentResolver(),

                Secure.STYLUS_BUTTONS_DISABLED, -1)).isEqualTo(0);

                Secure.STYLUS_BUTTONS_ENABLED, -1)).isEqualTo(0);

    }



    private void showScreen(StylusDevicesController controller) {