Dianne Hackborn ee3433bc58 resolved conflicts for merge of efddd2c5 to master ...

Change-Id: Ida5785a4b936ed485ee6f895cbe994acf5b37626

2010-10-05 14:06:01 -07:00

..

anim

Animation classname changes

2010-09-08 08:38:21 -07:00

drawable

Some tweaks to the loader API demo.

2010-08-05 18:20:35 -07:00

drawable-hdpi

am 11d89599: Add QuickContactsBadge widget sample to ApiDemos

2009-12-07 16:59:00 -08:00

drawable-ldpi

Add density demo.

2009-08-10 18:12:32 -07:00

drawable-mdpi

Add new sample for multi-pane PreferenceActivity.

2010-08-03 10:39:14 -07:00

drawable-nodpi

Add density demo.

2009-08-10 18:12:32 -07:00

layout

resolved conflicts for merge of efddd2c5 to master

2010-10-05 14:06:01 -07:00

layout-land

Make FramementLayout demo better... and, um actually work.

2010-09-21 19:29:47 -07:00

menu

SearchView examples

2010-09-14 18:05:13 -07:00

raw

Add API Demos showing how to use cube maps and frame buffer objects.

2010-01-29 20:58:38 +08:00

values

resolved conflicts for merge of efddd2c5 to master

2010-10-05 14:06:01 -07:00

values-large

Add density demo.

2009-08-10 18:12:32 -07:00

values-large-long

Add density demo.

2009-08-10 18:12:32 -07:00

values-large-notlong

Add density demo.

2009-08-10 18:12:32 -07:00

values-long

Add density demo.

2009-08-10 18:12:32 -07:00

values-normal

Add density demo.

2009-08-10 18:12:32 -07:00

values-normal-long

Add density demo.

2009-08-10 18:12:32 -07:00

values-normal-notlong

Add density demo.

2009-08-10 18:12:32 -07:00

values-notlong

Add density demo.

2009-08-10 18:12:32 -07:00

values-small

Add density demo.

2009-08-10 18:12:32 -07:00

values-small-long

Add density demo.

2009-08-10 18:12:32 -07:00

values-small-notlong

Add density demo.

2009-08-10 18:12:32 -07:00

xml

Update preference samples.

2010-08-26 17:09:27 -07:00