commit ab59660a17e896593f2a07c2e1191c2c23e3e353
author Daisuke Miyakawa <dmiyakawa@google.com> Thu Nov 18 17:28:02 2010 -0800
committer Daisuke Miyakawa <dmiyakawa@google.com> Mon Nov 22 10:03:42 2010 -0800
tree 14274e8f6be029f1ae45e3472427b5e654b2dbf0
parent 53e3176296eeaab1caff0712c946bb77c3cd72f3

Allow users to cancel each import/export.

- add cancel capability for vCard export.
- use jobId for Notification id, so that users can cancel each
  vCard import/export request.

Note:
As for Notification id, it may conflict with each other when
VCardService is shutdown.

Minor changes:
- add file name to each notification: users can see "xxx.vcf
  is successfully imported" instead of "vcard is successfully
  imported"
- rename mCancelled to mCanceled. strings.xml has "canceled",
  so inconsistent inside the app. Ignore the inconsistency
  between the spell in the app and Future#isCancelled().

Bug: 3215008
Change-Id: I7532e3d1b35a8bbeb694e47077554e36190482ed

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 09d5a6e..56d9a02 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -544,7 +544,7 @@
             </intent-filter>
         </activity>
 
-        <activity android:name=".vcard.CancelImportActivity"
+        <activity android:name=".vcard.CancelActivity"
             android:theme="@style/BackgroundOnly" />
 
         <activity android:name=".vcard.SelectAccountActivity"