diff --git a/samples/Support7Demos/res/layout/dialog_content_buttons.xml b/samples/Support7Demos/res/layout/dialog_content_buttons.xml
new file mode 100644
index 000000000..ab697482c
--- /dev/null
+++ b/samples/Support7Demos/res/layout/dialog_content_buttons.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2015 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              android:orientation="vertical"
+              android:layout_width="match_parent"
+              android:layout_height="match_parent">
+
+    <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/dialog_content"/>
+
+    <ImageView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:src="@drawable/app_sample_code" />
+
+    <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="right"
+            style="?attr/buttonBarStyle">
+
+        <Button
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@android:string/no"
+                style="?attr/buttonBarButtonStyle"/>
+
+        <Button
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@android:string/ok"
+                style="?attr/buttonBarButtonStyle"/>
+
+    </LinearLayout>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/samples/Support7Demos/res/values/arrays.xml b/samples/Support7Demos/res/values/arrays.xml
index ad60bcaba..9ffa6df9a 100644
--- a/samples/Support7Demos/res/values/arrays.xml
+++ b/samples/Support7Demos/res/values/arrays.xml
@@ -32,6 +32,7 @@
     <string-array name="dialog_types">
         <item>Simple</item>
         <item>Simple with Action Bar</item>
+        <item>Button bar</item>
     </string-array>
 
 </resources>
diff --git a/samples/Support7Demos/src/com/example/android/supportv7/app/DialogUsage.java b/samples/Support7Demos/src/com/example/android/supportv7/app/DialogUsage.java
index c52f31cb8..cf48d80bf 100644
--- a/samples/Support7Demos/src/com/example/android/supportv7/app/DialogUsage.java
+++ b/samples/Support7Demos/src/com/example/android/supportv7/app/DialogUsage.java
@@ -60,6 +60,9 @@ public class DialogUsage extends AppCompatActivity {
             case 1:
                 showSimpleDialogWithActionBar();
                 break;
+            case 2:
+                showButtonBarDialog();
+                break;
         }
     }
 
@@ -79,6 +82,13 @@ public class DialogUsage extends AppCompatActivity {
         dialog.show();
     }
 
+    private void showButtonBarDialog() {
+        Dialog dialog = new AppCompatDialog(this);
+        dialog.setTitle(R.string.dialog_title);
+        dialog.setContentView(R.layout.dialog_content_buttons);
+        dialog.show();
+    }
+
     /**
      * A simple {@link android.support.v7.app.AppCompatDialog} implementation which
      * inflates some items into it's options menu, and shows a toast when one is selected.