commit 3ad9f99e685393bfa2925046f4ec070fd25bd839
author Mikhail Naganov <mnaganov@google.com> Tue Nov 18 20:18:20 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue Nov 18 20:18:20 2014 +0000
tree 2b4b6c78b6a06df6831680fffd2fd0f989994709
parent 515761c04150f40b68403d5dc02017325be520c1
parent 50278dabb69191ed8605164936081a1701256cdd

am 50278dab: Restore zoom controls in HTMLViewer

* commit '50278dabb69191ed8605164936081a1701256cdd':
  Restore zoom controls in HTMLViewer

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);