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

Commit daf2c793 authored by Daniel Huang's avatar Daniel Huang Committed by Automerger Merge Worker
Browse files

Merge "[Fixed] Reverse scrolling setting is reversed" into udc-dev am: 08b2b68e am: 5f12c8fc 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22994936



Change-Id: I206f901fc41f60a6a825b107dfa1cfeb94e5c608
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b1e0308d 5f12c8fc

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();

    }

}