Commit Graph

624 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
5bd13f2f4e am b49dd835: Adding wallpaper sample in ApiDemos.
Merge commit 'b49dd8359d1b23eb527139499c0db58cb01466c6' into eclair-plus-aosp

* commit 'b49dd8359d1b23eb527139499c0db58cb01466c6':
  Adding wallpaper sample in ApiDemos.
2009-12-04 17:06:09 -08:00
Megha Joshi
b49dd8359d Adding wallpaper sample in ApiDemos. 2009-12-04 17:00:21 -08:00
Jean-Baptiste Queru
394ef56df8 am aecf2c65: am 76c9d31c: Revert "adding set wallpaper sample code in ApiDemos."
Merge commit 'aecf2c6581228677e90550a6d8f5f9668fb72987' into eclair-mr2-plus-aosp

* commit 'aecf2c6581228677e90550a6d8f5f9668fb72987':
  Revert "adding set wallpaper sample code in ApiDemos."
2009-12-03 16:57:41 -08:00
Megha Joshi
61f3e6cdaa am f6d9c9d4: am eb34b45e: Revert "fixing build"
Merge commit 'f6d9c9d427c70017757dcddf5b396de2d5f2f33d' into eclair-mr2-plus-aosp

* commit 'f6d9c9d427c70017757dcddf5b396de2d5f2f33d':
  Revert "fixing build"
2009-12-03 16:53:33 -08:00
Jean-Baptiste Queru
91b2d65eb9 am 76c9d31c: Revert "adding set wallpaper sample code in ApiDemos."
Merge commit '76c9d31ce383cf1f4ef89dd1dae4f751fbb73b9a' into eclair-plus-aosp

* commit '76c9d31ce383cf1f4ef89dd1dae4f751fbb73b9a':
  Revert "adding set wallpaper sample code in ApiDemos."
2009-12-03 16:44:41 -08:00
Jean-Baptiste Queru
aecf2c6581 am 76c9d31c: Revert "adding set wallpaper sample code in ApiDemos."
Merge commit '76c9d31ce383cf1f4ef89dd1dae4f751fbb73b9a' into eclair-mr2

* commit '76c9d31ce383cf1f4ef89dd1dae4f751fbb73b9a':
  Revert "adding set wallpaper sample code in ApiDemos."
2009-12-03 16:43:32 -08:00
Megha Joshi
e4ddc394fa am 59b2923c: am 7d1b833e: fixing build
Merge commit '59b2923c6025812154baf329d636291f55430e0e' into eclair-mr2-plus-aosp

* commit '59b2923c6025812154baf329d636291f55430e0e':
  fixing build
2009-12-03 16:42:00 -08:00
Megha Joshi
392481816e am b4fe143c: am b5ad157b: adding set wallpaper sample code in ApiDemos.
Merge commit 'b4fe143cfe18022653fc6710ba44a8f19c6b17ed' into eclair-mr2-plus-aosp

* commit 'b4fe143cfe18022653fc6710ba44a8f19c6b17ed':
  adding set wallpaper sample code in ApiDemos.
2009-12-03 16:41:05 -08:00
Jean-Baptiste Queru
76c9d31ce3 Revert "adding set wallpaper sample code in ApiDemos."
This reverts commit b5ad157bab.
2009-12-03 16:35:23 -08:00
Megha Joshi
ce28b790e7 am eb34b45e: Revert "fixing build"
Merge commit 'eb34b45ef1d1c6ca6c4e4d3a303baf00234b7bbd' into eclair-plus-aosp

* commit 'eb34b45ef1d1c6ca6c4e4d3a303baf00234b7bbd':
  Revert "fixing build"
2009-12-03 16:30:34 -08:00
Megha Joshi
f6d9c9d427 am eb34b45e: Revert "fixing build"
Merge commit 'eb34b45ef1d1c6ca6c4e4d3a303baf00234b7bbd' into eclair-mr2

* commit 'eb34b45ef1d1c6ca6c4e4d3a303baf00234b7bbd':
  Revert "fixing build"
2009-12-03 16:29:58 -08:00
Megha Joshi
eb34b45ef1 Revert "fixing build"
This reverts commit 7d1b833e7d.
2009-12-03 16:16:52 -08:00
Megha Joshi
59b2923c60 am 7d1b833e: fixing build
Merge commit '7d1b833e7d1337e9ce85746886bafc98bcab16d8' into eclair-mr2

* commit '7d1b833e7d1337e9ce85746886bafc98bcab16d8':
  fixing build
2009-12-03 15:23:37 -08:00
Megha Joshi
830d30d524 am 7d1b833e: fixing build
Merge commit '7d1b833e7d1337e9ce85746886bafc98bcab16d8' into eclair-plus-aosp

* commit '7d1b833e7d1337e9ce85746886bafc98bcab16d8':
  fixing build
2009-12-03 15:23:28 -08:00
Megha Joshi
7d1b833e7d fixing build 2009-12-03 15:13:10 -08:00
Megha Joshi
b4fe143cfe am b5ad157b: adding set wallpaper sample code in ApiDemos.
Merge commit 'b5ad157bab0298535fa09378f6aca47029f9f475' into eclair-mr2

* commit 'b5ad157bab0298535fa09378f6aca47029f9f475':
  adding set wallpaper sample code in ApiDemos.
2009-12-03 14:17:55 -08:00
Megha Joshi
f12dc8d51c am b5ad157b: adding set wallpaper sample code in ApiDemos.
Merge commit 'b5ad157bab0298535fa09378f6aca47029f9f475' into eclair-plus-aosp

* commit 'b5ad157bab0298535fa09378f6aca47029f9f475':
  adding set wallpaper sample code in ApiDemos.
2009-12-03 14:17:53 -08:00
Megha Joshi
b5ad157bab adding set wallpaper sample code in ApiDemos. 2009-12-03 13:56:37 -08:00
Dianne Hackborn
7bd364622b am c46a762e: am eb3547b3: Add API demo for services that run in the foreground.
Merge commit 'c46a762ee35b8630ed9f824e0627566fe7cfe605' into eclair-mr2-plus-aosp

* commit 'c46a762ee35b8630ed9f824e0627566fe7cfe605':
  Add API demo for services that run in the foreground.
2009-12-01 17:24:06 -08:00
Dianne Hackborn
c46a762ee3 am eb3547b3: Add API demo for services that run in the foreground.
Merge commit 'eb3547b3d0678ad16a602d342cf81dc64e03d9b7' into eclair-mr2

* commit 'eb3547b3d0678ad16a602d342cf81dc64e03d9b7':
  Add API demo for services that run in the foreground.
2009-12-01 17:05:18 -08:00
Dianne Hackborn
612c115040 am eb3547b3: Add API demo for services that run in the foreground.
Merge commit 'eb3547b3d0678ad16a602d342cf81dc64e03d9b7' into eclair-plus-aosp

* commit 'eb3547b3d0678ad16a602d342cf81dc64e03d9b7':
  Add API demo for services that run in the foreground.
2009-11-30 11:09:26 -08:00
Dianne Hackborn
eb3547b3d0 Add API demo for services that run in the foreground.
Change-Id: I7acb0817e5d738294bef02ca2df3c2ab18b45f60
2009-11-25 17:06:53 -08:00
Scott Main
75239b5177 am 21acc900: am e71c2828: am 1558abd6: Merge change I53e268db into eclair-sdk
Merge commit '21acc90055935d052e350fe441091091c2421010' into eclair-mr2-plus-aosp

* commit '21acc90055935d052e350fe441091091c2421010':
  docs: make the apidemos app index page only display the
2009-11-23 10:18:24 -08:00
Scott Main
21acc90055 am e71c2828: am 1558abd6: Merge change I53e268db into eclair-sdk
Merge commit 'e71c282812a870c120ff8bf0989fd78c0191eeb2' into eclair-mr2

* commit 'e71c282812a870c120ff8bf0989fd78c0191eeb2':
  docs: make the apidemos app index page only display the
2009-11-23 10:13:44 -08:00
Scott Main
7baf25521c am e71c2828: am 1558abd6: Merge change I53e268db into eclair-sdk
Merge commit 'e71c282812a870c120ff8bf0989fd78c0191eeb2' into eclair-plus-aosp

* commit 'e71c282812a870c120ff8bf0989fd78c0191eeb2':
  docs: make the apidemos app index page only display the
2009-11-23 10:13:07 -08:00
Scott Main
ea6c4f9082 docs: make the apidemos app index page only display the
shortcut links when the docs are online, because these
links will not resolve when the docs are offline.

this is a silly hack, but a temporary one until these
samples are moved.

Change-Id: I53e268db265cec143ca5e561ca2d6b4df3dba3e2
2009-11-20 14:55:07 -08:00
Owen Lin
1558a07089 Fix the camera preview demo.
The preview size will be checked now in Camera HAL. So, we change the code to
get the supported preview sizes and find one of the size that match the
surface's width and height.
2009-11-16 15:43:16 +08:00
Mike Reed
3938c17057 am d22a3d97: Revert "update demo to use boundary patch"
Merge commit 'd22a3d977dc3e999d5ddc9409f7903ae5477ab60' into eclair-mr2-plus-aosp

* commit 'd22a3d977dc3e999d5ddc9409f7903ae5477ab60':
  Revert "update demo to use boundary patch"
2009-10-28 14:16:28 -07:00
Mike Reed
d22a3d977d Revert "update demo to use boundary patch"
This reverts commit 3f14f59ee6.
2009-10-28 17:04:38 -04:00
Mike Reed
e978740ed3 am 3f14f59e: update demo to use boundary patch
Merge commit '3f14f59ee679c76438f6d37bfc9535b4bc2be024' into eclair-mr2-plus-aosp

* commit '3f14f59ee679c76438f6d37bfc9535b4bc2be024':
  update demo to use boundary patch
2009-10-28 13:03:28 -07:00
Mike Reed
3f14f59ee6 update demo to use boundary patch 2009-10-28 15:47:54 -04:00
Jean-Baptiste Queru
a7978d3bb0 merge from open-source master 2009-10-14 16:02:09 -07:00