am 6fb425e2: am eefa61ed: Merge "Settings: Use ICS alert drawable"

* commit '6fb425e2805a1c27c048fc954d402f4612cbf74d': Settings: Use ICS alert drawable
2012-08-13 16:03:15 -07:00
parent 70372dcfc3 6fb425e280
commit 9e8e9a1783
12 changed files with 19 additions and 19 deletions
--- a/src/com/android/settings/bluetooth/Utils.java
+++ b/src/com/android/settings/bluetooth/Utils.java
@@ -93,7 +93,7 @@ final class Utils {
        Context activity = manager.getForegroundActivity();
        if(manager.isForegroundActivity()) {
            new AlertDialog.Builder(activity)
-                .setIcon(android.R.drawable.ic_dialog_alert)
+                .setIconAttribute(android.R.attr.alertDialogIcon)
                .setTitle(R.string.bluetooth_error_title)
                .setMessage(message)
                .setPositiveButton(android.R.string.ok, null)