Commit Graph

3445 Commits

Author SHA1 Message Date
Trevor Johns
54270ee63f am ed1bc094: am 37fbca22: am 5865825d: Merge change Iabe9529e into eclair
Merge commit 'ed1bc094cf0688a79ee9a9f030533986d2eff249'

* commit 'ed1bc094cf0688a79ee9a9f030533986d2eff249':
  Adding ContactManager sample to SDK samples.
2009-12-09 16:26:31 -08:00
Scott Main
919e46da86 am 8158980b: am 441b80ab: am 6b4bd260: Merge change I1cd5c828 into eclair
Merge commit '8158980be8336c37a30a35de4e1dbbc3b0bb02d3'

* commit '8158980be8336c37a30a35de4e1dbbc3b0bb02d3':
  change the way bytes are read from InputStream.
2009-12-09 16:26:26 -08:00
James Yum
ee68f01a1d am 2a529126: am 1b5a89a2: am d2962a33: TextToSpeech API demo.
Merge commit '2a5291261163a7533097b80a6e5346f50ae2fe03'

* commit '2a5291261163a7533097b80a6e5346f50ae2fe03':
  TextToSpeech API demo.
2009-12-09 16:26:21 -08:00
Nicolas Catania
79726ff271 am 2bfd9db9: am 863270d1: Merge change I5ba25302 into eclair-mr2
Merge commit '2bfd9db950534a45b718f8939120a05ced5346f4'

* commit '2bfd9db950534a45b718f8939120a05ced5346f4':
  Added the new phone app unittest to runtest.
2009-12-09 16:26:15 -08:00
Derek Sollenberger
7d40a18f3f am 2823d675: am e8454e79: updating sample plugin to use new full screen interfaces.
Merge commit '2823d675626ead99e00dcf9958fda80c766b7f5b'

* commit '2823d675626ead99e00dcf9958fda80c766b7f5b':
  updating sample plugin to use new full screen interfaces.
2009-12-09 16:26:09 -08:00
Dianne Hackborn
7466716279 am d564588d: am 579c7f19: Reorganize Service API demos.
Merge commit 'd564588d7dd6975e13037af5cec6c33f52c9e55d'

* commit 'd564588d7dd6975e13037af5cec6c33f52c9e55d':
  Reorganize Service API demos.
2009-12-09 16:26:02 -08:00
Andrew Stadler
e54051d957 resolved conflicts for merge of e85c304f to master 2009-12-09 16:10:02 -08:00
Trevor Johns
ed1bc094cf am 37fbca22: am 5865825d: Merge change Iabe9529e into eclair
Merge commit '37fbca223a683b1d914b7b26eaf79da6c29aa113' into eclair-mr2-plus-aosp

* commit '37fbca223a683b1d914b7b26eaf79da6c29aa113':
  Adding ContactManager sample to SDK samples.
2009-12-09 15:56:43 -08:00
Scott Main
8158980be8 am 441b80ab: am 6b4bd260: Merge change I1cd5c828 into eclair
Merge commit '441b80ab3795cb9f02afa7a7397dccd7c17c0cdd' into eclair-mr2-plus-aosp

* commit '441b80ab3795cb9f02afa7a7397dccd7c17c0cdd':
  change the way bytes are read from InputStream.
2009-12-09 15:55:47 -08:00
James Yum
2a52912611 am 1b5a89a2: am d2962a33: TextToSpeech API demo.
Merge commit '1b5a89a2041586eba7211e996d4de9a5300e8b2d' into eclair-mr2-plus-aosp

* commit '1b5a89a2041586eba7211e996d4de9a5300e8b2d':
  TextToSpeech API demo.
2009-12-09 15:54:38 -08:00
Nicolas Catania
2bfd9db950 am 863270d1: Merge change I5ba25302 into eclair-mr2
Merge commit '863270d143ab4d496029f8417094187061e74ef2' into eclair-mr2-plus-aosp

* commit '863270d143ab4d496029f8417094187061e74ef2':
  Added the new phone app unittest to runtest.
2009-12-09 15:47:48 -08:00
Derek Sollenberger
2823d67562 am e8454e79: updating sample plugin to use new full screen interfaces.
Merge commit 'e8454e7969c4bc34d6f4a98ff27ffbf8dde20e4f' into eclair-mr2-plus-aosp

* commit 'e8454e7969c4bc34d6f4a98ff27ffbf8dde20e4f':
  updating sample plugin to use new full screen interfaces.
2009-12-09 15:44:43 -08:00
Dianne Hackborn
d564588d7d am 579c7f19: Reorganize Service API demos.
Merge commit '579c7f19ac379294822b976b73fe4037f40eba82' into eclair-mr2-plus-aosp

* commit '579c7f19ac379294822b976b73fe4037f40eba82':
  Reorganize Service API demos.
2009-12-09 15:41:08 -08:00
Andrew Stadler
e85c304f7d resolved conflicts for merge of fa3d6b54 to eclair-mr2-plus-aosp 2009-12-09 12:07:31 -08:00
Jack Palevich
fe8c16afe6 Simple Matrix Palette skinning sample. 2009-12-09 15:32:35 +08:00
Trevor Johns
37fbca223a am 5865825d: Merge change Iabe9529e into eclair
Merge commit '5865825df6792f1cf6a5f70911f5ad15a2a243b8' into eclair-mr2

* commit '5865825df6792f1cf6a5f70911f5ad15a2a243b8':
  Adding ContactManager sample to SDK samples.
2009-12-08 17:53:44 -08:00
Android (Google) Code Review
5865825df6 Merge change Iabe9529e into eclair
* changes:
  Adding ContactManager sample to SDK samples.
2009-12-08 17:50:19 -08:00
Trevor Johns
c6d634b850 Adding ContactManager sample to SDK samples.
This sample demonstrates use of the ContactsContract classes introduced in API Level 5.
2009-12-08 16:51:39 -08:00
Scott Main
441b80ab37 am 6b4bd260: Merge change I1cd5c828 into eclair
Merge commit '6b4bd26058d9d4d920e6a26c14a8f8bda9a863a3' into eclair-mr2

* commit '6b4bd26058d9d4d920e6a26c14a8f8bda9a863a3':
  change the way bytes are read from InputStream.
2009-12-08 16:47:50 -08:00
Android (Google) Code Review
6b4bd26058 Merge change I1cd5c828 into eclair
* changes:
  change the way bytes are read from InputStream. Read only the bytes received and don't allocate new arrays Also revise the mechanism for writing the outgoing messages to the screen to be more consistent with reading and cleanup line lengths to be <100 chars.
2009-12-08 16:44:40 -08:00
Scott Main
25b6aed7b2 change the way bytes are read from InputStream.
Read only the bytes received and don't allocate new arrays
Also revise the mechanism for writing the outgoing messages
to the screen to be more consistent with reading and
cleanup line lengths to be <100 chars.
2009-12-08 16:29:51 -08:00
James Yum
1b5a89a204 am d2962a33: TextToSpeech API demo.
Merge commit 'd2962a33216ce40a526c80fc8865cf9bd04936f4' into eclair-mr2

* commit 'd2962a33216ce40a526c80fc8865cf9bd04936f4':
  TextToSpeech API demo.
2009-12-08 16:13:06 -08:00
Megha Joshi
c38796e255 am 0a510b1f: am 0cf6092e: am 11d89599: Add QuickContactsBadge widget sample to ApiDemos
Merge commit '0a510b1f704ac940cf3d166a4f139c1910db1677'

* commit '0a510b1f704ac940cf3d166a4f139c1910db1677':
  Add QuickContactsBadge widget sample to ApiDemos
2009-12-08 14:52:03 -08:00
Marco Nelissen
45d9819638 am 92f95ee3: am bd642f3e: Make the simulator use alsa instead of esound.
Merge commit '92f95ee3fb30ed86fb0b9e080551552448b511ae'

* commit '92f95ee3fb30ed86fb0b9e080551552448b511ae':
  Make the simulator use alsa instead of esound.
2009-12-08 14:51:04 -08:00
Android (Google) Code Review
863270d143 Merge change I5ba25302 into eclair-mr2
* changes:
  Added the new phone app unittest to runtest.
2009-12-08 10:49:26 -08:00
Derek Sollenberger
e8454e7969 updating sample plugin to use new full screen interfaces. 2009-12-08 08:11:33 -05:00
Nicolas Catania
6f0366f773 Added the new phone app unittest to runtest.
Used phone-unit for the test name because 'phone'
is already taken by a package under '/vendor'.
2009-12-07 21:13:22 -08:00
James Yum
d2962a3321 TextToSpeech API demo. 2009-12-07 18:35:56 -08:00
Owen Lin
b05eba3155 am 0a91a547: am 0ee41ccc: Merge change I1558a070 into eclair-mr2
Merge commit '0a91a547ee32d559b7b737f69430d4d0732dfca9'

* commit '0a91a547ee32d559b7b737f69430d4d0732dfca9':
  Fix the camera preview demo.
2009-12-07 18:30:14 -08:00
Dianne Hackborn
579c7f19ac Reorganize Service API demos.
This collapses multiple related files in one, to make it easier to deal
with in documentation and elsewhere.
2009-12-07 18:05:40 -08:00
Megha Joshi
0a510b1f70 am 0cf6092e: am 11d89599: Add QuickContactsBadge widget sample to ApiDemos
Merge commit '0cf6092e742fbf95722e596f0d4e808e87ac6ce2' into eclair-mr2-plus-aosp

* commit '0cf6092e742fbf95722e596f0d4e808e87ac6ce2':
  Add QuickContactsBadge widget sample to ApiDemos
2009-12-07 17:03:40 -08:00
Android (Google) Code Review
fa3d6b5411 Merge change Ifc1b1ccb into eclair-mr2
* changes:
  Fix eclipse build
2009-12-07 16:59:07 -08:00
Megha Joshi
0cf6092e74 am 11d89599: Add QuickContactsBadge widget sample to ApiDemos
Merge commit '11d89599ef7cf949bfe0048d1352f264ee0f6a34' into eclair-mr2

* commit '11d89599ef7cf949bfe0048d1352f264ee0f6a34':
  Add QuickContactsBadge widget sample to ApiDemos
2009-12-07 16:59:00 -08:00
Megha Joshi
11d89599ef Add QuickContactsBadge widget sample to ApiDemos 2009-12-07 16:53:24 -08:00
Marco Nelissen
92f95ee3fb am bd642f3e: Make the simulator use alsa instead of esound.
Merge commit 'bd642f3e94f4cb94cbb48646ae61da5f6b18a093' into eclair-mr2-plus-aosp

* commit 'bd642f3e94f4cb94cbb48646ae61da5f6b18a093':
  Make the simulator use alsa instead of esound.
2009-12-07 16:02:40 -08:00
David 'Digit' Turner
d8ec4b51cb am cc3d3913: am 85f5c420: am e8d64956: Merge change I6b913ab8 into eclair
Merge commit 'cc3d39135124776ca2d36d6e973bc5b332fa9cbf'

* commit 'cc3d39135124776ca2d36d6e973bc5b332fa9cbf':
  Fix toolchain scripts for Darwin and Cygwin.
2009-12-07 14:57:29 -08:00
Megha Joshi
2d5ebf1e18 am f1074892: am 2321ba48: am b49dd835: Adding wallpaper sample in ApiDemos.
Merge commit 'f10748929f7edcf142357d03bed5464964284fdb'

* commit 'f10748929f7edcf142357d03bed5464964284fdb':
  Adding wallpaper sample in ApiDemos.
2009-12-07 14:56:59 -08:00
Marco Nelissen
caf9771fb2 am 1009e293: am ac2a5cf7: Fix fake timing.
Merge commit '1009e293d06026e9fb9240ad29308daebdf68236'

* commit '1009e293d06026e9fb9240ad29308daebdf68236':
  Fix fake timing.
2009-12-07 14:53:55 -08:00
Marco Nelissen
bd642f3e94 Make the simulator use alsa instead of esound. 2009-12-07 12:31:36 -08:00
Andrew Stadler
fc1b1ccbcf Fix eclipse build
* Bring in auto-generated EventLogTags
2009-12-07 10:55:39 -08:00
Owen Lin
0a91a547ee am 0ee41ccc: Merge change I1558a070 into eclair-mr2
Merge commit '0ee41ccc1429b83c6ab62cb99e081826a94741e8' into eclair-mr2-plus-aosp

* commit '0ee41ccc1429b83c6ab62cb99e081826a94741e8':
  Fix the camera preview demo.
2009-12-07 00:04:49 -08:00
Android (Google) Code Review
0ee41ccc14 Merge change I1558a070 into eclair-mr2
* changes:
  Fix the camera preview demo.
2009-12-07 00:00:07 -08:00
David 'Digit' Turner
cc3d391351 am 85f5c420: am e8d64956: Merge change I6b913ab8 into eclair
Merge commit '85f5c42069ab6ae90d1ed1c04f22a7b42407e55d' into eclair-mr2-plus-aosp

* commit '85f5c42069ab6ae90d1ed1c04f22a7b42407e55d':
  Fix toolchain scripts for Darwin and Cygwin.
2009-12-04 18:31:25 -08:00
David 'Digit' Turner
85f5c42069 am e8d64956: Merge change I6b913ab8 into eclair
Merge commit 'e8d649561a6dbc6e0260d4b24049c00d23e7285b' into eclair-mr2

* commit 'e8d649561a6dbc6e0260d4b24049c00d23e7285b':
  Fix toolchain scripts for Darwin and Cygwin.
2009-12-04 18:27:05 -08:00
Android (Google) Code Review
e8d649561a Merge change I6b913ab8 into eclair
* changes:
  Fix toolchain scripts for Darwin and Cygwin.
2009-12-04 18:22:21 -08:00
David 'Digit' Turner
6b913ab885 Fix toolchain scripts for Darwin and Cygwin.
Only touches download-toolchain-sources.sh and build-toolchain.sh
This does not impact the NDK build scripts themselves and is only
needed to properly package NDK release packages.
2009-12-04 17:57:36 -08:00
Megha Joshi
f10748929f am 2321ba48: am b49dd835: Adding wallpaper sample in ApiDemos.
Merge commit '2321ba48baed1638a71ec8c7b1d6f9d79e3e9f83' into eclair-mr2-plus-aosp

* commit '2321ba48baed1638a71ec8c7b1d6f9d79e3e9f83':
  Adding wallpaper sample in ApiDemos.
2009-12-04 17:10:40 -08:00
Megha Joshi
2321ba48ba am b49dd835: Adding wallpaper sample in ApiDemos.
Merge commit 'b49dd8359d1b23eb527139499c0db58cb01466c6' into eclair-mr2

* commit 'b49dd8359d1b23eb527139499c0db58cb01466c6':
  Adding wallpaper sample in ApiDemos.
2009-12-04 17:06:39 -08:00
Megha Joshi
b49dd8359d Adding wallpaper sample in ApiDemos. 2009-12-04 17:00:21 -08:00
Marco Nelissen
1009e293d0 am ac2a5cf7: Fix fake timing.
Merge commit 'ac2a5cf7e45a2fa7936119517e4f52517b9d5747' into eclair-mr2-plus-aosp

* commit 'ac2a5cf7e45a2fa7936119517e4f52517b9d5747':
  Fix fake timing.
2009-12-04 14:48:27 -08:00