diff --git a/res/values/strings.xml b/res/values/strings.xml index 9930c3685c0..3602f1e52e0 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -14046,7 +14046,7 @@ Device only - Device and %1$s + Device & %1$s Add an account to get started diff --git a/tests/robotests/src/com/android/settings/applications/contacts/ContactsStorageSettingsTest.java b/tests/robotests/src/com/android/settings/applications/contacts/ContactsStorageSettingsTest.java index 735508ab9f8..d99dd30d419 100644 --- a/tests/robotests/src/com/android/settings/applications/contacts/ContactsStorageSettingsTest.java +++ b/tests/robotests/src/com/android/settings/applications/contacts/ContactsStorageSettingsTest.java @@ -40,7 +40,6 @@ import android.content.Intent; import android.content.res.Resources; import android.graphics.drawable.Drawable; import android.os.Bundle; -import android.os.UserHandle; import android.provider.ContactsContract; import android.provider.ContactsContract.RawContacts.DefaultAccount.DefaultAccountAndState; import android.provider.SearchIndexableResource; @@ -250,13 +249,13 @@ public class ContactsStorageSettingsTest { SelectorWithWidgetPreference account1Preference = accountCategory.findPreference( String.valueOf(TEST_ACCOUNT1.hashCode())); - assertThat(account1Preference.getTitle()).isEqualTo("Device and Google"); + assertThat(account1Preference.getTitle()).isEqualTo("Device & Google"); assertThat(account1Preference.getSummary()).isEqualTo("test@gmail.com"); assertThat(account1Preference.getIcon()).isNotNull(); SelectorWithWidgetPreference account2Preference = accountCategory.findPreference( String.valueOf(TEST_ACCOUNT2.hashCode())); - assertThat(account2Preference.getTitle()).isEqualTo("Device and Samsung"); + assertThat(account2Preference.getTitle()).isEqualTo("Device & Samsung"); assertThat(account2Preference.getSummary()).isEqualTo("test@samsung.com"); assertThat(account2Preference.getIcon()).isNotNull(); @@ -304,19 +303,19 @@ public class ContactsStorageSettingsTest { SelectorWithWidgetPreference account1Preference = accountCategory.findPreference( String.valueOf(TEST_ACCOUNT1.hashCode())); - assertThat(account1Preference.getTitle()).isEqualTo("Device and Google"); + assertThat(account1Preference.getTitle()).isEqualTo("Device & Google"); assertThat(account1Preference.getSummary()).isEqualTo("test@gmail.com"); assertThat(account1Preference.getIcon()).isNotNull(); SelectorWithWidgetPreference account2Preference = accountCategory.findPreference( String.valueOf(TEST_ACCOUNT2.hashCode())); - assertThat(account2Preference.getTitle()).isEqualTo("Device and Samsung"); + assertThat(account2Preference.getTitle()).isEqualTo("Device & Samsung"); assertThat(account2Preference.getSummary()).isEqualTo("test@samsung.com"); assertThat(account2Preference.getIcon()).isNotNull(); SelectorWithWidgetPreference account3Preference = accountCategory.findPreference( String.valueOf(TEST_ACCOUNT3.hashCode())); - assertThat(account3Preference.getTitle()).isEqualTo("Device and Outlook"); + assertThat(account3Preference.getTitle()).isEqualTo("Device & Outlook"); assertThat(account3Preference.getSummary()).isEqualTo("test@outlook.com"); assertThat(account3Preference.getIcon()).isNotNull(); @@ -374,13 +373,13 @@ public class ContactsStorageSettingsTest { // onAccountsUpdate should refresh the icon and layouts. SelectorWithWidgetPreference account1Preference = accountCategory.findPreference( String.valueOf(TEST_ACCOUNT1.hashCode())); - assertThat(account1Preference.getTitle()).isEqualTo("Device and Google"); + assertThat(account1Preference.getTitle()).isEqualTo("Device & Google"); assertThat(account1Preference.getSummary()).isEqualTo("test@gmail.com"); assertThat(account1Preference.getIcon()).isNotNull(); SelectorWithWidgetPreference account2Preference = accountCategory.findPreference( String.valueOf(TEST_ACCOUNT2.hashCode())); - assertThat(account2Preference.getTitle()).isEqualTo("Device and Samsung"); + assertThat(account2Preference.getTitle()).isEqualTo("Device & Samsung"); assertThat(account2Preference.getSummary()).isEqualTo("test@samsung.com"); assertThat(account2Preference.getIcon()).isNotNull(); }