Skip to content

Commit 19274f5

Browse files
author
Jonathan Dixon
committed
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
1 parent 86fc2c9 commit 19274f5

File tree

3 files changed

+6
-23
lines changed

3 files changed

+6
-23
lines changed

core/java/android/webkit/WebView.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1550,7 +1550,6 @@ public void refreshPlugins(boolean reloadOpenPages) {
15501550
@Deprecated
15511551
public void emulateShiftHeld() {
15521552
checkThread();
1553-
mProvider.emulateShiftHeld();
15541553
}
15551554

15561555
/**
@@ -1656,7 +1655,6 @@ public boolean zoomOut() {
16561655
@Deprecated
16571656
public void debugDump() {
16581657
checkThread();
1659-
mProvider.debugDump();
16601658
}
16611659

16621660
/**

core/java/android/webkit/WebViewClassic.java

Lines changed: 6 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -3549,7 +3549,8 @@ public WebBackForwardListClassic copyBackForwardList() {
35493549
* See {@link WebView#setFindListener(WebView.FindListener)}.
35503550
* @hide
35513551
*/
3552-
public void setFindListener(WebView.FindListener listener) {
3552+
@Override
3553+
public void setFindListener(WebView.FindListener listener) {
35533554
mFindListener = listener;
35543555
}
35553556

@@ -3572,6 +3573,7 @@ public int findAll(String find) {
35723573
return findAllBody(find, false);
35733574
}
35743575

3576+
@Override
35753577
public void findAllAsync(String find) {
35763578
findAllBody(find, true);
35773579
}
@@ -3610,6 +3612,7 @@ private int findAllBody(String find, boolean isAsync) {
36103612
* If false and text is non-null, perform a find all.
36113613
* @return boolean True if the find dialog is shown, false otherwise.
36123614
*/
3615+
@Override
36133616
public boolean showFindDialog(String text, boolean showIme) {
36143617
FindActionModeCallback callback = new FindActionModeCallback(mContext);
36153618
if (mWebView.getParent() == null || mWebView.startActionMode(callback) == null) {
@@ -5233,14 +5236,6 @@ private void resetCaretTimer() {
52335236
}
52345237
}
52355238

5236-
/**
5237-
* See {@link WebView#emulateShiftHeld()}
5238-
*/
5239-
@Override
5240-
@Deprecated
5241-
public void emulateShiftHeld() {
5242-
}
5243-
52445239
/**
52455240
* Select all of the text in this WebView.
52465241
*
@@ -6486,6 +6481,7 @@ public boolean onGenericMotionEvent(MotionEvent event) {
64866481
private DrawData mDelaySetPicture;
64876482
private DrawData mLoadedPicture;
64886483

6484+
@Override
64896485
public void setMapTrackballToArrowKeys(boolean setMap) {
64906486
mMapTrackballToArrowKeys = setMap;
64916487
}
@@ -6712,6 +6708,7 @@ boolean updateScrollCoordinates(int x, int y) {
67126708
}
67136709
}
67146710

6711+
@Override
67156712
public void flingScroll(int vx, int vy) {
67166713
mScroller.fling(getScrollX(), getScrollY(), vx, vy, 0, computeMaxScrollX(), 0,
67176714
computeMaxScrollY(), mOverflingDistance, mOverflingDistance);
@@ -8447,14 +8444,6 @@ public void setBackgroundColor(int color) {
84478444
mWebViewCore.sendMessage(EventHub.SET_BACKGROUND_COLOR, color);
84488445
}
84498446

8450-
/**
8451-
* See {@link WebView#debugDump()}
8452-
*/
8453-
@Override
8454-
@Deprecated
8455-
public void debugDump() {
8456-
}
8457-
84588447
/**
84598448
* Enable the communication b/t the webView and VideoViewProxy
84608449
*

core/java/android/webkit/WebViewProvider.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -221,8 +221,6 @@ public void loadDataWithBaseURL(String baseUrl, String data,
221221

222222
public WebSettings getSettings();
223223

224-
public void emulateShiftHeld();
225-
226224
public void setMapTrackballToArrowKeys(boolean setMap);
227225

228226
public void flingScroll(int vx, int vy);
@@ -237,8 +235,6 @@ public void loadDataWithBaseURL(String baseUrl, String data,
237235

238236
public boolean zoomOut();
239237

240-
public void debugDump();
241-
242238
public void dumpViewHierarchyWithProperties(BufferedWriter out, int level);
243239

244240
public View findHierarchyView(String className, int hashCode);

0 commit comments

Comments
 (0)