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

Merge "[Fixed] Reverse scrolling setting is reversed" into udc-dev

Browse Source
This commit is contained in:
Daniel Huang
2023-05-05 02:33:13 +00:00
committed by Android (Google) Code Review
parent 3096997718 0b79c92348
commit 08b2b68e22
2 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/android/settings/inputmethod/TrackpadReverseScrollingPreferenceController.java
View File

@@ -30,12 +30,12 @@ public class TrackpadReverseScrollingPreferenceController extends TogglePreferen
@Override @Override
public boolean isChecked() { public boolean isChecked() {
return InputSettings.useTouchpadNaturalScrolling(mContext); return !InputSettings.useTouchpadNaturalScrolling(mContext);
} }
@Override @Override
public boolean setChecked(boolean isChecked) { public boolean setChecked(boolean isChecked) {
InputSettings.setTouchpadNaturalScrolling(mContext, isChecked); InputSettings.setTouchpadNaturalScrolling(mContext, !isChecked);
return true; return true;
} }

36
tests/robotests/src/com/android/settings/inputmethod/TrackpadReverseScrollingPreferenceControllerTest.java
View File

@@ -61,22 +61,9 @@ public class TrackpadReverseScrollingPreferenceControllerTest {
} }
@Test @Test
public void setChecked_true_shouldReturn1() { public void setChecked_true_shouldReturn0() {
mController.setChecked(true); mController.setChecked(true);
int result = Settings.System.getIntForUser(
mContext.getContentResolver(),
SETTING_KEY,
0,
UserHandle.USER_CURRENT);
assertThat(result).isEqualTo(1);
}
@Test
public void setChecked_false_shouldReturn0() {
mController.setChecked(false);
int result = Settings.System.getIntForUser( int result = Settings.System.getIntForUser(
mContext.getContentResolver(), mContext.getContentResolver(),
SETTING_KEY, SETTING_KEY,
@@ -87,7 +74,20 @@ public class TrackpadReverseScrollingPreferenceControllerTest {
} }
@Test @Test
public void isChecked_providerPutInt1_returnTrue() { public void setChecked_false_shouldReturn1() {
mController.setChecked(false);
int result = Settings.System.getIntForUser(
mContext.getContentResolver(),
SETTING_KEY,
0,
UserHandle.USER_CURRENT);
assertThat(result).isEqualTo(1);
}
@Test
public void isChecked_providerPutInt1_returnFalse() {
Settings.System.putIntForUser( Settings.System.putIntForUser(
mContext.getContentResolver(), mContext.getContentResolver(),
SETTING_KEY, SETTING_KEY,
@@ -96,11 +96,11 @@ public class TrackpadReverseScrollingPreferenceControllerTest {
boolean result = mController.isChecked(); boolean result = mController.isChecked();
assertThat(result).isTrue(); assertThat(result).isFalse();
} }
@Test @Test
public void isChecked_providerPutInt0_returnFalse() { public void isChecked_providerPutInt0_returnTrue() {
Settings.System.putIntForUser( Settings.System.putIntForUser(
mContext.getContentResolver(), mContext.getContentResolver(),
SETTING_KEY, SETTING_KEY,
@@ -109,6 +109,6 @@ public class TrackpadReverseScrollingPreferenceControllerTest {
boolean result = mController.isChecked(); boolean result = mController.isChecked();
assertThat(result).isFalse(); assertThat(result).isTrue();
} }
} }