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

296 Commits

Author SHA1 Message Date
Roman Nurik
8635908da1 Merge "Update resources data JSON, sample screenshot, and SDK makefile for Honeycomb Gallery" into honeycomb 2011-02-07 17:22:43 -08:00
Scott Main
62e9701099 enable javadoc filtering for api level 11 and disable preview doc mode 
Change-Id: I12e5f295145ef037beda0e1a3ae0358cf5a2b590
 2011-02-07 16:35:46 -08:00
Roman Nurik
a35f65692d Update resources data JSON, sample screenshot, and SDK makefile for Honeycomb Gallery 
Change-Id: I0a09517935dd330d0069bfb3e6382cdcbef8e99c
 2011-02-07 12:14:31 -08:00
Jean-Baptiste Queru
ef1cf4b416 Merge ba3dd323 from gingerbread 
Change-Id: I615bf5177abbc680292e0116491da58835c7396f
 2011-01-29 10:11:06 -08:00
Scott Main
ba3dd32357 enable preview mode for docs and add api level 10 flag for api level diffs 
Change-Id: Ief2adca0f7f5c37d9381bd69d39a27aa11ec85dc
 2011-01-26 18:29:50 -08:00
Robert Ly
3f9b6445cb Doc change: adding missing samples 
Change-Id: Id5f63a02b80f88b5cb0c4db18322554944b944c9
 2011-01-19 19:57:37 -08:00
Alexander Lucas
d84725401d Added Honeycomb-Gallery to docs. 
Change-Id: I3879ee553f761113b30f8ad82c0a226d0823dd2c
 2011-01-19 18:31:44 -08:00
Winson Chung
81f39eb6e7 Refactoring app widgets to address security/performance issues. 
- 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
 2011-01-18 22:57:09 -08:00
Scott Main
07226c29f3 set sdk version to "Android 3.0" and api level to "Honeycomb" 
Change-Id: I89a7149b32643d7e9c79bf2030b061bbff3bd8c4
 2011-01-17 16:53:10 -08:00
Brian Carlstrom
cf9a013774 Import libcore_to_document definition from libcore/Docs.mk 
Change-Id: I5f4ac355c6dadefce5762e0096dcc7379e5bf31d
 2011-01-05 17:52:36 -08:00
Nick Pelly
089c3c7c0b resolved conflicts for merge of 28e8c66d to master 
Change-Id: I9746fd7478d3954b491179ffbd241f481cc2fb6c
 2010-12-06 11:50:47 -08:00
Nick Pelly
16ec9c5bb5 Merge branch gingerbread-nfc into gingerbread. 
Change-Id: I37d657a16061fddfbb0993463f24d6d3945cddd1
Signed-off-by: Nick Pelly <npelly@google.com>
 2010-12-05 14:45:29 -08:00
Dirk Dougherty
92f4d9db83 am f4c2eaf2: am 47ccfcb0: Doc change: add AccelerometerPlay to the generated samples. 
* commit 'f4c2eaf2628582abf6eb0cc335bc864d2c64f440':
  Doc change: add AccelerometerPlay to the generated samples.
 2010-11-29 18:19:38 -08:00
Dirk Dougherty
47ccfcb015 Doc change: add AccelerometerPlay to the generated samples. 
Change-Id: I95764f216455bbceef7fa95a1a819b906e4e7e7c
 2010-11-29 18:12:36 -08:00
Dirk Dougherty
e7d9ab0dcf am cb1af77f: am b1150edc: Remove HeavyWeight sample from generated html samples. 
* commit 'cb1af77f1fefddb78b4540db7d4a1df673caffe2':
  Remove HeavyWeight sample from generated html samples.
 2010-11-29 17:15:47 -08:00
Dirk Dougherty
b1150edc22 Remove HeavyWeight sample from generated html samples. 
Change-Id: Idafb3d225d8e6a694faa2d8679c4dad6198df466
 2010-11-29 17:03:15 -08:00
Scott Main
b402f11a6d docs: add preview sdk docs to provide an api overview and install steps, 
enable the 'preview' flag for the docs build
revise sdk side nav for preview

Change-Id: Ifc26cfb1f18e394e96853fd42f0e194d5f8552f3
 2010-11-29 14:28:13 -08:00
Trevor Johns
a4db01151e am d3f19b86: am 210e9c4a: Merge "Revert "Disabling AccessibilityService sample from build system."" into gingerbread 
* commit 'd3f19b86b0f454b1bd2600d51d241b05fd5d9331':
  Revert "Disabling AccessibilityService sample from build system."
 2010-11-24 16:27:34 -08:00
Trevor Johns
e66593b47c Revert "Disabling AccessibilityService sample from build system." 
This re-enables the AccessibilityService sample.

This reverts commit ca9d51b15074163521b140dce431cc3a10cb56fe.
 2010-11-24 16:03:21 -08:00
Scott Main
131aef5303 am 4f3c40cc: am 8fac7c2e: change sdk version variable to 2.3 (for docs) 
* commit '4f3c40cc4d24ba1404b1332dbf1bfcddede8bf99':
  change sdk version variable to 2.3 (for docs)
 2010-11-22 13:58:05 -08:00
Scott Main
8fac7c2edc change sdk version variable to 2.3 (for docs) 
Change-Id: I76f5c69fab08913543c4f3d1ab000f7c4b6c9574
 2010-11-22 13:36:39 -08:00
Daniel Tomas
9024564107 Secure Element access implementation 
Change-Id: I907e6771ecc5babe895115c3a49288fa2144a187
 2010-11-19 22:23:45 -06:00
Jeff Hamilton
6be655c768 Rough first pass at the NFC technology API. 
Change-Id: I903ad6bc124bf9a65af788dae45f55d58704ef7b
 2010-11-19 20:26:29 -06:00
Megha Joshi
e2ef2c10e7 Fixing build (DO NOT MERGE) 
Change-Id: I27fb9dc0584940e119b030d63ff5781ef19001c1
 2010-11-12 19:09:11 -08:00
Megha Joshi
48c698fc14 Adding NFC sample resources (DO NOT MERGE) 
Change-Id: I687d07ebe4f8bd0c5dec30e69af0d3e880a68230
 2010-11-12 18:35:49 -08:00
Jason Chen
15d18efddd resolved conflicts for merge of f0452c25 to master 
Change-Id: Ie8f5e81393ac965fd570f99239ab8be8ea0db00c
 2010-11-04 09:29:55 -07:00
Alexander Lucas
a11c9e1506 Added SIP Demo 
Change-Id: I418bd272b42b82b9048934071322013f62ac0635
 2010-11-03 13:11:14 -07:00
David Deephanphongs
62f2ada64f Add missing NOTICE entries. 
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
 2010-10-19 16:56:02 -07:00
Scott Main
e9ac4e256d add api level 9 'since' flag to docs 
Change-Id: Idee873a20ae0f3f0a9705997c8b73ce7f181906f
 2010-10-19 08:23:35 -07:00
Scott Main
453c6d449b add api level 9 'since' flag to docs 
Change-Id: Ia28ed9b4791cddfa0ee11b86c392dff7caca1dd8
 2010-10-18 18:41:52 -07:00
Nick Pelly
f36c6db108 NFC API revision round 2. 
- 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
 2010-10-14 19:16:35 -07:00
Nick Pelly
d197f59ec9 Fix build. 
I removed these by mistake, and incremental build failed to pick the failure.

Change-Id: I19496d62a1eb1dc738a3a0b88d22ca1d5dddba96
 2010-10-12 19:21:07 -07:00
Nick Pelly
590b73bc5b NFC API revision round 2. 
- 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>
 2010-10-12 18:37:26 -07:00
Bjorn Bringert
25108167fd Remove the unused UrlRendererService 
Change-Id: I48af718d9753b475bd041147f0d18bee60da84ec
 2010-10-12 15:14:27 +01:00
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