Let ImportVCardActivity choose an account if multiple account exist.
Remove VCardActivity, which does nothing effective.
Remove getReopenableUri(), since this change the method unnecessary.
Bug: 2528512
Bug: 2568427
Change-Id: I1ffb4171fefaad1ddc7406fe5447876d4c647610
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 1e9b525..04d0cf4 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -448,9 +448,9 @@
</intent-filter>
</activity>
- <activity android:name=".VCardActivity"
- android:theme="@android:style/Theme.NoTitleBar" >
- <intent-filter>
+ <activity android:name=".ImportVCardActivity"
+ android:theme="@style/BackgroundOnly">
+ <intent-filter>
<action android:name="android.intent.action.VIEW" />
<data android:mimeType="text/directory" />
<data android:mimeType="text/x-vcard" />
@@ -458,9 +458,6 @@
</intent-filter>
</activity>
- <activity android:name=".ImportVCardActivity"
- android:theme="@style/BackgroundOnly" />
-
<activity android:name=".ExportVCardActivity"
android:theme="@style/BackgroundOnly" />
</application>