diff options
| author | Martijn Coenen <maco@google.com> | 2012-05-13 20:02:42 -0700 |
|---|---|---|
| committer | Martijn Coenen <maco@google.com> | 2012-05-15 17:37:45 -0700 |
| commit | 402da07068333f9393fd960a4c90df39b34bf668 (patch) | |
| tree | 2bd4d8152645029d760a336cfb0d73095e2a90a8 /res | |
| parent | 34fbe1fe0ece7303bc424483e0f8c013451c4496 (diff) | |
| download | packages_apps_nfc-402da07068333f9393fd960a4c90df39b34bf668.zip packages_apps_nfc-402da07068333f9393fd960a4c90df39b34bf668.tar.gz packages_apps_nfc-402da07068333f9393fd960a4c90df39b34bf668.tar.bz2 | |
Bluetooth Beam handover: deal with multi-file transfers.
A handover transfer object no longer represents a single file,
but all the files associated with the handover. This association
is based on the source address of the transfer and a timer;
if a new file transfer from the same source is started within
this timer, it is considered to be part of the same handover
transfer.
Received files are stored in beam/. If multiple files are
transferred, they are stored in their own subdirectory of beam.
We now use the mediaScanner for mime-types that the
platform can deal with by default. The advantage of this
is that the mediaScanner can already gather meta-data for
these files, and (platform) apps can query for and populate
views with such data.
3rd party applications can also query the mediaScanner
for meta-data on the received files.
A handover transfer object has a single notification
associated with it; upon launching the notification,
a single ACTION_VIEW intent is launched. If multiple files
were transferred as part of this handover, ACTION_VIEW is
launched on the first file in the set.
Change-Id: I00c23e58736f6dbe96726a1ec56fbc8c984a215d
Diffstat (limited to 'res')
| -rwxr-xr-x | res/values/strings.xml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml index 8d25943..06cc01c 100755 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -19,7 +19,7 @@ <string name="accessibility_nfc_enabled">NFC enabled.</string> <string name="touch">Touch to beam</string> - <string name="beam_progress">Beam in progress</string> + <string name="beam_progress">Incoming beam...</string> <string name="beam_complete">Beam complete</string> <string name="beam_failed">Beam failed</string> <string name="beam_touch_to_view">Touch to view</string> |