Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Update WebView#PictureListener for JBMR2." into jb-mr2-dev

Browse Source
This commit is contained in:
Ben Murdoch
2013-02-27 11:40:05 +00:00
committed by Android (Google) Code Review
parent d9731a57c6 52643e0ceb
commit 0e2f22a42b
2 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/java/android/webkit/WebView.java
View File

@@ -334,8 +334,9 @@ public class WebView extends AbsoluteLayout
* See {@link WebView#capturePicture} for details of the picture.
*
* @param view the WebView that owns the picture
* @param picture the new picture. Applications targetting Jelly
* Bean MR2 or above will always receive a null Picture.
* @param picture the new picture. Applications targeting
* {@link android.os.Build.VERSION_CODES#JELLY_BEAN_MR2} or above
* will always receive a null Picture.
* @deprecated Deprecated due to internal changes.
*/
@Deprecated

8
core/java/android/webkit/WebViewClassic.java
View File

@@ -7909,10 +7909,8 @@ public final class WebViewClassic implements WebViewProvider, WebViewProvider.Sc
if (mPictureListener != null) {
// trigger picture listener for hardware layers. Software layers are
// triggered in setNewPicture
// TODO: Update CUR_DEVELOPMENT when appropriate JBMR2 constant is
// available.
Picture picture = mContext.getApplicationInfo().targetSdkVersion <
Build.VERSION_CODES.CUR_DEVELOPMENT ? capturePicture() : null;
Build.VERSION_CODES.JELLY_BEAN_MR2 ? capturePicture() : null;
mPictureListener.onNewPicture(getWebView(), picture);
}
}
@@ -7998,10 +7996,8 @@ public final class WebViewClassic implements WebViewProvider, WebViewProvider.Sc
|| mWebView.getLayerType() == View.LAYER_TYPE_SOFTWARE) {
// trigger picture listener for software layers. Hardware layers are
// triggered in pageSwapCallback
// TODO: Update CUR_DEVELOPMENT when appropriate JBMR2 constant is
// available.
Picture picture = mContext.getApplicationInfo().targetSdkVersion <
Build.VERSION_CODES.CUR_DEVELOPMENT ? capturePicture() : null;
Build.VERSION_CODES.JELLY_BEAN_MR2 ? capturePicture() : null;
mPictureListener.onNewPicture(getWebView(), picture);
}
}