diff options
| author | Martijn Coenen <maco@google.com> | 2013-05-10 23:41:31 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-05-10 23:41:31 +0000 |
| commit | 7d58ff5aa3db0abca5cfad904a5f86a6cd9a873e (patch) | |
| tree | f924db4189e1913b4f51144a7c5a88768b25126a | |
| parent | f5954743f1d8b8ace641880fd55466fff4d914cb (diff) | |
| parent | 70fed93e7a684818495c6e27ab43fc05f7342926 (diff) | |
| download | android_packages_apps_Nfc-7d58ff5aa3db0abca5cfad904a5f86a6cd9a873e.tar.gz android_packages_apps_Nfc-7d58ff5aa3db0abca5cfad904a5f86a6cd9a873e.tar.bz2 android_packages_apps_Nfc-7d58ff5aa3db0abca5cfad904a5f86a6cd9a873e.zip | |
Merge "Use the right icon when sending pictures with Beam." into jb-mr2-dev
| -rw-r--r-- | src/com/android/nfc/handover/HandoverTransfer.java | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/src/com/android/nfc/handover/HandoverTransfer.java b/src/com/android/nfc/handover/HandoverTransfer.java index 83696786..df7addde 100644 --- a/src/com/android/nfc/handover/HandoverTransfer.java +++ b/src/com/android/nfc/handover/HandoverTransfer.java @@ -222,7 +222,8 @@ public class HandoverTransfer implements Handler.Callback, if (mState == STATE_NEW || mState == STATE_IN_PROGRESS || mState == STATE_W4_NEXT_TRANSFER || mState == STATE_W4_MEDIA_SCANNER) { notBuilder.setAutoCancel(false); - notBuilder.setSmallIcon(android.R.drawable.stat_sys_download); + notBuilder.setSmallIcon(mIncoming ? android.R.drawable.stat_sys_download : + android.R.drawable.stat_sys_upload); notBuilder.setTicker(beamString); notBuilder.setContentTitle(beamString); notBuilder.addAction(R.drawable.ic_menu_cancel_holo_dark, @@ -239,7 +240,8 @@ public class HandoverTransfer implements Handler.Callback, } } else if (mState == STATE_SUCCESS) { notBuilder.setAutoCancel(true); - notBuilder.setSmallIcon(android.R.drawable.stat_sys_download_done); + notBuilder.setSmallIcon(mIncoming ? android.R.drawable.stat_sys_download_done : + android.R.drawable.stat_sys_upload_done); notBuilder.setTicker(mContext.getString(R.string.beam_complete)); notBuilder.setContentTitle(mContext.getString(R.string.beam_complete)); @@ -253,12 +255,14 @@ public class HandoverTransfer implements Handler.Callback, } } else if (mState == STATE_FAILED) { notBuilder.setAutoCancel(false); - notBuilder.setSmallIcon(android.R.drawable.stat_sys_download_done); + notBuilder.setSmallIcon(mIncoming ? android.R.drawable.stat_sys_download_done : + android.R.drawable.stat_sys_upload_done); notBuilder.setTicker(mContext.getString(R.string.beam_failed)); notBuilder.setContentTitle(mContext.getString(R.string.beam_failed)); } else if (mState == STATE_CANCELLED) { notBuilder.setAutoCancel(false); - notBuilder.setSmallIcon(android.R.drawable.stat_sys_download_done); + notBuilder.setSmallIcon(mIncoming ? android.R.drawable.stat_sys_download_done : + android.R.drawable.stat_sys_upload_done); notBuilder.setTicker(mContext.getString(R.string.beam_canceled)); notBuilder.setContentTitle(mContext.getString(R.string.beam_canceled)); } else { |