Merge "Misc tweaks in settings" into oc-mr1-dev

2017-08-04 20:16:36 +00:00
parent e923d649c0 8722509eb9
commit 2c9e62ab0e
6 changed files with 25 additions and 46 deletions
--- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceNamePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceNamePreferenceControllerTest.java
@@ -74,7 +74,7 @@ public class BluetoothDeviceNamePreferenceControllerTest {
        final CharSequence summary = mPreference.getSummary();

        assertThat(summary.toString())
-                .isEqualTo("Visible as \"Nightshade\" to other devices");
+                .isEqualTo("Visible as \u201CNightshade\u201D to other devices");
        assertThat(mPreference.isSelectable()).isFalse();
    }