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

am 9a888816: Merge "Deprecate one-arg getDrawableForDensity, update currents.txt" into lmp-mr1-dev

Browse Source 
* commit '9a888816de21c4e146acbd608fdea110a299f42d':
  Deprecate one-arg getDrawableForDensity, update currents.txt
This commit is contained in:
Alan Viverette
2014-12-02 23:37:47 +00:00
committed by Android Git Automerger
parent 95482c28f5 9a888816de
commit a6779bc517
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
api/current.txt
View File

@@ -9214,9 +9214,9 @@ package android.content.res {
method public int getDimensionPixelOffset(int) throws android.content.res.Resources.NotFoundException; method public int getDimensionPixelOffset(int) throws android.content.res.Resources.NotFoundException;
method public int getDimensionPixelSize(int) throws android.content.res.Resources.NotFoundException; method public int getDimensionPixelSize(int) throws android.content.res.Resources.NotFoundException;
method public android.util.DisplayMetrics getDisplayMetrics(); method public android.util.DisplayMetrics getDisplayMetrics();
method public android.graphics.drawable.Drawable getDrawable(int) throws android.content.res.Resources.NotFoundException; method public deprecated android.graphics.drawable.Drawable getDrawable(int) throws android.content.res.Resources.NotFoundException;
method public android.graphics.drawable.Drawable getDrawable(int, android.content.res.Resources.Theme) throws android.content.res.Resources.NotFoundException; method public android.graphics.drawable.Drawable getDrawable(int, android.content.res.Resources.Theme) throws android.content.res.Resources.NotFoundException;
method public android.graphics.drawable.Drawable getDrawableForDensity(int, int) throws android.content.res.Resources.NotFoundException; method public deprecated android.graphics.drawable.Drawable getDrawableForDensity(int, int) throws android.content.res.Resources.NotFoundException;
method public android.graphics.drawable.Drawable getDrawableForDensity(int, int, android.content.res.Resources.Theme); method public android.graphics.drawable.Drawable getDrawableForDensity(int, int, android.content.res.Resources.Theme);
method public float getFraction(int, int, int); method public float getFraction(int, int, int);
method public int getIdentifier(java.lang.String, java.lang.String, java.lang.String); method public int getIdentifier(java.lang.String, java.lang.String, java.lang.String);

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

@@ -817,7 +817,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 #getDrawableForDensity(int, int, Theme) * @see #getDrawableForDensity(int, int, Theme)
* @deprecated Use {@link #getDrawableForDensity(int, int, Theme)} instead.
*/ */
@Deprecated
@Nullable
public Drawable getDrawableForDensity(int id, int density) throws NotFoundException { public Drawable getDrawableForDensity(int id, int density) throws NotFoundException {
return getDrawableForDensity(id, density, null); return getDrawableForDensity(id, density, null);
} }
@@ -836,6 +839,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 getDrawableForDensity(int id, int density, @Nullable Theme theme) { public Drawable getDrawableForDensity(int id, int density, @Nullable Theme theme) {
TypedValue value; TypedValue value;
synchronized (mAccessLock) { synchronized (mAccessLock) {