OSDN Git Service

Merge "Update string from "Add device" to "Pair new device" in Setting > Connected...
authorFan Zhang <zhfan@google.com>
Fri, 11 May 2018 18:02:22 +0000 (18:02 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 11 May 2018 18:02:22 +0000 (18:02 +0000)
res/values/strings.xml
res/xml/connected_devices.xml

index 99267dc..22cb3c8 100644 (file)
     <string name="connected_device_connected_title">Currently connected</string>
     <!-- Title for connected device group [CHAR LIMIT=none]-->
     <string name="connected_device_saved_title">Saved devices</string>
-    <!-- Title for preference to add a device [CHAR LIMIT=none]-->
-    <string name="connected_device_add_device_title">Pair new device</string>
+    <!-- Title for preference to add a device [CHAR LIMIT=none] [BACKUP_MESSAGE_ID=7803521577708810621] -->
+    <string name="connected_device_add_device_title">Add device</string>
     <!-- Summary for preference to add a device [CHAR LIMIT=none]-->
     <string name="connected_device_add_device_summary">Bluetooth will turn on to pair</string>
     <!-- Title for other connection preferences [CHAR LIMIT=none]-->
index 1e9d97e..6d25c58 100644 (file)
@@ -32,7 +32,7 @@
 
     <com.android.settingslib.RestrictedPreference
         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:summary="@string/connected_device_add_device_summary"
         android:fragment="com.android.settings.bluetooth.BluetoothPairingDetail"