commit e0a377f50951d51b5ddf3be6f0ce361affdffc56
author Alan Viverette <alanv@google.com> Fri Nov 21 00:08:23 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Nov 21 00:08:25 2014 +0000
tree 3eaebc298f9a11dc037347c1787e66aae00176e0
parent 4e9ea5e9aef8e35eaa5a876e726544277c80dec5
parent 8513453e3778e87a1fad93bf9d40efb1f39b003d

Merge "Make DeviceDefault alert dialog themes public" into lmp-mr1-dev

api/current.txt

diff --git a/api/current.txt b/api/current.txt
index 783eba1..ce4aa84 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -2012,6 +2012,7 @@
     field public static final int Theme_DeviceDefault_Dialog = 16974126; // 0x103012e
     field public static final int Theme_DeviceDefault_DialogWhenLarge = 16974134; // 0x1030136
     field public static final int Theme_DeviceDefault_DialogWhenLarge_NoActionBar = 16974135; // 0x1030137
+    field public static final int Theme_DeviceDefault_Dialog_Alert = 16974545; // 0x10302d1
     field public static final int Theme_DeviceDefault_Dialog_MinWidth = 16974127; // 0x103012f
     field public static final int Theme_DeviceDefault_Dialog_NoActionBar = 16974128; // 0x1030130
     field public static final int Theme_DeviceDefault_Dialog_NoActionBar_MinWidth = 16974129; // 0x1030131
@@ -2021,6 +2022,7 @@
     field public static final int Theme_DeviceDefault_Light_Dialog = 16974130; // 0x1030132
     field public static final int Theme_DeviceDefault_Light_DialogWhenLarge = 16974136; // 0x1030138
     field public static final int Theme_DeviceDefault_Light_DialogWhenLarge_NoActionBar = 16974137; // 0x1030139
+    field public static final int Theme_DeviceDefault_Light_Dialog_Alert = 16974546; // 0x10302d2
     field public static final int Theme_DeviceDefault_Light_Dialog_MinWidth = 16974131; // 0x1030133
     field public static final int Theme_DeviceDefault_Light_Dialog_NoActionBar = 16974132; // 0x1030134
     field public static final int Theme_DeviceDefault_Light_Dialog_NoActionBar_MinWidth = 16974133; // 0x1030135

core/res/res/values/public.xml

diff --git a/core/res/res/values/public.xml b/core/res/res/values/public.xml
index c01d406..1123813 100644
--- a/core/res/res/values/public.xml
+++ b/core/res/res/values/public.xml
@@ -2602,4 +2602,7 @@
     <public type="attr" name="dialogPreferredPadding" />
     <public type="attr" name="searchHintIcon" />
 
+    <public type="style" name="Theme.DeviceDefault.Dialog.Alert" />
+    <public type="style" name="Theme.DeviceDefault.Light.Dialog.Alert" />
+
 </resources>