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

Merge "Prevent LocalImageResolver from upscaling images" into tm-dev

Browse Source
This commit is contained in:
Jernej Virag
2022-04-21 14:19:41 +00:00
committed by Android (Google) Code Review
parent 5428fee94e dd397eac49
commit e02f9e390d
2 changed files with 16 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/java/com/android/internal/widget/LocalImageResolver.java
View File

@@ -198,6 +198,11 @@ public class LocalImageResolver {
} }
final Size size = info.getSize(); final Size size = info.getSize();
if (size.getWidth() <= maxWidth && size.getHeight() <= maxHeight) {
// We don't want to upscale images needlessly.
return;
}
if (size.getWidth() > size.getHeight()) { if (size.getWidth() > size.getHeight()) {
if (size.getWidth() > maxWidth) { if (size.getWidth() > maxWidth) {
final int targetHeight = size.getHeight() * maxWidth / size.getWidth(); final int targetHeight = size.getHeight() * maxWidth / size.getWidth();

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

@@ -194,6 +194,17 @@ public class LocalImageResolverTest {
assertThat(bd.getBitmap().getHeight()).isGreaterThan(51); assertThat(bd.getBitmap().getHeight()).isGreaterThan(51);
} }
@Test
public void resolveImage_smallBitmapIcon_passedSmallerSize_dontResize() {
Icon icon = Icon.createWithResource(mContext.getResources(), R.drawable.test32x24);
Drawable d = LocalImageResolver.resolveImage(icon, mContext, 600, 450);
assertThat(d).isInstanceOf(BitmapDrawable.class);
BitmapDrawable bd = (BitmapDrawable) d;
assertThat(bd.getBitmap().getWidth()).isEqualTo(32);
assertThat(bd.getBitmap().getHeight()).isEqualTo(24);
}
@Test @Test
public void resolveImage_largeBitmapIcon_passedSize_resizeToDefinedSize() { public void resolveImage_largeBitmapIcon_passedSize_resizeToDefinedSize() {
Icon icon = Icon.createWithBitmap( Icon icon = Icon.createWithBitmap(