drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
33,169 Commits 1 Branch 0 Tags
Commit Graph

262 Commits

Author SHA1 Message Date
Nick Pelly
4715bd91f5 resolved conflicts for merge of f4c3b7e9 to master 
Change-Id: Idcdc521144f3072058b2bb6cb383e42c852e64f4
 2010-09-29 12:20:51 -07:00
Nick Pelly
038cabe024 NFC integration 
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>
 2010-09-28 22:36:27 -07:00
Jesse Wilson
98a6abf7e3 resolved conflicts for merge of d78f338e to master 
Change-Id: Ibe4be94126df9f1ea999b0396351886161552960
 2010-09-16 18:21:20 -07:00
Jesse Wilson
a145956551 Add optional tags to frameworks/base ext. 
Change-Id: I08a69b7ca783994e52f735ad0ee9b85197cdaa96
 2010-09-16 17:50:43 -07:00
Joe Onorato
0ba4ac747c Make javadoc warnings into errors. 
Change-Id: Ic2f98ffcc1568db5a3d5d97dd30de9d6dbfaf602
 2010-09-16 16:01:53 -04:00
Dirk Dougherty
40da25a26e am 8ee9ecc1: am 9afd9093: Merge "Doc change: clean up droiddoc (cs) macros." into gingerbread 
Merge commit '8ee9ecc145c9e05faf13f4bcf5853c888760c1b6'

* commit '8ee9ecc145c9e05faf13f4bcf5853c888760c1b6':
  Doc change: clean up droiddoc (cs) macros.
 2010-09-16 11:32:30 -07:00
Joe Onorato
b9f03d51c2 DO NOT MERGE - Doclava warnings are now errors. 
Change-Id: I688d8f66829d8526d76c321427dd701fbe8d1792
 2010-09-16 14:30:16 -04:00
Dirk Dougherty
9519eab313 Doc change: clean up droiddoc (cs) macros. 
Change-Id: I84b08a573fea42686a41ff694f1a52e8fb760dc5
 2010-09-16 11:08:57 -07:00
Joe Onorato
d20e5d0a29 DO NOT MERGE. Use the new -knowntags option to suppress warnings for some known tags. 
Change-Id: Ifa46210d1e590e5298376539b6099452d85ef93d
 2010-09-16 12:38:42 -04:00
Joe Onorato
71f7f67230 DO NOT MERGE. Use the new -knowntags option to suppress warnings for some known tags. 
Change-Id: I4a04d9b182f2e644eb8d1966c33a0d280bf203e6
 2010-09-16 12:03:41 -04:00
Dirk Dougherty
f6a04aeeed am f9c7a3e2: am e71396cf: am 4b4af990: Doc change: update ADT 0.9.8 checksum and size. 
Merge commit 'f9c7a3e25e6e83292051414246cb1fc0c5f85207'

* commit 'f9c7a3e25e6e83292051414246cb1fc0c5f85207':
  Doc change: update ADT 0.9.8 checksum and size.
 2010-09-15 07:08:23 -07:00
Dirk Dougherty
e71396cf47 am 4b4af990: Doc change: update ADT 0.9.8 checksum and size. 
Merge commit '4b4af990af527c79073d546ead1850278caa7a8e' into gingerbread

* commit '4b4af990af527c79073d546ead1850278caa7a8e':
  Doc change: update ADT 0.9.8 checksum and size.
 2010-09-14 09:39:59 -07:00
Dirk Dougherty
4b4af990af Doc change: update ADT 0.9.8 checksum and size. 
Change-Id: I610985683cd4608b075a22e8d8089de7896eb312
 2010-09-14 09:17:33 -07:00
Joe Onorato
aa03045e63 Make @deprecated without comment an error. 
Change-Id: Iaa5289fe7b48f0349fa9708c4f05144f6340b11c
 2010-09-10 15:55:44 -04:00
Joe Onorato
e94f6db177 Make @deprecated without a comment an error DO NOT MERGE 
(do not merge because in master, this error has a different code 114 instead of 14)

Change-Id: Iffc58423a8e972f3f59edfe6668beac4b65182e0
 2010-09-10 15:02:06 -04:00
Dirk Dougherty
54ceb6e68e am eed5d17d: am ea68cab8: am 3eb07ea4: Merge "Doc change: Add notes for SDK 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.
 2010-09-08 18:22:33 -07:00
Dirk Dougherty
ea68cab8a3 am 3eb07ea4: Merge "Doc change: Add notes for SDK Tools r7 and ADT 0.9.8." into froyo 
Merge commit '3eb07ea483225974484c018d7d5affbf4815ceb2' into gingerbread

* commit '3eb07ea483225974484c018d7d5affbf4815ceb2':
  Doc change: Add notes for SDK Tools r7 and ADT 0.9.8.
 2010-09-08 18:05:58 -07:00
Dirk Dougherty
022171be9d Doc change: Add notes for SDK Tools r7 and ADT 0.9.8. 
Change-Id: I7cc8301e0160acd0adb3efbd20c6515ed985684f
 2010-09-08 15:59:56 -07:00
Jim Miller
783cb60ddb Update RecentApplications to use shared Carousel widget. 
Change-Id: I5ca7389aeca9ee6f03f48317f9d1034f9fb8c1ca
 2010-09-03 17:44:57 -07:00
Joe Onorato
7e3cf12e75 Don't try to dist the stubs or comment check docs builds. 
Change-Id: I0c567f28af8111cdb0eada30b8c0a30091967cd7
 2010-09-01 10:45:04 -07:00
Joe Onorato
522ea25f2b am 1e1a030b: am 47471175: Can\'t have two rules building the stubs and public.xml! 
Merge commit '1e1a030b502acae11dbd11d826d389351910a60f'

* commit '1e1a030b502acae11dbd11d826d389351910a60f':
  Can't have two rules building the stubs and public.xml!
 2010-08-31 15:29:24 -07:00
Joe Onorato
47471175c9 Can't have two rules building the stubs and public.xml! 
Change-Id: I27b113d436aa5f945c5d6d56258dbafdf71193cf
 2010-08-31 15:11:11 -07:00
Joe Onorato
77881293ad DO NOT MERGE - Back port change from master that enforces correctness in the javadoc comments. 
Change-Id: I42956ccb3a32b3bd7c573bb2175e4ec230613dbf
 2010-08-31 12:00:03 -07:00
Dirk Dougherty
2053f91623 Clean up doc build to use Android custom doclava. 
Change-Id: I1dcf18054aa128ffb4c66111c53fad20bcdee783
 2010-08-30 18:22:55 -07:00
Joe Onorato
4314e2e674 Add another pass of the docs that nothing depends on that tries to parse some of the docs but 
without generating all of them.

This should cut down on the number of sdk breakages.

Change-Id: I947cc346bc525b05cc064c102171c4004303d7ed
 2010-08-30 13:33:51 -07:00
Joe Onorato
3fec2bf9bf Clean up the mess 
Change-Id: Id3745d6e97d90443dcc0fd29fa047090c489adb3
 2010-08-27 15:34:00 -04:00
Bill Napier
e7c9178e6f Fix MonkeyRunner SDK documentation generation. 
Change-Id: I53774cace908f5ac68e52cdfeec2c11cbdd7e11d
 2010-08-25 18:13:02 -07:00
Mike Lockwood
089a38543f Revert "Add support for generated documentation as part of the SDK docs." 
Fix the build

This reverts commit e0dacf93b1a2d911d1c1a663ae6c66e0a211c14d.
 2010-08-25 08:21:15 -04:00
Rohit Mungee
6615759f0c am 22518947: am bfc9325f: Merge "Add support for generated documentation as part of the SDK docs." into gingerbread 
Merge commit '2251894743f9e7b1ca7f546369c2ba7fc3d28e1f'

* commit '2251894743f9e7b1ca7f546369c2ba7fc3d28e1f':
  Add support for generated documentation as part of the SDK docs.
 2010-08-24 23:15:28 -07:00
Bill Napier
e0dacf93b1 Add support for generated documentation as part of the SDK docs. 
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
 2010-08-24 22:18:54 -07:00
Trevor Johns
e79486fed8 am 63f05fe4: am bb75aa90: am ca9d51b1: Disabling AccessibilityService sample from build system. 
Merge commit '63f05fe487d23e559e9d3f2c285d1c35aa75b9b3'

* commit '63f05fe487d23e559e9d3f2c285d1c35aa75b9b3':
  Disabling AccessibilityService sample from build system.
 2010-08-24 11:01:02 -07:00
Kenny Root
53e75ea847 resolved conflicts for merge of 485de781 to master 
Change-Id: I483cb81596f09b024b1aea7fc55960183f38b24f
 2010-08-24 09:57:33 -07:00
Trevor Johns
bb75aa9065 am ca9d51b1: Disabling AccessibilityService sample from build system. 
Merge commit 'ca9d51b15074163521b140dce431cc3a10cb56fe' into gingerbread

* commit 'ca9d51b15074163521b140dce431cc3a10cb56fe':
  Disabling AccessibilityService sample from build system.
 2010-08-20 18:42:38 -07:00
Trevor Johns
ca9d51b150 Disabling AccessibilityService sample from build system. 
This is necessary for an upcoming doc push. I'll revert this change after the
doc push is complete.

Change-Id: I32bbff7797cf5af1642da2b907b20847c1d17d21
 2010-08-20 17:13:02 -07:00
Kenny Root
be857d4284 Reorganize MountService IPC 
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
 2010-08-20 13:17:12 -07:00
Ben Dodson
34f170f5ee Explicit warning level for deprecation mismatch 
Change-Id: I2ae784e61c4b4b7aa97d46080f78e9d4ab1df87f
 2010-08-19 14:24:45 -07:00
Jim Miller
c31f643223 Fix 2797185: Integrate Carousel widget into framework. 
Change-Id: Ia03e3f582541dd7f6079929e51d2484b5b91a67b
 2010-08-18 18:11:06 -07:00
Roman Nurik
89f0916696 am 96e24634: am e6bfceeb: am 3b70e159: Merge "Adding a sample accessibility service -make" into froyo 
Merge commit '96e24634c6db1a87285ca78d529dcc318653b7e9'

* commit '96e24634c6db1a87285ca78d529dcc318653b7e9':
  Adding a sample accessibility service -make
 2010-08-17 10:59:06 -07:00
Roman Nurik
e6bfceeb10 am 3b70e159: Merge "Adding a sample accessibility service -make" into froyo 
Merge commit '3b70e159a8168c1154d31d7b0552bb3b0c099334' into gingerbread

* commit '3b70e159a8168c1154d31d7b0552bb3b0c099334':
  Adding a sample accessibility service -make
 2010-08-17 10:45:30 -07:00
Kenny Root
bf0cb26a1c am f5ee5358: am ac9717ab: Merge "Move OBB file reading to DefaultContainerService" into gingerbread 
Merge commit 'f5ee5358c187107b2e5a1e1fbcb5a648d793c798'

* commit 'f5ee5358c187107b2e5a1e1fbcb5a648d793c798':
  Move OBB file reading to DefaultContainerService
 2010-08-11 14:15:10 -07:00
Kenny Root
a02b8b05dd Move OBB file reading to DefaultContainerService 
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
 2010-08-11 11:20:53 -07:00
Svetoslav Ganov
0581d4a197 Adding a sample accessibility service -make 
Change-Id: I5bdd57e022b9907f7745046d8818801dbc3929a8
 2010-08-10 21:39:56 -07:00
Ben Dodson
3fbe150d36 Updated error codes for Doclava migration 
Change-Id: Id8e8d0a47ae863cbdfb56569860fc0f56c644e97
 2010-08-10 10:42:21 -07:00
Chung-yih Wang
024d59601e resolved conflicts for merge of a06ad953 to master 
Change-Id: I282525787d7475cc72b2dec10fbc2cf8c5727b82
 2010-08-06 12:06:04 +08:00
Chung-yih Wang
2d94231ef9 Add SIP service into system server. 
Change-Id: Icc39e4e54768cfdcc1b20a3efe6206009b9a8d10
 2010-08-06 08:40:50 +08:00
Dianne Hackborn
9f53119b72 First pass at a new clipboard API. 
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
 2010-08-05 12:28:20 -07:00
Brian Carlstrom
3c7c351a62 Tracking merge of dalvik-dev to gingerbread 
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
 2010-08-04 23:47:38 -07:00
Scott Main
02a09927cc add droiddoc flag for honeycomb apis (for reference filtering) 
Change-Id: I711b71cbb914cbe9b6bcf7feae55332b1f3fa1c1
 2010-08-04 10:32:25 -07:00
Bai Tao
a58a8751b4 Add new system service CountryDetector 
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
 2010-07-28 09:45:57 +08:00
Mathias Agopian
50558b9561 resolved conflicts for merge of bc54e63c to master 
Change-Id: I4245b15b4cda6963d735442c0c6a04a0477ff5e1
 2010-07-21 18:10:22 -07:00