summaryrefslogtreecommitdiffstats
path: root/Android.mk
Commit message (Collapse)AuthorAgeFilesLines
* am da61eab8: Merge "Integrating RandomMusicPlayer sample into tree." into ↵Bruno Oliveira2011-06-211-0/+2
|\ | | | | | | | | | | | | honeycomb-mr2 * commit 'da61eab862dabe00f95c784a01c019e4f7776b23': Integrating RandomMusicPlayer sample into tree.
| * Merge "Integrating RandomMusicPlayer sample into tree." into honeycomb-mr2Bruno Oliveira2011-06-211-0/+2
| |\
| | * Integrating RandomMusicPlayer sample into tree.Bruno Oliveira2011-06-071-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a cherrypick of CL 112174 (originally written for honeycomb-mr1) into the honeycomb-mr2 branch. Original CL: https://android-git.corp.google.com/g/#change,112174 Patch Set 2: ammending to fix spaces in title (as suggsted by smain@) Change-Id: I1c6e2f4f3585bb65f9f87342445e21f27bed242d
* | | am 04295266: add api level 13 flag for docsScott Main2011-06-211-0/+1
|\ \ \ | |/ / | | | | | | | | | * commit '04295266b03f3c588b8be6b6be409d59f757b27b': add api level 13 flag for docs
| * | add api level 13 flag for docsScott Main2011-06-211-0/+1
| | | | | | | | | | | | Change-Id: I03a7739c923b1f38de6b4e77374daed438559548
* | | am 2f04883f: SDK only: integrate new sample code, deprecating along the way.Dianne Hackborn2011-06-161-1/+5
|\ \ \ | |/ / | | | | | | | | | * commit '2f04883ff880966d63d1aa4a1c7b05e497cfcc58': SDK only: integrate new sample code, deprecating along the way.
| * | SDK only: integrate new sample code, deprecating along the way.Dianne Hackborn2011-06-161-1/+5
| |/ | | | | | | | | | | | | | | | | | | | | | | The new support library features and sample code for switching between fragments using a TabHost now eliminates the utility of the TabActivity class, so deprecate it. This also means there is no longer any use in ActivityGroup or LocalActivityManager. Yay. Also fix up things so the new support API demos are included in the documentation. Change-Id: I4f073b82787f32560ba1fa5b6a23746ecc8aecdc
* | am 1c71fffe: update platform version number for docsScott Main2011-05-051-1/+1
|\ \ | |/ | | | | | | * commit '1c71fffeb5d6a241ccbe7f035ce0d030eaeef562': update platform version number for docs
| * update platform version number for docsScott Main2011-05-051-1/+1
| | | | | | | | Change-Id: If0866ab1544ce0f5e70bbbe93d30ed27c4403406
* | am 762481f0: Merge "adding the usb apis to the resources browser" into ↵Robert Ly2011-05-041-0/+2
|\ \ | |/ | | | | | | | | | | honeycomb-mr1 * commit '762481f0b58ac41b7583f74315fcb213ca0eb630': adding the usb apis to the resources browser
| * adding the usb apis to the resources browserRobert Ly2011-05-021-0/+2
| | | | | | | | Change-Id: I79e9f93ebfa3aaf03e4f4deeb70d6c5a7a4ad07f
* | am 5b68c655: Merge "docs: update makefile to show javadocs diffs for api ↵Scott Main2011-03-301-0/+1
|\ \ | |/ | | | | | | | | | | level 12" into honeycomb-mr1 * commit '5b68c655a1f56dce1ffd6f175e991dd542d415cf': docs: update makefile to show javadocs diffs for api level 12
| * docs: update makefile to show javadocs diffs for api level 12Scott Main2011-03-291-0/+1
| | | | | | | | Change-Id: I1ac584db778ec14b18129785126159f692459158
* | resolved conflicts for merge of 38d0d562 to honeycomb-plus-aospNick Pelly2011-03-141-1/+1
|\ \ | |/ |/| | | Change-Id: Iff9ea08b810b0d142a9227272492c0305a9bcf42
| * am 367f41f8: Implement new NFC-EE API\'s as shared library (frameworks/base).Nick Pelly2011-03-101-1/+1
| |\ | | | | | | | | | | | | * commit '367f41f8f61126c2ab34a34cc676756a9fc23ac2': Implement new NFC-EE API's as shared library (frameworks/base).
| | * Implement new NFC-EE API's as shared library (frameworks/base).Nick Pelly2011-03-101-1/+1
| | | | | | | | | | | | Change-Id: I45c4eaf59ec78167fc236fdd59676465a5e1bcb7
| * | am 40bbf929: DO NOT MERGE: Backport USB accessory support to gingerbreadMike Lockwood2011-03-021-0/+1
| |\ \ | | |/ | | | | | | | | | * commit '40bbf9295d5245d3917629ce15f7b37670aef1ac': DO NOT MERGE: Backport USB accessory support to gingerbread
| | * DO NOT MERGE: Backport USB accessory support to gingerbreadMike Lockwood2011-03-011-0/+1
| | | | | | | | | | | | Signed-off-by: Mike Lockwood <lockwood@android.com>
* | | 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>
generated by cgit v1.1 at 2024-09-17 11:23:36 +0000