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

Commit e077c963 authored by Shivangi Dubey's avatar Shivangi Dubey Committed by dshivangi
Browse files

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
parent 305a8e0e

src/com/android/settings/display/DeviceStateAutoRotateSettingController.java

+5 −4
Original line number Diff line number Diff line
@@ -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

src/com/android/settings/display/DeviceStateAutoRotationHelper.java

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

src/com/android/settings/display/SmartAutoRotateController.java

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

    }