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

Commit c8d2aad8 authored by Jernej Virag's avatar Jernej Virag Committed by Automerger Merge Worker
Browse files

Merge "Fix handling of negative size request for Bitmaps in... 

Merge "Fix handling of negative size request for Bitmaps in LocalImageResolver" into tm-dev am: 0c363694

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17504348



Change-Id: I98037ef693c42d17aea6cc36d0c4aef84b26f439
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents da1f66c5 0c363694

core/java/com/android/internal/widget/LocalImageResolver.java

+28 −15
Original line number Diff line number Diff line
@@ -37,12 +37,18 @@ public class LocalImageResolver { 


    private static final String TAG = "LocalImageResolver";



    /** There's no max size specified, load at original size. */

    public static final int NO_MAX_SIZE = -1;



    @VisibleForTesting

    static final int DEFAULT_MAX_SAFE_ICON_SIZE_PX = 480;



    /**

     * Resolve an image from the given Uri using {@link ImageDecoder} if it contains a

     * bitmap reference.

     * Negative or zero dimensions will result in icon loaded in its original size.

     *

     * @throws IOException if the icon could not be loaded.

     */

    @Nullable

    public static Drawable resolveImage(Uri uri, Context context) throws IOException {
@@ -63,8 +69,10 @@ public class LocalImageResolver { 
     * Get the drawable from Icon using {@link ImageDecoder} if it contains a bitmap reference, or

     * using {@link Icon#loadDrawable(Context)} otherwise.  This will correctly apply the Icon's,

     * tint, if present, to the drawable.

     * Negative or zero dimensions will result in icon loaded in its original size.

     *

     * @return drawable or null if loading failed.

     * @return drawable or null if the passed icon parameter was null.

     * @throws IOException if the icon could not be loaded.

     */

    @Nullable

    public static Drawable resolveImage(@Nullable Icon icon, Context context) throws IOException {
@@ -76,8 +84,10 @@ public class LocalImageResolver { 
     * Get the drawable from Icon using {@link ImageDecoder} if it contains a bitmap reference, or

     * using {@link Icon#loadDrawable(Context)} otherwise.  This will correctly apply the Icon's,

     * tint, if present, to the drawable.

     * Negative or zero dimensions will result in icon loaded in its original size.

     *

     * @throws IOException if the icon could not be loaded for whichever reason

     * @return loaded icon or null if a null icon was passed as a parameter.

     * @throws IOException if the icon could not be loaded.

     */

    @Nullable

    public static Drawable resolveImage(@Nullable Icon icon, Context context, int maxWidth,
@@ -144,6 +154,8 @@ public class LocalImageResolver { 
    @Nullable

    private static Drawable resolveBitmapImage(Icon icon, Context context, int maxWidth,

            int maxHeight) {



        if (maxWidth > 0 && maxHeight > 0) {

            Bitmap bitmap = icon.getBitmap();

            if (bitmap == null) {

                return null;
@@ -158,6 +170,7 @@ public class LocalImageResolver { 
                        .scaleDownIfNecessary(maxWidth, maxHeight);

                return smallerIcon.loadDrawable(context);

            }

        }



        return icon.loadDrawable(context);

    }
@@ -202,7 +215,7 @@ public class LocalImageResolver { 
        // in some cases despite it not saying so. Rethrow it as an IOException to keep

        // our API contract.

        } catch (IOException | Resources.NotFoundException e) {

            Log.e(TAG, "Failed to load image drawable", e);

            Log.d(TAG, "Couldn't use ImageDecoder for drawable, falling back to non-resized load.");

            return null;

        }

    }

core/tests/coretests/src/com/android/internal/widget/LocalImageResolverTest.java

+50 −0
Original line number Diff line number Diff line
@@ -144,6 +144,56 @@ public class LocalImageResolverTest { 
        assertThat(bd.getBitmap().getHeight()).isLessThan(51);

    }



    @Test

    public void resolveImage_largeResourceIcon_negativeWidth_dontResize() {

        Icon icon = Icon.createWithResource(mContext, R.drawable.big_a);

        Drawable d = LocalImageResolver.resolveImage(icon, mContext, LocalImageResolver.NO_MAX_SIZE,

                50);



        assertThat(d).isInstanceOf(BitmapDrawable.class);

        BitmapDrawable bd = (BitmapDrawable) d;

        assertThat(bd.getBitmap().getWidth()).isGreaterThan(101);

        assertThat(bd.getBitmap().getHeight()).isGreaterThan(51);

    }



    @Test

    public void resolveImage_largeResourceIcon_negativeHeight_dontResize() {

        Icon icon = Icon.createWithResource(mContext, R.drawable.big_a);

        Drawable d = LocalImageResolver.resolveImage(icon, mContext, 100,

                LocalImageResolver.NO_MAX_SIZE);



        assertThat(d).isInstanceOf(BitmapDrawable.class);

        BitmapDrawable bd = (BitmapDrawable) d;

        assertThat(bd.getBitmap().getWidth()).isGreaterThan(101);

        assertThat(bd.getBitmap().getHeight()).isGreaterThan(51);

    }



    @Test

    public void resolveImage_largeBitmapIcon_passedNegativeWidth_dontResize() {

        Icon icon = Icon.createWithBitmap(

                BitmapFactory.decodeResource(mContext.getResources(), R.drawable.big_a));

        Drawable d = LocalImageResolver.resolveImage(icon, mContext, LocalImageResolver.NO_MAX_SIZE,

                50);



        assertThat(d).isInstanceOf(BitmapDrawable.class);

        BitmapDrawable bd = (BitmapDrawable) d;

        assertThat(bd.getBitmap().getWidth()).isGreaterThan(101);

        assertThat(bd.getBitmap().getHeight()).isGreaterThan(51);

    }



    @Test

    public void resolveImage_largeBitmapIcon_passedNegativeHeight_dontResize() {

        Icon icon = Icon.createWithBitmap(

                BitmapFactory.decodeResource(mContext.getResources(), R.drawable.big_a));

        Drawable d = LocalImageResolver.resolveImage(icon, mContext, LocalImageResolver.NO_MAX_SIZE,

                50);



        assertThat(d).isInstanceOf(BitmapDrawable.class);

        BitmapDrawable bd = (BitmapDrawable) d;

        assertThat(bd.getBitmap().getWidth()).isGreaterThan(101);

        assertThat(bd.getBitmap().getHeight()).isGreaterThan(51);

    }



    @Test

    public void resolveImage_largeBitmapIcon_passedSize_resizeToDefinedSize() {

        Icon icon = Icon.createWithBitmap(