Merge "add more alt key acceleration in webview" into honeycomb (b74e32cc) · Commits · e / os / android_frameworks_base

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);