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

[Albert Astals Cid]

Limit tab-focus travelling on dialogs with a fence

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

 * Did you perform an exploratory manual test run of your code change and any related functionality?
Only tests since unity8 is not runnable on zesty at the moment

 * 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

[Unity8 CI Bot (unity8-ci-bot)]

FAILED: Continuous integration, rev:2746
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/2759/
Executed test runs:
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build/3617/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/3645
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/3491/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/3491/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/3491/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/3491/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/3491/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/3491/console

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/2759/rebuild

review: Needs Fixing (continuous-integration)

[lp:~aacid/unity8/tab_focus_fence_dialogs]

2747. By Albert Astals Cid on 2016-12-22

Test the focus fence in the shutdown dialog

[Unity8 CI Bot (unity8-ci-bot)]

FAILED: Continuous integration, rev:2747
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/2769/
Executed test runs:
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build/3627/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/3655
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/3501/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/3501/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/3501/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/3501/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/3501/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/3501/console

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/2769/rebuild

review: Needs Fixing (continuous-integration)

[Lukáš Tinkl (lukas-kde)]

Some minor comments inline, otherwise the code looks good (haven't tested yet)

review: Needs Fixing (code-review)

[Lukáš Tinkl (lukas-kde)]

Generally works fine but I can no longer press Esc to dismiss the logout/lock/reboot dialog.

review: Needs Fixing

[Lukáš Tinkl (lukas-kde)]

When in phone mode:

1. Press Ctrl+Alt+Delete to invoke the logout dialog
2. Press Tab
3. The task switcher gets activated instead
4. Subsequent Tab presses are correctly cycling thru the dialog's buttons

Point 3 needs fixing

review: Needs Fixing

[lp:~aacid/unity8/tab_focus_fence_dialogs]

2748. By Albert Astals Cid on 2017-01-03

New year

2749. By Albert Astals Cid on 2017-01-03

{}

2750. By Albert Astals Cid on 2017-01-03

oh no an empty line!

[Albert Astals Cid (aacid)]

> What is this purpose of this, can't see it being used anywhere

It's a default property, the purpose is to make children of the parent children of the default property.

[Unity8 CI Bot (unity8-ci-bot)]

FAILED: Continuous integration, rev:2750
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/2792/
Executed test runs:
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build/3655/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/3683
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/3528/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/3528/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/3528/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/3528/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/3528/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/3528/console

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/2792/rebuild

review: Needs Fixing (continuous-integration)

[lp:~aacid/unity8/tab_focus_fence_dialogs]

2751. By Albert Astals Cid on 2017-01-03

Merge

2752. By Albert Astals Cid on 2017-01-03

Beware of the evil double space!

2753. By Albert Astals Cid on 2017-01-03

Restore Esc to close dialog + test

[Albert Astals Cid (aacid)]

> Generally works fine but I can no longer press Esc to dismiss the
> logout/lock/reboot dialog.

Fixed

[Albert Astals Cid (aacid)]

> When in phone mode:
>
> 1. Press Ctrl+Alt+Delete to invoke the logout dialog
> 2. Press Tab
> 3. The task switcher gets activated instead
> 4. Subsequent Tab presses are correctly cycling thru the dialog's buttons
>
>
> Point 3 needs fixing

This seems to be a side effect of switching VTs, if you don't all is fine.

[Lukáš Tinkl (lukas-kde)]

This branch alone works fine; the issue with the logout dialog breaking Alt+Tab will be dealt with in another branch.

Waiting with top approval for CI

review: Approve

[Unity8 CI Bot (unity8-ci-bot)]

FAILED: Continuous integration, rev:2752
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/2795/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/3659
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=qmluitests.sh/2095
    UNSTABLE: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=zesty,testname=qmluitests.sh/2095
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/3687
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/3532
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/3532/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/3532
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/3532/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/3532
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/3532/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/3532
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/3532/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/3532
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/3532/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/3532
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/3532/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/2795/rebuild

review: Needs Fixing (continuous-integration)

[Lukáš Tinkl (lukas-kde)]

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

Yes

* Did CI run pass? If not, please explain why.

Yes, with an exception of an unrelated failure

review: Approve

[Unity8 CI Bot (unity8-ci-bot)]

PASSED: Continuous integration, rev:2753
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/2806/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/3673
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=qmluitests.sh/2106
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=zesty,testname=qmluitests.sh/2106
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/3701
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/3545
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/3545/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/3545
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/3545/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/3545
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/3545/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/3545
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/3545/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/3545
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/3545/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/3545
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/3545/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/2806/rebuild

review: Approve (continuous-integration)

=== modified file 'plugins/Utils/CMakeLists.txt'
--- plugins/Utils/CMakeLists.txt	2016-12-07 13:43:25 +0000
+++ plugins/Utils/CMakeLists.txt	2017-01-03 13:45:36 +0000
@@ -34,6 +34,7 @@
     deviceconfigparser.cpp
     globalfunctions.cpp
     URLDispatcher.cpp
+    tabfocusfence.cpp
     plugin.cpp
     )
 

=== modified file 'plugins/Utils/plugin.cpp'
--- plugins/Utils/plugin.cpp	2016-11-01 18:18:56 +0000
+++ plugins/Utils/plugin.cpp	2017-01-03 13:45:36 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2015 Canonical, Ltd.
+ * Copyright (C) 2012-2017 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
@@ -40,6 +40,7 @@
 #include "globalfunctions.h"
 #include "URLDispatcher.h"
 #include "appdrawerproxymodel.h"
+#include "tabfocusfence.h"
 
 static QObject *createWindowStateStorage(QQmlEngine *engine, QJSEngine *scriptEngine)
 {
@@ -84,4 +85,5 @@
     qmlRegisterSingletonType<GlobalFunctions>(uri, 0, 1, "Functions", createGlobalFunctions);
     qmlRegisterType<URLDispatcher>(uri, 0, 1, "URLDispatcher");
     qmlRegisterType<AppDrawerProxyModel>(uri, 0, 1, "AppDrawerProxyModel");
+    qmlRegisterType<TabFocusFenceItem>(uri, 0, 1, "TabFocusFence");
 }

=== added file 'plugins/Utils/tabfocusfence.cpp'
--- plugins/Utils/tabfocusfence.cpp	1970-01-01 00:00:00 +0000
+++ plugins/Utils/tabfocusfence.cpp	2017-01-03 13:45:36 +0000
@@ -0,0 +1,46 @@
+/*
+ * Copyright 2017 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser 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 Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include "tabfocusfence.h"
+
+#include <private/qquickitem_p.h>
+
+TabFocusFenceItem::TabFocusFenceItem(QQuickItem *parent) : QQuickItem(parent)
+{
+    QQuickItemPrivate *d = QQuickItemPrivate::get(this);
+    d->isTabFence = true;
+    setFlag(ItemIsFocusScope);
+}
+
+void TabFocusFenceItem::keyPressEvent(QKeyEvent *event)
+{
+    // Needed so we eat Tab keys when there's only one item inside the fence
+    if (event->key() == Qt::Key_Tab) {
+        event->accept();
+    } else {
+        QQuickItem::keyPressEvent(event);
+    }
+}
+
+void TabFocusFenceItem::keyReleaseEvent(QKeyEvent *event)
+{
+    // Needed so we eat Tab keys when there's only one item inside the fence
+    if (event->key() == Qt::Key_Tab) {
+        event->accept();
+    } else {
+        QQuickItem::keyReleaseEvent(event);
+    }
+}

=== added file 'plugins/Utils/tabfocusfence.h'
--- plugins/Utils/tabfocusfence.h	1970-01-01 00:00:00 +0000
+++ plugins/Utils/tabfocusfence.h	2017-01-03 13:45:36 +0000
@@ -0,0 +1,35 @@
+/*
+ * Copyright 2017 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser 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 Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#ifndef TABFOCUSFENCE_H
+#define TABFOCUSFENCE_H
+
+#include <QQuickItem>
+
+// An item that restricts focus Tab travelling
+// to its children
+class TabFocusFenceItem : public QQuickItem
+{
+Q_OBJECT
+
+public:
+    TabFocusFenceItem(QQuickItem *parent = nullptr);
+
+    void keyPressEvent(QKeyEvent *event) override;
+    void keyReleaseEvent(QKeyEvent *event) override;
+};
+
+#endif

=== modified file 'qml/Components/Dialogs.qml'
--- qml/Components/Dialogs.qml	2017-01-03 13:45:36 +0000
+++ qml/Components/Dialogs.qml	2017-01-03 13:45:36 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2016 Canonical, Ltd.
+ * Copyright (C) 2014-2017 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
@@ -149,6 +149,7 @@
             title: i18n.ctr("Title: Lock/Log out dialog", "Log out")
             text: i18n.tr("Are you sure you want to log out?")
             Button {
+                width: parent.width
                 text: i18n.ctr("Button: Lock the system", "Lock")
                 onClicked: {
                     LightDMService.greeter.showGreeter()
@@ -156,6 +157,7 @@
                 }
             }
             Button {
+                width: parent.width
                 focus: true
                 text: i18n.ctr("Button: Log out from the system", "Log Out")
                 onClicked: {
@@ -164,6 +166,7 @@
                 }
             }
             Button {
+                width: parent.width
                 text: i18n.tr("Cancel")
                 onClicked: {
                     logoutDialog.hide();
@@ -179,12 +182,14 @@
             title: i18n.ctr("Title: Reboot dialog", "Reboot")
             text: i18n.tr("Are you sure you want to reboot?")
             Button {
+                width: parent.width
                 text: i18n.tr("No")
                 onClicked: {
                     rebootDialog.hide();
                 }
             }
             Button {
+                width: parent.width
                 focus: true
                 text: i18n.tr("Yes")
                 onClicked: {
@@ -204,6 +209,7 @@
             title: i18n.ctr("Title: Power off/Restart dialog", "Power")
             text: i18n.tr("Are you sure you would like\nto power off?")
             Button {
+                width: parent.width
                 focus: true
                 text: i18n.ctr("Button: Power off the system", "Power off")
                 onClicked: {
@@ -214,6 +220,7 @@
                 color: theme.palette.normal.negative
             }
             Button {
+                width: parent.width
                 text: i18n.ctr("Button: Restart the system", "Restart")
                 onClicked: {
                     root.closeAllApps();
@@ -222,6 +229,7 @@
                 }
             }
             Button {
+                width: parent.width
                 text: i18n.tr("Cancel")
                 onClicked: {
                     powerDialog.hide();

=== modified file 'qml/Components/Lockscreen.qml'
--- qml/Components/Lockscreen.qml	2016-08-30 14:06:47 +0000
+++ qml/Components/Lockscreen.qml	2017-01-03 13:45:36 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013 Canonical, Ltd.
+ * Copyright (C) 2013-2017 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
@@ -240,8 +240,10 @@
             property var dialogLoader // dummy to satisfy ShellDialog's context dependent prop
 
             Button {
+                width: parent.width
                 objectName: "infoPopupOkButton"
                 text: i18n.tr("OK")
+                focus: true
                 onClicked: {
                     PopupUtils.close(dialog)
                     root.infoPopupConfirmed();

=== modified file 'qml/Components/ModeSwitchWarningDialog.qml'
--- qml/Components/ModeSwitchWarningDialog.qml	2016-05-17 20:46:51 +0000
+++ qml/Components/ModeSwitchWarningDialog.qml	2017-01-03 13:45:36 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2015 Canonical, Ltd.
+ * Copyright (C) 2015-2017 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
@@ -29,6 +29,7 @@
     signal forceClose();
 
     Label {
+        width: parent.width
         text: i18n.tr("Apps may have unsaved data:")
         fontSize: "large"
         color: "#5D5D5D"
@@ -37,6 +38,7 @@
     Repeater {
         id: appRepeater
         RowLayout {
+            width: parent.width
             spacing: units.gu(2)
             Image {
                 Layout.preferredHeight: units.gu(2)
@@ -54,20 +56,23 @@
     }
 
     Label {
+        width: parent.width
         text: i18n.ctr("Re-dock means connect the device again to an external screen/mouse/keyboard", "Re-dock, save your work and close these apps to continue.")
         wrapMode: Text.WordWrap
         color: "#888888"
     }
 
     Label {
+        width: parent.width
         text: i18n.tr("Or force close now (unsaved data will be lost).")
         wrapMode: Text.WordWrap
         color: "#888888"
     }
 
-    ThinDivider {}
+    ThinDivider { width: parent.width }
 
     RowLayout {
+        width: parent.width
         Label {
             objectName: "reconnectLabel"
             Layout.fillWidth: true
@@ -84,6 +89,7 @@
         }
 
         Button {
+            focus: true
             objectName: "forceCloseButton"
             text: i18n.tr("Close all")
             color: theme.palette.normal.negative

=== modified file 'qml/Components/ShellDialog.qml'
--- qml/Components/ShellDialog.qml	2016-03-29 03:47:39 +0000
+++ qml/Components/ShellDialog.qml	2017-01-03 13:45:36 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014 Canonical, Ltd.
+ * Copyright (C) 2014-2017 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
@@ -19,6 +19,7 @@
 import Ubuntu.Components 1.3
 import Ubuntu.Components.Themes 1.3
 import Ubuntu.Components.Popups 1.3
+import Utils 0.1
 
 /*
     A Dialog configured for use as a proper in-scene Dialog
@@ -32,6 +33,8 @@
     // NB: PopupBase, Dialog's superclass, will check for the existence of this property
     property bool reparentToRootItem: false
 
+    default property alias columnContents: column.data
+
     onVisibleChanged: { if (!visible && dialogLoader) { dialogLoader.active = false; } }
 
     Keys.onEscapePressed: hide()
@@ -50,4 +53,15 @@
         __foreground.theme = themeHack
         show();
     }
+
+    TabFocusFence {
+        width: parent.width
+        height: column.height
+        focus: true
+        Column {
+            id: column
+            width: parent.width
+            spacing: units.gu(2)
+        }
+    }
 }

=== modified file 'tests/mocks/Utils/CMakeLists.txt'
--- tests/mocks/Utils/CMakeLists.txt	2016-12-07 13:43:25 +0000
+++ tests/mocks/Utils/CMakeLists.txt	2017-01-03 13:45:36 +0000
@@ -25,6 +25,7 @@
     ${CMAKE_SOURCE_DIR}/plugins/Utils/deviceconfigparser.cpp
     ${CMAKE_SOURCE_DIR}/plugins/Utils/globalfunctions.cpp
     ${CMAKE_SOURCE_DIR}/plugins/Utils/appdrawerproxymodel.cpp
+    ${CMAKE_SOURCE_DIR}/plugins/Utils/tabfocusfence.cpp
     ${APPLICATION_API_INCLUDEDIR}/unity/shell/application/ApplicationManagerInterface.h
     ${APPLICATION_API_INCLUDEDIR}/unity/shell/application/ApplicationInfoInterface.h
     ${APPLICATION_API_INCLUDEDIR}/unity/shell/application/MirSurfaceInterface.h

=== modified file 'tests/mocks/Utils/plugin.cpp'
--- tests/mocks/Utils/plugin.cpp	2016-11-01 18:18:56 +0000
+++ tests/mocks/Utils/plugin.cpp	2017-01-03 13:45:36 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2015-2016 Canonical, Ltd.
+ * Copyright (C) 2015-2017 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
@@ -41,6 +41,7 @@
 #include <deviceconfigparser.h>
 #include <globalfunctions.h>
 #include <appdrawerproxymodel.h>
+#include <tabfocusfence.h>
 
 static QObject *createWindowStateStorage(QQmlEngine *engine, QJSEngine *scriptEngine)
 {
@@ -84,4 +85,5 @@
     qmlRegisterSingletonType<GlobalFunctions>(uri, 0, 1, "Functions", createGlobalFunctions);
     qmlRegisterType<URLDispatcher>(uri, 0, 1, "URLDispatcher");
     qmlRegisterType<AppDrawerProxyModel>(uri, 0, 1, "AppDrawerProxyModel");
+    qmlRegisterType<TabFocusFenceItem>(uri, 0, 1, "TabFocusFence");
 }

=== modified file 'tests/qmltests/tst_OrientedShell.qml'
--- tests/qmltests/tst_OrientedShell.qml	2016-12-12 16:45:09 +0000
+++ tests/qmltests/tst_OrientedShell.qml	2017-01-03 13:45:36 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2015-2016 Canonical, Ltd.
+ * Copyright (C) 2015-2017 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
@@ -1558,5 +1558,43 @@
             verify(surface);
             return surface.activeFocus;
         }
+
+        function test_tabCyclyingInShutdownDialog() {
+            loadShell("mako");
+
+            testCase.showPowerDialog();
+
+            var dialogs = findChild(orientedShell, "dialogs");
+            var buttons = findChildsByType(dialogs, "Button");
+
+            tryCompare(buttons[0], "activeFocus", true);
+
+            keyClick(Qt.Key_Tab);
+            tryCompare(buttons[1], "activeFocus", true);
+
+            keyClick(Qt.Key_Tab);
+            tryCompare(buttons[2], "activeFocus", true);
+
+            keyClick(Qt.Key_Tab);
+            tryCompare(buttons[0], "activeFocus", true);
+
+            keyClick(Qt.Key_Escape);
+
+            var dialogLoader = findChild(orientedShell, "dialogLoader");
+            tryCompare(dialogLoader, "item", null);
+        }
+
+        function test_escColosesShutdownDialog() {
+            loadShell("mako");
+
+            testCase.showPowerDialog();
+
+            var dialogLoader = findChild(orientedShell, "dialogLoader");
+            tryCompareFunction(function() { return dialogLoader.item !== null }, true);
+
+            keyClick(Qt.Key_Escape);
+
+            tryCompare(dialogLoader, "item", null);
+        }
     }
 }