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

Rearrange some code so it makes more sense. Thanks, findbugs.

Browse Source
This commit is contained in:
Marco Nelissen
2009-05-14 15:11:23 -07:00
parent 94f70cbbe2
commit 9ea923174c
1 changed files with 25 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4434,29 +4434,31 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
boolean reportExtractedText() { boolean reportExtractedText() {
final InputMethodState ims = mInputMethodState; final InputMethodState ims = mInputMethodState;
final boolean contentChanged = ims.mContentChanged; if (ims != null) {
if (ims != null && (contentChanged || ims.mSelectionModeChanged)) { final boolean contentChanged = ims.mContentChanged;
ims.mContentChanged = false; if (contentChanged || ims.mSelectionModeChanged) {
ims.mSelectionModeChanged = false; ims.mContentChanged = false;
final ExtractedTextRequest req = mInputMethodState.mExtracting; ims.mSelectionModeChanged = false;
if (req != null) { final ExtractedTextRequest req = mInputMethodState.mExtracting;
InputMethodManager imm = InputMethodManager.peekInstance(); if (req != null) {
if (imm != null) { InputMethodManager imm = InputMethodManager.peekInstance();
if (DEBUG_EXTRACT) Log.v(TAG, "Retrieving extracted start=" if (imm != null) {
+ ims.mChangedStart + " end=" + ims.mChangedEnd if (DEBUG_EXTRACT) Log.v(TAG, "Retrieving extracted start="
+ " delta=" + ims.mChangedDelta); + ims.mChangedStart + " end=" + ims.mChangedEnd
if (ims.mChangedStart < 0 && !contentChanged) { + " delta=" + ims.mChangedDelta);
ims.mChangedStart = EXTRACT_NOTHING; if (ims.mChangedStart < 0 && !contentChanged) {
} ims.mChangedStart = EXTRACT_NOTHING;
if (extractTextInternal(req, ims.mChangedStart, ims.mChangedEnd, }
ims.mChangedDelta, ims.mTmpExtracted)) { if (extractTextInternal(req, ims.mChangedStart, ims.mChangedEnd,
if (DEBUG_EXTRACT) Log.v(TAG, "Reporting extracted start=" ims.mChangedDelta, ims.mTmpExtracted)) {
+ ims.mTmpExtracted.partialStartOffset if (DEBUG_EXTRACT) Log.v(TAG, "Reporting extracted start="
+ " end=" + ims.mTmpExtracted.partialEndOffset + ims.mTmpExtracted.partialStartOffset
+ ": " + ims.mTmpExtracted.text); + " end=" + ims.mTmpExtracted.partialEndOffset
imm.updateExtractedText(this, req.token, + ": " + ims.mTmpExtracted.text);
mInputMethodState.mTmpExtracted); imm.updateExtractedText(this, req.token,
return true; mInputMethodState.mTmpExtracted);
return true;
}
} }
} }
} }