Commit Graph

646 Commits

Author SHA1 Message Date
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
Jack Palevich
79297bbe31 Turn of log message that was accidentally left on in an earlier commit. 2009-10-08 20:12:57 -07:00
Raphael
86ff4a1905 am 1121ceba: SDK: remove default.properties from ApiDemos
Merge commit '1121ceba04131669a95e6cc7e3cb83a3a87c8ea2' into eclair-mr2

* commit '1121ceba04131669a95e6cc7e3cb83a3a87c8ea2':
  SDK: remove default.properties from ApiDemos
2009-10-07 15:53:59 -07:00
Raphael
a30ee3bdb0 am 1121ceba: SDK: remove default.properties from ApiDemos
Merge commit '1121ceba04131669a95e6cc7e3cb83a3a87c8ea2' into eclair-plus-aosp

* commit '1121ceba04131669a95e6cc7e3cb83a3a87c8ea2':
  SDK: remove default.properties from ApiDemos
2009-10-07 15:53:54 -07:00
Raphael
1121ceba04 SDK: remove default.properties from ApiDemos
It's annoying to have to maintain this. Remove it and understand
why we needed it in the first place. If we do, we'll generate
it when packaging the SDK rather than have it in the tree.

SDK BUG 2144477
2009-10-07 15:20:21 -07:00
Jack Palevich
27666897d0 Make robot.png a raw resource.
After all, it's being used as a raw resource.
2009-10-05 13:59:20 -07:00
Jack Palevich
a7a9186b12 Remove non-working high-res robot texture.
This was added with good intentions, as part of the general drive to
provide high-res textures.

Unfortunately, most OpenGL ES drivers require that a texture's dimensions
be a power of two on each side. The original texture was 128 x 128, and
someone helpfully created a 192 x 192 high res texture. But 192 is not
a power of two, so the hihg-res texture would not render.

We could create a 256 x 256 texture, which would work, but that's not
really needed for this particular texture, and we'd prefer if the
texture stayed small for rendering performance reasons.
2009-10-05 13:40:44 -07:00
Daniel Sandler
b4e1e2e24c am 6f53211d: Merge change Ie022d478 into eclair
Merge commit '6f53211d6d9095c67107ac72def6d405e33b7fac' into eclair-plus-aosp

* commit '6f53211d6d9095c67107ac72def6d405e33b7fac':
  hdpi artwork for development/{apps,samples}.
2009-09-29 18:01:01 -07:00
Daniel Sandler
75ab82e25f hdpi artwork for development/{apps,samples}.
(drop dated 29-Sep-2009)

Change-Id: Ie022d478ed4eafc641e475dad94f507a6c358595
2009-09-29 20:41:24 -04:00
Dianne Hackborn
83f3713356 am bad9ac7f: Merge change 27163 into eclair
Merge commit 'bad9ac7f373f5585ee6e43926b21c470d07663f8' into eclair-plus-aosp

* commit 'bad9ac7f373f5585ee6e43926b21c470d07663f8':
  Add transition animation sample, log to service sample.
2009-09-25 16:20:56 -07:00
Dianne Hackborn
cfc90dc1aa Add transition animation sample, log to service sample.
Change-Id: I7021a7fbbe26d9c52699d7c2216452a5bd51452b
2009-09-25 16:10:42 -07:00
Raphael
3776994ce0 am a5115b64: Merge change 26885 into eclair
Merge commit 'a5115b646e651228566b3a2823260cd7f70a882c' into eclair-plus-aosp

* commit 'a5115b646e651228566b3a2823260cd7f70a882c':
  Tell the SDK that ApiDemoes requires Eclair preview.
2009-09-24 16:14:13 -07:00
Raphael
50dc6c7556 Tell the SDK that ApiDemoes requires Eclair preview.
After the preview we'll change it to the final API level.

BUG 2141157
2009-09-24 11:52:40 -07:00
Piotr Gurgul
284e84b677 am 95a32505: Merge change 26649 into eclair
Merge commit '95a32505be164e0424d01fdd2b06c04cd54e6f06' into eclair-plus-aosp

* commit '95a32505be164e0424d01fdd2b06c04cd54e6f06':
  Define tested.project.dir property for existing samples
2009-09-23 15:38:33 -07:00
Piotr Gurgul
979d5abe06 Define tested.project.dir property for existing samples
As now test projects are recognized by presence of the property
tested.project.dir, it has been manually added for existing
test project samples.
2009-09-23 12:15:05 -07:00
Eric Fischer
9f74298611 am 0c12e21a: Merge change 23532 into eclair
Merge commit '0c12e21a3152b62fb330c86b5ea544e927300608' into eclair-plus-aosp

* commit '0c12e21a3152b62fb330c86b5ea544e927300608':
  Add backslashes before apostrophes so they don't get lost.
2009-09-01 17:33:25 -07:00
Eric Fischer
2528f77daa Add backslashes before apostrophes so they don't get lost.
This is required by another change I am about to submit that makes it
an error not to include the backslash, since it is inevitably a mistake
when someone fails to include it.
2009-09-01 15:42:46 -07:00
Jean-Baptiste Queru
9dc454b1b1 merge from open-source master 2009-09-01 08:27:45 -07:00
Dianne Hackborn
b8ff7ade69 Add sample of correctly requesting camera feature, optional shared lib.
Change-Id: I5697e70cedeba9de6458caf50a363057278a7387
2009-08-27 20:13:19 -07:00
Muthu Ramadoss
8f5361ba0d Enhancement: ApiDemos - App - Dialog - AlertDialog with MultipleChoices backed by Cursor
Added an example for using AlertDialog in Multichoice mode backed up by Cursor. This example can be used to test the following bug: http://code.google.com/p/android/issues/detail?id=955

AMEND:
	Added a Toast to display readonly status of cursor, so data will not be updated.
	Removed empty code blocks, which did nothing.
2009-08-26 08:48:03 -07:00
Dianne Hackborn
945b236290 Update sample code for new service semantics. 2009-08-24 16:28:39 -07:00
Scott Main
1ef50a9d95 am 04680858: docs only. Add new web pages for sample apps included in the SDK. Revise the existing sample app web pages. Delete screenshots for notepad and lunar lander (these have moved into frameworks/base/docs/html/guide/samples/image/.
Merge commit '04680858a0671ad615f088edeea87b61ea243f24' into eclair

* commit '04680858a0671ad615f088edeea87b61ea243f24':
  docs only.
2009-08-24 16:20:14 -07:00
Scott Main
04680858a0 docs only.
Add new web pages for sample apps included in the SDK.
Revise the existing sample app web pages.
Delete screenshots for notepad and lunar lander (these have
moved into frameworks/base/docs/html/guide/samples/image/.
2009-08-24 15:27:00 -07:00
Xavier Ducrohet
53b3190a47 am e95a86cf: Merge change 22346 into donut
Merge commit 'e95a86cfec18836ddbff149690a13766bfc9ada3' into eclair

* commit 'e95a86cfec18836ddbff149690a13766bfc9ada3':
  Fix target for ApiDemos (API is now 4)
2009-08-22 07:44:12 -07:00
Xavier Ducrohet
c86903288c Fix target for ApiDemos (API is now 4)
Also add some progress output to the ant rules.
2009-08-21 15:59:02 -07:00
Jack Palevich
83d8d83ad1 Remove unused getConfigSpec methods from ApiDemos sample code
At one time during the development of GLSurfaceView, the
GLSurfaceView.Renderer interface had a getConfigSpec method that was used to
select the frame buffer format. This method was removed from the
Renderer interface before GLSurfaceView became a public API, but
the sample code still defined these now-unused methods.

To reduce the chance of confusing a developer who uses the sample code,
this change removes the dead, no-longer-called getConfigSpec
implementations from the three samples.

See GLSurfaceView.setEGLConfigChooser for the replacement
technique.
2009-08-21 11:48:50 -07:00
Dianne Hackborn
f416b7ea19 Hey, we don't need to set this flag any more! 2009-08-12 14:41:28 -07:00
Wu-cheng Li
0b34a0cfd5 am c5c912e4: Merge change 20717 into donut
Merge commit 'c5c912e49bdc89a7a7778b66d1ca6b00440d2888'

* commit 'c5c912e49bdc89a7a7778b66d1ca6b00440d2888':
  Release the camera in surfaceDestroyed().
2009-08-11 18:12:14 -07:00
Dianne Hackborn
b99b11dec9 am 46b133a2: Merge change 20690 into donut
Merge commit '46b133a2baf4d4c35801a24893d6a72f1ab82e7f'

* commit '46b133a2baf4d4c35801a24893d6a72f1ab82e7f':
  Add density demo.
2009-08-11 18:11:50 -07:00