diff options
| author | Martijn Coenen <maco@google.com> | 2012-05-22 15:41:09 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-05-22 15:41:09 -0700 |
| commit | d5b8a6f40c03bd3452083ccae4d9077a70e479da (patch) | |
| tree | e600639cd3284fc2a1733e4429ed038b79a77708 /src/com | |
| parent | dfd9b1d2e8979e8d6f3a92351b03a0e5e6906351 (diff) | |
| parent | 7d44aa52f36e8b0a08fcbb7fdf3af207cd54a97b (diff) | |
| download | packages_apps_nfc-d5b8a6f40c03bd3452083ccae4d9077a70e479da.zip packages_apps_nfc-d5b8a6f40c03bd3452083ccae4d9077a70e479da.tar.gz packages_apps_nfc-d5b8a6f40c03bd3452083ccae4d9077a70e479da.tar.bz2 | |
am 7d44aa52: am befa3d6d: Show time in NFC handover notifications.
* commit '7d44aa52f36e8b0a08fcbb7fdf3af207cd54a97b':
Show time in NFC handover notifications.
Diffstat (limited to 'src/com')
| -rw-r--r-- | src/com/android/nfc/handover/HandoverManager.java | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/com/android/nfc/handover/HandoverManager.java b/src/com/android/nfc/handover/HandoverManager.java index a1458b9..f229b65 100644 --- a/src/com/android/nfc/handover/HandoverManager.java +++ b/src/com/android/nfc/handover/HandoverManager.java @@ -375,7 +375,6 @@ public class HandoverManager implements BluetoothProfile.ServiceListener, notBuilder.addAction(R.drawable.ic_menu_cancel_holo_dark, mContext.getString(R.string.cancel), cancelIntent); notBuilder.setDeleteIntent(cancelIntent); - notBuilder.setWhen(0); // We do have progress indication on a per-file basis, but in a multi-file // transfer we don't know the total progress. So for now, just show an // indeterminate progress bar. @@ -386,7 +385,6 @@ public class HandoverManager implements BluetoothProfile.ServiceListener, notBuilder.setTicker(mContext.getString(R.string.beam_complete)); notBuilder.setContentTitle(mContext.getString(R.string.beam_complete)); notBuilder.setContentText(mContext.getString(R.string.beam_touch_to_view)); - notBuilder.setWhen(0); Intent viewIntent = buildViewIntent(); PendingIntent contentIntent = PendingIntent.getActivity(mContext, 0, viewIntent, 0); @@ -400,13 +398,11 @@ public class HandoverManager implements BluetoothProfile.ServiceListener, notBuilder.setSmallIcon(android.R.drawable.stat_sys_download_done); notBuilder.setTicker(mContext.getString(R.string.beam_failed)); notBuilder.setContentTitle(mContext.getString(R.string.beam_failed)); - notBuilder.setWhen(0); } else if (state == STATE_CANCELLED) { notBuilder.setAutoCancel(false); notBuilder.setSmallIcon(android.R.drawable.stat_sys_download_done); notBuilder.setTicker(mContext.getString(R.string.beam_canceled)); notBuilder.setContentTitle(mContext.getString(R.string.beam_canceled)); - notBuilder.setWhen(0); } else { return; } |