Dianne Hackborn
2f67bee481
am 4d6299be: am 6b3f9b3a: Clean up support library samples.
...
* commit '4d6299be11e4346b6abfe16f71114f3cea34d926':
Clean up support library samples.
2011-03-09 18:07:55 -08:00
Dianne Hackborn
4d6299be11
am 6b3f9b3a: Clean up support library samples.
...
* commit '6b3f9b3ac9327d22e73f4aa2b61e4fb6c3933a33':
Clean up support library samples.
2011-03-09 18:02:59 -08:00
Dianne Hackborn
6b3f9b3ac9
Clean up support library samples.
...
Move them off into their own directory, so it is less confusing to
find them.
Also put in some additional samples -- throttle and arguments.
And add some docs.
Change-Id: I221e56c7ff203934796979bb5ed7ab8835f84b83
2011-03-08 18:18:10 -08:00
Brad Fitzpatrick
4b24a4e810
am 9f06e429: am 6ecf30f2: Merge "Fix SpareParts crash going into battery stats."
...
* commit '9f06e429edf34e6add26a45d9b9ace20d44e0a8c':
Fix SpareParts crash going into battery stats.
2011-03-07 10:52:00 -08:00
Brad Fitzpatrick
9f06e429ed
am 6ecf30f2: Merge "Fix SpareParts crash going into battery stats."
...
* commit '6ecf30f2d8707de4c71272949afc2e6e6818e715':
Fix SpareParts crash going into battery stats.
2011-03-07 10:46:41 -08:00
Jaikumar Ganesh
b8ac11d575
Merge "Update bluetooth documentation."
2011-03-04 16:09:55 -08:00
Brad Fitzpatrick
6ecf30f2d8
Merge "Fix SpareParts crash going into battery stats."
2011-03-04 13:50:59 -08:00
Daniel Sandler
42f58ae22e
am cc6e41a4: am f6ab64af: Merge "Restore CAMERA permission to ApiDemos." into honeycomb-mr1
...
* commit 'cc6e41a44524592c9b477f99fcc738dea7538811':
Restore CAMERA permission to ApiDemos.
2011-03-04 11:38:27 -08:00
Daniel Sandler
cc6e41a445
am f6ab64af: Merge "Restore CAMERA permission to ApiDemos." into honeycomb-mr1
...
* commit 'f6ab64affe8cbd1ab8c163635faa557be58a207a':
Restore CAMERA permission to ApiDemos.
2011-03-04 11:07:51 -08:00
Daniel Sandler
f6ab64affe
Merge "Restore CAMERA permission to ApiDemos." into honeycomb-mr1
2011-03-04 10:42:15 -08:00
Daniel Sandler
6044514d0d
Restore CAMERA permission to ApiDemos.
...
Bug: 3512448
Change-Id: I6a80e7f0f9406e084fec9b626abb19cb24b4fe3d
2011-03-04 10:38:04 -05:00
Doug Zongker
13575201d2
Merge branch 'master' of ssh://android-git:29418/platform/development
2011-03-04 00:29:24 -08:00
Dianne Hackborn
277fd9adf7
am af3c92d5: Merge "New API demo showing arguments to fragments." into honeycomb-mr1
...
* commit 'af3c92d5016bd43c88d0a70d6f43ec7573ec1087':
New API demo showing arguments to fragments.
2011-03-04 00:15:01 -08:00
Andy Stadler
81d4216b79
am 04631234: Add emailcommon to classpath
...
* commit '04631234e920ccae612ac1ef39cf115931701030':
Add emailcommon to classpath
2011-03-04 00:14:59 -08:00
Android Git Automerger
208581903b
Merge branch 'master' of ssh://android-git:29418/platform/development
2011-03-03 22:25:56 -08:00
Dianne Hackborn
af3c92d501
Merge "New API demo showing arguments to fragments." into honeycomb-mr1
2011-03-03 22:23:17 -08:00
Dianne Hackborn
7f308f27bf
New API demo showing arguments to fragments.
...
Change-Id: I5bc41bb23b7ac6a6d7cbbd08cec67879dc4ae2fe
2011-03-03 22:20:11 -08:00
Ed Heyl
2e9c678537
Merge branch 'master' into honeycomb-plus-aosp
2011-03-03 21:48:48 -08:00
Dan Morrill
a773a80f18
NDEF Push Protocol spec PDF
...
Change-Id: I1fcf74d8179bfeff206441b45c7b8327a89d4351
2011-03-03 21:35:39 -08:00
Andy Stadler
04631234e9
Add emailcommon to classpath
...
Change-Id: Ia7ebfbc1c154883f9ace40ce5060a85cf471eaa2
2011-03-03 16:40:26 -08:00
Jaikumar Ganesh
ca0ff53ba0
Update bluetooth documentation.
...
a) Add HC and GB features.
b) Improve qualification message.
Change-Id: I9e023eea5c59438fb990d7464de477c7f51a0dd0
2011-03-03 14:15:19 -08:00
Brian Muramatsu
42cb1a23cc
Add Links to CTS 2.3 R2 and 1.6 R1
...
Bug 3486016
Change-Id: I2fe91aa7333cdaf4553eecd4a95446198d08c89b
2011-03-03 12:12:42 -08:00
Shih-wei Liao
45e0abddcf
Merge "Make AndroidManifest.xml's activity match what's in Java files"
2011-03-02 21:26:25 -08:00
Ying Wang
f566bf1d88
Merge "Add android-support-v4.jar to sdk."
2011-03-02 21:22:59 -08:00
Kenny Root
f57cc7f77b
Merge "Switch demo to use new delete observer"
2011-03-02 08:50:46 -08:00
Shih-wei Liao
7cd58489c9
Make AndroidManifest.xml's activity match what's in Java files
...
Change-Id: I9489d32a715a1aa7f8449495b7c1101a1ad1eac6
2011-03-01 18:21:44 -08:00
Ying Wang
d46eaa6f76
Add android-support-v4.jar to sdk.
...
Change-Id: I28d2a323d31df6b405548e0c73c616eb7b69753d
2011-03-01 17:14:05 -08:00
Xavier Ducrohet
add79697c8
Merge "Add readme to ApiDemos to mention the need for android-support-v4"
2011-03-01 16:45:04 -08:00
Xavier Ducrohet
86eecf0074
Add readme to ApiDemos to mention the need for android-support-v4
...
Change-Id: I3172f4644d41fe1358fd5ae327af03e54e1297b5
2011-03-01 16:32:51 -08:00
Xavier Ducrohet
7aa1c11e67
Fix SDK build.
...
Change-Id: I214048d331c0c9d3885983e588e9313dd3722346
2011-03-01 14:20:35 -08:00
Xavier Ducrohet
e488b3ef67
Put back jar file into compatibility package.
...
Change-Id: I437d3ba7b6fae13815e34a741adadac8e6ecd8f1
2011-03-01 12:07:04 -08:00
Xavier Ducrohet
281818d994
Merge "Fix build by using $(DIST_DIR)"
2011-03-01 11:10:34 -08:00
Xavier Ducrohet
51920ee661
Fix build by using $(DIST_DIR)
...
Change-Id: I68832ee411fcafa171354c8b06b0992c8f01cd4d
2011-03-01 11:10:02 -08:00
Brad Fitzpatrick
8832d812d5
Fix SpareParts crash going into battery stats.
...
Change-Id: Ib158b811c291285660be6fb35ec0f75c429fcea4
http://code.google.com/p/android/issues/detail?id=14898
2011-03-01 10:23:05 -08:00
Kenny Root
f9b8546aca
Switch demo to use new delete observer
...
PackageBrowser had a delete observer that needed to be changed
Change-Id: Ie0082b9af7a14d7d48f8ae64bee42e4c8fb214d7
2011-03-01 09:36:56 -08:00
Andy Stadler
07df538442
Merge "Refresh eclipse classpath"
2011-02-28 17:10:31 -08:00
Andy Stadler
db8cdb8218
Refresh eclipse classpath
...
* email intermediates moved to JAVA_LIBRARIES
* added android-support library
Change-Id: I9cc985f00f352547c29f2ac171e1ab03bc51a253
2011-02-28 17:07:45 -08:00
Xavier Ducrohet
a48db378fe
Merge "Package compatibility component."
2011-02-28 16:02:13 -08:00
Xavier Ducrohet
62df672f5d
Package compatibility component.
...
Change-Id: I4324df1814ae9450b254b22c7bd1b28e4826a29b
2011-02-28 15:57:39 -08:00
Andy Stadler
88cba92ba4
Merge "Add Exchange project to classpath"
2011-02-28 13:45:01 -08:00
Marc Blank
b1bc3d8c34
Add Exchange project to test_defs and coverage_targets
...
Change-Id: Ie854a0296955cbb42330989886d860d42ac5310b
2011-02-28 11:17:16 -08:00
David Turner
49880ee2b8
am a7a4a16d: am 0b80c5e8: am d2454506: Merge "Move files to proper location in development/ndk/platforms"
...
* commit 'a7a4a16d5e0552c1a64a2f8205fe42089d4df2af':
Line Wrapping General settings Set "Never join already wrapped lines" to true.
Move files to proper location in development/ndk/platforms
Blank Lines within class declarations Set "Before field declarations" value to 0.
2011-02-28 10:15:41 -08:00
David Turner
a7a4a16d5e
am 0b80c5e8: am d2454506: Merge "Move files to proper location in development/ndk/platforms"
...
* commit '0b80c5e83c057c42d3e3699593d89525c01a4096':
Line Wrapping General settings Set "Never join already wrapped lines" to true.
Move files to proper location in development/ndk/platforms
Blank Lines within class declarations Set "Before field declarations" value to 0.
2011-02-28 10:07:16 -08:00
David Turner
0b80c5e83c
am d2454506: Merge "Move files to proper location in development/ndk/platforms"
...
* commit 'd24545065acbacc7e9f1482f08013a4046640ad7':
Move files to proper location in development/ndk/platforms
2011-02-28 09:13:43 -08:00
Alex Sakhartchouk
005148359f
Merge "Moving renderscript sdk samples to their correct location."
2011-02-28 09:02:51 -08:00
David Turner
d24545065a
Merge "Move files to proper location in development/ndk/platforms"
2011-02-28 08:51:38 -08:00
Marc Blank
ac87006f19
Add Exchange project to classpath
...
Change-Id: I17c10b7da9014f7fc74e75cf1166ff631edfb09a
2011-02-27 11:41:27 -08:00
Jeff Brown
cce588af9a
Merge "Add a sample for HorizontalScrollView."
2011-02-25 17:15:20 -08:00
Dianne Hackborn
1917a19f3f
Merge "New API demo showing how to execute when app is updated."
2011-02-25 16:16:56 -08:00
Jeff Brown
2e87344184
Add a sample for HorizontalScrollView.
...
Change-Id: If5f59771182fdb1e76ac10e32a89257f047e6798
2011-02-25 12:04:25 -08:00