diff options
| author | 2014-12-02 23:07:01 +0000 | |
|---|---|---|
| committer | 2014-12-02 23:07:03 +0000 | |
| commit | 1b33396ee4047e79777495a8682b9117e88bba5c (patch) | |
| tree | 90ac63d80035ccd08c97490604229e9e8b242a8b | |
| parent | 152470a29212479c8ccc9e2c1a9f26188a5b7411 (diff) | |
| parent | c10e3960d9107f8663daa842ac57dedded4736e3 (diff) | |
Merge "Deprecate Resources.getDrawable(int) in favor of the two-arg version" into lmp-mr1-dev
| -rw-r--r-- | core/java/android/content/res/Resources.java | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/core/java/android/content/res/Resources.java b/core/java/android/content/res/Resources.java index 78d3e9cc9b25..a359c319429a 100644 --- a/core/java/android/content/res/Resources.java +++ b/core/java/android/content/res/Resources.java @@ -744,7 +744,10 @@ public class Resources { * @throws NotFoundException Throws NotFoundException if the given ID does * not exist. * @see #getDrawable(int, Theme) + * @deprecated Use {@link #getDrawable(int, Theme)} instead. */ + @Deprecated + @Nullable public Drawable getDrawable(int id) throws NotFoundException { final Drawable d = getDrawable(id, null); if (d != null && d.canApplyTheme()) { @@ -769,6 +772,7 @@ public class Resources { * @throws NotFoundException Throws NotFoundException if the given ID does * not exist. */ + @Nullable public Drawable getDrawable(int id, @Nullable Theme theme) throws NotFoundException { TypedValue value; synchronized (mAccessLock) { |