Merge "Unhide setPictureListener" into jb-mr1-dev

joth76 · Android (Google) Code Review · commit 402099f7861f · 2012-10-11T15:41:39.000-07:00
diff --git a/api/17.txt b/api/17.txt
@@ -27448,6 +27448,7 @@ package android.webkit {
     method public void setInitialScale(int);
     method public deprecated void setMapTrackballToArrowKeys(boolean);
     method public void setNetworkAvailable(boolean);
+    method public deprecated void setPictureListener(android.webkit.WebView.PictureListener);
     method public void setVerticalScrollbarOverlay(boolean);
     method public void setWebChromeClient(android.webkit.WebChromeClient);
     method public void setWebViewClient(android.webkit.WebViewClient);
diff --git a/api/current.txt b/api/current.txt
@@ -27448,6 +27448,7 @@ package android.webkit {
     method public void setInitialScale(int);
     method public deprecated void setMapTrackballToArrowKeys(boolean);
     method public void setNetworkAvailable(boolean);
+    method public deprecated void setPictureListener(android.webkit.WebView.PictureListener);
     method public void setVerticalScrollbarOverlay(boolean);
     method public void setWebChromeClient(android.webkit.WebChromeClient);
     method public void setWebViewClient(android.webkit.WebViewClient);
diff --git a/core/java/android/webkit/WebView.java b/core/java/android/webkit/WebView.java
@@ -1480,7 +1480,6 @@ public void setWebChromeClient(WebChromeClient client) {
      *
      * @param listener an implementation of WebView.PictureListener
      * @deprecated This method is now obsolete.
-     * @hide Since API level {@link android.os.Build.VERSION_CODES#JELLY_BEAN_MR1}
      */
     @Deprecated
     public void setPictureListener(PictureListener listener) {

Original file line number	Diff line number	Diff line change
`@@ -1480,7 +1480,6 @@ public void setWebChromeClient(WebChromeClient client) {`
`1480`	`1480`	`*`
`1481`	`1481`	`* @param listener an implementation of WebView.PictureListener`
`1482`	`1482`	`* @deprecated This method is now obsolete.`
`1483`		`- * @hide Since API level {@link android.os.Build.VERSION_CODES#JELLY_BEAN_MR1}`
`1484`	`1483`	`*/`
`1485`	`1484`	`@Deprecated`
`1486`	`1485`	`public void setPictureListener(PictureListener listener) {`