summaryrefslogtreecommitdiffstats
path: root/Android.mk
Commit message (Collapse)AuthorAgeFilesLines
* am f9c7a3e2: am e71396cf: am 4b4af990: Doc change: update ADT 0.9.8 checksum ↵Dirk Dougherty2010-09-151-2/+2
|\ | | | | | | | | | | | | | | | | and size. Merge commit 'f9c7a3e25e6e83292051414246cb1fc0c5f85207' * commit 'f9c7a3e25e6e83292051414246cb1fc0c5f85207': Doc change: update ADT 0.9.8 checksum and size.
| * am 4b4af990: Doc change: update ADT 0.9.8 checksum and size.Dirk Dougherty2010-09-141-2/+2
| |\ | | | | | | | | | | | | | | | | | | Merge commit '4b4af990af527c79073d546ead1850278caa7a8e' into gingerbread * commit '4b4af990af527c79073d546ead1850278caa7a8e': Doc change: update ADT 0.9.8 checksum and size.
| | * Doc change: update ADT 0.9.8 checksum and size.Dirk Dougherty2010-09-141-2/+2
| | | | | | | | | | | | Change-Id: I610985683cd4608b075a22e8d8089de7896eb312
| * | Make @deprecated without a comment an error DO NOT MERGEJoe Onorato2010-09-101-1/+1
| | | | | | | | | | | | | | | | | | (do not merge because in master, this error has a different code 114 instead of 14) Change-Id: Iffc58423a8e972f3f59edfe6668beac4b65182e0
* | | Make @deprecated without comment an error.Joe Onorato2010-09-101-0/+1
| | | | | | | | | | | | Change-Id: Iaa5289fe7b48f0349fa9708c4f05144f6340b11c
* | | am eed5d17d: am ea68cab8: am 3eb07ea4: Merge "Doc change: Add notes for SDK ↵Dirk Dougherty2010-09-081-4/+4
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | Tools r7 and ADT 0.9.8." into froyo Merge commit 'eed5d17d7869e77495b9836118a4ffbd5c3ebf50' * commit 'eed5d17d7869e77495b9836118a4ffbd5c3ebf50': Doc change: Add notes for SDK Tools r7 and ADT 0.9.8.
| * | am 3eb07ea4: Merge "Doc change: Add notes for SDK Tools r7 and ADT 0.9.8." ↵Dirk Dougherty2010-09-081-4/+4
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | into froyo Merge commit '3eb07ea483225974484c018d7d5affbf4815ceb2' into gingerbread * commit '3eb07ea483225974484c018d7d5affbf4815ceb2': Doc change: Add notes for SDK Tools r7 and ADT 0.9.8.
| | * Doc change: Add notes for SDK Tools r7 and ADT 0.9.8.Dirk Dougherty2010-09-081-4/+4
| | | | | | | | | | | | Change-Id: I7cc8301e0160acd0adb3efbd20c6515ed985684f
* | | Update RecentApplications to use shared Carousel widget.Jim Miller2010-09-031-3/+0
| | | | | | | | | | | | Change-Id: I5ca7389aeca9ee6f03f48317f9d1034f9fb8c1ca
* | | Don't try to dist the stubs or comment check docs builds.Joe Onorato2010-09-011-0/+4
| | | | | | | | | | | | Change-Id: I0c567f28af8111cdb0eada30b8c0a30091967cd7
* | | am 1e1a030b: am 47471175: Can\'t have two rules building the stubs and ↵Joe Onorato2010-08-311-2/+0
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | public.xml! Merge commit '1e1a030b502acae11dbd11d826d389351910a60f' * commit '1e1a030b502acae11dbd11d826d389351910a60f': Can't have two rules building the stubs and public.xml!
| * | Can't have two rules building the stubs and public.xml!Joe Onorato2010-08-311-2/+0
| | | | | | | | | | | | Change-Id: I27b113d436aa5f945c5d6d56258dbafdf71193cf
| * | DO NOT MERGE - Back port change from master that enforces correctness in the ↵Joe Onorato2010-08-311-0/+29
| | | | | | | | | | | | | | | | | | javadoc comments. Change-Id: I42956ccb3a32b3bd7c573bb2175e4ec230613dbf
* | | Clean up doc build to use Android custom doclava.Dirk Dougherty2010-08-301-8/+3
| | | | | | | | | | | | Change-Id: I1dcf18054aa128ffb4c66111c53fad20bcdee783
* | | Add another pass of the docs that nothing depends on that tries to parse ↵Joe Onorato2010-08-301-0/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | some of the docs but without generating all of them. This should cut down on the number of sdk breakages. Change-Id: I947cc346bc525b05cc064c102171c4004303d7ed
* | | Clean up the messJoe Onorato2010-08-271-3/+1
| | | | | | | | | | | | Change-Id: Id3745d6e97d90443dcc0fd29fa047090c489adb3
* | | Fix MonkeyRunner SDK documentation generation.Bill Napier2010-08-251-3/+4
| | | | | | | | | | | | Change-Id: I53774cace908f5ac68e52cdfeec2c11cbdd7e11d
* | | Revert "Add support for generated documentation as part of the SDK docs."Mike Lockwood2010-08-251-3/+3
| | | | | | | | | | | | | | | | | | Fix the build This reverts commit e0dacf93b1a2d911d1c1a663ae6c66e0a211c14d.
* | | am 22518947: am bfc9325f: Merge "Add support for generated documentation as ↵Rohit Mungee2010-08-241-3/+3
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | part of the SDK docs." into gingerbread Merge commit '2251894743f9e7b1ca7f546369c2ba7fc3d28e1f' * commit '2251894743f9e7b1ca7f546369c2ba7fc3d28e1f': Add support for generated documentation as part of the SDK docs.
| * | Add support for generated documentation as part of the SDK docs.Bill Napier2010-08-241-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | This can be done by adding the list of files to include to the ALL_GENERATED_DOCS variable, and then making sure to put your generated output files under $(OUT_DOCS)/gen. Change-Id: Ie068a3fadccf7c990ec8e26b92ad408e7314469e
* | | am 63f05fe4: am bb75aa90: am ca9d51b1: Disabling AccessibilityService sample ↵Trevor Johns2010-08-241-2/+0
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | from build system. Merge commit '63f05fe487d23e559e9d3f2c285d1c35aa75b9b3' * commit '63f05fe487d23e559e9d3f2c285d1c35aa75b9b3': Disabling AccessibilityService sample from build system.
| * | am ca9d51b1: Disabling AccessibilityService sample from build system.Trevor Johns2010-08-201-2/+0
| |\ \ | | |/ | | | | | | | | | | | | | | | Merge commit 'ca9d51b15074163521b140dce431cc3a10cb56fe' into gingerbread * commit 'ca9d51b15074163521b140dce431cc3a10cb56fe': Disabling AccessibilityService sample from build system.
| | * Disabling AccessibilityService sample from build system.Trevor Johns2010-08-201-2/+0
| | | | | | | | | | | | | | | | | | | | | This is necessary for an upcoming doc push. I'll revert this change after the doc push is complete. Change-Id: I32bbff7797cf5af1642da2b907b20847c1d17d21
* | | resolved conflicts for merge of 485de781 to masterKenny Root2010-08-241-4/+0
|\ \ \ | |/ / | | | | | | Change-Id: I483cb81596f09b024b1aea7fc55960183f38b24f
| * | Reorganize MountService IPCKenny Root2010-08-201-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove auto-generated AIDL files and replace them with manually edited .java and .cpp/.h files so that binder calls can be made from either Java or C++. Update the makefiles to not attempt to generate the AIDL files and also remove the old auto-generated .java files. Put all the storage-related C++ things in libstorage so that we don't pollute other libraries. Change-Id: I82d1631295452709f12ff1270f36c3100e652806
* | | Explicit warning level for deprecation mismatchBen Dodson2010-08-191-1/+1
| | | | | | | | | | | | Change-Id: I2ae784e61c4b4b7aa97d46080f78e9d4ab1df87f
* | | Fix 2797185: Integrate Carousel widget into framework.Jim Miller2010-08-181-0/+3
| | | | | | | | | | | | Change-Id: Ia03e3f582541dd7f6079929e51d2484b5b91a67b
* | | am 96e24634: am e6bfceeb: am 3b70e159: Merge "Adding a sample accessibility ↵Roman Nurik2010-08-171-0/+2
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | service -make" into froyo Merge commit '96e24634c6db1a87285ca78d529dcc318653b7e9' * commit '96e24634c6db1a87285ca78d529dcc318653b7e9': Adding a sample accessibility service -make
| * | am 3b70e159: Merge "Adding a sample accessibility service -make" into froyoRoman Nurik2010-08-171-0/+2
| |\ \ | | |/ | | | | | | | | | | | | | | | Merge commit '3b70e159a8168c1154d31d7b0552bb3b0c099334' into gingerbread * commit '3b70e159a8168c1154d31d7b0552bb3b0c099334': Adding a sample accessibility service -make
| | * Adding a sample accessibility service -makeSvetoslav Ganov2010-08-101-0/+2
| | | | | | | | | | | | Change-Id: I5bdd57e022b9907f7745046d8818801dbc3929a8
* | | am f5ee5358: am ac9717ab: Merge "Move OBB file reading to ↵Kenny Root2010-08-111-0/+1
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | DefaultContainerService" into gingerbread Merge commit 'f5ee5358c187107b2e5a1e1fbcb5a648d793c798' * commit 'f5ee5358c187107b2e5a1e1fbcb5a648d793c798': Move OBB file reading to DefaultContainerService
| * | Move OBB file reading to DefaultContainerServiceKenny Root2010-08-111-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | The system_server shouldn't touch files on the SD card. This change moves the things that touch the SD card out to the DefaultContainerService so that it will get killed if the SD card goes away instead of the system_server. Change-Id: I0aefa085be4b194768527195532ee6dddc801cfc
* | | Updated error codes for Doclava migrationBen Dodson2010-08-101-1/+1
| | | | | | | | | | | | Change-Id: Id8e8d0a47ae863cbdfb56569860fc0f56c644e97
* | | resolved conflicts for merge of a06ad953 to masterChung-yih Wang2010-08-061-0/+5
|\ \ \ | |/ / | | | | | | Change-Id: I282525787d7475cc72b2dec10fbc2cf8c5727b82
| * | Add SIP service into system server.Chung-yih Wang2010-08-061-0/+5
| | | | | | | | | | | | Change-Id: Icc39e4e54768cfdcc1b20a3efe6206009b9a8d10
| * | Tracking merge of dalvik-dev to gingerbreadBrian Carlstrom2010-08-041-24/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git cherry-pick --no-commit f77cf7f0 git cherry-pick --no-commit c8f503b5285e30c1a881d0ba860ba9021f57d113 git cherry-pick --no-commit 570bb561 git cherry-pick --no-commit e2417541 git cherry-pick --no-commit e4d81f25bd4dc1a5c909b56ab56a56406290da30 git cherry-pick --no-commit 5e8a587d Change-Id: I101a385d43f3e0f4ce5352217f92ef67a3908c88
* | | First pass at a new clipboard API.Dianne Hackborn2010-08-051-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ClipboardManager was in android.text(!!) so it needed to be moved up to android.content to have access to the richer data types we now need. ClippedData is the data representation. Still needs a lot of fleshing out to allow holding more than one data type at a time and perhaps conversions between them. (MIME-oriented interrogation and conversion will be done through ContentProvider, which needs to grow an ability to report multiple MIME types and accept a desired MIME type when a stream is being opened.) Change-Id: Ifa51bedcd084a677813b255d171804e8496b0cb5
* | | add droiddoc flag for honeycomb apis (for reference filtering)Scott Main2010-08-041-0/+1
| | | | | | | | | | | | Change-Id: I711b71cbb914cbe9b6bcf7feae55332b1f3fa1c1
* | | Add new system service CountryDetectorBai Tao2010-07-281-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a. The CountryDetector detects the country the user is in in order of mobile network, location, sim card or locale. It will be used by contact and contact provider. b. All added APIs are hidden at this stage. Change-Id: I4ba278571ffb6ab6ded0996d4f440a18534f8ed4
* | | resolved conflicts for merge of bc54e63c to masterMathias Agopian2010-07-211-1/+0
|\ \ \ | |/ / | | | | | | Change-Id: I4245b15b4cda6963d735442c0c6a04a0477ff5e1
| * | new SensorServiceMathias Agopian2010-07-191-1/+0
| | | | | | | | | | | | | | | | | | | | | remove old sensor service and implement SensorManager on top of the new (native) SensorManger API. Change-Id: Iddb77d498755da3e11646473a44d651f12f40281
* | | Initial changes to allow collections in widgets.Winson Chung2010-07-191-0/+1
| | | | | | | | | | | | Change-Id: I3cfa899bae88cd252912cecebc12e93c27a3b7c9
* | | am 92a47ea3: am 562124e8: Merge "Clean up some style in the makefiles." into ↵Joe Onorato2010-07-151-7/+7
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | gingerbread Merge commit '92a47ea3a7b82708e46c9d1710355f5e5fdd4f07' * commit '92a47ea3a7b82708e46c9d1710355f5e5fdd4f07': Clean up some style in the makefiles.
| * | Clean up some style in the makefiles.Joe Onorato2010-07-141-7/+7
| | | | | | | | | | | | Change-Id: I993702808395f37c2e9d3c7e457d2952be51d795
* | | frameworks/base updates to track merge from dalvik-devBrian Carlstrom2010-06-301-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | - frameworks and CoreTests modules now depend on bouncycastle - update preloades classes for NativeBN package change - moved CryptoTest to libcore - updated api Change-Id: I47363a463f074af205b5bd128cd98faab70ac849
* | | New XmlAdapters sample code.Gilles Debunne2010-06-251-1/+3
| | | | | | | | | | | | | | | | | | Build files modified to add the new sample. Sample screenshot images. Change-Id: I51b9512eb7b8202a3acb482fbfbd8e5ffa100f5c
* | | Reimplement the PhoneNumberFormattingTextWatcherBai Tao2010-06-101-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | a. Built the external/libphonenumberutil into the ext.jar. The file size increased 50K, the phone number meta file is 90K before the compression. b. Used the external/libphonenumberutil to format the phone number for about 200 countries. c. Beside the phone number formatting, the external/libphonenumberutil will also be used for phonenumber match and international dialing. Change-Id: Ie5165dc60d66e1eddab7134725a8d1d1c826434a
* | | am 420e7ec7: am fef42db9: Add sample code.Dianne Hackborn2010-06-041-2/+4
|\ \ \ | |/ /
| * | Add sample code.Dianne Hackborn2010-06-041-2/+4
| | | | | | | | | | | | Change-Id: I8f598dcbccbb0c43cedc1e1d02f6e3a46d6ebc67
* | | am 12cd606d: am 0cbda99f: The status bar draws its icons now.Joe Onorato2010-06-021-2/+2
|\ \ \ | |/ /