Merge "Implement resolving of icon attributes to resIds in AlertController" (ab12f0f7) · Commits · e / os / android_frameworks_base

core/java/com/android/internal/app/AlertController.java

+16 −0

Original line number	Original line	Diff line number	Diff line
	@@ -347,6 +347,18 @@ public class AlertController {
	}		}
	}		}

			/**
			* @param attrId the attributeId of the theme-specific drawable
			* to resolve the resourceId for.
			*
			* @return resId the resourceId of the theme-specific drawable
			*/
			public int getIconAttributeResId(int attrId) {
			TypedValue out = new TypedValue();
			mContext.getTheme().resolveAttribute(attrId, out, true);
			return out.resourceId;
			}

	public void setInverseBackgroundForced(boolean forceInverseBackground) {		public void setInverseBackgroundForced(boolean forceInverseBackground) {
	mForceInverseBackground = forceInverseBackground;		mForceInverseBackground = forceInverseBackground;
	}		}
	@@ -740,6 +752,7 @@ public class AlertController {

	public int mIconId = 0;		public int mIconId = 0;
	public Drawable mIcon;		public Drawable mIcon;
			public int mIconAttrId = 0;
	public CharSequence mTitle;		public CharSequence mTitle;
	public View mCustomTitleView;		public View mCustomTitleView;
	public CharSequence mMessage;		public CharSequence mMessage;
	@@ -806,6 +819,9 @@ public class AlertController {
	if (mIconId >= 0) {		if (mIconId >= 0) {
	dialog.setIcon(mIconId);		dialog.setIcon(mIconId);
	}		}
			if (mIconAttrId > 0) {
			dialog.setIcon(dialog.getIconAttributeResId(mIconAttrId));
			}
	}		}
	if (mMessage != null) {		if (mMessage != null) {
	dialog.setMessage(mMessage);		dialog.setMessage(mMessage);