Merge "Remove developer option to disable device ID access restrictions" into qt-dev
This commit is contained in:
committed by
Android (Google) Code Review
commit
ad85d6b942
@@ -6079,10 +6079,6 @@
|
||||
<string name="sms_access_restriction_enabled">Restrict SMS & call log access</string>
|
||||
<!-- Summary for whether to enable SMS access restriction [CHAR LIMIT=NONE]-->
|
||||
<string name="sms_access_restriction_enabled_summary">Only default phone and messaging apps have SMS & call log permissions</string>
|
||||
<!-- Title for the new device identifier access restrictions [CHAR LIMIT=50]-->
|
||||
<string name="device_identifier_access_restrictions_title">Disable device identifier restrictions</string>
|
||||
<!-- Summary for the new device identifier access restrictions [CHAR LIMIT=NONE]-->
|
||||
<string name="device_identifier_access_restrictions_summary">Disable the new access restrictions for device identifiers</string>
|
||||
|
||||
|
||||
<!-- Message when there are no available trust agents to display -->
|
||||
|
@@ -561,11 +561,6 @@
|
||||
android:title="@string/sms_access_restriction_enabled"
|
||||
android:summary="@string/sms_access_restriction_enabled_summary" />
|
||||
|
||||
<SwitchPreference
|
||||
android:key="device_identifier_access_restrictions"
|
||||
android:title="@string/device_identifier_access_restrictions_title"
|
||||
android:summary="@string/device_identifier_access_restrictions_summary" />
|
||||
|
||||
<SwitchPreference
|
||||
android:key="notification_bubbles"
|
||||
android:title="@string/notification_bubbles_title"
|
||||
|
Reference in New Issue
Block a user