Url bar selection handling updated
Bug: 3222647
framework has been updated to change the way tap/double tap
and long press are handled
url bar uses a custom action bar to add the share option
Change-Id: Ie75fc07fe71c9e16fc7f83deda8ecddea39b0397
diff --git a/src/com/android/browser/UrlInputView.java b/src/com/android/browser/UrlInputView.java
index 9c85616..a4c2be3 100644
--- a/src/com/android/browser/UrlInputView.java
+++ b/src/com/android/browser/UrlInputView.java
@@ -22,7 +22,6 @@
import android.content.res.Configuration;
import android.text.TextUtils;
import android.util.AttributeSet;
-import android.view.ActionMode;
import android.view.KeyEvent;
import android.view.View;
import android.view.View.OnFocusChangeListener;
@@ -36,7 +35,8 @@
* handling suggestions
*/
public class UrlInputView extends AutoCompleteTextView
- implements OnFocusChangeListener, OnEditorActionListener, CompletionListener {
+ implements OnFocusChangeListener, OnEditorActionListener,
+ CompletionListener {
private UrlInputListener mListener;
private InputMethodManager mInputManager;
@@ -66,11 +66,17 @@
super.setOnFocusChangeListener(this);
mAdapter = new SuggestionsAdapter(ctx, this);
setAdapter(mAdapter);
- setSelectAllOnFocus(false);
+ setSelectAllOnFocus(true);
onConfigurationChanged(ctx.getResources().getConfiguration());
setThreshold(1);
}
+ void setController(UiController controller) {
+ UrlSelectionActionMode urlSelectionMode
+ = new UrlSelectionActionMode(controller);
+ setCustomSelectionActionModeCallback(urlSelectionMode);
+ }
+
void setContainer(View container) {
mContainer = container;
}
@@ -109,12 +115,6 @@
}
@Override
- public ActionMode startActionMode(ActionMode.Callback callback) {
- // suppress selection action mode
- return null;
- }
-
- @Override
public void setOnFocusChangeListener(OnFocusChangeListener focusListener) {
mWrappedFocusListener = focusListener;
}