Merge "Made context menu appear when tapping inside selection." into gingerbread

core/java/android/widget/TextView.java

@@ -6628,6 +6628,8 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
 
         if (start == end) {
             if (start >= prevStart && start < prevEnd) {
+                // Restore previous selection
+                Selection.setSelection((Spannable)mText, prevStart, prevEnd);
                 // Tapping inside the selection displays the cut/copy/paste context menu.
                 showContextMenu();
                 return;