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

Merge "Voice input replaces selected text." into gingerbread

Browse Source
This commit is contained in:
Gilles Debunne
2010-10-10 14:01:10 -07:00
committed by Android (Google) Code Review
parent 66e606040a e507a9e4af
commit b72a335a7f
1 changed files with 10 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -6668,10 +6668,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
if (mInputContentType != null) {
mInputContentType.enterDown = false;
}
hideInsertionPointCursorController();
if (mSelectionModifierCursorController != null) {
mSelectionModifierCursorController.hide();
}
hideControllers();
}
startStopMarquee(hasWindowFocus);
@@ -6681,10 +6678,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
protected void onVisibilityChanged(View changedView, int visibility) {
super.onVisibilityChanged(changedView, visibility);
if (visibility != VISIBLE) {
hideInsertionPointCursorController();
if (mSelectionModifierCursorController != null) {
mSelectionModifierCursorController.hide();
}
hideControllers();
}
}
@@ -7643,10 +7637,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
private void stopTextSelectionMode() {
if (mIsInTextSelectionMode) {
Selection.setSelection((Spannable) mText, getSelectionEnd());
if (mSelectionModifierCursorController != null) {
mSelectionModifierCursorController.hide();
}
hideSelectionModifierCursorController();
mIsInTextSelectionMode = false;
}
}
@@ -8182,9 +8173,15 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
}
}
private void hideSelectionModifierCursorController() {
if (mSelectionModifierCursorController != null) {
mSelectionModifierCursorController.hide();
}
}
private void hideControllers() {
hideInsertionPointCursorController();
stopTextSelectionMode();
hideSelectionModifierCursorController();
}
private int getOffsetForHorizontal(int line, int x) {