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
Android (Google) Code Review
dcf99fbe7a
Merge change If4ff28ed into eclair-mr2
...
* changes:
Cleanup one of the ListView sample demos.
2009-12-10 16:51:41 -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
Romain Guy
f4ff28edda
Cleanup one of the ListView sample demos.
2009-12-10 15:19:03 -08:00
Roman Nurik
e7e7a6b821
Modify index pages of MultiResolution, Wiktionary, and WiktionarySimple samples, to point to new screenshots. Also some minor cleanup.
2009-12-10 09:43:24 -08:00
Grace Kloba
276b14eee5
am 3744ddfa: am 2c0f89aa: Update SampleBrowserPlugin to show handling long press and double tap events.
...
Merge commit '3744ddfa36deaed303401d5faec18a40daac8e28'
* commit '3744ddfa36deaed303401d5faec18a40daac8e28':
Update SampleBrowserPlugin to show handling
2009-12-09 18:37:51 -08:00
Trevor Johns
a6db4b4643
am 0359bdb7: Merge change I2b0bb983 into eclair
...
Merge commit '0359bdb72f3da3f319d0b3ef87a70c4f98d4154f' into eclair-plus-aosp
* commit '0359bdb72f3da3f319d0b3ef87a70c4f98d4154f':
Importing Wikitionary/SimpleWiktionary sample code from http://code.google.com/p/wiktionary-android/ .
2009-12-09 18:12:09 -08:00
Android (Google) Code Review
0359bdb72f
Merge change I2b0bb983 into eclair
...
* changes:
Importing Wikitionary/SimpleWiktionary sample code from http://code.google.com/p/wiktionary-android/ .
2009-12-09 18:07:31 -08:00
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
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
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
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
Trevor Johns
807dc15b09
Importing Wikitionary/SimpleWiktionary sample code from http://code.google.com/p/wiktionary-android/ .
...
Original code by Jeffrey Sharkey <jsharkey@android.com >.
Modifications:
- Remove .classpath, .project, and default.properties.
- Remove generated files (/gen).
- Create Android.mk and _index.html.
- Cleaned up whitespace and converted to match AOSP style guide.
- Renamed SimpleWiktionary to WiktionarySimple to keep both samples next to each other in the
directory listing.
- Removed the android:text attribute in the BulletPoint due to localization issues.
2009-12-09 11:35:26 -08:00
Trevor Johns
8759e2f036
am bba4ff7c: Fixing crash in ContactManager: Changing ContactsContract.Contacts.LOOKUP_KEY to ContactsContract.Contacts._ID.
...
Merge commit 'bba4ff7c38e7e6837fabdb225cdb24d12a17eabc' into eclair-plus-aosp
* commit 'bba4ff7c38e7e6837fabdb225cdb24d12a17eabc':
Fixing crash in ContactManager: Changing ContactsContract.Contacts.LOOKUP_KEY to
2009-12-09 11:28:35 -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
Jack Palevich
fe8c16afe6
Simple Matrix Palette skinning sample.
2009-12-09 15:32:35 +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
d1d19baf0c
am 5865825d: Merge change Iabe9529e into eclair
...
Merge commit '5865825df6792f1cf6a5f70911f5ad15a2a243b8' into eclair-plus-aosp
* commit '5865825df6792f1cf6a5f70911f5ad15a2a243b8':
Adding ContactManager sample to SDK samples.
2009-12-08 17:54:10 -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
Scott Main
c984764ff6
am 6b4bd260: Merge change I1cd5c828 into eclair
...
Merge commit '6b4bd26058d9d4d920e6a26c14a8f8bda9a863a3' into eclair-plus-aosp
* commit '6b4bd26058d9d4d920e6a26c14a8f8bda9a863a3':
change the way bytes are read from InputStream.
2009-12-08 16:47:21 -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
8ac07a902d
am d2962a33: TextToSpeech API demo.
...
Merge commit 'd2962a33216ce40a526c80fc8865cf9bd04936f4' into eclair-plus-aosp
* commit 'd2962a33216ce40a526c80fc8865cf9bd04936f4':
TextToSpeech API demo.
2009-12-08 16:13: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
Derek Sollenberger
e8454e7969
updating sample plugin to use new full screen interfaces.
2009-12-08 08:11:33 -05: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
Megha Joshi
b3ed38b90e
am 11d89599: Add QuickContactsBadge widget sample to ApiDemos
...
Merge commit '11d89599ef7cf949bfe0048d1352f264ee0f6a34' into eclair-plus-aosp
* commit '11d89599ef7cf949bfe0048d1352f264ee0f6a34':
Add QuickContactsBadge widget sample to ApiDemos
2009-12-07 16:59:39 -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
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
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