Commit Graph

1139 Commits

Author SHA1 Message Date
Jack Palevich
3328b18293 am 494bb69b: Merge change I79297bbe into eclair-mr2
Merge commit '494bb69bfd8990e5e02d40abc9a7a4d5eca76810'

* commit '494bb69bfd8990e5e02d40abc9a7a4d5eca76810':
  Turn of log message that was accidentally left on in an earlier commit.
2009-10-13 12:11:19 -07:00
Marco Nelissen
0d0d319f21 am 7b7bdf13: am 32739c61: Merge change I2e026098 into eclair
Merge commit '7b7bdf133a5102dae2a29b2770eeeb157c9cfb9a'

* commit '7b7bdf133a5102dae2a29b2770eeeb157c9cfb9a':
  Three implementations of a live wallpaper showing a spinning cube.
2009-10-13 11:55:23 -07:00
Derek Sollenberger
bb660dd555 updating sample plugins to support fixed surface dimensions. 2009-10-13 11:45:47 -04:00
Raphael
6265862dac am 86ff4a19: am 1121ceba: SDK: remove default.properties from ApiDemos
Merge commit '86ff4a1905474bbcbef9b174013fe02740f78a0d'

* commit '86ff4a1905474bbcbef9b174013fe02740f78a0d':
  SDK: remove default.properties from ApiDemos
2009-10-12 12:37:42 -07:00
Jack Palevich
68e943ef9a am c2c1efc0: Merge change I27666897 into eclair-mr2
Merge commit 'c2c1efc02fcba6e68fd38282788c9cda204dde40'

* commit 'c2c1efc02fcba6e68fd38282788c9cda204dde40':
  Make robot.png a raw resource.
2009-10-12 11:32:55 -07:00
Jack Palevich
bd3e51e101 am 888dfd73: Merge change Ia7a9186b into eclair-mr2
Merge commit '888dfd731b8d403c2003c38485d60b1fd1dd5e76'

* commit '888dfd731b8d403c2003c38485d60b1fd1dd5e76':
  Remove non-working high-res robot texture.
2009-10-12 11:31:35 -07:00
Derek Sollenberger
62618ffbfa am 4c46bf95: Merge change I108ad940 into eclair-mr2
Merge commit '4c46bf9558d928568905eeeda26657b80cbc399d'

* commit '4c46bf9558d928568905eeeda26657b80cbc399d':
  Adding a full screen video sample plugin. Also cleaned up surface plugins to use the provided JavaVM.
2009-10-12 11:29:53 -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
Marco Nelissen
b0399e6e80 am 32739c61: Merge change I2e026098 into eclair
Merge commit '32739c6183d525f371c37d923a85c1150a6a1b0d' into eclair-plus-aosp

* commit '32739c6183d525f371c37d923a85c1150a6a1b0d':
  Three implementations of a live wallpaper showing a spinning cube.
2009-10-08 10:43:54 -07:00
Marco Nelissen
7b7bdf133a am 32739c61: Merge change I2e026098 into eclair
Merge commit '32739c6183d525f371c37d923a85c1150a6a1b0d' into eclair-mr2

* commit '32739c6183d525f371c37d923a85c1150a6a1b0d':
  Three implementations of a live wallpaper showing a spinning cube.
2009-10-08 10:36:37 -07:00
Android (Google) Code Review
32739c6183 Merge change I2e026098 into eclair
* changes:
  Three implementations of a live wallpaper showing a spinning cube. One very basic, one slightly more elaborate (selectable shape, settings panel), and one that uses renderscript.
2009-10-08 13:10:19 -04: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
Marco Nelissen
42dbb8b92b Three implementations of a live wallpaper showing a spinning cube.
One very basic, one slightly more elaborate (selectable shape, settings panel), and one that uses renderscript.
2009-10-06 16:11:00 -07:00
Android (Google) Code Review
c2c1efc02f Merge change I27666897 into eclair-mr2
* changes:
  Make robot.png a raw resource.
2009-10-05 17:00:09 -04: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
Android (Google) Code Review
888dfd731b Merge change Ia7a9186b into eclair-mr2
* changes:
  Remove non-working high-res robot texture.
2009-10-05 16:44:20 -04: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
Derek Sollenberger
b8947eee34 Adding a full screen video sample plugin. Also cleaned up surface plugins to use the provided JavaVM. 2009-10-05 14:59:48 -04:00
Daniel Sandler
26d17bc870 am b4e1e2e2: am 6f53211d: Merge change Ie022d478 into eclair
Merge commit 'b4e1e2e24c48c0a90bc4645113b164b419f31aa9'

* commit 'b4e1e2e24c48c0a90bc4645113b164b419f31aa9':
  hdpi artwork for development/{apps,samples}.
2009-10-01 11:44:06 -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
Jean-Michel Trivi
481fc7807a am 2296cfbd: am 8c77415e: Merge change Ic94b435b into eclair
Merge commit '2296cfbd37e696bd32e92c88a30dd290c7470018'

* commit '2296cfbd37e696bd32e92c88a30dd290c7470018':
  Fix bug 2142296 where the user couldn't back out of the JetBoy demo.
2009-09-29 11:10:58 -07:00
Jean-Michel Trivi
2296cfbd37 am 8c77415e: Merge change Ic94b435b into eclair
Merge commit '8c77415ede684d89b738b3cf6cdaeaacd541eb87' into eclair-plus-aosp

* commit '8c77415ede684d89b738b3cf6cdaeaacd541eb87':
  Fix bug 2142296 where the user couldn't back out of the JetBoy demo.
2009-09-28 15:23:31 -07:00
Jean-Michel Trivi
c94b435b86 Fix bug 2142296 where the user couldn't back out of the JetBoy demo.
The application was trapping the key up event on the back key. It
worked on Donut because the framework implemented the "back" behavior
on the key down. The fix consists in sending the key up event on the
back button to the Activity class.
2009-09-28 15:06:25 -07:00
Dianne Hackborn
e78ac99cc0 am 83f37133: am bad9ac7f: Merge change 27163 into eclair
Merge commit '83f3713356c2669ed839e5521ff772c18746c856'

* commit '83f3713356c2669ed839e5521ff772c18746c856':
  Add transition animation sample, log to service sample.
2009-09-27 15:41:44 -07: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
e9917eb019 am 3776994c: am a5115b64: Merge change 26885 into eclair
Merge commit '3776994ce00c8f2423a7eb94641fb7c8a025a331'

* commit '3776994ce00c8f2423a7eb94641fb7c8a025a331':
  Tell the SDK that ApiDemoes requires Eclair preview.
2009-09-25 11:13:27 -07:00
Piotr Gurgul
5b47911df6 am 284e84b6: am 95a32505: Merge change 26649 into eclair
Merge commit '284e84b677f0e8588bf5d3ebc44b615d922b493f'

* commit '284e84b677f0e8588bf5d3ebc44b615d922b493f':
  Define tested.project.dir property for existing samples
2009-09-25 10:54:06 -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
Derek Sollenberger
71e02ae249 am f7d831e8: am 4a9200d0: renaming setJavaClassName to setPluginStubJavaClassName
Merge commit 'f7d831e876c1135b1fc73058358ce3dfb61ca304'

* commit 'f7d831e876c1135b1fc73058358ce3dfb61ca304':
  renaming setJavaClassName to setPluginStubJavaClassName
2009-09-21 10:53:18 -07:00
Derek Sollenberger
f7d831e876 am 4a9200d0: renaming setJavaClassName to setPluginStubJavaClassName
Merge commit '4a9200d0945cd5eb4cfe7a8721c70eeec67e528e' into eclair-plus-aosp

* commit '4a9200d0945cd5eb4cfe7a8721c70eeec67e528e':
  renaming setJavaClassName to setPluginStubJavaClassName
2009-09-21 10:42:56 -07:00
Derek Sollenberger
4a9200d094 renaming setJavaClassName to setPluginStubJavaClassName
Change-Id: I1a962ed93e27615611a248b8791d3392ba36df1e
2009-09-21 09:15:38 -04:00
Patrick Scott
0f21d65744 am 967b58be: am 107621ad: Merge change 25538 into eclair
Merge commit '967b58bed382c3b096e65e8ac7f943c12c96bdb4'

* commit '967b58bed382c3b096e65e8ac7f943c12c96bdb4':
  Do not install libsampleplugin by default.
2009-09-17 13:20:14 -07:00
Patrick Scott
967b58bed3 am 107621ad: Merge change 25538 into eclair
Merge commit '107621ad3120121bfd0eec59f2069995fbe27b0b' into eclair-plus-aosp

* commit '107621ad3120121bfd0eec59f2069995fbe27b0b':
  Do not install libsampleplugin by default.
2009-09-17 13:09:39 -07:00
Patrick Scott
4a8c3bf380 Do not install libsampleplugin by default.
This avoids installing the library during a normal build. When building
SampleBrowserPlugin, the library will be packaged in the apk.
2009-09-17 15:07:35 -04:00
Derek Sollenberger
cc2e456256 am 4ccb60a8: am 33769eea: Merge change 24203 into eclair
Merge commit '4ccb60a894badfea7365e43ac87ba63e20fb5bdd'

* commit '4ccb60a894badfea7365e43ac87ba63e20fb5bdd':
  Updating samplePlugin to use java surface views.
2009-09-17 09:46:02 -07:00
Derek Sollenberger
c99110c936 am 33b4efa5: am 3b3de839: Merge change 23489 into eclair
Merge commit '33b4efa5cbf3928cddacf3f45e596a05dc256ab3'

* commit '33b4efa5cbf3928cddacf3f45e596a05dc256ab3':
  adding support for plugins to use the java view system.
2009-09-17 09:45:58 -07:00
Derek Sollenberger
4ccb60a894 am 33769eea: Merge change 24203 into eclair
Merge commit '33769eea082e0fece00f9cc16995f1edba5bfeb0' into eclair-plus-aosp

* commit '33769eea082e0fece00f9cc16995f1edba5bfeb0':
  Updating samplePlugin to use java surface views.
2009-09-15 17:13:09 -07:00
Derek Sollenberger
33b4efa5cb am 3b3de839: Merge change 23489 into eclair
Merge commit '3b3de83970037c9fec707dbdb06af2835b9f5913' into eclair-plus-aosp

* commit '3b3de83970037c9fec707dbdb06af2835b9f5913':
  adding support for plugins to use the java view system.
2009-09-15 17:13:05 -07:00
Derek Sollenberger
08581f1c06 Updating samplePlugin to use java surface views.
Change-Id: I1b925ce3a6aeb0bd5464a7d5711449029944d7de
2009-09-15 19:31:43 -04:00
Derek Sollenberger
16ce3cdcac adding support for plugins to use the java view system.
Change-Id: I7305300dfc09e3e0968a1e61c21a6a2cdb983594
2009-09-15 19:31:43 -04:00
Jean-Baptiste Queru
4b4bcaf08c merge from donut 2009-09-03 14:12:47 -07:00
Eric Fischer
9e688ef136 am 9f742986: am 0c12e21a: Merge change 23532 into eclair
Merge commit '9f742986117baf8d365b8938baec57ccf499041a'

* commit '9f742986117baf8d365b8938baec57ccf499041a':
  Add backslashes before apostrophes so they don't get lost.
2009-09-01 17:35:48 -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