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

Commit 27f16da5 authored by Liefu Liu's avatar Liefu Liu
Browse files

Minor UI string change in Contacts Storage Setting. 

Bug: 394114508
Test: atest ContactsStorageSettingTest
Flag: EXEMPTED

	modified:   res/values/strings.xml
	modified:   tests/robotests/src/com/android/settings/applications/contacts/ContactsStorageSettingsTest.java

Change-Id: I2246f6a71116acd7d3ae256133ed1fea77c8ebab
parent 878f860f

res/values/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -14046,7 +14046,7 @@ 
    <!-- Text for displaying when default account is set as local only [CHAR LIMIT=50] -->

    <string name="contacts_storage_local_account_summary">Device only</string>

    <!-- Text for displaying eligible account preference title [CHAR LIMIT=50] -->

    <string name="contacts_storage_account_title">Device and %1$s</string>

    <string name="contacts_storage_account_title">Device &amp; %1$s</string>

    <!-- Text for add account selection message when no account has been added [CHAR LIMIT=100] -->

    <string name="contacts_storage_first_time_add_account_message">Add an account to get started</string>

    <!-- Text for account preference category title for contacts storage settings page [CHAR LIMIT=100] -->

tests/robotests/src/com/android/settings/applications/contacts/ContactsStorageSettingsTest.java

+7 −8
Original line number Diff line number Diff line
@@ -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();

    }