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

Merge "Update string for bluetooth device visibility" into oc-mr1-dev

Browse Source 
am: c239561da5

Change-Id: Ic124bbed9f9bf3185787444264d063185f9754f6
This commit is contained in:
Fan Zhang
2017-07-24 21:38:18 +00:00
committed by android-build-merger
parent 4a36ff9338 c239561da5
commit 3c8b12e2dd
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
res/values/strings.xml
View File

@@ -387,7 +387,7 @@
<string name="bluetooth_sap_acceptance_dialog_text"><xliff:g id="device_name">%1$s</xliff:g> wants to access your SIM card. Granting access to the SIM card will disable data connectivity on your device for the duration of the connection. Give access to <xliff:g id="device_name">%2$s?</xliff:g></string>
<!-- Description for bluetooth device name summary [CHAR LIMIT=none] -->
<string name="bluetooth_device_name_summary">Visible as \'<xliff:g id="device_name">^1</xliff:g>\' to other devices</string>
<string name="bluetooth_device_name_summary">Visible as \"<xliff:g id="device_name">^1</xliff:g>\" to other devices</string>
<!-- Title for paired device group [CHAR LIMIT=none] -->
<string name="bluetooth_paired_device_title">Your devices</string>

3
tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceNamePreferenceControllerTest.java
View File

@@ -72,8 +72,9 @@ public class BluetoothDeviceNamePreferenceControllerTest {
mController.updateDeviceName(mPreference, DEVICE_NAME);
final CharSequence summary = mPreference.getSummary();
assertThat(summary.toString())
.isEqualTo("Visible as 'Nightshade' to other devices");
.isEqualTo("Visible as \"Nightshade\" to other devices");
assertThat(mPreference.isSelectable()).isFalse();
}