summaryrefslogtreecommitdiffstats
path: root/res
Commit message (Collapse)AuthorAgeFilesLines
* Import translations. DO NOT MERGEEric Fischer2012-06-052-2/+2
| | | | Change-Id: Ib5bcc3b5ced20ee891060473d2d7d15a5064b226
* Import translations. DO NOT MERGEEric Fischer2012-06-043-25/+13
| | | | Change-Id: Iffcbed93dd77b9fcc319a5f033199e3aeefb549c
* Import translations. DO NOT MERGEEric Fischer2012-06-0136-258/+129
| | | | Change-Id: Ic3afdde057c9e7dff2b806fdc2f896757dd5493b
* Import translations. DO NOT MERGEEric Fischer2012-05-3115-93/+47
| | | | Change-Id: Iacfcfce47cf89d41e130f9623b053f4a0a096ebf
* Import translations. DO NOT MERGEEric Fischer2012-05-3017-184/+92
| | | | Change-Id: I045766c671dc36b48b09fb0af7e98a1e76e58f88
* Import translations. DO NOT MERGEEric Fischer2012-05-2948-97/+145
| | | | Change-Id: I2c744437a1b73b6b3492bbbc1d8cbbf96accba8c
* Merge "Fall back to NDEF push if handover SNEP get fails." into jb-devMartijn Coenen2012-05-251-0/+1
|\
| * Fall back to NDEF push if handover SNEP get fails.Martijn Coenen2012-05-251-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | This allows applications to be able to set both a Uri (for handover) and an NDEF message, which will only be sent if the handover request does not work (as will be the case on pre-J devices). Also, show a toast if the remote device does not support connection handover. Bug: 6561174 Change-Id: I9ffdcfdf0cded319fbb4ab646ae1da5382fcb74a
* | Import translations. DO NOT MERGEEric Fischer2012-05-2548-629/+713
|/ | | | Change-Id: Id4aa85e6401a2bd21b8b45d78fdd1017b4d1b843
* Fix some strings.Martijn Coenen2012-05-221-4/+4
| | | | Change-Id: I94103a7318cc72dc4c48aa59e942e3a4ae92a743
* Merge "Allow cancelling of Bluetooth Beam transfers." into jb-devMartijn Coenen2012-05-173-0/+2
|\
| * Allow cancelling of Bluetooth Beam transfers.Martijn Coenen2012-05-163-0/+2
| | | | | | | | | | | | | | | | | | | | | | Add an action to the notification entry that allows cancelling Beam transfers. Also, each transfer now has a generic timer that marks the transfer as failed, in case no updates happen on the transfer at all for 10 seconds. Change-Id: I9670e4e782e5c1b846a07f7e490a2f317a45fb70
* | Merge "Bluetooth Beam handover: deal with multi-file transfers." into jb-devMartijn Coenen2012-05-161-1/+1
|\ \ | |/
| * Bluetooth Beam handover: deal with multi-file transfers.Martijn Coenen2012-05-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | Import translations. DO NOT MERGEEric Fischer2012-05-1511-330/+165
| | | | | | | | Change-Id: Ic2e75ecc2fa54d8c92adb4798d84e9c3d19f83b6
* | Import translations. DO NOT MERGEEric Fischer2012-05-1417-510/+255
|/ | | | Change-Id: I708d501c8816ad9613b1625725f9da3d530cadd8
* Import translations. DO NOT MERGEEric Fischer2012-05-1148-2/+1442
| | | | Change-Id: I6209e0962febfa0ec06adebc46d435a249f51f72
* UI confirmation for pairing a BT device through NFC.Martijn Coenen2012-05-101-0/+3
| | | | | | | | If we find a BT device to pair through NFC and we haven't seen it device before, request confirmation before pairing it. Bug: 6092058 Change-Id: I34fc638fbdb152a48e90644f9a34cc1a0b942de2
* Bluetooth Beam bug fixes, UX and i18n.Martijn Coenen2012-05-101-0/+14
| | | | | | | | | | - Implemented handover select with carrier power state - Delay OPP send if remote carrier is activating - I18n for all handover components - Cleanup old handover transfers Bug: 6411485 Change-Id: I84aac3a7c7e703a1fcb423b6016cd9fa3d33d9b1
* Import translations. DO NOT MERGEEric Fischer2012-04-161-1/+1
| | | | Change-Id: Iebd5151bca71a1d3e13492d2a43b2571dea12cac
* Import translations. DO NOT MERGEEric Fischer2012-04-131-1/+1
| | | | Change-Id: Ie30e2fa88f9f4ffaa4570ae9f51221b6b4f8b25e
* Merge commit 'efc56ea'Mike Lockwood2012-03-211-0/+0
|\ | | | | | | | | | | | | | | | | Add back.png to the Nfc app's drawable-mdpi On mdpi devices the Nfc app will crash if it can't load this resource. Change-Id: Ifa7a0db150e48b3c3d04e8945269c32b6a0e3981
| * Add back.png to the Nfc app's drawable-mdpiJason Simmons2011-10-271-0/+0
| | | | | | | | | | | | | | Tungsten builds as an mdpi device, and the Nfc app will crash if it can't load this resource. Change-Id: I0949c2254b4967fc3201c5b6fe5ab11b6f167029
* | Import translations. DO NOT MERGEEric Fischer2012-03-051-1/+1
| | | | | | | | Change-Id: Iee092c4e8af89001cec817c191d3c8d3836819bd
* | Remove unused assets from packages/apps/Nfc.Martijn Coenen2012-02-133-0/+0
| | | | | | | | | | | | Saves around 212KB. Change-Id: I7e1e4c25643c6934830171ac828a578026ee822c
* | Import translations. DO NOT MERGEEric Fischer2012-01-262-8/+4
| | | | | | | | Change-Id: Iec7c66f17e3f12b4bb87c730eb0aec244e5b24bf
* | Import revised translations.Eric Fischer2011-12-2946-1/+47
| | | | | | | | Change-Id: I089572f3bb05d4aa30dc064d2ffe80391acadc0f
* | am 951dad2b: Restore deleted string still referenced from manifest.Eric Fischer2011-11-301-0/+1
|\ \ | | | | | | | | | | | | * commit '951dad2b5af6be7c1b0490153f5c3f1f727da64f': Restore deleted string still referenced from manifest.
| * | Restore deleted string still referenced from manifest.Eric Fischer2011-11-291-0/+1
| | | | | | | | | | | | Change-Id: I72188c26d8d1cc47f50f586bbb680bc8297bd81c
* | | Import revised translations.Eric Fischer2011-11-2946-138/+0
| | | | | | | | | | | | Change-Id: I9a019efacfd6bdd58680400888cb80c64bf3c754
* | | am e1cadb0c: Merge "Replace vendor specific NfcGoogle.apk with generic ↵Nick Pelly2011-11-211-1/+0
|\ \ \ | |/ / | | | | | | | | | | | | | | | Nfc.apk" into ics-mr1 * commit 'e1cadb0cb6d6741a8b0a94456a5324c6f4a6f64d': Replace vendor specific NfcGoogle.apk with generic Nfc.apk
| * | Replace vendor specific NfcGoogle.apk with generic Nfc.apkNick Pelly2011-11-211-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The access control changes allow us to just use Nfc.apk with the regular platform certificate, instead of the custom signed NfcGoogle.apk. So we can compeltely get rid of vendor/google/apps/NfcGoogle and just build it out of packages/apps/Nfc now. The package name is also reverted from com.android.nfc3 to com.android.nfc The NFC uid needs to get bumped (25 to 27) to allow the cert change. Bug: 5608249 Change-Id: I4437dff96f2529f0b9e7d8e65c21359c3eeccd0b
| * | Import revised translations. DO NOT MERGEEric Fischer2011-11-1648-96/+0
| | | | | | | | | | | | Change-Id: I5f2eb5d7a5862bd8dfd2a3fc3b21f6c48138b8bf
* | | resolved conflicts for merge of ebf4b36e to masterNick Pelly2011-11-111-7/+0
|\ \ \ | |/ / | | | | | | Change-Id: I73a3025a35da21db6600b6e82c99836641e9bee7
| * | Implement static white-list access control for NFC-EE.Jeff Hamilton2011-11-111-7/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | NFC service now has a build time array of package signatures and package names that are allowed access to the NFCEE, removing the shared certificate requirement. See sample_nfcee_access.xml for the XML format. Bug: 4515759 Change-Id: Ibf03e259137f2f4247ec5d31fb88b1090b013d32
* | | Merge "Import revised translations."Eric Fischer2011-11-1046-186/+186
|\ \ \
| * | | Import revised translations.Eric Fischer2011-11-1046-186/+186
| | | | | | | | | | | | | | | | Change-Id: Ie37d61b3674e4e0c68aa792582a2e8de3fa5e95a
* | | | am c1c09483: Reduce sound assets size.Eric Laurent2011-11-103-0/+0
|\ \ \ \ | |/ / / |/| / / | |/ / | | | * commit 'c1c0948374c475007ca5127991baecbab206c3d2': Reduce sound assets size.
| * | Reduce sound assets size.Eric Laurent2011-11-083-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The assets used for start end and error sounds were unecessarily large and caused a lot of memory to be used in media server process. Reduced the sound duration, sampling rate and converted to mono to devide the size by 8. Issue 5160674. Change-Id: Ifda28eae27e574867bc62e105dfef51685bf9f9a
| * | Merge "Import revised translations. DO NOT MERGE" into ics-mr1Eric Fischer2011-11-072-2/+2
| |\ \
| | * | Import revised translations. DO NOT MERGEEric Fischer2011-11-072-2/+2
| | | | | | | | | | | | | | | | Change-Id: Ib28a165a6891dcdadd2720b7b4c2dc88e884428a
* | | | am f7a151e2: Merge "Remove static background image from Beam when no ↵Martijn Coenen2011-11-072-8/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | hw-acceleration." into ics-mr1 * commit 'f7a151e2fe02af5026d6aad37447f13bff60c56a': Remove static background image from Beam when no hw-acceleration.
| * | | Remove static background image from Beam when no hw-acceleration.Martijn Coenen2011-11-032-8/+1
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | The Beam scale down animation on is really jerky on devices where we can't use hardware acceleration. This seems to be due the fact that we have a static background over which we scale. Removing it makes the scaling nice and smooth. Bug: 5567020 Change-Id: Id04bae45713eaa368d03001e5352271f47d26603
* | | am 2d97436c: Merge "Import revised translations." into ics-mr1Eric Fischer2011-11-022-0/+28
|\ \ \ | |/ / | | | | | | | | | * commit '2d97436ca95fad9e796f3e999b88cb693517d4f1': Import revised translations.
| * | Import revised translations.Eric Fischer2011-11-012-0/+28
| |/ | | | | | | Change-Id: I143aebc8beea50841db9d6231b5fd0603c88875a
| * Import revised translations. DO NOT MERGEEric Fischer2011-10-261-1/+1
| | | | | | | | Change-Id: If9c3a584cf13cd785cb989d42aa695535f55b725
| * Import revised translations. DO NOT MERGEEric Fischer2011-10-241-1/+1
| | | | | | | | Change-Id: I146e1c83692dc78f647ac01b8470d82c6047996c
| * Import revised translations. DO NOT MERGEEric Fischer2011-10-182-1/+15
| | | | | | | | Change-Id: I25ff3a0808477797e2916838719f995b2e4368e5
* | Merge "Edits to strings to use UI text standards (ending punctuation in ↵Claudia de Veaux2011-10-281-4/+4
|\ \ | | | | | | | | | second notification line, use "Touch" instead of "Tap", use "app" instead of "application". Bug: 5163232"
| * | Edits to strings to use UI text standardsClaudia de Veaux2011-10-281-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (ending punctuation in second notification line, use "Touch" instead of "Tap", use "app" instead of "application". Bug: 5163232 Change-Id: I8f0619806c86db54fa5fa2214548e1a70a217603 Changed Near Field Communication to NFC per review.
generated by cgit v1.1 at 2025-01-08 19:37:15 +0000