summaryrefslogtreecommitdiffstats
path: root/packages
diff options
context:
space:
mode:
authorAdam Powell <adamp@android.com>2012-12-07 12:24:20 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2012-12-07 12:24:20 -0800
commitcd252d267b09d6838e9c363c87befd4697d45b53 (patch)
treef67d2adb05ae196a3dd601c0d89391f6ab8df63c /packages
parent461c8534e1b278cfa09da56b3691b1ef3de824d7 (diff)
parent524962c8cf796035f7578515ba48080873d46057 (diff)
downloadframeworks_base-cd252d267b09d6838e9c363c87befd4697d45b53.zip
frameworks_base-cd252d267b09d6838e9c363c87befd4697d45b53.tar.gz
frameworks_base-cd252d267b09d6838e9c363c87befd4697d45b53.tar.bz2
am 524962c8: am ff411ddb: Merge "Framework: Use holo alert drawables"
* commit '524962c8cf796035f7578515ba48080873d46057': Framework: Use holo alert drawables
Diffstat (limited to 'packages')
-rw-r--r--packages/VpnDialogs/src/com/android/vpndialogs/ConfirmDialog.java2
1 files changed, 1 insertions, 1 deletions
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;