PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Invert STYLUS_BUTTONS_DISABLED to avoid double negatives."

Browse Source
This commit is contained in:
Vania Januar
2023-02-07 08:28:48 +00:00
committed by Android (Google) Code Review
parent e5cebf9452 7584bbc015
commit c27efd7b31
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/com/android/settings/connecteddevice/stylus/StylusDevicesController.java
View File

@@ -140,7 +140,7 @@ public class StylusDevicesController extends AbstractPreferenceController implem
pref.setIcon(R.drawable.ic_block); pref.setIcon(R.drawable.ic_block);
pref.setOnPreferenceClickListener(this); pref.setOnPreferenceClickListener(this);
pref.setChecked(Settings.Secure.getInt(mContext.getContentResolver(), pref.setChecked(Settings.Secure.getInt(mContext.getContentResolver(),
Settings.Secure.STYLUS_BUTTONS_DISABLED, 0) == 1); Settings.Secure.STYLUS_BUTTONS_ENABLED, 1) == 0);
return pref; return pref;
} }
@@ -175,8 +175,8 @@ public class StylusDevicesController extends AbstractPreferenceController implem
break; break;
case KEY_IGNORE_BUTTON: case KEY_IGNORE_BUTTON:
Settings.Secure.putInt(mContext.getContentResolver(), Settings.Secure.putInt(mContext.getContentResolver(),
Secure.STYLUS_BUTTONS_DISABLED, Secure.STYLUS_BUTTONS_ENABLED,
((SwitchPreference) preference).isChecked() ? 1 : 0); ((SwitchPreference) preference).isChecked() ? 0 : 1);
break; break;
} }
return true; return true;

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

@@ -364,7 +364,7 @@ public class StylusDevicesControllerTest {
@Test @Test
public void buttonsPreference_checkedWhenFlagTrue() { public void buttonsPreference_checkedWhenFlagTrue() {
Settings.Secure.putInt(mContext.getContentResolver(), Settings.Secure.putInt(mContext.getContentResolver(),
Settings.Secure.STYLUS_BUTTONS_DISABLED, 1); Settings.Secure.STYLUS_BUTTONS_ENABLED, 0);
showScreen(mController); showScreen(mController);
SwitchPreference buttonsPref = (SwitchPreference) mPreferenceContainer.getPreference(2); SwitchPreference buttonsPref = (SwitchPreference) mPreferenceContainer.getPreference(2);
@@ -375,7 +375,7 @@ public class StylusDevicesControllerTest {
@Test @Test
public void buttonsPreference_uncheckedWhenFlagFalse() { public void buttonsPreference_uncheckedWhenFlagFalse() {
Settings.Secure.putInt(mContext.getContentResolver(), Settings.Secure.putInt(mContext.getContentResolver(),
Settings.Secure.STYLUS_BUTTONS_DISABLED, 0); Settings.Secure.STYLUS_BUTTONS_ENABLED, 1);
showScreen(mController); showScreen(mController);
SwitchPreference buttonsPref = (SwitchPreference) mPreferenceContainer.getPreference(2); SwitchPreference buttonsPref = (SwitchPreference) mPreferenceContainer.getPreference(2);
@@ -386,7 +386,7 @@ public class StylusDevicesControllerTest {
@Test @Test
public void buttonsPreference_updatesFlagOnClick() { public void buttonsPreference_updatesFlagOnClick() {
Settings.Secure.putInt(mContext.getContentResolver(), Settings.Secure.putInt(mContext.getContentResolver(),
Settings.Secure.STYLUS_BUTTONS_DISABLED, 1); Settings.Secure.STYLUS_BUTTONS_ENABLED, 0);
showScreen(mController); showScreen(mController);
SwitchPreference buttonsPref = (SwitchPreference) mPreferenceContainer.getPreference(2); SwitchPreference buttonsPref = (SwitchPreference) mPreferenceContainer.getPreference(2);
@@ -394,7 +394,7 @@ public class StylusDevicesControllerTest {
assertThat(buttonsPref.isChecked()).isEqualTo(false); assertThat(buttonsPref.isChecked()).isEqualTo(false);
assertThat(Settings.Secure.getInt(mContext.getContentResolver(), 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) { private void showScreen(StylusDevicesController controller) {