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

Merge "Fix small but crashy edge case in Icon.scaleDown"

Browse Source
This commit is contained in:
TreeHugger Robot
2018-01-10 00:09:16 +00:00
committed by Android (Google) Code Review
parent 151c52c009 76dc52ac36
commit a13c47694f
2 changed files with 19 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
core/tests/coretests/src/android/graphics/drawable/IconTest.java
View File

@@ -16,6 +16,8 @@
package android.graphics.drawable;
import static com.google.common.truth.Truth.assertThat;
import android.graphics.Bitmap;
import android.graphics.Canvas;
import android.graphics.Region;
@@ -107,6 +109,19 @@ public class IconTest extends AndroidTestCase {
}
}
@SmallTest
public void testScaleDownIfNecessary() throws Exception {
final Bitmap bm = Bitmap.createBitmap(4321, 78, Bitmap.Config.ARGB_8888);
final Icon ic = Icon.createWithBitmap(bm);
ic.scaleDownIfNecessary(40, 20);
assertThat(bm.getWidth()).isEqualTo(4321);
assertThat(bm.getHeight()).isEqualTo(78);
assertThat(ic.getBitmap().getWidth()).isLessThan(41);
assertThat(ic.getBitmap().getHeight()).isLessThan(21);
}
@SmallTest
public void testWithAdaptiveBitmap() throws Exception {
final Bitmap bm1 = Bitmap.createBitmap(150, 150, Bitmap.Config.ARGB_8888);

6
graphics/java/android/graphics/drawable/Icon.java
View File

@@ -819,8 +819,10 @@ public final class Icon implements Parcelable {
if (bitmapWidth > maxWidth || bitmapHeight > maxHeight) {
float scale = Math.min((float) maxWidth / bitmapWidth,
(float) maxHeight / bitmapHeight);
bitmap = Bitmap.createScaledBitmap(bitmap, (int) (scale * bitmapWidth),
(int) (scale * bitmapHeight), true /* filter */);
bitmap = Bitmap.createScaledBitmap(bitmap,
Math.max(1, (int) (scale * bitmapWidth)),
Math.max(1, (int) (scale * bitmapHeight)),
true /* filter */);
}
return bitmap;
}