summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBjörn Lundén <blunden2@gmail.com>2012-09-20 13:58:51 +0200
committerBjörn Lundén <blunden2@gmail.com>2012-11-15 15:32:02 +0100
commit1129a85203ac3f238b95c4795397d84c81c01094 (patch)
tree97a0a8fd2466edc38fce9437865f9da5b0c12110
parente4163e96e0ee31c6e78434114cc1dcf4cd3ab5bd (diff)
downloadframeworks_base-1129a85203ac3f238b95c4795397d84c81c01094.zip
frameworks_base-1129a85203ac3f238b95c4795397d84c81c01094.tar.gz
frameworks_base-1129a85203ac3f238b95c4795397d84c81c01094.tar.bz2
Framework: Use holo alert drawables
Replaces the current usage of the GB alert drawable with theme-consistent holo ones. Change-Id: I8594ef8276db5bb0e192f3a541937d7281321043
-rw-r--r--core/java/android/webkit/WebCoreThreadWatchdog.java2
-rw-r--r--packages/VpnDialogs/src/com/android/vpndialogs/ConfirmDialog.java2
-rw-r--r--services/java/com/android/server/accessibility/AccessibilityManagerService.java2
3 files changed, 3 insertions, 3 deletions
diff --git a/core/java/android/webkit/WebCoreThreadWatchdog.java b/core/java/android/webkit/WebCoreThreadWatchdog.java
index a22e6e8..c27bb5f 100644
--- a/core/java/android/webkit/WebCoreThreadWatchdog.java
+++ b/core/java/android/webkit/WebCoreThreadWatchdog.java
@@ -270,7 +270,7 @@ class WebCoreThreadWatchdog implements Runnable {
SUBSEQUENT_TIMEOUT_PERIOD);
}
})
- .setIcon(android.R.drawable.ic_dialog_alert)
+ .setIconAttribute(android.R.attr.alertDialogIcon)
.show();
}
}
diff --git a/packages/VpnDialogs/src/com/android/vpndialogs/ConfirmDialog.java b/packages/VpnDialogs/src/com/android/vpndialogs/ConfirmDialog.java
index 13d8019..7a1e66c 100644
--- a/packages/VpnDialogs/src/com/android/vpndialogs/ConfirmDialog.java
+++ b/packages/VpnDialogs/src/com/android/vpndialogs/ConfirmDialog.java
@@ -66,7 +66,7 @@ public class ConfirmDialog extends AlertActivity implements
getString(R.string.prompt, app.loadLabel(pm)));
((CompoundButton) view.findViewById(R.id.check)).setOnCheckedChangeListener(this);
- mAlertParams.mIconId = android.R.drawable.ic_dialog_alert;
+ mAlertParams.mIconAttrId = android.R.attr.alertDialogIcon;
mAlertParams.mTitle = getText(android.R.string.dialog_alert_title);
mAlertParams.mPositiveButtonText = getText(android.R.string.ok);
mAlertParams.mPositiveButtonListener = this;
diff --git a/services/java/com/android/server/accessibility/AccessibilityManagerService.java b/services/java/com/android/server/accessibility/AccessibilityManagerService.java
index 671cbfe..a34d44c 100644
--- a/services/java/com/android/server/accessibility/AccessibilityManagerService.java
+++ b/services/java/com/android/server/accessibility/AccessibilityManagerService.java
@@ -1123,7 +1123,7 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub {
return;
}
mEnableTouchExplorationDialog = new AlertDialog.Builder(mContext)
- .setIcon(android.R.drawable.ic_dialog_alert)
+ .setIconAttribute(android.R.attr.alertDialogIcon)
.setPositiveButton(android.R.string.ok, new OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {