summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkaiyiz <kaiyiz@codeaurora.org>2014-10-16 16:41:25 +0800
committerXiaojing Zhang <zhangx@codeaurora.org>2014-11-04 20:34:37 -0800
commitf93fb06c62c809676226ceb497b1ab54a058560d (patch)
tree20a27dc43957c5a3a6085c501f0c6f138c2f7030
parenta7d3d1ee3cd570a72b62998bd206227cdcbb7011 (diff)
downloadandroid_packages_apps_ContactsCommon-f93fb06c62c809676226ceb497b1ab54a058560d.tar.gz
android_packages_apps_ContactsCommon-f93fb06c62c809676226ceb497b1ab54a058560d.tar.bz2
android_packages_apps_ContactsCommon-f93fb06c62c809676226ceb497b1ab54a058560d.zip
ContactsCommon: Modify the notification icon when import/export contacts
There is no parameter to distinguish these two action when impot or export contacts. Add a parameter to distinguish import and export contacts. CRs-Fixed: 738748 Change-Id: I262d282f4b8748d210f5205cf4737c2649fe6702
-rw-r--r--src/com/android/contacts/common/vcard/ExportProcessor.java4
-rw-r--r--src/com/android/contacts/common/vcard/NotificationImportExportListener.java8
2 files changed, 7 insertions, 5 deletions
diff --git a/src/com/android/contacts/common/vcard/ExportProcessor.java b/src/com/android/contacts/common/vcard/ExportProcessor.java
index 83a36d03..72cfa426 100644
--- a/src/com/android/contacts/common/vcard/ExportProcessor.java
+++ b/src/com/android/contacts/common/vcard/ExportProcessor.java
@@ -263,8 +263,8 @@ public class ExportProcessor extends ProcessorBase {
final Intent intent = new Intent();
intent.setClassName(mService, mCallingActivity);
final Notification notification =
- NotificationImportExportListener.constructFinishNotification(mService, title,
- description, intent);
+ NotificationImportExportListener.constructFinishNotification(mService, VCardService.TYPE_EXPORT,
+ title, description, intent);
mNotificationManager.notify(NotificationImportExportListener.DEFAULT_NOTIFICATION_TAG,
mJobId, notification);
}
diff --git a/src/com/android/contacts/common/vcard/NotificationImportExportListener.java b/src/com/android/contacts/common/vcard/NotificationImportExportListener.java
index f873e316..7117f9f5 100644
--- a/src/com/android/contacts/common/vcard/NotificationImportExportListener.java
+++ b/src/com/android/contacts/common/vcard/NotificationImportExportListener.java
@@ -127,7 +127,7 @@ public class NotificationImportExportListener implements VCardImportExportListen
}
final Notification notification =
NotificationImportExportListener.constructFinishNotification(mContext,
- description, null, intent);
+ VCardService.TYPE_IMPORT, description, null, intent);
mNotificationManager.notify(NotificationImportExportListener.DEFAULT_NOTIFICATION_TAG,
jobId, notification);
}
@@ -254,10 +254,12 @@ public class NotificationImportExportListener implements VCardImportExportListen
* @param intent Intent to be launched when the Notification is clicked. Can be null.
*/
/* package */ static Notification constructFinishNotification(
- Context context, String title, String description, Intent intent) {
+ Context context, int type, String title, String description, Intent intent) {
return new Notification.Builder(context)
.setAutoCancel(true)
- .setSmallIcon(android.R.drawable.stat_sys_download_done)
+ .setSmallIcon(type == VCardService.TYPE_IMPORT
+ ? android.R.drawable.stat_sys_download_done
+ : android.R.drawable.stat_sys_upload_done)
.setContentTitle(title)
.setContentText(description)
.setContentIntent(PendingIntent.getActivity(context, 0,