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

am 63c7a655: am 1b33396e: Merge "Deprecate Resources.getDrawable(int) in favor of the two-arg version" into lmp-mr1-dev

Browse Source 
* commit '63c7a655beab21da934d21bb4004889bfb6e4417':
  Deprecate Resources.getDrawable(int) in favor of the two-arg version
This commit is contained in:
Alan Viverette
2014-12-02 23:19:28 +00:00
committed by Android Git Automerger
parent 24d40b302e 63c7a655be
commit 0cd6296c0a
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/android/content/res/Resources.java
View File

@@ -744,7 +744,10 @@ public class Resources {
* @throws NotFoundException Throws NotFoundException if the given ID does * @throws NotFoundException Throws NotFoundException if the given ID does
* not exist. * not exist.
* @see #getDrawable(int, Theme) * @see #getDrawable(int, Theme)
* @deprecated Use {@link #getDrawable(int, Theme)} instead.
*/ */
@Deprecated
@Nullable
public Drawable getDrawable(int id) throws NotFoundException { public Drawable getDrawable(int id) throws NotFoundException {
final Drawable d = getDrawable(id, null); final Drawable d = getDrawable(id, null);
if (d != null && d.canApplyTheme()) { if (d != null && d.canApplyTheme()) {
@@ -769,6 +772,7 @@ public class Resources {
* @throws NotFoundException Throws NotFoundException if the given ID does * @throws NotFoundException Throws NotFoundException if the given ID does
* not exist. * not exist.
*/ */
@Nullable
public Drawable getDrawable(int id, @Nullable Theme theme) throws NotFoundException { public Drawable getDrawable(int id, @Nullable Theme theme) throws NotFoundException {
TypedValue value; TypedValue value;
synchronized (mAccessLock) { synchronized (mAccessLock) {