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

Commit a3ee56f4 authored by Cary Clark's avatar Cary Clark
Browse files

add more alt key acceleration in webview 

Make key accceleration exact; if alt is required,
allow only alt, and so on.

Also, set the touch point when nav'ing with the arrows
or trackball so that context menus have a point to
work with.

bug:3301564
bug:3241968
Change-Id: I574ce145941e84ac0934efd323d9db71eec11663
parent 8733bea4

core/java/android/webkit/WebView.java

+42 −3
Original line number Diff line number Diff line
@@ -4573,13 +4573,33 @@ public class WebView extends AbsoluteLayout 
        }



        if (keyCode == KeyEvent.KEYCODE_PAGE_UP) {

            if (event.hasNoModifiers()) {

                pageUp(false);

                return true;

            } else if (event.hasModifiers(KeyEvent.META_ALT_ON)) {

                pageUp(true);

                return true;

            }

        }



        if (keyCode == KeyEvent.KEYCODE_PAGE_DOWN) {

            if (event.hasNoModifiers()) {

                pageDown(false);

                return true;

            } else if (event.hasModifiers(KeyEvent.META_ALT_ON)) {

                pageDown(true);

                return true;

            }

        }



        if (keyCode == KeyEvent.KEYCODE_MOVE_HOME && event.hasNoModifiers()) {

            pageUp(true);

            return true;

        }



        if (keyCode == KeyEvent.KEYCODE_MOVE_END && event.hasNoModifiers()) {

            pageDown(true);

            return true;

        }



        if (keyCode >= KeyEvent.KEYCODE_DPAD_UP
@@ -4589,6 +4609,22 @@ public class WebView extends AbsoluteLayout 
                letPageHandleNavKey(keyCode, event.getEventTime(), true, event.getMetaState());

                return true;

            }

            if (event.hasModifiers(KeyEvent.META_ALT_ON)) {

                switch (keyCode) {

                    case KeyEvent.KEYCODE_DPAD_UP:

                        pageUp(true);

                        return true;

                    case KeyEvent.KEYCODE_DPAD_DOWN:

                        pageDown(true);

                        return true;

                    case KeyEvent.KEYCODE_DPAD_LEFT:

                        nativeClearCursor(); // start next trackball movement from page edge

                        return pinScrollTo(0, mScrollY, true, 0);

                    case KeyEvent.KEYCODE_DPAD_RIGHT:

                        nativeClearCursor(); // start next trackball movement from page edge

                        return pinScrollTo(mContentWidth, mScrollY, true, 0);

                }

            }

            if (mSelectingText) {

                int xRate = keyCode == KeyEvent.KEYCODE_DPAD_LEFT

                    ? -1 : keyCode == KeyEvent.KEYCODE_DPAD_RIGHT ? 1 : 0;
@@ -7947,6 +7983,9 @@ public class WebView extends AbsoluteLayout 
        Rect contentCursorRingBounds = nativeGetCursorRingBounds();

        if (contentCursorRingBounds.isEmpty()) return keyHandled;

        Rect viewCursorRingBounds = contentToViewRect(contentCursorRingBounds);

        // set last touch so that context menu related functions will work

        mLastTouchX = (viewCursorRingBounds.left + viewCursorRingBounds.right) / 2;

        mLastTouchY = (viewCursorRingBounds.top + viewCursorRingBounds.bottom) / 2;

        Rect visRect = new Rect();

        calcOurVisibleRect(visRect);

        Rect outset = new Rect(visRect);