diff options
author | Matt Garnes <matt@cyngn.com> | 2015-06-15 15:15:14 -0700 |
---|---|---|
committer | Matt Garnes <matt@cyngn.com> | 2015-06-17 18:20:52 -0700 |
commit | fb208f513b81d091eba5a6d3c2959269a704eeb5 (patch) | |
tree | 526589f130451f9ba3e3ec0a7dd3ba7b4fce7365 | |
parent | 4a20fc44b39fdedf61f380aff3132453393f53a1 (diff) | |
download | android_packages_apps_ContactsCommon-fb208f513b81d091eba5a6d3c2959269a704eeb5.tar.gz android_packages_apps_ContactsCommon-fb208f513b81d091eba5a6d3c2959269a704eeb5.tar.bz2 android_packages_apps_ContactsCommon-fb208f513b81d091eba5a6d3c2959269a704eeb5.zip |
Add local phone account as a writable AccountTypes.
Previously, the local account can be used to create contacts but not groups. Fix this by ensuring
that the local account is added as a contact writable account as well as a group writable account.
Change-Id: Ia4e0a8abca42d12a708a9e56a181fd3677e56aba
-rw-r--r-- | src/com/android/contacts/common/model/AccountTypeManager.java | 6 | ||||
-rwxr-xr-x | src/com/android/contacts/common/util/AccountsListAdapter.java | 4 |
2 files changed, 6 insertions, 4 deletions
diff --git a/src/com/android/contacts/common/model/AccountTypeManager.java b/src/com/android/contacts/common/model/AccountTypeManager.java index 86d6a06e..d12e47f9 100644 --- a/src/com/android/contacts/common/model/AccountTypeManager.java +++ b/src/com/android/contacts/common/model/AccountTypeManager.java @@ -465,6 +465,12 @@ class AccountTypeManagerImpl extends AccountTypeManager AccountType localAccountType = new PhoneAccountType(mContext, mContext.getPackageName()); addAccountType(localAccountType, accountTypesByTypeAndDataSet, accountTypesByType); + AccountWithDataSet localAccountWithDataSet = new AccountWithDataSet( + PhoneAccountType.ACCOUNT_NAME, PhoneAccountType.ACCOUNT_TYPE, null); + allAccounts.add(localAccountWithDataSet); + contactWritableAccounts.add(localAccountWithDataSet); + groupWritableAccounts.add(localAccountWithDataSet); + // If any extension packages were specified, process them as well. if (!extensionPackages.isEmpty()) { Log.d(TAG, "Registering " + extensionPackages.size() + " extension packages"); diff --git a/src/com/android/contacts/common/util/AccountsListAdapter.java b/src/com/android/contacts/common/util/AccountsListAdapter.java index 15af0aba..e1986f2a 100755 --- a/src/com/android/contacts/common/util/AccountsListAdapter.java +++ b/src/com/android/contacts/common/util/AccountsListAdapter.java @@ -68,10 +68,6 @@ public final class AccountsListAdapter extends BaseAdapter { mAccountTypes = AccountTypeManager.getInstance(context); mAccounts = getAccounts(accountListFilter); - // Add the virtual local storage account to allow user to store its contacts in the phone - mAccounts.add(0, new AccountWithDataSet(PhoneAccountType.ACCOUNT_NAME, - PhoneAccountType.ACCOUNT_TYPE, - null)); if (currentAccount != null && !mAccounts.isEmpty() && !mAccounts.get(0).equals(currentAccount) |