Merge "Added onMovedToDisplay method to WebView" into oc-dev

api/system-current.txt

@@ -52944,6 +52944,7 @@ package android.webkit {
     method public abstract boolean onKeyMultiple(int, int, android.view.KeyEvent);
     method public abstract boolean onKeyUp(int, android.view.KeyEvent);
     method public abstract void onMeasure(int, int);
+    method public default void onMovedToDisplay(int, android.content.res.Configuration);
     method public abstract void onOverScrolled(int, int, boolean, boolean);
     method public default void onProvideAutofillVirtualStructure(android.view.ViewStructure, int);
     method public abstract void onProvideVirtualStructure(android.view.ViewStructure);

core/java/android/webkit/WebView.java

@@ -2506,6 +2506,11 @@ public class WebView extends AbsoluteLayout
         super.onDetachedFromWindowInternal();
     }
 
+    @Override
+    public void onMovedToDisplay(int displayId, Configuration config) {
+        mProvider.getViewDelegate().onMovedToDisplay(displayId, config);
+    }
+
     @Override
     public void setLayoutParams(ViewGroup.LayoutParams params) {
         mProvider.getViewDelegate().setLayoutParams(params);

core/java/android/webkit/WebViewProvider.java

@@ -378,6 +378,8 @@ public interface WebViewProvider {
 
         public void onDetachedFromWindow();
 
+        public default void onMovedToDisplay(int displayId, Configuration config) {}
+
         public void onVisibilityChanged(View changedView, int visibility);
 
         public void onWindowFocusChanged(boolean hasWindowFocus);