summaryrefslogtreecommitdiffstats
path: root/src/com/android/browser/Tab.java
diff options
context:
space:
mode:
authorJean-Baptiste Queru <jbq@google.com>2012-08-14 08:39:45 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-08-14 08:39:45 -0700
commitd2a59930d8958f58a96409fc8efe68a53b976ed8 (patch)
tree4640a6a6a13eead6956d0414c9d5036f96f0a365 /src/com/android/browser/Tab.java
parent3c2ab0322d40a0eac3b482052532e27d20399f65 (diff)
parentedc9e064969b97fd62f492ef8e15812b63af2bb3 (diff)
downloadpackages_apps_Browser-d2a59930d8958f58a96409fc8efe68a53b976ed8.tar.gz
packages_apps_Browser-d2a59930d8958f58a96409fc8efe68a53b976ed8.tar.bz2
packages_apps_Browser-d2a59930d8958f58a96409fc8efe68a53b976ed8.zip
am edc9e064: Merge "Browser: Use ICS alert icon"
* commit 'edc9e064969b97fd62f492ef8e15812b63af2bb3': Browser: Use ICS alert icon
Diffstat (limited to 'src/com/android/browser/Tab.java')
-rw-r--r--src/com/android/browser/Tab.java8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/com/android/browser/Tab.java b/src/com/android/browser/Tab.java
index 7cb00d93a..484357e0f 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)