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

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

Merge "Collapse common package (2/2)" into ub-contactsdialer-i-dev

parents 576fa654 0a49afa2
Loading
Loading
Loading
Loading
+5 −5
Original line number Diff line number Diff line
@@ -219,7 +219,7 @@
            android:launchMode="singleTop"
            android:exported="false"/>

        <activity android:name=".common.activity.LicenseActivity"
        <activity android:name=".activities.LicenseActivity"
            android:label="@string/activity_title_licenses"
            android:theme="@style/ContactsPreferencesTheme"
            android:exported="true" />
@@ -237,17 +237,17 @@
            android:theme="@style/ContactListFilterTheme" />

        <activity
            android:name=".common.activity.RequestPermissionsActivity"
            android:name=".activities.RequestPermissionsActivity"
            android:theme="@style/PeopleTheme"
            android:exported="false"/>

        <activity
            android:name=".common.activity.RequestDesiredPermissionsActivity"
            android:name=".activities.RequestDesiredPermissionsActivity"
            android:theme="@style/PeopleTheme"
            android:exported="false"/>

        <activity
            android:name=".common.activity.RequestImportVCardPermissionsActivity"
            android:name=".activities.RequestImportVCardPermissionsActivity"
            android:theme="@style/PeopleTheme"
            android:exported="false"/>

@@ -377,7 +377,7 @@
            </intent-filter>
        </activity>

        <activity android:name=".common.test.FragmentTestActivity">
        <activity android:name=".test.FragmentTestActivity">
            <intent-filter>
                <category android:name="android.intent.category.TEST" />
            </intent-filter>
+18 −18
Original line number Diff line number Diff line
@@ -14,15 +14,26 @@

# Needed for tests
-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.Collapser { *; }
-keep class com.android.contacts.ContactPhotoManager { *; }
-keep class com.android.contacts.ContactsApplication { *; }
-keep class com.android.contacts.ContactsUtils { *; }
-keep class com.android.contacts.ContactSaveService { *; }
-keep class com.android.contacts.ContactSaveService$* { *; }
-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.DynamicShortcuts { *; }
-keep class com.android.contacts.editor.ContactEditorUtils { *; }
-keep class com.android.contacts.editor.EditorUiUtils { *; }
-keep class com.android.contacts.format.FormatUtils { *; }
-keep class com.android.contacts.format.TextHighlighter { *; }
-keep class com.android.contacts.group.GroupUtil { *; }
-keep class com.android.contacts.interactions.CallLogInteraction { *; }
-keep class com.android.contacts.interactions.CallLogInteractionsLoader { *; }
-keep class com.android.contacts.interactions.ContactDeletionInteraction { *; }
-keep class com.android.contacts.interactions.ContactInteractionUtil { *; }
-keep class com.android.contacts.list.ContactListItemView { *; }
-keep class com.android.contacts.list.ContactsSectionIndexer { *; }
-keep class com.android.contacts.location.CountryDetector { *; }
@@ -69,9 +80,11 @@
-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.MoreContactUtils { *; }
-keep class com.android.contacts.preference.ContactsPreferences { *; }
-keep class com.android.contacts.common.test.mocks.MockContactPhotoManager { *; }
-keep class com.android.contacts.SimImportService { *; }
-keep class com.android.contacts.SimImportService$* { *; }
-keep class com.android.contacts.test.mocks.MockContactPhotoManager { *; }
-keep class com.android.contacts.testing.InjectedServices { *; }
-keep class com.android.contacts.util.BitmapUtil { *; }
-keep class com.android.contacts.util.ContactDisplayUtils { *; }
@@ -82,19 +95,6 @@
-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$* { *; }
-keep class com.android.contacts.SimImportService { *; }
-keep class com.android.contacts.SimImportService$* { *; }
-keep class com.android.contacts.DynamicShortcuts { *; }
-keep class com.android.contacts.editor.ContactEditorUtils { *; }
-keep class com.android.contacts.editor.EditorUiUtils { *; }
-keep class com.android.contacts.group.GroupUtil { *; }
-keep class com.android.contacts.interactions.CallLogInteraction { *; }
-keep class com.android.contacts.interactions.CallLogInteractionsLoader { *; }
-keep class com.android.contacts.interactions.ContactDeletionInteraction { *; }
-keep class com.android.contacts.interactions.ContactInteractionUtil { *; }
-keep class com.android.contacts.util.SyncUtil { *; }
-keep class com.android.contacts.widget.CompositeListAdapter { *; }
-keep class com.google.common.base.Function { *; }
+3 −3
Original line number Diff line number Diff line
@@ -13,14 +13,14 @@
 */
package com.android.contactsbind;

import com.android.contacts.logging.Logger;
import com.android.contacts.util.DeviceLocalAccountTypeFactory;

import android.app.Fragment;
import android.content.Context;
import android.content.Intent;
import android.net.Uri;

import com.android.contacts.logging.Logger;
import com.android.contacts.util.DeviceLocalAccountTypeFactory;

/**
 * Creates default bindings for overlays.
 */
+0 −3
Original line number Diff line number Diff line
@@ -14,10 +14,7 @@

package com.android.contactsbind.analytics;

import android.app.Activity;
import android.app.Application;
import android.app.Fragment;
import android.text.TextUtils;

public class AnalyticsUtil {

+0 −2
Original line number Diff line number Diff line
@@ -17,8 +17,6 @@
package com.android.contactsbind.util;

import android.content.Context;
import android.content.pm.PackageManager;
import android.os.Build;

/**
 * Generates a user agent string for the application.
Loading