Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 10bd4106: am baed0a8f: am 56fd88d8: am ab12f0f7: Merge "Implement resolving of icon attributes to resIds in AlertController"

Browse Source 
* commit '10bd4106efc22efd57875a2fb914110475c91856':
  Implement resolving of icon attributes to resIds in AlertController
This commit is contained in:
Adam Powell
2012-09-19 12:31:39 -07:00
committed by Android Git Automerger
parent d02341d0bd 10bd4106ef
commit d1f135869e
1 changed files with 16 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
core/java/com/android/internal/app/AlertController.java
View File

@@ -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;
@@ -807,6 +820,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);