From abbd755689fae94b0fc2047f0c0bd19417d9f2b4 Mon Sep 17 00:00:00 2001 From: Jean Chalard Date: Fri, 24 Jan 2014 14:18:11 +0900 Subject: [PATCH] [IL81] Remove a useless test. It seems the comments were right all along. This seems to really be useless. Bug: 8636060 Change-Id: Ie030e9cb73007334380d023abeaa4ce52a863a34 --- .../inputmethod/latin/inputlogic/InputLogic.java | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/java/src/com/android/inputmethod/latin/inputlogic/InputLogic.java b/java/src/com/android/inputmethod/latin/inputlogic/InputLogic.java index d4f7f0ecd..71212b952 100644 --- a/java/src/com/android/inputmethod/latin/inputlogic/InputLogic.java +++ b/java/src/com/android/inputmethod/latin/inputlogic/InputLogic.java @@ -206,18 +206,9 @@ public final class InputLogic { // state-related special processing to kick in. mSpaceState = SpaceState.NONE; - // if composingSpanStart and composingSpanEnd are -1, it means there is no composing - // span in the view - we can use that to narrow down whether the cursor was moved - // by us or not. If we are composing a word but there is no composing span, then - // we know for sure the cursor moved while we were composing and we should reset - // the state. TODO: rescind this policy: the framework never removes the composing - // span on its own accord while editing. This test is useless. - final boolean noComposingSpan = composingSpanStart == -1 && composingSpanEnd == -1; - final boolean selectionChanged = oldSelStart != newSelStart || oldSelEnd != newSelEnd; - - // TODO: is it still necessary to test for composingSpan related stuff? - final boolean selectionChangedOrSafeToReset = selectionChanged - || (!mWordComposer.isComposingWord()) || noComposingSpan; + final boolean selectionChangedOrSafeToReset = + oldSelStart != newSelStart || oldSelEnd != newSelEnd // selection changed + || !mWordComposer.isComposingWord(); // safe to reset final boolean hasOrHadSelection = (oldSelStart != oldSelEnd || newSelStart != newSelEnd); final int moveAmount = newSelStart - oldSelStart; if (selectionChangedOrSafeToReset && (hasOrHadSelection