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

Merge "Deprecate Resources#getMovie()"

Browse Source
This commit is contained in:
TreeHugger Robot
2018-08-27 21:06:28 +00:00
committed by Android (Google) Code Review
parent 2ff7174649 f0764b5c46
commit 84f7d7b37c
4 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/current.txt
View File

@@ -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;

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

@@ -916,8 +916,10 @@ public class Resources {
* tool. This integer encodes the package, type, and resource
* 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);

1
graphics/java/android/graphics/Movie.java
View File

@@ -25,6 +25,7 @@ import java.io.InputStream;
/**
* @deprecated Prefer {@link android.graphics.drawable.AnimatedImageDrawable}.
*/
@Deprecated
public class Movie {
@UnsupportedAppUsage
private long mNativeMovie;

1
test-mock/api/current.txt
View File

@@ -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);
}