Commit Graph

3031 Commits

Author SHA1 Message Date
Trevor Johns
19d79f2fb4 am 4eb4ed2d: am bba4ff7c: Fixing crash in ContactManager: Changing ContactsContract.Contacts.LOOKUP_KEY to ContactsContract.Contacts._ID.
Merge commit '4eb4ed2d19c498998bb9560c71873fa6657d0644' into eclair-mr2-plus-aosp

* commit '4eb4ed2d19c498998bb9560c71873fa6657d0644':
  Fixing crash in ContactManager: Changing ContactsContract.Contacts.LOOKUP_KEY to
2009-12-10 16:55:06 -08:00
Trevor Johns
4eb4ed2d19 am bba4ff7c: Fixing crash in ContactManager: Changing ContactsContract.Contacts.LOOKUP_KEY to ContactsContract.Contacts._ID.
Merge commit 'bba4ff7c38e7e6837fabdb225cdb24d12a17eabc' into eclair-mr2

* commit 'bba4ff7c38e7e6837fabdb225cdb24d12a17eabc':
  Fixing crash in ContactManager: Changing ContactsContract.Contacts.LOOKUP_KEY to
2009-12-10 16:45:44 -08:00
Grace Kloba
3744ddfa36 am 2c0f89aa: Update SampleBrowserPlugin to show handling long press and double tap events.
Merge commit '2c0f89aaf61d62ac2f28ff3e46db6ba27983c6e5' into eclair-mr2-plus-aosp

* commit '2c0f89aaf61d62ac2f28ff3e46db6ba27983c6e5':
  Update SampleBrowserPlugin to show handling
2009-12-09 16:01:30 -08:00
Jack Palevich
67250c0d1f am 3c31d6cd: Simple Matrix Palette skinning sample.
Merge commit '3c31d6cded51b6e6719b0052ec9987ca7218c868' into eclair-mr2-plus-aosp

* commit '3c31d6cded51b6e6719b0052ec9987ca7218c868':
  Simple Matrix Palette skinning sample.
2009-12-09 15:59:16 -08:00
Jack Palevich
59a3008aa4 am 5dc44989: Add OpenGL ES 2.0 sample.
Merge commit '5dc449896cb596159652d15e7333d74e53601609' into eclair-mr2-plus-aosp

* commit '5dc449896cb596159652d15e7333d74e53601609':
  Add OpenGL ES 2.0 sample.
2009-12-09 15:59:12 -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
Grace Kloba
2c0f89aaf6 Update SampleBrowserPlugin to show handling
long press and double tap events.
2009-12-09 11:11:45 -08:00
Jack Palevich
3c31d6cded Simple Matrix Palette skinning sample. 2009-12-09 18:35:19 +08:00
Jack Palevich
5dc449896c Add OpenGL ES 2.0 sample.
This sample renders a textured triangle using OpenGL ES 2.0.

If OpenGL ES 2.0 is not available, the sample falls back to
using OpenGL ES 1.0.
2009-12-09 16:37:55 +08:00
Trevor Johns
bba4ff7c38 Fixing crash in ContactManager: Changing ContactsContract.Contacts.LOOKUP_KEY to
ContactsContract.Contacts._ID.
2009-12-08 23:23:53 -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
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
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
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
Marco Nelissen
ac2a5cf7e4 Fix fake timing. 2009-12-04 14:44:43 -08:00
Scott Main
768421daf5 am 2eaa8880: am c5a640ee: Merge change Icce4f510 into eclair
Merge commit '2eaa8880f076ebd0db36de81f9feaf34bd571df3' into eclair-mr2-plus-aosp

* commit '2eaa8880f076ebd0db36de81f9feaf34bd571df3':
  change BT sample minsdkversion to 6 because it
2009-12-03 18:24:44 -08:00
Scott Main
2eaa8880f0 am c5a640ee: Merge change Icce4f510 into eclair
Merge commit 'c5a640ee3aba8c3215a769a11492a4dc8d82bd72' into eclair-mr2

* commit 'c5a640ee3aba8c3215a769a11492a4dc8d82bd72':
  change BT sample minsdkversion to 6 because it
2009-12-03 18:14:59 -08:00
Android (Google) Code Review
c5a640ee3a Merge change Icce4f510 into eclair
* changes:
  change BT sample minsdkversion to 6 because it uses the revised result codes when enabling BT
2009-12-03 18:07:52 -08:00
Scott Main
cce4f51025 change BT sample minsdkversion to 6 because it
uses the revised result codes when enabling BT
2009-12-03 17:59:47 -08:00