Merge "Don't override dialog icon drawable unless valid resource ID was set" into lmp-mr1-dev (74890242) · Commits · e / os / android_frameworks_base

core/java/android/app/AlertDialog.java

+7 −1

Original line number	Diff line number	Diff line
		@@ -466,6 +466,8 @@ public class AlertDialog extends Dialog implements DialogInterface {

		/**
		* Set the resource id of the {@link Drawable} to be used in the title.
		* <p>
		* Takes precedence over values set using {@link #setIcon(Drawable)}.
		*
		* @return This Builder object to allow for chaining of calls to set methods
		*/
		@@ -485,7 +487,11 @@ public class AlertDialog extends Dialog implements DialogInterface {
		}

		/**
		* Set an icon as supplied by a theme attribute. e.g. android.R.attr.alertDialogIcon
		* Set an icon as supplied by a theme attribute. e.g.
		* {@link android.R.attr#alertDialogIcon}.
		* <p>
		* Takes precedence over values set using {@link #setIcon(int)} or
		* {@link #setIcon(Drawable)}.
		*
		* @param attrId ID of a theme attribute that points to a drawable resource.
		*/

+2 −2

Original line number	Diff line number	Diff line
		@@ -955,10 +955,10 @@ public class AlertController {
		if (mIcon != null) {
		dialog.setIcon(mIcon);
		}
		if (mIconId >= 0) {
		if (mIconId != 0) {
		dialog.setIcon(mIconId);
		}
		if (mIconAttrId > 0) {
		if (mIconAttrId != 0) {
		dialog.setIcon(dialog.getIconAttributeResId(mIconAttrId));
		}
		}