Merge lp:~nick-dedekind/unity/phablet.indicators.small-swipe into lp:unity/phablet

[Nick Dedekind]

Fixed issue where the indicator menus will not open if you do a small swipe on the indicator bar.

Fixed issue where the indicator menus will not open if you do a small swipe on the indicator bar.
This only happens if you don't swipe beyond the hint threshold.

[Michał Sawicz (saviq)]

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:620
http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/731/
Executed test runs:
    SUCCESS: http://s-jenkins:8080/job/unity-phablet-qmluitests/557
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-ci/733
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-ci/733/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-i386-ci/731
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/607
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/607/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-i386-ci/611
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/1274

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-phablet-ci/731/rebuild

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/unity-phablet-autolanding/245/
Executed test runs:
    SUCCESS: http://s-jenkins:8080/job/unity-phablet-qmluitests/570
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-autolanding/245
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-autolanding/245/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-i386-autolanding/245
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-autolanding/179
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-autolanding/179/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-i386-autolanding/179
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/1285

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'Panel/Indicators.qml'
--- Panel/Indicators.qml	2013-04-12 08:37:35 +0000
+++ Panel/Indicators.qml	2013-04-23 10:27:40 +0000
@@ -250,6 +250,10 @@
                 if (indicators.state == "initial") {
                     openOverview()
                 }
+                else {
+                    indicators.calculateCurrentItem(revealer.lateralPosition, false)
+                    menuContent.showMenu()
+                }
                 indicators.state = "commit"
             }
         }

=== modified file 'tests/qmltests/Panel/tst_Indicators.qml'
--- tests/qmltests/Panel/tst_Indicators.qml	2013-04-17 13:01:10 +0000
+++ tests/qmltests/Panel/tst_Indicators.qml	2013-04-23 10:27:40 +0000
@@ -197,5 +197,16 @@
             compare(indicators.partiallyOpened, false, "Indicator should show as fully opened when in between revealer closedValue & openedValue height");
             compare(indicators.fullyOpened, true, "Indicator should not show as fully opened when at revealer openedValue height");
         }
+
+        // The indicator menu content should be shown if the indicators are show through an animation before they
+        // enter a furthur state through a progress change (eg press indicator row, drag down a less then hint
+        // threshold and release to show
+        function test_menu_open_on_hint_drag() {
+            indicators.handlePress();
+            indicators.show()
+
+            var menuContent = findChild(indicators, "menuContent")
+            compare(menuContent.__shown, true, "Indicator menu content should be shown after a indicator show.");
+        }
     }
 }