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

Commit 79343b46 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fixed the robo test failed in AutoRotatePreferenceControllerTest and... 

Merge "Fixed the robo test failed in AutoRotatePreferenceControllerTest 	and SmartAutoRotatePreferenceControllerTest" into main
parents 02427bb6 383edb4a

tests/robotests/src/com/android/settings/display/AutoRotatePreferenceControllerTest.java

+6 −4
Original line number Original line Diff line number Diff line
@@ -190,15 +190,17 @@ public class AutoRotatePreferenceControllerTest { 
    private void enableAutoRotationPreference() {

    private void enableAutoRotationPreference() {

        when(mPackageManager.hasSystemFeature(anyString())).thenReturn(true);

        when(mPackageManager.hasSystemFeature(anyString())).thenReturn(true);

        when(mContext.getResources().getBoolean(anyInt())).thenReturn(true);

        when(mContext.getResources().getBoolean(anyInt())).thenReturn(true);

        Settings.System.putInt(mContentResolver,

        Settings.System.putIntForUser(mContentResolver,

                Settings.System.HIDE_ROTATION_LOCK_TOGGLE_FOR_ACCESSIBILITY, 0);

                Settings.System.HIDE_ROTATION_LOCK_TOGGLE_FOR_ACCESSIBILITY, 0,

                UserHandle.USER_CURRENT);

    }

    }





    private void disableAutoRotationPreference() {

    private void disableAutoRotationPreference() {

        when(mPackageManager.hasSystemFeature(anyString())).thenReturn(true);

        when(mPackageManager.hasSystemFeature(anyString())).thenReturn(true);

        when(mContext.getResources().getBoolean(anyInt())).thenReturn(true);

        when(mContext.getResources().getBoolean(anyInt())).thenReturn(true);

        Settings.System.putInt(mContentResolver,

        Settings.System.putIntForUser(mContentResolver,

                Settings.System.HIDE_ROTATION_LOCK_TOGGLE_FOR_ACCESSIBILITY, 1);

                Settings.System.HIDE_ROTATION_LOCK_TOGGLE_FOR_ACCESSIBILITY, 1,

                UserHandle.USER_CURRENT);

    }

    }





    private void enableAutoRotation() {

    private void enableAutoRotation() {

tests/robotests/src/com/android/settings/display/SmartAutoRotatePreferenceControllerTest.java

+6 −4
Original line number Original line Diff line number Diff line
@@ -236,15 +236,17 @@ public class SmartAutoRotatePreferenceControllerTest { 
    private void enableAutoRotationPreference() {

    private void enableAutoRotationPreference() {

        when(mPackageManager.hasSystemFeature(anyString())).thenReturn(true);

        when(mPackageManager.hasSystemFeature(anyString())).thenReturn(true);

        when(mResources.getBoolean(anyInt())).thenReturn(true);

        when(mResources.getBoolean(anyInt())).thenReturn(true);

        Settings.System.putInt(mContentResolver,

        Settings.System.putIntForUser(mContentResolver,

                Settings.System.HIDE_ROTATION_LOCK_TOGGLE_FOR_ACCESSIBILITY, 0);

                Settings.System.HIDE_ROTATION_LOCK_TOGGLE_FOR_ACCESSIBILITY, 0,

                UserHandle.USER_CURRENT);

    }

    }





    private void disableAutoRotationPreference() {

    private void disableAutoRotationPreference() {

        when(mPackageManager.hasSystemFeature(anyString())).thenReturn(true);

        when(mPackageManager.hasSystemFeature(anyString())).thenReturn(true);

        when(mResources.getBoolean(anyInt())).thenReturn(true);

        when(mResources.getBoolean(anyInt())).thenReturn(true);

        Settings.System.putInt(mContentResolver,

        Settings.System.putIntForUser(mContentResolver,

                Settings.System.HIDE_ROTATION_LOCK_TOGGLE_FOR_ACCESSIBILITY, 1);

                Settings.System.HIDE_ROTATION_LOCK_TOGGLE_FOR_ACCESSIBILITY, 1,

                UserHandle.USER_CURRENT);

    }

    }





    private void enableAutoRotation() {

    private void enableAutoRotation() {