diff --git a/src/com/android/settings/inputmethod/TrackpadReverseScrollingPreferenceController.java b/src/com/android/settings/inputmethod/TrackpadReverseScrollingPreferenceController.java index 0bbfb98ebeb..10d30139b6c 100644 --- a/src/com/android/settings/inputmethod/TrackpadReverseScrollingPreferenceController.java +++ b/src/com/android/settings/inputmethod/TrackpadReverseScrollingPreferenceController.java @@ -30,12 +30,12 @@ public class TrackpadReverseScrollingPreferenceController extends TogglePreferen @Override public boolean isChecked() { - return InputSettings.useTouchpadNaturalScrolling(mContext); + return !InputSettings.useTouchpadNaturalScrolling(mContext); } @Override public boolean setChecked(boolean isChecked) { - InputSettings.setTouchpadNaturalScrolling(mContext, isChecked); + InputSettings.setTouchpadNaturalScrolling(mContext, !isChecked); return true; } diff --git a/tests/robotests/src/com/android/settings/inputmethod/TrackpadReverseScrollingPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/inputmethod/TrackpadReverseScrollingPreferenceControllerTest.java index b4cb862e6c6..a99abb8d38f 100644 --- a/tests/robotests/src/com/android/settings/inputmethod/TrackpadReverseScrollingPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/inputmethod/TrackpadReverseScrollingPreferenceControllerTest.java @@ -61,22 +61,9 @@ public class TrackpadReverseScrollingPreferenceControllerTest { } @Test - public void setChecked_true_shouldReturn1() { + public void setChecked_true_shouldReturn0() { 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( mContext.getContentResolver(), SETTING_KEY, @@ -87,7 +74,20 @@ public class TrackpadReverseScrollingPreferenceControllerTest { } @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( mContext.getContentResolver(), SETTING_KEY, @@ -96,11 +96,11 @@ public class TrackpadReverseScrollingPreferenceControllerTest { boolean result = mController.isChecked(); - assertThat(result).isTrue(); + assertThat(result).isFalse(); } @Test - public void isChecked_providerPutInt0_returnFalse() { + public void isChecked_providerPutInt0_returnTrue() { Settings.System.putIntForUser( mContext.getContentResolver(), SETTING_KEY, @@ -109,6 +109,6 @@ public class TrackpadReverseScrollingPreferenceControllerTest { boolean result = mController.isChecked(); - assertThat(result).isFalse(); + assertThat(result).isTrue(); } }