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

Commit b9d3e5ec authored Feb 11, 2011 by Adam Cohen Committed by Android Git Automerger Feb 11, 2011

am c7f15f5c: am 5a1b6357: Merge "Adding StackWidget sample code" into honeycomb

* commit 'c7f15f5c':
  Adding StackWidget sample code

parents 2fc779ea c7f15f5c

Android.mk

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -428,6 +428,8 @@ web_docs_sample_code_flags := \
	resources/samples/Spinner "Spinner" \		resources/samples/Spinner "Spinner" \
	-samplecode $(sample_dir)/SpinnerTest \		-samplecode $(sample_dir)/SpinnerTest \
	resources/samples/SpinnerTest "SpinnerTest" \		resources/samples/SpinnerTest "SpinnerTest" \
			-samplecode $(sample_dir)/StackWidget \
			resources/samples/StackWidget "StackWidget" \
	-samplecode $(sample_dir)/TicTacToeLib \		-samplecode $(sample_dir)/TicTacToeLib \
	resources/samples/TicTacToeLib "TicTacToeLib" \		resources/samples/TicTacToeLib "TicTacToeLib" \
	-samplecode $(sample_dir)/TicTacToeMain \		-samplecode $(sample_dir)/TicTacToeMain \

docs/html/resources/resources-data.js

+10 −0

Original line number	Original line	Diff line number	Diff line
	@@ -564,6 +564,16 @@ var ANDROID_RESOURCES = [
	en: 'The test application for the Activity Testing tutorial. It tests the Spinner example application.'		en: 'The test application for the Activity Testing tutorial. It tests the Spinner example application.'
	}		}
	},		},
			{
			tags: ['sample', 'new', 'newfeature'],
			path: 'samples/StackWidget/index.html',
			title: {
			en: 'StackView App Widget'
			},
			description: {
			en: 'Demonstrates how to create a simple collection widget containing a StackView.'
			}
			},
	{		{
	tags: ['sample', 'newfeature'],		tags: ['sample', 'newfeature'],
	path: 'samples/TicTacToeLib/index.html',		path: 'samples/TicTacToeLib/index.html',

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

0 → 100644

+2.47 KiB

Loading image diff...