Merge lp:~aacid/unity8/fix_indicators_update_state into lp:unity8

[Albert Astals Cid]

Update state of indicators bar only when the user is actively dragging himself

Fixes race with timer causing bug 1457044

 * Are there any related MPs required for this MP to build/function as expected?
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

 * Did you have a look at the warnings when running tests? Can they be reduced?
Yes, not introducing any new warning

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1793
http://jenkins.qa.ubuntu.com/job/unity8-ci/5765/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-wily-touch/44
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-wily/28/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-wily-amd64-ci/43
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-wily-i386-ci/43
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-wily-mako/34
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/44
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/44/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/20734

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/5765/rebuild

review: Needs Fixing (continuous-integration)

[lp:~aacid/unity8/fix_indicators_update_state]

1794. By Albert Astals Cid on 2015-05-26

Fix test

We need to make sure we are pressing the handle before fake changing the height of the indicatorsMenu

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1794
http://jenkins.qa.ubuntu.com/job/unity8-ci/5766/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-wily-touch/45
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-wily/29/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-wily-amd64-ci/44
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-wily-i386-ci/44
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-wily-mako/35
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/45
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/45/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/20740

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/5766/rebuild

review: Needs Fixing (continuous-integration)

[lp:~aacid/unity8/fix_indicators_update_state]

1795. By Albert Astals Cid on 2015-05-27

Merge oxide_regression_workaround

1796. By Albert Astals Cid on 2015-06-22

Merge unity8

1797. By Albert Astals Cid on 2015-07-03

Merge unit8

Unmerged revisions

=== modified file 'qml/Panel/IndicatorsMenu.qml'
--- qml/Panel/IndicatorsMenu.qml	2015-05-18 23:04:12 +0000
+++ qml/Panel/IndicatorsMenu.qml	2015-05-27 13:37:16 +0000
@@ -270,7 +270,7 @@
         }
 
         function updateState() {
-            if (!showAnimation.running && !hideAnimation.running) {
+            if (!showAnimation.running && !hideAnimation.running && d.activeDragHandle) {
                 if (unitProgress <= 0) {
                     root.state = "initial";
                 // lock indicator if we've been committed and aren't moving too much laterally or too fast up.

=== modified file 'tests/autopilot/unity8/indicators/__init__.py'
--- tests/autopilot/unity8/indicators/__init__.py	2015-04-28 15:20:13 +0000
+++ tests/autopilot/unity8/indicators/__init__.py	2015-05-27 13:37:16 +0000
@@ -74,6 +74,7 @@
         # XXX this should be implemented as a general horizontal swiping in
         # the toolkit custom proxy object. -- elopio - 2015-01-20
         if not flickable.atXEnd:
+            flickable.interactive.wait_for(True)
             while not flickable.atXEnd:
                 start_y = stop_y = (
                     flickable.globalRect.y +

=== modified file 'tests/qmltests/CMakeLists.txt'
--- tests/qmltests/CMakeLists.txt	2015-05-18 23:04:19 +0000
+++ tests/qmltests/CMakeLists.txt	2015-05-27 13:37:16 +0000
@@ -93,4 +93,4 @@
 add_qml_test(Stages WindowMoveResizeArea)
 add_qml_test(Stages Splash)
 add_qml_test(Tutorial Tutorial)
-add_qml_test(Wizard Wizard)
+add_qml_test(Wizard Wizard ENVIRONMENT "OXIDE_NO_SANDBOX=1")

=== modified file 'tests/qmltests/Panel/tst_IndicatorsMenu.qml'
--- tests/qmltests/Panel/tst_IndicatorsMenu.qml	2014-11-25 12:53:03 +0000
+++ tests/qmltests/Panel/tst_IndicatorsMenu.qml	2015-05-27 13:37:16 +0000
@@ -147,11 +147,17 @@
         }
 
         function test_progress_changes_state_to_reveal() {
+            var firstItem = get_indicator_item(0);
+            var firstItemMappedPosition = indicatorsMenu.mapFromItem(firstItem, firstItem.width/2, firstItem.height/2);
+            touchPress(indicatorsMenu, firstItemMappedPosition.x, indicatorsMenu.minimizedPanelHeight / 2);
+
             indicatorsMenu.height = indicatorsMenu.openedHeight / 2;
             compare(indicatorsMenu.state, "reveal", "Indicators should be revealing when partially opened.");
 
             indicatorsMenu.height = indicatorsMenu.openedHeight;
             compare(indicatorsMenu.state, "reveal", "Indicators should still be revealing when fully opened.");
+
+            touchRelease(indicatorsMenu, firstItemMappedPosition.x, indicatorsMenu.minimizedPanelHeight / 2);
         }
 
         function test_open_state() {