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

Merge "Add a keywords for "Pair new deivce"" into rvc-dev am: d29dd6ca5e

Browse Source 
Change-Id: Ie48622ecc3976b8517d8e91ebb484b703e2dac9c
This commit is contained in:
TreeHugger Robot
2020-05-05 05:58:40 +00:00
committed by Automerger Merge Worker
parent 8cd75c8398 d29dd6ca5e
commit edec7354c6
2 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
res/values/strings.xml
View File

@@ -176,6 +176,8 @@
<string name="bluetooth_empty_list_user_restricted">You don\u2019t have permission to change Bluetooth settings.</string> <string name="bluetooth_empty_list_user_restricted">You don\u2019t have permission to change Bluetooth settings.</string>
<!-- Title for bluetooth pairing item [CHAR LIMIT=60] --> <!-- Title for bluetooth pairing item [CHAR LIMIT=60] -->
<string name="bluetooth_pairing_pref_title">Pair new device</string> <string name="bluetooth_pairing_pref_title">Pair new device</string>
<!-- Keywords for bluetooth pairing item [CHAR LIMIT=30] -->
<string name="keywords_add_bt_device">bluetooth</string>
<!-- Bluetooth Visibility message. This message informs the user that their device is now visible to other bluetooth devices. [CHAR LIMIT=NONE] --> <!-- Bluetooth Visibility message. This message informs the user that their device is now visible to other bluetooth devices. [CHAR LIMIT=NONE] -->
<string name="bluetooth_is_visible_message"><xliff:g id="device_name">%1$s</xliff:g> is visible to nearby devices while Bluetooth settings is open.</string> <string name="bluetooth_is_visible_message"><xliff:g id="device_name">%1$s</xliff:g> is visible to nearby devices while Bluetooth settings is open.</string>

1
res/xml/connected_devices.xml
View File

@@ -43,6 +43,7 @@
android:summary="@string/connected_device_add_device_summary" android:summary="@string/connected_device_add_device_summary"
android:fragment="com.android.settings.bluetooth.BluetoothPairingDetail" android:fragment="com.android.settings.bluetooth.BluetoothPairingDetail"
settings:allowDividerAbove="true" settings:allowDividerAbove="true"
settings:keywords="@string/keywords_add_bt_device"
settings:userRestriction="no_config_bluetooth" settings:userRestriction="no_config_bluetooth"
settings:useAdminDisabledSummary="true" settings:useAdminDisabledSummary="true"
settings:controller="com.android.settings.connecteddevice.AddDevicePreferenceController"/> settings:controller="com.android.settings.connecteddevice.AddDevicePreferenceController"/>