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

Commit d476c8b8 authored by Dianne Hackborn's avatar Dianne Hackborn Committed by Android Git Automerger
Browse files

am d3be0a76: Merge "Unhide Resources APIs for getting resources at specific... 

am d3be0a76: Merge "Unhide Resources APIs for getting resources at specific densities." into ics-mr1

* commit 'd3be0a76':
  Unhide Resources APIs for getting resources at specific densities.
parents ab6ccca0 d3be0a76

api/15.txt

+2 −0
Original line number Diff line number Diff line
@@ -6611,6 +6611,7 @@ package android.content.res { 
    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 android.graphics.drawable.Drawable getDrawableForDensity(int, int) throws android.content.res.Resources.NotFoundException;

    method public float getFraction(int, int, int);

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

    method public int[] getIntArray(int) throws android.content.res.Resources.NotFoundException;
@@ -6633,6 +6634,7 @@ package android.content.res { 
    method public java.lang.CharSequence[] getTextArray(int) throws android.content.res.Resources.NotFoundException;

    method public void getValue(int, android.util.TypedValue, boolean) throws android.content.res.Resources.NotFoundException;

    method public void getValue(java.lang.String, android.util.TypedValue, boolean) throws android.content.res.Resources.NotFoundException;

    method public void getValueForDensity(int, int, android.util.TypedValue, boolean) throws android.content.res.Resources.NotFoundException;

    method public android.content.res.XmlResourceParser getXml(int) throws android.content.res.Resources.NotFoundException;

    method public final android.content.res.Resources.Theme newTheme();

    method public android.content.res.TypedArray obtainAttributes(android.util.AttributeSet, int[]);

api/current.txt

+2 −0
Original line number Diff line number Diff line
@@ -6611,6 +6611,7 @@ package android.content.res { 
    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 android.graphics.drawable.Drawable getDrawableForDensity(int, int) throws android.content.res.Resources.NotFoundException;

    method public float getFraction(int, int, int);

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

    method public int[] getIntArray(int) throws android.content.res.Resources.NotFoundException;
@@ -6633,6 +6634,7 @@ package android.content.res { 
    method public java.lang.CharSequence[] getTextArray(int) throws android.content.res.Resources.NotFoundException;

    method public void getValue(int, android.util.TypedValue, boolean) throws android.content.res.Resources.NotFoundException;

    method public void getValue(java.lang.String, android.util.TypedValue, boolean) throws android.content.res.Resources.NotFoundException;

    method public void getValueForDensity(int, int, android.util.TypedValue, boolean) throws android.content.res.Resources.NotFoundException;

    method public android.content.res.XmlResourceParser getXml(int) throws android.content.res.Resources.NotFoundException;

    method public final android.content.res.Resources.Theme newTheme();

    method public android.content.res.TypedArray obtainAttributes(android.util.AttributeSet, int[]);

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

+0 −2
Original line number Diff line number Diff line
@@ -683,7 +683,6 @@ public class Resources { 
     * @throws NotFoundException Throws NotFoundException if the given ID does

     *             not exist.

     * @return Drawable An object that can be used to draw this resource.

     * @hide

     */

    public Drawable getDrawableForDensity(int id, int density) throws NotFoundException {

        synchronized (mTmpValue) {
@@ -1032,7 +1031,6 @@ public class Resources { 
     * @throws NotFoundException Throws NotFoundException if the given ID does

     *             not exist.

     * @see #getValue(String, TypedValue, boolean)

     * @hide

     */

    public void getValueForDensity(int id, int density, TypedValue outValue, boolean resolveRefs)

            throws NotFoundException {