Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 19274f5a authored by Jonathan Dixon's avatar Jonathan Dixon
Browse files

Remove deprecated methods from webview provider interface 

As these methods are a no-op, no need to foward it to the provider.
Also fixed some missing @Override annotations.

Change-Id: I6ba87cea49d95499de3f62db85c6f6947634bb6f
parent 86fc2c9b

core/java/android/webkit/WebView.java

+0 −2
Original line number Diff line number Diff line
@@ -1550,7 +1550,6 @@ public class WebView extends AbsoluteLayout 
    @Deprecated

    public void emulateShiftHeld() {

        checkThread();

        mProvider.emulateShiftHeld();

    }



    /**
@@ -1656,7 +1655,6 @@ public class WebView extends AbsoluteLayout 
    @Deprecated

    public void debugDump() {

        checkThread();

        mProvider.debugDump();

    }



    /**

core/java/android/webkit/WebViewClassic.java

+6 −17
Original line number Diff line number Diff line
@@ -3549,6 +3549,7 @@ public final class WebViewClassic implements WebViewProvider, WebViewProvider.Sc 
     * See {@link WebView#setFindListener(WebView.FindListener)}.

     * @hide

     */

     @Override

    public void setFindListener(WebView.FindListener listener) {

         mFindListener = listener;

     }
@@ -3572,6 +3573,7 @@ public final class WebViewClassic implements WebViewProvider, WebViewProvider.Sc 
        return findAllBody(find, false);

    }



    @Override

    public void findAllAsync(String find) {

        findAllBody(find, true);

    }
@@ -3610,6 +3612,7 @@ public final class WebViewClassic implements WebViewProvider, WebViewProvider.Sc 
     *             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) {
@@ -5233,14 +5236,6 @@ public final class WebViewClassic implements WebViewProvider, WebViewProvider.Sc 
        }

    }



    /**

     * See {@link WebView#emulateShiftHeld()}

     */

    @Override

    @Deprecated

    public void emulateShiftHeld() {

    }



    /**

     * Select all of the text in this WebView.

     *
@@ -6486,6 +6481,7 @@ public final class WebViewClassic implements WebViewProvider, WebViewProvider.Sc 
    private DrawData mDelaySetPicture;

    private DrawData mLoadedPicture;



    @Override

    public void setMapTrackballToArrowKeys(boolean setMap) {

        mMapTrackballToArrowKeys = setMap;

    }
@@ -6712,6 +6708,7 @@ public final class WebViewClassic implements WebViewProvider, WebViewProvider.Sc 
        }

    }



    @Override

    public void flingScroll(int vx, int vy) {

        mScroller.fling(getScrollX(), getScrollY(), vx, vy, 0, computeMaxScrollX(), 0,

                computeMaxScrollY(), mOverflingDistance, mOverflingDistance);
@@ -8447,14 +8444,6 @@ public final class WebViewClassic implements WebViewProvider, WebViewProvider.Sc 
        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

+0 −4
Original line number Diff line number Diff line
@@ -221,8 +221,6 @@ public interface WebViewProvider { 


    public WebSettings getSettings();



    public void emulateShiftHeld();



    public void setMapTrackballToArrowKeys(boolean setMap);



    public void flingScroll(int vx, int vy);
@@ -237,8 +235,6 @@ public interface WebViewProvider { 


    public boolean zoomOut();



    public void debugDump();



    public void dumpViewHierarchyWithProperties(BufferedWriter out, int level);



    public View findHierarchyView(String className, int hashCode);