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

Commit 8eb8a32f authored by Jorim Jaggi's avatar Jorim Jaggi
Browse files

Fix divider touchable region 

Make sure to update the touchable region whenever the layout
changes. The layout is wrong if the window is invisible during
the first layout.

Bug: 27854148
Change-Id: Ic0501eccf7b919d10491c6f5aa0c0f1765a07c52
parent 255490c3

packages/SystemUI/src/com/android/systemui/stackdivider/DividerView.java

+9 −10
Original line number Diff line number Diff line
@@ -240,16 +240,6 @@ public class DividerView extends FrameLayout implements OnTouchListener, 
    protected void onAttachedToWindow() {

        super.onAttachedToWindow();

        EventBus.getDefault().register(this);

        getViewTreeObserver().addOnGlobalLayoutListener(new OnGlobalLayoutListener() {



            @Override

            public void onGlobalLayout() {

                getViewTreeObserver().removeOnGlobalLayoutListener(this);

                mWindowManagerProxy.setTouchRegion(new Rect(mHandle.getLeft(), mHandle.getTop(),

                        mHandle.getLeft() + mHandle.getWidth(),

                        mHandle.getTop() + mHandle.getHeight()));

            }

        });

    }



    @Override
@@ -274,6 +264,15 @@ public class DividerView extends FrameLayout implements OnTouchListener, 
        return super.onApplyWindowInsets(insets);

    }



    @Override

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

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

        if (changed) {

            mWindowManagerProxy.setTouchRegion(new Rect(mHandle.getLeft(), mHandle.getTop(),

                    mHandle.getRight(), mHandle.getBottom()));

        }

    }



    public void setWindowManager(DividerWindowManager windowManager) {

        mWindowManager = windowManager;

    }