diff options
author | George Mount <mount@google.com> | 2012-05-24 09:56:16 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2012-05-24 09:56:16 -0700 |
commit | 4f3136768038398e109a66d393d74858d2754a34 (patch) | |
tree | 1b3d24842f188f2b34b66bce8af4049e0597762e /core | |
parent | cde7efde0c4084147989176ba8a0cda8c799f68d (diff) | |
parent | 222f56135026627637e9db4801d6532b1ff16657 (diff) | |
download | frameworks_base-4f3136768038398e109a66d393d74858d2754a34.zip frameworks_base-4f3136768038398e109a66d393d74858d2754a34.tar.gz frameworks_base-4f3136768038398e109a66d393d74858d2754a34.tar.bz2 |
am 222f5613: Merge "Use setCustomSelectActionModeCallback to disallow action bar." into jb-dev
* commit '222f56135026627637e9db4801d6532b1ff16657':
Use setCustomSelectActionModeCallback to disallow action bar.
Diffstat (limited to 'core')
-rw-r--r-- | core/java/android/webkit/FindActionModeCallback.java | 31 |
1 files changed, 22 insertions, 9 deletions
diff --git a/core/java/android/webkit/FindActionModeCallback.java b/core/java/android/webkit/FindActionModeCallback.java index 6b7263c..1a4ccfa 100644 --- a/core/java/android/webkit/FindActionModeCallback.java +++ b/core/java/android/webkit/FindActionModeCallback.java @@ -34,7 +34,7 @@ import android.widget.EditText; import android.widget.TextView; class FindActionModeCallback implements ActionMode.Callback, TextWatcher, - View.OnLongClickListener, View.OnClickListener { + View.OnClickListener { private View mCustomView; private EditText mEditText; private TextView mMatches; @@ -51,9 +51,7 @@ class FindActionModeCallback implements ActionMode.Callback, TextWatcher, com.android.internal.R.layout.webview_find, null); mEditText = (EditText) mCustomView.findViewById( com.android.internal.R.id.edit); - // Override long click so that select ActionMode is not opened, which - // would exit find ActionMode. - mEditText.setOnLongClickListener(this); + mEditText.setCustomSelectionActionModeCallback(new NoAction()); mEditText.setOnClickListener(this); setText(""); mMatches = (TextView) mCustomView.findViewById( @@ -174,11 +172,6 @@ class FindActionModeCallback implements ActionMode.Callback, TextWatcher, mMatches.setVisibility(View.VISIBLE); } - // OnLongClickListener implementation - - @Override - public boolean onLongClick(View v) { return true; } - // OnClickListener implementation @Override @@ -280,4 +273,24 @@ class FindActionModeCallback implements ActionMode.Callback, TextWatcher, return mGlobalVisibleRect.bottom; } + public static class NoAction implements ActionMode.Callback { + @Override + public boolean onCreateActionMode(ActionMode mode, Menu menu) { + return false; + } + + @Override + public boolean onPrepareActionMode(ActionMode mode, Menu menu) { + return false; + } + + @Override + public boolean onActionItemClicked(ActionMode mode, MenuItem item) { + return false; + } + + @Override + public void onDestroyActionMode(ActionMode mode) { + } + } } |