Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 97ef3b41 authored Feb 15, 2011 by Scott Main Committed by Android (Google) Code Review Feb 15, 2011

Merge "docs: revise a couple sample app names to match side nav" into honeycomb

parents 5a44efb4 d873e660

Android.mk

+2 −2

Original line number	Diff line number	Diff line
		@@ -428,13 +428,13 @@ web_docs_sample_code_flags := \
		-samplecode $(sample_dir)/SpinnerTest \
		resources/samples/SpinnerTest "SpinnerTest" \
		-samplecode $(sample_dir)/StackWidget \
		resources/samples/StackWidget "StackWidget" \
		resources/samples/StackWidget "StackView Widget" \
		-samplecode $(sample_dir)/TicTacToeLib \
		resources/samples/TicTacToeLib "TicTacToeLib" \
		-samplecode $(sample_dir)/TicTacToeMain \
		resources/samples/TicTacToeMain "TicTacToeMain" \
		-samplecode $(sample_dir)/WeatherListWidget \
		resources/samples/WeatherListWidget "Weather List Widget Sample" \
		resources/samples/WeatherListWidget "Weather List Widget" \
		-samplecode $(sample_dir)/Wiktionary \
		resources/samples/Wiktionary "Wiktionary" \
		-samplecode $(sample_dir)/WiktionarySimple \

docs/html/resources/resources-data.js

+2 −2

Original line number	Diff line number	Diff line
		@@ -569,7 +569,7 @@ var ANDROID_RESOURCES = [
		tags: ['sample', 'new', 'newfeature', 'widgets'],
		path: 'samples/StackWidget/index.html',
		title: {
		en: 'StackView App Widget'
		en: 'StackView Widget'
		},
		description: {
		en: 'Demonstrates how to create a simple collection widget containing a StackView.'
		@@ -619,7 +619,7 @@ var ANDROID_RESOURCES = [
		tags: ['sample', 'widgets', 'newfeature', 'new'],
		path: 'samples/WeatherListWidget/index.html',
		title: {
		en: 'Weather List Widget Sample'
		en: 'Weather List Widget'
		},
		description: {
		en: 'A more complex collection-widget example which uses a ContentProvider as its data source.'