Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am d97d4f6c: Merge "Only open CAB for long-press." into jb-dev

Browse Source 
* commit 'd97d4f6cf642663375de59668f5d42ee12ee7a69':
  Only open CAB for long-press.
This commit is contained in:
George Mount
2012-05-15 13:27:13 -07:00
committed by Android Git Automerger
parent ef2f0dfb48 d97d4f6cf6
commit 9b0ec73d52
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/android/webkit/WebViewClassic.java
View File

@@ -7986,7 +7986,9 @@ public final class WebViewClassic implements WebViewProvider, WebViewProvider.Sc
}
nativeSetTextSelection(mNativeClass, data.mSelectTextPtr);
if (data.mSelectionReason == TextSelectionData.REASON_ACCESSIBILITY_INJECTOR) {
if ((data.mSelectionReason == TextSelectionData.REASON_ACCESSIBILITY_INJECTOR)
|| (!mSelectingText
&& data.mSelectionReason != TextSelectionData.REASON_SELECT_WORD)) {
selectionDone();
mShowTextSelectionExtra = true;
invalidate();

6
core/java/android/webkit/WebViewCore.java
View File

@@ -22,7 +22,6 @@ import android.content.pm.PackageManager.NameNotFoundException;
import android.database.Cursor;
import android.graphics.Point;
import android.graphics.Rect;
import android.graphics.Region;
import android.media.MediaFile;
import android.net.ProxyProperties;
import android.net.Uri;
@@ -864,6 +863,7 @@ public final class WebViewCore {
static class TextSelectionData {
static final int REASON_UNKNOWN = 0;
static final int REASON_ACCESSIBILITY_INJECTOR = 1;
static final int REASON_SELECT_WORD = 2;
public TextSelectionData(int start, int end, int selectTextPtr) {
mStart = start;
mEnd = end;
@@ -1718,12 +1718,16 @@ public final class WebViewCore {
break;
}
case SELECT_WORD_AT: {
mTextSelectionChangeReason
= TextSelectionData.REASON_SELECT_WORD;
int x = msg.arg1;
int y = msg.arg2;
if (!nativeSelectWordAt(mNativeClass, x, y)) {
mWebViewClassic.mPrivateHandler.obtainMessage(WebViewClassic.SHOW_CARET_HANDLE)
.sendToTarget();
}
mTextSelectionChangeReason
= TextSelectionData.REASON_UNKNOWN;
break;
}
case SELECT_ALL: