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

Commit 9e3b9146 authored by Shivangi Dubey's avatar Shivangi Dubey
Browse files

Refactor ShadowDeviceStateAutoRotateSettingManager 

Update ShadowDeviceSttaeAutoRotateSettingManager as per the latest changes to DeviceStateAutoRotateSettingManager.
Test: atest DeviceStateAutoRotateSettingControllerTest
Bug: 394303723
Bug: 394303731
Flag: com.android.window.flags.enable_device_state_auto_rotate_setting_refactor

Change-Id: I8ea694709ccfd08310b241713b5ec67f2e070e2c
parent b830e703

tests/robotests/src/com/android/settings/accessibility/LockScreenRotationPreferenceControllerTest.java

+20 −16
Original line number Diff line number Diff line
@@ -16,9 +16,14 @@ 


package com.android.settings.accessibility;



import static com.android.settings.testutils.DeviceStateAutoRotateSettingTestUtils.setDeviceStateRotationLockEnabled;



import static com.google.common.truth.Truth.assertThat;



import static org.mockito.Mockito.when;



import android.content.Context;

import android.content.res.Resources;

import android.os.UserHandle;

import android.provider.Settings;
@@ -26,12 +31,14 @@ import androidx.preference.SwitchPreference; 


import com.android.internal.view.RotationPolicy;

import com.android.settings.core.BasePreferenceController;

import com.android.settings.testutils.shadow.ShadowDeviceStateRotationLockSettingsManager;

import com.android.settings.testutils.shadow.ShadowRotationPolicy;



import org.junit.Before;

import org.junit.Test;

import org.junit.runner.RunWith;

import org.mockito.Mock;

import org.mockito.Mockito;

import org.mockito.MockitoAnnotations;

import org.robolectric.RobolectricTestRunner;

import org.robolectric.RuntimeEnvironment;

import org.robolectric.annotation.Config;
@@ -41,48 +48,45 @@ import org.robolectric.annotation.Config; 
        com.android.settings.testutils.shadow.ShadowSystemSettings.class,

})

public class LockScreenRotationPreferenceControllerTest {



    @Mock

    private Resources mResources;

    private Context mContext;

    private SwitchPreference mPreference;

    private LockScreenRotationPreferenceController mController;



    @Before

    public void setUp() {

        mContext = RuntimeEnvironment.application;

        MockitoAnnotations.initMocks(this);

        mContext = Mockito.spy(RuntimeEnvironment.application);

        mPreference = new SwitchPreference(mContext);

        when(mContext.getResources()).thenReturn(mResources);



        mController = new LockScreenRotationPreferenceController(mContext, "lock_screen");

    }



    @Test

    @Config(shadows = {

            ShadowRotationPolicy.class,

            ShadowDeviceStateRotationLockSettingsManager.class

    })

    @Config(shadows = {ShadowRotationPolicy.class})

    public void getAvailabilityStatus_supportedRotation_shouldReturnAvailable() {

        ShadowRotationPolicy.setRotationSupported(true /* supported */);

        setDeviceStateRotationLockEnabled(false, mResources);



        assertThat(mController.getAvailabilityStatus()).isEqualTo(

                BasePreferenceController.AVAILABLE);

    }



    @Test

    @Config(shadows = {

            ShadowRotationPolicy.class,

            ShadowDeviceStateRotationLockSettingsManager.class

    })

    @Config(shadows = {ShadowRotationPolicy.class})

    public void getAvailabilityStatus_deviceStateRotationEnabled_returnsUnsupported() {

        ShadowRotationPolicy.setRotationSupported(true /* supported */);

        ShadowDeviceStateRotationLockSettingsManager.setDeviceStateRotationLockEnabled(true);

        setDeviceStateRotationLockEnabled(true, mResources);



        assertThat(mController.getAvailabilityStatus()).isEqualTo(

                BasePreferenceController.UNSUPPORTED_ON_DEVICE);

    }



    @Test

    @Config(shadows = {

            ShadowRotationPolicy.class,

            ShadowDeviceStateRotationLockSettingsManager.class

    })    public void getAvailabilityStatus_unsupportedRotation_shouldReturnUnsupportedOnDevice() {

    @Config(shadows = {ShadowRotationPolicy.class})

    public void getAvailabilityStatus_unsupportedRotation_shouldReturnUnsupportedOnDevice() {

        ShadowRotationPolicy.setRotationSupported(false /* supported */);



        assertThat(mController.getAvailabilityStatus()).isEqualTo(

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

+27 −9
Original line number Diff line number Diff line
@@ -18,30 +18,48 @@ package com.android.settings.display; 


import static com.android.settings.core.BasePreferenceController.AVAILABLE;

import static com.android.settings.core.BasePreferenceController.UNSUPPORTED_ON_DEVICE;

import static com.android.settings.testutils.DeviceStateAutoRotateSettingTestUtils.setDeviceStateRotationLockEnabled;



import static com.google.common.truth.Truth.assertThat;



import com.android.settings.testutils.shadow.ShadowDeviceStateRotationLockSettingsManager;

import static org.mockito.Mockito.when;



import android.content.Context;

import android.content.res.Resources;



import com.android.settings.testutils.shadow.ShadowRotationPolicy;



import org.junit.Before;

import org.junit.Test;

import org.junit.runner.RunWith;

import org.mockito.Mock;

import org.mockito.Mockito;

import org.mockito.MockitoAnnotations;

import org.robolectric.RobolectricTestRunner;

import org.robolectric.RuntimeEnvironment;

import org.robolectric.annotation.Config;



@RunWith(RobolectricTestRunner.class)

@Config(shadows = {ShadowRotationPolicy.class, ShadowDeviceStateRotationLockSettingsManager.class})

@Config(shadows = {ShadowRotationPolicy.class})

public class DeviceStateAutoRotateOverviewControllerTest {



    private final DeviceStateAutoRotateOverviewController mController =

            new DeviceStateAutoRotateOverviewController(

                    RuntimeEnvironment.application, "device_state_auto_rotate");

    @Mock

    private Resources mResources;

    private DeviceStateAutoRotateOverviewController mController;



    @Before

    public void setUp() {

        MockitoAnnotations.initMocks(this);

        Context context = Mockito.spy(RuntimeEnvironment.application);

        when(context.getResources()).thenReturn(mResources);



        mController = new DeviceStateAutoRotateOverviewController(

                context, "device_state_auto_rotate");

    }



    @Test

    public void getAvailabilityStatus_rotationAndDeviceStateRotationEnabled_returnsAvailable() {

        ShadowRotationPolicy.setRotationSupported(true);

        ShadowDeviceStateRotationLockSettingsManager.setDeviceStateRotationLockEnabled(true);

        setDeviceStateRotationLockEnabled(true, mResources);



        int availability = mController.getAvailabilityStatus();
@@ -51,7 +69,7 @@ public class DeviceStateAutoRotateOverviewControllerTest { 
    @Test

    public void getAvailabilityStatus_rotationNotSupported_returnsUnsupportedOnDevice() {

        ShadowRotationPolicy.setRotationSupported(false);

        ShadowDeviceStateRotationLockSettingsManager.setDeviceStateRotationLockEnabled(true);

        setDeviceStateRotationLockEnabled(true, mResources);



        int availability = mController.getAvailabilityStatus();
@@ -61,7 +79,7 @@ public class DeviceStateAutoRotateOverviewControllerTest { 
    @Test

    public void getAvailabilityStatus_deviceStateRotationNotSupported_returnsUnsupportedOnDevice() {

        ShadowRotationPolicy.setRotationSupported(true);

        ShadowDeviceStateRotationLockSettingsManager.setDeviceStateRotationLockEnabled(false);

        setDeviceStateRotationLockEnabled(false, mResources);



        int availability = mController.getAvailabilityStatus();

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

+11 −8
Original line number Diff line number Diff line
@@ -18,14 +18,17 @@ package com.android.settings.display; 


import static com.android.settings.core.BasePreferenceController.AVAILABLE;

import static com.android.settings.core.BasePreferenceController.UNSUPPORTED_ON_DEVICE;

import static com.android.settings.testutils.DeviceStateAutoRotateSettingTestUtils.setDeviceStateRotationLockEnabled;



import static com.google.common.truth.Truth.assertThat;



import static org.mockito.Mockito.doReturn;

import static org.mockito.Mockito.verify;

import static org.mockito.Mockito.when;



import android.app.settings.SettingsEnums;

import android.content.Context;

import android.content.res.Resources;

import android.hardware.devicestate.DeviceState;

import android.hardware.devicestate.DeviceStateManager;
@@ -34,7 +37,6 @@ import androidx.preference.PreferenceManager; 
import androidx.preference.PreferenceScreen;



import com.android.settings.R;

import com.android.settings.testutils.shadow.ShadowDeviceStateRotationLockSettingsManager;

import com.android.settings.testutils.shadow.ShadowRotationPolicy;

import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;

import com.android.settingslib.devicestate.DeviceStateAutoRotateSettingManager;
@@ -54,10 +56,7 @@ import java.util.ArrayList; 
import java.util.List;



@RunWith(RobolectricTestRunner.class)

@Config(shadows = {

        ShadowRotationPolicy.class,

        ShadowDeviceStateRotationLockSettingsManager.class

})

@Config(shadows = {ShadowRotationPolicy.class})

public class DeviceStateAutoRotateSettingControllerTest {



    private static final DeviceState DEFAULT_DEVICE_STATE = new DeviceState(
@@ -70,6 +69,7 @@ public class DeviceStateAutoRotateSettingControllerTest { 


    @Mock private MetricsFeatureProvider mMetricsFeatureProvider;

    @Mock private DeviceStateManager mDeviceStateManager;

    @Mock private Resources mResources;



    private DeviceStateAutoRotateSettingController mController;
@@ -78,11 +78,14 @@ public class DeviceStateAutoRotateSettingControllerTest { 
        MockitoAnnotations.initMocks(this);



        doReturn(mContext).when(mContext).getApplicationContext();

        when(mContext.getResources()).thenReturn(mResources);

        doReturn(mDeviceStateManager).when(mContext).getSystemService(DeviceStateManager.class);

        doReturn(List.of(DEFAULT_DEVICE_STATE)).when(

                mDeviceStateManager).getSupportedDeviceStates();

        setDeviceStateRotationLockEnabled(false, mResources);

        mAutoRotateSettingsManager =

                DeviceStateAutoRotateSettingManagerProvider.getSingletonInstance(mContext);



        mController = new DeviceStateAutoRotateSettingController(

                mContext,

                DEFAULT_DEVICE_STATE.getIdentifier(),
@@ -108,7 +111,7 @@ public class DeviceStateAutoRotateSettingControllerTest { 
    @Test

    public void getAvailabilityStatus_rotationAndDeviceStateRotationEnabled_returnsAvailable() {

        ShadowRotationPolicy.setRotationSupported(true);

        ShadowDeviceStateRotationLockSettingsManager.setDeviceStateRotationLockEnabled(true);

        setDeviceStateRotationLockEnabled(true, mResources);



        int availability = mController.getAvailabilityStatus();
@@ -118,7 +121,7 @@ public class DeviceStateAutoRotateSettingControllerTest { 
    @Test

    public void getAvailabilityStatus_deviceStateRotationDisabled_returnsUnsupported() {

        ShadowRotationPolicy.setRotationSupported(true);

        ShadowDeviceStateRotationLockSettingsManager.setDeviceStateRotationLockEnabled(false);

        setDeviceStateRotationLockEnabled(false, mResources);



        int availability = mController.getAvailabilityStatus();
@@ -128,7 +131,7 @@ public class DeviceStateAutoRotateSettingControllerTest { 
    @Test

    public void getAvailabilityStatus_rotationDisabled_returnsUnsupported() {

        ShadowRotationPolicy.setRotationSupported(false);

        ShadowDeviceStateRotationLockSettingsManager.setDeviceStateRotationLockEnabled(true);

        setDeviceStateRotationLockEnabled(true, mResources);



        int availability = mController.getAvailabilityStatus();

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

+13 −6
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ package com.android.settings.display; 
import static com.android.settings.core.BasePreferenceController.AVAILABLE;

import static com.android.settings.core.BasePreferenceController.DISABLED_DEPENDENT_SETTING;

import static com.android.settings.core.BasePreferenceController.UNSUPPORTED_ON_DEVICE;

import static com.android.settings.testutils.DeviceStateAutoRotateSettingTestUtils.setDeviceStateRotationLockEnabled;



import static com.google.common.truth.Truth.assertThat;
@@ -33,6 +34,7 @@ import android.content.Context; 
import android.content.pm.PackageManager;

import android.content.pm.ResolveInfo;

import android.content.pm.ServiceInfo;

import android.content.res.Resources;

import android.hardware.devicestate.DeviceState;

import android.hardware.devicestate.DeviceStateManager;

import android.os.UserHandle;
@@ -41,7 +43,7 @@ import android.provider.Settings; 
import androidx.preference.Preference;



import com.android.settings.testutils.ResolveInfoBuilder;

import com.android.settings.testutils.shadow.ShadowDeviceStateRotationLockSettingsManager;

import com.android.settings.testutils.shadow.ShadowDeviceStateAutoRotateSettingManager;

import com.android.settings.testutils.shadow.ShadowRotationPolicy;

import com.android.settings.testutils.shadow.ShadowSensorPrivacyManager;

import com.android.settings.testutils.shadow.ShadowSystemSettings;
@@ -73,6 +75,8 @@ public class SmartAutoRotateControllerTest { 
    private Preference mPreference;

    @Mock

    private DeviceStateManager mDeviceStateManager;

    @Mock

    private Resources mResources;

    private ContentResolver mContentResolver;

    private DeviceStateAutoRotateSettingManager mDeviceStateAutoRotateSettingManager;
@@ -81,9 +85,11 @@ public class SmartAutoRotateControllerTest { 
        MockitoAnnotations.initMocks(this);

        final Context context = Mockito.spy(RuntimeEnvironment.application);

        mContentResolver = RuntimeEnvironment.application.getContentResolver();

        mResources = Mockito.spy(RuntimeEnvironment.application.getResources());



        when(context.getPackageManager()).thenReturn(mPackageManager);

        when(context.getContentResolver()).thenReturn(mContentResolver);

        when(context.getResources()).thenReturn(mResources);

        doReturn(PACKAGE_NAME).when(mPackageManager).getRotationResolverPackageName();

        doReturn(PackageManager.PERMISSION_GRANTED).when(mPackageManager).checkPermission(

                Manifest.permission.CAMERA, PACKAGE_NAME);
@@ -91,6 +97,7 @@ public class SmartAutoRotateControllerTest { 
        doReturn(context).when(context).getApplicationContext();

        doReturn(mDeviceStateManager).when(context).getSystemService(DeviceStateManager.class);

        doReturn(getDeviceStateList()).when(mDeviceStateManager).getSupportedDeviceStates();

        setDeviceStateRotationLockEnabled(false, mResources);

        mDeviceStateAutoRotateSettingManager =

                DeviceStateAutoRotateSettingManagerProvider.getSingletonInstance(context);

        mController = Mockito.spy(new SmartAutoRotateController(context, "test_key"));
@@ -144,7 +151,7 @@ public class SmartAutoRotateControllerTest { 


    @Test

    @Config(shadows = {

            ShadowDeviceStateRotationLockSettingsManager.class,

            ShadowDeviceStateAutoRotateSettingManager.class,

            ShadowRotationPolicy.class

    })

    public void getAvailabilityStatus_deviceStateRotationLocked_returnDisableDependentSetting() {
@@ -158,7 +165,7 @@ public class SmartAutoRotateControllerTest { 


    @Test

    @Config(shadows = {

            ShadowDeviceStateRotationLockSettingsManager.class,

            ShadowDeviceStateAutoRotateSettingManager.class,

            ShadowRotationPolicy.class

    })

    public void getAvailabilityStatus_deviceStateRotationUnlocked_returnAvailable() {
@@ -182,17 +189,17 @@ public class SmartAutoRotateControllerTest { 


    private void enableDeviceStateRotation() {

        ShadowRotationPolicy.setRotationSupported(true);

        ShadowDeviceStateRotationLockSettingsManager.setDeviceStateRotationLockEnabled(true);

        setDeviceStateRotationLockEnabled(true, mResources);

    }



    private void lockDeviceStateRotation() {

        ShadowDeviceStateRotationLockSettingsManager shadowManager =

        ShadowDeviceStateAutoRotateSettingManager shadowManager =

                Shadow.extract(mDeviceStateAutoRotateSettingManager);

        shadowManager.setRotationLockedForAllStates(true);

    }



    private void unlockDeviceStateRotation() {

        ShadowDeviceStateRotationLockSettingsManager shadowManager =

        ShadowDeviceStateAutoRotateSettingManager shadowManager =

                Shadow.extract(mDeviceStateAutoRotateSettingManager);

        shadowManager.setRotationLockedForAllStates(false);

    }

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

+5 −5
Original line number Diff line number Diff line
@@ -18,6 +18,8 @@ package com.android.settings.display; 


import static android.provider.Settings.Secure.CAMERA_AUTOROTATE;



import static com.android.settings.testutils.DeviceStateAutoRotateSettingTestUtils.setDeviceStateRotationLockEnabled;



import static com.google.common.truth.Truth.assertThat;



import static org.mockito.ArgumentMatchers.any;
@@ -40,7 +42,6 @@ import com.android.settings.R; 
import com.android.settings.core.BasePreferenceController;

import com.android.settings.testutils.FakeFeatureFactory;

import com.android.settings.testutils.ResolveInfoBuilder;

import com.android.settings.testutils.shadow.ShadowDeviceStateRotationLockSettingsManager;

import com.android.settings.testutils.shadow.ShadowSensorPrivacyManager;

import com.android.settings.testutils.shadow.ShadowSystemSettings;
@@ -57,8 +58,7 @@ import org.robolectric.annotation.Config; 
@RunWith(RobolectricTestRunner.class)

@Config(shadows = {

        ShadowSystemSettings.class,

        ShadowSensorPrivacyManager.class,

        ShadowDeviceStateRotationLockSettingsManager.class

        ShadowSensorPrivacyManager.class

})

public class SmartAutoRotatePreferenceControllerTest {
@@ -104,7 +104,7 @@ public class SmartAutoRotatePreferenceControllerTest { 
                new SmartAutoRotatePreferenceController(mContext, "smart_auto_rotate"));

        when(mController.isCameraLocked()).thenReturn(false);

        when(mController.isPowerSaveMode()).thenReturn(false);

        ShadowDeviceStateRotationLockSettingsManager.setDeviceStateRotationLockEnabled(false);

        setDeviceStateRotationLockEnabled(false, mResources);

    }



    @Test
@@ -213,7 +213,7 @@ public class SmartAutoRotatePreferenceControllerTest { 
    @Test

    public void getAvailabilityStatus_deviceStateRotationEnabled_returnsUnsupported() {

        enableAutoRotationPreference();

        ShadowDeviceStateRotationLockSettingsManager.setDeviceStateRotationLockEnabled(true);

        setDeviceStateRotationLockEnabled(true, mResources);



        assertThat(mController.getAvailabilityStatus()).isEqualTo(

                BasePreferenceController.UNSUPPORTED_ON_DEVICE);