diff options
| author | 2017-04-28 01:20:25 +0000 | |
|---|---|---|
| committer | 2017-04-28 01:20:32 +0000 | |
| commit | a7045f59e05f46c9a55668c9f7430b967e98beb5 (patch) | |
| tree | 525f91ab741e96a2f269c0641926669a77abc09f | |
| parent | a896d6abf4f56711ce5213f3dab0ee932f7b812b (diff) | |
| parent | 5544f6c63b619fcf69beb15ffc691c8da11ed794 (diff) | |
Merge "Hide onMovedToDisplay for WebView" into oc-dev
| -rw-r--r-- | api/current.txt | 1 | ||||
| -rw-r--r-- | api/system-current.txt | 1 | ||||
| -rw-r--r-- | api/test-current.txt | 1 | ||||
| -rw-r--r-- | core/java/android/webkit/WebView.java | 1 |
4 files changed, 1 insertions, 3 deletions
diff --git a/api/current.txt b/api/current.txt index 223b967565f1..307eb5cf4409 100644 --- a/api/current.txt +++ b/api/current.txt @@ -48932,7 +48932,6 @@ package android.webkit { method public deprecated void onChildViewAdded(android.view.View, android.view.View); method public deprecated void onChildViewRemoved(android.view.View, android.view.View); method public deprecated void onGlobalFocusChanged(android.view.View, android.view.View); - method public void onMovedToDisplay(int, android.content.res.Configuration); method public void onPause(); method public void onResume(); method public deprecated boolean overlayHorizontalScrollbar(); diff --git a/api/system-current.txt b/api/system-current.txt index cbc70cc409d6..d21dc2714baa 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -52614,7 +52614,6 @@ package android.webkit { method public deprecated void onChildViewAdded(android.view.View, android.view.View); method public deprecated void onChildViewRemoved(android.view.View, android.view.View); method public deprecated void onGlobalFocusChanged(android.view.View, android.view.View); - method public void onMovedToDisplay(int, android.content.res.Configuration); method public void onPause(); method public void onResume(); method public deprecated boolean overlayHorizontalScrollbar(); diff --git a/api/test-current.txt b/api/test-current.txt index 3231578e061c..8896e16ec67e 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -49311,7 +49311,6 @@ package android.webkit { method public deprecated void onChildViewAdded(android.view.View, android.view.View); method public deprecated void onChildViewRemoved(android.view.View, android.view.View); method public deprecated void onGlobalFocusChanged(android.view.View, android.view.View); - method public void onMovedToDisplay(int, android.content.res.Configuration); method public void onPause(); method public void onResume(); method public deprecated boolean overlayHorizontalScrollbar(); diff --git a/core/java/android/webkit/WebView.java b/core/java/android/webkit/WebView.java index 8a441fc8451b..52c82a71fb7e 100644 --- a/core/java/android/webkit/WebView.java +++ b/core/java/android/webkit/WebView.java @@ -2508,6 +2508,7 @@ public class WebView extends AbsoluteLayout super.onDetachedFromWindowInternal(); } + /** @hide */ @Override public void onMovedToDisplay(int displayId, Configuration config) { mProvider.getViewDelegate().onMovedToDisplay(displayId, config); |