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

Commit db7bb7c3 authored by Tony Chan's avatar Tony Chan Committed by Android Git Automerger
Browse files

am 4ddfaeb5: Merge "sdk doc change: Added KeyChain API Demo" into ics-mr1 

* commit '4ddfaeb5':
  sdk doc change: Added KeyChain API Demo
parents 21603cc6 4ddfaeb5

Android.mk

+2 −0
Original line number Diff line number Diff line
@@ -443,6 +443,8 @@ web_docs_sample_code_flags := \ 
		            resources/samples/HoneycombGallery "Honeycomb Gallery" \

		-samplecode $(sample_dir)/JetBoy \

		            resources/samples/JetBoy "JetBoy" \

		-samplecode $(sample_dir)/KeyChainDemo \

		            resources/samples/KeyChainDemo "KeyChain Demo" \

		-samplecode $(sample_dir)/LunarLander \

		            resources/samples/LunarLander "Lunar Lander" \

		-samplecode $(sample_dir)/training/ads-and-ux \

docs/html/resources/resources-data.js

+10 −0
Original line number Diff line number Diff line
@@ -558,6 +558,16 @@ var ANDROID_RESOURCES = [ 
      en: 'A game that demonstrates the SONiVOX JET interactive music technology, with <code><a href="/reference/android/media/JetPlayer.html">JetPlayer</a></code>.'

    }

  },

  {

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

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

    title: {

      en: 'KeyChain Demo'

    },

    description: {

      en: 'A demo application to demonstrate how to use KeyChain APIs.'

    }

  },

  {

    tags: ['sample', 'gamedev', 'media'],

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

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

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

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

0 → 100755
+39.4 KiB
Loading image diff...

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

0 → 100755
+61 KiB
Loading image diff...