From 5313df2f7455e5bbbf36065fdcd966cd8634d265 Mon Sep 17 00:00:00 2001 From: Alex Florescu Date: Fri, 14 Jan 2022 18:09:09 +0000 Subject: [PATCH] Move DeviceStateRotationLockSettingsManager to settingslib so it can be used in both SystemUI and Settings Bug: 195757480 Test: atest SystemUITests:DeviceStateRotationLockSettingControllerTest Change-Id: I18ef2b4d7937172743d1e6ea4bcd8caa53adc7d8 --- .../devicestate}/DeviceStateRotationLockSettingsManager.java | 2 +- .../policy/DeviceStateRotationLockSettingController.java | 1 + .../systemui/statusbar/policy/dagger/StatusBarPolicyModule.java | 2 +- .../policy/DeviceStateRotationLockSettingControllerTest.java | 1 + 4 files changed, 4 insertions(+), 2 deletions(-) rename packages/{SystemUI/src/com/android/systemui/statusbar/policy => SettingsLib/src/com/android/settingslib/devicestate}/DeviceStateRotationLockSettingsManager.java (99%) diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/DeviceStateRotationLockSettingsManager.java b/packages/SettingsLib/src/com/android/settingslib/devicestate/DeviceStateRotationLockSettingsManager.java similarity index 99% rename from packages/SystemUI/src/com/android/systemui/statusbar/policy/DeviceStateRotationLockSettingsManager.java rename to packages/SettingsLib/src/com/android/settingslib/devicestate/DeviceStateRotationLockSettingsManager.java index bec5fc8e7b9fb..afd3626ab8892 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/DeviceStateRotationLockSettingsManager.java +++ b/packages/SettingsLib/src/com/android/settingslib/devicestate/DeviceStateRotationLockSettingsManager.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.systemui.statusbar.policy; +package com.android.settingslib.devicestate; import static android.provider.Settings.Secure.DEVICE_STATE_ROTATION_LOCK_IGNORED; import static android.provider.Settings.Secure.DEVICE_STATE_ROTATION_LOCK_LOCKED; diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/DeviceStateRotationLockSettingController.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/DeviceStateRotationLockSettingController.java index 33f2140b150ef..d90363957aa9f 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/DeviceStateRotationLockSettingController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/DeviceStateRotationLockSettingController.java @@ -23,6 +23,7 @@ import android.annotation.Nullable; import android.hardware.devicestate.DeviceStateManager; import android.util.Log; +import com.android.settingslib.devicestate.DeviceStateRotationLockSettingsManager; import com.android.systemui.dagger.SysUISingleton; import com.android.systemui.dagger.qualifiers.Main; import com.android.systemui.util.wrapper.RotationPolicyWrapper; diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/dagger/StatusBarPolicyModule.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/dagger/StatusBarPolicyModule.java index 60938fb2feb49..c3268354a5391 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/dagger/StatusBarPolicyModule.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/dagger/StatusBarPolicyModule.java @@ -21,6 +21,7 @@ import android.content.res.Resources; import android.os.UserManager; import com.android.internal.R; +import com.android.settingslib.devicestate.DeviceStateRotationLockSettingsManager; import com.android.systemui.dagger.SysUISingleton; import com.android.systemui.dagger.qualifiers.Main; import com.android.systemui.settings.UserTracker; @@ -36,7 +37,6 @@ import com.android.systemui.statusbar.policy.DeviceControlsController; import com.android.systemui.statusbar.policy.DeviceControlsControllerImpl; import com.android.systemui.statusbar.policy.DevicePostureController; import com.android.systemui.statusbar.policy.DevicePostureControllerImpl; -import com.android.systemui.statusbar.policy.DeviceStateRotationLockSettingsManager; import com.android.systemui.statusbar.policy.ExtensionController; import com.android.systemui.statusbar.policy.ExtensionControllerImpl; import com.android.systemui.statusbar.policy.FlashlightController; diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/DeviceStateRotationLockSettingControllerTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/DeviceStateRotationLockSettingControllerTest.java index 6364d2f232992..48b17322da4d2 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/DeviceStateRotationLockSettingControllerTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/DeviceStateRotationLockSettingControllerTest.java @@ -36,6 +36,7 @@ import androidx.test.filters.SmallTest; import com.android.internal.R; import com.android.internal.view.RotationPolicy; +import com.android.settingslib.devicestate.DeviceStateRotationLockSettingsManager; import com.android.systemui.SysuiTestCase; import com.android.systemui.util.concurrency.FakeExecutor; import com.android.systemui.util.time.FakeSystemClock;