PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: I47bf9211925aaa3341f764db54009c58d9a6ffcf
This commit is contained in:
Ganesh Olekar
2021-10-25 17:19:33 +00:00
committed by Automerger Merge Worker
parent 6f405c9c46 f24702f643
commit cce029599f
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
res/values/strings.xml
View File

@@ -13605,8 +13605,10 @@
<string name="camera_toggle_title">Camera access</string> <string name="camera_toggle_title">Camera access</string>
<!-- Label for the camera use toggle [CHAR LIMIT=40] --> <!-- Label for the camera use toggle [CHAR LIMIT=40] -->
<string name="mic_toggle_title">Microphone access</string> <string name="mic_toggle_title">Microphone access</string>
<!-- Describes what is affected by the camera or mic toggle [CHAR LIMIT=NONE] --> <!-- Describes what is affected by the camera toggle [CHAR LIMIT=NONE] -->
<string name="sensor_toggle_description">For all apps and services</string> <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] --> <!-- Title for Game settings entry. [CHAR_LIMIT=NONE] -->
<string name="game_settings_title">Game settings</string> <string name="game_settings_title">Game settings</string>

4
res/xml/privacy_dashboard_settings.xml
View File

@@ -67,14 +67,14 @@
<com.android.settingslib.RestrictedSwitchPreference <com.android.settingslib.RestrictedSwitchPreference
android:key="privacy_camera_toggle" android:key="privacy_camera_toggle"
android:title="@string/camera_toggle_title" 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"/> settings:controller="com.android.settings.privacy.CameraToggleController"/>
<!-- Microphone toggle --> <!-- Microphone toggle -->
<com.android.settingslib.RestrictedSwitchPreference <com.android.settingslib.RestrictedSwitchPreference
android:key="privacy_mic_toggle" android:key="privacy_mic_toggle"
android:title="@string/mic_toggle_title" 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"/> settings:controller="com.android.settings.privacy.MicToggleController"/>
<!-- Show passwords --> <!-- Show passwords -->