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

Commit 3eb4527a authored by Roman Nurik's avatar Roman Nurik Committed by Android (Google) Code Review
Browse files

Merge "Add ActionBarCompat sample (CL 2 of 2)"

parents 1a7ae634 f4b2ba18

Android.mk

+6 −4
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)/ActionBarCompat \

		            resources/samples/ActionBarCompat "Action Bar Compatibility" \

                -samplecode $(sample_dir)/AndroidBeam \

		            resources/samples/AndroidBeam "Android Beam" \

		-samplecode $(sample_dir)/ApiDemos \

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', 'ui', 'compatibility', 'newfeature'],

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

    title: {

      en: 'Action Bar Compatibility'

    },

    description: {

      en: 'Shows how to use the action bar on both pre-API 11 and API 11+ devices, maximizing code re-use.'

    }

  },

  {

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

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

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

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

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

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