diff options
| author | Alan Viverette <alanv@google.com> | 2014-12-02 23:19:28 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-12-02 23:19:28 +0000 |
| commit | 0cd6296c0afb92f63487247ef4c9c73715113926 (patch) | |
| tree | 15d5cc629f36afca6a9e6c3d07228ec57ee8a74e /core/java | |
| parent | 24d40b302e5dabc6c435b6549ef5801540edfca8 (diff) | |
| parent | 63c7a655beab21da934d21bb4004889bfb6e4417 (diff) | |
| download | frameworks_base-0cd6296c0afb92f63487247ef4c9c73715113926.zip frameworks_base-0cd6296c0afb92f63487247ef4c9c73715113926.tar.gz frameworks_base-0cd6296c0afb92f63487247ef4c9c73715113926.tar.bz2 | |
am 63c7a655: am 1b33396e: Merge "Deprecate Resources.getDrawable(int) in favor of the two-arg version" into lmp-mr1-dev
* commit '63c7a655beab21da934d21bb4004889bfb6e4417':
Deprecate Resources.getDrawable(int) in favor of the two-arg version
Diffstat (limited to 'core/java')
| -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 78d3e9c..a359c31 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) { |