summaryrefslogtreecommitdiffstats
path: root/Android.mk
Commit message (Collapse)AuthorAgeFilesLines
* Move USB framework support from android.hardware to android.hardware.usb packageMike Lockwood2011-03-011-1/+1
| | | | | Change-Id: I00fd4f0caaa4aebe48f71c576bb211b5f38bf88d Signed-off-by: Mike Lockwood <lockwood@android.com>
* fixing resource browser for renderscript samples because the samples movedRobert Ly2011-02-281-2/+2
| | | | Change-Id: Ic63399f8f6ff0b33461a8e6c8ce1ce398bd8085f
* am b732b7b5: am ce57a7f3: am 6504490c: am dff6b8e7: Merge "Add ↵Xavier Ducrohet2011-02-281-0/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | --non-constant-id to aapt." * commit 'b732b7b5e8192501360edc15fb8c6399d11fb97d': GpsLocationProvider: Clean up HAL initialization/cleanup sequence Fixed GSM encoded network initiated position request Ensuring thread-safe usage of DateFormat. Fixing infinite loop for zero duration. Fix for an infinite loop while scrolling lists. WAPPushManager, WAP Push over SMS message handler Add --non-constant-id to aapt.
| * am ce57a7f3: am 6504490c: am dff6b8e7: Merge "Add --non-constant-id to aapt."Xavier Ducrohet2011-02-281-0/+1
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'ce57a7f35344e76689d30f45964d1e37b78280cb': GpsLocationProvider: Clean up HAL initialization/cleanup sequence Fixed GSM encoded network initiated position request Ensuring thread-safe usage of DateFormat. Fixing infinite loop for zero duration. Fix for an infinite loop while scrolling lists. WAPPushManager, WAP Push over SMS message handler Add --non-constant-id to aapt.
| | * am dff6b8e7: Merge "Add --non-constant-id to aapt."Xavier Ducrohet2011-02-281-0/+1
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'dff6b8e71dda9f5d841fa26408714aec2aef1505': GpsLocationProvider: Clean up HAL initialization/cleanup sequence Fixed GSM encoded network initiated position request Ensuring thread-safe usage of DateFormat. Fixing infinite loop for zero duration. Fix for an infinite loop while scrolling lists. WAPPushManager, WAP Push over SMS message handler Add --non-constant-id to aapt.
| | | * WAPPushManager, WAP Push over SMS message handlernoda2011-02-181-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The WAPPushManager is a new, optional service for handling WAP Push over SMS messages. This service allows a carrier to designate a high priority handler for specific WAP Push over SMS messages without affecting other WAP Push over SMS, binary SMS, or SMS text messages. It is also optional, so that it can be configured out of the target image resulting in no change in the WAP Push over SMS handling behavior compared to the current AOSP. - This patch contains the WAPPushManager itself, the associated test code, and the modifications to telephony to use the WAPPushManager. Change-Id: I4f7fb5b68fc666da9bdeeea525e8797ae317e4b5
* | | | am d2acfd6d: am a58f58da: Merge "Doc change: fixing renderscript samples" ↵Robert Ly2011-02-171-0/+2
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | into honeycomb * commit 'd2acfd6d04545562fcacd266e175461f26b25da9': Doc change: fixing renderscript samples
| * | | Doc change: fixing renderscript samplesRobert Ly2011-02-171-0/+2
| | | | | | | | | | | | | | | | Change-Id: Ie5d17df121ec4bc5fd46448c1670d306322b92d8
* | | | am 2b0c6fdf: am 97ef3b41: Merge "docs: revise a couple sample app names to ↵Scott Main2011-02-151-2/+2
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | match side nav" into honeycomb * commit '2b0c6fdfff0faf17163d126ac21c1651e4053968': docs: revise a couple sample app names to match side nav
| * | | docs: revise a couple sample app names to match side navScott Main2011-02-151-2/+2
| | | | | | | | | | | | | | | | Change-Id: Ia45e78fe005c80934d70b585558cb4c6c0f52f30
* | | | am c7f15f5c: am 5a1b6357: Merge "Adding StackWidget sample code" into honeycombAdam Cohen2011-02-111-0/+2
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit 'c7f15f5cbb68e138e739f6e6d7e1605c48cad2a4': Adding StackWidget sample code
| * | | Merge "Adding StackWidget sample code" into honeycombAdam Cohen2011-02-111-0/+2
| |\ \ \
| | * | | Adding StackWidget sample codeAdam Cohen2011-02-101-0/+2
| | | | | | | | | | | | | | | | | | | | Change-Id: I4c469f25147f733a3a09cdea0db407cd4e9f62ca
* | | | | am 40683904: am 5f3cd3ea: Merge "Associated changes for \'Adding sample for ↵Winson Chung2011-02-111-0/+2
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | collection widgets backed by content providers.\'" into honeycomb * commit '4068390434c366b814dc0885ae5ef5fc0cf50eff': Associated changes for 'Adding sample for collection widgets backed by content providers.'
| * | | | Associated changes for 'Adding sample for collection widgets backed by ↵Winson Chung2011-02-111-0/+2
| |/ / / | | | | | | | | | | | | | | | | | | | | content providers.' Change-Id: Ic872675f4645497dd1478b6c7e3074b029ea66ad
* | | | am b8d74fd9: am 8635908d: Merge "Update resources data JSON, sample ↵Roman Nurik2011-02-071-2/+2
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | screenshot, and SDK makefile for Honeycomb Gallery" into honeycomb * commit 'b8d74fd962e7a8595e5aeadb78b5e7eacea52e8a': Update resources data JSON, sample screenshot, and SDK makefile for Honeycomb Gallery
| * | | Merge "Update resources data JSON, sample screenshot, and SDK makefile for ↵Roman Nurik2011-02-071-2/+2
| |\ \ \ | | | | | | | | | | | | | | | Honeycomb Gallery" into honeycomb
| | * | | Update resources data JSON, sample screenshot, and SDK makefile for ↵Roman Nurik2011-02-071-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Honeycomb Gallery Change-Id: I0a09517935dd330d0069bfb3e6382cdcbef8e99c
* | | | | am 236e9db9: am 62e97010: enable javadoc filtering for api level 11 and ↵Scott Main2011-02-071-3/+3
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | disable preview doc mode * commit '236e9db9f31f6b93f6f21cd3b09df7c19dde16dd': enable javadoc filtering for api level 11 and disable preview doc mode
| * | | | enable javadoc filtering for api level 11 and disable preview doc modeScott Main2011-02-071-3/+3
| |/ / / | | | | | | | | | | | | Change-Id: I12e5f295145ef037beda0e1a3ae0358cf5a2b590
| * | | Merge ba3dd323 from gingerbreadJean-Baptiste Queru2011-01-291-0/+1
| |\ \ \ | | |/ / | | | | | | | | Change-Id: I615bf5177abbc680292e0116491da58835c7396f
* | | | am 796f1af0: Merge "resolved conflicts for merge of 77ba255e to ↵Scott Main2011-01-261-0/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | honeycomb-plus-aosp" into honeycomb-plus-aosp * commit '796f1af04567dab098f638c9166caebc2818efe4': enable preview mode for docs and add api level 10 flag for api level diffs
| * \ \ \ resolved conflicts for merge of 77ba255e to honeycomb-plus-aospScott Main2011-01-261-0/+1
| |\ \ \ \ | | |/ / / | |/| / / | | |/ / Change-Id: Ib40af8301e19b70c86161fc0a6cc061b118863ab
| | * | enable preview mode for docs and add api level 10 flag for api level diffsScott Main2011-01-261-1/+6
| | | | | | | | | | | | | | | | Change-Id: Ief2adca0f7f5c37d9381bd69d39a27aa11ec85dc
* | | | New APIs for USB host support:Mike Lockwood2011-01-221-0/+1
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | UsbManager: - is now a service retrievable via Context.getSystemService(Context.USB_SERVICE). - provides support for returning a list all connected USB devices - broadcasts ACTION_USB_DEVICE_ATTACHED and USB_DEVICE_DETACHED when devices are added and removed from the USB host bus UsbDevice: - represents an attached USB device. UsbInterface: - represents an interface on a USB device - devices may have multiple interfaces if they provide multiple sets of functionality (for example, android phones typically have interfaces for both USB mass storage and adb) UsbEndpoint: - represents an endpoint on a USB interface - endpoints are used for sending or receiving data (only in one or the other direction) UsbRequest: - encapsulates a send or receive request to be sent over an endpoint Change-Id: Ieef3e434c62760770ea839070cf5eba1a705967a Signed-off-by: Mike Lockwood <lockwood@android.com>
* | | Doc change: adding missing samplesRobert Ly2011-01-191-4/+6
| | | | | | | | | | | | Change-Id: Id5f63a02b80f88b5cb0c4db18322554944b944c9
* | | Added Honeycomb-Gallery to docs.Alexander Lucas2011-01-191-0/+2
| | | | | | | | | | | | Change-Id: I3879ee553f761113b30f8ad82c0a226d0823dd2c
* | | Refactoring app widgets to address security/performance issues.Winson Chung2011-01-181-0/+1
| | | | | | | | | | | | | | | | | | | | | - Moving the service binding to AppWidgetService to prevent arbitrary apps from binding to widget services - Requiring RemoteViewsServices to require android.permission.BIND_REMOTEVIEWS permission Change-Id: Id135bafba998299eb278067712b8a5d8487cfd04
* | | set sdk version to "Android 3.0" and api level to "Honeycomb"Scott Main2011-01-171-4/+3
| | | | | | | | | | | | Change-Id: I89a7149b32643d7e9c79bf2030b061bbff3bd8c4
* | | Import libcore_to_document definition from libcore/Docs.mkBrian Carlstrom2011-01-051-11/+2
| | | | | | | | | | | | Change-Id: I5f4ac355c6dadefce5762e0096dcc7379e5bf31d
* | | resolved conflicts for merge of 28e8c66d to masterNick Pelly2010-12-061-2/+1
|\ \ \ | |/ / | | | | | | Change-Id: I9746fd7478d3954b491179ffbd241f481cc2fb6c
| * | Merge branch gingerbread-nfc into gingerbread.Nick Pelly2010-12-051-2/+1
| |\ \ | | | | | | | | | | | | | | | | Change-Id: I37d657a16061fddfbb0993463f24d6d3945cddd1 Signed-off-by: Nick Pelly <npelly@google.com>
| | * | Secure Element access implementationDaniel Tomas2010-11-191-0/+1
| | | | | | | | | | | | | | | | Change-Id: I907e6771ecc5babe895115c3a49288fa2144a187
| | * | Rough first pass at the NFC technology API.Jeff Hamilton2010-11-191-2/+0
| | | | | | | | | | | | | | | | Change-Id: I903ad6bc124bf9a65af788dae45f55d58704ef7b
* | | | am f4c2eaf2: am 47ccfcb0: Doc change: add AccelerometerPlay to the generated ↵Dirk Dougherty2010-11-291-0/+2
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | samples. * commit 'f4c2eaf2628582abf6eb0cc335bc864d2c64f440': Doc change: add AccelerometerPlay to the generated samples.
| * | | Doc change: add AccelerometerPlay to the generated samples.Dirk Dougherty2010-11-291-0/+2
| | | | | | | | | | | | | | | | Change-Id: I95764f216455bbceef7fa95a1a819b906e4e7e7c
* | | | am cb1af77f: am b1150edc: Remove HeavyWeight sample from generated html samples.Dirk Dougherty2010-11-291-2/+0
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit 'cb1af77f1fefddb78b4540db7d4a1df673caffe2': Remove HeavyWeight sample from generated html samples.
| * | | Remove HeavyWeight sample from generated html samples.Dirk Dougherty2010-11-291-2/+0
| | |/ | |/| | | | | | | Change-Id: Idafb3d225d8e6a694faa2d8679c4dad6198df466
* | | docs: add preview sdk docs to provide an api overview and install steps,Scott Main2010-11-291-6/+3
| | | | | | | | | | | | | | | | | | | | | enable the 'preview' flag for the docs build revise sdk side nav for preview Change-Id: Ifc26cfb1f18e394e96853fd42f0e194d5f8552f3
* | | am d3f19b86: am 210e9c4a: Merge "Revert "Disabling AccessibilityService ↵Trevor Johns2010-11-241-0/+2
|\ \ \ | |/ / | | | | | | | | | | | | | | | sample from build system."" into gingerbread * commit 'd3f19b86b0f454b1bd2600d51d241b05fd5d9331': Revert "Disabling AccessibilityService sample from build system."
| * | Revert "Disabling AccessibilityService sample from build system."Trevor Johns2010-11-241-0/+2
| | | | | | | | | | | | | | | | | | This re-enables the AccessibilityService sample. This reverts commit ca9d51b15074163521b140dce431cc3a10cb56fe.
* | | am 4f3c40cc: am 8fac7c2e: change sdk version variable to 2.3 (for docs)Scott Main2010-11-221-1/+1
|\ \ \ | |/ / | | | | | | | | | * commit '4f3c40cc4d24ba1404b1332dbf1bfcddede8bf99': change sdk version variable to 2.3 (for docs)
| * | change sdk version variable to 2.3 (for docs)Scott Main2010-11-221-1/+1
| | | | | | | | | | | | Change-Id: I76f5c69fab08913543c4f3d1ab000f7c4b6c9574
| * | Fixing build (DO NOT MERGE)Megha Joshi2010-11-121-1/+1
| | | | | | | | | | | | Change-Id: I27fb9dc0584940e119b030d63ff5781ef19001c1
| * | Adding NFC sample resources (DO NOT MERGE)Megha Joshi2010-11-121-0/+2
| |/ | | | | | | Change-Id: I687d07ebe4f8bd0c5dec30e69af0d3e880a68230
* | resolved conflicts for merge of f0452c25 to masterJason Chen2010-11-041-0/+2
|\ \ | |/ | | | | Change-Id: Ie8f5e81393ac965fd570f99239ab8be8ea0db00c
| * Added SIP DemoAlexander Lucas2010-11-031-0/+2
| | | | | | | | Change-Id: I418bd272b42b82b9048934071322013f62ac0635
| * add api level 9 'since' flag to docsScott Main2010-10-181-1/+2
| | | | | | | | Change-Id: Ia28ed9b4791cddfa0ee11b86c392dff7caca1dd8
| * Fix build.Nick Pelly2010-10-121-0/+8
| | | | | | | | | | | | I removed these by mistake, and incremental build failed to pick the failure. Change-Id: I19496d62a1eb1dc738a3a0b88d22ca1d5dddba96
| * NFC API revision round 2.Nick Pelly2010-10-121-8/+4
| | | | | | | | | | | | | | | | | | - Add the second half of the new NFC API: NfcAdapter, Tag, NdefTag, RawTagConnection, NdefTagConnection. - Add implementations for all of the new NFC API. Change-Id: I8da9fd1d2971ed2c8b76f2a93f207fa9e305b0f6 Signed-off-by: Nick Pelly <npelly@google.com>