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

Merge "Fix HitTest type detection"

Browse Source
This commit is contained in:
John Reck
2012-02-24 10:22:56 -08:00
committed by Android (Google) Code Review
parent 64c2263428 59265e896a
commit 0d4134834e
1 changed files with 28 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -9238,6 +9238,30 @@ public class WebView extends AbsoluteLayout
}
}
private void setHitTestTypeFromUrl(String url) {
String substr = null;
if (url.startsWith(SCHEME_GEO)) {
mInitialHitTestResult.mType = HitTestResult.GEO_TYPE;
substr = url.substring(SCHEME_GEO.length());
} else if (url.startsWith(SCHEME_TEL)) {
mInitialHitTestResult.mType = HitTestResult.PHONE_TYPE;
substr = url.substring(SCHEME_TEL.length());
} else if (url.startsWith(SCHEME_MAILTO)) {
mInitialHitTestResult.mType = HitTestResult.EMAIL_TYPE;
substr = url.substring(SCHEME_MAILTO.length());
} else {
mInitialHitTestResult.mType = HitTestResult.SRC_ANCHOR_TYPE;
mInitialHitTestResult.mExtra = url;
return;
}
try {
mInitialHitTestResult.mExtra = URLDecoder.decode(substr, "UTF-8");
} catch (Throwable e) {
Log.w(LOGTAG, "Failed to decode URL! " + substr, e);
mInitialHitTestResult.mType = HitTestResult.UNKNOWN_TYPE;
}
}
private void setHitTestResult(WebKitHitTest hit) {
if (hit == null) {
mInitialHitTestResult = null;
@@ -9245,9 +9269,9 @@ public class WebView extends AbsoluteLayout
}
mInitialHitTestResult = new HitTestResult();
if (hit.mLinkUrl != null) {
mInitialHitTestResult.mType = HitTestResult.SRC_ANCHOR_TYPE;
mInitialHitTestResult.mExtra = hit.mLinkUrl;
if (hit.mImageUrl != null) {
setHitTestTypeFromUrl(hit.mLinkUrl);
if (hit.mImageUrl != null
&& mInitialHitTestResult.mType == HitTestResult.SRC_ANCHOR_TYPE) {
mInitialHitTestResult.mType = HitTestResult.SRC_IMAGE_ANCHOR_TYPE;
mInitialHitTestResult.mExtra = hit.mImageUrl;
}
@@ -9257,25 +9281,7 @@ public class WebView extends AbsoluteLayout
} else if (hit.mEditable) {
mInitialHitTestResult.mType = HitTestResult.EDIT_TEXT_TYPE;
} else if (hit.mIntentUrl != null) {
String substr = null;
if (hit.mIntentUrl.startsWith(SCHEME_GEO)) {
mInitialHitTestResult.mType = HitTestResult.GEO_TYPE;
substr = hit.mIntentUrl.substring(SCHEME_GEO.length());
} else if (hit.mIntentUrl.startsWith(SCHEME_TEL)) {
mInitialHitTestResult.mType = HitTestResult.PHONE_TYPE;
substr = hit.mIntentUrl.substring(SCHEME_TEL.length());
} else if (hit.mIntentUrl.startsWith(SCHEME_MAILTO)) {
mInitialHitTestResult.mType = HitTestResult.EMAIL_TYPE;
substr = hit.mIntentUrl.substring(SCHEME_MAILTO.length());
} else {
return;
}
try {
mInitialHitTestResult.mExtra = URLDecoder.decode(substr, "UTF-8");
} catch (Throwable e) {
Log.w(LOGTAG, "Failed to decode GEO URL!", e);
mInitialHitTestResult.mType = HitTestResult.UNKNOWN_TYPE;
}
setHitTestTypeFromUrl(hit.mIntentUrl);
}
}