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

Commit c239561d authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

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

parents a47a3f58 358d30f0

res/values/strings.xml

+1 −1
Original line number Original line Diff line number Diff line
@@ -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>

    <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] -->







    <!-- 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] -->







    <!-- Title for paired device group [CHAR LIMIT=none] -->











    <string name="bluetooth_paired_device_title">Your devices</string>







    <string name="bluetooth_paired_device_title">Your devices</string>

































tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceNamePreferenceControllerTest.java



+2
−1




























Original line number
Original line
Diff line number
Diff line








@@ -72,8 +72,9 @@ public class BluetoothDeviceNamePreferenceControllerTest {









        mController.updateDeviceName(mPreference, DEVICE_NAME);







        mController.updateDeviceName(mPreference, DEVICE_NAME);































        final CharSequence summary = mPreference.getSummary();







        final CharSequence summary = mPreference.getSummary();


























        assertThat(summary.toString())







        assertThat(summary.toString())











                .isEqualTo("Visible as 'Nightshade' to other devices");







                .isEqualTo("Visible as \"Nightshade\" to other devices");











        assertThat(mPreference.isSelectable()).isFalse();







        assertThat(mPreference.isSelectable()).isFalse();











    }







    }