Merge lp:~mzanetti/unity8/disable-hud into lp:unity8

[Michael Zanetti]

disable hud and its tests. Not deleting any code yet as we don't know how it will come back.

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

https://code.launchpad.net/~mzanetti/ubuntu-ui-toolkit/drop-bottombarvisibilitycommunicator/+merge/209446

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

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

[lp:~mzanetti/unity8/disable-hud]

749. By Michael Zanetti on 2014-03-04

completely drop Hud and Bttombar from Shell.qml

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:748
http://jenkins.qa.ubuntu.com/job/unity8-ci/2424/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/3647
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/3252/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-trusty/1294
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-amd64-ci/945
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-ci/949
        deb: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-ci/949/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-i386-ci/945
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/3208
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/3651
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/3651/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/3254
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/3254/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/5629/console
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/4447

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:749
http://jenkins.qa.ubuntu.com/job/unity8-ci/2426/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/3654
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/3259/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-trusty/1296
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-amd64-ci/947
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-ci/951
        deb: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-ci/951/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-i386-ci/947
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/3213
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/3658
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/3658/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/3261
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/3261/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/5635/console
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/4455

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

review: Needs Fixing (continuous-integration)

[Albert Astals Cid (aacid)]

You probably want to comment out
  ./plugins/Utils/plugin.cpp:71: engine->rootContext()->setContextProperty("bottomBarVisibilityCommunicatorShell", bottomBarVisibilityCommunicator);
and the associated bottomBarVisibilityCommunicator code.

review: Needs Fixing

[Michał Sawicz (saviq)]

And skip the hud ap tests, too - http://docs.python.org/2/library/unittest.html#skipping-tests-and-expected-failures

review: Needs Fixing

[Michał Sawicz (saviq)]

Ah oh well, disabled_ works fine, too...

review: Abstain

[lp:~mzanetti/unity8/disable-hud]

750. By Michael Zanetti on 2014-03-05

also drop the bottombarvisiblitycommunicatorshell

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:750
http://jenkins.qa.ubuntu.com/job/unity8-ci/2431/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/3671
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/3270/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-trusty/1301
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-amd64-ci/952
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-ci/956
        deb: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-ci/956/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-i386-ci/952
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/3225
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/3676
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/3676/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/3272
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/3272/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/5644/console
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/4484

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

review: Needs Fixing (continuous-integration)

[lp:~mzanetti/unity8/disable-hud]

751. By Michael Zanetti on 2014-03-06

merge upstream branch

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:750
http://jenkins.qa.ubuntu.com/job/unity8-ci/2444/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/3717
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/3308/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-trusty/1314
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-amd64-ci/965
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-ci/969
        deb: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-ci/969/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-i386-ci/965
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/3267
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/3722
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/3722/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/3310
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/3310/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/5680/console
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/4533

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

review: Needs Fixing (continuous-integration)

Unmerged revisions

=== modified file 'plugins/Utils/CMakeLists.txt'
--- plugins/Utils/CMakeLists.txt	2014-02-18 14:39:51 +0000
+++ plugins/Utils/CMakeLists.txt	2014-03-06 14:25:32 +0000
@@ -12,7 +12,6 @@
 
 set(QMLPLUGIN_SRC
     albumartprovider.cpp
-    bottombarvisibilitycommunicatorshell.cpp
     mediaartcache.cpp
     qlimitproxymodelqml.cpp
     qsortfilterproxymodelqml.cpp

=== removed file 'plugins/Utils/bottombarvisibilitycommunicatorshell.cpp'
--- plugins/Utils/bottombarvisibilitycommunicatorshell.cpp	2013-11-12 12:13:04 +0000
+++ plugins/Utils/bottombarvisibilitycommunicatorshell.cpp	1970-01-01 00:00:00 +0000
@@ -1,49 +0,0 @@
-/*
- * Copyright (C) 2012 Canonical, Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "bottombarvisibilitycommunicatorshell.h"
-
-BottomBarVisibilityCommunicatorShell::BottomBarVisibilityCommunicatorShell()
- : m_forceHidden(false),
-   m_position(0)
-{
-}
-
-bool BottomBarVisibilityCommunicatorShell::forceHidden() const
-{
-    return m_forceHidden;
-}
-
-double BottomBarVisibilityCommunicatorShell::position() const
-{
-    return m_position;
-}
-
-void BottomBarVisibilityCommunicatorShell::setForceHidden(bool forceHidden)
-{
-    if (forceHidden != m_forceHidden) {
-        m_forceHidden = forceHidden;
-        Q_EMIT forceHiddenChanged(forceHidden);
-    }
-}
-
-void BottomBarVisibilityCommunicatorShell::setPosition(double position)
-{
-    if (position != m_position) {
-        m_position = position;
-        Q_EMIT positionChanged(position);
-    }
-}

=== removed file 'plugins/Utils/bottombarvisibilitycommunicatorshell.h'
--- plugins/Utils/bottombarvisibilitycommunicatorshell.h	2013-11-12 12:13:04 +0000
+++ plugins/Utils/bottombarvisibilitycommunicatorshell.h	1970-01-01 00:00:00 +0000
@@ -1,59 +0,0 @@
-/*
- * Copyright (C) 2012 Canonical, Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef BOTTOMBARVISIBILITYCOMMUNICATORSHELL_H
-#define BOTTOMBARVISIBILITYCOMMUNICATORSHELL_H
-
-#include <QObject>
-
-class QDBusInterface;
-
-/** This is an internal class used to talk with the bottom bar used by either
-  * applications or the SDK.
-  * There is a method to force the bottom bar to be hidden or otherwise behave as usual
-  */
-
-class BottomBarVisibilityCommunicatorShell : public QObject
-{
-    Q_OBJECT
-    Q_PROPERTY(bool forceHidden READ forceHidden WRITE setForceHidden NOTIFY forceHiddenChanged)
-    Q_PROPERTY(double position READ position WRITE setPosition NOTIFY positionChanged)
-
-    Q_CLASSINFO("D-Bus Interface", "com.canonical.Shell.BottomBarVisibilityCommunicator")
-public:
-    static BottomBarVisibilityCommunicatorShell& instance() {
-        static BottomBarVisibilityCommunicatorShell instance;
-        return instance;
-    }
-
-    bool forceHidden() const;
-    void setForceHidden(bool forceHidden);
-
-    double position() const;
-    void setPosition(double position);
-
-Q_SIGNALS:
-    void forceHiddenChanged(bool forceHidden);
-    void positionChanged(double position);
-
-private:
-    BottomBarVisibilityCommunicatorShell();
-
-    bool m_forceHidden;
-    double m_position;
-};
-
-#endif

=== modified file 'plugins/Utils/plugin.cpp'
--- plugins/Utils/plugin.cpp	2013-12-10 14:22:43 +0000
+++ plugins/Utils/plugin.cpp	2014-03-06 14:25:32 +0000
@@ -27,15 +27,11 @@
 
 // local
 #include "albumartprovider.h"
-#include "bottombarvisibilitycommunicatorshell.h"
 #include "qlimitproxymodelqml.h"
 #include "qsortfilterproxymodelqml.h"
 #include "timeformatter.h"
 #include "unitymenumodelpaths.h"
 
-static const char* BOTTOM_BAR_VISIBILITY_COMMUNICATOR_DBUS_PATH = "/BottomBarVisibilityCommunicator";
-static const char* DBUS_SERVICE = "com.canonical.Shell.BottomBarVisibilityCommunicator";
-
 void UtilsPlugin::registerTypes(const char *uri)
 {
     Q_ASSERT(uri == QLatin1String("Utils"));
@@ -45,7 +41,6 @@
     qmlRegisterType<UnityMenuModelPaths>(uri, 0, 1, "UnityMenuModelPaths");
     qmlRegisterType<TimeFormatter>(uri, 0, 1, "TimeFormatter");
     qmlRegisterType<GDateTimeFormatter>(uri, 0, 1, "GDateTimeFormatter");
-    qmlRegisterUncreatableType<BottomBarVisibilityCommunicatorShell>(uri, 0, 1, "BottomBarVisibilityCommunicatorShell", "Can't create BottomBarVisibilityCommunicatorShell");
 }
 
 void UtilsPlugin::initializeEngine(QQmlEngine *engine, const char *uri)
@@ -64,9 +59,4 @@
     {
         qWarning() << "Failed to register image provider for albumart (unknown error)";
     }
-
-    QDBusConnection::sessionBus().registerService(DBUS_SERVICE);
-    BottomBarVisibilityCommunicatorShell *bottomBarVisibilityCommunicator = &BottomBarVisibilityCommunicatorShell::instance();
-    QDBusConnection::sessionBus().registerObject(BOTTOM_BAR_VISIBILITY_COMMUNICATOR_DBUS_PATH, bottomBarVisibilityCommunicator, QDBusConnection::ExportAllContents);
-    engine->rootContext()->setContextProperty("bottomBarVisibilityCommunicatorShell", bottomBarVisibilityCommunicator);
 }

=== modified file 'qml/Shell.qml'
--- qml/Shell.qml	2014-03-04 11:42:38 +0000
+++ qml/Shell.qml	2014-03-06 14:25:32 +0000
@@ -28,9 +28,7 @@
 import "Greeter"
 import "Launcher"
 import "Panel"
-import "Hud"
 import "Components"
-import "Bottombar"
 import "SideStage"
 import "Notifications"
 import Unity.Notifications 1.0 as NotificationBackend
@@ -403,7 +401,7 @@
 
         readonly property int backgroundTopMargin: -panel.panelHeight
 
-        hides: [launcher, panel.indicators, hud]
+        hides: [launcher, panel.indicators]
         shown: false
         enabled: true
         showAnimation: StandardAnimation { property: "opacity"; to: 1 }
@@ -458,7 +456,7 @@
         objectName: "greeter"
 
         available: true
-        hides: [launcher, panel.indicators, hud]
+        hides: [launcher, panel.indicators]
         shown: true
 
         defaultBackground: shell.background
@@ -545,7 +543,7 @@
     InputFilterArea {
         anchors.fill: parent
         blockInput: !applicationFocused || greeter.shown || lockscreen.shown || launcher.shown
-                    || panel.indicators.shown || hud.shown
+                    || panel.indicators.shown
     }
 
     Connections {
@@ -607,48 +605,6 @@
             }
         }
 
-        Hud {
-            id: hud
-
-            width: parent.width > units.gu(60) ? units.gu(40) : parent.width
-            height: parent.height
-
-            available: !greeter.shown && !panel.indicators.shown && !lockscreen.shown && edgeDemo.dashEnabled
-            shown: false
-            showAnimation: StandardAnimation { property: "y"; duration: hud.showableAnimationDuration; to: 0; easing.type: Easing.Linear }
-            hideAnimation: StandardAnimation { property: "y"; duration: hud.showableAnimationDuration; to: hudRevealer.closedValue; easing.type: Easing.Linear }
-
-            Connections {
-                target: shell.applicationManager
-                onMainStageFocusedApplicationChanged: hud.hide()
-                onSideStageFocusedApplicationChanged: hud.hide()
-            }
-        }
-
-        Revealer {
-            id: hudRevealer
-
-            enabled: hud.shown
-            width: hud.width
-            anchors.left: hud.left
-            height: parent.height
-            target: hud.revealerTarget
-            closedValue: height
-            openedValue: 0
-            direction: Qt.RightToLeft
-            orientation: Qt.Vertical
-            handleSize: hud.handleHeight
-            onCloseClicked: target.hide()
-        }
-
-        Bottombar {
-            id: bottombar
-            theHud: hud
-            anchors.fill: parent
-            enabled: hud.available
-            applicationIsOnForeground: applicationFocused
-        }
-
         InputFilterArea {
             blockInput: launcher.shown
             anchors {
@@ -693,8 +649,6 @@
             onShownChanged: {
                 if (shown) {
                     panel.indicators.hide()
-                    hud.hide()
-                    bottombar.hide()
                 }
             }
         }

=== renamed file 'tests/autopilot/unity8/shell/tests/test_hud.py' => 'tests/autopilot/unity8/shell/tests/disabled_test_hud.py'