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

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

Merge "Deprecate Resources constructor and updateConfiguration() method" into nyc-mr1-dev

parents 06eb24d9 aa19d5e4

api/current.txt

+2 −2
Original line number Diff line number Diff line
@@ -10321,7 +10321,7 @@ package android.content.res { 
  }















  public class Resources {













    ctor public Resources(android.content.res.AssetManager, android.util.DisplayMetrics, android.content.res.Configuration);













    ctor public deprecated Resources(android.content.res.AssetManager, android.util.DisplayMetrics, android.content.res.Configuration);















    method public final void finishPreloading();















    method public final void flushLayoutCache();















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










@@ -10372,7 +10372,7 @@ package android.content.res {













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















    method public void parseBundleExtra(java.lang.String, android.util.AttributeSet, android.os.Bundle) throws org.xmlpull.v1.XmlPullParserException;















    method public void parseBundleExtras(android.content.res.XmlResourceParser, android.os.Bundle) throws java.io.IOException, org.xmlpull.v1.XmlPullParserException;













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













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















  }





























  public static class Resources.NotFoundException extends java.lang.RuntimeException {

























api/system-current.txt



+2
−2




























Original line number
Diff line number
Diff line








@@ -10760,7 +10760,7 @@ package android.content.res {













  }





























  public class Resources {













    ctor public Resources(android.content.res.AssetManager, android.util.DisplayMetrics, android.content.res.Configuration);













    ctor public deprecated Resources(android.content.res.AssetManager, android.util.DisplayMetrics, android.content.res.Configuration);















    method public final void finishPreloading();















    method public final void flushLayoutCache();















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










@@ -10811,7 +10811,7 @@ package android.content.res {













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















    method public void parseBundleExtra(java.lang.String, android.util.AttributeSet, android.os.Bundle) throws org.xmlpull.v1.XmlPullParserException;















    method public void parseBundleExtras(android.content.res.XmlResourceParser, android.os.Bundle) throws java.io.IOException, org.xmlpull.v1.XmlPullParserException;













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













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















  }





























  public static class Resources.NotFoundException extends java.lang.RuntimeException {

























api/test-current.txt



+2
−2




























Original line number
Diff line number
Diff line








@@ -10335,7 +10335,7 @@ package android.content.res {













  }





























  public class Resources {













    ctor public Resources(android.content.res.AssetManager, android.util.DisplayMetrics, android.content.res.Configuration);













    ctor public deprecated Resources(android.content.res.AssetManager, android.util.DisplayMetrics, android.content.res.Configuration);















    method public final void finishPreloading();















    method public final void flushLayoutCache();















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










@@ -10386,7 +10386,7 @@ package android.content.res {













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















    method public void parseBundleExtra(java.lang.String, android.util.AttributeSet, android.os.Bundle) throws org.xmlpull.v1.XmlPullParserException;















    method public void parseBundleExtras(android.content.res.XmlResourceParser, android.os.Bundle) throws java.io.IOException, org.xmlpull.v1.XmlPullParserException;













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













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















  }





























  public static class Resources.NotFoundException extends java.lang.RuntimeException {

























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



+7
−0




























Original line number
Diff line number
Diff line








@@ -201,12 +201,16 @@ public class Resources {













     * Create a new Resources object on top of an existing set of assets in an















     * AssetManager.















     *













     * @deprecated Resources should not be constructed by apps.













     * See {@link android.content.Context#createConfigurationContext(Configuration)}.













     *















     * @param assets Previously created AssetManager.















     * @param metrics Current display metrics to consider when















     *                selecting/computing resource values.















     * @param config Desired device configuration to consider when















     *               selecting/computing resource values (optional).















     */













    @Deprecated















    public Resources(AssetManager assets, DisplayMetrics metrics, Configuration config) {















        this(null);















        mResourcesImpl = new ResourcesImpl(assets, metrics, config, new DisplayAdjustments());










@@ -1762,7 +1766,10 @@ public class Resources {





























    /**















     * Store the newly updated configuration.













     *













     * @deprecated See {@link android.content.Context#createConfigurationContext(Configuration)}.















     */













    @Deprecated















    public void updateConfiguration(Configuration config, DisplayMetrics metrics) {















        updateConfiguration(config, metrics, null);















    }