Merge lp:~feng-kylin/unity8/TapToReturnToCall into lp:unity8

[handsome_feng]

Don't expand indicators when tap to return to call.

Don't expand indicators when tap to return to call.

 * Are there any related MPs required for this MP to build/function as expected? Please list.

no

 * Did you perform an exploratory manual test run of your code change and any related functionality?

yes
 * Did you make sure that your branch does not contain spurious tags?

yes

 * If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?

n/a

 * If you changed the UI, has there been a design review?

n/a

[Lukáš Tinkl (lukas-kde)]

Looks good to me, nice work; one minor nitpick as an inline comment

review: Needs Fixing

[lp:~feng-kylin/unity8/TapToReturnToCall]

1801. By handsome_feng on 2015-06-10

Modified the name of testing function

[handsome_feng (feng-kylin)]

> Looks good to me, nice work; one minor nitpick as an inline comment

Thank you for your comment! I often make mistakes in grammar. :P

[Nick Dedekind (nick-dedekind)]

This should only be enabled on non-touch devices. The MouseArea is a fallback for not getting touch events in the DragHandles.

If we can determine if touch is enabled, that would be best as a compound decision.
showOnClick: touchEnabled && !callHint.visible

Also, more comments attached

[Nick Dedekind (nick-dedekind)]

Perhaps just update the comments. we can sort out the rest later when we have more design for non-touch devices. May want open with click on "desktop mode with touch" for example.

[Nick Dedekind (nick-dedekind)]

review: Needs Fixing

[Nick Dedekind (nick-dedekind)]

Also, can you modify your test so that is actually tests clicking on the panel doesn't open during an active call. (ie call mouseClick(...) on the panel and verify it doens't open). This tests behaviour rather than just your code changes. You're currently just testing that the area is disabled.

review: Needs Fixing

[lp:~feng-kylin/unity8/TapToReturnToCall]

1802. By handsome_feng on 2015-06-29

merge trunk

1803. By handsome_feng on 2015-06-29

modify the test

1804. By handsome_feng on 2015-06-29

update

[handsome_feng (feng-kylin)]

> Also, can you modify your test so that is actually tests clicking on the panel
> doesn't open during an active call. (ie call mouseClick(...) on the panel and
> verify it doens't open). This tests behaviour rather than just your code
> changes. You're currently just testing that the area is disabled.

Done. Thank you.

[lp:~feng-kylin/unity8/TapToReturnToCall]

1805. By handsome_feng on 2015-06-29

remove the useless objectName

[Nick Dedekind (nick-dedekind)]

Looks fine!

review: Approve

=== modified file 'qml/Panel/IndicatorsMenu.qml'
--- qml/Panel/IndicatorsMenu.qml	2015-05-18 23:04:12 +0000
+++ qml/Panel/IndicatorsMenu.qml	2015-06-29 06:21:57 +0000
@@ -36,6 +36,7 @@
     readonly property bool fullyClosed: unitProgress == 0
     property bool enableHint: true
     property bool contentEnabled: true
+    property bool showOnClick: true
     property color panelColor: "black"
 
     signal showTapped(point position)
@@ -168,7 +169,7 @@
         anchors.left: parent.left
         anchors.right: parent.right
         height: minimizedPanelHeight
-        enabled: __showDragHandle.enabled
+        enabled: __showDragHandle.enabled && showOnClick
         onClicked: {
             bar.selectItemAt(mouseX)
             root.show()
 
=== modified file 'qml/Panel/Panel.qml'
--- qml/Panel/Panel.qml	2015-04-15 11:37:00 +0000
+++ qml/Panel/Panel.qml	2015-06-29 06:21:57 +0000
@@ -147,6 +147,7 @@
                 return root.width
             }
             enableHint: !callHint.active && !fullscreenMode
+            showOnClick: !callHint.visible
             panelColor: indicatorAreaBackground.color
 
             onShowTapped: {
 
=== modified file 'tests/qmltests/Panel/tst_Panel.qml'
--- tests/qmltests/Panel/tst_Panel.qml	2015-04-15 11:37:00 +0000
+++ tests/qmltests/Panel/tst_Panel.qml	2015-06-29 06:21:57 +0000
@@ -19,6 +19,7 @@
 import QtTest 1.0
 import Unity.Test 0.1
 import Ubuntu.Components 0.1
+import Unity.Application 0.1
 import Unity.Indicators 0.1 as Indicators
 import Ubuntu.Telephony 0.1 as Telephony
 import "../../../qml/Panel"
@@ -421,6 +422,23 @@
             verify(panel.indicators.fullyClosed);
         }
 
+        function test_tapToReturnCallDoesntExpandIndicators() {
+            compare(panel.indicators.shown, false);
+            verify(panel.indicators.fullyClosed);
+
+            callManager.foregroundCall = phoneCall;
+
+            ApplicationManager.focusApplication("unity8-dash");
+            tryCompare(ApplicationManager, "focusedApplicationId", "unity8-dash");
+
+            mouseClick(panel.indicators,
+                       panel.indicators.width / 2,
+                       panel.indicators.minimizedPanelHeight / 2);
+
+            compare(panel.indicators.shown, false);
+            verify(panel.indicators.fullyClosed);
+        }
+
         function test_openAndClosePanelWithMouseClicks() {
             compare(panel.indicators.shown, false);
             verify(panel.indicators.fullyClosed);