commit 8e9158af9f89e2a3ad4fe6d383d32cd80d9fe418
author Mikhail Naganov <mnaganov@google.com> Mon Nov 17 23:53:31 2014 +0000
committer The Android Automerger <android-build@google.com> Mon Nov 17 17:27:36 2014 -0800
tree 2b4b6c78b6a06df6831680fffd2fd0f989994709
parent c9cd4b66263697ddc227b012d96a90ead8d21d92

Restore zoom controls in HTMLViewer

WebSettings.setBuiltInZoomControls must be set to 'true' for zoom
controls and pinch-zooming to work. And then we need to call
WebSettings.setDisplayZoomControls(false) to leave only pinch-zoom.

Bug: 18403885
Change-Id: I549fc11673096046212f8c8efaf65824d1000ad7

src/com/android/htmlviewer/HTMLViewerActivity.java

diff --git a/src/com/android/htmlviewer/HTMLViewerActivity.java b/src/com/android/htmlviewer/HTMLViewerActivity.java
index 0de772d..8a945a9 100644
--- a/src/com/android/htmlviewer/HTMLViewerActivity.java
+++ b/src/com/android/htmlviewer/HTMLViewerActivity.java
@@ -60,6 +60,8 @@
         WebSettings s = mWebView.getSettings();
         s.setUseWideViewPort(true);
         s.setSupportZoom(true);
+        s.setBuiltInZoomControls(true);
+        s.setDisplayZoomControls(false);
         s.setSavePassword(false);
         s.setSaveFormData(false);
         s.setBlockNetworkLoads(true);