jenkins-bot has submitted this change and it was merged.

Change subject: Remove pinch-zoom in the WebView.
......................................................................


Remove pinch-zoom in the WebView.

Finally figured out (I think) why find-in-page was randomly zooming the page by 
small amounts.

Change-Id: Idd57d9d7264b9c530b7e461ad26f7ecf30f586ba
---
M wikipedia/assets/index.html
M wikipedia/src/main/java/org/wikipedia/page/PageViewFragmentInternal.java
2 files changed, 1 insertion(+), 7 deletions(-)

Approvals:
  BearND: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/wikipedia/assets/index.html b/wikipedia/assets/index.html
index 3130185..5ca4005 100644
--- a/wikipedia/assets/index.html
+++ b/wikipedia/assets/index.html
@@ -4,7 +4,7 @@
     <base href="https://wikipedia.org"; /> <!-- Force links to resolve with 
https as protocol, rather than file:// -->
     <script src="file:///android_asset/bundle.js"></script>
 
-    <meta name="viewport" content="width=device-width, initial-scale=1.0, 
user-scalable=yes, minimum-scale=0.25, maximum-scale=1.6" />
+    <meta name="viewport" content="width=device-width, user-scalable=no" />
 </head>
 <body>
 <div id="content" class="content"></div>
diff --git 
a/wikipedia/src/main/java/org/wikipedia/page/PageViewFragmentInternal.java 
b/wikipedia/src/main/java/org/wikipedia/page/PageViewFragmentInternal.java
index 14f6eb7..f3d66b0 100644
--- a/wikipedia/src/main/java/org/wikipedia/page/PageViewFragmentInternal.java
+++ b/wikipedia/src/main/java/org/wikipedia/page/PageViewFragmentInternal.java
@@ -284,12 +284,6 @@
 
         connectionIssueFunnel = new ConnectionIssueFunnel(app);
 
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB) {
-            // Enable Pinch-Zoom
-            webView.getSettings().setBuiltInZoomControls(true);
-            webView.getSettings().setDisplayZoomControls(false);
-        }
-
         updateFontSize();
 
         // Explicitly set background color of the WebView (independently of 
CSS, because

-- 
To view, visit https://gerrit.wikimedia.org/r/171850
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Idd57d9d7264b9c530b7e461ad26f7ecf30f586ba
Gerrit-PatchSet: 3
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Dbrant <[email protected]>
Gerrit-Reviewer: BearND <[email protected]>
Gerrit-Reviewer: Brion VIBBER <[email protected]>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to