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

Commit b34562ef authored by Dongzhuo Zhang's avatar Dongzhuo Zhang Committed by Android (Google) Code Review
Browse files

Merge "Swtich to use DefaultAccount related API to get and set default account... 

Merge "Swtich to use DefaultAccount related API to get and set default account for handling contacts." into main
parents be181867 8e3e3ea9

res/values/strings.xml

+312 −308
Original line number Diff line number Diff line
@@ -13729,8 +13729,12 @@ 
    <string name="contacts_storage_device_only_preference_summary">New contacts won\'t be synced with an account</string>

    <!-- Text for explaining the selection in Contacts Storage Settings [CHAR LIMIT=NONE] -->

    <string name="contacts_storage_selection_message">Contacts will be saved to your device and synced to your account by default</string>

    <!-- Text for error toast when there's error setting the default account in Contacts Storage Settings [CHAR LIMIT=NONE] -->

    <string name="contacts_storage_set_default_account_error_message">Error setting the default account</string>

    <!-- Text for displaying when no account is set as default account [CHAR LIMIT=50] -->

    <string name="contacts_storage_no_account_set">No default set</string>

    <string name="contacts_storage_no_account_set_summary">No default set</string>

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

























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



+39
−19






























Original line number
Diff line number
Diff line



















/*









 * Copyright (C) 2024 The Android Open Source Project









 *








@@ -16,12 +15,13 @@







 */









package com.android.settings.applications.contacts;



















import static android.provider.ContactsContract.RawContacts.DefaultAccount;



















import android.accounts.Account;









import android.content.Context;









import android.os.UserHandle;









import android.provider.ContactsContract;



















import androidx.preference.PreferenceScreen;









import android.provider.ContactsContract.RawContacts.DefaultAccount.DefaultAccountAndState;









import android.util.Log;



















import com.android.settings.R;









import com.android.settings.core.BasePreferenceController;








@@ -36,33 +36,53 @@ public class ContactsStoragePreferenceController extends BasePreferenceControlle

















    private final AuthenticatorHelper mAuthenticatorHelper;



















    private DefaultAccountAndState mCurrentDefaultAccountAndState;



















    public ContactsStoragePreferenceController(Context context, String preferenceKey) {









        super(context, preferenceKey);









        mAuthenticatorHelper = new AuthenticatorHelper(mContext,









                new UserHandle(UserHandle.myUserId()), null);









        try {









            mCurrentDefaultAccountAndState =









                    DefaultAccount.getDefaultAccountForNewContacts(mContext.getContentResolver());









        } catch (IllegalStateException e) {









            Log.e(TAG, "The default account is in an invalid state: " + e);









        } catch (RuntimeException e) {









            Log.e(TAG, "Failed to look up the default account: " + e);









        }









    }



















    @Override









    public int getAvailabilityStatus() {









        return Flags.enableContactsDefaultAccountInSettings()









            ? AVAILABLE : CONDITIONALLY_UNAVAILABLE;









        return (Flags.enableContactsDefaultAccountInSettings()









                && mCurrentDefaultAccountAndState != null) ? AVAILABLE : CONDITIONALLY_UNAVAILABLE;









    }



















    @Override









    public CharSequence getSummary() {









        Account currentDefaultAccount =









                ContactsContract.Settings.getDefaultAccount(mContext.getContentResolver());









        if (currentDefaultAccount == null) {









        if (mCurrentDefaultAccountAndState != null) {









            int currentDefaultAccountState = mCurrentDefaultAccountAndState.getState();









            Account currentDefaultAccount = mCurrentDefaultAccountAndState.getAccount();









            if (currentDefaultAccountState









                    == DefaultAccountAndState.DEFAULT_ACCOUNT_STATE_NOT_SET) {









                return mContext.getResources().getString(









                    R.string.contacts_storage_no_account_set);









        }









                        R.string.contacts_storage_no_account_set_summary);









            } else if (currentDefaultAccountState









                    == DefaultAccountAndState.DEFAULT_ACCOUNT_STATE_LOCAL) {









                return mContext.getResources().getString(









                        R.string.contacts_storage_local_account_summary);









            } else if (currentDefaultAccount != null) {









                String accountTypeLabel = (String) mAuthenticatorHelper.getLabelForType(mContext,









                        currentDefaultAccount.type);









                // If there's no account type, or the account type is the same as the









                // current default account name, just return the account name.









        if (accountTypeLabel == null || accountTypeLabel.equals(currentDefaultAccount.name)) {









                if (accountTypeLabel == null || accountTypeLabel.equals(









                        currentDefaultAccount.name)) {









                    return currentDefaultAccount.name;









                }









                return accountTypeLabel + " | " + currentDefaultAccount.name;









            }









        }









        return "";









    }









}
























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



+77
−38






























Original line number
Diff line number
Diff line



















/*









 * Copyright (C) 2020 The Android Open Source Project









 *








@@ -17,25 +16,27 @@







package com.android.settings.applications.contacts;



















import static android.content.Intent.FLAG_ACTIVITY_NEW_TASK;









import static android.provider.ContactsContract.RawContacts.DefaultAccount;









import static android.provider.Settings.ACTION_ADD_ACCOUNT;









import static android.provider.Settings.EXTRA_ACCOUNT_TYPES;



















import android.accounts.Account;









import android.accounts.AccountManager;









import android.app.settings.SettingsEnums;









import android.content.Context;









import android.content.Intent;









import android.content.res.Resources;









import android.os.Bundle;









import android.os.UserHandle;









import android.provider.ContactsContract.Settings;



















import android.provider.ContactsContract.RawContacts.DefaultAccount.DefaultAccountAndState;









import android.widget.Toast;









import androidx.annotation.NonNull;









import androidx.annotation.Nullable;









import androidx.annotation.UiThread;









import androidx.preference.Preference;









import androidx.preference.Preference.OnPreferenceClickListener;









import androidx.preference.PreferenceScreen;



















import com.android.internal.annotations.VisibleForTesting;









import com.android.settings.R;









import com.android.settings.accounts.AddAccountSettings;









import com.android.settings.dashboard.DashboardFragment;








@@ -46,6 +47,7 @@ import com.android.settingslib.search.SearchIndexable;







import com.android.settingslib.widget.SelectorWithWidgetPreference;



















import java.util.HashMap;









import java.util.List;









import java.util.Map;



















/**








@@ -59,7 +61,7 @@ public class ContactsStorageSettings extends DashboardFragment







    private static final String TAG = "ContactsStorageSettings";









    private static final String PREF_KEY_ADD_ACCOUNT = "add_account";









    private static final String PREF_KEY_DEVICE_ONLY = "device_only_account_preference";









    private final Map<String, Account> mAccountMap = new HashMap<>();









    private final Map<String, DefaultAccountAndState> mAccountMap = new HashMap<>();









    private AuthenticatorHelper mAuthenticatorHelper;



















    @Override








@@ -73,13 +75,18 @@ public class ContactsStorageSettings extends DashboardFragment







    @Override









    public void onRadioButtonClicked(@NonNull SelectorWithWidgetPreference selectedPref) {









        final String selectedPreferenceKey = selectedPref.getKey();









        // Check if current provider is different from the selected provider.









        // Check if current account is different from the selected account.









        for (String preferenceKey : mAccountMap.keySet()) {









            if (selectedPreferenceKey.equals(preferenceKey)) {









                try {









                    DefaultAccount.setDefaultAccountForNewContacts(getContentResolver(),









                            mAccountMap.get(preferenceKey));









                    selectedPref.setChecked(true);









                //TODO: Call DefaultAccount.setDefaultAccountForNewContacts once









                // the implementation is ready.









                Settings.setDefaultAccount(getContentResolver(), mAccountMap.get(preferenceKey));









                } catch (RuntimeException e) {









                    Toast.makeText(getContext(),









                            R.string.contacts_storage_set_default_account_error_message,









                            Toast.LENGTH_SHORT).show();









                }









            } else {









                SelectorWithWidgetPreference unSelectedPreference =









                        getPreferenceScreen().findPreference(preferenceKey);








@@ -92,10 +99,7 @@ public class ContactsStorageSettings extends DashboardFragment

















    public boolean onPreferenceClick(@NonNull Preference preference) {









        if (PREF_KEY_ADD_ACCOUNT.equals(preference.getKey())) {









            Resources resources = Resources.getSystem();









            String[] accountTypesArray =









                    resources.getStringArray(









                            com.android.internal.R.array.config_rawContactsEligibleDefaultAccountTypes);









            String[] accountTypesArray = getEligibleAccountTypes();









            Intent intent = new Intent(ACTION_ADD_ACCOUNT);









            intent.setClass(getContext(), AddAccountSettings.class);









            intent.putExtra(EXTRA_ACCOUNT_TYPES, accountTypesArray);








@@ -119,48 +123,60 @@ public class ContactsStorageSettings extends DashboardFragment







        // when creating eligible account preferences.









        mAccountMap.clear();









        final PreferenceScreen screen = getPreferenceScreen();









        AccountManager accountManager = AccountManager.get(getPrefContext());









        //TODO: Call DefaultAccount.getDefaultAccountForNewContacts once









        // implementation is ready.









        Account[] accounts = accountManager.getAccounts();



















        for (int i = 0; i < accounts.length; i++) {









            screen.addPreference(buildAccountPreference(accounts[i], i));









        List<Account> accounts = DefaultAccount.getEligibleCloudAccounts(getContentResolver());









        for (int i = 0; i < accounts.size(); i++) {









            screen.addPreference(buildAccountPreference(accounts.get(i), /*order=*/i));









        }









        screen.addPreference(buildAddAccountPreference(accounts.length == 0));









        setupDeviceOnlyPreference();



















        //TODO: Call DefaultAccount.ListEligibleCloudAccounts once the









        // implementation is ready. And differentiate device only account vs account not set case.









        Account currentDefaultAccount = Settings.getDefaultAccount(getContentResolver());









        String preferenceKey = currentDefaultAccount != null ?









                String.valueOf(currentDefaultAccount.hashCode()) : PREF_KEY_DEVICE_ONLY;









        SelectorWithWidgetPreference preference = getPreferenceScreen().findPreference(









                preferenceKey);









        if (preference != null) {









            preference.setChecked(true);









        // If there's no eligible account types, the "Add Account" preference should









        // not be shown to the users.









        if (getEligibleAccountTypes().length > 0) {









            screen.addPreference(buildAddAccountPreference(accounts.isEmpty()));









        }









        setupDeviceOnlyPreference();









        setDefaultAccountPreference();









    }



















    private void setupDeviceOnlyPreference() {









        SelectorWithWidgetPreference preference = findPreference(PREF_KEY_DEVICE_ONLY);









        if (preference != null) {









            preference.setOnClickListener(this);









            mAccountMap.put(PREF_KEY_DEVICE_ONLY, null);









            mAccountMap.put(PREF_KEY_DEVICE_ONLY, DefaultAccountAndState.ofLocal());









        }









    }



















    private void setDefaultAccountPreference() {









        DefaultAccountAndState currentDefaultAccountAndState =









                DefaultAccount.getDefaultAccountForNewContacts(getContentResolver());









        String preferenceKey = getAccountHashCode(currentDefaultAccountAndState);









        Account currentDefaultAccount = currentDefaultAccountAndState.getAccount();



















        // Set the current default account preference to be checked if found among existing









        // preferences. If not, then create a new preference for default account.









        SelectorWithWidgetPreference preference = null;









        if (mAccountMap.containsKey(preferenceKey)) {









            preference = getPreferenceScreen().findPreference(preferenceKey);









        } else if (preferenceKey != null && currentDefaultAccount != null) {









            preference = buildAccountPreference(currentDefaultAccount, mAccountMap.size());









            getPreferenceScreen().addPreference(preference);









        }









        if (preference != null) {









            preference.setChecked(true);









        }









    }



















    //TODO: Add preference category on account preferences.









    private Preference buildAccountPreference(Account account, int order) {









    private SelectorWithWidgetPreference buildAccountPreference(Account account, int order) {









        SelectorWithWidgetPreference preference = new SelectorWithWidgetPreference(









                getPrefContext());









        DefaultAccountAndState accountAndState = DefaultAccountAndState.ofCloud(account);









        String preferenceKey = getAccountHashCode(accountAndState);









        preference.setTitle(mAuthenticatorHelper.getLabelForType(getPrefContext(), account.type));









        preference.setIcon(mAuthenticatorHelper.getDrawableForType(getPrefContext(), account.type));









        preference.setSummary(account.name);









        preference.setKey(String.valueOf(account.hashCode()));









        preference.setKey(preferenceKey);









        preference.setOnClickListener(this);









        preference.setOrder(order);









        mAccountMap.put(String.valueOf(account.hashCode()), account);









        mAccountMap.put(preferenceKey, accountAndState);









        return preference;









    }


















@@ -178,6 +194,29 @@ public class ContactsStorageSettings extends DashboardFragment







        return preference;









    }



















    private @Nullable String getAccountHashCode(DefaultAccountAndState currentDefaultAccountAndState) {









        Account currentDefaultAccount = currentDefaultAccountAndState.getAccount();









        if (currentDefaultAccount != null && (currentDefaultAccountAndState.getState()









                == DefaultAccountAndState.DEFAULT_ACCOUNT_STATE_CLOUD









                || currentDefaultAccountAndState.getState()









                == DefaultAccountAndState.DEFAULT_ACCOUNT_STATE_SIM)) {









            return String.valueOf(currentDefaultAccount.hashCode());









        } else if (currentDefaultAccountAndState.getState()









                == DefaultAccountAndState.DEFAULT_ACCOUNT_STATE_LOCAL) {









            return PREF_KEY_DEVICE_ONLY;









        } else {









            // If the account is not set or in error state, it should just return null and won't









            // set the checked status in radio button.









            return null;









        }









    }



















    @VisibleForTesting









    String[] getEligibleAccountTypes() {









        return Resources.getSystem().getStringArray(









                com.android.internal.R.array.config_rawContactsEligibleDefaultAccountTypes);









    }



















    @Override









    protected int getPreferenceScreenResId() {









        return R.xml.contacts_storage_settings;
































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



+96
−30






























Original line number
Diff line number
Diff line







@@ -16,8 +16,9 @@

















package com.android.settings.applications.contacts;



















import static android.provider.ContactsContract.Settings.KEY_DEFAULT_ACCOUNT;









import static android.provider.ContactsContract.Settings.QUERY_DEFAULT_ACCOUNT_METHOD;









import static android.provider.ContactsContract.RawContacts.DefaultAccount.KEY_DEFAULT_ACCOUNT_STATE;









import static android.provider.ContactsContract.RawContacts.DefaultAccount.QUERY_DEFAULT_ACCOUNT_FOR_NEW_CONTACTS_METHOD;









import static android.provider.ContactsContract.Settings;



















import static com.android.settings.core.BasePreferenceController.AVAILABLE;









import static com.android.settings.core.BasePreferenceController.CONDITIONALLY_UNAVAILABLE;








@@ -28,25 +29,26 @@ import static org.mockito.ArgumentMatchers.anyInt;







import static org.mockito.ArgumentMatchers.eq;









import static org.mockito.Mockito.when;





























import android.accounts.Account;









import android.accounts.AccountManager;









import android.content.ContentProviderClient;









import android.content.ContentResolver;









import android.content.Context;









import android.content.res.Resources;









import android.os.Bundle;









import android.platform.test.annotations.EnableFlags;









import android.platform.test.annotations.RequiresFlagsDisabled;









import android.platform.test.flag.junit.CheckFlagsRule;









import android.platform.test.flag.junit.DeviceFlagsValueProvider;









import android.platform.test.flag.junit.SetFlagsRule;









import android.provider.ContactsContract;









import android.provider.ContactsContract.RawContacts.DefaultAccount.DefaultAccountAndState;



















import com.android.settings.R;









import com.android.settings.flags.Flags;









import com.android.settings.testutils.shadow.ShadowAuthenticationHelper;



















import org.junit.Before;









import android.platform.test.annotations.RequiresFlagsDisabled;









import android.platform.test.flag.junit.CheckFlagsRule;









import android.platform.test.flag.junit.DeviceFlagsValueProvider;









import org.junit.Rule;









import org.junit.Test;









import org.junit.runner.RunWith;








@@ -62,11 +64,6 @@ public class ContactsStoragePreferenceControllerTest {

















    private static final String CONTACTS_DEFAULT_ACCOUNT_PREFERENCE_KEY =









            "contacts_default_account";









    private static final Account TEST_ACCOUNT1 = new Account("test@gmail.com", "type1");



















    private static final Account TEST_ACCOUNT2 = new Account("test@samsung.com", "type2");



















    private static final Account TEST_ACCOUNT3 = new Account("LABEL3", "type3");



















    @Rule









    public final MockitoRule mockito = MockitoJUnit.rule();








@@ -83,6 +80,9 @@ public class ContactsStoragePreferenceControllerTest {







    @Mock









    private ContentResolver mContentResolver;



















    @Mock









    private ContentProviderClient mContentProviderClient;



















    @Mock









    private Resources mResources;


















@@ -94,9 +94,15 @@ public class ContactsStoragePreferenceControllerTest {







    @Before









    public void setUp() throws Exception {









        when(mContext.getContentResolver()).thenReturn(mContentResolver);









        when(mContentResolver.acquireContentProviderClient(









                eq(ContactsContract.AUTHORITY_URI))).thenReturn(mContentProviderClient);









        when(mContext.getSystemService(eq(Context.ACCOUNT_SERVICE))).thenReturn(mAccountManager);









        when(mAccountManager.getAccountsAsUser(anyInt())).thenReturn(new Account[]{});



















        Bundle bundle = new Bundle();









        bundle.putInt(KEY_DEFAULT_ACCOUNT_STATE,









                DefaultAccountAndState.DEFAULT_ACCOUNT_STATE_NOT_SET);









        when(mContentProviderClient.call(eq(QUERY_DEFAULT_ACCOUNT_FOR_NEW_CONTACTS_METHOD), any(),









                any())).thenReturn(bundle);









        mPreferenceController = new ContactsStoragePreferenceController(mContext,









                CONTACTS_DEFAULT_ACCOUNT_PREFERENCE_KEY);









    }








@@ -104,13 +110,39 @@ public class ContactsStoragePreferenceControllerTest {







    @Test









    @EnableFlags(Flags.FLAG_ENABLE_CONTACTS_DEFAULT_ACCOUNT_IN_SETTINGS)









    public void getAvailabilityStatus_flagIsOn_shouldReturnAvailable() {



















        assertThat(mPreferenceController.getAvailabilityStatus()).isEqualTo(AVAILABLE);









    }



















    @Test









    @RequiresFlagsDisabled(Flags.FLAG_ENABLE_CONTACTS_DEFAULT_ACCOUNT_IN_SETTINGS)









    public void getAvailabilityStatus_flagIsOff_shouldReturnConditionallyUnavailable() {









        assertThat(mPreferenceController.getAvailabilityStatus()).isEqualTo(









                CONDITIONALLY_UNAVAILABLE);









    }



















    @Test









    @EnableFlags(Flags.FLAG_ENABLE_CONTACTS_DEFAULT_ACCOUNT_IN_SETTINGS)









    public void getAvailabilityStatus_illegalStateExceptionThrown_shouldReturnConditionallyUnavailable()









            throws Exception {









        when(mContentProviderClient.call(eq(QUERY_DEFAULT_ACCOUNT_FOR_NEW_CONTACTS_METHOD), any(),









                any())).thenThrow(new IllegalStateException());



















        mPreferenceController = new ContactsStoragePreferenceController(mContext,









                CONTACTS_DEFAULT_ACCOUNT_PREFERENCE_KEY);



















        assertThat(mPreferenceController.getAvailabilityStatus()).isEqualTo(









                CONDITIONALLY_UNAVAILABLE);









    }



















    @Test









    @EnableFlags(Flags.FLAG_ENABLE_CONTACTS_DEFAULT_ACCOUNT_IN_SETTINGS)









    public void getAvailabilityStatus_runtimeExceptionThrown_shouldReturnConditionallyUnavailable()









            throws Exception {









        when(mContentProviderClient.call(eq(QUERY_DEFAULT_ACCOUNT_FOR_NEW_CONTACTS_METHOD), any(),









                any())).thenThrow(new RuntimeException());



















        mPreferenceController = new ContactsStoragePreferenceController(mContext,









                CONTACTS_DEFAULT_ACCOUNT_PREFERENCE_KEY);



















        assertThat(mPreferenceController.getAvailabilityStatus()).isEqualTo(









                CONDITIONALLY_UNAVAILABLE);








@@ -118,43 +150,77 @@ public class ContactsStoragePreferenceControllerTest {

















    @Test









    public void getSummary_noAccountIsSetAsDefault_shouldReturnNoAccountSetSummary() {









        Bundle bundle = new Bundle();









        bundle.putParcelable(KEY_DEFAULT_ACCOUNT, null);









        when(mContentResolver.call(eq(ContactsContract.AUTHORITY_URI),









                eq(QUERY_DEFAULT_ACCOUNT_METHOD), any(), any())).thenReturn(bundle);









        when(mContext.getResources()).thenReturn(mResources);









        when(mResources.getString(eq(R.string.contacts_storage_no_account_set))).thenReturn(









        when(mResources.getString(eq(R.string.contacts_storage_no_account_set_summary))).thenReturn(









                "No default set");



















        // Fetch the default account from CP2.









        mPreferenceController = new ContactsStoragePreferenceController(mContext,









                CONTACTS_DEFAULT_ACCOUNT_PREFERENCE_KEY);



















        assertThat(mPreferenceController.getSummary()).isEqualTo("No default set");









    }



















    @Test









    public void getSummary_googleAccountIsSetAsDefault_shouldReturnGoogleAccountTypeAndAccountName() {









    public void getSummary_localAccountIsSetAsDefault_shouldReturnLocalAccountSetSummary()









            throws Exception {









        Bundle bundle = new Bundle();









        bundle.putParcelable(KEY_DEFAULT_ACCOUNT, TEST_ACCOUNT1);









        when(mContentResolver.call(eq(ContactsContract.AUTHORITY_URI),









                eq(QUERY_DEFAULT_ACCOUNT_METHOD), any(), any())).thenReturn(bundle);









        bundle.putInt(KEY_DEFAULT_ACCOUNT_STATE,









                DefaultAccountAndState.DEFAULT_ACCOUNT_STATE_LOCAL);









        when(mContentProviderClient.call(eq(QUERY_DEFAULT_ACCOUNT_FOR_NEW_CONTACTS_METHOD), any(),









                any())).thenReturn(bundle);









        when(mContext.getResources()).thenReturn(mResources);









        when(mResources.getString(eq(R.string.contacts_storage_local_account_summary))).thenReturn(









                "Device only");









        mPreferenceController = new ContactsStoragePreferenceController(mContext,









                CONTACTS_DEFAULT_ACCOUNT_PREFERENCE_KEY);



















        assertThat(mPreferenceController.getSummary()).isEqualTo("Device only");









    }



















    @Test









    public void getSummary_googleAccountIsSetAsDefault_shouldReturnGoogleAccountTypeAndAccountName()









            throws Exception {









        Bundle bundle = new Bundle();









        bundle.putInt(KEY_DEFAULT_ACCOUNT_STATE,









                DefaultAccountAndState.DEFAULT_ACCOUNT_STATE_CLOUD);









        bundle.putString(Settings.ACCOUNT_TYPE, "type1");









        bundle.putString(Settings.ACCOUNT_NAME, "test@gmail.com");









        when(mContentProviderClient.call(eq(QUERY_DEFAULT_ACCOUNT_FOR_NEW_CONTACTS_METHOD), any(),









                any())).thenReturn(bundle);









        mPreferenceController = new ContactsStoragePreferenceController(mContext,









                CONTACTS_DEFAULT_ACCOUNT_PREFERENCE_KEY);



















        assertThat(mPreferenceController.getSummary()).isEqualTo("LABEL1 | test@gmail.com");









    }



















    @Test









    public void getSummary_samsungAccountIsSetAsDefault_shouldReturnSamsungAccountTypeAndAccountName() {









    public void getSummary_samsungAccountIsSetAsDefault_shouldReturnSamsungAccountTypeAndAccountName()









            throws Exception {









        Bundle bundle = new Bundle();









        bundle.putParcelable(KEY_DEFAULT_ACCOUNT, TEST_ACCOUNT2);









        when(mContentResolver.call(eq(ContactsContract.AUTHORITY_URI),









                eq(QUERY_DEFAULT_ACCOUNT_METHOD), any(), any())).thenReturn(bundle);









        bundle.putInt(KEY_DEFAULT_ACCOUNT_STATE,









                DefaultAccountAndState.DEFAULT_ACCOUNT_STATE_CLOUD);









        bundle.putString(Settings.ACCOUNT_TYPE, "type2");









        bundle.putString(Settings.ACCOUNT_NAME, "test@samsung.com");









        when(mContentProviderClient.call(eq(QUERY_DEFAULT_ACCOUNT_FOR_NEW_CONTACTS_METHOD), any(),









                any())).thenReturn(bundle);









        mPreferenceController = new ContactsStoragePreferenceController(mContext,









                CONTACTS_DEFAULT_ACCOUNT_PREFERENCE_KEY);



















        assertThat(mPreferenceController.getSummary()).isEqualTo("LABEL2 | test@samsung.com");









    }



















    @Test









    public void getSummary_accountLabelSameAsAccountName_onlyReturnAccountName() {









    public void getSummary_accountLabelSameAsAccountName_onlyReturnAccountName() throws Exception {









        Bundle bundle = new Bundle();









        bundle.putParcelable(KEY_DEFAULT_ACCOUNT, TEST_ACCOUNT3);









        when(mContentResolver.call(eq(ContactsContract.AUTHORITY_URI),









                eq(QUERY_DEFAULT_ACCOUNT_METHOD), any(), any())).thenReturn(bundle);









        bundle.putInt(KEY_DEFAULT_ACCOUNT_STATE,









                DefaultAccountAndState.DEFAULT_ACCOUNT_STATE_CLOUD);









        bundle.putString(Settings.ACCOUNT_TYPE, "type3");









        bundle.putString(Settings.ACCOUNT_NAME, "LABEL3");









        when(mContentProviderClient.call(eq(QUERY_DEFAULT_ACCOUNT_FOR_NEW_CONTACTS_METHOD), any(),









                any())).thenReturn(bundle);









        mPreferenceController = new ContactsStoragePreferenceController(mContext,









                CONTACTS_DEFAULT_ACCOUNT_PREFERENCE_KEY);



















        // Since package name and account name is the same, we only return account name.









        assertThat(mPreferenceController.getSummary()).isEqualTo("LABEL3");
































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



+133
−29




























File changed.
Preview size limit exceeded, changes collapsed.