Fixup browser to use WebView proxy
Has to escape out to WebViewClassic whenever it needs a hidden API.
Interdepends on https://android-git.corp.google.com/g/165608
Change-Id: Ic61dd7f57f75381864075605d5901f2688648cbd
diff --git a/src/com/android/browser/BrowserWebView.java b/src/com/android/browser/BrowserWebView.java
index b763cf1..7981d8a 100644
--- a/src/com/android/browser/BrowserWebView.java
+++ b/src/com/android/browser/BrowserWebView.java
@@ -21,13 +21,14 @@
import android.util.AttributeSet;
import android.view.View;
import android.webkit.WebView;
+import android.webkit.WebViewClassic;
import java.util.Map;
/**
* Manage WebView scroll events
*/
-public class BrowserWebView extends WebView {
+public class BrowserWebView extends WebView implements WebViewClassic.TitleBarDelegate {
public interface OnScrollChangedListener {
void onScrollChanged(int l, int t, int oldl, int oldt);
@@ -73,18 +74,15 @@
super(context);
}
+ // From TitleBarDelegate
@Override
- protected int getTitleHeight() {
+ public int getTitleHeight() {
return (mTitleBar != null) ? mTitleBar.getEmbeddedHeight() : 0;
}
- void hideEmbeddedTitleBar() {
- scrollBy(0, getVisibleTitleHeight());
- }
-
+ // From TitleBarDelegate
@Override
- public void setEmbeddedTitleBar(final View title) {
- super.setEmbeddedTitleBar(title);
+ public void onSetEmbeddedTitleBar(final View title) {
mTitleBar = (TitleBar) title;
}