am debb5bbe: Merge "Add public API for on screen zoom controls" into honeycomb

* commit 'debb5bbe816ce764ecda73eabc17c31fd59fbe3e':
  Add public API for on screen zoom controls

api/current.xml

@@ -236246,6 +236246,17 @@
  visibility="public"
 >
 </method>
+<method name="getDisplayZoomControls"
+ return="boolean"
+ abstract="false"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
 <method name="getDomStorageEnabled"
  return="boolean"
  abstract="false"
@@ -236740,6 +236751,19 @@
 <parameter name="zoom" type="android.webkit.WebSettings.ZoomDensity">
 </parameter>
 </method>
+<method name="setDisplayZoomControls"
+ return="void"
+ abstract="false"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="enabled" type="boolean">
+</parameter>
+</method>
 <method name="setDomStorageEnabled"
  return="void"
  abstract="false"

core/java/android/webkit/WebSettings.java

@@ -571,7 +571,6 @@ public class WebSettings {
      * A combination of built in zoom controls enabled
      * and on screen zoom controls disabled allows for pinch to zoom
      * to work without the on screen controls
-     * @hide
      */
     public void setDisplayZoomControls(boolean enabled) {
         mDisplayZoomControls = enabled;
@@ -580,7 +579,6 @@ public class WebSettings {
 
     /**
      * Returns true if the on screen zoom buttons are being used.
-     * @hide
      */
     public boolean getDisplayZoomControls() {
         return mDisplayZoomControls;