diff options
| author | Daichi Hirono <hirono@google.com> | 2015-04-15 05:44:14 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-04-15 05:44:15 +0000 |
| commit | 52743f3b172a7575bd2cd9360af72c32587dd4d3 (patch) | |
| tree | 7bc1a8a23f8011dcba1d261f92be27df68f4d150 /packages/DocumentsUI/src | |
| parent | 485a3cb2bc091c2733c33284cf3b11bc74c0e4f8 (diff) | |
| parent | e4db58edd4a0f02b3ad0051fb7cc50829771528e (diff) | |
| download | frameworks_base-52743f3b172a7575bd2cd9360af72c32587dd4d3.zip frameworks_base-52743f3b172a7575bd2cd9360af72c32587dd4d3.tar.gz frameworks_base-52743f3b172a7575bd2cd9360af72c32587dd4d3.tar.bz2 | |
Merge "DocumentsUI: Use system cancel string resources."
Diffstat (limited to 'packages/DocumentsUI/src')
| -rw-r--r-- | packages/DocumentsUI/src/com/android/documentsui/CopyService.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/packages/DocumentsUI/src/com/android/documentsui/CopyService.java b/packages/DocumentsUI/src/com/android/documentsui/CopyService.java index 337b862..d2ef3d7 100644 --- a/packages/DocumentsUI/src/com/android/documentsui/CopyService.java +++ b/packages/DocumentsUI/src/com/android/documentsui/CopyService.java @@ -190,7 +190,7 @@ public class CopyService extends IntentService { final Intent cancelIntent = new Intent(this, CopyService.class); cancelIntent.putExtra(EXTRA_CANCEL, mJobId); mProgressBuilder.addAction(R.drawable.ic_cab_cancel, - getString(R.string.cancel), PendingIntent.getService(this, 0, + getString(android.R.string.cancel), PendingIntent.getService(this, 0, cancelIntent, PendingIntent.FLAG_ONE_SHOT)); // Send an initial progress notification. |