Downscale large bitmaps in CachingIconView

CachingIconView is used to displayed (smallish) icons in Notifications. Those can accidentally be made very large if big resources are used.
This makes CachingIconView use LocalImageResolver to load those images with limited size. This fixes large memory use of notification header icons.

Bug: 210690571
Bug: 218845090

Test: Manually on small and large Pixel device with Notification tester APK
      Added Unit Tests to cover this case.
Change-Id: If3d871e788608c1702461d563673560fa18fc53f
This commit is contained in:
Jernej Virag
2022-02-14 12:30:50 +00:00
parent f450d3c054
commit 104e6492b2
6 changed files with 424 additions and 7 deletions

View File

@@ -23,6 +23,7 @@ import android.annotation.Nullable;
import android.compat.annotation.UnsupportedAppUsage;
import android.content.Context;
import android.content.res.Configuration;
import android.content.res.TypedArray;
import android.graphics.Bitmap;
import android.graphics.PorterDuff;
import android.graphics.drawable.Drawable;
@@ -35,6 +36,9 @@ import android.view.RemotableViewMethod;
import android.widget.ImageView;
import android.widget.RemoteViews;
import com.android.internal.R;
import java.io.IOException;
import java.util.Objects;
import java.util.function.Consumer;
@@ -55,9 +59,42 @@ public class CachingIconView extends ImageView {
private int mBackgroundColor;
private boolean mWillBeForceHidden;
private int mMaxDrawableWidth = -1;
private int mMaxDrawableHeight = -1;
public CachingIconView(Context context) {
this(context, null, 0, 0);
}
@UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553)
public CachingIconView(Context context, @Nullable AttributeSet attrs) {
super(context, attrs);
this(context, attrs, 0, 0);
}
public CachingIconView(Context context, @Nullable AttributeSet attrs,
int defStyleAttr) {
this(context, attrs, defStyleAttr, 0);
}
public CachingIconView(Context context, @Nullable AttributeSet attrs,
int defStyleAttr, int defStyleRes) {
super(context, attrs, defStyleAttr, defStyleRes);
init(context, attrs, defStyleAttr, defStyleRes);
}
private void init(Context context, @Nullable AttributeSet attrs, int defStyleAttr,
int defStyleRes) {
if (attrs == null) {
return;
}
TypedArray ta = context.obtainStyledAttributes(attrs,
R.styleable.CachingIconView, defStyleAttr, defStyleRes);
mMaxDrawableWidth = ta.getDimensionPixelSize(R.styleable
.CachingIconView_maxDrawableWidth, -1);
mMaxDrawableHeight = ta.getDimensionPixelSize(R.styleable
.CachingIconView_maxDrawableHeight, -1);
ta.recycle();
}
@Override
@@ -66,15 +103,31 @@ public class CachingIconView extends ImageView {
if (!testAndSetCache(icon)) {
mInternalSetDrawable = true;
// This calls back to setImageDrawable, make sure we don't clear the cache there.
super.setImageIcon(icon);
Drawable drawable = loadSizeRestrictedIcon(icon);
if (drawable == null) {
super.setImageIcon(icon);
} else {
super.setImageDrawable(drawable);
}
mInternalSetDrawable = false;
}
}
@Nullable
private Drawable loadSizeRestrictedIcon(@Nullable Icon icon) {
try {
return LocalImageResolver.resolveImage(icon, getContext(), mMaxDrawableWidth,
mMaxDrawableHeight);
} catch (IOException e) {
return null;
}
}
@Override
public Runnable setImageIconAsync(@Nullable Icon icon) {
public Runnable setImageIconAsync(@Nullable final Icon icon) {
resetCache();
return super.setImageIconAsync(icon);
Drawable drawable = loadSizeRestrictedIcon(icon);
return () -> setImageDrawable(drawable);
}
@Override
@@ -83,14 +136,34 @@ public class CachingIconView extends ImageView {
if (!testAndSetCache(resId)) {
mInternalSetDrawable = true;
// This calls back to setImageDrawable, make sure we don't clear the cache there.
super.setImageResource(resId);
Drawable drawable = loadSizeRestrictedDrawable(resId);
if (drawable == null) {
super.setImageResource(resId);
} else {
super.setImageDrawable(drawable);
}
mInternalSetDrawable = false;
}
}
@Nullable
private Drawable loadSizeRestrictedDrawable(@DrawableRes int resId) {
try {
return LocalImageResolver.resolveImage(resId, getContext(), mMaxDrawableWidth,
mMaxDrawableHeight);
} catch (IOException e) {
return null;
}
}
@Override
public Runnable setImageResourceAsync(@DrawableRes int resId) {
resetCache();
Drawable drawable = loadSizeRestrictedDrawable(resId);
if (drawable != null) {
return () -> setImageDrawable(drawable);
}
return super.setImageResourceAsync(resId);
}
@@ -98,13 +171,35 @@ public class CachingIconView extends ImageView {
@RemotableViewMethod(asyncImpl="setImageURIAsync")
public void setImageURI(@Nullable Uri uri) {
resetCache();
super.setImageURI(uri);
Drawable drawable = loadSizeRestrictedUri(uri);
if (drawable == null) {
super.setImageURI(uri);
} else {
mInternalSetDrawable = true;
super.setImageDrawable(drawable);
mInternalSetDrawable = false;
}
}
@Nullable
private Drawable loadSizeRestrictedUri(@Nullable Uri uri) {
try {
return LocalImageResolver.resolveImage(uri, getContext(), mMaxDrawableWidth,
mMaxDrawableHeight);
} catch (IOException e) {
return null;
}
}
@Override
public Runnable setImageURIAsync(@Nullable Uri uri) {
resetCache();
return super.setImageURIAsync(uri);
Drawable drawable = loadSizeRestrictedUri(uri);
if (drawable == null) {
return super.setImageURIAsync(uri);
} else {
return () -> setImageDrawable(drawable);
}
}
@Override
@@ -307,4 +402,18 @@ public class CachingIconView extends ImageView {
public void setWillBeForceHidden(boolean forceHidden) {
mWillBeForceHidden = forceHidden;
}
/**
* Returns the set maximum width of drawable in pixels. -1 if not set.
*/
public int getMaxDrawableWidth() {
return mMaxDrawableWidth;
}
/**
* Returns the set maximum height of drawable in pixels. -1 if not set.
*/
public int getMaxDrawableHeight() {
return mMaxDrawableHeight;
}
}

View File

@@ -9807,4 +9807,12 @@
of the supported locale. {@link android.app.LocaleConfig} -->
<attr name="name" />
</declare-styleable>
<!-- @hide -->
<declare-styleable name="CachingIconView">
<!-- Maximum width of displayed drawable. Drawables exceeding this size will be downsampled. -->
<attr name="maxDrawableWidth" format="dimension"/>
<!-- Maximum width of height drawable. Drawables exceeding this size will be downsampled. -->
<attr name="maxDrawableHeight" format="dimension"/>
</declare-styleable>
</resources>

View File

@@ -148,6 +148,10 @@
<public name="supportsInlineSuggestionsWithTouchExploration" />
<public name="lineBreakStyle" />
<public name="lineBreakWordStyle" />
<!-- @hide -->
<public name="maxDrawableWidth" />
<!-- @hide -->
<public name="maxDrawableHeight" />
</staging-public-group>
<staging-public-group type="id" first-id="0x01de0000">

View File

@@ -0,0 +1,24 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ Copyright (C) 2022 The Android Open Source Project
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
<com.android.internal.widget.CachingIconView
xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/caching_icon_view"
android:layout_width="120dp"
android:layout_height="120dp"
android:maxDrawableWidth="80dp"
android:maxDrawableHeight="80dp" />

View File

@@ -0,0 +1,22 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ Copyright (C) 2022 The Android Open Source Project
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
<com.android.internal.widget.CachingIconView
xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/caching_icon_view"
android:layout_width="120dp"
android:layout_height="120dp" />

View File

@@ -0,0 +1,250 @@
/*
* Copyright (C) 2022 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.android.internal.widget;
import static com.google.common.truth.Truth.assertThat;
import android.annotation.Nullable;
import android.content.Context;
import android.graphics.drawable.BitmapDrawable;
import android.graphics.drawable.Drawable;
import android.graphics.drawable.Icon;
import android.graphics.drawable.InsetDrawable;
import android.net.Uri;
import android.util.TypedValue;
import android.view.LayoutInflater;
import androidx.test.ext.junit.runners.AndroidJUnit4;
import androidx.test.platform.app.InstrumentationRegistry;
import com.android.frameworks.coretests.R;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@RunWith(AndroidJUnit4.class)
public class CachingIconViewTest {
private Context mContext;
@Before
public void setUp() {
mContext = InstrumentationRegistry.getInstrumentation().getTargetContext();
}
@Test
public void customDrawable_setImageIcon_skipsResizeSuccessfully() {
CachingIconView view = (CachingIconView) LayoutInflater.from(mContext).inflate(
R.layout.caching_icon_view_test_max_size, null);
view.setImageIcon(Icon.createWithResource(mContext, R.drawable.custom_drawable));
Drawable drawable = view.getDrawable();
assertThat(drawable).isInstanceOf(InsetDrawable.class);
}
@Test
public void customDrawable_setImageIconAsync_skipsResizeSuccessfully() {
CachingIconView view = (CachingIconView) LayoutInflater.from(mContext).inflate(
R.layout.caching_icon_view_test_max_size, null);
view.setImageIconAsync(Icon.createWithResource(mContext, R.drawable.custom_drawable)).run();
Drawable drawable = view.getDrawable();
assertThat(drawable).isInstanceOf(InsetDrawable.class);
}
@Test
public void customDrawable_setImageResource_skipsResizeSuccessfully() {
CachingIconView view = (CachingIconView) LayoutInflater.from(mContext).inflate(
R.layout.caching_icon_view_test_max_size, null);
view.setImageResource(R.drawable.custom_drawable);
Drawable drawable = view.getDrawable();
assertThat(drawable).isInstanceOf(InsetDrawable.class);
}
@Test
public void customDrawable_setImageResourceAsync_skipsResizeSuccessfully() {
CachingIconView view = (CachingIconView) LayoutInflater.from(mContext).inflate(
R.layout.caching_icon_view_test_max_size, null);
view.setImageResourceAsync(R.drawable.custom_drawable).run();
Drawable drawable = view.getDrawable();
assertThat(drawable).isInstanceOf(InsetDrawable.class);
}
@Test
public void customDrawable_setImageUri_skipsResizeSuccessfully() {
CachingIconView view = (CachingIconView) LayoutInflater.from(mContext).inflate(
R.layout.caching_icon_view_test_max_size, null);
view.setImageURI(Uri.parse(
"android.resource://com.android.frameworks.coretests/"
+ R.drawable.custom_drawable));
Drawable drawable = view.getDrawable();
assertThat(drawable).isInstanceOf(InsetDrawable.class);
}
@Test
public void customDrawable_setImageUriAsync_skipsResizeSuccessfully() {
CachingIconView view = (CachingIconView) LayoutInflater.from(mContext).inflate(
R.layout.caching_icon_view_test_max_size, null);
view.setImageURIAsync(Uri.parse(
"android.resource://com.android.frameworks.coretests/"
+ R.drawable.custom_drawable)).run();
Drawable drawable = view.getDrawable();
assertThat(drawable).isInstanceOf(InsetDrawable.class);
}
@Test
public void maxDrawableDimensionsSet_setImageIcon_resizesImageIcon() {
CachingIconView view = (CachingIconView) LayoutInflater.from(mContext).inflate(
R.layout.caching_icon_view_test_max_size, null);
view.setImageIcon(Icon.createWithResource(mContext, R.drawable.big_a));
assertDrawableResized(view);
}
@Test
public void maxDrawableWithNoDimensionsSet_setImageIcon_doesNotResizeImageIcon() {
CachingIconView view = (CachingIconView) LayoutInflater.from(mContext).inflate(
R.layout.caching_icon_view_test_no_max_size, null);
view.setImageIcon(Icon.createWithResource(mContext, R.drawable.big_a));
assertDrawableNotResized(view);
}
@Test
public void maxDrawableDimensionsSet_setImageIconAsync_resizesImageIcon() {
CachingIconView view = (CachingIconView) LayoutInflater.from(mContext).inflate(
R.layout.caching_icon_view_test_max_size, null);
view.setImageIconAsync(Icon.createWithResource(mContext, R.drawable.big_a)).run();
assertDrawableResized(view);
}
@Test
public void maxDrawableWithNoDimensionsSet_setImageIconAsync_doesNotResizeImageIcon() {
CachingIconView view = (CachingIconView) LayoutInflater.from(mContext).inflate(
R.layout.caching_icon_view_test_no_max_size, null);
view.setImageIconAsync(Icon.createWithResource(mContext, R.drawable.big_a)).run();
assertDrawableNotResized(view);
}
@Test
public void maxDrawableDimensionsSet_setImageResource_resizesImageIcon() {
CachingIconView view = (CachingIconView) LayoutInflater.from(mContext).inflate(
R.layout.caching_icon_view_test_max_size, null);
view.setImageResource(R.drawable.big_a);
assertDrawableResized(view);
}
@Test
public void maxDrawableWithNoDimensionsSet_setImageResource_doesNotResizeImageIcon() {
CachingIconView view = (CachingIconView) LayoutInflater.from(mContext).inflate(
R.layout.caching_icon_view_test_no_max_size, null);
view.setImageResource(R.drawable.big_a);
assertDrawableNotResized(view);
}
@Test
public void maxDrawableDimensionsSet_setImageResourceAsync_resizesImageIcon() {
CachingIconView view = (CachingIconView) LayoutInflater.from(mContext).inflate(
R.layout.caching_icon_view_test_max_size, null);
view.setImageResourceAsync(R.drawable.big_a).run();
assertDrawableResized(view);
}
@Test
public void maxDrawableWithNoDimensionsSet_setImageResourceAsync_doesNotResizeImageIcon() {
CachingIconView view = (CachingIconView) LayoutInflater.from(mContext).inflate(
R.layout.caching_icon_view_test_no_max_size, null);
view.setImageResourceAsync(R.drawable.big_a).run();
assertDrawableNotResized(view);
}
@Test
public void maxDrawableDimensionsSet_setImageUri_resizesImageIcon() {
CachingIconView view = (CachingIconView) LayoutInflater.from(mContext).inflate(
R.layout.caching_icon_view_test_max_size, null);
view.setImageURI(Uri.parse(
"android.resource://com.android.frameworks.coretests/" + R.drawable.big_a));
assertDrawableResized(view);
}
@Test
public void maxDrawableWithNoDimensionsSet_setImageUri_doesNotResizeImageIcon() {
CachingIconView view = (CachingIconView) LayoutInflater.from(mContext).inflate(
R.layout.caching_icon_view_test_no_max_size, null);
view.setImageURI(Uri.parse(
"android.resource://com.android.frameworks.coretests/" + R.drawable.big_a));
assertDrawableNotResized(view);
}
@Test
public void maxDrawableDimensionsSet_setImageUriAsync_resizesImageIcon() {
CachingIconView view = (CachingIconView) LayoutInflater.from(mContext).inflate(
R.layout.caching_icon_view_test_max_size, null);
view.setImageURIAsync(Uri.parse(
"android.resource://com.android.frameworks.coretests/" + R.drawable.big_a)).run();
assertDrawableResized(view);
}
@Test
public void maxDrawableWithNoDimensionsSet_setImageUriAsync_doesNotResizeImageIcon() {
CachingIconView view = (CachingIconView) LayoutInflater.from(mContext).inflate(
R.layout.caching_icon_view_test_no_max_size, null);
view.setImageURIAsync(Uri.parse(
"android.resource://com.android.frameworks.coretests/" + R.drawable.big_a)).run();
assertDrawableNotResized(view);
}
private void assertDrawableResized(@Nullable CachingIconView view) {
assertThat(view).isNotNull();
int maxSize =
(int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 80f,
mContext.getResources().getDisplayMetrics());
assertThat(view.getMaxDrawableHeight()).isEqualTo(maxSize);
assertThat(view.getMaxDrawableWidth()).isEqualTo(maxSize);
Drawable drawable = view.getDrawable();
assertThat(drawable).isInstanceOf(BitmapDrawable.class);
BitmapDrawable bitmapDrawable = (BitmapDrawable) drawable;
assertThat(bitmapDrawable.getBitmap().getWidth()).isLessThan(maxSize + 1);
assertThat(bitmapDrawable.getBitmap().getHeight()).isLessThan(maxSize + 1);
}
private void assertDrawableNotResized(@Nullable CachingIconView view) {
assertThat(view).isNotNull();
int maxSize =
(int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 80f,
mContext.getResources().getDisplayMetrics());
assertThat(view.getMaxDrawableHeight()).isEqualTo(-1);
assertThat(view.getMaxDrawableWidth()).isEqualTo(-1);
Drawable drawable = view.getDrawable();
assertThat(drawable).isInstanceOf(BitmapDrawable.class);
BitmapDrawable bitmapDrawable = (BitmapDrawable) drawable;
assertThat(bitmapDrawable.getBitmap().getWidth()).isGreaterThan(maxSize);
assertThat(bitmapDrawable.getBitmap().getHeight()).isGreaterThan(maxSize);
}
}