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

Commit df5d7c88 authored by Scott Main's avatar Scott Main Committed by Android (Google) Code Review
Browse files

Merge "adding Android Beam sample"

parents 53902603 d8afdb49

Android.mk

+2 −0
Original line number Diff line number Diff line
@@ -400,6 +400,8 @@ web_docs_sample_code_flags := \ 
		            resources/samples/AccessibilityService "Accessibility Service" \

		-samplecode $(sample_dir)/AccelerometerPlay \

		            resources/samples/AccelerometerPlay "Accelerometer Play" \

                -samplecode $(sample_dir)/AndroidBeam \

		            resources/samples/AndroidBeam "Android Beam" \

		-samplecode $(sample_dir)/ApiDemos \

		            resources/samples/ApiDemos "API Demos" \

		-samplecode $(sample_dir)/Support4Demos \

docs/html/resources/resources-data.js

+10 −0
Original line number Diff line number Diff line
@@ -407,6 +407,16 @@ var ANDROID_RESOURCES = [ 
      en: 'Illustrates an accessibility service that provides custom feedback for the Clock application which comes by default with Android devices'

    }

  },

  {

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

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

    title: {

      en: 'Android Beam'

    },

    description: {

      en: 'An example of how to use the Android Beam feature to send messages between two Android-powered devices (API level 14 or later) that support NFC.'

    }

  },

  {

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

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