diff options
| author | Marcus Hagerott <mhagerott@google.com> | 2016-08-24 17:02:40 -0700 |
|---|---|---|
| committer | Marcus Hagerott <mhagerott@google.com> | 2016-09-06 19:35:19 -0700 |
| commit | fac695a36b227f5591eac064ded8e8dad3398400 (patch) | |
| tree | 0581d4a619a7e7470e3d8a1f8c4dc23edf29b46e /proguard.flags | |
| parent | 46cb310fdaddc40cc7872fa7a7514a2a00757c1c (diff) | |
| download | Contacts-fac695a36b227f5591eac064ded8e8dad3398400.tar.gz | |
Add device and SIM to AccountTypeManager
This makes these account types available throughout the app rather than
just the Nav drawer.
Test:
Added unit tests for new classes; run with:
$ adb shell am instrument -w \
com.google.android.tests/android.test.InstrumentationTestRunner
Manually on Nexus 6, LG G5 and Samsung S7 with device and SIM contacts
in CP2 by verifying "Device" and "SIM" options were available in
* nav drawer
* account list accessed by Pressing FAB without default account set
* editor account dropdown for new contact
* editor account label when editing existing contact
* picker for default account in settings
* settings customize screen account list
Bug 30867780
Change-Id: I329381ccc58d59f2e27f65a3d9dc0164fb20c971
Diffstat (limited to 'proguard.flags')
| -rw-r--r-- | proguard.flags | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/proguard.flags b/proguard.flags index d9dad57b2..d6e3755d7 100644 --- a/proguard.flags +++ b/proguard.flags @@ -19,20 +19,23 @@ -keep class com.android.contacts.common.database.NoNullCursorAsyncQueryHandler { *; } -keep class com.android.contacts.common.format.FormatUtils { *; } -keep class com.android.contacts.common.format.TextHighlighter { *; } --keep class com.android.contacts.common.list.ContactListFilter { *; } -keep class com.android.contacts.common.list.ContactListItemView { *; } -keep class com.android.contacts.common.list.ContactsSectionIndexer { *; } -keep class com.android.contacts.common.location.CountryDetector { *; } +-keep class com.android.contacts.common.model.account.AccountDisplayInfo { *; } +-keep class com.android.contacts.common.model.account.AccountDisplayInfoFactory { *; } -keep class com.android.contacts.common.model.account.AccountType { *; } -keep class com.android.contacts.common.model.account.AccountType$* { *; } -keep class com.android.contacts.common.model.account.AccountTypeWithDataSet { *; } -keep class com.android.contacts.common.model.account.AccountWithDataSet { *; } -keep class com.android.contacts.common.model.account.BaseAccountType { *; } -keep class com.android.contacts.common.model.account.BaseAccountType$* { *; } +-keep class com.android.contacts.common.model.account.DeviceLocalAccountType { *; } -keep class com.android.contacts.common.model.account.ExchangeAccountType { *; } -keep class com.android.contacts.common.model.account.ExternalAccountType { *; } -keep class com.android.contacts.common.model.account.FallbackAccountType { *; } -keep class com.android.contacts.common.model.account.GoogleAccountType { *; } +-keep class com.android.contacts.common.model.account.SimAccountType { *; } -keep class com.android.contacts.common.model.AccountTypeManager { *; } -keep class com.android.contacts.common.model.AccountTypeManagerImpl { *; } -keep class com.android.contacts.common.model.BuilderWrapper { *; } @@ -53,6 +56,7 @@ -keep class com.android.contacts.common.model.dataitem.StructuredNameDataItem { *; } -keep class com.android.contacts.common.model.dataitem.StructuredPostalDataItem { *; } -keep class com.android.contacts.common.model.dataitem.WebsiteDataItem { *; } +-keep class com.android.contacts.common.model.DeviceLocalAccountLocator { *; } -keep class com.android.contacts.common.model.RawContact { *; } -keep class com.android.contacts.common.model.RawContactDelta { *; } -keep class com.android.contacts.common.model.RawContactDeltaList { *; } @@ -64,14 +68,11 @@ -keep class com.android.contacts.common.util.BitmapUtil { *; } -keep class com.android.contacts.common.util.ContactDisplayUtils { *; } -keep class com.android.contacts.common.util.DateUtils { *; } +-keep class com.android.contacts.common.util.DeviceLocalAccountTypeFactory { *; } +-keep class com.android.contacts.common.util.DeviceLocalAccountTypeFactory$* { *; } -keep class com.android.contacts.common.util.NameConverter { *; } -keep class com.android.contacts.common.util.SearchUtil { *; } -keep class com.android.contacts.common.util.SearchUtil$* { *; } --keep class com.android.contacts.common.util.DeviceAccountFilter { *; } --keep class com.android.contacts.common.util.DeviceAccountFilter$* { *; } --keep class com.android.contacts.common.util.DeviceAccountPresentationValues { *; } --keep class com.android.contacts.common.util.DeviceAccountPresentationValues$* { *; } --keep class com.android.contacts.common.util.DeviceLocalContactsFilterProvider { *; } -keep class com.android.contacts.ContactsApplication { *; } -keep class com.android.contacts.ContactSaveService { *; } -keep class com.android.contacts.ContactSaveService$* { *; } |