commit 5d82abe5862fae01d16e63a3da27a9de4021e271
author Roman Nurik <romannurik@google.com> Mon Feb 07 17:27:58 2011 -0800
committer Android Git Automerger <android-git-automerger@android.com> Mon Feb 07 17:27:58 2011 -0800
tree 22f6f75c93cbadd5093be931b3e141d57ae37ac0
parent 609602ed771f5c1ed159f7fdaec2e6fd52370be7
parent b8d74fd962e7a8595e5aeadb78b5e7eacea52e8a

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

Android.mk

diff --git a/Android.mk b/Android.mk
index d26c313..c18b24b 100644
--- a/Android.mk
+++ b/Android.mk
@@ -402,8 +402,8 @@
                 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 \

docs/html/resources/resources-data.js

diff --git a/docs/html/resources/resources-data.js b/docs/html/resources/resources-data.js
index 11964da..5a3145b 100644
--- a/docs/html/resources/resources-data.js
+++ b/docs/html/resources/resources-data.js
@@ -180,7 +180,7 @@
     }
   },
   {
-    tags: ['article', 'ui', 'newfeature'],
+    tags: ['article', 'ui'],
     path: 'articles/live-folders.html',
     title: {
       en: 'Live Folders'
@@ -190,7 +190,7 @@
     }
   },
   {
-    tags: ['article', 'ui', 'newfeature'],
+    tags: ['article', 'ui'],
     path: 'articles/live-wallpapers.html',
     title: {
       en: 'Live Wallpapers'
@@ -250,7 +250,7 @@
     }
   },
   {
-    tags: ['article', 'newfeature'],
+    tags: ['article'],
     path: 'articles/ui-1.5.html',
     title: {
       en: 'UI Framework Changes in Android 1.5'
@@ -260,7 +260,7 @@
     }
   },
   {
-    tags: ['article', 'newfeature'],
+    tags: ['article'],
     path: 'articles/ui-1.6.html',
     title: {
       en: 'UI Framework Changes in Android 1.6'
@@ -435,13 +435,13 @@
     }
   },
   {
-    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).'
     }
   },
   {

docs/html/resources/samples/images/hcgallery.png

diff --git a/docs/html/resources/samples/images/hcgallery.png b/docs/html/resources/samples/images/hcgallery.png
index 9a80fd7..42b0183 100644
--- a/docs/html/resources/samples/images/hcgallery.png
+++ b/docs/html/resources/samples/images/hcgallery.png
Binary files differ