Merge "Update resources data JSON, sample screenshot, and SDK makefile for... (8635908d) · Commits · e / os / android_frameworks_base

Android.mk

+2 −2

Original line number	Diff line number	Diff line
		@@ -401,8 +401,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 \

+7 −7

Original line number	Diff line number	Diff line
		@@ -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).'
		}
		},
		{

−56.7 KiB (244 KiB)

Loading image diff...