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

Commit 264e7474 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 4781566 from bafae44c to pi-release 

Change-Id: Id9ce3e224b118ec93aeaa90ebe324a56020d8380
parents 0df7e324 bafae44c

res/values/strings.xml

+29 −11
Original line number Diff line number Diff line
@@ -402,11 +402,6 @@ 
    <!-- Summary for bluetooth item in connection detail page. (phone)-->

    <string name="bluetooth_pref_summary" product="default">Allow your phone to communicate with nearby Bluetooth devices</string>









    <!-- Setting Checkbox title for disabling Bluetooth inband ringing in Development Settings -->









    <string name="bluetooth_disable_inband_ringing">Disable in-band ringing</string>









    <!-- Summary of checkbox for disabling Bluetooth inband ringing in Development Settings -->









    <string name="bluetooth_disable_inband_ringing_summary">Don’t play custom phone ringtones on Bluetooth headsets</string>

















    <!-- Title for Bluetooth device group with media capability group [CHAR LIMIT=none]-->









    <string name="connected_device_available_media_title">Available media devices</string>









    <!-- Title for Bluetooth device group with media capability group [CHAR LIMIT=none]-->








@@ -1691,15 +1686,10 @@







    <!-- Bluetooth settings.  Dock Setting Dialog - Remember setting and don't ask user again -->









    <string name="bluetooth_dock_settings_remember">Remember settings</string>

















    <!-- Bluetooth developer options. -->









    <!-- Bluetooth developer settings: Maximum number of connected audio devices -->









    <string name="bluetooth_max_connected_audio_devices_string">Maximum connected Bluetooth audio devices</string>









    <!-- Bluetooth developer settings: Maximum number of connected audio devices -->









    <string name="bluetooth_max_connected_audio_devices_dialog_title">Select maximum number of connected Bluetooth audio devices</string>









    <!-- Bluetooth developer settings: Checkbox title for disabling Bluetooth receiving AVDTP delay reports -->









    <string name="bluetooth_disable_avdtp_delay_reports">Disable Bluetooth AVDTP delay reports</string>









    <!-- Bluetooth developer settings: Summary of checkbox for disabling Bluetooth receiving AVDTP delay reports -->









    <string name="bluetooth_disable_avdtp_delay_reports_summary">Disallow receiving Bluetooth AVDTP delay reports</string>

















    <!-- Wifi Display settings. The title of the screen. [CHAR LIMIT=40] -->









    <string name="wifi_display_settings_title">Cast</string>








@@ -2350,6 +2340,17 @@







    <!-- Message of private dns that provides a help link. [CHAR LIMIT=NONE] -->









    <string name="private_dns_help_message"><annotation id="url">Learn more</annotation> about Private DNS features</string>

















    <!-- Message to display when setting wifi calling are not editable [CHAR LIMIT=NONE] -->









    <string name="wifi_calling_pref_managed_by_carrier">Setting managed by carrier</string>









    <!-- Message to display when wifi calling needs activation [CHAR LIMIT=NONE] -->









    <string name="wifi_calling_settings_activation_instructions">Activate Wi\u2011Fi Calling</string>









    <!-- Message to display when wifi calling should be on [CHAR LIMIT=NONE] -->









    <string name="wifi_calling_turn_on">Turn on Wi\u2011Fi calling</string>









    <!-- Message to display when carrier does not support wifi calling or doesn't want the user









         to modify the settings [CHAR LIMIT=NONE] -->









    <string name="wifi_calling_not_supported">Wi\u2011Fi calling is not supported for %1$s</string>









    <!-- Carrier string to use in other messages -->









    <string name="carrier">Carrier</string>









    <!-- Sound and alerts settings -->









    <skip/>









    <string name="display_settings_title">Display</string>








@@ -4922,6 +4923,8 @@







    <string name="background_activity_warning_dialog_title">Limit background activity?</string>









    <!-- TODO: Pending UX review. Text for the warning dialog to show to the user when limiting background activity for an app -->









    <string name="background_activity_warning_dialog_text">If you limit background activity for an app, it may misbehave</string>









    <!-- Dialog message when app can't been restricted because it is not optimized [CHAR_LIMIT=120] -->









    <string name="background_activity_disabled_dialog_text">Since this app is not set to optimize battery, you can\u2019t restrict it.\n\nTo restrict the app, first turn on battery optimization.</string>

















    <!-- Title for the screen usage in power use UI [CHAR_LIMIT=60] -->









    <string name="device_screen_usage">Screen usage since full charge</string>








@@ -7930,6 +7933,9 @@







    <!-- [CHAR LIMIT=20] Zen mode settings: Calls option -->









    <string name="zen_mode_calls">Calls</string>

















    <!-- [CHAR LIMIT=40] Zen mode settings: Allow calls toggle title -->









    <string name="zen_mode_calls_title">Allow calls</string>

















    <!-- [CHAR LIMIT=20] Zen mode settings: Calls screen footer -->









    <string name="zen_mode_calls_footer">When Do Not Disturb is on, incoming calls are blocked. You can adjust settings to allow your friends, family, or other contacts to reach you.</string>
















@@ -7945,6 +7951,9 @@







    <!-- [CHAR LIMIT=20] Zen mode settings: Messages option -->









    <string name="zen_mode_messages">Messages</string>

















    <!-- [CHAR LIMIT=40] Zen mode settings: Allow messages toggle title -->









    <string name="zen_mode_messages_title">Allow messages</string>

















    <!-- [CHAR LIMIT=50] Zen mode settings: All messages summary -->









    <string name="zen_mode_all_messages">Messages</string>
















@@ -7984,9 +7993,15 @@







    <!-- [CHAR LIMIT=50] Zen mode settings: Reminders option -->









    <string name="zen_mode_reminders">Reminders</string>

















    <!-- [CHAR LIMIT=70] Zen mode settings: Allow reminders toggle title -->









    <string name="zen_mode_reminders_title">Allow reminders</string>

















    <!-- [CHAR LIMIT=50] Zen mode settings: Events option -->









    <string name="zen_mode_events">Events</string>

















    <!-- [CHAR LIMIT=70] Zen mode settings: Allow events toggle title -->









    <string name="zen_mode_events_title">Allow events</string>

















    <!-- [CHAR LIMIT=50] Zen mode settings: All callers summary -->









    <string name="zen_mode_all_callers">anyone</string>
















@@ -7999,8 +8014,11 @@







    <!-- [CHAR LIMIT=50] Zen mode settings: Repeat callers option -->









    <string name="zen_mode_repeat_callers">Repeat callers</string>

















    <!-- [CHAR LIMIT=70] Zen mode settings: Allow repeat callers toggle title -->









    <string name="zen_mode_repeat_callers_title">Allow repeat callers</string>

















    <!-- [CHAR LIMIT=50] Zen mode settings: calls summary -->









    <string name="zen_mode_calls_summary_one">From <xliff:g id="caller type" example="contacts">%1$s</xliff:g> only</string>









    <string name="zen_mode_calls_summary_one">From <xliff:g id="caller type" example="contacts">%1$s</xliff:g></string>

















    <!-- [CHAR LIMIT=50] Zen mode settings: calls summary -->









    <string name="zen_mode_calls_summary_two">From <xliff:g id="caller type" example="starred contacts">%1$s</xliff:g> and <xliff:g id="callert tpye" example="repeat callers">%2$s</xliff:g></string>

























res/xml/development_settings.xml



+0
−10






























Original line number
Diff line number
Diff line







@@ -254,16 +254,6 @@







            android:title="@string/bluetooth_disable_absolute_volume"









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



















        <SwitchPreference









            android:key="bluetooth_disable_inband_ringing"









            android:title="@string/bluetooth_disable_inband_ringing"









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



















        <SwitchPreference









            android:key="bluetooth_disable_avdtp_delay_reports"









            android:title="@string/bluetooth_disable_avdtp_delay_reports"









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



















        <ListPreference









            android:key="bluetooth_select_avrcp_version"









            android:title="@string/bluetooth_select_avrcp_version_string"
































res/xml/network_and_internet.xml



+2
−1






























Original line number
Diff line number
Diff line







@@ -97,6 +97,7 @@







        android:order="15"









        android:dialogTitle="@string/select_private_dns_configuration_dialog_title"









        android:dialogLayout="@layout/private_dns_mode_dialog"









        android:positiveButtonText="@string/save" />









        android:positiveButtonText="@string/save"









        android:negativeButtonText="@android:string/cancel" />



















</PreferenceScreen>
























res/xml/zen_mode_calls_settings.xml



+2
−2






























Original line number
Diff line number
Diff line







@@ -25,7 +25,7 @@







      <!-- Calls -->









      <ListPreference









          android:key="zen_mode_calls"









          android:title="@string/zen_mode_calls"









          android:title="@string/zen_mode_calls_title"









          android:entries="@array/zen_mode_contacts_entries"









          android:entryValues="@array/zen_mode_contacts_values"/>


















@@ -36,7 +36,7 @@







      <!-- Repeat callers -->









      <SwitchPreference









          android:key="zen_mode_repeat_callers"









          android:title="@string/zen_mode_repeat_callers" />









          android:title="@string/zen_mode_repeat_callers_title" />









   </PreferenceCategory>



















   <com.android.settingslib.widget.FooterPreference/>
































res/xml/zen_mode_msg_event_reminder_settings.xml



+3
−3






























Original line number
Diff line number
Diff line







@@ -25,7 +25,7 @@







      <!-- Messages -->









      <ListPreference









          android:key="zen_mode_messages"









          android:title="@string/zen_mode_messages"









          android:title="@string/zen_mode_messages_title"









          android:entries="@array/zen_mode_contacts_entries"









          android:entryValues="@array/zen_mode_contacts_values"/>


















@@ -36,12 +36,12 @@







      <!-- Reminders -->









      <SwitchPreference









          android:key="zen_mode_reminders"









          android:title="@string/zen_mode_reminders"/>









          android:title="@string/zen_mode_reminders_title"/>



















      <!-- Events -->









      <SwitchPreference









          android:key="zen_mode_events"









          android:title="@string/zen_mode_events"/>









          android:title="@string/zen_mode_events_title"/>









   </PreferenceCategory>



















   <com.android.settingslib.widget.FooterPreference />