Merge "[Fixed] Reverse scrolling setting is reversed" into udc-dev (08b2b68e) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/inputmethod/TrackpadReverseScrollingPreferenceController.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -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;
		}

tests/robotests/src/com/android/settings/inputmethod/TrackpadReverseScrollingPreferenceControllerTest.java

+8 −8

Original line number	Diff line number	Diff line
		@@ -61,7 +61,7 @@ public class TrackpadReverseScrollingPreferenceControllerTest {
		}

		@Test
		public void setChecked_true_shouldReturn1() {
		public void setChecked_true_shouldReturn0() {
		mController.setChecked(true);

		int result = Settings.System.getIntForUser(
		@@ -70,11 +70,11 @@ public class TrackpadReverseScrollingPreferenceControllerTest {
		0,
		UserHandle.USER_CURRENT);

		assertThat(result).isEqualTo(1);
		assertThat(result).isEqualTo(0);
		}

		@Test
		public void setChecked_false_shouldReturn0() {
		public void setChecked_false_shouldReturn1() {
		mController.setChecked(false);

		int result = Settings.System.getIntForUser(
		@@ -83,11 +83,11 @@ public class TrackpadReverseScrollingPreferenceControllerTest {
		0,
		UserHandle.USER_CURRENT);

		assertThat(result).isEqualTo(0);
		assertThat(result).isEqualTo(1);
		}

		@Test
		public void isChecked_providerPutInt1_returnTrue() {
		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();
		}
		}