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

Android.mk

@@ -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 \
@@ -416,12 +418,12 @@ web_docs_sample_code_flags := \
 		            resources/samples/BusinessCard "Business Card" \
 		-samplecode $(sample_dir)/ContactManager \
 		            resources/samples/ContactManager "Contact Manager" \
-    -samplecode $(sample_dir)/CubeLiveWallpaper \
-                resources/samples/CubeLiveWallpaper "Cube Live Wallpaper" \
+		-samplecode $(sample_dir)/CubeLiveWallpaper \
+		            resources/samples/CubeLiveWallpaper "Cube Live Wallpaper" \
 		-samplecode $(sample_dir)/Home \
 		            resources/samples/Home "Home" \
-                -samplecode $(sample_dir)/HoneycombGallery \
-                            resources/samples/HoneycombGallery "Honeycomb Gallery" \
+		-samplecode $(sample_dir)/HoneycombGallery \
+		            resources/samples/HoneycombGallery "Honeycomb Gallery" \
 		-samplecode $(sample_dir)/JetBoy \
 		            resources/samples/JetBoy "JetBoy" \
 		-samplecode $(sample_dir)/LunarLander \

docs/html/resources/resources-data.js

@@ -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',