Commit Graph

289 Commits

Author SHA1 Message Date
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
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
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
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
eb3547b3d0 Add API demo for services that run in the foreground.
Change-Id: I7acb0817e5d738294bef02ca2df3c2ab18b45f60
2009-11-25 17:06:53 -08:00
Jean-Baptiste Queru
a7978d3bb0 merge from open-source master 2009-10-14 16:02:09 -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
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
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
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
Dianne Hackborn
3b01460578 Add density demo.
This is basically just a copy of DpiTest, but it seems like this stuff
would be useful to have in sample code.
2009-08-10 18:12:32 -07:00
Dianne Hackborn
b1a1abffa8 Use new wallpaper theme. 2009-08-09 17:23:53 -07:00
Dianne Hackborn
44bf93a67b Half-done new wallpaper API demo. 2009-08-08 21:36:31 -07:00
Mike Reed
b94183bf7c add sample for using colorfilters 2009-06-08 14:00:17 -04:00
Jean-Baptiste Queru
670bde6ff0 Automated import from //branches/master/...@142574,142574 2009-03-25 15:05:49 -07:00
Romain Guy
02e8d006b0 Automated import from //branches/donutburger/...@142465,142465 2009-03-24 22:45:50 -07:00
The Android Open Source Project
243d18eb22 auto import from //branches/cupcake/...@137873 2009-03-11 12:11:54 -07:00
The Android Open Source Project
52d4c30ca5 auto import from //depot/cupcake/@135843 2009-03-03 19:29:09 -08:00
The Android Open Source Project
d4aee0c0ca auto import from //depot/cupcake/@135843 2009-03-03 18:28:16 -08:00
The Android Open Source Project
87a88c4f03 auto import from //branches/cupcake/...@131421 2009-02-13 12:57:48 -08:00
The Android Open Source Project
e3c5766074 auto import from //branches/cupcake/...@130745 2009-02-10 15:43:58 -08:00
The Android Open Source Project
95cf464c5a auto import from //branches/cupcake/...@125939 2009-01-09 17:51:19 -08:00
The Android Open Source Project
e943f2fd8e Code drop from //branches/cupcake/...@124589 2008-12-17 18:04:04 -08:00
The Android Open Source Project
5c11852110 Initial Contribution 2008-10-21 07:00:00 -07:00