Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 76866208: Merge "Send onViewClicked in the extract mode"

Browse Source 
* commit '76866208f81988fa653568513112b152e156d806':
  Send onViewClicked in the extract mode
This commit is contained in:
satok
2011-09-07 19:53:23 -07:00
committed by Android Git Automerger
parent b51154d167 76866208f8
commit 6795dae72c
2 changed files with 25 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
core/java/android/inputmethodservice/ExtractEditText.java
View File

@@ -19,6 +19,7 @@ package android.inputmethodservice;
import android.content.Context;
import android.util.AttributeSet;
import android.view.inputmethod.ExtractedText;
import android.view.inputmethod.InputMethodManager;
import android.widget.EditText;
/***
@@ -142,4 +143,17 @@ public class ExtractEditText extends EditText {
@Override public boolean hasFocus() {
return this.isEnabled();
}
/**
* @hide
*/
@Override protected void viewClicked(InputMethodManager imm) {
// As an instance of this class is supposed to be owned by IMS,
// and it has a reference to the IMS (the current IME),
// we just need to call back its onViewClicked() here.
// It should be good to avoid unnecessary IPCs by doing this as well.
if (mIME != null) {
mIME.onViewClicked(false);
}
}
}

15
core/java/android/widget/TextView.java
View File

@@ -5432,8 +5432,8 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
if (mMovement != null && mText instanceof Editable
&& mLayout != null && onCheckIsTextEditor()) {
InputMethodManager imm = InputMethodManager.peekInstance();
viewClicked(imm);
if (imm != null) {
imm.viewClicked(this);
imm.showSoftInput(this, 0);
}
}
@@ -8346,9 +8346,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
if (touchIsFinished && (isTextEditable() || mTextIsSelectable)) {
// Show the IME, except when selecting in read-only text.
final InputMethodManager imm = InputMethodManager.peekInstance();
if (imm != null) {
imm.viewClicked(this);
}
viewClicked(imm);
if (!mTextIsSelectable) {
handled |= imm != null && imm.showSoftInput(this, 0);
}
@@ -11310,6 +11308,15 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
mResolvedDrawables = false;
}
/**
* @hide
*/
protected void viewClicked(InputMethodManager imm) {
if (imm != null) {
imm.viewClicked(this);
}
}
@ViewDebug.ExportedProperty(category = "text")
private CharSequence mText;
private CharSequence mTransformed;