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

Commit 624c7ccf authored by Winson Chung's avatar Winson Chung
Browse files

Compute nearest frames after layout 

- The computation fetches the locations of the buttons which are not
  updated until after layout

Bug: 180881900
Test: atest NearestTouchFrameTest
Test: Rotate a few times and verify the deferred bounds are within
      the current display bounds
Change-Id: I8b40e6461c8c6c27198f20843c6d8fe73769f339
parent d549483e

packages/SystemUI/src/com/android/systemui/navigationbar/buttons/NearestTouchFrame.java

+3 −8
Original line number Diff line number Diff line
@@ -84,19 +84,14 @@ public class NearestTouchFrame extends FrameLayout { 
    }



    @Override

    protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {

        super.onMeasure(widthMeasureSpec, heightMeasureSpec);

    protected void onLayout(boolean changed, int left, int top, int right, int bottom) {

        super.onLayout(changed, left, top, right, bottom);

        mClickableChildren.clear();

        mAttachedChildren.clear();

        mTouchableRegions.clear();

        addClickableChildren(this);

        cacheClosestChildLocations();

    }



    @Override

    protected void onLayout(boolean changed, int left, int top, int right, int bottom) {

        super.onLayout(changed, left, top, right, bottom);

        getLocationInWindow(mOffset);

        cacheClosestChildLocations();

    }



    /**

packages/SystemUI/tests/src/com/android/systemui/navigationbar/buttons/NearestTouchFrameTest.java

+14 −16
Original line number Diff line number Diff line
@@ -69,7 +69,7 @@ public class NearestTouchFrameTest extends SysuiTestCase { 


        mNearestTouchFrame.addView(left);

        mNearestTouchFrame.addView(right);

        mNearestTouchFrame.onMeasure(0, 0);

        mNearestTouchFrame.layout(0, 0, 30, 30);



        MotionEvent ev = MotionEvent.obtain(0, 0, 0,

                12 /* x */, 5 /* y */, 0);
@@ -86,7 +86,7 @@ public class NearestTouchFrameTest extends SysuiTestCase { 


        mNearestTouchFrame.addView(left);

        mNearestTouchFrame.addView(right);

        mNearestTouchFrame.onMeasure(0, 0);

        mNearestTouchFrame.layout(0, 0, 30, 30);



        MotionEvent ev = MotionEvent.obtain(0, 0, 0,

                12 /* x */, 5 /* y */, 0);
@@ -105,7 +105,7 @@ public class NearestTouchFrameTest extends SysuiTestCase { 


        mNearestTouchFrame.addView(left);

        mNearestTouchFrame.addView(right);

        mNearestTouchFrame.onMeasure(0, 0);

        mNearestTouchFrame.layout(0, 0, 30, 30);



        // Would go to left view if attached, but goes to right instead as left should be detached.

        MotionEvent ev = MotionEvent.obtain(0, 0, 0,
@@ -122,7 +122,7 @@ public class NearestTouchFrameTest extends SysuiTestCase { 


        mNearestTouchFrame.addView(left);

        mNearestTouchFrame.addView(right);

        mNearestTouchFrame.onMeasure(0, 0);

        mNearestTouchFrame.layout(0, 0, 30, 30);



        MotionEvent ev = MotionEvent.obtain(0, 0, 0,

                12 /* x */, 5 /* y */, 0);
@@ -138,7 +138,7 @@ public class NearestTouchFrameTest extends SysuiTestCase { 


        mNearestTouchFrame.addView(left);

        mNearestTouchFrame.addView(right);

        mNearestTouchFrame.onMeasure(0, 0);

        mNearestTouchFrame.layout(0, 0, 30, 30);



        MotionEvent ev = MotionEvent.obtain(0, 0, 0,

                18 /* x */, 5 /* y */, 0);
@@ -154,7 +154,7 @@ public class NearestTouchFrameTest extends SysuiTestCase { 
        mNearestTouchFrame.setIsVertical(true);

        mNearestTouchFrame.addView(top);

        mNearestTouchFrame.addView(bottom);

        mNearestTouchFrame.onMeasure(0, 0);

        mNearestTouchFrame.layout(0, 0, 30, 30);



        MotionEvent ev = MotionEvent.obtain(0, 0, 0,

                5 /* x */, 12 /* y */, 0);
@@ -170,7 +170,7 @@ public class NearestTouchFrameTest extends SysuiTestCase { 
        mNearestTouchFrame.setIsVertical(true);

        mNearestTouchFrame.addView(top);

        mNearestTouchFrame.addView(bottom);

        mNearestTouchFrame.onMeasure(0, 0);

        mNearestTouchFrame.layout(0, 0, 30, 30);



        MotionEvent ev = MotionEvent.obtain(0, 0, 0,

                5 /* x */, 18 /* y */, 0);
@@ -184,7 +184,7 @@ public class NearestTouchFrameTest extends SysuiTestCase { 
        View view = mockViewAt(0, 20, 10, 10);

        when(view.isAttachedToWindow()).thenReturn(false);

        mNearestTouchFrame.addView(view);

        mNearestTouchFrame.onMeasure(0, 0);

        mNearestTouchFrame.layout(0, 0, 30, 30);



        MotionEvent ev = MotionEvent.obtain(0, 0, 0, 5 /* x */, 18 /* y */, 0);

        mNearestTouchFrame.onTouchEvent(ev);
@@ -201,7 +201,7 @@ public class NearestTouchFrameTest extends SysuiTestCase { 
        mNearestTouchFrame.addView(view1);

        mNearestTouchFrame.addView(view2);

        mNearestTouchFrame.addView(view3);

        mNearestTouchFrame.onMeasure(0, 0);

        mNearestTouchFrame.layout(0, 0, 30, 30);



        MotionEvent ev = MotionEvent.obtain(0, 0, 0, 5 /* x */, 18 /* y */, 0);

        mNearestTouchFrame.onTouchEvent(ev);
@@ -213,11 +213,9 @@ public class NearestTouchFrameTest extends SysuiTestCase { 
    public void testCachedRegionsSplit_horizontal() {

        View left = mockViewAt(0, 0, 5, 20);

        View right = mockViewAt(15, 0, 5, 20);

        mNearestTouchFrame.layout(0, 0, 20, 20);



        mNearestTouchFrame.addView(left);

        mNearestTouchFrame.addView(right);

        mNearestTouchFrame.onMeasure(0, 0);

        mNearestTouchFrame.layout(0, 0, 20, 20);



        Map<View, Rect> childRegions = mNearestTouchFrame.getFullTouchableChildRegions();

        assertEquals(2, childRegions.size());
@@ -231,12 +229,10 @@ public class NearestTouchFrameTest extends SysuiTestCase { 
    public void testCachedRegionsSplit_vertical() {

        View top = mockViewAt(0, 0, 20, 5);

        View bottom = mockViewAt(0, 15, 20, 5);

        mNearestTouchFrame.layout(0, 0, 20, 20);

        mNearestTouchFrame.setIsVertical(true);



        mNearestTouchFrame.addView(top);

        mNearestTouchFrame.addView(bottom);

        mNearestTouchFrame.onMeasure(0, 0);

        mNearestTouchFrame.setIsVertical(true);

        mNearestTouchFrame.layout(0, 0, 20, 20);



        Map<View, Rect> childRegions = mNearestTouchFrame.getFullTouchableChildRegions();

        assertEquals(2, childRegions.size());
@@ -256,6 +252,8 @@ public class NearestTouchFrameTest extends SysuiTestCase { 
        }).when(v).getLocationInWindow(any());

        when(v.isClickable()).thenReturn(true);

        when(v.isAttachedToWindow()).thenReturn(true);

        when(v.getWidth()).thenReturn(width);

        when(v.getHeight()).thenReturn(height);



        // Stupid final methods.

        v.setLeft(0);