From c65ff211af9b425ad709d835fbf4ee349472b4e6 Mon Sep 17 00:00:00 2001
From: Alan Viverette <alanv@google.com>
Date: Wed, 9 Jul 2014 16:15:38 -0700
Subject: [PATCH] Remove icon from base alert dialog, use light theme

BUG: 16160305
Change-Id: I3cc5b5f0f02ddffb19b06b4796dedb98a6083454
---
 core/res/res/values/themes.xml                                | 4 ++--
 services/core/java/com/android/server/am/BaseErrorDialog.java | 1 -
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/core/res/res/values/themes.xml b/core/res/res/values/themes.xml
index 20e350228b52..b63a8c123fe7 100644
--- a/core/res/res/values/themes.xml
+++ b/core/res/res/values/themes.xml
@@ -816,7 +816,7 @@ please see themes_device_defaults.xml.
     <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 @@ please see themes_device_defaults.xml.
 
     <!-- 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>
diff --git a/services/core/java/com/android/server/am/BaseErrorDialog.java b/services/core/java/com/android/server/am/BaseErrorDialog.java
index 35bdee0497d4..5f7f67a8a5e8 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 @@ class BaseErrorDialog extends AlertDialog {
         WindowManager.LayoutParams attrs = getWindow().getAttributes();
         attrs.setTitle("Error Dialog");
         getWindow().setAttributes(attrs);
-        setIconAttribute(R.attr.alertDialogIcon);
     }
 
     public void onStart() {
-- 
2.11.0