summaryrefslogtreecommitdiffstats
path: root/res
Commit message (Expand)AuthorAgeFilesLines
* Import translations. DO NOT MERGEEric Fischer2012-05-1148-2/+1442
* UI confirmation for pairing a BT device through NFC.Martijn Coenen2012-05-101-0/+3
* Bluetooth Beam bug fixes, UX and i18n.Martijn Coenen2012-05-101-0/+14
* Import translations. DO NOT MERGEEric Fischer2012-04-161-1/+1
* Import translations. DO NOT MERGEEric Fischer2012-04-131-1/+1
* Merge commit 'efc56ea'Mike Lockwood2012-03-211-0/+0
|\
| * Add back.png to the Nfc app's drawable-mdpiJason Simmons2011-10-271-0/+0
* | Import translations. DO NOT MERGEEric Fischer2012-03-051-1/+1
* | Remove unused assets from packages/apps/Nfc.Martijn Coenen2012-02-133-0/+0
* | Import translations. DO NOT MERGEEric Fischer2012-01-262-8/+4
* | Import revised translations.Eric Fischer2011-12-2946-1/+47
* | am 951dad2b: Restore deleted string still referenced from manifest.Eric Fischer2011-11-301-0/+1
|\ \
| * | Restore deleted string still referenced from manifest.Eric Fischer2011-11-291-0/+1
* | | Import revised translations.Eric Fischer2011-11-2946-138/+0
* | | am e1cadb0c: Merge "Replace vendor specific NfcGoogle.apk with generic Nfc.ap...Nick Pelly2011-11-211-1/+0
|\ \ \ | |/ /
| * | Replace vendor specific NfcGoogle.apk with generic Nfc.apkNick Pelly2011-11-211-1/+0
| * | Import revised translations. DO NOT MERGEEric Fischer2011-11-1648-96/+0
* | | resolved conflicts for merge of ebf4b36e to masterNick Pelly2011-11-111-7/+0
|\ \ \ | |/ /
| * | Implement static white-list access control for NFC-EE.Jeff Hamilton2011-11-111-7/+0
* | | Merge "Import revised translations."Eric Fischer2011-11-1046-186/+186
|\ \ \
| * | | Import revised translations.Eric Fischer2011-11-1046-186/+186
* | | | am c1c09483: Reduce sound assets size.Eric Laurent2011-11-103-0/+0
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | Reduce sound assets size.Eric Laurent2011-11-083-0/+0
| * | 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
* | | | am f7a151e2: Merge "Remove static background image from Beam when no hw-accel...Martijn Coenen2011-11-072-8/+1
|\ \ \ \ | |/ / /
| * | | Remove static background image from Beam when no hw-acceleration.Martijn Coenen2011-11-032-8/+1
| |/ /
* | | am 2d97436c: Merge "Import revised translations." into ics-mr1Eric Fischer2011-11-022-0/+28
|\ \ \ | |/ /
| * | Import revised translations.Eric Fischer2011-11-012-0/+28
| |/
| * Import revised translations. DO NOT MERGEEric Fischer2011-10-261-1/+1
| * Import revised translations. DO NOT MERGEEric Fischer2011-10-241-1/+1
| * Import revised translations. DO NOT MERGEEric Fischer2011-10-182-1/+15
* | Merge "Edits to strings to use UI text standards (ending punctuation in secon...Claudia de Veaux2011-10-281-4/+4
|\ \
| * | Edits to strings to use UI text standardsClaudia de Veaux2011-10-281-4/+4
* | | Import revised translations.Eric Fischer2011-10-281-1/+1
|/ /
* | Import revised translations.Eric Fischer2011-10-251-1/+1
* | Import revised translations.Eric Fischer2011-10-182-1/+15
|/
* Final NFC animation tweaks.Martijn Coenen2011-10-142-34/+3
* NFC: Remove statusbar/navbar from animated screenshot.Martijn Coenen2011-10-111-5/+0
* Import revised translations.Eric Fischer2011-10-104-6/+6
* Import revised translations.Eric Fischer2011-09-3045-0/+630
* Merge "Improve NFC Admin permission strings, for easier translation."Nick Pelly2011-09-221-2/+3
|\
| * Improve NFC Admin permission strings, for easier translation.Nick Pelly2011-09-221-2/+3
* | Updated NFC soundsJustin Ho2011-09-223-0/+0
* | Use 'Touch to beam' text. Increase font size. Center layouts.Nick Pelly2011-09-212-16/+22
|/
* Remove first-share notification.Martijn Coenen2011-09-151-6/+0
* Render fireflies with OpenGL.Martijn Coenen2011-09-022-2/+14
* Merge "Latest zeroclick animations."Martijn Coenen2011-09-022-8/+4
|\
| * Latest zeroclick animations.Martijn Coenen2011-09-012-8/+4
* | Unused assets removed from NfcJustin Ho2011-09-013-0/+0
|/