Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f50644f2 authored by Alan Viverette's avatar Alan Viverette Committed by Android Git Automerger
Browse files

am 6c23ba0d: am a6779bc5: am 9a888816: Merge "Deprecate one-arg... 

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

* commit '6c23ba0d':
  Deprecate one-arg getDrawableForDensity, update currents.txt
parents 67880ce3 6c23ba0d

api/current.txt

+2 −2
Original line number Diff line number Diff line
@@ -9215,9 +9215,9 @@ package android.content.res { 
    method public int getDimensionPixelOffset(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.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 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 float getFraction(int, int, int);

    method public int getIdentifier(java.lang.String, java.lang.String, java.lang.String);

core/java/android/content/res/Resources.java

+4 −0
Original line number Diff line number Diff line
@@ -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) {