Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 32866527 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fix focusfinder coretests"

parents a794deb3 d061f4ff

core/tests/coretests/src/android/view/FocusFinderTest.java

+9 −9
Original line number Diff line number Diff line
@@ -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 

    }