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

Commit f450fd07 authored by Robert Ly's avatar Robert Ly Committed by Android (Google) Code Review
Browse files

Merge "fixing resource browser for renderscript samples because the samples moved"

parents d72fcf68 44b362c3

Android.mk

+2 −2
Original line number Diff line number Diff line
@@ -417,8 +417,8 @@ web_docs_sample_code_flags := \ 
		            resources/samples/NotePad "Note Pad" \

		-samplecode $(sample_dir)/SampleSyncAdapter \

		            resources/samples/SampleSyncAdapter "Sample Sync Adapter" \

		-samplecode frameworks/base/libs/rs/java \

		            resources/samples/Renderscript "Renderscript" \

		-samplecode $(sample_dir)/RenderScript \

		            resources/samples/RenderScript "RenderScript" \

		-samplecode $(sample_dir)/SearchableDictionary \

		            resources/samples/SearchableDictionary "Searchable Dictionary v2" \

		-samplecode $(sample_dir)/SipDemo \

docs/html/resources/resources-data.js

+3 −3
Original line number Diff line number Diff line
@@ -497,12 +497,12 @@ var ANDROID_RESOURCES = [ 
  },

  {

    tags: ['sample', 'new', 'newfeature', 'performance', 'gamedev', 'gl'],

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

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

    title: {

      en: 'Renderscript'

      en: 'RenderScript'

    },

    description: {

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

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

    }

  },

  {