summaryrefslogtreecommitdiffstats
path: root/res
Commit message (Collapse)AuthorAgeFilesLines
* Import translations. DO NOT MERGEEric Fischer2012-05-1148-0/+1440
| | | | Change-Id: Iabc7546f56cd68daa446ab55886af1d2462c7ab1
* am bca928cb: am 78705adb: UI confirmation for pairing a BT device through NFC.Martijn Coenen2012-05-101-0/+3
|\ | | | | | | | | * commit 'bca928cb5c29ad662cc37b70bb3c8a93b8478456': UI confirmation for pairing a BT device through NFC.
| * 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
* | am 82aea6aa: am d82d9db8: Bluetooth Beam bug fixes, UX and i18n.Martijn Coenen2012-05-101-0/+14
|\ \ | |/ | | | | | | * commit '82aea6aa8835d14fe57ceb3c5a3cf63ef398ac5b': Bluetooth Beam bug fixes, UX and i18n.
| * 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-05-021-2/+2
|/ | | | Change-Id: I69989c92c36a4b395abc531a229d2bc020b1b454
* 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.
* | | Import revised translations.Eric Fischer2011-10-281-1/+1
|/ / | | | | | | Change-Id: I0f12207e43c2270320338b2e72ac11920e6d6e76
* | Import revised translations.Eric Fischer2011-10-251-1/+1
| | | | | | | | Change-Id: I9fc3b5d9b78b5ddb57cc22867302282ec8ee07a7
* | Import revised translations.Eric Fischer2011-10-182-1/+15
|/ | | | Change-Id: I5993d6fd5e77f134a8649eec45d17d675ad6264c
* Final NFC animation tweaks.Martijn Coenen2011-10-142-34/+3
| | | | | Bug: 5318512 Change-Id: Iae150be1210bf25c1fc58b41ec24dc301547cf7f
* NFC: Remove statusbar/navbar from animated screenshot.Martijn Coenen2011-10-111-5/+0
| | | | | | | | | | | | This just crops the status bar and the navbar from the screenshot we take. This makes the animation look right in all cases, except for when we are full screen: in that scenario we're cropping away too much. Also removed the clone view (was no longer used) and cleaned FireflyRenderer a bit. Bug: 5318512 Change-Id: I37189a576f19937c2cae4ec368f26ac0725a1b62
* Import revised translations.Eric Fischer2011-10-104-6/+6
| | | | Change-Id: I031d83074f38592019912c34a06ddc5c74afd53a
* Import revised translations.Eric Fischer2011-09-3045-0/+630
| | | | Change-Id: I0cd23cb557e59d7f7736495749e8dc090d771b22
* 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
| | | | | | | | Change-Id: Iadf9d337e0645aaf3d3aafaee0ab710c76d04257
* | Updated NFC soundsJustin Ho2011-09-223-0/+0
| | | | | | | | | | | | Bug: 4381131 Change-Id: I336adcc3ec4072088074fceabac80e93f992a254
* | Use 'Touch to beam' text. Increase font size. Center layouts.Nick Pelly2011-09-212-16/+22
|/ | | | | Bug: 5350022 Change-Id: I803facfd2f50329771ad6eb6e608b91a94e9a6bb
* Remove first-share notification.Martijn Coenen2011-09-151-6/+0
| | | | | Bug: 5296866 Change-Id: I90ccb7127b61aa2242fdb5252cdacccc049d5081
* Render fireflies with OpenGL.Martijn Coenen2011-09-022-2/+14
| | | | | | | - Show a static (scaling in) background in case we're not hw-accelerated. - Modify the cloning animation a bit. Change-Id: I808238fb515c2c8d7832a4ab8bc70a37e1198de5
generated by cgit v1.1 at 2024-12-25 05:38:30 +0000