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

Commit 7c8be3a7 authored by Robert Ly's avatar Robert Ly Committed by Android Git Automerger
Browse files

am 762481f0: Merge "adding the usb apis to the resources browser" into honeycomb-mr1 

* commit '762481f0':
  adding the usb apis to the resources browser
parents f0a1d683 762481f0

Android.mk

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

		-samplecode $(sample_dir)/TicTacToeMain \

		            resources/samples/TicTacToeMain "TicTacToeMain" \

		-samplecode $(sample_dir)/USB \

		            resources/samples/USB "USB" \

		-samplecode $(sample_dir)/WeatherListWidget \

		            resources/samples/WeatherListWidget "Weather List Widget" \

		-samplecode $(sample_dir)/Wiktionary \

docs/html/resources/resources-data.js

+10 −0
Original line number Diff line number Diff line
@@ -605,6 +605,16 @@ var ANDROID_RESOURCES = [ 
      en: 'Demonstrates how an application can make use of shared code and resources stored in an Android library project.'

    }

  },

  {

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

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

    title: {

      en: 'USB'

    },

    description: {

      en: 'A set of samples that demonstrate how to use various features of the USB APIs.'

    }

  },

  {

    tags: ['sample', 'ui', 'widgets'],

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