Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 76c97428 authored by Martin Kosiba's avatar Martin Kosiba Committed by Android (Google) Code Review
Browse files

Merge "Change WebView.zoomBy return type to void." into lmp-dev

parents acdc602f 3a82acdb

api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -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=";

core/java/android/webkit/WebView.java

+2 −4
Original line number Diff line number Diff line
@@ -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);

    }



    /**