am edc9e064: Merge "Browser: Use ICS alert icon"

* commit 'edc9e064969b97fd62f492ef8e15812b63af2bb3':
  Browser: Use ICS alert icon

6 files changed, 11 insertions, 11 deletions

diff --git a/src/com/android/browser/BookmarkUtils.java b/src/com/android/browser/BookmarkUtils.java
index 4834c39..f0c01f7 100644
--- a/src/com/android/browser/BookmarkUtils.java
+++ b/src/com/android/browser/BookmarkUtils.java
@@ -234,7 +234,7 @@ public class BookmarkUtils {
             final Context context, final Message msg) {
 
         new AlertDialog.Builder(context)
-                .setIcon(android.R.drawable.ic_dialog_alert)
+                .setIconAttribute(android.R.attr.alertDialogIcon)
                 .setMessage(context.getString(R.string.delete_bookmark_warning,
                         title))
                 .setPositiveButton(R.string.ok,
diff --git a/src/com/android/browser/BrowserHistoryPage.java b/src/com/android/browser/BrowserHistoryPage.java
index 69febc5..9493b85 100644
--- a/src/com/android/browser/BrowserHistoryPage.java
+++ b/src/com/android/browser/BrowserHistoryPage.java
@@ -293,7 +293,7 @@ public class BrowserHistoryPage extends Fragment
         final ClearHistoryTask clear = new ClearHistoryTask(resolver);
         AlertDialog.Builder builder = new AlertDialog.Builder(getActivity())
                 .setMessage(R.string.pref_privacy_clear_history_dlg)
-                .setIcon(android.R.drawable.ic_dialog_alert)
+                .setIconAttribute(android.R.attr.alertDialogIcon)
                 .setNegativeButton(R.string.cancel, null)
                 .setPositiveButton(R.string.ok, new DialogInterface.OnClickListener() {
                      @Override
diff --git a/src/com/android/browser/DownloadHandler.java b/src/com/android/browser/DownloadHandler.java
index 2292716..5517e59 100644
--- a/src/com/android/browser/DownloadHandler.java
+++ b/src/com/android/browser/DownloadHandler.java
@@ -162,7 +162,7 @@ public class DownloadHandler {
 
             new AlertDialog.Builder(activity)
                 .setTitle(title)
-                .setIcon(android.R.drawable.ic_dialog_alert)
+                .setIconAttribute(android.R.attr.alertDialogIcon)
                 .setMessage(msg)
                 .setPositiveButton(R.string.ok, null)
                 .show();
diff --git a/src/com/android/browser/HttpAuthenticationDialog.java b/src/com/android/browser/HttpAuthenticationDialog.java
index ac4119c..0c16632 100644
--- a/src/com/android/browser/HttpAuthenticationDialog.java
+++ b/src/com/android/browser/HttpAuthenticationDialog.java
@@ -128,7 +128,7 @@ public class HttpAuthenticationDialog {
 
         mDialog = new AlertDialog.Builder(mContext)
                 .setTitle(title)
-                .setIcon(android.R.drawable.ic_dialog_alert)
+                .setIconAttribute(android.R.attr.alertDialogIcon)
                 .setView(v)
                 .setPositiveButton(R.string.action, new DialogInterface.OnClickListener() {
                     public void onClick(DialogInterface dialog, int whichButton) {
diff --git a/src/com/android/browser/Tab.java b/src/com/android/browser/Tab.java
index 7cb00d9..484357e 100644
--- a/src/com/android/browser/Tab.java
+++ b/src/com/android/browser/Tab.java
@@ -518,7 +518,7 @@ class Tab implements PictureListener {
                 new AlertDialog.Builder(mContext)
                     .setTitle(R.string.security_warning)
                     .setMessage(R.string.ssl_warnings_header)
-                    .setIcon(android.R.drawable.ic_dialog_alert)
+                    .setIconAttribute(android.R.attr.alertDialogIcon)
                     .setPositiveButton(R.string.ssl_continue,
                         new DialogInterface.OnClickListener() {
                             @Override
@@ -719,7 +719,7 @@ class Tab implements PictureListener {
             if (dialog && mSubView != null) {
                 new AlertDialog.Builder(mContext)
                         .setTitle(R.string.too_many_subwindows_dialog_title)
-                        .setIcon(android.R.drawable.ic_dialog_alert)
+                        .setIconAttribute(android.R.attr.alertDialogIcon)
                         .setMessage(R.string.too_many_subwindows_dialog_message)
                         .setPositiveButton(R.string.ok, null)
                         .show();
@@ -727,7 +727,7 @@ class Tab implements PictureListener {
             } else if (!mWebViewController.getTabControl().canCreateNewTab()) {
                 new AlertDialog.Builder(mContext)
                         .setTitle(R.string.too_many_windows_dialog_title)
-                        .setIcon(android.R.drawable.ic_dialog_alert)
+                        .setIconAttribute(android.R.attr.alertDialogIcon)
                         .setMessage(R.string.too_many_windows_dialog_message)
                         .setPositiveButton(R.string.ok, null)
                         .show();
@@ -760,7 +760,7 @@ class Tab implements PictureListener {
             // Build a confirmation dialog to display to the user.
             final AlertDialog d =
                     new AlertDialog.Builder(mContext)
-                    .setIcon(android.R.drawable.ic_dialog_alert)
+                    .setIconAttribute(android.R.attr.alertDialogIcon)
                     .setMessage(R.string.popup_window_attempt)
                     .setPositiveButton(R.string.allow, allowListener)
                     .setNegativeButton(R.string.block, blockListener)
diff --git a/src/com/android/browser/preferences/WebsiteSettingsFragment.java b/src/com/android/browser/preferences/WebsiteSettingsFragment.java
index da06428..c84c669 100644
--- a/src/com/android/browser/preferences/WebsiteSettingsFragment.java
+++ b/src/com/android/browser/preferences/WebsiteSettingsFragment.java
@@ -596,7 +596,7 @@ public class WebsiteSettingsFragment extends ListFragment implements OnClickList
                                     notifyDataSetChanged();
                                 }})
                             .setNegativeButton(R.string.webstorage_clear_data_dialog_cancel_button, null)
-                            .setIcon(android.R.drawable.ic_dialog_alert)
+                            .setIconAttribute(android.R.attr.alertDialogIcon)
                             .show();
                         break;
                     case Site.FEATURE_GEOLOCATION:
@@ -614,7 +614,7 @@ public class WebsiteSettingsFragment extends ListFragment implements OnClickList
                                     notifyDataSetChanged();
                                 }})
                             .setNegativeButton(R.string.geolocation_settings_page_dialog_cancel_button, null)
-                            .setIcon(android.R.drawable.ic_dialog_alert)
+                            .setIconAttribute(android.R.attr.alertDialogIcon)
                             .show();
                         break;
                 }
@@ -695,7 +695,7 @@ public class WebsiteSettingsFragment extends ListFragment implements OnClickList
                                     finish();
                                 }})
                     .setNegativeButton(R.string.website_settings_clear_all_dialog_cancel_button, null)
-                    .setIcon(android.R.drawable.ic_dialog_alert)
+                    .setIconAttribute(android.R.attr.alertDialogIcon)
                     .show();
             break;
         }