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

Commit 84f7d7b3 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Deprecate Resources#getMovie()"

parents 2ff71746 f0764b5c

api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -11922,7 +11922,7 @@ package android.content.res { 
    method public int[] getIntArray(int) throws android.content.res.Resources.NotFoundException;

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

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

    method public android.graphics.Movie getMovie(int) throws android.content.res.Resources.NotFoundException;

    method public deprecated android.graphics.Movie getMovie(int) throws android.content.res.Resources.NotFoundException;

    method public java.lang.String getQuantityString(int, int, java.lang.Object...) throws android.content.res.Resources.NotFoundException;

    method public java.lang.String getQuantityString(int, int) throws android.content.res.Resources.NotFoundException;

    method public java.lang.CharSequence getQuantityText(int, int) throws android.content.res.Resources.NotFoundException;

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

+3 −1
Original line number Diff line number Diff line
@@ -917,7 +917,9 @@ public class Resources { 
     *           entry. The value 0 is an invalid identifier.

     * @throws NotFoundException Throws NotFoundException if the given ID does not exist.

     *

     * @deprecated Prefer {@link android.graphics.drawable.AnimatedImageDrawable}.

     */

    @Deprecated

    public Movie getMovie(@RawRes int id) throws NotFoundException {

        final InputStream is = openRawResource(id);

        final Movie movie = Movie.decodeStream(is);

graphics/java/android/graphics/Movie.java

+1 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ import java.io.InputStream; 
/**

 * @deprecated Prefer {@link android.graphics.drawable.AnimatedImageDrawable}.

 */

@Deprecated

public class Movie {

    @UnsupportedAppUsage

    private long mNativeMovie;

test-mock/api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -292,6 +292,7 @@ package android.test.mock { 
    method public int getColor(int) throws android.content.res.Resources.NotFoundException;

    method public android.content.res.ColorStateList getColorStateList(int) throws android.content.res.Resources.NotFoundException;

    method public android.graphics.drawable.Drawable getDrawable(int) throws android.content.res.Resources.NotFoundException;

    method public android.graphics.Movie getMovie(int) throws android.content.res.Resources.NotFoundException;

    method public void updateConfiguration(android.content.res.Configuration, android.util.DisplayMetrics);

  }