Loading core/java/android/webkit/FindActionModeCallback.java +12 −4 Original line number Diff line number Diff line Loading @@ -22,16 +22,14 @@ import android.text.Editable; import android.text.Selection; import android.text.Spannable; import android.text.TextWatcher; import android.webkit.WebView; import android.widget.EditText; import android.widget.TextView; import android.view.ActionMode; import android.view.LayoutInflater; import android.view.Menu; import android.view.MenuInflater; import android.view.MenuItem; import android.view.View; import android.view.inputmethod.InputMethodManager; import android.widget.EditText; import android.widget.TextView; class FindActionModeCallback implements ActionMode.Callback, TextWatcher, View.OnLongClickListener, View.OnClickListener { Loading Loading @@ -203,6 +201,7 @@ class FindActionModeCallback implements ActionMode.Callback, TextWatcher, @Override public void onDestroyActionMode(ActionMode mode) { mActionMode = null; mWebView.notifyFindDialogDismissed(); mInput.hideSoftInputFromWindow(mWebView.getWindowToken(), 0); } Loading Loading @@ -255,4 +254,13 @@ class FindActionModeCallback implements ActionMode.Callback, TextWatcher, // Does nothing. Needed to implement TextWatcher. } public int getActionModeHeight() { if (mActionMode == null) { return 0; } View parent = (View) mCustomView.getParent(); return parent != null ? parent.getMeasuredHeight() : mCustomView.getMeasuredHeight(); } } core/java/android/webkit/WebView.java +2 −1 Original line number Diff line number Diff line Loading @@ -1483,7 +1483,8 @@ public class WebView extends AbsoluteLayout private int getVisibleTitleHeightImpl() { // need to restrict mScrollY due to over scroll return Math.max(getTitleHeight() - Math.max(0, mScrollY), 0); return Math.max(getTitleHeight() - Math.max(0, mScrollY), mFindCallback != null ? mFindCallback.getActionModeHeight() : 0); } /* Loading Loading
core/java/android/webkit/FindActionModeCallback.java +12 −4 Original line number Diff line number Diff line Loading @@ -22,16 +22,14 @@ import android.text.Editable; import android.text.Selection; import android.text.Spannable; import android.text.TextWatcher; import android.webkit.WebView; import android.widget.EditText; import android.widget.TextView; import android.view.ActionMode; import android.view.LayoutInflater; import android.view.Menu; import android.view.MenuInflater; import android.view.MenuItem; import android.view.View; import android.view.inputmethod.InputMethodManager; import android.widget.EditText; import android.widget.TextView; class FindActionModeCallback implements ActionMode.Callback, TextWatcher, View.OnLongClickListener, View.OnClickListener { Loading Loading @@ -203,6 +201,7 @@ class FindActionModeCallback implements ActionMode.Callback, TextWatcher, @Override public void onDestroyActionMode(ActionMode mode) { mActionMode = null; mWebView.notifyFindDialogDismissed(); mInput.hideSoftInputFromWindow(mWebView.getWindowToken(), 0); } Loading Loading @@ -255,4 +254,13 @@ class FindActionModeCallback implements ActionMode.Callback, TextWatcher, // Does nothing. Needed to implement TextWatcher. } public int getActionModeHeight() { if (mActionMode == null) { return 0; } View parent = (View) mCustomView.getParent(); return parent != null ? parent.getMeasuredHeight() : mCustomView.getMeasuredHeight(); } }
core/java/android/webkit/WebView.java +2 −1 Original line number Diff line number Diff line Loading @@ -1483,7 +1483,8 @@ public class WebView extends AbsoluteLayout private int getVisibleTitleHeightImpl() { // need to restrict mScrollY due to over scroll return Math.max(getTitleHeight() - Math.max(0, mScrollY), 0); return Math.max(getTitleHeight() - Math.max(0, mScrollY), mFindCallback != null ? mFindCallback.getActionModeHeight() : 0); } /* Loading