Commit Graph

1139 Commits

Author SHA1 Message Date
Derek Sollenberger
a85d523be1 am d53b56d1: Removed dependence on java interfaces and use only one surface for both embedded and fullscreen surfaces.
Merge commit 'd53b56d1806161bd26c2d97b9af67ef0e41f6e25' into eclair-mr2-plus-aosp

* commit 'd53b56d1806161bd26c2d97b9af67ef0e41f6e25':
  Removed dependence on java interfaces and use only one surface for both embedded and fullscreen surfaces.
2010-01-11 13:10:56 -08:00
Trevor Johns
f44d1b040f Adding index file for BusinessCard sample. This will be displayed in the HTML
documentation when this sample is selected via the Resource tab.
2010-01-11 11:59:10 -08:00
Derek Sollenberger
d53b56d180 Removed dependence on java interfaces and use only one surface for both embedded and fullscreen surfaces. 2010-01-11 13:45:50 -05:00
Romain Guy
74192eafec Deprecate fill_parent and introduce match_parent.
Bug: #2361749.
2010-01-08 15:11:18 -08:00
Grace Kloba
8cb8766744 am 653b97e7: am a0e762ca: free the NPObject in NPP_Destroy.
Merge commit '653b97e701546e816f75167280bf87b665a47b2c'

* commit '653b97e701546e816f75167280bf87b665a47b2c':
  free the NPObject in NPP_Destroy.
2010-01-04 10:03:34 -08:00
Grace Kloba
653b97e701 am a0e762ca: free the NPObject in NPP_Destroy.
Merge commit 'a0e762caeaca275ed8390e9ee1cfb5e9149e07b7' into eclair-mr2-plus-aosp

* commit 'a0e762caeaca275ed8390e9ee1cfb5e9149e07b7':
  free the NPObject in NPP_Destroy.
2010-01-04 09:59:45 -08:00
Jack Palevich
c1645153e7 Tool for compressing/decompressing ETC1 textures.
The ETC1 texture format is commonly supported by
OpenGL ES 2.0-capable GPUs.

For historical reasons ETC1 texture files have the
default extension .PKM

This tool relies on the libETC1 library to
compress and decompress the image data.
2009-12-31 13:19:21 +08:00
Grace Kloba
a0e762caea free the NPObject in NPP_Destroy. 2009-12-27 14:33:09 -08:00
Jack Palevich
8e50990893 Remove unnecessary matrix stack manipulations.
glDrawTexiOES does not use the matix stack, so no need to modify it.
2009-12-22 18:32:05 +08:00
Grace Kloba
831940271a am 6be651ee: am 3bc69e62: Merge change Ib59457e0 into eclair-mr2
Merge commit '6be651ee000270b56b285f60a6bda9c090cfbb9f'

* commit '6be651ee000270b56b285f60a6bda9c090cfbb9f':
  Change full screen surface to Opaque as it is required
2009-12-16 14:24:17 -08:00
Grace Kloba
6be651ee00 am 3bc69e62: Merge change Ib59457e0 into eclair-mr2
Merge commit '3bc69e6256b616514871276e24bf98f37b3f89ad' into eclair-mr2-plus-aosp

* commit '3bc69e6256b616514871276e24bf98f37b3f89ad':
  Change full screen surface to Opaque as it is required
2009-12-16 14:21:19 -08:00
Grace Kloba
b59457e055 Change full screen surface to Opaque as it is required
by the new plugin model.

Comment out the video as it is not working and causes
crash when touch.
2009-12-16 11:38:53 -08:00
Dirk Dougherty
a276296490 Merge commit 'e897c1b4' into manualmerge
Conflicts:
	samples/ApiDemos/src/com/example/android/apis/app/_index.html
2009-12-15 23:27:22 -08:00
Dirk Dougherty
e897c1b428 am 1d151678: Merge change Ie8650e4b into eclair
Merge commit '1d15167865b22730cf6ba314a057e62f960aa1db' into eclair-plus-aosp

* commit '1d15167865b22730cf6ba314a057e62f960aa1db':
  sdk doc change for esr: fix some broken links to resources files.
2009-12-15 19:26:25 -08:00
Android (Google) Code Review
1d15167865 Merge change Ie8650e4b into eclair
* changes:
  sdk doc change for esr: fix some broken links to resources files.
2009-12-15 19:23:33 -08:00
Dirk Dougherty
0b1153b115 sdk doc change for esr: fix some broken links to resources files.
Bug: 2160782
Change-Id: Ie8650e4b642a96e67a2e7e62669282bc58d414ba
2009-12-15 18:47:00 -08:00
Trevor Johns
7a41627710 am 55d80586: am 5dba584a: Merge change Ic3464854 into eclair
Merge commit '55d80586c76580bf6cbc00e9bd89658a72aa985b'

* commit '55d80586c76580bf6cbc00e9bd89658a72aa985b':
  Renaming com.google.example.android.contactmanager to com.example.android.contactmanager.
2009-12-15 15:06:19 -08:00
Xavier Ducrohet
050eb28ab5 am cf4e98b2: am b84cf9e1: Clean up the SDK and make it compiled and installed in the SDK system image.
Merge commit 'cf4e98b260230ea5d9290d2e18f37b2f3c585970'

* commit 'cf4e98b260230ea5d9290d2e18f37b2f3c585970':
  Clean up the SDK and make it compiled and installed in the SDK system image.
2009-12-15 15:05:51 -08:00
Trevor Johns
55d80586c7 am 5dba584a: Merge change Ic3464854 into eclair
Merge commit '5dba584a08e6d2d5c84ca971b796e053995e4214' into eclair-plus-aosp

* commit '5dba584a08e6d2d5c84ca971b796e053995e4214':
  Renaming com.google.example.android.contactmanager to com.example.android.contactmanager.
2009-12-15 12:17:03 -08:00
Android (Google) Code Review
5dba584a08 Merge change Ic3464854 into eclair
* changes:
  Renaming com.google.example.android.contactmanager to com.example.android.contactmanager.
2009-12-15 12:13:54 -08:00
Xavier Ducrohet
cf4e98b260 am b84cf9e1: Clean up the SDK and make it compiled and installed in the SDK system image.
Merge commit 'b84cf9e1e378f6cc6642b4ac3f391a85b208a23b' into eclair-plus-aosp

* commit 'b84cf9e1e378f6cc6642b4ac3f391a85b208a23b':
  Clean up the SDK and make it compiled and installed in the SDK system image.
2009-12-15 10:33:08 -08:00
Trevor Johns
0ed0224e24 Renaming com.google.example.android.contactmanager to com.example.android.contactmanager. 2009-12-14 23:25:59 -08:00
Xavier Ducrohet
b84cf9e1e3 Clean up the SDK and make it compiled and installed in the SDK system image.
Change-Id: I6e5f01a1cc45beada70608307f4ac38a4dcdd0b9
2009-12-14 22:36:44 -08:00
Roman Nurik
b96f645ccb am 8b13cf63: am 70634b36: am e7e7a6b8: Modify index pages of MultiResolution, Wiktionary, and WiktionarySimple samples, to point to new screenshots. Also some minor cleanup.
Merge commit '8b13cf63d4d96e290c83a35725ff26cf2601b063'

* commit '8b13cf63d4d96e290c83a35725ff26cf2601b063':
  Modify index pages of MultiResolution, Wiktionary, and WiktionarySimple samples, to point to new screenshots. Also some minor cleanup.
2009-12-11 01:38:51 -08:00
Trevor Johns
b8cd782342 am ddedf966: am 5f6b6bfb: am 0359bdb7: Merge change I2b0bb983 into eclair
Merge commit 'ddedf9666e90cfac79c1b31ff2beaef4ad60366c'

* commit 'ddedf9666e90cfac79c1b31ff2beaef4ad60366c':
  Importing Wikitionary/SimpleWiktionary sample code from http://code.google.com/p/wiktionary-android/.
2009-12-10 23:41:21 -08:00
Roman Nurik
8b13cf63d4 am 70634b36: am e7e7a6b8: Modify index pages of MultiResolution, Wiktionary, and WiktionarySimple samples, to point to new screenshots. Also some minor cleanup.
Merge commit '70634b3633dc2847df14db67a4e22dce5a16e45f' into eclair-mr2-plus-aosp

* commit '70634b3633dc2847df14db67a4e22dce5a16e45f':
  Modify index pages of MultiResolution, Wiktionary, and WiktionarySimple samples, to point to new screenshots. Also some minor cleanup.
2009-12-10 19:54:47 -08:00
Roman Nurik
70634b3633 am e7e7a6b8: Modify index pages of MultiResolution, Wiktionary, and WiktionarySimple samples, to point to new screenshots. Also some minor cleanup.
Merge commit 'e7e7a6b821367c5c2ce7a0eac66f92a2689c22e9' into eclair-mr2

* commit 'e7e7a6b821367c5c2ce7a0eac66f92a2689c22e9':
  Modify index pages of MultiResolution, Wiktionary, and WiktionarySimple samples, to point to new screenshots. Also some minor cleanup.
2009-12-10 19:48:38 -08:00
Trevor Johns
ddedf9666e am 5f6b6bfb: am 0359bdb7: Merge change I2b0bb983 into eclair
Merge commit '5f6b6bfb881601bdcb65c274449ffad08df5b29b' into eclair-mr2-plus-aosp

* commit '5f6b6bfb881601bdcb65c274449ffad08df5b29b':
  Importing Wikitionary/SimpleWiktionary sample code from http://code.google.com/p/wiktionary-android/.
2009-12-10 17:51:34 -08:00
Trevor Johns
5f6b6bfb88 am 0359bdb7: Merge change I2b0bb983 into eclair
Merge commit '0359bdb72f3da3f319d0b3ef87a70c4f98d4154f' into eclair-mr2

* commit '0359bdb72f3da3f319d0b3ef87a70c4f98d4154f':
  Importing Wikitionary/SimpleWiktionary sample code from http://code.google.com/p/wiktionary-android/.
2009-12-10 17:44:35 -08:00
Romain Guy
63893a62cc am 764ff751: am dcf99fbe: Merge change If4ff28ed into eclair-mr2
Merge commit '764ff7513a47da76a59fee7c5f299afb7662aac6'

* commit '764ff7513a47da76a59fee7c5f299afb7662aac6':
  Cleanup one of the ListView sample demos.
2009-12-10 17:14:18 -08:00
Trevor Johns
879e646757 am 19d79f2f: am 4eb4ed2d: am bba4ff7c: Fixing crash in ContactManager: Changing ContactsContract.Contacts.LOOKUP_KEY to ContactsContract.Contacts._ID.
Merge commit '19d79f2fb44ce0ce48bd95f972d929910afa951c'

* commit '19d79f2fb44ce0ce48bd95f972d929910afa951c':
  Fixing crash in ContactManager: Changing ContactsContract.Contacts.LOOKUP_KEY to
2009-12-10 17:14:13 -08:00
Roman Nurik
aa89e73699 am e7e7a6b8: Modify index pages of MultiResolution, Wiktionary, and WiktionarySimple samples, to point to new screenshots. Also some minor cleanup.
Merge commit 'e7e7a6b821367c5c2ce7a0eac66f92a2689c22e9' into eclair-plus-aosp

* commit 'e7e7a6b821367c5c2ce7a0eac66f92a2689c22e9':
  Modify index pages of MultiResolution, Wiktionary, and WiktionarySimple samples, to point to new screenshots. Also some minor cleanup.
2009-12-10 17:06:41 -08:00
Romain Guy
764ff7513a am dcf99fbe: Merge change If4ff28ed into eclair-mr2
Merge commit 'dcf99fbe7ac981c4ef3c8def65213e148281547a' into eclair-mr2-plus-aosp

* commit 'dcf99fbe7ac981c4ef3c8def65213e148281547a':
  Cleanup one of the ListView sample demos.
2009-12-10 16:58:46 -08:00
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