Merge "Associated changes for 'Adding sample for collection widgets backed by content providers.'" into honeycomb

3 files changed, 12 insertions, 0 deletions

diff --git a/Android.mk b/Android.mk
index 18e0963eaf0c..efe1ea10a22b 100644
--- a/Android.mk
+++ b/Android.mk
@@ -431,6 +431,8 @@ web_docs_sample_code_flags := \
 		            resources/samples/TicTacToeLib "TicTacToeLib" \
 		-samplecode $(sample_dir)/TicTacToeMain \
 		            resources/samples/TicTacToeMain "TicTacToeMain" \
+		-samplecode $(sample_dir)/WeatherListWidget \
+		            resources/samples/WeatherListWidget "Weather List Widget Sample" \
 		-samplecode $(sample_dir)/Wiktionary \
 		            resources/samples/Wiktionary "Wiktionary" \
 		-samplecode $(sample_dir)/WiktionarySimple \
diff --git a/docs/html/resources/resources-data.js b/docs/html/resources/resources-data.js
index 5a3145b5185c..6d0768dc84f0 100644
--- a/docs/html/resources/resources-data.js
+++ b/docs/html/resources/resources-data.js
@@ -605,6 +605,16 @@ var ANDROID_RESOURCES = [
     }
   },
   {
+    tags: ['sample', 'widgets', 'newfeature', 'new'],
+    path: 'samples/WeatherListWidget/index.html',
+    title: {
+      en: 'Weather List Widget Sample'
+    },
+    description: {
+      en: 'A more complex collection-widget example which uses a ContentProvider as its data source.'
+    }
+  },
+  {
     tags: ['sample', 'layout'],
     path: 'samples/XmlAdapters/index.html',
     title: {
diff --git a/docs/html/resources/samples/images/WeatherListWidget.png b/docs/html/resources/samples/images/WeatherListWidget.png
new file mode 100644
index 000000000000..f0cbdaff095f
--- /dev/null
+++ b/docs/html/resources/samples/images/WeatherListWidget.png