Restore windowMinWidthMajor/Minor in alert dialog overlay theme
Bug: 20185630
Change-Id: Ic4a6b3d84a24c26846ea0fcc3ce32ca882e4dd95
diff --git a/api/current.txt b/api/current.txt
index 5f4d6e9..2ddbcce 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -2026,6 +2026,7 @@
field public static final int ThemeOverlay_Material_Dark = 16974411; // 0x103024b
field public static final int ThemeOverlay_Material_Dark_ActionBar = 16974412; // 0x103024c
field public static final int ThemeOverlay_Material_Dialog = 16974564; // 0x10302e4
+ field public static final int ThemeOverlay_Material_Dialog_Alert = 16974566; // 0x10302e6
field public static final int ThemeOverlay_Material_Light = 16974410; // 0x103024a
field public static final int Theme_Black = 16973832; // 0x1030008
field public static final int Theme_Black_NoTitleBar = 16973833; // 0x1030009
diff --git a/api/system-current.txt b/api/system-current.txt
index e44ee6e..ea97e1a 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -2105,6 +2105,7 @@
field public static final int ThemeOverlay_Material_Dark = 16974411; // 0x103024b
field public static final int ThemeOverlay_Material_Dark_ActionBar = 16974412; // 0x103024c
field public static final int ThemeOverlay_Material_Dialog = 16974564; // 0x10302e4
+ field public static final int ThemeOverlay_Material_Dialog_Alert = 16974566; // 0x10302e6
field public static final int ThemeOverlay_Material_Light = 16974410; // 0x103024a
field public static final int Theme_Black = 16973832; // 0x1030008
field public static final int Theme_Black_NoTitleBar = 16973833; // 0x1030009
diff --git a/core/res/res/values/public.xml b/core/res/res/values/public.xml
index 208afb7d..c157d4c 100644
--- a/core/res/res/values/public.xml
+++ b/core/res/res/values/public.xml
@@ -2642,6 +2642,7 @@
<public type="style" name="Theme.Material.Light.LightStatusBar" />
<public type="style" name="ThemeOverlay.Material.Dialog" />
<public type="style" name="TextAppearance.Material.Widget.Button.Inverse" />
+ <public type="style" name="ThemeOverlay.Material.Dialog.Alert" />
<public type="id" name="pasteAsPlainText" />
<public type="id" name="undo" />
diff --git a/core/res/res/values/themes_material.xml b/core/res/res/values/themes_material.xml
index 9931d00..a413d91 100644
--- a/core/res/res/values/themes_material.xml
+++ b/core/res/res/values/themes_material.xml
@@ -182,7 +182,7 @@
<item name="dialogPreferredPadding">@dimen/dialog_padding_material</item>
<!-- AlertDialog attributes -->
- <item name="alertDialogTheme">@style/ThemeOverlay.Material.Dialog</item>
+ <item name="alertDialogTheme">@style/ThemeOverlay.Material.Dialog.Alert</item>
<item name="alertDialogStyle">@style/AlertDialog.Material</item>
<item name="alertDialogCenterButtons">false</item>
<item name="alertDialogIcon">@drawable/ic_dialog_alert_material</item>
@@ -538,7 +538,7 @@
<item name="dialogPreferredPadding">@dimen/dialog_padding_material</item>
<!-- AlertDialog attributes -->
- <item name="alertDialogTheme">@style/ThemeOverlay.Material.Dialog</item>
+ <item name="alertDialogTheme">@style/ThemeOverlay.Material.Dialog.Alert</item>
<item name="alertDialogStyle">@style/AlertDialog.Material.Light</item>
<item name="alertDialogCenterButtons">false</item>
<item name="alertDialogIcon">@drawable/ic_dialog_alert_material</item>
@@ -882,6 +882,11 @@
<item name="preferencePanelStyle">@style/PreferencePanel.Dialog</item>
</style>
+ <style name="ThemeOverlay.Material.Dialog.Alert">
+ <item name="windowMinWidthMajor">@dimen/dialog_min_width_major</item>
+ <item name="windowMinWidthMinor">@dimen/dialog_min_width_minor</item>
+ </style>
+
<!-- Variant of the material (dark) theme with no action bar. -->
<style name="Theme.Material.NoActionBar">
<item name="windowActionBar">false</item>