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

Commit 5b44127d authored by Ganesh Olekar's avatar Ganesh Olekar Committed by Automerger Merge Worker
Browse files

Merge "Update toggle string for cam and mic access" into sc-v2-dev am: f24702f6 am: cce02959 

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

Change-Id: Ibc16462fbaf1cc37d0f059d1661133637d4e1217
parents 250b7c3e cce02959

res/values/strings.xml

+4 −2
Original line number Diff line number Diff line
@@ -13626,8 +13626,10 @@ 
    <string name="camera_toggle_title">Camera access</string>

    <!-- Label for the camera use toggle [CHAR LIMIT=40] -->

    <string name="mic_toggle_title">Microphone access</string>

    <!-- Describes what is affected by the camera or mic toggle [CHAR LIMIT=NONE] -->

    <string name="sensor_toggle_description">For all apps and services</string>

    <!-- Describes what is affected by the camera toggle [CHAR LIMIT=NONE] -->

    <string name="cam_toggle_description">For apps and services</string>

    <!-- Describes what is affected by the mic toggle [CHAR LIMIT=NONE] -->

    <string name="mic_toggle_description">For apps and services. If this setting is off, microphone data may still be shared when you call an emergency number.</string>









    <!-- Title for Game settings entry. [CHAR_LIMIT=NONE] -->









    <string name="game_settings_title">Game settings</string>

























res/xml/privacy_dashboard_settings.xml



+2
−2






























Original line number
Diff line number
Diff line







@@ -67,14 +67,14 @@







    <com.android.settingslib.RestrictedSwitchPreference









        android:key="privacy_camera_toggle"









        android:title="@string/camera_toggle_title"









        android:summary="@string/sensor_toggle_description"









        android:summary="@string/cam_toggle_description"









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



















    <!-- Microphone toggle -->









    <com.android.settingslib.RestrictedSwitchPreference









        android:key="privacy_mic_toggle"









        android:title="@string/mic_toggle_title"









        android:summary="@string/sensor_toggle_description"









        android:summary="@string/mic_toggle_description"









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



















    <!-- Show passwords -->