From d061f4ff15a4c16f672f1ea836a730c2165e4904 Mon Sep 17 00:00:00 2001 From: Evan Rosky Date: Tue, 14 Nov 2017 11:04:54 -0800 Subject: [PATCH] Fix focusfinder coretests beams are no-longer considered overlapping if edges touch. These coretests weren't updated to reflect that. Bug: 67467972 Test: android.view.FocusFinderTest Change-Id: Ibc1535c1b232fe1c42104ff8970b371fbc8a7c25 --- .../coretests/src/android/view/FocusFinderTest.java | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/core/tests/coretests/src/android/view/FocusFinderTest.java b/core/tests/coretests/src/android/view/FocusFinderTest.java index 6f1dd7c40184..2732a04b44d5 100644 --- a/core/tests/coretests/src/android/view/FocusFinderTest.java +++ b/core/tests/coretests/src/android/view/FocusFinderTest.java @@ -117,8 +117,8 @@ public class FocusFinderTest extends AndroidTestCase { // at edge rect2.offset(0, 1); - assertBeamsOverlap(View.FOCUS_LEFT, rect1, rect2); - assertBeamsOverlap(View.FOCUS_RIGHT, rect1, rect2); + assertBeamsDontOverlap(View.FOCUS_LEFT, rect1, rect2); + assertBeamsDontOverlap(View.FOCUS_RIGHT, rect1, rect2); // just beyond rect2.offset(0, 1); @@ -133,8 +133,8 @@ public class FocusFinderTest extends AndroidTestCase { // at top edge rect2.offset(0, -1); - assertBeamsOverlap(View.FOCUS_LEFT, rect1, rect2); - assertBeamsOverlap(View.FOCUS_RIGHT, rect1, rect2); + assertBeamsDontOverlap(View.FOCUS_LEFT, rect1, rect2); + assertBeamsDontOverlap(View.FOCUS_RIGHT, rect1, rect2); // just beyond top edge rect2.offset(0, -1); @@ -154,8 +154,8 @@ public class FocusFinderTest extends AndroidTestCase { // at edge rect2.offset(1, 0); - assertBeamsOverlap(View.FOCUS_UP, rect1, rect2); - assertBeamsOverlap(View.FOCUS_DOWN, rect1, rect2); + assertBeamsDontOverlap(View.FOCUS_UP, rect1, rect2); + assertBeamsDontOverlap(View.FOCUS_DOWN, rect1, rect2); // just beyond rect2.offset(1, 0); @@ -170,8 +170,8 @@ public class FocusFinderTest extends AndroidTestCase { // at edge rect2.offset(-1, 0); - assertBeamsOverlap(View.FOCUS_UP, rect1, rect2); - assertBeamsOverlap(View.FOCUS_DOWN, rect1, rect2); + assertBeamsDontOverlap(View.FOCUS_UP, rect1, rect2); + assertBeamsDontOverlap(View.FOCUS_DOWN, rect1, rect2); // just beyond edge rect2.offset(-1, 0); @@ -445,7 +445,7 @@ public class FocusFinderTest extends AndroidTestCase { assertBetterCandidate(View.FOCUS_LEFT, // L T R B new Rect(150, 0, 200, 50), // src - new Rect(0, 50, 50, 50), // better, (way further, but in beam) + new Rect(0, 0, 50, 50), // better, (way further, but in beam) new Rect(49, 99, 149, 101)); // worse, even though it is closer } -- 2.11.0