Merge "Hide WebView.getZoomControls()"

Author: Jonathan Dixon

api/16.txt

@@ -25204,7 +25204,6 @@ package android.webkit {
     method public java.lang.String getTitle();
     method public java.lang.String getUrl();
     method public deprecated int getVisibleTitleHeight();
-    method public deprecated android.view.View getZoomControls();
     method public void goBack();
     method public void goBackOrForward(int);
     method public void goForward();

api/current.txt

@@ -25796,7 +25796,6 @@ package android.webkit {
     method public java.lang.String getTitle();
     method public java.lang.String getUrl();
     method public deprecated int getVisibleTitleHeight();
-    method public deprecated android.view.View getZoomControls();
     method public void goBack();
     method public void goBackOrForward(int);
     method public void goForward();

core/java/android/webkit/WebView.java

@@ -1539,6 +1539,7 @@ public void flingScroll(int vx, int vy) {
      *
      * @deprecated The built-in zoom mechanism is preferred, see
      *             {@link WebSettings#setBuiltInZoomControls(boolean)}.
+     * @hide since API version 16.
      */
     @Deprecated
     public View getZoomControls() {