Merge "Remove deprecated methods from webview provider interface"

Author: Jonathan Dixon

core/java/android/webkit/WebView.java

@@ -1550,7 +1550,6 @@ public void refreshPlugins(boolean reloadOpenPages) {
     @Deprecated
     public void emulateShiftHeld() {
         checkThread();
-        mProvider.emulateShiftHeld();
     }
 
     /**
@@ -1656,7 +1655,6 @@ public boolean zoomOut() {
     @Deprecated
     public void debugDump() {
         checkThread();
-        mProvider.debugDump();
     }
 
     /**

core/java/android/webkit/WebViewClassic.java

@@ -3550,7 +3550,8 @@ public WebBackForwardListClassic copyBackForwardList() {
      * See {@link WebView#setFindListener(WebView.FindListener)}.
      * @hide
      */
-     public void setFindListener(WebView.FindListener listener) {
+     @Override
+    public void setFindListener(WebView.FindListener listener) {
          mFindListener = listener;
      }
 
@@ -3573,6 +3574,7 @@ public int findAll(String find) {
         return findAllBody(find, false);
     }
 
+    @Override
     public void findAllAsync(String find) {
         findAllBody(find, true);
     }
@@ -3611,6 +3613,7 @@ private int findAllBody(String find, boolean isAsync) {
      *             If false and text is non-null, perform a find all.
      * @return boolean True if the find dialog is shown, false otherwise.
      */
+    @Override
     public boolean showFindDialog(String text, boolean showIme) {
         FindActionModeCallback callback = new FindActionModeCallback(mContext);
         if (mWebView.getParent() == null || mWebView.startActionMode(callback) == null) {
@@ -5234,14 +5237,6 @@ private void resetCaretTimer() {
         }
     }
 
-    /**
-     * See {@link WebView#emulateShiftHeld()}
-     */
-    @Override
-    @Deprecated
-    public void emulateShiftHeld() {
-    }
-
     /**
      * Select all of the text in this WebView.
      *
@@ -6487,6 +6482,7 @@ public boolean onGenericMotionEvent(MotionEvent event) {
     private DrawData mDelaySetPicture;
     private DrawData mLoadedPicture;
 
+    @Override
     public void setMapTrackballToArrowKeys(boolean setMap) {
         mMapTrackballToArrowKeys = setMap;
     }
@@ -6713,6 +6709,7 @@ boolean updateScrollCoordinates(int x, int y) {
         }
     }
 
+    @Override
     public void flingScroll(int vx, int vy) {
         mScroller.fling(getScrollX(), getScrollY(), vx, vy, 0, computeMaxScrollX(), 0,
                 computeMaxScrollY(), mOverflingDistance, mOverflingDistance);
@@ -8450,14 +8447,6 @@ public void setBackgroundColor(int color) {
         mWebViewCore.sendMessage(EventHub.SET_BACKGROUND_COLOR, color);
     }
 
-    /**
-     * See {@link WebView#debugDump()}
-     */
-    @Override
-    @Deprecated
-    public void debugDump() {
-    }
-
     /**
      * Enable the communication b/t the webView and VideoViewProxy
      *

core/java/android/webkit/WebViewProvider.java

@@ -221,8 +221,6 @@ public void loadDataWithBaseURL(String baseUrl, String data,
 
     public WebSettings getSettings();
 
-    public void emulateShiftHeld();
-
     public void setMapTrackballToArrowKeys(boolean setMap);
 
     public void flingScroll(int vx, int vy);
@@ -237,8 +235,6 @@ public void loadDataWithBaseURL(String baseUrl, String data,
 
     public boolean zoomOut();
 
-    public void debugDump();
-
     public void dumpViewHierarchyWithProperties(BufferedWriter out, int level);
 
     public View findHierarchyView(String className, int hashCode);