summaryrefslogtreecommitdiffstats
path: root/Android.mk
Commit message (Collapse)AuthorAgeFilesLines
* 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>
* | Add missing NOTICE entries.David Deephanphongs2010-10-191-0/+4
| | | | | | | | | | | | | | | | Add missing NOTICE block for TagSoup in general NOTICE file. Add comment in Android.mk to help reviewers locate the NOTICE for apache-http. Modify build rule for 'am' command to pull in the NOTICE file. Change-Id: I43c6c1468395b70d0942b3620f12e4b6f3d9a66b
* | add api level 9 'since' flag to docsScott Main2010-10-191-0/+1
| | | | | | | | Change-Id: Idee873a20ae0f3f0a9705997c8b73ce7f181906f
* | NFC API revision round 2.Nick Pelly2010-10-141-8/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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> Conflicts: Android.mk CleanSpec.mk core/java/android/app/ContextImpl.java
* | Remove the unused UrlRendererServiceBjorn Bringert2010-10-121-2/+0
| | | | | | | | Change-Id: I48af718d9753b475bd041147f0d18bee60da84ec
* | resolved conflicts for merge of f4c3b7e9 to masterNick Pelly2010-09-291-0/+8
|\ \ | |/ | | | | Change-Id: Idcdc521144f3072058b2bb6cb383e42c852e64f4
| * NFC integrationNick Pelly2010-09-281-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Source: Trusted_NFC_Device_Host_AA03.01e02_google.zip code drop (23-Sep-2010) Conflicts: core/java/android/app/ApplicationContext.java core/java/android/provider/Settings.java core/jni/Android.mk core/jni/AndroidRuntime.cpp core/res/AndroidManifest.xml include/utils/Asset.h Change-Id: I62c92f4c79f5ee65126c97602f6bc1c15794e573 Signed-off-by: Nick Pelly <npelly@google.com>
* | resolved conflicts for merge of d78f338e to masterJesse Wilson2010-09-161-0/+1
|\ \ | |/ | | | | Change-Id: Ibe4be94126df9f1ea999b0396351886161552960
| * Add optional tags to frameworks/base ext.Jesse Wilson2010-09-161-1/+1
| | | | | | | | Change-Id: I08a69b7ca783994e52f735ad0ee9b85197cdaa96
| * DO NOT MERGE - Doclava warnings are now errors.Joe Onorato2010-09-161-2/+2
| | | | | | | | Change-Id: I688d8f66829d8526d76c321427dd701fbe8d1792
* | Make javadoc warnings into errors.Joe Onorato2010-09-161-2/+1
| | | | | | | | Change-Id: Ic2f98ffcc1568db5a3d5d97dd30de9d6dbfaf602
* | am 8ee9ecc1: am 9afd9093: Merge "Doc change: clean up droiddoc (cs) macros." ↵Dirk Dougherty2010-09-161-15/+2
|\ \ | |/ | | | | | | | | | | | | | | into gingerbread Merge commit '8ee9ecc145c9e05faf13f4bcf5853c888760c1b6' * commit '8ee9ecc145c9e05faf13f4bcf5853c888760c1b6': Doc change: clean up droiddoc (cs) macros.
| * Doc change: clean up droiddoc (cs) macros.Dirk Dougherty2010-09-161-15/+2
| | | | | | | | Change-Id: I84b08a573fea42686a41ff694f1a52e8fb760dc5
| * DO NOT MERGE. Use the new -knowntags option to suppress warnings for some ↵Joe Onorato2010-09-161-1/+10
| | | | | | | | | | | | known tags. Change-Id: I4a04d9b182f2e644eb8d1966c33a0d280bf203e6
* | DO NOT MERGE. Use the new -knowntags option to suppress warnings for some ↵Joe Onorato2010-09-161-1/+10
| | | | | | | | | | | | known tags. Change-Id: Ifa46210d1e590e5298376539b6099452d85ef93d
* | 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
generated by cgit v1.1 at 2024-10-30 09:53:39 +0000