diff options
| author | Marcus Hagerott <mhagerott@google.com> | 2016-09-07 09:15:14 -0700 |
|---|---|---|
| committer | Marcus Hagerott <mhagerott@google.com> | 2016-09-07 09:45:22 -0700 |
| commit | 3c1153ffe62484e83764fbed7668d52c065fa518 (patch) | |
| tree | 3be194f5ea6dd4ec9d4e427b44fa91b741b7d46b /proguard.flags | |
| parent | f9b7036af54ae75fef6a462cb739cb66c180bb4c (diff) | |
| parent | fac695a36b227f5591eac064ded8e8dad3398400 (diff) | |
| download | Contacts-3c1153ffe62484e83764fbed7668d52c065fa518.tar.gz | |
resolve merge conflicts of fac695a to master
Change-Id: I467a8b4fa5cc610c3e1627f30631a55ecd6c91c1
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 d74b6c522..1154abe1a 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$* { *; } |