commit d5c72cbc23496bff5feac78455afb323c08bbeca
author Alan Viverette <alanv@google.com> Thu Jul 10 00:02:28 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Jul 09 21:45:32 2014 +0000
tree ce2608bcd22471b3ac7e007b781cc75ba9d16786
parent 30303faea63473003e3d038d987cebf9a63f31dd
parent c65ff211af9b425ad709d835fbf4ee349472b4e6

Merge "Remove icon from base alert dialog, use light theme"

core/res/res/values/themes.xml

diff --git a/core/res/res/values/themes.xml b/core/res/res/values/themes.xml
index 20e3502..b63a8c1 100644
--- a/core/res/res/values/themes.xml
+++ b/core/res/res/values/themes.xml
@@ -816,7 +816,7 @@
     <eat-comment />
 
     <!-- Theme for the dialog shown when an app crashes or ANRs. -->
-    <style name="Theme.Dialog.AppError" parent="Theme.DeviceDefault.Dialog">
+    <style name="Theme.Dialog.AppError" parent="Theme.DeviceDefault.Light.Dialog">
         <item name="windowFrame">@null</item>
         <item name="windowTitleStyle">@style/DialogWindowTitle</item>
         <item name="windowBackground">@color/transparent</item>
@@ -829,7 +829,7 @@
 
     <!-- Special theme for the recent apps dialog, to allow customization
          with overlays. -->
-    <style name="Theme.Dialog.RecentApplications" parent="Theme.DeviceDefault.Dialog">
+    <style name="Theme.Dialog.RecentApplications" parent="Theme.DeviceDefault.Light.Dialog">
         <item name="windowFrame">@null</item>
         <item name="windowBackground">@color/transparent</item>
         <item name="windowAnimationStyle">@style/Animation.RecentApplications</item>

services/core/java/com/android/server/am/BaseErrorDialog.java

diff --git a/services/core/java/com/android/server/am/BaseErrorDialog.java b/services/core/java/com/android/server/am/BaseErrorDialog.java
index 35bdee0..5f7f67a 100755
--- a/services/core/java/com/android/server/am/BaseErrorDialog.java
+++ b/services/core/java/com/android/server/am/BaseErrorDialog.java
@@ -41,7 +41,6 @@
         WindowManager.LayoutParams attrs = getWindow().getAttributes();
         attrs.setTitle("Error Dialog");
         getWindow().setAttributes(attrs);
-        setIconAttribute(R.attr.alertDialogIcon);
     }
 
     public void onStart() {