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

Commit 22e23bf4 authored by Nate Myren's avatar Nate Myren Committed by Automerger Merge Worker
Browse files

Remove location toggle from privacy controls screen am: d18f11a8 am: b055df3b 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19281813



Change-Id: I501b834e2fff7655a94eb32e0d1d552ed8709774
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 2fa2dc49 b055df3b

res/xml/privacy_controls_settings.xml

+0 −6
Original line number Original line Diff line number Diff line
@@ -34,12 +34,6 @@ 
        android:summary="@string/mic_toggle_description"

        android:summary="@string/mic_toggle_description"

        settings:controller="com.android.settings.privacy.MicToggleController"/>

        settings:controller="com.android.settings.privacy.MicToggleController"/>





    <!-- Location toggle -->

    <com.android.settingslib.RestrictedSwitchPreference

        android:key="privacy_location_toggle"

        android:title="@string/location_toggle_title"

        android:summary="@string/perm_toggle_description"/>



    <!-- Clipboard access notifications -->

    <!-- Clipboard access notifications -->

    <SwitchPreference

    <SwitchPreference

        android:key="show_clip_access_notification"

        android:key="show_clip_access_notification"

src/com/android/settings/privacy/PrivacyControlsFragment.java

+0 −3
Original line number Original line Diff line number Diff line
@@ -33,15 +33,12 @@ public class PrivacyControlsFragment extends DashboardFragment { 
    private static final String TAG = "PrivacyDashboardFrag";

    private static final String TAG = "PrivacyDashboardFrag";

    private static final String CAMERA_KEY = "privacy_camera_toggle";

    private static final String CAMERA_KEY = "privacy_camera_toggle";

    private static final String MIC_KEY = "privacy_mic_toggle";

    private static final String MIC_KEY = "privacy_mic_toggle";

    private static final String LOCATION_KEY = "privacy_location_toggle";





    @Override

    @Override

    protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {

    protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {

        final List<AbstractPreferenceController> controllers = new ArrayList<>();

        final List<AbstractPreferenceController> controllers = new ArrayList<>();

        controllers.add(new CameraToggleController(context, CAMERA_KEY));

        controllers.add(new CameraToggleController(context, CAMERA_KEY));

        controllers.add(new MicToggleController(context, MIC_KEY));

        controllers.add(new MicToggleController(context, MIC_KEY));

        controllers.add(new LocationToggleController(context, LOCATION_KEY,

                getSettingsLifecycle()));

        controllers.add(new ShowClipAccessNotificationPreferenceController(context));

        controllers.add(new ShowClipAccessNotificationPreferenceController(context));

        return controllers;

        return controllers;

    }

    }