diff options
| author | Alan Viverette <alanv@google.com> | 2014-12-02 23:45:25 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-12-02 23:45:25 +0000 |
| commit | 6c23ba0d8d39aed98197071c7cf9ffc0b6c633b5 (patch) | |
| tree | 41e9d8ad9fefd5e944f1f05508646325bf52d8b4 /core/java/android/content | |
| parent | 935702b6d5873d028c5f5c0e35e46a35b5e11a22 (diff) | |
| parent | a6779bc51772aae2ba4cc94db2ae47b76a2cc972 (diff) | |
| download | frameworks_base-6c23ba0d8d39aed98197071c7cf9ffc0b6c633b5.zip frameworks_base-6c23ba0d8d39aed98197071c7cf9ffc0b6c633b5.tar.gz frameworks_base-6c23ba0d8d39aed98197071c7cf9ffc0b6c633b5.tar.bz2 | |
am a6779bc5: am 9a888816: Merge "Deprecate one-arg getDrawableForDensity, update currents.txt" into lmp-mr1-dev
* commit 'a6779bc51772aae2ba4cc94db2ae47b76a2cc972':
Deprecate one-arg getDrawableForDensity, update currents.txt
Diffstat (limited to 'core/java/android/content')
| -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 a359c31..73913b6 100644 --- a/core/java/android/content/res/Resources.java +++ b/core/java/android/content/res/Resources.java @@ -817,7 +817,10 @@ public class Resources { * @throws NotFoundException Throws NotFoundException if the given ID does * not exist. * @see #getDrawableForDensity(int, int, Theme) + * @deprecated Use {@link #getDrawableForDensity(int, int, Theme)} instead. */ + @Deprecated + @Nullable public Drawable getDrawableForDensity(int id, int density) throws NotFoundException { return getDrawableForDensity(id, density, null); } @@ -836,6 +839,7 @@ public class Resources { * @throws NotFoundException Throws NotFoundException if the given ID does * not exist. */ + @Nullable public Drawable getDrawableForDensity(int id, int density, @Nullable Theme theme) { TypedValue value; synchronized (mAccessLock) { |