diff options
| author | Martin Kosiba <mkosiba@google.com> | 2014-09-05 13:44:32 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-09-05 13:44:34 +0000 |
| commit | 76c974286226b32c392222525d46008138e0ba23 (patch) | |
| tree | 7d4b291f3270e2c41965c56a2c942694312458e8 | |
| parent | acdc602f184d8d83ff31ef2a94fc9eca761e0ea4 (diff) | |
| parent | 3a82acdbf647c1b3b3a8720b852ad7ec352fd793 (diff) | |
| download | frameworks_base-76c974286226b32c392222525d46008138e0ba23.zip frameworks_base-76c974286226b32c392222525d46008138e0ba23.tar.gz frameworks_base-76c974286226b32c392222525d46008138e0ba23.tar.bz2 | |
Merge "Change WebView.zoomBy return type to void." into lmp-dev
| -rw-r--r-- | api/current.txt | 2 | ||||
| -rw-r--r-- | core/java/android/webkit/WebView.java | 6 |
2 files changed, 3 insertions, 5 deletions
diff --git a/api/current.txt b/api/current.txt index 4459056..e75cc90 100644 --- a/api/current.txt +++ b/api/current.txt @@ -36827,7 +36827,7 @@ package android.webkit { method public void setWebViewClient(android.webkit.WebViewClient); method public deprecated boolean showFindDialog(java.lang.String, boolean); method public void stopLoading(); - method public boolean zoomBy(float); + method public void zoomBy(float); method public boolean zoomIn(); method public boolean zoomOut(); field public static final java.lang.String SCHEME_GEO = "geo:0,0?q="; diff --git a/core/java/android/webkit/WebView.java b/core/java/android/webkit/WebView.java index edfa7af..081bfdf 100644 --- a/core/java/android/webkit/WebView.java +++ b/core/java/android/webkit/WebView.java @@ -1939,16 +1939,14 @@ public class WebView extends AbsoluteLayout * * @param zoomFactor the zoom factor to apply. The zoom factor will be clamped to the Webview's * zoom limits. This value must be in the range 0.01 to 100.0 inclusive. - * - * @return false if no zoom changes, true otherwise. */ - public boolean zoomBy(float zoomFactor) { + public void zoomBy(float zoomFactor) { checkThread(); if (zoomFactor < 0.01) throw new IllegalArgumentException("zoomFactor must be greater than 0.01."); if (zoomFactor > 100.0) throw new IllegalArgumentException("zoomFactor must be less than 100."); - return mProvider.zoomBy(zoomFactor); + mProvider.zoomBy(zoomFactor); } /** |