diff options
| author | Martijn Coenen <maco@google.com> | 2012-05-17 15:30:02 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-05-17 15:30:02 -0700 |
| commit | 2aa9b461d148f49ab9c63858f1c8f87c0b40b824 (patch) | |
| tree | 007bbb0187b9af1ca4305c6d91a0ef3a1343feb1 /res | |
| parent | b0f96e9d93e2c96caa95186164f655009a8e8f60 (diff) | |
| parent | 3bf04bd4f04b217768b3799dadb4a775b5a31f1a (diff) | |
| download | packages_apps_nfc-2aa9b461d148f49ab9c63858f1c8f87c0b40b824.zip packages_apps_nfc-2aa9b461d148f49ab9c63858f1c8f87c0b40b824.tar.gz packages_apps_nfc-2aa9b461d148f49ab9c63858f1c8f87c0b40b824.tar.bz2 | |
Merge "Allow cancelling of Bluetooth Beam transfers." into jb-dev
Diffstat (limited to 'res')
| -rw-r--r-- | res/drawable-hdpi/ic_menu_cancel_holo_dark.png | bin | 0 -> 583 bytes | |||
| -rw-r--r-- | res/drawable-mdpi/ic_menu_cancel_holo_dark.png | bin | 0 -> 520 bytes | |||
| -rwxr-xr-x | res/values/strings.xml | 2 |
3 files changed, 2 insertions, 0 deletions
diff --git a/res/drawable-hdpi/ic_menu_cancel_holo_dark.png b/res/drawable-hdpi/ic_menu_cancel_holo_dark.png Binary files differnew file mode 100644 index 0000000..2956109 --- /dev/null +++ b/res/drawable-hdpi/ic_menu_cancel_holo_dark.png diff --git a/res/drawable-mdpi/ic_menu_cancel_holo_dark.png b/res/drawable-mdpi/ic_menu_cancel_holo_dark.png Binary files differnew file mode 100644 index 0000000..6ed1327 --- /dev/null +++ b/res/drawable-mdpi/ic_menu_cancel_holo_dark.png diff --git a/res/values/strings.xml b/res/values/strings.xml index 06cc01c..005f770 100755 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -22,6 +22,8 @@ <string name="beam_progress">Incoming beam...</string> <string name="beam_complete">Beam complete</string> <string name="beam_failed">Beam failed</string> + <string name="beam_canceled">Beam canceled</string> + <string name="cancel">Cancel</string> <string name="beam_touch_to_view">Touch to view</string> <string name="connecting_headset">Connecting</string> |
