Updated dialog utilities function for custom dialog to include icon

api/src/com/todoroo/andlib/utility/DialogUtilities.java

@@ -123,7 +123,7 @@ public class DialogUtilities {
             final String text, final DialogInterface.OnClickListener okListener,
             final DialogInterface.OnClickListener cancelListener) {
 
-        okCancelCustomDialog(activity, title, text, android.R.string.ok, android.R.string.cancel, okListener, cancelListener);
+        okCancelCustomDialog(activity, title, text, android.R.string.ok, android.R.string.cancel, android.R.drawable.ic_dialog_alert, okListener, cancelListener);
     }
 
     /**
@@ -138,7 +138,7 @@ public class DialogUtilities {
             final DialogInterface.OnClickListener okListener,
             final DialogInterface.OnClickListener cancelListener) {
 
-        okCancelCustomDialog(activity, activity.getString(R.string.DLG_confirm_title), text, android.R.string.ok, android.R.string.cancel, okListener, cancelListener);
+        okCancelCustomDialog(activity, activity.getString(R.string.DLG_confirm_title), text, android.R.string.ok, android.R.string.cancel, android.R.drawable.ic_dialog_alert, okListener, cancelListener);
 
     }
 
@@ -148,6 +148,7 @@ public class DialogUtilities {
 
     public static void okCancelCustomDialog(final Activity activity, final String title, final String text,
             final int okTitleId, final int cancelTitleId,
+            final int icon,
             final DialogInterface.OnClickListener okListener,
             final DialogInterface.OnClickListener cancelListener) {
         if(activity.isFinishing())
@@ -159,7 +160,7 @@ public class DialogUtilities {
                 .setTitle(R.string.DLG_confirm_title)
                 .setMessage(text)
                 .setTitle(title)
-                .setIcon(android.R.drawable.ic_dialog_alert)
+                .setIcon(icon)
                 .setPositiveButton(okTitleId, okListener)
                 .setNegativeButton(cancelTitleId, cancelListener)
                 .show().setOwnerActivity(activity);

astrid/plugin-src/com/todoroo/astrid/actfm/EditPeopleControlSet.java

@@ -547,7 +547,9 @@ public class EditPeopleControlSet extends PopupControlSet {
                         task.setValue(Task.USER, me.user.toString());
                     }
                 };
-                DialogUtilities.okCancelCustomDialog(activity, activity.getString(R.string.actfm_EPA_login_button), activity.getString(R.string.actfm_EPA_login_to_share), R.string.actfm_EPA_login_button, R.string.actfm_EPA_dont_share_button, okListener, cancelListener);
+                DialogUtilities.okCancelCustomDialog(activity, activity.getString(R.string.actfm_EPA_login_button),
+                        activity.getString(R.string.actfm_EPA_login_to_share), R.string.actfm_EPA_login_button,
+                        R.string.actfm_EPA_dont_share_button, android.R.drawable.ic_dialog_alert, okListener, cancelListener);
 
                 return false;
             }

astrid/src/com/todoroo/astrid/welcome/WelcomeLogin.java

@@ -132,6 +132,7 @@ public class WelcomeLogin extends ActFmLoginActivity implements AuthListener {
             DialogUtilities.okCancelCustomDialog(WelcomeLogin.this, title, confirmLater,
                     R.string.welcome_login_confirm_later_ok,
                     R.string.welcome_login_confirm_later_cancel,
+                    android.R.drawable.ic_dialog_alert,
                     null, confirmLaterListener);
         }