Merge "Add a developer option to controll mockmodemservice permission" am: 78b2b241a9 am: 41ec2bc89b am: 24888461da

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

Change-Id: I12e5aa6274b2db7f70a231d8b6512f40d32ff8a9
This commit is contained in:
Gary Jian
2022-03-23 06:56:17 +00:00
committed by Automerger Merge Worker
5 changed files with 208 additions and 0 deletions

View File

@@ -13520,6 +13520,11 @@
<!-- Summary for allowing screen overlays on Settings app. [CHAR LIMIT=NONE]-->
<string name="overlay_settings_summary">Allow apps that can display over other apps to overlay Settings screens</string>
<!-- Developer settings: Title for allowing mock modem service for testing. [CHAR LIMIT=50]-->
<string name="allow_mock_modem">Allow Mock Modem</string>
<!-- Developer settings: Summary for allowing mock modem service. [CHAR LIMIT=NONE]-->
<string name="allow_mock_modem_summary">Allow this device to run Mock Modem service for instrumentation testing. Do not enable this during normal usage of the phone</string>
<!-- Title for media control settings [CHAR LIMIT=50]-->
<string name="media_controls_title">Media</string>
<!-- Title of toggle to enable or disable the media resumption feature in quick settings [CHAR LIMIT=50]-->

View File

@@ -250,6 +250,11 @@
android:title="@string/force_high_refresh_rate_toggle"
android:summary="@string/force_high_refresh_rate_desc" />
<SwitchPreference
android:key="allow_mock_modem"
android:title="@string/allow_mock_modem"
android:summary="@string/allow_mock_modem_summary" />
</PreferenceCategory>
<PreferenceCategory