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

Commit f8dfbf73 authored by Gary Mai's avatar Gary Mai Committed by Android (Google) Code Review
Browse files

Merge "Collapse common packages (1/?)" into ub-contactsdialer-i-dev

parents 92518c59 69c182af

AndroidManifest_common.xml

+12 −12
Original line number Diff line number Diff line
@@ -213,7 +213,7 @@ 


        <!-- Used to set options -->

        <activity

            android:name=".common.preference.ContactsPreferenceActivity"

            android:name=".preference.ContactsPreferenceActivity"

            android:label="@string/activity_title_settings"

            android:theme="@style/ContactsPreferencesTheme"

            android:launchMode="singleTop"
@@ -226,13 +226,13 @@ 


        <!-- Used to filter contacts list by account -->

        <activity

            android:name=".common.list.AccountFilterActivity"

            android:name=".list.AccountFilterActivity"

            android:label="@string/activity_title_contacts_filter"

            android:theme="@style/ContactListFilterTheme" />



        <!-- Used to select display and sync groups -->

        <activity

            android:name=".common.list.CustomContactListFilterActivity"

            android:name=".list.CustomContactListFilterActivity"

            android:label="@string/custom_list_filter"

            android:theme="@style/ContactListFilterTheme" />
@@ -386,7 +386,7 @@ 
        <!-- Stub service used to keep our process alive long enough for

             background threads to finish their operations. -->

        <service

            android:name=".common.util.EmptyService"

            android:name=".util.EmptyService"

            android:exported="false" />



        <!-- Service to save a contact -->
@@ -411,7 +411,7 @@ 
        </activity>



        <!-- vCard related -->

        <activity android:name=".common.vcard.ImportVCardActivity"

        <activity android:name=".vcard.ImportVCardActivity"

            android:configChanges="orientation|screenSize|keyboardHidden"

            android:theme="@style/BackgroundOnlyTheme">

            <intent-filter>
@@ -423,7 +423,7 @@ 
            </intent-filter>

        </activity>



        <activity android:name=".common.vcard.NfcImportVCardActivity"

        <activity android:name=".vcard.NfcImportVCardActivity"

            android:configChanges="orientation|screenSize|keyboardHidden"

            android:theme="@style/BackgroundOnlyTheme">

            <intent-filter>
@@ -434,16 +434,16 @@ 
            </intent-filter>

        </activity>



        <activity android:name=".common.vcard.CancelActivity"

        <activity android:name=".vcard.CancelActivity"

            android:theme="@style/BackgroundOnlyTheme" />



        <activity android:name=".common.vcard.SelectAccountActivity"

        <activity android:name=".vcard.SelectAccountActivity"

            android:theme="@style/BackgroundOnlyTheme" />



        <activity android:name=".common.vcard.ExportVCardActivity"

        <activity android:name=".vcard.ExportVCardActivity"

            android:theme="@style/BackgroundOnlyTheme" />



        <activity android:name=".common.vcard.ShareVCardActivity"

        <activity android:name=".vcard.ShareVCardActivity"

                  android:theme="@style/BackgroundOnlyTheme" />



         <activity android:name=".activities.SimImportActivity"
@@ -452,7 +452,7 @@ 




        <service

            android:name=".common.vcard.VCardService"

            android:name=".vcard.VCardService"

            android:exported="false" />

        <!-- end vCard related -->
@@ -483,7 +483,7 @@ 
            </intent-filter>

        </activity>



        <activity android:name="com.android.contacts.common.dialog.CallSubjectDialog"

        <activity android:name="com.android.contacts.dialog.CallSubjectDialog"

                  android:theme="@style/Theme.CallSubjectDialogTheme"

                  android:windowSoftInputMode="stateVisible|adjustResize">

            <intent-filter>

proguard.flags

+64 −64
Original line number Diff line number Diff line
@@ -13,75 +13,75 @@ 
-keep class com.google.android.libraries.material.featurehighlight.** { *; }



# Needed for tests

-keep class com.android.contacts.common.compat.CompatUtils { *; }

-keep class com.android.contacts.compat.CompatUtils { *; }

-keep class com.android.contacts.common.Collapser { *; }

-keep class com.android.contacts.common.ContactPhotoManager { *; }

-keep class com.android.contacts.common.ContactsUtils { *; }

-keep class com.android.contacts.common.database.NoNullCursorAsyncQueryHandler { *; }

-keep class com.android.contacts.common.database.SimContactDao { *; }

-keep class com.android.contacts.common.database.SimContactDao$* { *; }

-keep class com.android.contacts.common.database.SimContactDaoImpl { *; }

-keep class com.android.contacts.common.format.FormatUtils { *; }

-keep class com.android.contacts.common.format.TextHighlighter { *; }

-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 { *; }

-keep class com.android.contacts.common.model.Contact { *; }

-keep class com.android.contacts.common.model.ContactLoader { *; }

-keep class com.android.contacts.common.model.Cp2DeviceLocalAccountLocator { *; }

-keep class com.android.contacts.common.model.CPOWrapper { *; }

-keep class com.android.contacts.common.model.dataitem.DataItem { *; }

-keep class com.android.contacts.common.model.dataitem.DataKind { *; }

-keep class com.android.contacts.common.model.dataitem.EmailDataItem { *; }

-keep class com.android.contacts.common.model.dataitem.EventDataItem { *; }

-keep class com.android.contacts.common.model.dataitem.ImDataItem { *; }

-keep class com.android.contacts.common.model.dataitem.NicknameDataItem { *; }

-keep class com.android.contacts.common.model.dataitem.NoteDataItem { *; }

-keep class com.android.contacts.common.model.dataitem.OrganizationDataItem { *; }

-keep class com.android.contacts.common.model.dataitem.PhoneDataItem { *; }

-keep class com.android.contacts.common.model.dataitem.RelationDataItem { *; }

-keep class com.android.contacts.common.model.dataitem.SipAddressDataItem { *; }

-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 { *; }

-keep class com.android.contacts.common.model.RawContactModifier { *; }

-keep class com.android.contacts.common.model.SimCard { *; }

-keep class com.android.contacts.common.model.SimContact { *; }

-keep class com.android.contacts.common.model.ValuesDelta { *; }

-keep class com.android.contacts.database.NoNullCursorAsyncQueryHandler { *; }

-keep class com.android.contacts.database.SimContactDao { *; }

-keep class com.android.contacts.database.SimContactDao$* { *; }

-keep class com.android.contacts.database.SimContactDaoImpl { *; }

-keep class com.android.contacts.format.FormatUtils { *; }

-keep class com.android.contacts.format.TextHighlighter { *; }

-keep class com.android.contacts.list.ContactListItemView { *; }

-keep class com.android.contacts.list.ContactsSectionIndexer { *; }

-keep class com.android.contacts.location.CountryDetector { *; }

-keep class com.android.contacts.model.account.AccountDisplayInfo { *; }

-keep class com.android.contacts.model.account.AccountDisplayInfoFactory { *; }

-keep class com.android.contacts.model.account.AccountType { *; }

-keep class com.android.contacts.model.account.AccountType$* { *; }

-keep class com.android.contacts.model.account.AccountTypeWithDataSet { *; }

-keep class com.android.contacts.model.account.AccountWithDataSet { *; }

-keep class com.android.contacts.model.account.BaseAccountType { *; }

-keep class com.android.contacts.model.account.BaseAccountType$* { *; }

-keep class com.android.contacts.model.account.DeviceLocalAccountType { *; }

-keep class com.android.contacts.model.account.ExchangeAccountType { *; }

-keep class com.android.contacts.model.account.ExternalAccountType { *; }

-keep class com.android.contacts.model.account.FallbackAccountType { *; }

-keep class com.android.contacts.model.account.GoogleAccountType { *; }

-keep class com.android.contacts.model.account.SimAccountType { *; }

-keep class com.android.contacts.model.AccountTypeManager { *; }

-keep class com.android.contacts.model.AccountTypeManagerImpl { *; }

-keep class com.android.contacts.model.BuilderWrapper { *; }

-keep class com.android.contacts.model.Contact { *; }

-keep class com.android.contacts.model.ContactLoader { *; }

-keep class com.android.contacts.model.Cp2DeviceLocalAccountLocator { *; }

-keep class com.android.contacts.model.CPOWrapper { *; }

-keep class com.android.contacts.model.dataitem.DataItem { *; }

-keep class com.android.contacts.model.dataitem.DataKind { *; }

-keep class com.android.contacts.model.dataitem.EmailDataItem { *; }

-keep class com.android.contacts.model.dataitem.EventDataItem { *; }

-keep class com.android.contacts.model.dataitem.ImDataItem { *; }

-keep class com.android.contacts.model.dataitem.NicknameDataItem { *; }

-keep class com.android.contacts.model.dataitem.NoteDataItem { *; }

-keep class com.android.contacts.model.dataitem.OrganizationDataItem { *; }

-keep class com.android.contacts.model.dataitem.PhoneDataItem { *; }

-keep class com.android.contacts.model.dataitem.RelationDataItem { *; }

-keep class com.android.contacts.model.dataitem.SipAddressDataItem { *; }

-keep class com.android.contacts.model.dataitem.StructuredNameDataItem { *; }

-keep class com.android.contacts.model.dataitem.StructuredPostalDataItem { *; }

-keep class com.android.contacts.model.dataitem.WebsiteDataItem { *; }

-keep class com.android.contacts.model.DeviceLocalAccountLocator { *; }

-keep class com.android.contacts.model.RawContact { *; }

-keep class com.android.contacts.model.RawContactDelta { *; }

-keep class com.android.contacts.model.RawContactDeltaList { *; }

-keep class com.android.contacts.model.RawContactModifier { *; }

-keep class com.android.contacts.model.SimCard { *; }

-keep class com.android.contacts.model.SimContact { *; }

-keep class com.android.contacts.model.ValuesDelta { *; }

-keep class com.android.contacts.common.MoreContactUtils { *; }

-keep class com.android.contacts.common.preference.ContactsPreferences { *; }

-keep class com.android.contacts.preference.ContactsPreferences { *; }

-keep class com.android.contacts.common.test.mocks.MockContactPhotoManager { *; }

-keep class com.android.contacts.common.testing.InjectedServices { *; }

-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.PermissionsUtil { *; }

-keep class com.android.contacts.common.util.SearchUtil { *; }

-keep class com.android.contacts.common.util.SearchUtil$* { *; }

-keep class com.android.contacts.testing.InjectedServices { *; }

-keep class com.android.contacts.util.BitmapUtil { *; }

-keep class com.android.contacts.util.ContactDisplayUtils { *; }

-keep class com.android.contacts.util.DateUtils { *; }

-keep class com.android.contacts.util.DeviceLocalAccountTypeFactory { *; }

-keep class com.android.contacts.util.DeviceLocalAccountTypeFactory$* { *; }

-keep class com.android.contacts.util.NameConverter { *; }

-keep class com.android.contacts.util.PermissionsUtil { *; }

-keep class com.android.contacts.util.SearchUtil { *; }

-keep class com.android.contacts.util.SearchUtil$* { *; }

-keep class com.android.contacts.ContactsApplication { *; }

-keep class com.android.contacts.ContactSaveService { *; }

-keep class com.android.contacts.ContactSaveService$* { *; }

res/layout/contact_list_content.xml

+1 −1
Original line number Diff line number Diff line
@@ -78,7 +78,7 @@ 
            android:enabled="false" >



            <view

                class="com.android.contacts.common.list.PinnedHeaderListView"

                class="com.android.contacts.list.PinnedHeaderListView"

                android:id="@android:id/list"

                android:layout_width="match_parent"

                android:layout_height="match_parent"

res/layout/contact_list_filter_item.xml

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 


<view

    xmlns:android="http://schemas.android.com/apk/res/android"

    class="com.android.contacts.common.list.ContactListFilterView"

    class="com.android.contacts.list.ContactListFilterView"

    android:descendantFocusability="blocksDescendants"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

res/layout/contact_picker_content.xml

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ 
    <include layout="@layout/contact_list_card"/>



    <view

        class="com.android.contacts.common.list.PinnedHeaderListView"

        class="com.android.contacts.list.PinnedHeaderListView"

        android:id="@android:id/list"

        android:layout_width="match_parent"

        android:layout_height="match_parent"