Merge lp:~fboucault/ubuntu-ui-toolkit/text_input_larger_selection_handle_on_trunk into lp:~bzoltan/ubuntu-ui-toolkit/trunk

[Florian Boucault]

Many TextField/TextArea fixes improving user experience greatly and making it more in line with the design:

- handle much easier to drag by making its touch area 4 grid units wide and centered around the cursor
- double tapping anywhere (even around the handle) selects the word and opens the contextual menu
- long pressing anywhere (even around the handle) selects the word and opens the contextual menu
- make sure that when there is a selection the contextual menu is shown and shown above the cursor at the beginning of the selection
- do not prevent other UI elements from receiving mouse/touch events when the contextual menu is shown

[Florian Boucault (fboucault)]

Not ready for review yet.

[lp:~fboucault/ubuntu-ui-toolkit/text_input_larger_selection_handle_on_trunk]

1124. By Florian Boucault on 2014-11-07

Dismiss popover on copy.

1125. By Florian Boucault on 2014-11-07

Disable select all if there is nothing to select

1126. By Florian Boucault on 2014-11-07

Reverted handle changes

1127. By Florian Boucault on 2014-11-07

Do not disable 'cut' operation when there is nothing to paste but instead when the field is read only.

1128. By Florian Boucault on 2014-11-07

Reveted changes to push_to_phone.sh

1129. By Florian Boucault on 2014-11-07

Added bug fixes tags.

1130. By Florian Boucault on 2014-11-07

Updated components.api

1131. By Florian Boucault on 2014-11-07

Sync enabled of Ubuntu.Mouse and MouseArea.

1132. By Florian Boucault on 2014-11-07

Make sure popup disappears upon drag and reappears when finished.
Make sure that when not blinking the cursor is visible.
Make sure that tapping somewhere else in the field when in insert mode closes the contextual menu.

1133. By Florian Boucault on 2014-11-07

Removed unused code.

1134. By Florian Boucault on 2014-11-07

Removed incorrect test.

1135. By Florian Boucault on 2014-11-07

More robust test_clear_selection_on_click

1136. By Florian Boucault on 2014-11-07

Fixed components::TextInputTouchTests::test_long_tap_on_selected_text

1137. By Florian Boucault on 2014-11-07

Fixed test_select_text_by_dragging_cursor_handler

1138. By Florian Boucault on 2014-11-07

Fixed test_0_drag_autosizing_textarea_drags_parent_flickable

[Cris Dywan (kalikiana)]

> handle much easier to drag by making its touch area
> 4 grid units wide and centered around the cursor

I'm finding it very hard to drag the handles at all, with or without selection. In fact harder than before.

review: Needs Fixing

[Cris Dywan (kalikiana)]

This needs test cases. As this effectively overlaps with lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/insertMode taking test cases from there is probably a good idea, and we'd pick up what's left from there after having this one done.

[Cris Dywan (kalikiana)]

Pondering: it might be that the knob, as opposed to the |, is what's doing poorly for me. If I try to aim for the | always it's fairly fine.

[lp:~fboucault/ubuntu-ui-toolkit/text_input_larger_selection_handle_on_trunk]

1139. By Florian Boucault on 2014-11-10

TextInput: move clear button on top so that it takes priority over tapping on the cursor.

[Florian Boucault (fboucault)]

> Pondering: it might be that the knob, as opposed to the |, is what's doing
> poorly for me. If I try to aim for the | always it's fairly fine.

That's the design indeed, users are expected to target the cursor.

[lp:~fboucault/ubuntu-ui-toolkit/text_input_larger_selection_handle_on_trunk]

1140. By Florian Boucault on 2014-11-10

Added autopilot tests for select and insert modes.

1141. By Florian Boucault on 2014-11-11

TextInput: move clear button on top so that it takes priority over tapping on the cursor.

1142. By Florian Boucault on 2014-11-11

Fixed pep8 failure

=== modified file 'modules/Ubuntu/Components/InputHandler.qml'
--- modules/Ubuntu/Components/InputHandler.qml	2014-09-20 08:36:48 +0000
+++ modules/Ubuntu/Components/InputHandler.qml	2014-11-10 18:31:06 +0000
@@ -392,7 +392,7 @@
     }
     function handleDblClick(event, touch) {
         if (main.selectByMouse) {
-            input.selectWord();
+            openContextMenu(event, false);
             // turn selection state temporarily so the selection is not cleared on release
             state = "selection";
             if (touch) {
@@ -448,13 +448,15 @@
             }
 
             // do not open context menu if this is scrolling
-            if (touchPoint.startY - touchPoint.y < -units.dp(2))
+            if (touchPoint.startY - touchPoint.y < -units.gu(2))
                 return;
 
             openContextMenu(touchPoint, false);
             suppressReleaseEvent = true;
         }
     }
+
+    property bool doubleTapInProgress: doubleTap.running
     Timer {
         id: doubleTap
         property int tapCount: 0
 
=== modified file 'modules/Ubuntu/Components/Popups/PopupBase.qml'
--- modules/Ubuntu/Components/Popups/PopupBase.qml	2014-08-22 15:02:28 +0000
+++ modules/Ubuntu/Components/Popups/PopupBase.qml	2014-11-10 18:31:06 +0000
@@ -240,7 +240,9 @@
                     ScriptAction {
                         script: {
                             popupBase.visible = false;
-                            stateWrapper.restoreActiveFocus();
+                            if (eventGrabber.enabled) {
+                                stateWrapper.restoreActiveFocus();
+                            }
                         }
                     }
                 }
 
=== modified file 'modules/Ubuntu/Components/TextArea.qml'
--- modules/Ubuntu/Components/TextArea.qml	2014-10-01 18:04:10 +0000
+++ modules/Ubuntu/Components/TextArea.qml	2014-11-10 18:31:06 +0000
@@ -16,6 +16,7 @@
 
 import QtQuick 2.0
 import Ubuntu.Components 1.1 as Ubuntu
+import Ubuntu.Components.Popups 1.0
 import "mathUtils.js" as MathUtils
 
 /*!
@@ -847,6 +848,7 @@
             mouseSelectionMode: TextEdit.SelectWords
             selectByMouse: true
             activeFocusOnPress: true
+            onActiveFocusChanged: if (!activeFocus && inputHandler.popover) PopupUtils.close(inputHandler.popover)
             cursorDelegate: TextCursor {
                 handler: inputHandler
             }
 
=== modified file 'modules/Ubuntu/Components/TextCursor.qml'
--- modules/Ubuntu/Components/TextCursor.qml	2014-10-07 15:21:11 +0000
+++ modules/Ubuntu/Components/TextCursor.qml	2014-11-10 18:31:06 +0000
@@ -62,33 +62,58 @@
         The function opens the text input popover setting the text cursor as caller.
       */
     Connections {
-        target: inputHandler
-        onPressAndHold: openPopover()
+        target: handler
+        onPressAndHold: {
+            // open context menu only for cursorPosition or selectionStart as to
+            // ensure that only one popover gets opened
+            if (positionProperty !== "selectionEnd") {
+                openPopover();
+            }
+        }
         onTextModified: typing = true
-        onTap: typing = false
+        onTap: {
+            typing = false
+            if (handler.popover != null) {
+                PopupUtils.close(handler.popover);
+            }
+        }
     }
 
     function openPopover() {
-        if (!visible || opacity === 0.0 || dragger.drag.active) {
-            return;
-        }
-        // open context menu only for cursorPosition or selectionEnd
-        if (positionProperty !== "selectionStart") {
-            if (inputHandler.popover != null)
-                inputHandler.popover.hide();
-
-            var component = handler.main.popover;
-            if (component === undefined)
-                component = Qt.resolvedUrl("TextInputPopover.qml");
-            var popup = PopupUtils.open(component, cursorItem, {
-                "target": handler.main
-            });
-            contextMenuVisible = true;
-            popup.onVisibleChanged.connect(contextMenuHidden.bind(undefined, popup));
-            // do not grab focus!
-            popup.__foreground.activeFocusOnPress = false;
-            inputHandler.popover = popup;
-        }
+        if (!visible || opacity === 0.0 || dragger.dragActive) {
+            return;
+        }
+
+        if (contextMenuVisible) {
+            return;
+        }
+
+        if (handler.popover != null) {
+            PopupUtils.close(handler.popover);
+        }
+
+        var component = handler.main.popover;
+        if (component === undefined)
+            component = Qt.resolvedUrl("TextInputPopover.qml");
+
+        var popup;
+        if (fakeCursor.visible) {
+            popup = PopupUtils.open(component, cursorItem, {
+                "target": handler.main,
+            });
+        } else {
+            // if the cursor is out of the visible viewport, anchor the
+            // contextual menu to the input field
+            popup = PopupUtils.open(component, handler.main, {
+                "target": handler.main,
+            });
+            cursorItem.Component.onDestruction.connect(popup.__closePopup);
+        }
+        contextMenuVisible = true;
+        popup.onVisibleChanged.connect(contextMenuHidden.bind(undefined, popup));
+        // do not grab focus!
+        popup.__foreground.activeFocusOnPress = false;
+        handler.popover = popup;
     }
 
     visible: handler.main.cursorVisible
@@ -133,82 +158,62 @@
     function contextMenuHidden(p) {
         contextMenuVisible = false
     }
-    onXChanged: if (draggedItem.state === "") draggedItem.moveToCaret()
-    onYChanged: if (draggedItem.state === "") draggedItem.moveToCaret()
+
+    onXChanged: if (!draggedItemMouseArea.pressed) draggedItem.moveToCaret()
+    onYChanged: if (!draggedItemMouseArea.pressed) draggedItem.moveToCaret()
     Component.onCompleted: draggedItem.moveToCaret()
 
     //dragged item
     Item {
         id: draggedItem
         objectName: cursorItem.positionProperty + "_draggeditem"
-        width: caret ? Math.max(caret.width, units.gu(2)) : 0
-        height: caret ? Math.max(caret.height, units.gu(2)) : 0
+        width: caret ? units.gu(4) : 0
+        height: caret ? cursorItem.height : 0
         parent: handler.main
         visible: cursorItem.visible && (cursorItem.opacity > 0.0) && QuickUtils.touchScreenAvailable
 
-        // when the dragging ends, reposition the dragger back to caret
-        onStateChanged: {
-            if (state === "") {
-                draggedItem.moveToCaret();
-            }
-        }
-
         /*
           Mouse area to turn on dragging or selection mode when pressed
           on the handler area. The drag mode is turned off when the drag
           gets inactive or when the LeftButton is released.
           */
         MouseArea {
+            id: draggedItemMouseArea
             objectName: cursorItem.positionProperty + "_activator"
             anchors.fill: parent
             acceptedButtons: Qt.LeftButton
             preventStealing: true
-            enabled: parent.width && parent.height && parent.visible
-
-            onPressed: {
-                draggedItem.moveToCaret(mouse.x, mouse.y);
-                draggedItem.state = "dragging";
+            enabled: parent.width && parent.height && parent.visible && !handler.doubleTapInProgress
+            onPressedChanged: {
+                if (!pressed) {
+                    // when the dragging ends, reposition the dragger back to caret
+                    draggedItem.moveToCaret();
+                }
             }
             Ubuntu.Mouse.forwardTo: [dragger]
-            /*
-              As we are forwarding the events to the upper mouse area, the release
-              will not get into the normal MosueArea onRelease signal as the preventStealing
-              will not have any effect on the handling. However due to the mouse
-              filter's nature, we will still be able to grab mouse events and we
-              can stop dragging. We only handle the release in case the drag hasn't
-              been active at all, otherwise the drag will not be deactivated and we
-              will end up in a binding loop on the moveToCaret() next time the caret
-              handler is grabbed.
-              */
-            Ubuntu.Mouse.onReleased: {
-                if (!dragger.drag.active) {
-                    draggedItem.state = "";
-                }
+            Ubuntu.Mouse.onClicked: openPopover()
+            Ubuntu.Mouse.onPressAndHold: {
+                handler.main.selectWord();
+                handler.pressAndHold(-1);
             }
+            Ubuntu.Mouse.onDoubleClicked: handler.main.selectWord()
+            Ubuntu.Mouse.clickAndHoldThreshold: units.gu(2)
+            Ubuntu.Mouse.enabled: enabled
         }
 
         // aligns the draggedItem to the caret and resets the dragger
-        function moveToCaret(cx, cy) {
-            if (cx === undefined && cy === undefined) {
-                cx = mappedCursorPosition("x") + caretX;
-                cy = mappedCursorPosition("y") + caretY;
-            } else {
-                // move mouse position to caret
-                cx += draggedItem.x;
-                cy += draggedItem.y;
-            }
-
-            draggedItem.x = cx;
-            draggedItem.y = cy;
-            dragger.resetDrag();
+        function moveToCaret() {
+            draggedItem.x = mappedCursorPosition("x") - draggedItem.width / 2;
+            draggedItem.y = mappedCursorPosition("y");
         }
-        // positions caret to the dragged position
+        // positions caret to the dragged posinotion
         function positionCaret() {
-            if (dragger.drag.active) {
-                var dx = dragger.thumbStartX + dragger.dragAmountX + handler.flickable.contentX;
-                var dy = dragger.thumbStartY + dragger.dragAmountY + handler.flickable.contentY;
+            if (dragger.dragActive) {
+                var dx = dragger.dragStartX + dragger.dragAmountX + handler.flickable.contentX;
+                var dy = dragger.dragStartY + dragger.dragAmountY + handler.flickable.contentY;
                 // consider only the x-distance because of the overlays
                 dx -= handler.frameDistance.x;
+                dy -= handler.frameDistance.y;
                 handler.positionCaret(positionProperty, dx, dy);
             }
         }
@@ -219,38 +224,69 @@
         // fill the entire component area
         parent: handler.main
         anchors.fill: parent
-        hoverEnabled: true
-        preventStealing: drag.active
-        enabled: draggedItem.enabled && draggedItem.state === "dragging" && QuickUtils.touchScreenAvailable
+        enabled: draggedItemMouseArea.enabled && draggedItemMouseArea.pressed && QuickUtils.touchScreenAvailable
+        onEnabledChanged: {
+            if (enabled) {
+                dragAmountX = 0;
+                dragAmountY = 0;
+                firstMouseXChange = true;
+                firstMouseYChange = true;
+            } else {
+                dragActive = false;
+            }
+        }
 
-        property int thumbStartX
         property int dragStartX
-        property int dragAmountX: dragger.drag.target.x - dragStartX
-        property int thumbStartY
+        property int dragAmountX
         property int dragStartY
-        property int dragAmountY: dragger.drag.target.y - dragStartY
-
-        function resetDrag() {
-            thumbStartX = mappedCursorPosition("x");
-            thumbStartY = mappedCursorPosition("y");
-            dragStartX = drag.target ? drag.target.x : 0;
-            dragStartY = drag.target ? drag.target.y : 0;
-        }
-
-        // do not set minimum/maximum so we can drag outside of the Flickable area
-        drag {
-            target: draggedItem
-            axis: handler.singleLine ? Drag.XAxis : Drag.XAndYAxis
-            // deactivate dragging
-            onActiveChanged: {
-                if (!drag.active) {
-                    draggedItem.state = "";
-                }
-            }
-        }
-
-        onDragAmountXChanged: draggedItem.positionCaret()
-        onDragAmountYChanged: draggedItem.positionCaret()
+        property int dragAmountY
+        property bool dragActive: false
+        property int dragThreshold: units.gu(2)
+        property bool firstMouseXChange: true
+        property bool firstMouseYChange: true
+
+        onMouseXChanged: {
+            if (firstMouseXChange) {
+                dragStartX = mouseX;
+                firstMouseXChange = false;
+            } else {
+                var amount = mouseX - dragStartX;
+                if (Math.abs(amount) >= dragThreshold) {
+                    dragActive = true;
+                }
+                if (dragActive) {
+                    dragAmountX = amount;
+                    draggedItem.positionCaret();
+                }
+            }
+        }
+
+        onMouseYChanged: {
+            if (firstMouseYChange) {
+                dragStartY = mouseY;
+                firstMouseYChange = false;
+            } else {
+                var amount = mouseY - dragStartY;
+                if (Math.abs(amount) >= dragThreshold) {
+                    dragActive = true;
+                }
+                if (dragActive) {
+                    dragAmountY = amount;
+                    draggedItem.positionCaret()
+                }
+            }
+        }
+
+        onDragActiveChanged: {
+            // close contextual menu when dragging and reopen it at the end of the drag
+            if (dragActive) {
+                if (handler.popover != null) {
+                    PopupUtils.close(handler.popover);
+                }
+            } else {
+                handler.pressAndHold(-1);
+            }
+        }
     }
 
     // fake cursor, caret is reparented to it to avoid caret clipping
 
=== modified file 'modules/Ubuntu/Components/TextField.qml'
--- modules/Ubuntu/Components/TextField.qml	2014-10-02 20:08:52 +0000
+++ modules/Ubuntu/Components/TextField.qml	2014-11-10 18:31:06 +0000
@@ -16,6 +16,7 @@
 
 import QtQuick 2.0
 import Ubuntu.Components 1.1 as Ubuntu
+import Ubuntu.Components.Popups 1.0
 
 /*!
     \qmltype TextField
@@ -901,34 +902,6 @@
         }
     }
 
-    AbstractButton {
-        id: clearButton
-        objectName: "clear_button"
-        activeFocusOnPress: false
-
-        anchors {
-            top: parent.top
-            right: rightPane.left
-            bottom: parent.bottom
-            margins: internal.spacing
-        }
-        width: visible ? icon.width : 0
-        visible: control.hasClearButton &&
-                 !control.readOnly &&
-                    (control.activeFocus && ((editor.text != "") || editor.inputMethodComposing))
-
-        Icon {
-            id: icon
-            anchors.verticalCenter: parent.verticalCenter
-            width: units.gu(2.5)
-            height: width
-            // use icon from icon-theme
-            name: control.hasClearButton && !control.readOnly ? "clear-search" : ""
-        }
-
-        onClicked: editor.text = ""
-    }
-
     // hint text
     Label {
         id: hint
@@ -991,6 +964,7 @@
             // overrides
             selectByMouse: true
             activeFocusOnPress: true
+            onActiveFocusChanged: if (!activeFocus && inputHandler.popover) PopupUtils.close(inputHandler.popover)
 
             // input selection and navigation handling
             Ubuntu.Mouse.forwardTo: [inputHandler]
@@ -1010,6 +984,34 @@
         }
     }
 
+    AbstractButton {
+        id: clearButton
+        objectName: "clear_button"
+        activeFocusOnPress: false
+
+        anchors {
+            top: parent.top
+            right: rightPane.left
+            bottom: parent.bottom
+            margins: internal.spacing
+        }
+        width: visible ? icon.width : 0
+        visible: control.hasClearButton &&
+                 !control.readOnly &&
+                    (control.activeFocus && ((editor.text != "") || editor.inputMethodComposing))
+
+        Icon {
+            id: icon
+            anchors.verticalCenter: parent.verticalCenter
+            width: units.gu(2.5)
+            height: width
+            // use icon from icon-theme
+            name: control.hasClearButton && !control.readOnly ? "clear-search" : ""
+        }
+
+        onClicked: editor.text = ""
+    }
+
     Component.onCompleted: {
         editor.accepted.connect(control.accepted);
         cursorPosition = 0;
 
=== modified file 'modules/Ubuntu/Components/TextInputPopover.qml'
--- modules/Ubuntu/Components/TextInputPopover.qml	2014-08-31 19:24:19 +0000
+++ modules/Ubuntu/Components/TextInputPopover.qml	2014-11-10 18:31:06 +0000
@@ -26,6 +26,7 @@
         Action {
             text: i18n.dtr('ubuntu-ui-toolkit', "Select All")
             iconName: "edit-select-all"
+            enabled: target.text !== ""
             visible: target && target.selectedText === ""
             onTriggered: target.selectAll()
         },
@@ -34,25 +35,40 @@
             iconName: "edit-cut"
             // If paste/editing is not possible, then disable also "Cut" operation
             // It is applicable for ReadOnly's TextFields and TextAreas
-            enabled: target && target.selectedText !== "" && target.canPaste
+            enabled: target && target.selectedText !== "" && !target.readOnly
             visible: target.selectedText !== ""
-            onTriggered: target.cut()
+            onTriggered: {
+                PopupUtils.close(popover);
+                target.cut();
+            }
         },
         Action {
             text: i18n.dtr('ubuntu-ui-toolkit', "Copy")
             iconName: "edit-copy"
             enabled: target && target.selectedText !== ""
             visible: target.selectedText !== ""
-            onTriggered: target.copy()
+            onTriggered: {
+                PopupUtils.close(popover);
+                target.copy();
+            }
         },
         Action {
             text: i18n.dtr('ubuntu-ui-toolkit', "Paste")
             iconName: "edit-paste"
             enabled: target && target.canPaste
-            onTriggered: target.paste()
+            onTriggered: {
+                PopupUtils.close(popover);
+                target.paste();
+            }
         }
     ]
 
+    // removes hide animation
+    function hide() {
+        popover.visible = false;
+    }
+
+    autoClose: false
     contentHeight: row.childrenRect.height
     contentWidth: row.childrenRect.width
     Row {
@@ -73,7 +89,6 @@
                 height: units.gu(6)
                 action: actions[modelData]
                 style: Theme.createStyleComponent("ToolbarButtonStyle.qml", button)
-                onClicked: popover.hide()
             }
         }
     }
 
=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/TextCursorStyle.qml'
--- modules/Ubuntu/Components/Themes/Ambiance/TextCursorStyle.qml	2014-10-07 15:21:11 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/TextCursorStyle.qml	2014-11-10 18:31:06 +0000
@@ -53,10 +53,11 @@
     Component {
         id: delegate
         Rectangle {
+            objectName: "text_cursor_style_" + styledItem.positionProperty
             width: cursorWidth
             // FIXME: Extend the palette and use palette values here
             color: UbuntuColors.blue
-            visible: blinkTimer.timerShowCursor
+            visible: blinkTimer.timerShowCursor || !blinkTimer.running
             Timer {
                 id: blinkTimer
                 interval: cursorStyle.cursorVisibleTimeout
 
=== modified file 'modules/Ubuntu/Components/plugin/ucmousefilters.cpp'
--- modules/Ubuntu/Components/plugin/ucmousefilters.cpp	2014-04-25 12:53:58 +0000
+++ modules/Ubuntu/Components/plugin/ucmousefilters.cpp	2014-11-10 18:31:06 +0000
@@ -784,6 +784,7 @@
             m_owner->installEventFilter(this);
         } else {
             m_owner->removeEventFilter(this);
+            m_pressAndHoldTimer.stop();
         }
         Q_EMIT enabledChanged();
     }
 
=== modified file 'tests/autopilot/ubuntuuitoolkit/base.py'
--- tests/autopilot/ubuntuuitoolkit/base.py	2014-09-17 16:06:35 +0000
+++ tests/autopilot/ubuntuuitoolkit/base.py	2014-11-10 18:31:06 +0000
@@ -21,6 +21,9 @@
 import os
 import subprocess
 import ubuntuuitoolkit
+from autopilot.introspection import dbus
+from autopilot.matchers import Eventually
+from testtools.matchers import Equals
 
 from autopilot import (
     input,
@@ -80,3 +83,16 @@
             return input.Mouse
         else:
             return input.Touch
+
+    def _assert_not_visible(self, type_name='*', **kwargs):
+        """Confirm that an object is hidden.
+
+        Internally this means asserting that selecting the object fails.
+        """
+        try:
+            object = self.main_view.select_single(type_name, **kwargs)
+            # object.visible is always True if the select succeeds
+            self.assertThat(object.visible, Eventually(Equals(False)))
+        except dbus.StateNotFoundError:
+            # Caret can't be selected because it's hidden
+            pass
 
=== modified file 'tests/autopilot/ubuntuuitoolkit/tests/components/test_textinput.py'
--- tests/autopilot/ubuntuuitoolkit/tests/components/test_textinput.py	2014-09-22 07:19:56 +0000
+++ tests/autopilot/ubuntuuitoolkit/tests/components/test_textinput.py	2014-11-10 18:31:06 +0000
@@ -17,8 +17,11 @@
 """Tests for the Ubuntu UI Toolkit Header component."""
 
 import os
+import testtools
+from time import sleep
 
-from autopilot.introspection import dbus
+from autopilot.input._common import get_center_point
+from autopilot import platform
 
 from ubuntuuitoolkit import tests
 
@@ -57,19 +60,11 @@
         self.assertFalse(self.textfield.focus)
 
     def test_caret_visible_on_focus(self):
-        try:
-            cursor = self.main_view.select_single(
-                objectName='text_cursor_style_caret_cursorPosition')
-            # cursor.visible is always True if the select succeeds
-            self.assertFalse(cursor.visible)
-        except dbus.StateNotFoundError:
-            # Caret can't be selected because it's hidden
-            pass
-
+        cursorName = 'text_cursor_style_caret_cursorPosition'
+        self._assert_not_visible(objectName=cursorName)
         self.pointing_device.click_object(self.textfield)
         self.assertTrue(self.textfield.focus)
-        cursor = self.main_view.select_single(
-            objectName='text_cursor_style_caret_cursorPosition')
+        cursor = self.main_view.select_single(objectName=cursorName)
         self.assertTrue(cursor.visible)
 
     def test_caret_hide_while_typing(self):
@@ -96,3 +91,91 @@
         cursor = self.main_view.select_single(
             objectName='text_cursor_style_caret_selectionEnd')
         self.assertTrue(cursor.visible)
+
+
+class InsertModeTextInputTestCase(tests.QMLFileAppTestCase):
+
+    path = os.path.abspath(__file__)
+    dir_path = os.path.dirname(path)
+    textfield_qml_file_path = os.path.join(
+        dir_path, 'test_textinput.textfield.qml')
+    textarea_qml_file_path = os.path.join(
+        dir_path, 'test_textinput.textarea.qml')
+    customfield_qml_file_path = os.path.join(
+        dir_path, 'test_textinput.textfield_custom.qml')
+
+    scenarios = [
+        ('textfield',
+            dict(test_qml_file_path=textfield_qml_file_path,
+                 objectName='textfield')),
+        ('textarea',
+            dict(test_qml_file_path=textarea_qml_file_path,
+                 objectName='textarea')),
+        ('customfield',
+            dict(test_qml_file_path=customfield_qml_file_path,
+                 objectName='textfield')),
+    ]
+
+    def get_command_line(self, command_line):
+        command_line.append('-touch')
+        return command_line
+
+    def setUp(self):
+        super(InsertModeTextInputTestCase, self).setUp()
+        self.textfield = self.main_view.select_single(
+            objectName=self.objectName)
+        self.assertFalse(self.textfield.focus)
+
+    def assert_buttons(self, texts):
+        popover = self.main_view.get_text_input_context_menu(
+            'text_input_contextmenu')
+        for text in texts:
+            button = popover._get_button(text)
+            self.assertTrue(button.visible)
+
+    def assert_discard_popover(self):
+        # Discard popover by tap
+        self.pointing_device.move(
+            self.textfield.globalRect.x + self.textfield.width * 0.7,
+            self.textfield.globalRect.y + self.textfield.height / 10)
+        self.pointing_device.click()
+
+        self._assert_not_visible(objectName='text_input_contextmenu')
+
+    @testtools.skipIf(platform.model() == 'Desktop', 'Touch only')
+    def test_popover_visible_after_tapping_caret(self):
+        # Insert Mode
+        self.pointing_device.click_object(self.textfield)
+        sleep(1)
+        cursor = self.main_view.select_single(
+            objectName='text_cursor_style_cursorPosition')
+        self.pointing_device.click_object(cursor)
+        self.assert_buttons(['Select All', 'Paste'])
+        self.assert_discard_popover()
+
+    @testtools.skipIf(platform.model() == 'Desktop', 'Touch only')
+    def test_popover_visible_after_dragging_caret(self):
+        # Insert Mode
+        self.pointing_device.click_object(self.textfield)
+        self.textfield.keyboard.type('Lorem ipsum')
+        #self.pointing_device.click_object(self.textfield)
+        cursor = self.main_view.select_single(
+            objectName='text_cursor_style_cursorPosition')
+        x, y = get_center_point(cursor)
+        self.pointing_device.drag(x, y, 0, y)
+        self.assert_buttons(['Select All', 'Paste'])
+        self.assert_discard_popover()
+
+    @testtools.skipIf(platform.model() == 'Desktop', 'Touch only')
+    def test_popover_visible_after_selecting(self):
+        # Select Mode
+        self.pointing_device.click_object(self.textfield)
+        self.textfield.keyboard.type('Lorem ipsum')
+        self.pointing_device.move(
+            self.textfield.globalRect.x + self.textfield.width / 8,
+            self.textfield.globalRect.y + self.textfield.height / 2)
+        # Long press to select a word
+        self.pointing_device.click()
+        self.pointing_device.click()
+        self.assert_buttons(['Cut', 'Copy', 'Paste'])
+        self.assert_discard_popover()
 
=== modified file 'tests/unit_x11/tst_components/tst_textinput_common.qml'
--- tests/unit_x11/tst_components/tst_textinput_common.qml	2014-07-13 07:19:15 +0000
+++ tests/unit_x11/tst_components/tst_textinput_common.qml	2014-11-10 18:31:06 +0000
@@ -175,38 +175,6 @@
             cursorRectSpy.target = null;
         }
 
-        function test_press_and_hold_does_nothing_data() {
-            return [
-                {tag: "TextField", input: textField, withTextSelected: false},
-                {tag: "TextArea", input: textArea, withTextSelected: false},
-                {tag: "TextField", input: textField, withTextSelected: true},
-                {tag: "TextArea", input: textArea, withTextSelected: true},
-            ];
-        }
-
-        function test_press_and_hold_does_nothing(data) {
-            var handler = findChild(data.input, "input_handler");
-            popupSpy.target = handler;
-
-            data.input.focus = true;
-            if (data.withTextSelected) {
-                // select the first 20 characters
-                data.input.select(0, 20);
-            }
-
-            // press and hold over selected text
-            mouseLongPress(data.input, units.gu(7), y);
-            waitForRendering(data.input);
-            expectFailContinue(data.tag, "Should not open popover");
-            popupSpy.wait(400);
-
-            if (data.withTextSelected) {
-                // text selection must not be cleared
-                verify(data.input.selectedText !== "", "Selected text cleared!");
-            }
-            mouseRelease(data.input, units.gu(7), y);
-        }
-
         function test_scroll_when_not_focused_data() {
             return [
                 // dx and dy are in eights of a degree; see QWheelEvent::angleDelta() for more details.
@@ -274,7 +242,7 @@
                 {tag: "TextField click on selection", input: textField, selectChars: 10, clickPos: Qt.point(10, textField.height / 2)},
                 {tag: "TextArea click on selection", input: textArea, selectChars: 40, clickPos: Qt.point(20, 20)},
                 {tag: "TextField click beside selection", input: textField, selectChars: 5, clickPos: Qt.point(textField.width / 2, textField.height / 2)},
-                {tag: "TextArea click beside selection", input: textArea, selectChars: 5, clickPos: Qt.point(textArea.width / 2, textArea.height / 2)},
+                {tag: "TextArea click beside selection", input: textArea, selectChars: 1, clickPos: Qt.point(textArea.width / 2, textArea.height / 2)},
             ];
         }
         function test_clear_selection_on_click(data) {
 
=== modified file 'tests/unit_x11/tst_components/tst_textinput_touch.qml'
--- tests/unit_x11/tst_components/tst_textinput_touch.qml	2014-08-26 10:36:07 +0000
+++ tests/unit_x11/tst_components/tst_textinput_touch.qml	2014-11-10 18:31:06 +0000
@@ -223,7 +223,7 @@
             return [
                 {tag: "TextField", input: textField, initialCursorPosition: 0, cursorName: "selectionEnd", delta: guPoint(10, 0)},
                 {tag: "TextArea", input: textArea, initialCursorPosition: 0, cursorName: "selectionEnd", delta: guPoint(10, 5)},
-                {tag: "TextField", input: textField, initialCursorPosition: 50, cursorName: "selectionStart", delta: guPoint(-10, 0)},
+                {tag: "TextField", input: textField, initialCursorPosition: 48, cursorName: "selectionStart", delta: guPoint(-10, 0)},
                 {tag: "TextArea", input: textArea, initialCursorPosition: 50, cursorName: "selectionStart", delta: guPoint(-20, -5)},
             ];
         }
@@ -268,7 +268,6 @@
         function test_0_drag_autosizing_textarea_drags_parent_flickable_data() {
             return [
                 {tag: "when inactive", focused: false },
-                {tag: "when active", focused: true },
             ];
         }
         function test_0_drag_autosizing_textarea_drags_parent_flickable(data) {