am b8d74fd9: am 8635908d: Merge "Update resources data JSON, sample screenshot, and SDK makefile for Honeycomb Gallery" into honeycomb

* commit 'b8d74fd962e7a8595e5aeadb78b5e7eacea52e8a':
  Update resources data JSON, sample screenshot, and SDK makefile for Honeycomb Gallery

3 files changed, 9 insertions, 9 deletions

diff --git a/Android.mk b/Android.mk
index d26c313bac89..c18b24bc26d6 100644
--- a/Android.mk
+++ b/Android.mk
@@ -402,8 +402,8 @@ web_docs_sample_code_flags := \
                 resources/samples/CubeLiveWallpaper "Cube Live Wallpaper" \
 		-samplecode $(sample_dir)/Home \
 		            resources/samples/Home "Home" \
-                -samplecode $(sample_dir)/Honeycomb-Gallery \
-                            resources/samples/Honeycomb-Gallery "Honeycomb Gallery" \
+                -samplecode $(sample_dir)/HoneycombGallery \
+                            resources/samples/HoneycombGallery "Honeycomb Gallery" \
 		-samplecode $(sample_dir)/JetBoy \
 		            resources/samples/JetBoy "JetBoy" \
 		-samplecode $(sample_dir)/LunarLander \
diff --git a/docs/html/resources/resources-data.js b/docs/html/resources/resources-data.js
index 11964da3f537..5a3145b5185c 100644
--- a/docs/html/resources/resources-data.js
+++ b/docs/html/resources/resources-data.js
@@ -180,7 +180,7 @@ var ANDROID_RESOURCES = [
     }
   },
   {
-    tags: ['article', 'ui', 'newfeature'],
+    tags: ['article', 'ui'],
     path: 'articles/live-folders.html',
     title: {
       en: 'Live Folders'
@@ -190,7 +190,7 @@ var ANDROID_RESOURCES = [
     }
   },
   {
-    tags: ['article', 'ui', 'newfeature'],
+    tags: ['article', 'ui'],
     path: 'articles/live-wallpapers.html',
     title: {
       en: 'Live Wallpapers'
@@ -250,7 +250,7 @@ var ANDROID_RESOURCES = [
     }
   },
   {
-    tags: ['article', 'newfeature'],
+    tags: ['article'],
     path: 'articles/ui-1.5.html',
     title: {
       en: 'UI Framework Changes in Android 1.5'
@@ -260,7 +260,7 @@ var ANDROID_RESOURCES = [
     }
   },
   {
-    tags: ['article', 'newfeature'],
+    tags: ['article'],
     path: 'articles/ui-1.6.html',
     title: {
       en: 'UI Framework Changes in Android 1.6'
@@ -435,13 +435,13 @@ var ANDROID_RESOURCES = [
     }
   },
   {
-    tags: ['sample', 'new'],
-    path: 'samples/Honeycomb-Gallery/index.html',
+    tags: ['sample', 'new', 'newfeature', 'ui'],
+    path: 'samples/HoneycombGallery/index.html',
     title: {
       en: 'Honeycomb Gallery'
     },
     description: {
-      en: 'An image gallery application using Honeycomb-specific APIs.'
+      en: 'An image gallery application using APIs that are new in Android 3.0 (a.k.a. Honeycomb).'
     }
   },
   {
diff --git a/docs/html/resources/samples/images/hcgallery.png b/docs/html/resources/samples/images/hcgallery.png
index 9a80fd77ad9b..42b018341fc2 100644
--- a/docs/html/resources/samples/images/hcgallery.png
+++ b/docs/html/resources/samples/images/hcgallery.png