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

Commit 8e5923bc authored by emancebo's avatar emancebo Committed by Ed Mancebo
Browse files

Dialer: remove contact importing from Dialer 

Dialer uses a different code path for importing contacts than the contacts app
which is broken.  Since you can already import via contacts, this is redundant.

Change-Id: I8251da51f8dd03261826313f5381131ff70aa3cb
(cherry picked from commit 4fef6c9d)
parent b33a952b

AndroidManifest.xml

+0 −24
Original line number Diff line number Diff line
@@ -238,30 +238,6 @@ 
            android:label="@string/custom_list_filter"

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



        <!-- vCard related -->

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

                  android:configChanges="orientation|screenSize|keyboardHidden"

                  android:theme="@style/BackgroundOnlyTheme">

            <intent-filter>

                <action android:name="android.intent.action.VIEW"/>

                <data android:mimeType="text/directory"/>

                <data android:mimeType="text/vcard"/>

                <data android:mimeType="text/x-vcard"/>

                <category android:name="android.intent.category.DEFAULT"/>

            </intent-filter>

        </activity>



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

                  android:configChanges="orientation|screenSize|keyboardHidden"

                  android:theme="@style/BackgroundOnlyTheme">

            <intent-filter>

                <action android:name="android.nfc.action.NDEF_DISCOVERED"/>

                <data android:mimeType="text/vcard"/>

                <data android:mimeType="text/x-vcard"/>

                <category android:name="android.intent.category.DEFAULT"/>

            </intent-filter>

        </activity>



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

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

res/menu/dialtacts_options.xml

+0 −3
Original line number Diff line number Diff line
@@ -14,9 +14,6 @@ 
     limitations under the License.

-->

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

    <item

        android:id="@+id/menu_import_export"

        android:title="@string/menu_import_export" />

    <item

        android:id="@+id/menu_clear_frequents"

        android:title="@string/menu_clear_frequents" />

src/com/android/dialer/DialtactsActivity.java

+0 −8
Original line number Diff line number Diff line
@@ -524,14 +524,6 @@ public class DialtactsActivity extends TransactionSafeActivity implements View.O 
    @Override

    public boolean onMenuItemClick(MenuItem item) {

        switch (item.getItemId()) {

            case R.id.menu_import_export:

                // We hard-code the "contactsAreAvailable" argument because doing it properly would

                // involve querying a {@link ProviderStatusLoader}, which we don't want to do right

                // now in Dialtacts for (potential) performance reasons. Compare with how it is

                // done in {@link PeopleActivity}.

                ImportExportDialogFragment.show(getFragmentManager(), true,

                        DialtactsActivity.class);

                return true;

            case R.id.menu_clear_frequents:

                ClearFrequentsDialog.show(getFragmentManager());

                return true;