Unity 8

Merge lp:~mzanetti/unity8/appdrawer-improvements into lp:unity8

appdrawer-improvements
Merge into trunk

Proposed by Michael Zanetti on 2016-12-13

Status:	Merged
Approved by:	Albert Astals Cid on 2017-01-16
Approved revision:	2737
Merged at revision:	2787
Proposed branch:	lp:~mzanetti/unity8/appdrawer-improvements
Merge into:	lp:unity8
Prerequisite:	lp:~lukas-kde/unity8/appdrawer-direct-search
Diff against target:	891 lines (+236/-166) 18 files modified data/com.canonical.Unity8.gschema.xml (+5/-0) plugins/Utils/appdrawerproxymodel.cpp (+1/-1) qml/Launcher/Drawer.qml (+78/-5) qml/Launcher/DrawerGridView.qml (+3/-1) qml/Launcher/DrawerListView.qml (+6/-0) qml/Launcher/Launcher.qml (+6/-10) qml/Launcher/LauncherDelegate.qml (+8/-9) qml/Launcher/LauncherPanel.qml (+11/-6) qml/Launcher/MoreAppsHeader.qml (+12/-5) qml/Launcher/graphics/launcher-app-focus-ring.svg (+0/-12) qml/Shell.qml (+16/-4) tests/mocks/GSettings.1.0/fake_gsettings.cpp (+14/-0) tests/mocks/GSettings.1.0/fake_gsettings.h (+7/-0) tests/qmltests/Dash/tst_DashShell.qml (+0/-40) tests/qmltests/Launcher/tst_Drawer.qml (+42/-3) tests/qmltests/Launcher/tst_Launcher.qml (+5/-6) tests/qmltests/tst_Shell.qml (+5/-64) tests/qmltests/tst_ShellWithPin.qml (+17/-0)
To merge this branch:	bzr merge lp:~mzanetti/unity8/appdrawer-improvements
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
Albert Astals Cid (community)			Abstain on 2017-01-16
Unity8 CI Bot	continuous-integration	2016-12-13	Approve on 2017-01-16
Lukáš Tinkl (community)		2016-12-13	Approve on 2017-01-10
Review via email: mp+313139@code.launchpad.net

Commit Message

Improvements for the appdrawer

Allow cancelling of the reveal gesture
move the app store uri to a gsetting

Description of the Change

* Are there any related MPs required for this MP to build/function as expected? Please list.
no
* 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?
yes, vesa checked it out

Vesa Rautiainen (vesar) wrote on 2016-12-22:

Reviewed these changes with Michael -> approved by design

Unity8 CI Bot (unity8-ci-bot) wrote on 2017-01-09:

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

review: Needs Fixing (continuous-integration)

Lukáš Tinkl (lukas-kde) wrote on 2017-01-09:

Looking good, waiting on CI for the top approval

* 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.

Not yet

review: Approve

Unity8 CI Bot (unity8-ci-bot) wrote on 2017-01-09:

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

review: Needs Fixing (continuous-integration)

Lukáš Tinkl (lukas-kde) wrote on 2017-01-09:

There are some failing tests:

qmltestrunner.DashShell::test_setShellHome
qmltestrunner.Launcher::test_keyboardNavigation
qmltestrunner.NarrowView::test_doubleTapSwitchesToNextInfographic
qmltestrunner.Shell::test_ClickUbuntuIconInLauncherTakesToAppsAndResetSearchString
qmltestrunner.Shell::test_focusAppFromLauncherExitsSpread
qmltestrunner.Shell::test_superTabToCycleLauncher
qmltestrunner.Shell::test_tapUbuntuIconInLauncherOverAppSpread

review: Needs Fixing

Unity8 CI Bot (unity8-ci-bot) wrote on 2017-01-10:

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

review: Needs Fixing (continuous-integration)

Unity8 CI Bot (unity8-ci-bot) wrote on 2017-01-10:

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

review: Needs Fixing (continuous-integration)

Unity8 CI Bot (unity8-ci-bot) wrote on 2017-01-10:

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

review: Approve (continuous-integration)

Lukáš Tinkl (lukas-kde) wrote on 2017-01-10:

CI green, let's call it done

review: Approve

Albert Astals Cid (aacid) wrote on 2017-01-16:

Doesn't build, remove the change from tests/mocks/Unity/Launcher/MockAppDrawerModel.cpp

review: Needs Fixing

lp:~mzanetti/unity8/appdrawer-improvements updated on 2017-01-16

2737. By Michael Zanetti on 2017-01-16: merge prereq

Michael Zanetti (mzanetti) wrote on 2017-01-16:

> Doesn't build, remove the change from
> tests/mocks/Unity/Launcher/MockAppDrawerModel.cpp

done

Unity8 CI Bot (unity8-ci-bot) wrote on 2017-01-16:

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

review: Approve (continuous-integration)

Albert Astals Cid (aacid) on 2017-01-16:

review: Abstain

lp:~mzanetti/unity8/appdrawer-improvements updated on 2017-01-23

2738. By Michael Zanetti on 2017-01-23: adjust home key to still focus the dash instead of messing with the drawer
2739. By Michael Zanetti on 2017-01-23: add a test
2740. By Michael Zanetti on 2017-01-23: try to catch a crash in case we're getting bad indexes

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

Subscribers

People subscribed via source and target branches

to all changes:

Michael Zanetti

Mohammad Rakibul Hasan

Unity Team

 === modified file 'data/com.canonical.Unity8.gschema.xml'
 --- data/com.canonical.Unity8.gschema.xml	2016-11-30 10:32:23 +0000
 +++ data/com.canonical.Unity8.gschema.xml	2017-01-16 11:12:35 +0000
@@ -53,6 +53,11 @@
        <summary>Enable or disable the indicator pull down menus</summary>
        <description>Toggle the availability of the indicator pull down menus</description>
      </key>
++    <key type="s" name="appstore-uri">
++      <default>'scope://com.canonical.scopes.clickstore'</default>
++      <summary>The uri to the app store</summary>
++      <description>This will be used whenever the user triggers an action to open the app store.</description>
++    </key>
    </schema>
    <schema path="/com/canonical/unity8/greeter/" id="com.canonical.Unity8.Greeter" gettext-domain="unity8">
 === modified file 'plugins/Utils/appdrawerproxymodel.cpp'
 --- plugins/Utils/appdrawerproxymodel.cpp	2016-12-23 11:04:53 +0000
 +++ plugins/Utils/appdrawerproxymodel.cpp	2017-01-16 11:12:35 +0000
@@ -185,5 +185,5 @@
              return adpm->appId(sourceIndex.row());
+         }
+     }
--    return nullptr;
++    return QString();
+ }
 === modified file 'qml/Launcher/Drawer.qml'
 --- qml/Launcher/Drawer.qml	2017-01-16 11:12:35 +0000
 +++ qml/Launcher/Drawer.qml	2017-01-16 11:12:35 +0000
@@ -20,6 +20,7 @@
  import Utils 0.1
  import "../Components"
  import Qt.labs.settings 1.0
++import GSettings  1.0
  FocusScope {
      id: root
@@ -47,8 +48,10 @@
          if (event.text.trim() !== "") {
              focusInput();
              searchField.text = event.text;
--            event.accepted = true;
+         }
++        // Catch all presses here in case the navigation lets something through
++        // We never want to end up in the launcher with focus
++        event.accepted = true;
+     }
      Settings {
@@ -88,6 +91,9 @@
                  anchors { left: parent.left; top: parent.top; right: parent.right; margins: units.gu(1) }
                  placeholderText: i18n.tr("Search…")
                  focus: true
++
++                KeyNavigation.down: sections
++
                  onAccepted: {
                      if (searchField.displayText != "" && listLoader.item && listLoader.item.currentItem) {
                          root.applicationSelected(listLoader.item.getFirstAppId());
@@ -104,7 +110,14 @@
                  Sections {
                      id: sections
++                    objectName: "drawerSections"
                      width: parent.width
++
++                    KeyNavigation.up: searchField
++                    KeyNavigation.down: headerFocusScope
++                    KeyNavigation.backtab: searchField
++                    KeyNavigation.tab: headerFocusScope
++
                      actions: [
                          Action {
                              text: i18n.ctr("Apps sorted alphabetically", "A-Z")
@@ -124,9 +137,45 @@
+                 }
+             }
++            FocusScope {
++                id: headerFocusScope
++                objectName: "headerFocusScope"
++                KeyNavigation.up: sections
++                KeyNavigation.down: listLoader.item
++                KeyNavigation.backtab: sections
++                KeyNavigation.tab: listLoader.item
++                activeFocusOnTab: true
++
++                GSettings {
++                    id: settings
++                    schema.id: "com.canonical.Unity8"
++                }
++
++                Keys.onPressed: {
++                    switch (event.key) {
++                    case Qt.Key_Return:
++                    case Qt.Key_Enter:
++                    case Qt.Key_Space:
++                        trigger();
++                        event.accepted = true;
++                    }
++                }
++
++                function trigger() {
++                    Qt.openUrlExternally(settings.appstoreUri)
++                }
++            }
++
              Loader {
                  id: listLoader
--                anchors { left: parent.left; top: sectionsContainer.bottom; right: parent.right; bottom: parent.bottom; leftMargin: units.gu(1); rightMargin: units.gu(1) }
++                objectName: "drawerListLoader"
++                anchors { left: parent.left; top: sectionsContainer.bottom; right: parent.right; bottom: parent.bottom }
++
++                KeyNavigation.up: headerFocusScope
++                KeyNavigation.down: searchField
++                KeyNavigation.backtab: headerFocusScope
++                KeyNavigation.tab: searchField
++
                  sourceComponent: {
                      switch (sections.selectedIndex) {
                      case 0: return aToZComponent;
@@ -176,10 +225,13 @@
              Component {
                  id: mostUsedComponent
                  DrawerListView {
++                    id: mostUsedListView
                      header: MoreAppsHeader {
                          width: parent.width
                          height: units.gu(6)
++                        highlighted: headerFocusScope.activeFocus
++                        onClicked: headerFocusScope.trigger();
+                     }
                      model: AppDrawerProxyModel {
@@ -189,7 +241,8 @@
+                     }
                      delegate: UbuntuShape {
--                        width: parent.width
++                        width: parent.width - units.gu(2)
++                        anchors.horizontalCenter: parent.horizontalCenter
                          color: "#20ffffff"
                          aspect: UbuntuShape.Flat
                          // NOTE: Cannot use gridView.rows here as it would evaluate to 0 at first and only update later,
@@ -205,6 +258,9 @@
                              bottomMargin: units.gu(1)
                              clip: true
++                            interactive: true
++                            focus: index == mostUsedListView.currentIndex
++
                              model: sortProxyModel
                              delegateWidth: units.gu(8)
@@ -218,10 +274,13 @@
              Component {
                  id: aToZComponent
                  DrawerListView {
++                    id: aToZListView
                      header: MoreAppsHeader {
                          width: parent.width
                          height: units.gu(6)
++                        highlighted: headerFocusScope.activeFocus
++                        onClicked: headerFocusScope.trigger();
+                     }
                      model: AppDrawerProxyModel {
@@ -231,7 +290,8 @@
+                     }
                      delegate: UbuntuShape {
--                        width: parent.width
++                        width: parent.width - units.gu(2)
++                        anchors.horizontalCenter: parent.horizontalCenter
                          color: "#20ffffff"
                          aspect: UbuntuShape.Flat
@@ -253,7 +313,8 @@
                              anchors { left: parent.left; top: categoryNameLabel.bottom; right: parent.right; topMargin: units.gu(1) }
                              height: rows * delegateHeight
--                            interactive: false
++                            interactive: true
++                            focus: index == aToZListView.currentIndex
                              model: AppDrawerProxyModel {
                                  id: categoryModel
@@ -272,10 +333,13 @@
          Component {
              id: drawerDelegateComponent
              AbstractButton {
++                id: drawerDelegate
                  width: GridView.view.cellWidth
                  height: units.gu(10)
                  objectName: "drawerItem_" + model.appId
++                readonly property bool focused: index === GridView.view.currentIndex && GridView.view.activeFocus
++
                  onClicked: root.applicationSelected(model.appId)
                  Column {
@@ -299,6 +363,15 @@
                              source: model.icon
+                         }
                          sourceFillMode: UbuntuShape.PreserveAspectCrop
++
++                        StyledItem {
++                            styleName: "FocusShape"
++                            anchors.fill: parent
++                            StyleHints {
++                                visible: drawerDelegate.focused
++                                radius: units.gu(2.55)
++                            }
++                        }
+                     }
                      Label {
 === modified file 'qml/Launcher/DrawerGridView.qml'
 --- qml/Launcher/DrawerGridView.qml	2016-11-10 14:39:18 +0000
 +++ qml/Launcher/DrawerGridView.qml	2017-01-16 11:12:35 +0000
@@ -17,7 +17,7 @@
  import QtQuick 2.4
  import "../Components"
--Item {
++FocusScope {
      id: root
      property int delegateWidth: units.gu(10)
@@ -25,6 +25,7 @@
      property alias delegate: gridView.delegate
      property alias model: gridView.model
      property alias interactive: gridView.interactive
++    property alias currentIndex: gridView.currentIndex
      property alias header: gridView.header
      property alias topMargin: gridView.topMargin
@@ -37,6 +38,7 @@
          id: gridView
          anchors.fill: parent
          leftMargin: spacing
++        focus: true
          readonly property int overflow: width - (root.columns * root.delegateWidth)
          readonly property real spacing: overflow / (root.columns)
 === modified file 'qml/Launcher/DrawerListView.qml'
 --- qml/Launcher/DrawerListView.qml	2016-11-28 14:56:02 +0000
 +++ qml/Launcher/DrawerListView.qml	2017-01-16 11:12:35 +0000
@@ -25,6 +25,12 @@
      bottomMargin: units.gu(1)
      spacing: units.gu(1)
      clip: true
++    focus: true
++
++    onActiveFocusChanged: {
++        currentIndex = -1;
++        currentIndex = 0;
++    }
      function getFirstAppId() {
          return model.appId(0);
 === modified file 'qml/Launcher/Launcher.qml'
 --- qml/Launcher/Launcher.qml	2017-01-16 11:12:35 +0000
 +++ qml/Launcher/Launcher.qml	2017-01-16 11:12:35 +0000
@@ -87,14 +87,14 @@
              superPressTimer.stop();
              superLongPressTimer.stop();
          } else {
++            switchToNextState("");
++            root.focus = false;
              if (panel.highlightIndex == -1) {
--                showDashHome();
++                root.showDashHome();
              } else if (panel.highlightIndex >= 0){
                  launcherApplicationSelected(LauncherModel.get(panel.highlightIndex).appId);
+             }
              panel.highlightIndex = -2;
--            switchToNextState("");
--            root.focus = false;
+         }
+     }
@@ -206,7 +206,7 @@
          case Qt.Key_Return:
          case Qt.Key_Space:
              if (panel.highlightIndex == -1) {
--                showDashHome();
++                root.showDashHome();
              } else if (panel.highlightIndex >= 0) {
                  launcherApplicationSelected(LauncherModel.get(panel.highlightIndex).appId);
+             }
@@ -469,9 +469,7 @@
+         }
          onPassed: {
              if (root.drawerEnabled) {
--                root.switchToNextState("drawer");
--                root.focus = true;
--                drawer.focus = true;
++                root.openDrawer()
+             }
+         }
@@ -547,9 +545,7 @@
              if (!dragging) {
                  if (distance > panel.width / 2) {
                      if (root.drawerEnabled && distance > panel.width * 3 && dragDirection() !== "left") {
--                        root.switchToNextState("drawer");
--                        root.focus = true;
--                        drawer.focus = true;
++                        root.openDrawer(false)
                      } else {
                          root.switchToNextState("visible");
+                     }
 === modified file 'qml/Launcher/LauncherDelegate.qml'
 --- qml/Launcher/LauncherDelegate.qml	2016-09-26 11:58:56 +0000
 +++ qml/Launcher/LauncherDelegate.qml	2017-01-16 11:12:35 +0000
@@ -124,15 +124,14 @@
          height: parent.itemHeight + units.gu(1)
          anchors.centerIn: parent
--        Image {
--            objectName: "focusRing"
--            anchors.centerIn: iconShape
--            height: width * 15 / 16
--            width: iconShape.width + units.gu(1)
--            source: "graphics/launcher-app-focus-ring.svg"
--            sourceSize.width: width
--            sourceSize.height: height
--            visible: root.highlighted
++        StyledItem {
++            styleName: "FocusShape"
++            anchors.fill: iconShape
++            activeFocusOnTab: true
++            StyleHints {
++                visible: root.highlighted
++                radius: units.gu(2.55)
++            }
+         }
          ProportionalShape {
 === modified file 'qml/Launcher/LauncherPanel.qml'
 --- qml/Launcher/LauncherPanel.qml	2017-01-10 14:44:00 +0000
 +++ qml/Launcher/LauncherPanel.qml	2017-01-16 11:12:35 +0000
@@ -80,6 +80,7 @@
+         }
          Rectangle {
++            id: bfb
              objectName: "buttonShowDashHome"
              width: parent.width
              height: width * .9
@@ -100,13 +101,15 @@
                  activeFocusOnPress: false
                  onClicked: root.showDashHome()
+             }
--            Rectangle {
--                objectName: "bfbFocusHighlight"
++
++            StyledItem {
++                styleName: "FocusShape"
                  anchors.fill: parent
--                border.color: "white"
--                border.width: units.dp(1)
--                color: "transparent"
--                visible: parent.highlighted
++                anchors.margins: units.gu(.5)
++                StyleHints {
++                    visible: bfb.highlighted
++                    radius: 0
++                }
+             }
+         }
@@ -788,6 +791,8 @@
              quickList.model = launcherListView.model.get(index).quickList;
              quickList.appId = launcherListView.model.get(index).appId;
              quickList.state = "open";
++            root.highlightIndex = index;
++            quickList.forceActiveFocus();
+         }
          Item {
 === modified file 'qml/Launcher/MoreAppsHeader.qml'
 --- qml/Launcher/MoreAppsHeader.qml	2016-11-04 10:10:26 +0000
 +++ qml/Launcher/MoreAppsHeader.qml	2017-01-16 11:12:35 +0000
@@ -4,17 +4,24 @@
  AbstractButton {
      id: root
--    onClicked: {
--        // TODO: Make this point to the snappy store as soon as we stop landing to vivid
--        Qt.openUrlExternally("scope://com.canonical.scopes.clickstore")
--    }
++    property bool highlighted: false
      UbuntuShape {
--        width: parent.width
++        width: parent.width - units.gu(2)
++        anchors.horizontalCenter: parent.horizontalCenter
          height: parent.height - units.gu(1)
          color: "#20ffffff"
          aspect: UbuntuShape.Flat
++        StyledItem {
++            styleName: "FocusShape"
++            anchors.fill: parent
++            activeFocusOnTab: true
++            StyleHints {
++                visible: root.highlighted
++            }
++        }
++
          Row {
              anchors.fill: parent
              anchors.margins: units.gu(1)
 === removed file 'qml/Launcher/graphics/launcher-app-focus-ring.svg'
 --- qml/Launcher/graphics/launcher-app-focus-ring.svg	2015-12-15 12:53:53 +0000
 +++ qml/Launcher/graphics/launcher-app-focus-ring.svg	1970-01-01 00:00:00 +0000
@@ -1,12 +0,0 @@
--<?xml version="1.0" encoding="UTF-8" standalone="no"?>
--<svg width="172px" height="163px" viewBox="0 0 172 163" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
--    <!-- Generator: Sketch 3.4.4 (17249) - http://www.bohemiancoding.com/sketch -->
--    <title>Shape</title>
--    <desc>Created with Sketch.</desc>
--    <defs></defs>
--    <g id="•-Launcher" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
--        <g id="Artboard-9" sketch:type="MSArtboardGroup" transform="translate(-163.000000, -1436.000000)" fill="#E95420">
--            <path d="M221.983432,1440 L221.983432,1440 C195.6127,1440 184.708233,1442.4723 177.107949,1450.10734 C169.476819,1457.77336 167,1468.79245 167,1495.3481 L167,1538.9019 C167,1565.45755 169.476819,1576.47664 177.107949,1584.14266 C184.708233,1591.7777 195.6127,1594.25 221.983432,1594.25 L276.016868,1594.25 C302.387595,1594.25 313.291998,1591.77771 320.892221,1584.14264 C328.523252,1576.47663 331,1565.45769 331,1538.9019 L331,1495.3481 C331,1468.79231 328.523252,1457.77337 320.892221,1450.10736 C313.291998,1442.47229 302.387595,1440 276.016868,1440 L221.983432,1440 Z M221.983432,1436 L276.016868,1436 C302.345315,1436 314.848953,1438.36655 323.727108,1447.2854 C332.633306,1456.23243 335,1468.85167 335,1495.3481 L335,1538.9019 C335,1565.39833 332.633306,1578.01757 323.727108,1586.9646 C314.848953,1595.88345 302.345315,1598.25 276.016868,1598.25 L221.983432,1598.25 C195.654985,1598.25 183.151291,1595.88345 174.273077,1586.96463 C165.366772,1578.0176 163,1565.39822 163,1538.9019 L163,1495.3481 C163,1468.85178 165.366772,1456.2324 174.273077,1447.28537 C183.151291,1438.36655 195.654985,1436 221.983432,1436 L221.983432,1436 Z" id="Shape" sketch:type="MSShapeGroup"></path>
--        </g>
--    </g>
--</svg>
 \ No newline at end of file
 === modified file 'qml/Shell.qml'
 --- qml/Shell.qml	2017-01-03 12:04:08 +0000
 +++ qml/Shell.qml	2017-01-16 11:12:35 +0000
@@ -343,6 +343,16 @@
          onLoaded: {
              item.objectName = "greeter"
+         }
++        property bool openDrawerAfterUnlock: false
++        Connections {
++            target: greeter
++            onActiveChanged: {
++                if (!greeter.active && greeterLoader.openDrawerAfterUnlock) {
++                    launcher.openDrawer(false);
++                    greeterLoader.openDrawerAfterUnlock = false;
++                }
++            }
++        }
+     }
      Component {
@@ -434,9 +444,11 @@
          if (shell.mode === "greeter") {
              SessionBroadcast.requestHomeShown(AccountsService.user);
          } else {
--            var animate = !LightDMService.greeter.active && !stages.shown;
--            dash.setCurrentScope(0, animate, false);
--            ApplicationManager.requestFocusApplication("unity8-dash");
++            if (!greeter.active) {
++                launcher.openDrawer(false);
++            } else {
++                greeterLoader.openDrawerAfterUnlock = true;
++            }
+         }
+     }
@@ -512,7 +524,7 @@
              lockedVisible: shell.usageScenario == "desktop" && !settings.autohideLauncher && !panel.fullscreenMode
              blurSource: greeter.shown ? greeter : stages
              topPanelHeight: panel.panelHeight
--            drawerEnabled: !greeter.shown
++            drawerEnabled: !greeter.active
              onShowDashHome: showHome()
              onLauncherApplicationSelected: {
 === modified file 'tests/mocks/GSettings.1.0/fake_gsettings.cpp'
 --- tests/mocks/GSettings.1.0/fake_gsettings.cpp	2016-11-16 05:54:50 +0000
 +++ tests/mocks/GSettings.1.0/fake_gsettings.cpp	2017-01-16 11:12:35 +0000
@@ -29,6 +29,7 @@
      , m_edgeDragWidth(2)
      , m_enableLauncher(true)
      , m_enableIndicatorMenu(true)
++    , m_appstoreUri("http://uappexplorer.com")
+ {
+ }
@@ -173,6 +174,11 @@
+     }
+ }
++QString GSettingsControllerQml::appstoreUri() const
++{
++    return m_appstoreUri;
++}
++
  GSettingsSchemaQml::GSettingsSchemaQml(QObject *parent): QObject(parent) {
+ }
@@ -376,6 +382,14 @@
+     }
+ }
++QVariant GSettingsQml::appstoreUri() const
++{
++    if (m_valid && m_schema->id() == "com.canonical.Unity8") {
++        return GSettingsControllerQml::instance()->appstoreUri();
++    }
++    return QVariant();
++}
++
  void GSettingsQml::setLifecycleExemptAppids(const QVariant &appIds)
+ {
      if (m_valid && m_schema->id() == "com.canonical.qtmir") {
 === modified file 'tests/mocks/GSettings.1.0/fake_gsettings.h'
 --- tests/mocks/GSettings.1.0/fake_gsettings.h	2016-11-16 05:54:50 +0000
 +++ tests/mocks/GSettings.1.0/fake_gsettings.h	2017-01-16 11:12:35 +0000
@@ -59,6 +59,7 @@
      Q_PROPERTY(QVariant edgeDragWidth READ edgeDragWidth WRITE setEdgeDragWidth NOTIFY edgeDragWidthChanged)
      Q_PROPERTY(QVariant enableLauncher READ enableLauncher WRITE setEnableLauncher NOTIFY enableLauncherChanged)
      Q_PROPERTY(QVariant enableIndicatorMenu READ enableIndicatorMenu WRITE setEnableIndicatorMenu NOTIFY enableIndicatorMenuChanged)
++    Q_PROPERTY(QVariant appstoreUri READ appstoreUri NOTIFY appstoreUriChanged)
  public:
      GSettingsQml(QObject *parent = nullptr);
@@ -77,6 +78,7 @@
      QVariant edgeDragWidth() const;
      QVariant enableLauncher() const;
      QVariant enableIndicatorMenu() const;
++    QVariant appstoreUri() const;
      void setDisableHeight(const QVariant &val);
      void setPictureUri(const QVariant &str);
@@ -101,6 +103,7 @@
      void edgeDragWidthChanged();
      void enableLauncherChanged();
      void enableIndicatorMenuChanged();
++    void appstoreUriChanged();
  private:
      GSettingsSchemaQml* m_schema;
@@ -147,6 +150,8 @@
      bool enableIndicatorMenu() const;
      Q_INVOKABLE void setEnableIndicatorMenu(bool enableIndicatorMenu);
++    QString appstoreUri() const;
++
  Q_SIGNALS:
      void disableHeightChanged();
      void pictureUriChanged(const QString&);
@@ -158,6 +163,7 @@
      void edgeDragWidthChanged(uint edgeDragWidth);
      void enableLauncherChanged(bool enableLauncher);
      void enableIndicatorMenuChanged(bool enableIndicatorMenu);
++    void appstoreUriChanged(const QString &appstoreUri);
  private:
      GSettingsControllerQml();
@@ -172,6 +178,7 @@
      uint m_edgeDragWidth;
      bool m_enableLauncher;
      bool m_enableIndicatorMenu;
++    QString m_appstoreUri;
      static GSettingsControllerQml* s_controllerInstance;
      QList<GSettingsQml *> m_registeredGSettings;
 === modified file 'tests/qmltests/Dash/tst_DashShell.qml'
 --- tests/qmltests/Dash/tst_DashShell.qml	2016-12-14 17:43:23 +0000
 +++ tests/qmltests/Dash/tst_DashShell.qml	2017-01-16 11:12:35 +0000
@@ -72,45 +72,5 @@
                  true, 15000);
              waitForRendering(findChild(dash, "scopeLoader0").item);
+         }
--
--        function test_setShellHome() {
--            var dashContentList = findChild(dash, "dashContentList");
--            var startX = dash.width - units.gu(1);
--            var startY = dash.height / 2;
--            var stopX = units.gu(1)
--            var stopY = startY;
--            waitForRendering(dashContentList);
--            touchFlick(dash, startX, startY, stopX, stopY);
--            touchFlick(dash, startX, startY, stopX, stopY);
--            compare(dashContentList.currentIndex, 2, "Could not flick to scope id 2");
--
--            // Flick the greeter away
--            var startX = shell.width - units.gu(1);
--            var startY = shell.height / 2;
--            var stopX = units.gu(1)
--            var stopY = startY;
--            touchFlick(shell, startX, startY, stopX, stopY);
--
--            var greeter = findChild(shell, "greeter");
--            tryCompare(greeter, "shown", false);
--
--            // bring in the launcher
--            var startX = units.gu(1);
--            var startY = shell.height / 2;
--            var stopX = shell.width / 3;
--            var stopY = startY;
--            touchFlick(shell, startX, startY, stopX, stopY);
--
--            var launcher = findChild(shell, "launcher");
--            var buttonShowDashHome = findChild(launcher, "buttonShowDashHome");
--            tryCompare(buttonShowDashHome, "enabled", true);
--            tryCompare(launcher, "visibleWidth", launcher.panelWidth);
--
--            // Make sure that opening the launcher doesn't change the scope
--            compare(dashContentList.currentIndex, 2, "Opening the launcher changed the current scope");
--
--            mouseClick(buttonShowDashHome);
--            tryCompare(dashContentList, "currentIndex", 0);
--        }
+     }
+ }
 === modified file 'tests/qmltests/Launcher/tst_Drawer.qml'
 --- tests/qmltests/Launcher/tst_Drawer.qml	2017-01-16 11:12:35 +0000
 +++ tests/qmltests/Launcher/tst_Drawer.qml	2017-01-16 11:12:35 +0000
@@ -136,6 +136,8 @@
              launcher.hide();
              var drawer = findChild(launcher, "drawer");
              tryCompare(drawer, "x", -drawer.width);
++            var searchField = findChild(drawer, "searchField");
++            searchField.text = "";
+         }
          function test_revealByEdgeDrag() {
@@ -173,7 +175,7 @@
              var drawer = dragDrawerIntoView();
              waitForRendering(launcher);
--            mouseFlick(root, drawer.width - units.gu(1), drawer.height / 2, units.gu(2), drawer.height / 2, true, true);
++            mouseFlick(root, drawer.width - units.gu(1), drawer.height / 2, units.gu(10), drawer.height / 2, true, true);
              tryCompare(drawer.anchors, "rightMargin", 0);
              tryCompare(launcher, "state", data.endState);
@@ -263,8 +265,8 @@
          function test_searchDirectly() {
              var drawer = dragDrawerIntoView();
--            waitForRendering(drawer);
--            waitUntilTransitionsEnd(drawer);
++            waitForRendering(launcher);
++            waitUntilTransitionsEnd(launcher);
              tryCompare(drawer, "focus", true);
              var searchField = findChild(drawer, "searchField");
@@ -272,5 +274,42 @@
              typeString("cam");
              tryCompareFunction(function() { return searchField.displayText }, "cam");
+         }
++
++        function test_kbdNavigation() {
++            launcher.openDrawer(true);
++            waitForRendering(launcher);
++            waitUntilTransitionsEnd(launcher);
++            compare(launcher.lastSelectedApplication, "");
++
++            var drawer = findChild(launcher, "drawer");
++            var searchField = findChild(drawer, "searchField");
++            var sections = findChild(drawer, "drawerSections");
++            var header = findChild(drawer, "headerFocusScope");
++            var listLoader = findChild(drawer, "drawerListLoader");
++
++            tryCompare(searchField, "activeFocus", true);
++            // for some reason, even when the searchField has activeFocus already,
++            // it won't react on key down events if they're coming in too early...
++            // let's repeat the press for a bit before giving up
++            tryCompareFunction(function() {
++                wait(10)
++                keyClick(Qt.Key_Down);
++                return sections.activeFocus;
++            }, true)
++
++            keyClick(Qt.Key_Down);
++            tryCompare(header, "activeFocus", true);
++
++            keyClick(Qt.Key_Down);
++            tryCompare(listLoader, "activeFocus", true);
++
++            keyClick(Qt.Key_Down);
++            keyClick(Qt.Key_Left);
++            tryCompare(listLoader, "activeFocus", true);
++
++            keyClick(Qt.Key_Enter);
++
++            compare(launcher.lastSelectedApplication, "calendar-app");
++        }
+     }
+ }
 === modified file 'tests/qmltests/Launcher/tst_Launcher.qml'
 --- tests/qmltests/Launcher/tst_Launcher.qml	2016-12-07 13:43:25 +0000
 +++ tests/qmltests/Launcher/tst_Launcher.qml	2017-01-16 11:12:35 +0000
@@ -369,18 +369,17 @@
          function assertFocusOnIndex(index) {
              var launcherPanel = findChild(launcher, "launcherPanel");
              var launcherListView = findChild(launcher, "launcherListView");
--            var bfbFocusHighlight = findChild(launcher, "bfbFocusHighlight");
++            var bfb = findChild(launcher, "buttonShowDashHome");
              waitForRendering(launcher);
              tryCompare(launcherPanel, "highlightIndex", index);
--            compare(bfbFocusHighlight.visible, index === -1);
++            compare(bfb.highlighted, index === -1);
              for (var i = 0; i < launcherListView.count; i++) {
                  var item = findChild(launcher, "launcherDelegate" + i);
                  // Delegates might be destroyed when not visible. We can't check if they paint a focus highlight.
                  // Make sure the requested index does have focus. for the others, try best effort to check if they don't
                  if (index === i || item) {
--                    var focusRing = findChild(item, "focusRing")
--                    tryCompare(focusRing, "visible", index === i);
++                    tryCompare(item, "highlighted", index === i);
+                 }
+             }
+         }
@@ -1188,13 +1187,13 @@
+         }
          function test_keyboardNavigation(data) {
--            var bfbFocusHighlight = findChild(launcher, "bfbFocusHighlight");
++            var bfb = findChild(launcher, "buttonShowDashHome");
              var quickList = findChild(launcher, "quickList");
              var launcherPanel = findChild(launcher, "launcherPanel");
              var launcherListView = findChild(launcher, "launcherListView");
              var last = launcherListView.count - 1;
--            compare(bfbFocusHighlight.visible, false);
++            compare(bfb.highlighted, false);
              launcher.openForKeyboardNavigation();
              tryCompare(launcherPanel, "x", 0);
              waitForRendering(launcher);
 === modified file 'tests/qmltests/tst_Shell.qml'
 --- tests/qmltests/tst_Shell.qml	2017-01-09 14:10:17 +0000
 +++ tests/qmltests/tst_Shell.qml	2017-01-16 11:12:35 +0000
@@ -747,22 +747,6 @@
              mockNotificationsModel.append(n)
+         }
--        function test_ClickUbuntuIconInLauncherTakesToAppsAndResetSearchString() {
--            loadShell("phone");
--            swipeAwayGreeter();
--            dragLauncherIntoView();
--            dashCommunicatorSpy.clear();
--
--            var launcher = findChild(shell, "launcher");
--            var dashIcon = findChild(launcher, "dashItem");
--            verify(dashIcon != undefined);
--            mouseClick(dashIcon);
--
--            tryCompare(ApplicationManager, "focusedApplicationId", "unity8-dash");
--
--            compare(dashCommunicatorSpy.count, 1);
--        }
--
          function test_suspend() {
              loadShell("phone");
              swipeAwayGreeter();
@@ -1380,47 +1364,6 @@
              tryCompare(stage, "state", "spread");
+         }
--        function test_tapUbuntuIconInLauncherOverAppSpread() {
--            launcherShowDashHomeSpy.clear();
--
--            loadShell("phone");
--            swipeAwayGreeter();
--
--            waitUntilFocusedApplicationIsShowingItsSurface();
--
--            swipeFromRightEdgeToShowAppSpread();
--
--            var launcher = findChild(shell, "launcher");
--
--            dragLauncherIntoView();
--
--            // Emulate a tap with a finger, where the touch position drifts during the tap.
--            // This is to test the touch ownership changes. The tap is happening on the button
--            // area but then drifting into the left edge drag area. This test makes sure
--            // the touch ownership stays with the button and doesn't move over to the
--            // left edge drag area.
--            {
--                var buttonShowDashHome = findChild(launcher, "buttonShowDashHome");
--                touchFlick(buttonShowDashHome,
--                    buttonShowDashHome.width * 0.2,  /* startPos.x */
--                    buttonShowDashHome.height * 0.8, /* startPos.y */
--                    buttonShowDashHome.width * 0.8,  /* endPos.x */
--                    buttonShowDashHome.height * 0.2  /* endPos.y */);
--            }
--
--            compare(launcherShowDashHomeSpy.count, 1);
--
--            // check that the stage has left spread mode.
--            {
--                var stage = findChild(shell, "stage");
--                tryCompare(stage, "state", "staged");
--            }
--
--            // check that the launcher got dismissed
--            var launcherPanel = findChild(shell, "launcherPanel");
--            tryCompare(launcherPanel, "x", -launcherPanel.width);
--        }
--
          function test_physicalHomeKeyPressDoesNothingWithActiveGreeter() {
              loadShell("phone");
@@ -1847,7 +1790,7 @@
              loadDesktopShellWithApps()
              var launcher = findChild(shell, "launcher");
              var stage = findChild(shell, "stage");
--            var bfb = findChild(launcher, "buttonShowDashHome");
++            var app1 = findChild(launcher, "launcherDelegate0");
              GSettingsController.setAutohideLauncher(!data.launcherLocked);
              waitForRendering(shell);
@@ -1860,17 +1803,17 @@
              if (!data.launcherLocked) {
                  revealLauncherByEdgePushWithMouse();
                  tryCompare(launcher, "x", 0);
--                mouseMove(bfb, bfb.width / 2, bfb.height / 2)
++                mouseMove(app1, app1.width / 2, app1.height / 2)
                  waitForRendering(shell)
+             }
--            mouseClick(bfb, bfb.width / 2, bfb.height / 2)
++            mouseClick(app1, app1.width / 2, app1.height / 2)
              if (!data.launcherLocked) {
                  tryCompare(launcher, "state", "")
+             }
              tryCompare(stage, "state", "windowed")
--            tryCompare(ApplicationManager, "focusedApplicationId", "unity8-dash")
++            tryCompare(ApplicationManager, "focusedApplicationId", "dialer-app")
              keyRelease(Qt.Key_Alt);
+         }
@@ -2194,10 +2137,8 @@
              tryCompare(launcher, "state", "visible");
              tryCompare(launcherPanel, "highlightIndex", -1);
              keyRelease(Qt.Key_Super_L, Qt.MetaModifier);
--            tryCompare(launcher, "state", data.launcherLocked ? "visible" : "");
++            tryCompare(launcher, "state", "drawer");
              tryCompare(launcherPanel, "highlightIndex", -2);
--            tryCompare(ApplicationManager, "focusedApplicationId", "unity8-dash");
--            tryCompare(stage, "focus", true)
+         }
          function test_longpressSuperOpensLauncherAndShortcutsOverlay() {
 === modified file 'tests/qmltests/tst_ShellWithPin.qml'
 --- tests/qmltests/tst_ShellWithPin.qml	2017-01-03 12:04:08 +0000
 +++ tests/qmltests/tst_ShellWithPin.qml	2017-01-16 11:12:35 +0000
@@ -558,5 +558,22 @@
              var lockscreen = findChild(shell, "lockscreen");
              verify(lockscreen.shown);
+         }
++
++        function test_bfbOnLockedDevice() {
++            var launcher = findChild(shell, "launcher");
++            touchFlick(shell, units.gu(.5), shell.height / 2, units.gu(10), shell.height / 2);
++
++            tryCompare(launcher, "x", 0);
++            tryCompare(launcher, "state", "visible");
++
++            waitForRendering(shell)
++
++            var bfb = findChild(launcher, "buttonShowDashHome");
++            mouseClick(bfb, bfb.width / 2, bfb.height / 2);
++
++            enterPin("1234")
++
++            tryCompare(launcher, "state", "drawer");
++        }
+     }
+ }