Niedzielski has uploaded a new change for review. https://gerrit.wikimedia.org/r/292063
Change subject: Enable pinch to zoom ...................................................................... Enable pinch to zoom Not a perfectly smooth experience but nothing seems to break and it lets the user get up close when they really need to. Bug: T120730 Change-Id: Id7bfaef3f61a7cb4b578110110319eef514fe4ef --- M app/src/main/assets/index.html M app/src/main/java/org/wikipedia/page/PageFragment.java M www/index.html 3 files changed, 5 insertions(+), 4 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia refs/changes/63/292063/1 diff --git a/app/src/main/assets/index.html b/app/src/main/assets/index.html index d85ed02..db61117 100644 --- a/app/src/main/assets/index.html +++ b/app/src/main/assets/index.html @@ -4,10 +4,10 @@ <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, user-scalable=no" /> + <meta name="viewport" content="width=device-width, initial-scale=1" /> </head> <body class="stable"> <div id="content" class="content"></div> <div id="loading_sections"></div> </body> -</html> \ No newline at end of file +</html> diff --git a/app/src/main/java/org/wikipedia/page/PageFragment.java b/app/src/main/java/org/wikipedia/page/PageFragment.java index a58905c..465fd54 100755 --- a/app/src/main/java/org/wikipedia/page/PageFragment.java +++ b/app/src/main/java/org/wikipedia/page/PageFragment.java @@ -208,6 +208,7 @@ webView = (ObservableWebView) rootView.findViewById(R.id.page_web_view); initWebViewListeners(); + webView.getSettings().setBuiltInZoomControls(true); tocDrawer = (WikiDrawerLayout) rootView.findViewById(R.id.page_toc_drawer); tocDrawer.setDragEdgeWidth(getResources().getDimensionPixelSize(R.dimen.drawer_drag_margin)); diff --git a/www/index.html b/www/index.html index d85ed02..db61117 100644 --- a/www/index.html +++ b/www/index.html @@ -4,10 +4,10 @@ <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, user-scalable=no" /> + <meta name="viewport" content="width=device-width, initial-scale=1" /> </head> <body class="stable"> <div id="content" class="content"></div> <div id="loading_sections"></div> </body> -</html> \ No newline at end of file +</html> -- To view, visit https://gerrit.wikimedia.org/r/292063 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id7bfaef3f61a7cb4b578110110319eef514fe4ef Gerrit-PatchSet: 1 Gerrit-Project: apps/android/wikipedia Gerrit-Branch: master Gerrit-Owner: Niedzielski <sniedziel...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits