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

Commit 51bc4a3f authored by Nick Chameyev's avatar Nick Chameyev Committed by Android (Google) Code Review
Browse files

Merge "Allow switching to outer screen only after passing 90 degrees" into 24D1-dev

parents 9154fe5c 9ff6e9b4

services/foldables/devicestateprovider/src/com/android/server/policy/BookStyleStateTransitions.java

+2 −2
Original line number Diff line number Diff line
@@ -412,7 +412,7 @@ public class BookStyleStateTransitions { 
                /* stickyKeepInnerUntil45Degrees */ true,

                PreferredScreen.INNER,

                /* setStickyKeepOuterUntil90Degrees */ null,

                /* setStickyKeepInnerUntil45Degrees */ false

                /* setStickyKeepInnerUntil45Degrees */ null

        ));

        DEFAULT_STATE_TRANSITIONS.add(new StateTransition(

                HingeAngle.ANGLE_45_TO_90,
@@ -492,7 +492,7 @@ public class BookStyleStateTransitions { 
                /* stickyKeepInnerUntil45Degrees */ true,

                PreferredScreen.INNER,

                /* setStickyKeepOuterUntil90Degrees */ null,

                /* setStickyKeepInnerUntil45Degrees */ false

                /* setStickyKeepInnerUntil45Degrees */ null

        ));

        DEFAULT_STATE_TRANSITIONS.add(new StateTransition(

                HingeAngle.ANGLE_45_TO_90,

services/foldables/devicestateprovider/tests/src/com/android/server/policy/BookStyleDeviceStatePolicyTest.java

+31 −1
Original line number Diff line number Diff line
@@ -511,7 +511,7 @@ public final class BookStyleDeviceStatePolicyTest { 
    }



    @Test

    public void test_unfoldTo60Degrees_andFoldTo10_switchesToClosedState() {

    public void test_unfoldTo60Degrees_andFoldTo10_doesNotSwitchToClosedState() {

        sendHingeAngle(0f);

        sendRightSideFlatSensorEvent(false);

        mProvider.setListener(mListener);
@@ -522,6 +522,36 @@ public final class BookStyleDeviceStatePolicyTest { 


        sendHingeAngle(10f);



        verify(mListener, never()).onStateChanged(anyInt());

    }



    @Test

    public void test_unfoldTo100Degrees_andFoldTo10_switchesToClosedState() {

        sendHingeAngle(0f);

        sendRightSideFlatSensorEvent(false);

        mProvider.setListener(mListener);

        assertLatestReportedState(DEVICE_STATE_CLOSED);

        sendHingeAngle(100f);

        assertLatestReportedState(DEVICE_STATE_HALF_OPENED);

        clearInvocations(mListener);



        sendHingeAngle(10f);



        verify(mListener).onStateChanged(DEVICE_STATE_CLOSED);

    }



    @Test

    public void test_unfoldTo10Degrees_andFoldTo0_switchesToClosedState() {

        sendHingeAngle(0f);

        sendRightSideFlatSensorEvent(false);

        mProvider.setListener(mListener);

        assertLatestReportedState(DEVICE_STATE_CLOSED);

        sendHingeAngle(10f);

        assertLatestReportedState(DEVICE_STATE_HALF_OPENED);

        clearInvocations(mListener);



        sendHingeAngle(0f);



        verify(mListener).onStateChanged(DEVICE_STATE_CLOSED);

    }