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

Merge "AbsSeekBarTest: Fix dpToPixel computation" am: 72df4073ea am: f26a5b003b

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1518543

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie869880da1c9eb8d05fb179da946c7e29814340b
This commit is contained in:
Treehugger Robot
2021-01-13 18:52:55 +00:00
committed by Automerger Merge Worker
parent 226d233fb0 f26a5b003b
commit a9a80c7e7e
1 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
core/tests/coretests/src/android/widget/AbsSeekBarTest.java
View File

@@ -60,35 +60,35 @@ public class AbsSeekBarTest {
@Test
public void testExclusionForThumb_limitedTo48dp() {
mBar.setPadding(10, 10, 10, 10);
mBar.setThumb(newThumb(dpToPx(20)));
mBar.setThumb(newThumb(dpToPxSize(20)));
mBar.setMin(0);
mBar.setMax(100);
mBar.setProgress(50);
measureAndLayout(dpToPx(200), dpToPx(100));
measureAndLayout(dpToPxSize(200), dpToPxSize(100));
List<Rect> exclusions = mBar.getSystemGestureExclusionRects();
assertEquals("exclusions should be size 1, but was " + exclusions, 1, exclusions.size());
assertEquals("exclusion should be centered on thumb",
center(mBar), center(exclusions.get(0)));
assertEquals("exclusion should be 48dp high", dpToPx(48), exclusions.get(0).height());
assertEquals("exclusion should be 48dp wide", dpToPx(48), exclusions.get(0).width());
assertEquals("exclusion should be 48dp high", dpToPxSize(48), exclusions.get(0).height());
assertEquals("exclusion should be 48dp wide", dpToPxSize(48), exclusions.get(0).width());
}
@Test
public void testExclusionForThumb_limitedToHeight() {
mBar.setPadding(10, 10, 10, 10);
mBar.setThumb(newThumb(dpToPx(20)));
mBar.setThumb(newThumb(dpToPxSize(20)));
mBar.setMin(0);
mBar.setMax(100);
mBar.setProgress(50);
measureAndLayout(dpToPx(200), dpToPx(32));
measureAndLayout(dpToPxSize(200), dpToPxSize(32));
List<Rect> exclusions = mBar.getSystemGestureExclusionRects();
assertEquals("exclusions should be size 1, but was " + exclusions, 1, exclusions.size());
assertEquals("exclusion should be centered on thumb",
center(mBar), center(exclusions.get(0)));
assertEquals("exclusion should be 32dp high", dpToPx(32), exclusions.get(0).height());
assertEquals("exclusion should be 32dp wide", dpToPx(32), exclusions.get(0).width());
assertEquals("exclusion should be 32dp high", dpToPxSize(32), exclusions.get(0).height());
assertEquals("exclusion should be 32dp wide", dpToPxSize(32), exclusions.get(0).width());
}
@Test
@@ -96,11 +96,11 @@ public class AbsSeekBarTest {
mBar.setSystemGestureExclusionRects(Arrays.asList(new Rect(1, 2, 3, 4)));
mBar.setPadding(10, 10, 10, 10);
mBar.setThumb(newThumb(dpToPx(20)));
mBar.setThumb(newThumb(dpToPxSize(20)));
mBar.setMin(0);
mBar.setMax(100);
mBar.setProgress(50);
measureAndLayout(dpToPx(200), dpToPx(32));
measureAndLayout(dpToPxSize(200), dpToPxSize(32));
assertThat(mBar.getSystemGestureExclusionRects(), hasItem(new Rect(1, 2, 3, 4)));
assertThat(mBar.getSystemGestureExclusionRects(), hasSize(2));
@@ -130,7 +130,7 @@ public class AbsSeekBarTest {
mBar.layout(0, 0, wPx, hPx);
}
private int dpToPx(int dp) {
return (int) (mContext.getResources().getDisplayMetrics().density * dp);
private int dpToPxSize(int dp) {
return (int) (mContext.getResources().getDisplayMetrics().density * dp + 0.5f);
}
}