Bug 5255124: Move cursor to the end of a word after correction popup alternates selection

Change-Id: Idd3edc72edf864f256df173bcf643163192ecbde

diff --git a/core/java/android/widget/TextView.java b/core/java/android/widget/TextView.java
index ebe22cc..0ec357f 100644 (file)
--- a/core/java/android/widget/TextView.java
+++ b/core/java/android/widget/TextView.java
@@ -9901,6 +9901,9 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
                                     suggestionSpansFlags[i]);
                         }
                     }
+                    
+                    // Move cursor at the end of the replacement word
+                    Selection.setSelection(editable, spanEnd + lengthDifference);
                 }
             }
             hide();