am 475f9f35: Merge "Comments improvements"

* commit '475f9f35b61f9dfe8a15cf274a60e8fd073d9df9':
  Comments improvements
main
Jean Chalard 2014-02-20 00:25:26 -08:00 committed by Android Git Automerger
commit f0ed3799c5
1 changed files with 2 additions and 2 deletions

View File

@ -810,11 +810,11 @@ public final class RichInputConnection {
if (mExpectedSelStart == newSelStart && mExpectedSelEnd == newSelEnd) return true; if (mExpectedSelStart == newSelStart && mExpectedSelEnd == newSelEnd) return true;
// This update is not belated if mExpectedSelStart and mExpectedSelEnd match the old // This update is not belated if mExpectedSelStart and mExpectedSelEnd match the old
// values, and one of newSelStart or newSelEnd is updated to a different value. In this // values, and one of newSelStart or newSelEnd is updated to a different value. In this
// case, there is likely something other than the IME has moved the selection endpoint // case, it is likely that something other than the IME has moved the selection endpoint
// to the new value. // to the new value.
if (mExpectedSelStart == oldSelStart && mExpectedSelEnd == oldSelEnd if (mExpectedSelStart == oldSelStart && mExpectedSelEnd == oldSelEnd
&& (oldSelStart != newSelStart || oldSelEnd != newSelEnd)) return false; && (oldSelStart != newSelStart || oldSelEnd != newSelEnd)) return false;
// If nether of the above two cases holds, then the system may be having trouble keeping up // If neither of the above two cases hold, then the system may be having trouble keeping up
// with updates. If 1) the selection is a cursor, 2) newSelStart is between oldSelStart // with updates. If 1) the selection is a cursor, 2) newSelStart is between oldSelStart
// and mExpectedSelStart, and 3) newSelEnd is between oldSelEnd and mExpectedSelEnd, then // and mExpectedSelStart, and 3) newSelEnd is between oldSelEnd and mExpectedSelEnd, then
// assume a belated update. // assume a belated update.