diff options
| author | Alan Viverette <alanv@google.com> | 2014-08-15 16:13:15 -0700 |
|---|---|---|
| committer | Alan Viverette <alanv@google.com> | 2014-08-15 17:15:39 -0700 |
| commit | 34a14f967ab6c88829c9a36ce6e909c47b3ee398 (patch) | |
| tree | 60367cc4ec76fa3688a39e73457e520df6fb48ac /core/java/android/content/res | |
| parent | a2897ea9d8d6eb7c1c0aace695ed835da96bb39c (diff) | |
| download | frameworks_base-34a14f967ab6c88829c9a36ce6e909c47b3ee398.zip frameworks_base-34a14f967ab6c88829c9a36ce6e909c47b3ee398.tar.gz frameworks_base-34a14f967ab6c88829c9a36ce6e909c47b3ee398.tar.bz2 | |
Better handling of unresolved theme attributes
Also adds a (very obviously wrong) default color to RippleDrawable
Change-Id: I6d29b371f4e59accbebf25eb059b1f372b9184b0
Diffstat (limited to 'core/java/android/content/res')
| -rw-r--r-- | core/java/android/content/res/Resources.java | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/core/java/android/content/res/Resources.java b/core/java/android/content/res/Resources.java index 52d1c79..fff21aa 100644 --- a/core/java/android/content/res/Resources.java +++ b/core/java/android/content/res/Resources.java @@ -715,7 +715,13 @@ public class Resources { * @see #getDrawable(int, Theme) */ public Drawable getDrawable(int id) throws NotFoundException { - return getDrawable(id, null); + final Drawable d = getDrawable(id, null); + if (d.canApplyTheme()) { + Log.w(TAG, "Drawable " + getResourceName(id) + " has unresolved theme " + + "attributes! Consider using Resources.getDrawable(int, Theme) or " + + "Context.getDrawable(int).", new RuntimeException()); + } + return d; } /** |