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

Commit 98520337 authored by Liefu Liu's avatar Liefu Liu Committed by Android (Google) Code Review
Browse files

Merge "Update the sub title of SIM preference in Contacts Storage Setting, to... 

Merge "Update the sub title of SIM preference in Contacts Storage Setting, to be consistent with "Device-only" preference." into main
parents 3a7e3cb6 069f926b

src/com/android/settings/applications/contacts/ContactsStorageSettings.java

+1 −1
Original line number Diff line number Diff line
@@ -232,7 +232,7 @@ public class ContactsStorageSettings extends DashboardFragment 
                    getPrefContext());

            preference.setTitle(R.string.sim_card_label);

            preference.setIcon(R.drawable.ic_sim_card);

            preference.setSummary(R.string.sim_card_label);

            preference.setSummary(R.string.contacts_storage_device_only_preference_summary);

            preference.setKey(preferenceKey);

            preference.setOnClickListener(this);

            mAccountMap.put(preferenceKey, currentDefaultAccountAndState);

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

+2 −1
Original line number Diff line number Diff line
@@ -345,7 +345,8 @@ public class ContactsStorageSettingsTest { 
        SelectorWithWidgetPreference simPreference = accountCategory.findPreference(

                String.valueOf(SIM_ACCOUNT.hashCode()));

        assertThat(simPreference.getTitle()).isEqualTo("SIM");

        assertThat(simPreference.getSummary()).isEqualTo("SIM");

        assertThat(simPreference.getSummary()).isEqualTo(

                "Contacts may not sync or be available on your other devices");

        assertThat(simPreference.getIcon()).isNotNull();

        assertThat(simPreference.isChecked()).isTrue();

    }