Skip to content

GitLab

Commit d063d3bf authored by Martijn Coenen's avatar Martijn Coenen Committed by Android Git Automerger
Browse files

am 7ac7ad5f: am 7d58ff5a: Merge "Use the right icon when sending pictures with... 

am 7ac7ad5f: am 7d58ff5a: Merge "Use the right icon when sending pictures with Beam." into jb-mr2-dev

* commit '7ac7ad5f':
  Use the right icon when sending pictures with Beam.
parents 42935217 7ac7ad5f
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 4 deletions
src/com/android/nfc/handover/HandoverTransfer.java
View file @ d063d3bf
......@@ -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 {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment