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

Merge "Update string from "Add device" to "Pair new device" in Setting > Connected devices" into pi-dev

Browse Source 
am: fe522dc2db

Change-Id: I380123375af5eed570915472d4ae34402d6af006
This commit is contained in:
Fan Zhang
2018-05-11 11:38:31 -07:00
committed by android-build-merger
parent 45d58cab2c fe522dc2db
commit 75cbd6d88d
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
res/values/strings.xml
View File

@@ -415,8 +415,8 @@
<string name="connected_device_connected_title">Currently connected</string> <string name="connected_device_connected_title">Currently connected</string>
<!-- Title for connected device group [CHAR LIMIT=none]--> <!-- Title for connected device group [CHAR LIMIT=none]-->
<string name="connected_device_saved_title">Saved devices</string> <string name="connected_device_saved_title">Saved devices</string>
<!-- Title for preference to add a device [CHAR LIMIT=none]--> <!-- Title for preference to add a device [CHAR LIMIT=none] [BACKUP_MESSAGE_ID=7803521577708810621] -->
<string name="connected_device_add_device_title">Pair new device</string> <string name="connected_device_add_device_title">Add device</string>
<!-- Summary for preference to add a device [CHAR LIMIT=none]--> <!-- Summary for preference to add a device [CHAR LIMIT=none]-->
<string name="connected_device_add_device_summary">Bluetooth will turn on to pair</string> <string name="connected_device_add_device_summary">Bluetooth will turn on to pair</string>
<!-- Title for other connection preferences [CHAR LIMIT=none]--> <!-- Title for other connection preferences [CHAR LIMIT=none]-->

2
res/xml/connected_devices.xml
View File

@@ -32,7 +32,7 @@
<com.android.settingslib.RestrictedPreference <com.android.settingslib.RestrictedPreference
android:key="add_bt_devices" android:key="add_bt_devices"
android:title="@string/connected_device_add_device_title" android:title="@string/bluetooth_pairing_pref_title"
android:icon="@drawable/ic_menu_add" android:icon="@drawable/ic_menu_add"
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"