Glenn Kasten
6e20b04ed0
am f328f262: Merge "Remove .classpath and .project files" into gingerbread
...
* commit 'f328f262fd66f90a8ebda011e75dfcc11b65279a':
Remove .classpath and .project files
2010-11-15 16:25:58 -08:00
Glenn Kasten
f328f262fd
Merge "Remove .classpath and .project files" into gingerbread
2010-11-15 16:23:34 -08:00
Megha Joshi
064a7f0ad8
am d53c6f2a: (-s ours) am 7f39ff80: Merge "NFC sample app (DO NOT MERGE)" into gingerbread
...
* commit 'd53c6f2ac325f6e06a94f751817a9ecdfa4eb7f1':
NFC sample app (DO NOT MERGE)
2010-11-12 18:34:19 -08:00
Megha Joshi
d53c6f2ac3
am 7f39ff80: Merge "NFC sample app (DO NOT MERGE)" into gingerbread
...
* commit '7f39ff802b6281b563f341dc89c58a43ec6bdd99':
NFC sample app (DO NOT MERGE)
2010-11-12 18:32:14 -08:00
Megha Joshi
7f39ff802b
Merge "NFC sample app (DO NOT MERGE)" into gingerbread
2010-11-12 18:30:14 -08:00
Megha Joshi
150dd1693f
NFC sample app (DO NOT MERGE)
...
Change-Id: I1d1d67bbc6760cea1a0c6eccfa4d9f7b1398cd4d
2010-11-12 18:03:05 -08:00
Brian Muramatsu
edc0ec900e
Update Android CTS Download Link to 2.2_r4
...
Bug 3166146
Change-Id: I91969c15c95cf208a2ae90bca6a75fb6b4a5bddd
2010-11-12 12:45:00 -08:00
Jim Miller
3087c65b7c
Merge "Add password expiration test to DeviceAdminSample."
2010-11-11 19:45:45 -08:00
Jaikumar Ganesh
e79b943821
Merge "Start the accept thread when the socket gets disconnected."
2010-11-11 16:09:08 -08:00
Jaikumar Ganesh
c4ee500f13
Start the accept thread when the socket gets disconnected.
...
Change-Id: I937c19c657a1077df8c2c19b5edc3fec218e11a4
2010-11-11 16:01:50 -08:00
Gilles Debunne
a9c1bf68a8
Merge "New demos and tests for Tabs in Holo theme."
2010-11-11 12:25:27 -08:00
Gilles Debunne
2fba3e1bce
New demos and tests for Tabs in Holo theme.
...
Change-Id: Ifd12e639e7e25e1e5ea7b1b1106789976d9450d3
2010-11-11 12:17:49 -08:00
Gilles Debunne
12fca8d8f0
Renamed fill_parent to match_parent
...
Change-Id: I12ddb06d560f4f373c5ad292823a4646be133744
2010-11-11 12:10:43 -08:00
Jim Miller
7a2d5f2981
Add password expiration test to DeviceAdminSample.
...
Change-Id: Ib5b398dc068227529d83be2b55c33225f9bbce80
2010-11-10 21:36:55 -08:00
Glenn Kasten
74025fa139
am 296326ba: am 809ec924: Native audio example
...
* commit '296326baa9a1e92a8603f51dc457c09d7305d8d4':
Native audio example
2010-11-08 13:20:45 -08:00
Raphael
2dcfe08b48
Merge commit '4e75b80a' into merge
...
Conflicts:
host/windows/usb/android_winusb.inf
Change-Id: I64a3be958e85302d0a6213d1c46ff9e7214ef352
2010-11-08 12:51:51 -08:00
Glenn Kasten
296326baa9
am 809ec924: Native audio example
...
* commit '809ec924d28657e8be8ca36871ce6ddbfedcdc40':
Native audio example
2010-11-08 12:13:19 -08:00
Raphael Moll
4e75b80a4d
am 4bd402f5: Merge "Fix DOS end-of-lines in winusb INF file."
...
* commit '4bd402f5f1f15a7e9f13ae0104d32285113d780b':
Fix DOS end-of-lines in winusb INF file.
2010-11-08 10:13:55 -08:00
Raphael Moll
4bd402f5f1
Merge "Fix DOS end-of-lines in winusb INF file."
2010-11-08 10:02:03 -08:00
Glenn Kasten
809ec924d2
Native audio example
...
Change-Id: Ia48597d3e94d178ec95a396c545e4a95de7c88f8
2010-11-05 17:38:11 -07:00
Raphael Moll
66980b1877
Fix DOS end-of-lines in winusb INF file.
...
The file has a mix of unix and DOS-mode end-of-lines.
This CL just fixes the end-of-line to make it a consistent DOS-mode.
There is no change to the actualy content.
Change-Id: I6635ec87907f68e1d34c807f712723804eb0e698
2010-11-05 16:35:01 -07:00
Adam Powell
80541cbaf3
Update modal multi-select demo to restore gracefully after orientation changes
...
Change-Id: I6ef6ecb28c1e0cccb2bc88be3f4a6b14351d7849
2010-11-05 11:58:27 -07:00
Andrew Stadler
999c358399
Cleanup eclipse .classpath
...
* New: add frameworks/base/drm
* Old: remove frameworks renderscript intermediates
Change-Id: Icb4898f2a09900595313848b2ed92a23eeb8d9a0
2010-11-04 14:32:31 -07:00
David 'Digit' Turner
c4d2b6d9a2
am 2b7aeaf0: am 186ce6d5: Merge "NDK: Last cleanup of the platform headers" into gingerbread
...
* commit '2b7aeaf07787e414ad2af93bd88baee47b727000':
NDK: Last cleanup of the platform headers
2010-11-04 10:57:25 -07:00
David 'Digit' Turner
fd94292af2
am f7b07025: am cc5809bf: Merge "ndk: Use __ANDROID__ instead of ANDROID." into gingerbread
...
* commit 'f7b070255f964af5eef0e2562d892058786df2db':
ndk: Use __ANDROID__ instead of ANDROID.
2010-11-04 10:57:23 -07:00
Alexander Lucas
40090497c6
am 655f02a4: am 48cc36d9: Merge "Added SIP Demo to sample apps." into gingerbread
...
* commit '655f02a45669ce3b03d96cd8634bfe3745b6f725':
Added SIP Demo to sample apps.
2010-11-04 07:20:40 -07:00
David 'Digit' Turner
2b7aeaf077
am 186ce6d5: Merge "NDK: Last cleanup of the platform headers" into gingerbread
...
* commit '186ce6d54380d2808acf341aec676f9c5ec56b63':
NDK: Last cleanup of the platform headers
2010-11-04 04:11:19 -07:00
David 'Digit' Turner
186ce6d543
Merge "NDK: Last cleanup of the platform headers" into gingerbread
2010-11-04 04:09:48 -07:00
David 'Digit' Turner
f7b070255f
am cc5809bf: Merge "ndk: Use __ANDROID__ instead of ANDROID." into gingerbread
...
* commit 'cc5809bf2fdae2ea7b5d84b21875cd2220c66105':
ndk: Use __ANDROID__ instead of ANDROID.
2010-11-04 04:08:23 -07:00
David 'Digit' Turner
3c7c38b2bb
NDK: Last cleanup of the platform headers
...
- fix a declaration omission in 3/<grp.h>
- add missing 8/<err.h>
- simplify 8/<stdio.h>
- update 9/ headers to the latest Bionic versions
- fix a typo in android_native_app_glue.h
- use __BEGIN_DECLS .. __END_DECLS whenever possible.
- remove C++-style comments from headers
Change-Id: I58b98b3973cde494436206194ba33416a11ca8ee
2010-11-04 04:07:16 -07:00
David 'Digit' Turner
cc5809bf2f
Merge "ndk: Use __ANDROID__ instead of ANDROID." into gingerbread
2010-11-04 04:06:31 -07:00
Adam Powell
2b658f0d9f
Add ActionBarTabs demo
...
Change-Id: I21087d63f78a4d35b249e7ffd92bf6823cf29b60
2010-11-03 19:24:16 -07:00
Chet Haase
04281538b3
Update animation demo to use setBackgroundColor functionality on View
...
Change-Id: I6811fd4a3612c9af8f09e570ee3c600570cefcb1
2010-11-03 18:34:55 -07:00
Xavier Ducrohet
b76b6c5b61
Merge "Make ApiDemo build on Java 5.0"
2010-11-03 18:20:35 -07:00
Xavier Ducrohet
0bb93262cc
Make ApiDemo build on Java 5.0
...
Change-Id: Ib0759e5598d73741ef9e2408f08edd5d6b38288b
2010-11-03 18:11:02 -07:00
Chet Haase
df5ab89e0b
Merge "Updated to the new optimized keyframe APIs"
2010-11-03 17:44:33 -07:00
Chet Haase
2d3d5377a8
Updated to the new optimized keyframe APIs
...
Also fixed some existing bugs in some of the animation apps
Change-Id: Iff39a8396f8c49e2db8601b04012a0bb784a78ed
2010-11-03 16:21:15 -07:00
Alexander Lucas
655f02a456
am 48cc36d9: Merge "Added SIP Demo to sample apps." into gingerbread
...
* commit '48cc36d936ea132665c35a1f8c9a2b4b9207ec0b':
Added SIP Demo to sample apps.
2010-11-03 15:35:24 -07:00
Alexander Lucas
48cc36d936
Merge "Added SIP Demo to sample apps." into gingerbread
2010-11-03 15:32:48 -07:00
Alexander Lucas
a025796211
Added SIP Demo to sample apps.
...
Change-Id: Id98b6e542e1be5b9822a696936e735406c08500f
2010-11-03 13:21:52 -07:00
Dirk Dougherty
c06f3bcf80
am 9c92ae92: am 49fe761d: Merge "Cherry pick from master: Sample app and test package for a Service" into gingerbread
...
* commit '9c92ae922c1ef17caac6b39db1cd29a89865df56':
Cherry pick from master: Sample app and test package for a Service
2010-11-03 13:16:40 -07:00
Dirk Dougherty
9c92ae922c
am 49fe761d: Merge "Cherry pick from master: Sample app and test package for a Service" into gingerbread
...
* commit '49fe761ddcf779f1913d22706a2a6153b80aa397':
Cherry pick from master: Sample app and test package for a Service
2010-11-03 13:13:33 -07:00
Dirk Dougherty
49fe761ddc
Merge "Cherry pick from master: Sample app and test package for a Service" into gingerbread
2010-11-03 13:12:11 -07:00
Roman Nurik
b7ba9ee6cc
am bf8c20f6: am bccecc2b: Merge "Add ApiDemo for android.media.audiofx (Visualizer and Equalizer)" into gingerbread
...
* commit 'bf8c20f6f0ee32f7ca7bfb2fb5d932f13cab55ee':
Add ApiDemo for android.media.audiofx (Visualizer and Equalizer)
2010-11-03 12:02:21 -07:00
David Turner
3885c649aa
am dc4800e4: am fc187b1e: Merge "update native_window.h ndk header" into gingerbread
...
* commit 'dc4800e43b063ebe8994827f5dea58206a503efd':
update native_window.h ndk header
2010-11-03 08:31:15 -07:00
David 'Digit' Turner
7e73103bb8
am 33d21904: am 10795d84: Declare localeconv() in <locale.h>
...
* commit '33d21904a4677f10aa651abb39d0c7c9308e104b':
Declare localeconv() in <locale.h>
2010-11-03 08:31:09 -07:00
Roman Nurik
bf8c20f6f0
am bccecc2b: Merge "Add ApiDemo for android.media.audiofx (Visualizer and Equalizer)" into gingerbread
...
* commit 'bccecc2b871749695148a7dcf27ff5b8655a77a0':
Add ApiDemo for android.media.audiofx (Visualizer and Equalizer)
2010-11-03 07:56:40 -07:00
Roman Nurik
bccecc2b87
Merge "Add ApiDemo for android.media.audiofx (Visualizer and Equalizer)" into gingerbread
2010-11-03 07:55:06 -07:00
David Turner
dc4800e43b
am fc187b1e: Merge "update native_window.h ndk header" into gingerbread
...
* commit 'fc187b1e3a73275dba91e98d912aa23d7b097fc9':
update native_window.h ndk header
2010-11-02 01:51:44 -07:00
David Turner
fc187b1e3a
Merge "update native_window.h ndk header" into gingerbread
2010-11-02 01:49:47 -07:00