drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "add more alt key acceleration in webview" into honeycomb

Browse Source
This commit is contained in:
Cary Clark
2011-01-10 09:55:54 -08:00
committed by Android (Google) Code Review
parent 36fd7a39ca a3ee56f4ae
commit b74e32cc7d
1 changed files with 42 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
core/java/android/webkit/WebView.java
View File

@ -4573,12 +4573,32 @@ public class WebView extends AbsoluteLayout
}
if (keyCode == KeyEvent.KEYCODE_PAGE_UP) {
pageUp(false);
return true;
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) {
pageDown(false);
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;
}
@ -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);