diff options
| author | 2012-01-06 02:22:36 -0800 | |
|---|---|---|
| committer | 2012-01-06 02:22:36 -0800 | |
| commit | 017ad7cd567e511d28e7ae45f2b64fb39068f4f9 (patch) | |
| tree | 5cd59d6585dc5fd638c79f8de92c2dac5fe4cfa2 | |
| parent | 0b34fb7d32045886876be7a4ac6d75b753aebfb5 (diff) | |
| parent | 5883520fd7c9b3426d0fcc107f647f999a0a3232 (diff) | |
am 5883520f: Merge "Make WebView.HitTestResult static"
* commit '5883520fd7c9b3426d0fcc107f647f999a0a3232':
Make WebView.HitTestResult static
| -rw-r--r-- | api/16.txt | 2 | ||||
| -rw-r--r-- | api/current.txt | 2 | ||||
| -rw-r--r-- | core/java/android/webkit/WebView.java | 3 |
3 files changed, 3 insertions, 4 deletions
diff --git a/api/16.txt b/api/16.txt index 13fba29d2875..8e07844725c3 100644 --- a/api/16.txt +++ b/api/16.txt @@ -25259,7 +25259,7 @@ package android.webkit { field public static final java.lang.String SCHEME_TEL = "tel:"; } - public class WebView.HitTestResult { + public static class WebView.HitTestResult { method public java.lang.String getExtra(); method public int getType(); field public static final deprecated int ANCHOR_TYPE = 1; // 0x1 diff --git a/api/current.txt b/api/current.txt index db3b30d618b5..1f6ba1b3b921 100644 --- a/api/current.txt +++ b/api/current.txt @@ -25433,7 +25433,7 @@ package android.webkit { field public static final java.lang.String SCHEME_TEL = "tel:"; } - public class WebView.HitTestResult { + public static class WebView.HitTestResult { method public java.lang.String getExtra(); method public int getType(); field public static final deprecated int ANCHOR_TYPE = 1; // 0x1 diff --git a/core/java/android/webkit/WebView.java b/core/java/android/webkit/WebView.java index fa82c46e2f56..29af64efb281 100644 --- a/core/java/android/webkit/WebView.java +++ b/core/java/android/webkit/WebView.java @@ -952,8 +952,7 @@ public class WebView extends AbsoluteLayout public void onNewPicture(WebView view, Picture picture); } - // FIXME: Want to make this public, but need to change the API file. - public /*static*/ class HitTestResult { + public static class HitTestResult { /** * Default HitTestResult, where the target is unknown */ |