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

Commit cbc3bc5a authored by Evan Severson's avatar Evan Severson Committed by Android (Google) Code Review
Browse files

Merge "Update mic/camera toggles api" into sc-dev

parents 72993877 5087e71b

src/com/android/settings/development/qstile/DevelopmentTiles.java

+2 −2
Original line number Diff line number Diff line
@@ -371,7 +371,7 @@ public abstract class DevelopmentTiles extends TileService { 
            mContext = getApplicationContext();

            mSensorPrivacyManager = (SensorPrivacyManager) mContext.getSystemService(

                    Context.SENSOR_PRIVACY_SERVICE);

            mIsEnabled = mSensorPrivacyManager.isSensorPrivacyEnabled();

            mIsEnabled = mSensorPrivacyManager.isAllSensorPrivacyEnabled();

            mMetricsFeatureProvider = FeatureFactory.getFactory(

                    mContext).getMetricsFeatureProvider();

            mKeyguardManager = (KeyguardManager) mContext.getSystemService(
@@ -392,7 +392,7 @@ public abstract class DevelopmentTiles extends TileService { 
            mMetricsFeatureProvider.action(getApplicationContext(), SettingsEnums.QS_SENSOR_PRIVACY,

                    isEnabled);

            mIsEnabled = isEnabled;

            mSensorPrivacyManager.setSensorPrivacy(isEnabled);

            mSensorPrivacyManager.setAllSensorPrivacy(isEnabled);

        }

    }

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

+1 −1
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ public class AdaptiveSleepCameraStatePreferenceController { 
        mPreference.setPositiveButtonText(R.string.allow);

        mPrivacyManager = SensorPrivacyManager.getInstance(context);

        mPrivacyManager.addSensorPrivacyListener(CAMERA,

                enabled -> updateVisibility());

                (sensor, enabled) -> updateVisibility());

        mPreference.setPositiveButtonOnClickListener(p -> {

            mPrivacyManager.setSensorPrivacy(CAMERA, false);

        });

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

+1 −3
Original line number Diff line number Diff line
@@ -111,9 +111,7 @@ public class ScreenTimeoutSettings extends RadioButtonPickerFragment implements 
        mPrivacyPreference.setLayoutResource(R.layout.preference_footer);

        mPrivacyManager = SensorPrivacyManager.getInstance(context);

        mPrivacyManager.addSensorPrivacyListener(CAMERA,

                enabled -> {

                    mAdaptiveSleepController.updatePreference();

                });

                (sensor, enabled) -> mAdaptiveSleepController.updatePreference());

    }



    @Override

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

+1 −1
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ public class SmartAutoRotateCameraStateController extends BasePreferenceControll 
    public SmartAutoRotateCameraStateController(Context context, String key) {

        super(context, key);

        mPrivacyManager = SensorPrivacyManager.getInstance(context);

        mPrivacyManager.addSensorPrivacyListener(CAMERA, enabled -> {

        mPrivacyManager.addSensorPrivacyListener(CAMERA, (sensor, enabled) -> {

            mPreference.setVisible(enabled);

            updateState(mPreference);

        });

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

+2 −1
Original line number Diff line number Diff line
@@ -52,7 +52,8 @@ public class SmartAutoRotateController extends TogglePreferenceController implem 
        super(context, preferenceKey);

        mMetricsFeatureProvider = FeatureFactory.getFactory(context).getMetricsFeatureProvider();

        mPrivacyManager = SensorPrivacyManager.getInstance(context);

        mPrivacyManager.addSensorPrivacyListener(CAMERA, enabled -> updateState(mPreference));

        mPrivacyManager

                .addSensorPrivacyListener(CAMERA, (sensor, enabled) -> updateState(mPreference));

    }



    @Override