diff options
| author | Sylvain Pineau <sylvain.pineau@canonical.com> | 2018-04-30 14:41:47 +0200 |
|---|---|---|
| committer | Sylvain Pineau <sylvain.pineau@canonical.com> | 2018-04-30 14:41:47 +0200 |
| commit | 5fce85372efcf80660c035574f1d274799d4a533 (patch) | |
| tree | 7e297d69160868ff9cb9a6f57829f20fde729b2e /units/touchscreen | |
| parent | 0322afd467e93b33c42b0b4fc371a91bdf22517a (diff) | |
touchscreen/x-touch-tap: Fix qmlscene invocation and disable unity only on 16.04
Fixes: lp:1766766
Diffstat (limited to 'units/touchscreen')
| -rw-r--r-- | units/touchscreen/jobs.pxu | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/units/touchscreen/jobs.pxu b/units/touchscreen/jobs.pxu index 9db5677d..98a2d4f6 100644 --- a/units/touchscreen/jobs.pxu +++ b/units/touchscreen/jobs.pxu @@ -124,6 +124,7 @@ _description: Did the tap open the Dash? plugin: user-interact-verify +template-engine: jinja2 category_id: com.canonical.plainbox::touchscreen id: touchscreen/3-touch-tap imports: from com.canonical.plainbox import manifest @@ -139,14 +140,19 @@ _description: VERIFICATION: Did you see the green circles around the three fingers? command: + {%- if __system_env__["XDG_CURRENT_DESKTOP"] == 'Unity' %} manage_compiz_plugin unityshell disable - qmlscene -qt5 $PLAINBOX_PROVIDER_DATA/touch_tap_test.qml 3 2>&1 | grep -o PASS + {% endif %} + qmlscene -qt5 3 $PLAINBOX_PROVIDER_DATA/touch_tap_test.qml 2>&1 | grep -o PASS EXIT=$? sleep 5 + {%- if __system_env__["XDG_CURRENT_DESKTOP"] == 'Unity' %} manage_compiz_plugin unityshell enable + {% endif %} exit $EXIT plugin: user-interact-verify +template-engine: jinja2 category_id: com.canonical.plainbox::touchscreen id: touchscreen/4-touch-tap imports: from com.canonical.plainbox import manifest @@ -162,9 +168,13 @@ _description: VERIFICATION: Did you see the green circles around the four fingers? command: + {%- if __system_env__["XDG_CURRENT_DESKTOP"] == 'Unity' %} manage_compiz_plugin unityshell disable - qmlscene -qt5 $PLAINBOX_PROVIDER_DATA/touch_tap_test.qml 4 2>&1 | grep -o PASS + {% endif %} + qmlscene -qt5 4 $PLAINBOX_PROVIDER_DATA/touch_tap_test.qml 2>&1 | grep -o PASS EXIT=$? sleep 5 + {%- if __system_env__["XDG_CURRENT_DESKTOP"] == 'Unity' %} manage_compiz_plugin unityshell enable + {% endif %} exit $EXIT |