auto import from //branches/cupcake_rel/...@140373

1 files changed, 15 insertions, 0 deletions

diff --git a/core/java/android/webkit/WebSettings.java b/core/java/android/webkit/WebSettings.java
index 65544d450f36..025e6bb819cc 100644
--- a/core/java/android/webkit/WebSettings.java
+++ b/core/java/android/webkit/WebSettings.java
@@ -153,6 +153,7 @@ public class WebSettings {
     private boolean         mNeedInitialFocus = true;
     private boolean         mNavDump = false;
     private boolean         mSupportZoom = true;
+    private boolean         mBuiltInZoomControls = false;
     private boolean         mAllowFileAccess = true;
 
     // Class to handle messages before WebCore is ready.
@@ -364,6 +365,20 @@ public class WebSettings {
     }
 
     /**
+     * Sets whether the zoom mechanism built into WebView is used.
+     */
+    public void setBuiltInZoomControls(boolean enabled) {
+        mBuiltInZoomControls = enabled;
+    }
+    
+    /**
+     * Returns true if the zoom mechanism built into WebView is being used.
+     */
+    public boolean getBuiltInZoomControls() {
+        return mBuiltInZoomControls;
+    }
+    
+    /**
      * Enable or disable file access within WebView. File access is enabled by
      * default.
      */