drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

resolved conflicts for merge of 5d919b43 to gingerbread-plus-aosp

Browse Source 
Change-Id: I8b8a8dfdd99052f3d43a0feb47168876b41e336d
This commit is contained in:
Jean-Baptiste Queru
2010-10-20 18:16:57 -07:00
parent 674b856c15 5d919b4387
commit 843ff92bb0
1 changed files with 19 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -976,6 +976,22 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
setTypeface(tf, styleIndex); setTypeface(tf, styleIndex);
} }
@Override
public void setEnabled(boolean enabled) {
if (enabled == isEnabled()) {
return;
}
if (!enabled) {
// Hide the soft input if the currently active TextView is disabled
InputMethodManager imm = InputMethodManager.peekInstance();
if (imm != null && imm.isActive(this)) {
imm.hideSoftInputFromWindow(getWindowToken(), 0);
}
}
super.setEnabled(enabled);
}
/** /**
* Sets the typeface and style in which the text should be displayed, * Sets the typeface and style in which the text should be displayed,
* and turns on the fake bold and italic bits in the Paint if the * and turns on the fake bold and italic bits in the Paint if the
@ -4562,7 +4578,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
} }
@Override public InputConnection onCreateInputConnection(EditorInfo outAttrs) { @Override public InputConnection onCreateInputConnection(EditorInfo outAttrs) {
if (onCheckIsTextEditor()) { if (onCheckIsTextEditor() && isEnabled()) {
if (mInputMethodState == null) { if (mInputMethodState == null) {
mInputMethodState = new InputMethodState(); mInputMethodState = new InputMethodState();
} }
@ -6821,7 +6837,8 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
return superResult; return superResult;
} }
if ((mMovement != null || onCheckIsTextEditor()) && mText instanceof Spannable && mLayout != null) { if ((mMovement != null || onCheckIsTextEditor()) && isEnabled()
&& mText instanceof Spannable && mLayout != null) {
if (mInsertionPointCursorController != null) { if (mInsertionPointCursorController != null) {
mInsertionPointCursorController.onTouchEvent(event); mInsertionPointCursorController.onTouchEvent(event);
} }