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

Commit 627eca9b authored by Derek Sollenberger's avatar Derek Sollenberger Committed by Android (Google) Code Review
Browse files

Merge "Update EmbeddedZoomControl to use new ZoomManager methods."

parents 5c1c29a1 af39e4b8

core/java/android/webkit/ZoomControlEmbedded.java

+2 −3
Original line number Diff line number Diff line
@@ -67,9 +67,8 @@ class ZoomControlEmbedded implements ZoomControlBase { 
            return;

        }



        boolean canZoomIn = mWebView.getScale() < mZoomManager.mMaxZoomScale;

        boolean canZoomOut = mWebView.getScale() > mZoomManager.mMinZoomScale &&

                                                  !mZoomManager.mInZoomOverview;

        boolean canZoomIn = mZoomManager.canZoomIn();

        boolean canZoomOut = mZoomManager.canZoomOut() && !mZoomManager.mInZoomOverview;

        if (!canZoomIn && !canZoomOut) {

            // Hide the zoom in and out buttons if the page cannot zoom

            mZoomButtonsController.getZoomControls().setVisibility(View.GONE);