Integrate refactored device-state auto-rotate setting manager
Added DeviceStateAutoRotateSettingManagerProvider to provide appropriate implementation of DeviceStateAutoRotateSettingManager based on flag. Integrate DeviceStateAutoRotateSettingManagerImpl to be used when auto-rotate refactor flag is ON. For more info:go/auto-rotate-refactor Bug: 394303723 Bug: 394303731 Flag: com.android.window.flags.enable_device_state_auto_rotate_setting_refactor Test: atest DeviceStateAutoRotateSettingManagerProviderTest Change-Id: I63494b6548f1f533a9a1979f2b19640c3ad1dc8d
This commit is contained in:
committed by
dshivangi
parent
a9ef330701
commit
b830e703f3
@@ -37,7 +37,7 @@ 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.DeviceStateRotationLockSettingsManager;
|
||||
import com.android.settingslib.devicestate.DeviceStateAutoRotateSettingManager;
|
||||
import com.android.settingslib.search.SearchIndexableRaw;
|
||||
|
||||
import org.junit.Before;
|
||||
@@ -66,7 +66,7 @@ public class DeviceStateAutoRotateSettingControllerTest {
|
||||
private static final int DEFAULT_ORDER = -10;
|
||||
|
||||
private final Context mContext = Mockito.spy(RuntimeEnvironment.application);
|
||||
private DeviceStateRotationLockSettingsManager mAutoRotateSettingsManager;
|
||||
private DeviceStateAutoRotateSettingManager mAutoRotateSettingsManager;
|
||||
|
||||
@Mock private MetricsFeatureProvider mMetricsFeatureProvider;
|
||||
@Mock private DeviceStateManager mDeviceStateManager;
|
||||
@@ -82,7 +82,7 @@ public class DeviceStateAutoRotateSettingControllerTest {
|
||||
doReturn(List.of(DEFAULT_DEVICE_STATE)).when(
|
||||
mDeviceStateManager).getSupportedDeviceStates();
|
||||
mAutoRotateSettingsManager =
|
||||
DeviceStateRotationLockSettingsManager.getInstance(mContext);
|
||||
DeviceStateAutoRotateSettingManagerProvider.getSingletonInstance(mContext);
|
||||
mController = new DeviceStateAutoRotateSettingController(
|
||||
mContext,
|
||||
DEFAULT_DEVICE_STATE.getIdentifier(),
|
||||
|
Reference in New Issue
Block a user