PoorManThemes: add round UI support to themes

yes. do it.

Change-Id: Ib080f6065ae7c461e7af7569a24d9c79bd9c0e1d
diff --git a/google/themes/PrimaryAlmostBlack/res/values/settings.xml b/google/themes/PrimaryAlmostBlack/res/values/settings.xml
index 2b9e570..0fe9576 100644
--- a/google/themes/PrimaryAlmostBlack/res/values/settings.xml
+++ b/google/themes/PrimaryAlmostBlack/res/values/settings.xml
@@ -22,6 +22,7 @@
         <item name="android:colorControlNormal">@*android:color/omni_color4</item>
         <item name="android:colorControlHighlight">@*android:color/omni_color7</item>
         <item name="android:colorControlActivated">@*android:color/omni_color5</item>
-
+        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
+        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</item>
     </style>
 </resources>
diff --git a/google/themes/PrimaryAlmostBlack/res/values/themes.xml b/google/themes/PrimaryAlmostBlack/res/values/themes.xml
index e6f496b..4dc2324 100644
--- a/google/themes/PrimaryAlmostBlack/res/values/themes.xml
+++ b/google/themes/PrimaryAlmostBlack/res/values/themes.xml
@@ -15,7 +15,8 @@
 	<item name="android:textColorHint">@*android:color/omni_color3</item>
 	<item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
         <item name="android:colorControlNormal">@*android:color/omni_color4</item>
-
+        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
+        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</item>
     </style>
     <!-- Variant of {@link #Theme_DeviceDefault_Light} with no action bar -->
     <style name="Theme.DeviceDefault.Light.NoActionBar" parent="@*android:style/Theme.Material.NoActionBar">
@@ -33,6 +34,8 @@
         <item name="android:textColorHint">@*android:color/omni_color3</item>
         <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
         <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
+        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</item>
     </style>
 
 
@@ -51,6 +54,8 @@
         <item name="android:textColorHint">@*android:color/omni_color3</item>
         <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
         <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
+        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</item>
     </style>
 
     <!-- Variant of {@link #Theme_DeviceDefault_Light} with no action bar and no status bar
@@ -112,6 +117,8 @@
         <item name="android:textColorHint">@*android:color/omni_color3</item>
         <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
         <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
+        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</item>
     </style>
 
     <!-- Variant of {@link #Theme_DeviceDefault_Light_Dialog} that has a nice minimum width for a
@@ -129,7 +136,8 @@
         <item name="android:textColorHint">@*android:color/omni_color3</item>
         <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
         <item name="android:colorControlNormal">@*android:color/omni_color4</item>
-
+        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
+        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</item>
     </style>
 
      <!-- Variant of {@link #Theme_DeviceDefault_Light_Dialog} without an action bar -->
@@ -163,6 +171,8 @@
         <item name="android:textColorHint">@*android:color/omni_color3</item>
         <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
         <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
+        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</item>
     </style>
 
     <!-- Variant of Theme.DeviceDefault.Dialog that has a fixed size. -->
@@ -184,6 +194,8 @@
         <item name="android:textColorHint">@*android:color/omni_color3</item>
         <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
         <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
+        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</item>
     </style>
 
     <!-- Variant of Theme.DeviceDefault.Dialog.NoActionBar that has a fixed size. -->
@@ -205,7 +217,8 @@
         <item name="android:textColorHint">@*android:color/omni_color3</item>
         <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
         <item name="android:colorControlNormal">@*android:color/omni_color4</item>
-
+        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
+        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</item>
     </style>
 
     <!-- DeviceDefault light theme for a window that will be displayed either full-screen on smaller
@@ -223,6 +236,8 @@
         <item name="android:textColorHint">@*android:color/omni_color3</item>
         <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
         <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
+        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</item>
     </style>
 
     <!-- DeviceDefault light theme for a window without an action bar that will be displayed either
@@ -241,6 +256,8 @@
         <item name="android:textColorHint">@*android:color/omni_color3</item>
         <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
         <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
+        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</item>
     </style>
 
     <!-- DeviceDefault light theme for a presentation window on a secondary display. -->
@@ -257,6 +274,8 @@
         <item name="android:textColorHint">@*android:color/omni_color3</item>
         <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
         <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
+        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</item>
     </style>
 
     <!-- DeviceDefault light theme for panel windows. This removes all extraneous window
@@ -275,6 +294,8 @@
         <item name="android:textColorHint">@*android:color/omni_color3</item>
         <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
         <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
+        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</item>
     </style>
 
     <style name="Theme.DeviceDefault.Light.Dialog.Alert" parent="@*android:style/Theme.Material.Dialog.Alert">
@@ -306,6 +327,8 @@
         <item name="android:textColorHint">@*android:color/omni_color3</item>
         <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
         <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
+        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</item>
     </style>
 
     <style name="Theme.DeviceDefault.Light.Voice" parent="@*android:style/Theme.Material.Voice">
@@ -321,6 +344,8 @@
         <item name="android:textColorHint">@*android:color/omni_color3</item>
         <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
         <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
+        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</item>
     </style>
 
     <style name="Theme.DeviceDefault.QuickSettings" parent="@*android:style/Theme.DeviceDefault">
@@ -338,6 +363,8 @@
         <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
         <item name="android:colorControlNormal">@*android:color/omni_color4</item>
 -->
+        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
+        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</item>
     </style>
 
     <style name="qs_base" parent="@*android:style/Theme.DeviceDefault">
@@ -354,6 +381,8 @@
         <item name="android:textColorHint">@*android:color/omni_color3</item>
         <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
         <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
+        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</item>
     </style>
 
     <style name="Theme.DeviceDefault.QuickSettings.Dialog" parent="@*android:style/Theme.DeviceDefault.Dialog">
@@ -370,6 +399,8 @@
         <item name="android:textColorHint">@*android:color/omni_color3</item>
         <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
         <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
+        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</item>
     </style>
 
     <!-- Variant of {@link #Theme_DeviceDefault_Settings_Dark} with no action bar -->
@@ -386,6 +417,8 @@
         <item name="android:textColorHint">@*android:color/omni_color3</item>
         <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
         <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
+        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</item>
     </style>
 
     <style name="Theme.DeviceDefault.Settings.Dialog" parent="@*android:style/Theme.Material.Settings.Dialog">
@@ -402,6 +435,8 @@
         <item name="android:textColorHint">@*android:color/omni_color3</item>
         <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
         <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
+        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</item>
     </style>
 
     <style name="Theme.DeviceDefault.Settings.DialogWhenLarge" parent="@*android:style/Theme.Material.Settings.DialogWhenLarge">
@@ -418,6 +453,8 @@
         <item name="android:textColorHint">@*android:color/omni_color3</item>
         <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
         <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
+        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</item>
     </style>
 
     <style name="Theme.DeviceDefault.Settings.Dialog.Alert" parent="@*android:style/Theme.Material.Settings.Dialog.Alert">
@@ -435,6 +472,8 @@
         <item name="android:textColorHint">@*android:color/omni_color3</item>
         <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
         <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
+        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</item>
     </style>
 
     <style name="Theme.DeviceDefault.Settings.Dialog.NoActionBar" parent="@*android:style/Theme.DeviceDefault.Dialog.NoActionBar"/>
@@ -484,6 +523,8 @@
         <item name="android:textColorHint">@*android:color/omni_color3</item>
         <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
         <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
+        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</item>
     </style>
 
     <!-- @hide Theme overlay that inherits from material actionbar,  and use accent color for
diff --git a/google/themes/PrimaryBlack/res/values/settings.xml b/google/themes/PrimaryBlack/res/values/settings.xml
index 2b9e570..0fe9576 100644
--- a/google/themes/PrimaryBlack/res/values/settings.xml
+++ b/google/themes/PrimaryBlack/res/values/settings.xml
@@ -22,6 +22,7 @@
         <item name="android:colorControlNormal">@*android:color/omni_color4</item>
         <item name="android:colorControlHighlight">@*android:color/omni_color7</item>
         <item name="android:colorControlActivated">@*android:color/omni_color5</item>
-
+        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
+        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</item>
     </style>
 </resources>
diff --git a/google/themes/PrimaryBlack/res/values/themes.xml b/google/themes/PrimaryBlack/res/values/themes.xml
index 9f1fc15..4dc2324 100644
--- a/google/themes/PrimaryBlack/res/values/themes.xml
+++ b/google/themes/PrimaryBlack/res/values/themes.xml
@@ -15,7 +15,8 @@
 	<item name="android:textColorHint">@*android:color/omni_color3</item>
 	<item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
         <item name="android:colorControlNormal">@*android:color/omni_color4</item>
-
+        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
+        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</item>
     </style>
     <!-- Variant of {@link #Theme_DeviceDefault_Light} with no action bar -->
     <style name="Theme.DeviceDefault.Light.NoActionBar" parent="@*android:style/Theme.Material.NoActionBar">
@@ -33,6 +34,8 @@
         <item name="android:textColorHint">@*android:color/omni_color3</item>
         <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
         <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
+        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</item>
     </style>
 
 
@@ -51,6 +54,8 @@
         <item name="android:textColorHint">@*android:color/omni_color3</item>
         <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
         <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
+        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</item>
     </style>
 
     <!-- Variant of {@link #Theme_DeviceDefault_Light} with no action bar and no status bar
@@ -112,6 +117,8 @@
         <item name="android:textColorHint">@*android:color/omni_color3</item>
         <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
         <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
+        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</item>
     </style>
 
     <!-- Variant of {@link #Theme_DeviceDefault_Light_Dialog} that has a nice minimum width for a
@@ -129,7 +136,8 @@
         <item name="android:textColorHint">@*android:color/omni_color3</item>
         <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
         <item name="android:colorControlNormal">@*android:color/omni_color4</item>
-
+        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
+        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</item>
     </style>
 
      <!-- Variant of {@link #Theme_DeviceDefault_Light_Dialog} without an action bar -->
@@ -163,6 +171,8 @@
         <item name="android:textColorHint">@*android:color/omni_color3</item>
         <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
         <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
+        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</item>
     </style>
 
     <!-- Variant of Theme.DeviceDefault.Dialog that has a fixed size. -->
@@ -184,6 +194,8 @@
         <item name="android:textColorHint">@*android:color/omni_color3</item>
         <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
         <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
+        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</item>
     </style>
 
     <!-- Variant of Theme.DeviceDefault.Dialog.NoActionBar that has a fixed size. -->
@@ -205,7 +217,8 @@
         <item name="android:textColorHint">@*android:color/omni_color3</item>
         <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
         <item name="android:colorControlNormal">@*android:color/omni_color4</item>
-
+        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
+        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</item>
     </style>
 
     <!-- DeviceDefault light theme for a window that will be displayed either full-screen on smaller
@@ -223,6 +236,8 @@
         <item name="android:textColorHint">@*android:color/omni_color3</item>
         <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
         <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
+        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</item>
     </style>
 
     <!-- DeviceDefault light theme for a window without an action bar that will be displayed either
@@ -241,6 +256,8 @@
         <item name="android:textColorHint">@*android:color/omni_color3</item>
         <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
         <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
+        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</item>
     </style>
 
     <!-- DeviceDefault light theme for a presentation window on a secondary display. -->
@@ -257,6 +274,8 @@
         <item name="android:textColorHint">@*android:color/omni_color3</item>
         <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
         <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
+        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</item>
     </style>
 
     <!-- DeviceDefault light theme for panel windows. This removes all extraneous window
@@ -275,6 +294,8 @@
         <item name="android:textColorHint">@*android:color/omni_color3</item>
         <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
         <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
+        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</item>
     </style>
 
     <style name="Theme.DeviceDefault.Light.Dialog.Alert" parent="@*android:style/Theme.Material.Dialog.Alert">
@@ -306,6 +327,8 @@
         <item name="android:textColorHint">@*android:color/omni_color3</item>
         <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
         <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
+        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</item>
     </style>
 
     <style name="Theme.DeviceDefault.Light.Voice" parent="@*android:style/Theme.Material.Voice">
@@ -321,6 +344,8 @@
         <item name="android:textColorHint">@*android:color/omni_color3</item>
         <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
         <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
+        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</item>
     </style>
 
     <style name="Theme.DeviceDefault.QuickSettings" parent="@*android:style/Theme.DeviceDefault">
@@ -338,10 +363,12 @@
         <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
         <item name="android:colorControlNormal">@*android:color/omni_color4</item>
 -->
+        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
+        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</item>
     </style>
 
     <style name="qs_base" parent="@*android:style/Theme.DeviceDefault">
-        <item name="android:colorBackgroundFloating">@*android:color/omni_color7</item>
+        <item name="android:colorBackgroundFloating">@*android:color/omni_color900</item>
         <!-- Color palette -->
         <item name="android:colorPrimary">@*android:color/omni_color2</item>
         <item name="android:colorPrimaryDark">@*android:color/omni_color1</item>
@@ -354,6 +381,8 @@
         <item name="android:textColorHint">@*android:color/omni_color3</item>
         <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
         <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
+        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</item>
     </style>
 
     <style name="Theme.DeviceDefault.QuickSettings.Dialog" parent="@*android:style/Theme.DeviceDefault.Dialog">
@@ -370,6 +399,8 @@
         <item name="android:textColorHint">@*android:color/omni_color3</item>
         <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
         <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
+        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</item>
     </style>
 
     <!-- Variant of {@link #Theme_DeviceDefault_Settings_Dark} with no action bar -->
@@ -386,6 +417,8 @@
         <item name="android:textColorHint">@*android:color/omni_color3</item>
         <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
         <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
+        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</item>
     </style>
 
     <style name="Theme.DeviceDefault.Settings.Dialog" parent="@*android:style/Theme.Material.Settings.Dialog">
@@ -402,6 +435,8 @@
         <item name="android:textColorHint">@*android:color/omni_color3</item>
         <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
         <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
+        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</item>
     </style>
 
     <style name="Theme.DeviceDefault.Settings.DialogWhenLarge" parent="@*android:style/Theme.Material.Settings.DialogWhenLarge">
@@ -418,6 +453,8 @@
         <item name="android:textColorHint">@*android:color/omni_color3</item>
         <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
         <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
+        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</item>
     </style>
 
     <style name="Theme.DeviceDefault.Settings.Dialog.Alert" parent="@*android:style/Theme.Material.Settings.Dialog.Alert">
@@ -435,6 +472,8 @@
         <item name="android:textColorHint">@*android:color/omni_color3</item>
         <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
         <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
+        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</item>
     </style>
 
     <style name="Theme.DeviceDefault.Settings.Dialog.NoActionBar" parent="@*android:style/Theme.DeviceDefault.Dialog.NoActionBar"/>
@@ -484,6 +523,8 @@
         <item name="android:textColorHint">@*android:color/omni_color3</item>
         <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
         <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
+        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</item>
     </style>
 
     <!-- @hide Theme overlay that inherits from material actionbar,  and use accent color for
diff --git a/google/themes/PrimaryColdWhite/res/values/settings.xml b/google/themes/PrimaryColdWhite/res/values/settings.xml
index 098e5da..583eead 100644
--- a/google/themes/PrimaryColdWhite/res/values/settings.xml
+++ b/google/themes/PrimaryColdWhite/res/values/settings.xml
@@ -22,6 +22,7 @@
         <item name="android:colorControlNormal">@*android:color/omni_color4</item>
         <item name="android:colorControlHighlight">@*android:color/omni_color1</item>
         <item name="android:colorControlActivated">@*android:color/omni_color5</item>
-
+        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
+        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</item>
     </style>
 </resources>
diff --git a/google/themes/PrimaryColdWhite/res/values/themes.xml b/google/themes/PrimaryColdWhite/res/values/themes.xml
index e914ee2..19362fc 100644
--- a/google/themes/PrimaryColdWhite/res/values/themes.xml
+++ b/google/themes/PrimaryColdWhite/res/values/themes.xml
@@ -15,7 +15,8 @@
 	<item name="android:textColorHint">@*android:color/omni_color3</item>
 	<item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
         <item name="android:colorControlNormal">@*android:color/omni_color4</item>
-
+        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
+        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</item>
     </style>
     <!-- Variant of {@link #Theme_DeviceDefault_Light} with no action bar -->
     <style name="Theme.DeviceDefault.Light.NoActionBar" parent="@*android:style/Theme.Material.NoActionBar">
@@ -33,6 +34,8 @@
         <item name="android:textColorHint">@*android:color/omni_color3</item>
         <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
         <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
+        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</item>
     </style>
 
 
@@ -51,6 +54,8 @@
         <item name="android:textColorHint">@*android:color/omni_color3</item>
         <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
         <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
+        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</item>
     </style>
 
     <!-- Variant of {@link #Theme_DeviceDefault_Light} with no action bar and no status bar
@@ -112,6 +117,8 @@
         <item name="android:textColorHint">@*android:color/omni_color3</item>
         <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
         <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
+        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</item>
     </style>
 
     <!-- Variant of {@link #Theme_DeviceDefault_Light_Dialog} that has a nice minimum width for a
@@ -129,7 +136,8 @@
         <item name="android:textColorHint">@*android:color/omni_color3</item>
         <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
         <item name="android:colorControlNormal">@*android:color/omni_color4</item>
-
+        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
+        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</item>
     </style>
 
      <!-- Variant of {@link #Theme_DeviceDefault_Light_Dialog} without an action bar -->
@@ -163,6 +171,8 @@
         <item name="android:textColorHint">@*android:color/omni_color3</item>
         <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
         <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
+        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</item>
     </style>
 
     <!-- Variant of Theme.DeviceDefault.Dialog that has a fixed size. -->
@@ -184,6 +194,8 @@
         <item name="android:textColorHint">@*android:color/omni_color3</item>
         <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
         <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
+        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</item>
     </style>
 
     <!-- Variant of Theme.DeviceDefault.Dialog.NoActionBar that has a fixed size. -->
@@ -205,7 +217,8 @@
         <item name="android:textColorHint">@*android:color/omni_color3</item>
         <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
         <item name="android:colorControlNormal">@*android:color/omni_color4</item>
-
+        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
+        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</item>
     </style>
 
     <!-- DeviceDefault light theme for a window that will be displayed either full-screen on smaller
@@ -223,6 +236,8 @@
         <item name="android:textColorHint">@*android:color/omni_color3</item>
         <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
         <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
+        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</item>
     </style>
 
     <!-- DeviceDefault light theme for a window without an action bar that will be displayed either
@@ -241,6 +256,8 @@
         <item name="android:textColorHint">@*android:color/omni_color3</item>
         <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
         <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
+        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</item>
     </style>
 
     <!-- DeviceDefault light theme for a presentation window on a secondary display. -->
@@ -257,6 +274,8 @@
         <item name="android:textColorHint">@*android:color/omni_color3</item>
         <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
         <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
+        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</item>
     </style>
 
     <!-- DeviceDefault light theme for panel windows. This removes all extraneous window
@@ -275,6 +294,8 @@
         <item name="android:textColorHint">@*android:color/omni_color3</item>
         <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
         <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
+        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</item>
     </style>
 
     <style name="Theme.DeviceDefault.Light.Dialog.Alert" parent="@*android:style/Theme.Material.Dialog.Alert">
@@ -306,6 +327,8 @@
         <item name="android:textColorHint">@*android:color/omni_color3</item>
         <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
         <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
+        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</item>
     </style>
 
     <style name="Theme.DeviceDefault.Light.Voice" parent="@*android:style/Theme.Material.Voice">
@@ -321,6 +344,8 @@
         <item name="android:textColorHint">@*android:color/omni_color3</item>
         <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
         <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
+        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</item>
     </style>
 
     <!-- Variant of {@link #Theme_DeviceDefault_Settings_Dark} with no action bar -->
@@ -337,6 +362,8 @@
         <item name="android:textColorHint">@*android:color/omni_color3</item>
         <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
         <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
+        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</item>
     </style>
 
     <style name="Theme.DeviceDefault.Settings.Dialog" parent="@*android:style/Theme.Material.Settings.Dialog">
@@ -353,6 +380,8 @@
         <item name="android:textColorHint">@*android:color/omni_color3</item>
         <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
         <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
+        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</item>
     </style>
 
     <style name="Theme.DeviceDefault.Settings.DialogWhenLarge" parent="@*android:style/Theme.Material.Settings.DialogWhenLarge">
@@ -369,6 +398,8 @@
         <item name="android:textColorHint">@*android:color/omni_color3</item>
         <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
         <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
+        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</item>
     </style>
 
     <style name="Theme.DeviceDefault.Settings.Dialog.Alert" parent="@*android:style/Theme.Material.Settings.Dialog.Alert">
@@ -386,6 +417,8 @@
         <item name="android:textColorHint">@*android:color/omni_color3</item>
         <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
         <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
+        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</item>
     </style>
 
     <style name="Theme.DeviceDefault.Settings.Dialog.NoActionBar" parent="@*android:style/Theme.DeviceDefault.Dialog.NoActionBar"/>
diff --git a/google/themes/PrimaryDarkBlue/res/values/settings.xml b/google/themes/PrimaryDarkBlue/res/values/settings.xml
index 8c94cbf..b9ff9b0 100644
--- a/google/themes/PrimaryDarkBlue/res/values/settings.xml
+++ b/google/themes/PrimaryDarkBlue/res/values/settings.xml
@@ -22,6 +22,7 @@
         <item name="android:colorControlNormal">@*android:color/omni_color4</item>
         <item name="android:colorControlHighlight">@*android:color/omni_color1</item>
         <item name="android:colorControlActivated">@*android:color/omni_color5</item>
-
+        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
+        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</item>
     </style>
 </resources>
diff --git a/google/themes/PrimaryDarkBlue/res/values/themes.xml b/google/themes/PrimaryDarkBlue/res/values/themes.xml
index e6f496b..4dc2324 100644
--- a/google/themes/PrimaryDarkBlue/res/values/themes.xml
+++ b/google/themes/PrimaryDarkBlue/res/values/themes.xml
@@ -15,7 +15,8 @@
 	<item name="android:textColorHint">@*android:color/omni_color3</item>
 	<item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
         <item name="android:colorControlNormal">@*android:color/omni_color4</item>
-
+        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
+        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</item>
     </style>
     <!-- Variant of {@link #Theme_DeviceDefault_Light} with no action bar -->
     <style name="Theme.DeviceDefault.Light.NoActionBar" parent="@*android:style/Theme.Material.NoActionBar">
@@ -33,6 +34,8 @@
         <item name="android:textColorHint">@*android:color/omni_color3</item>
         <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
         <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
+        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</item>
     </style>
 
 
@@ -51,6 +54,8 @@
         <item name="android:textColorHint">@*android:color/omni_color3</item>
         <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
         <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
+        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</item>
     </style>
 
     <!-- Variant of {@link #Theme_DeviceDefault_Light} with no action bar and no status bar
@@ -112,6 +117,8 @@
         <item name="android:textColorHint">@*android:color/omni_color3</item>
         <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
         <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
+        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</item>
     </style>
 
     <!-- Variant of {@link #Theme_DeviceDefault_Light_Dialog} that has a nice minimum width for a
@@ -129,7 +136,8 @@
         <item name="android:textColorHint">@*android:color/omni_color3</item>
         <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
         <item name="android:colorControlNormal">@*android:color/omni_color4</item>
-
+        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
+        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</item>
     </style>
 
      <!-- Variant of {@link #Theme_DeviceDefault_Light_Dialog} without an action bar -->
@@ -163,6 +171,8 @@
         <item name="android:textColorHint">@*android:color/omni_color3</item>
         <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
         <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
+        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</item>
     </style>
 
     <!-- Variant of Theme.DeviceDefault.Dialog that has a fixed size. -->
@@ -184,6 +194,8 @@
         <item name="android:textColorHint">@*android:color/omni_color3</item>
         <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
         <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
+        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</item>
     </style>
 
     <!-- Variant of Theme.DeviceDefault.Dialog.NoActionBar that has a fixed size. -->
@@ -205,7 +217,8 @@
         <item name="android:textColorHint">@*android:color/omni_color3</item>
         <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
         <item name="android:colorControlNormal">@*android:color/omni_color4</item>
-
+        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
+        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</item>
     </style>
 
     <!-- DeviceDefault light theme for a window that will be displayed either full-screen on smaller
@@ -223,6 +236,8 @@
         <item name="android:textColorHint">@*android:color/omni_color3</item>
         <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
         <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
+        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</item>
     </style>
 
     <!-- DeviceDefault light theme for a window without an action bar that will be displayed either
@@ -241,6 +256,8 @@
         <item name="android:textColorHint">@*android:color/omni_color3</item>
         <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
         <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
+        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</item>
     </style>
 
     <!-- DeviceDefault light theme for a presentation window on a secondary display. -->
@@ -257,6 +274,8 @@
         <item name="android:textColorHint">@*android:color/omni_color3</item>
         <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
         <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
+        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</item>
     </style>
 
     <!-- DeviceDefault light theme for panel windows. This removes all extraneous window
@@ -275,6 +294,8 @@
         <item name="android:textColorHint">@*android:color/omni_color3</item>
         <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
         <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
+        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</item>
     </style>
 
     <style name="Theme.DeviceDefault.Light.Dialog.Alert" parent="@*android:style/Theme.Material.Dialog.Alert">
@@ -306,6 +327,8 @@
         <item name="android:textColorHint">@*android:color/omni_color3</item>
         <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
         <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
+        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</item>
     </style>
 
     <style name="Theme.DeviceDefault.Light.Voice" parent="@*android:style/Theme.Material.Voice">
@@ -321,6 +344,8 @@
         <item name="android:textColorHint">@*android:color/omni_color3</item>
         <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
         <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
+        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</item>
     </style>
 
     <style name="Theme.DeviceDefault.QuickSettings" parent="@*android:style/Theme.DeviceDefault">
@@ -338,6 +363,8 @@
         <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
         <item name="android:colorControlNormal">@*android:color/omni_color4</item>
 -->
+        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
+        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</item>
     </style>
 
     <style name="qs_base" parent="@*android:style/Theme.DeviceDefault">
@@ -354,6 +381,8 @@
         <item name="android:textColorHint">@*android:color/omni_color3</item>
         <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
         <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
+        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</item>
     </style>
 
     <style name="Theme.DeviceDefault.QuickSettings.Dialog" parent="@*android:style/Theme.DeviceDefault.Dialog">
@@ -370,6 +399,8 @@
         <item name="android:textColorHint">@*android:color/omni_color3</item>
         <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
         <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
+        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</item>
     </style>
 
     <!-- Variant of {@link #Theme_DeviceDefault_Settings_Dark} with no action bar -->
@@ -386,6 +417,8 @@
         <item name="android:textColorHint">@*android:color/omni_color3</item>
         <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
         <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
+        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</item>
     </style>
 
     <style name="Theme.DeviceDefault.Settings.Dialog" parent="@*android:style/Theme.Material.Settings.Dialog">
@@ -402,6 +435,8 @@
         <item name="android:textColorHint">@*android:color/omni_color3</item>
         <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
         <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
+        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</item>
     </style>
 
     <style name="Theme.DeviceDefault.Settings.DialogWhenLarge" parent="@*android:style/Theme.Material.Settings.DialogWhenLarge">
@@ -418,6 +453,8 @@
         <item name="android:textColorHint">@*android:color/omni_color3</item>
         <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
         <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
+        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</item>
     </style>
 
     <style name="Theme.DeviceDefault.Settings.Dialog.Alert" parent="@*android:style/Theme.Material.Settings.Dialog.Alert">
@@ -435,6 +472,8 @@
         <item name="android:textColorHint">@*android:color/omni_color3</item>
         <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
         <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
+        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</item>
     </style>
 
     <style name="Theme.DeviceDefault.Settings.Dialog.NoActionBar" parent="@*android:style/Theme.DeviceDefault.Dialog.NoActionBar"/>
@@ -484,6 +523,8 @@
         <item name="android:textColorHint">@*android:color/omni_color3</item>
         <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
         <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
+        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</item>
     </style>
 
     <!-- @hide Theme overlay that inherits from material actionbar,  and use accent color for
diff --git a/google/themes/PrimaryOmni/res/values/settings.xml b/google/themes/PrimaryOmni/res/values/settings.xml
index 8c94cbf..b9ff9b0 100644
--- a/google/themes/PrimaryOmni/res/values/settings.xml
+++ b/google/themes/PrimaryOmni/res/values/settings.xml
@@ -22,6 +22,7 @@
         <item name="android:colorControlNormal">@*android:color/omni_color4</item>
         <item name="android:colorControlHighlight">@*android:color/omni_color1</item>
         <item name="android:colorControlActivated">@*android:color/omni_color5</item>
-
+        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
+        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</item>
     </style>
 </resources>
diff --git a/google/themes/PrimaryOmni/res/values/themes.xml b/google/themes/PrimaryOmni/res/values/themes.xml
index e6f496b..4dc2324 100644
--- a/google/themes/PrimaryOmni/res/values/themes.xml
+++ b/google/themes/PrimaryOmni/res/values/themes.xml
@@ -15,7 +15,8 @@
 	<item name="android:textColorHint">@*android:color/omni_color3</item>
 	<item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
         <item name="android:colorControlNormal">@*android:color/omni_color4</item>
-
+        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
+        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</item>
     </style>
     <!-- Variant of {@link #Theme_DeviceDefault_Light} with no action bar -->
     <style name="Theme.DeviceDefault.Light.NoActionBar" parent="@*android:style/Theme.Material.NoActionBar">
@@ -33,6 +34,8 @@
         <item name="android:textColorHint">@*android:color/omni_color3</item>
         <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
         <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
+        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</item>
     </style>
 
 
@@ -51,6 +54,8 @@
         <item name="android:textColorHint">@*android:color/omni_color3</item>
         <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
         <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
+        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</item>
     </style>
 
     <!-- Variant of {@link #Theme_DeviceDefault_Light} with no action bar and no status bar
@@ -112,6 +117,8 @@
         <item name="android:textColorHint">@*android:color/omni_color3</item>
         <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
         <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
+        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</item>
     </style>
 
     <!-- Variant of {@link #Theme_DeviceDefault_Light_Dialog} that has a nice minimum width for a
@@ -129,7 +136,8 @@
         <item name="android:textColorHint">@*android:color/omni_color3</item>
         <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
         <item name="android:colorControlNormal">@*android:color/omni_color4</item>
-
+        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
+        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</item>
     </style>
 
      <!-- Variant of {@link #Theme_DeviceDefault_Light_Dialog} without an action bar -->
@@ -163,6 +171,8 @@
         <item name="android:textColorHint">@*android:color/omni_color3</item>
         <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
         <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
+        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</item>
     </style>
 
     <!-- Variant of Theme.DeviceDefault.Dialog that has a fixed size. -->
@@ -184,6 +194,8 @@
         <item name="android:textColorHint">@*android:color/omni_color3</item>
         <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
         <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
+        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</item>
     </style>
 
     <!-- Variant of Theme.DeviceDefault.Dialog.NoActionBar that has a fixed size. -->
@@ -205,7 +217,8 @@
         <item name="android:textColorHint">@*android:color/omni_color3</item>
         <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
         <item name="android:colorControlNormal">@*android:color/omni_color4</item>
-
+        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
+        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</item>
     </style>
 
     <!-- DeviceDefault light theme for a window that will be displayed either full-screen on smaller
@@ -223,6 +236,8 @@
         <item name="android:textColorHint">@*android:color/omni_color3</item>
         <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
         <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
+        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</item>
     </style>
 
     <!-- DeviceDefault light theme for a window without an action bar that will be displayed either
@@ -241,6 +256,8 @@
         <item name="android:textColorHint">@*android:color/omni_color3</item>
         <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
         <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
+        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</item>
     </style>
 
     <!-- DeviceDefault light theme for a presentation window on a secondary display. -->
@@ -257,6 +274,8 @@
         <item name="android:textColorHint">@*android:color/omni_color3</item>
         <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
         <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
+        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</item>
     </style>
 
     <!-- DeviceDefault light theme for panel windows. This removes all extraneous window
@@ -275,6 +294,8 @@
         <item name="android:textColorHint">@*android:color/omni_color3</item>
         <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
         <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
+        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</item>
     </style>
 
     <style name="Theme.DeviceDefault.Light.Dialog.Alert" parent="@*android:style/Theme.Material.Dialog.Alert">
@@ -306,6 +327,8 @@
         <item name="android:textColorHint">@*android:color/omni_color3</item>
         <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
         <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
+        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</item>
     </style>
 
     <style name="Theme.DeviceDefault.Light.Voice" parent="@*android:style/Theme.Material.Voice">
@@ -321,6 +344,8 @@
         <item name="android:textColorHint">@*android:color/omni_color3</item>
         <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
         <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
+        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</item>
     </style>
 
     <style name="Theme.DeviceDefault.QuickSettings" parent="@*android:style/Theme.DeviceDefault">
@@ -338,6 +363,8 @@
         <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
         <item name="android:colorControlNormal">@*android:color/omni_color4</item>
 -->
+        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
+        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</item>
     </style>
 
     <style name="qs_base" parent="@*android:style/Theme.DeviceDefault">
@@ -354,6 +381,8 @@
         <item name="android:textColorHint">@*android:color/omni_color3</item>
         <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
         <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
+        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</item>
     </style>
 
     <style name="Theme.DeviceDefault.QuickSettings.Dialog" parent="@*android:style/Theme.DeviceDefault.Dialog">
@@ -370,6 +399,8 @@
         <item name="android:textColorHint">@*android:color/omni_color3</item>
         <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
         <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
+        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</item>
     </style>
 
     <!-- Variant of {@link #Theme_DeviceDefault_Settings_Dark} with no action bar -->
@@ -386,6 +417,8 @@
         <item name="android:textColorHint">@*android:color/omni_color3</item>
         <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
         <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
+        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</item>
     </style>
 
     <style name="Theme.DeviceDefault.Settings.Dialog" parent="@*android:style/Theme.Material.Settings.Dialog">
@@ -402,6 +435,8 @@
         <item name="android:textColorHint">@*android:color/omni_color3</item>
         <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
         <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
+        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</item>
     </style>
 
     <style name="Theme.DeviceDefault.Settings.DialogWhenLarge" parent="@*android:style/Theme.Material.Settings.DialogWhenLarge">
@@ -418,6 +453,8 @@
         <item name="android:textColorHint">@*android:color/omni_color3</item>
         <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
         <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
+        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</item>
     </style>
 
     <style name="Theme.DeviceDefault.Settings.Dialog.Alert" parent="@*android:style/Theme.Material.Settings.Dialog.Alert">
@@ -435,6 +472,8 @@
         <item name="android:textColorHint">@*android:color/omni_color3</item>
         <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
         <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
+        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</item>
     </style>
 
     <style name="Theme.DeviceDefault.Settings.Dialog.NoActionBar" parent="@*android:style/Theme.DeviceDefault.Dialog.NoActionBar"/>
@@ -484,6 +523,8 @@
         <item name="android:textColorHint">@*android:color/omni_color3</item>
         <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
         <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
+        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</item>
     </style>
 
     <!-- @hide Theme overlay that inherits from material actionbar,  and use accent color for
diff --git a/google/themes/PrimaryWarmWhite/res/values/settings.xml b/google/themes/PrimaryWarmWhite/res/values/settings.xml
index 098e5da..583eead 100644
--- a/google/themes/PrimaryWarmWhite/res/values/settings.xml
+++ b/google/themes/PrimaryWarmWhite/res/values/settings.xml
@@ -22,6 +22,7 @@
         <item name="android:colorControlNormal">@*android:color/omni_color4</item>
         <item name="android:colorControlHighlight">@*android:color/omni_color1</item>
         <item name="android:colorControlActivated">@*android:color/omni_color5</item>
-
+        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
+        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</item>
     </style>
 </resources>
diff --git a/google/themes/PrimaryWarmWhite/res/values/themes.xml b/google/themes/PrimaryWarmWhite/res/values/themes.xml
index e914ee2..19362fc 100644
--- a/google/themes/PrimaryWarmWhite/res/values/themes.xml
+++ b/google/themes/PrimaryWarmWhite/res/values/themes.xml
@@ -15,7 +15,8 @@
 	<item name="android:textColorHint">@*android:color/omni_color3</item>
 	<item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
         <item name="android:colorControlNormal">@*android:color/omni_color4</item>
-
+        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
+        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</item>
     </style>
     <!-- Variant of {@link #Theme_DeviceDefault_Light} with no action bar -->
     <style name="Theme.DeviceDefault.Light.NoActionBar" parent="@*android:style/Theme.Material.NoActionBar">
@@ -33,6 +34,8 @@
         <item name="android:textColorHint">@*android:color/omni_color3</item>
         <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
         <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
+        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</item>
     </style>
 
 
@@ -51,6 +54,8 @@
         <item name="android:textColorHint">@*android:color/omni_color3</item>
         <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
         <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
+        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</item>
     </style>
 
     <!-- Variant of {@link #Theme_DeviceDefault_Light} with no action bar and no status bar
@@ -112,6 +117,8 @@
         <item name="android:textColorHint">@*android:color/omni_color3</item>
         <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
         <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
+        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</item>
     </style>
 
     <!-- Variant of {@link #Theme_DeviceDefault_Light_Dialog} that has a nice minimum width for a
@@ -129,7 +136,8 @@
         <item name="android:textColorHint">@*android:color/omni_color3</item>
         <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
         <item name="android:colorControlNormal">@*android:color/omni_color4</item>
-
+        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
+        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</item>
     </style>
 
      <!-- Variant of {@link #Theme_DeviceDefault_Light_Dialog} without an action bar -->
@@ -163,6 +171,8 @@
         <item name="android:textColorHint">@*android:color/omni_color3</item>
         <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
         <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
+        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</item>
     </style>
 
     <!-- Variant of Theme.DeviceDefault.Dialog that has a fixed size. -->
@@ -184,6 +194,8 @@
         <item name="android:textColorHint">@*android:color/omni_color3</item>
         <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
         <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
+        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</item>
     </style>
 
     <!-- Variant of Theme.DeviceDefault.Dialog.NoActionBar that has a fixed size. -->
@@ -205,7 +217,8 @@
         <item name="android:textColorHint">@*android:color/omni_color3</item>
         <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
         <item name="android:colorControlNormal">@*android:color/omni_color4</item>
-
+        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
+        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</item>
     </style>
 
     <!-- DeviceDefault light theme for a window that will be displayed either full-screen on smaller
@@ -223,6 +236,8 @@
         <item name="android:textColorHint">@*android:color/omni_color3</item>
         <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
         <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
+        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</item>
     </style>
 
     <!-- DeviceDefault light theme for a window without an action bar that will be displayed either
@@ -241,6 +256,8 @@
         <item name="android:textColorHint">@*android:color/omni_color3</item>
         <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
         <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
+        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</item>
     </style>
 
     <!-- DeviceDefault light theme for a presentation window on a secondary display. -->
@@ -257,6 +274,8 @@
         <item name="android:textColorHint">@*android:color/omni_color3</item>
         <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
         <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
+        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</item>
     </style>
 
     <!-- DeviceDefault light theme for panel windows. This removes all extraneous window
@@ -275,6 +294,8 @@
         <item name="android:textColorHint">@*android:color/omni_color3</item>
         <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
         <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
+        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</item>
     </style>
 
     <style name="Theme.DeviceDefault.Light.Dialog.Alert" parent="@*android:style/Theme.Material.Dialog.Alert">
@@ -306,6 +327,8 @@
         <item name="android:textColorHint">@*android:color/omni_color3</item>
         <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
         <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
+        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</item>
     </style>
 
     <style name="Theme.DeviceDefault.Light.Voice" parent="@*android:style/Theme.Material.Voice">
@@ -321,6 +344,8 @@
         <item name="android:textColorHint">@*android:color/omni_color3</item>
         <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
         <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
+        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</item>
     </style>
 
     <!-- Variant of {@link #Theme_DeviceDefault_Settings_Dark} with no action bar -->
@@ -337,6 +362,8 @@
         <item name="android:textColorHint">@*android:color/omni_color3</item>
         <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
         <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
+        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</item>
     </style>
 
     <style name="Theme.DeviceDefault.Settings.Dialog" parent="@*android:style/Theme.Material.Settings.Dialog">
@@ -353,6 +380,8 @@
         <item name="android:textColorHint">@*android:color/omni_color3</item>
         <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
         <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
+        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</item>
     </style>
 
     <style name="Theme.DeviceDefault.Settings.DialogWhenLarge" parent="@*android:style/Theme.Material.Settings.DialogWhenLarge">
@@ -369,6 +398,8 @@
         <item name="android:textColorHint">@*android:color/omni_color3</item>
         <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
         <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
+        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</item>
     </style>
 
     <style name="Theme.DeviceDefault.Settings.Dialog.Alert" parent="@*android:style/Theme.Material.Settings.Dialog.Alert">
@@ -386,6 +417,8 @@
         <item name="android:textColorHint">@*android:color/omni_color3</item>
         <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
         <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
+        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</item>
     </style>
 
     <style name="Theme.DeviceDefault.Settings.Dialog.NoActionBar" parent="@*android:style/Theme.DeviceDefault.Dialog.NoActionBar"/>
diff --git a/google/themes/PrimaryWhite/res/values/settings.xml b/google/themes/PrimaryWhite/res/values/settings.xml
index 098e5da..583eead 100644
--- a/google/themes/PrimaryWhite/res/values/settings.xml
+++ b/google/themes/PrimaryWhite/res/values/settings.xml
@@ -22,6 +22,7 @@
         <item name="android:colorControlNormal">@*android:color/omni_color4</item>
         <item name="android:colorControlHighlight">@*android:color/omni_color1</item>
         <item name="android:colorControlActivated">@*android:color/omni_color5</item>
-
+        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
+        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</item>
     </style>
 </resources>
diff --git a/google/themes/PrimaryWhite/res/values/themes.xml b/google/themes/PrimaryWhite/res/values/themes.xml
index e914ee2..19362fc 100644
--- a/google/themes/PrimaryWhite/res/values/themes.xml
+++ b/google/themes/PrimaryWhite/res/values/themes.xml
@@ -15,7 +15,8 @@
 	<item name="android:textColorHint">@*android:color/omni_color3</item>
 	<item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
         <item name="android:colorControlNormal">@*android:color/omni_color4</item>
-
+        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
+        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</item>
     </style>
     <!-- Variant of {@link #Theme_DeviceDefault_Light} with no action bar -->
     <style name="Theme.DeviceDefault.Light.NoActionBar" parent="@*android:style/Theme.Material.NoActionBar">
@@ -33,6 +34,8 @@
         <item name="android:textColorHint">@*android:color/omni_color3</item>
         <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
         <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
+        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</item>
     </style>
 
 
@@ -51,6 +54,8 @@
         <item name="android:textColorHint">@*android:color/omni_color3</item>
         <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
         <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
+        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</item>
     </style>
 
     <!-- Variant of {@link #Theme_DeviceDefault_Light} with no action bar and no status bar
@@ -112,6 +117,8 @@
         <item name="android:textColorHint">@*android:color/omni_color3</item>
         <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
         <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
+        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</item>
     </style>
 
     <!-- Variant of {@link #Theme_DeviceDefault_Light_Dialog} that has a nice minimum width for a
@@ -129,7 +136,8 @@
         <item name="android:textColorHint">@*android:color/omni_color3</item>
         <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
         <item name="android:colorControlNormal">@*android:color/omni_color4</item>
-
+        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
+        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</item>
     </style>
 
      <!-- Variant of {@link #Theme_DeviceDefault_Light_Dialog} without an action bar -->
@@ -163,6 +171,8 @@
         <item name="android:textColorHint">@*android:color/omni_color3</item>
         <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
         <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
+        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</item>
     </style>
 
     <!-- Variant of Theme.DeviceDefault.Dialog that has a fixed size. -->
@@ -184,6 +194,8 @@
         <item name="android:textColorHint">@*android:color/omni_color3</item>
         <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
         <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
+        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</item>
     </style>
 
     <!-- Variant of Theme.DeviceDefault.Dialog.NoActionBar that has a fixed size. -->
@@ -205,7 +217,8 @@
         <item name="android:textColorHint">@*android:color/omni_color3</item>
         <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
         <item name="android:colorControlNormal">@*android:color/omni_color4</item>
-
+        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
+        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</item>
     </style>
 
     <!-- DeviceDefault light theme for a window that will be displayed either full-screen on smaller
@@ -223,6 +236,8 @@
         <item name="android:textColorHint">@*android:color/omni_color3</item>
         <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
         <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
+        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</item>
     </style>
 
     <!-- DeviceDefault light theme for a window without an action bar that will be displayed either
@@ -241,6 +256,8 @@
         <item name="android:textColorHint">@*android:color/omni_color3</item>
         <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
         <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
+        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</item>
     </style>
 
     <!-- DeviceDefault light theme for a presentation window on a secondary display. -->
@@ -257,6 +274,8 @@
         <item name="android:textColorHint">@*android:color/omni_color3</item>
         <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
         <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
+        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</item>
     </style>
 
     <!-- DeviceDefault light theme for panel windows. This removes all extraneous window
@@ -275,6 +294,8 @@
         <item name="android:textColorHint">@*android:color/omni_color3</item>
         <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
         <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
+        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</item>
     </style>
 
     <style name="Theme.DeviceDefault.Light.Dialog.Alert" parent="@*android:style/Theme.Material.Dialog.Alert">
@@ -306,6 +327,8 @@
         <item name="android:textColorHint">@*android:color/omni_color3</item>
         <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
         <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
+        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</item>
     </style>
 
     <style name="Theme.DeviceDefault.Light.Voice" parent="@*android:style/Theme.Material.Voice">
@@ -321,6 +344,8 @@
         <item name="android:textColorHint">@*android:color/omni_color3</item>
         <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
         <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
+        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</item>
     </style>
 
     <!-- Variant of {@link #Theme_DeviceDefault_Settings_Dark} with no action bar -->
@@ -337,6 +362,8 @@
         <item name="android:textColorHint">@*android:color/omni_color3</item>
         <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
         <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
+        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</item>
     </style>
 
     <style name="Theme.DeviceDefault.Settings.Dialog" parent="@*android:style/Theme.Material.Settings.Dialog">
@@ -353,6 +380,8 @@
         <item name="android:textColorHint">@*android:color/omni_color3</item>
         <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
         <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
+        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</item>
     </style>
 
     <style name="Theme.DeviceDefault.Settings.DialogWhenLarge" parent="@*android:style/Theme.Material.Settings.DialogWhenLarge">
@@ -369,6 +398,8 @@
         <item name="android:textColorHint">@*android:color/omni_color3</item>
         <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
         <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
+        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</item>
     </style>
 
     <style name="Theme.DeviceDefault.Settings.Dialog.Alert" parent="@*android:style/Theme.Material.Settings.Dialog.Alert">
@@ -386,6 +417,8 @@
         <item name="android:textColorHint">@*android:color/omni_color3</item>
         <item name="android:textColorAlertDialogListItem">@*android:color/omni_text_tertiary</item>
         <item name="android:colorControlNormal">@*android:color/omni_color4</item>
+        <item name="android:dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
+        <item name="android:buttonCornerRadius">@*android:dimen/config_buttonCornerRadius</item>
     </style>
 
     <style name="Theme.DeviceDefault.Settings.Dialog.NoActionBar" parent="@*android:style/Theme.DeviceDefault.Dialog.NoActionBar"/>