From e077c9632bbd44da7b5306f551e5c128c3fd5ab5 Mon Sep 17 00:00:00 2001 From: Shivangi Dubey Date: Thu, 20 Feb 2025 08:29:24 -0800 Subject: [PATCH] Create new device state auto rotate setting manager As part of auto-rotate setting refactor, create a new manager to be used between sysui and settings. This manager will replace the current DeviceStateRotationLockManager. Next CL: Integrate this manager to be used when auto-rotate refactor flag is ON. For more info:go/auto-rotate-refactor Bug: 394303723 Flag: com.android.window.flags.enable_device_state_auto_rotate_setting_refactor Test: atest DeviceStateAutoRotateSettingManagerImplTest Change-Id: Id1e09174fa3fb094f3aaf635b622b4bb9610f7f2 --- .../display/DeviceStateAutoRotateSettingController.java | 9 +++++---- .../settings/display/DeviceStateAutoRotationHelper.java | 2 +- .../settings/display/SmartAutoRotateController.java | 9 +++++---- 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/src/com/android/settings/display/DeviceStateAutoRotateSettingController.java b/src/com/android/settings/display/DeviceStateAutoRotateSettingController.java index e38f5d41bda..d3950ee1396 100644 --- a/src/com/android/settings/display/DeviceStateAutoRotateSettingController.java +++ b/src/com/android/settings/display/DeviceStateAutoRotateSettingController.java @@ -34,6 +34,7 @@ import com.android.settings.R; import com.android.settings.core.TogglePreferenceController; import com.android.settings.overlay.FeatureFactory; import com.android.settingslib.core.instrumentation.MetricsFeatureProvider; +import com.android.settingslib.devicestate.DeviceStateAutoRotateSettingManager; import com.android.settingslib.devicestate.DeviceStateRotationLockSettingsManager; import com.android.settingslib.search.SearchIndexableRaw; @@ -47,8 +48,8 @@ public class DeviceStateAutoRotateSettingController extends TogglePreferenceCont private final DeviceStateRotationLockSettingsManager mAutoRotateSettingsManager; private final int mOrder; - private final DeviceStateRotationLockSettingsManager.DeviceStateRotationLockSettingsListener - mDeviceStateRotationLockSettingsListener = () -> updateState(mPreference); + private final DeviceStateAutoRotateSettingManager.DeviceStateAutoRotateSettingListener + mDeviceStateAutoRotateSettingListener = () -> updateState(mPreference); private final int mDeviceState; private final String mDeviceStateDescription; private final MetricsFeatureProvider mMetricsFeatureProvider; @@ -77,12 +78,12 @@ public class DeviceStateAutoRotateSettingController extends TogglePreferenceCont @OnLifecycleEvent(ON_START) void onStart() { - mAutoRotateSettingsManager.registerListener(mDeviceStateRotationLockSettingsListener); + mAutoRotateSettingsManager.registerListener(mDeviceStateAutoRotateSettingListener); } @OnLifecycleEvent(ON_STOP) void onStop() { - mAutoRotateSettingsManager.unregisterListener(mDeviceStateRotationLockSettingsListener); + mAutoRotateSettingsManager.unregisterListener(mDeviceStateAutoRotateSettingListener); } @Override diff --git a/src/com/android/settings/display/DeviceStateAutoRotationHelper.java b/src/com/android/settings/display/DeviceStateAutoRotationHelper.java index 223ef1aa4fa..3bf9def2316 100644 --- a/src/com/android/settings/display/DeviceStateAutoRotationHelper.java +++ b/src/com/android/settings/display/DeviceStateAutoRotationHelper.java @@ -26,7 +26,7 @@ import com.android.settings.R; import com.android.settings.core.BasePreferenceController; import com.android.settingslib.core.AbstractPreferenceController; import com.android.settingslib.devicestate.DeviceStateRotationLockSettingsManager; -import com.android.settingslib.devicestate.DeviceStateRotationLockSettingsManager.SettableDeviceState; +import com.android.settingslib.devicestate.SettableDeviceState; import com.android.settingslib.search.SearchIndexableRaw; import com.google.common.collect.ImmutableList; diff --git a/src/com/android/settings/display/SmartAutoRotateController.java b/src/com/android/settings/display/SmartAutoRotateController.java index b5e3af223fd..c99b2f853ca 100644 --- a/src/com/android/settings/display/SmartAutoRotateController.java +++ b/src/com/android/settings/display/SmartAutoRotateController.java @@ -46,6 +46,7 @@ import com.android.settings.R; import com.android.settings.core.TogglePreferenceController; import com.android.settings.overlay.FeatureFactory; import com.android.settingslib.core.instrumentation.MetricsFeatureProvider; +import com.android.settingslib.devicestate.DeviceStateAutoRotateSettingManager; import com.android.settingslib.devicestate.DeviceStateRotationLockSettingsManager; /** @@ -75,8 +76,8 @@ public class SmartAutoRotateController extends TogglePreferenceController implem }; private final DeviceStateRotationLockSettingsManager mDeviceStateAutoRotateSettingsManager; - private final DeviceStateRotationLockSettingsManager.DeviceStateRotationLockSettingsListener - mDeviceStateRotationLockSettingsListener = () -> updateState(mPreference); + private final DeviceStateAutoRotateSettingManager.DeviceStateAutoRotateSettingListener + mDeviceStateAutoRotateSettingListener = () -> updateState(mPreference); private RotationPolicy.RotationPolicyListener mRotationPolicyListener; public SmartAutoRotateController(Context context, String preferenceKey) { @@ -140,7 +141,7 @@ public class SmartAutoRotateController extends TogglePreferenceController implem } RotationPolicy.registerRotationPolicyListener(mContext, mRotationPolicyListener); mDeviceStateAutoRotateSettingsManager.registerListener( - mDeviceStateRotationLockSettingsListener); + mDeviceStateAutoRotateSettingListener); mPrivacyManager.addSensorPrivacyListener(CAMERA, mPrivacyChangedListener); } @@ -152,7 +153,7 @@ public class SmartAutoRotateController extends TogglePreferenceController implem mRotationPolicyListener = null; } mDeviceStateAutoRotateSettingsManager.unregisterListener( - mDeviceStateRotationLockSettingsListener); + mDeviceStateAutoRotateSettingListener); mPrivacyManager.removeSensorPrivacyListener(CAMERA, mPrivacyChangedListener); }