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

Commit 5f3cd3ea authored by Winson Chung's avatar Winson Chung Committed by Android (Google) Code Review
Browse files

Merge "Associated changes for 'Adding sample for collection widgets backed by... 

Merge "Associated changes for 'Adding sample for collection widgets backed by content providers.'" into honeycomb
parents 2be58282 06d2fa70

Android.mk

+2 −0
Original line number Original line Diff line number Diff line
@@ -431,6 +431,8 @@ web_docs_sample_code_flags := \ 
		            resources/samples/TicTacToeLib "TicTacToeLib" \

		            resources/samples/TicTacToeLib "TicTacToeLib" \

		-samplecode $(sample_dir)/TicTacToeMain \

		-samplecode $(sample_dir)/TicTacToeMain \

		            resources/samples/TicTacToeMain "TicTacToeMain" \

		            resources/samples/TicTacToeMain "TicTacToeMain" \

		-samplecode $(sample_dir)/WeatherListWidget \

		            resources/samples/WeatherListWidget "Weather List Widget Sample" \

		-samplecode $(sample_dir)/Wiktionary \

		-samplecode $(sample_dir)/Wiktionary \

		            resources/samples/Wiktionary "Wiktionary" \

		            resources/samples/Wiktionary "Wiktionary" \

		-samplecode $(sample_dir)/WiktionarySimple \

		-samplecode $(sample_dir)/WiktionarySimple \

docs/html/resources/resources-data.js

+10 −0
Original line number Original line Diff line number Diff line
@@ -604,6 +604,16 @@ var ANDROID_RESOURCES = [ 
      en: 'A simple Android home screen widgets example.'

      en: 'A simple Android home screen widgets example.'

    }

    }

  },

  },

  {

    tags: ['sample', 'widgets', 'newfeature', 'new'],

    path: 'samples/WeatherListWidget/index.html',

    title: {

      en: 'Weather List Widget Sample'

    },

    description: {

      en: 'A more complex collection-widget example which uses a ContentProvider as its data source.'

    }

  },

  {

  {

    tags: ['sample', 'layout'],

    tags: ['sample', 'layout'],

    path: 'samples/XmlAdapters/index.html',

    path: 'samples/XmlAdapters/index.html',

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

0 → 100644
+27.7 KiB
Loading image diff...