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

Commit 9b9f6b5e authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Move DeviceStateRotationLockSettingsManager to settingslib so it can be... 

Merge "Move DeviceStateRotationLockSettingsManager to settingslib so it can be used in both SystemUI and Settings"
parents 666324ec 5313df2f

packages/SystemUI/src/com/android/systemui/statusbar/policy/DeviceStateRotationLockSettingsManager.java→packages/SettingsLib/src/com/android/settingslib/devicestate/DeviceStateRotationLockSettingsManager.java

+1 −1
Original line number Diff line number Diff line
@@ -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;

packages/SystemUI/src/com/android/systemui/statusbar/policy/DeviceStateRotationLockSettingController.java

+1 −0
Original line number Diff line number Diff line
@@ -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;

packages/SystemUI/src/com/android/systemui/statusbar/policy/dagger/StatusBarPolicyModule.java

+1 −1
Original line number Diff line number Diff line
@@ -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;

packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/DeviceStateRotationLockSettingControllerTest.java

+1 −0
Original line number Diff line number Diff line
@@ -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;