Merge lp:~nik90/ubuntu-clock-app/add-multiselection-mode into lp:ubuntu-clock-app

[Nekhelesh Ramananthan]

This MP adds multiselection mode for the alarm list.

This MP adds multiselection mode for the alarm list.

To Test:
 1. Proceed to alarm page
 2. Add a couple of alarms
 3. Long press on an alarm to activate selection mode. See if you can delete a group of alarm in one go.
 4. That's about it :)

Note: MultipleSelectionListView.qml and MultipleSelectionVisualModel.qml are upstream components and needn't be reviewed.

[Renato Araujo Oliveira Filho (renatofilho)]

You should use listModel and listDelegate property, this is necessary due the VisualModel used by multipleSelection model.

this is the patch: http://paste.ubuntu.com/7993101/

I fixed other small problems.

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Continuous integration, rev:48
http://91.189.93.70:8080/job/ubuntu-clock-dev-ubuntu-clock-app-utopic-3.0-ci/148/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1441/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-clock-dev-ubuntu-clock-app-utopic-3.0-utopic-amd64-ci/148/console

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-clock-dev-ubuntu-clock-app-utopic-3.0-ci/148/rebuild

review: Needs Fixing (continuous-integration)

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Continuous integration, rev:49
http://91.189.93.70:8080/job/ubuntu-clock-dev-ubuntu-clock-app-utopic-3.0-ci/149/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1442/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-clock-dev-ubuntu-clock-app-utopic-3.0-utopic-amd64-ci/149/console

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-clock-dev-ubuntu-clock-app-utopic-3.0-ci/149/rebuild

review: Needs Fixing (continuous-integration)

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Continuous integration, rev:51
http://91.189.93.70:8080/job/ubuntu-clock-dev-ubuntu-clock-app-utopic-3.0-ci/150/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1443/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-clock-dev-ubuntu-clock-app-utopic-3.0-utopic-amd64-ci/150/console

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-clock-dev-ubuntu-clock-app-utopic-3.0-ci/150/rebuild

review: Needs Fixing (continuous-integration)

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Continuous integration, rev:52
http://91.189.93.70:8080/job/ubuntu-clock-dev-ubuntu-clock-app-utopic-3.0-ci/153/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1453/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-clock-dev-ubuntu-clock-app-utopic-3.0-utopic-amd64-ci/153/console

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-clock-dev-ubuntu-clock-app-utopic-3.0-ci/153/rebuild

review: Needs Fixing (continuous-integration)

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Continuous integration, rev:53
http://91.189.93.70:8080/job/ubuntu-clock-dev-ubuntu-clock-app-utopic-3.0-ci/155/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1463/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-clock-dev-ubuntu-clock-app-utopic-3.0-utopic-amd64-ci/155/console

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-clock-dev-ubuntu-clock-app-utopic-3.0-ci/155/rebuild

review: Needs Fixing (continuous-integration)

[Alan Pope 🍺🐧🐱 🦄 (popey)]

Works great on device, thanks!

review: Approve

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Continuous integration, rev:54
http://91.189.93.70:8080/job/ubuntu-clock-dev-ubuntu-clock-app-utopic-3.0-ci/157/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1470/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-clock-dev-ubuntu-clock-app-utopic-3.0-utopic-amd64-ci/157/console

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-clock-dev-ubuntu-clock-app-utopic-3.0-ci/157/rebuild

review: Needs Fixing (continuous-integration)

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Autolanding.
More details in the following jenkins job:
http://91.189.93.70:8080/job/ubuntu-clock-dev-ubuntu-clock-app-utopic-3.0-autolanding/10/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1481/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-clock-dev-ubuntu-clock-app-utopic-3.0-utopic-amd64-autolanding/10/console

review: Needs Fixing (continuous-integration)

=== modified file 'app/alarm/AlarmDelegate.qml'
--- app/alarm/AlarmDelegate.qml	2014-08-07 13:17:02 +0000
+++ app/alarm/AlarmDelegate.qml	2014-08-11 15:43:15 +0000
@@ -23,82 +23,73 @@
 ListItemWithActions {
     id: root
 
+    width: parent ? parent.width : 0
     height: units.gu(6)
-    width: parent ? parent.width : 0
     color: "Transparent"
-
-    Item {
-        id: delegate
-
-        anchors.fill: parent
+    selectedColor: "Transparent"
+
+    Label {
+        id: alarmTime
+        objectName: "listAlarmTime" + index
+
+        anchors {
+            top: alarmDetailsColumn.top
+            left: parent.left
+        }
+
+        fontSize: "medium"
+        text: Qt.formatTime(date)
+    }
+
+    Column {
+        id: alarmDetailsColumn
+
+        anchors {
+            left: alarmTime.right
+            right: alarmStatus.left
+            verticalCenter: parent.verticalCenter
+            margins: units.gu(1)
+        }
 
         Label {
-            id: alarmTime
-            objectName: "listAlarmTime" + index
-
-            anchors {
-                top: alarmDetailsColumn.top
-                left: parent.left
-            }
-
+            id: alarmLabel
+            objectName: "listAlarmLabel" + index
+
+            text: message
             fontSize: "medium"
-            text: Qt.formatTime(date)
-        }
-
-        Column {
-            id: alarmDetailsColumn
-
-            anchors {
-                left: alarmTime.right
-                right: alarmStatus.left
-                verticalCenter: parent.verticalCenter
-                margins: units.gu(1)
-            }
-
-            Label {
-                id: alarmLabel
-                objectName: "listAlarmLabel" + index
-
-                text: message
-                fontSize: "medium"
-                elide: Text.ElideRight
-                color: UbuntuColors.midAubergine
-            }
-
-            Label {
-                id: alarmSubtitle
-                objectName: "listAlarmSubtitle" + index
-
-                fontSize: "xx-small"
-                width: parent.width
-                wrapMode: Text.WrapAtWordBoundaryOrAnywhere
-                text: alarmUtils.format_day_string(daysOfWeek)
-            }
-        }
-
-        Switch {
-            id: alarmStatus
-            objectName: "listAlarmStatus" + index
-
-            anchors {
-                right: parent.right
-                verticalCenter: parent.verticalCenter
-            }
-
-            checked: enabled
-
-            /*
+            width: parent.width
+            elide: Text.ElideRight
+            color: UbuntuColors.midAubergine
+        }
+
+        Label {
+            id: alarmSubtitle
+            objectName: "listAlarmSubtitle" + index
+
+            fontSize: "xx-small"
+            width: parent.width
+            wrapMode: Text.WrapAtWordBoundaryOrAnywhere
+            text: alarmUtils.format_day_string(daysOfWeek)
+        }
+    }
+
+    Switch {
+        id: alarmStatus
+        objectName: "listAlarmStatus" + index
+
+        anchors {
+            right: parent.right
+            verticalCenter: parent.verticalCenter
+        }
+
+        checked: enabled
+
+        /*
              #TODO: Add the ability to enable/disable alarms using the
              switch. At the moment it only shows the alarm status.
              This was postponed since a similar implementation in the
              old clock app caused it to loop. So if user clicks on the
              switch, it disables and then re-enables the alarm again.
             */
-        }
-    }
-
-    onItemClicked: {
-        mainStack.push(Qt.resolvedUrl("EditAlarmPage.qml"),
-                       {"isNewAlarm": false, "alarmIndex": index})
     }
 }

=== modified file 'app/alarm/AlarmList.qml'
--- app/alarm/AlarmList.qml	2014-08-09 14:38:15 +0000
+++ app/alarm/AlarmList.qml	2014-08-11 15:43:15 +0000
@@ -20,150 +20,127 @@
 import Ubuntu.Components 1.1
 import Ubuntu.Components.ListItems 1.0 as ListItem
 import "../components"
+import "../upstreamcomponents"
 import "../components/Utils.js" as Utils
 
-Flickable {
-    id: alarmListFlickable
-    objectName: "alarmListFlickable"
-
-    // Property to set the model of the saved alarm list
-    property var model
-
-    /*
-      Property to set the minimum drag distance before activating the add
-      alarm signal
-    */
-    property int _minThreshold: addAlarmButton.maxThreshold + units.gu(2)
+MultipleSelectionListView {
+    id: alarmListView
+    objectName: "alarmListView"
+
+    property var _currentSwipedItem: null
+
+    function _updateSwipeState(item)
+    {
+        if (item.swipping) {
+            return
+        }
+
+        if (item.swipeState !== "Normal") {
+            if (alarmListView._currentSwipedItem !== item) {
+                if (alarmListView._currentSwipedItem) {
+                    alarmListView._currentSwipedItem.resetSwipe()
+                }
+                alarmListView._currentSwipedItem = item
+            }
+        } else if (item.swipeState !== "Normal"
+                   && alarmListView._currentSwipedItem === item) {
+            alarmListView._currentSwipedItem = null
+        }
+    }
 
     clip: true
     anchors.fill: parent
-    contentHeight: alarmList.height
 
     AlarmUtils {
         id: alarmUtils
     }
 
-    PullToAdd {
-        id: addAlarmButton
-        objectName: "addAlarmButton"
-
-        anchors {
-            top: parent.top
-            topMargin: -labelHeight - units.gu(3)
-            horizontalCenter: parent.horizontalCenter
-        }
-
-        leftLabel: i18n.tr("Add")
-        rightLabel: i18n.tr("Alarm")
-    }
-
-    Column {
-        id: alarmList
-        objectName: 'alarmList'
-        anchors.fill: parent
-
-        Repeater {
-            id: alarmRepeater
-            objectName: "alarmListRepeater"
-
-            property var _currentSwipedItem: null
-
-            function _updateSwipeState(item)
-            {
-                if (item.swipping) {
-                    return
-                }
-
-                if (item.swipeState !== "Normal") {
-                    if (alarmRepeater._currentSwipedItem !== item) {
-                        if (alarmRepeater._currentSwipedItem) {
-                            alarmRepeater._currentSwipedItem.resetSwipe()
-                        }
-                        alarmRepeater._currentSwipedItem = item
-                    }
-                } else if (item.swipeState !== "Normal"
-                           && alarmRepeater._currentSwipedItem === item) {
-                    alarmRepeater._currentSwipedItem = null
-                }
-            }
-
-            model: alarmListFlickable.model
-
-            delegate: AlarmDelegate {
-                id: alarmDelegate
-                objectName: "alarm" + index
-
-                property var removalAnimation
-
-                function remove() {
-                    removalAnimation.start()
-                }
-
-                onSwippingChanged: {
-                    alarmRepeater._updateSwipeState(alarmDelegate)
-                }
-
-                onSwipeStateChanged: {
-                    alarmRepeater._updateSwipeState(alarmDelegate)
-                }
-
-                leftSideAction: Action {
-                    iconName: "delete"
-                    text: i18n.tr("Delete")
-                    onTriggered: {
-                        alarmDelegate.remove()
-                    }
-                }
-
-                ListView.onRemove: ScriptAction {
-                    script: {
-                        if (alarmRepeater._currentSwipedItem
-                                === alarmDelegate) {
-                            alarmRepeater._currentSwipedItem = null
-                        }
-                    }
-                }
-
-                removalAnimation: SequentialAnimation {
-                    alwaysRunToEnd: true
-
-                    PropertyAction {
-                        target: alarmDelegate
-                        property: "ListView.delayRemove"
-                        value: true
-                    }
-
-                    UbuntuNumberAnimation {
-                        target: alarmDelegate
-                        property: "height"
-                        to: 0
-                    }
-
-                    PropertyAction {
-                        target: alarmDelegate
-                        property: "ListView.delayRemove"
-                        value: false
-                    }
-
-                    ScriptAction {
-                        script: {
-                            var alarm = alarmModel.get(index)
-                            alarm.cancel()
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-    onDragEnded: {
-        if(contentY < _minThreshold)
-            mainStack.push(Qt.resolvedUrl("EditAlarmPage.qml"))
-    }
-
-    onContentYChanged: {
-        if(contentY < 0 && atYBeginning) {
-            addAlarmButton.dragPosition = contentY.toFixed(0)
+    listDelegate: AlarmDelegate {
+        id: alarmDelegate
+        objectName: "alarm" + index
+
+        property var removalAnimation
+
+        function remove() {
+            removalAnimation.start()
+        }
+
+        selectionMode: alarmListView.isInSelectionMode
+        selected: alarmListView.isSelected(alarmDelegate)
+
+        onSwippingChanged: {
+            _updateSwipeState(alarmDelegate)
+        }
+
+        onSwipeStateChanged: {
+            _updateSwipeState(alarmDelegate)
+        }
+
+        leftSideAction: Action {
+            iconName: "delete"
+            text: i18n.tr("Delete")
+            onTriggered: {
+                alarmDelegate.remove()
+            }
+        }
+
+        ListView.onRemove: ScriptAction {
+            script: {
+                if (_currentSwipedItem
+                        === alarmDelegate) {
+                    _currentSwipedItem = null
+                }
+            }
+        }
+
+        removalAnimation: SequentialAnimation {
+            alwaysRunToEnd: true
+
+            PropertyAction {
+                target: alarmDelegate
+                property: "ListView.delayRemove"
+                value: true
+            }
+
+            UbuntuNumberAnimation {
+                target: alarmDelegate
+                property: "height"
+                to: 0
+            }
+
+            PropertyAction {
+                target: alarmDelegate
+                property: "ListView.delayRemove"
+                value: false
+            }
+
+            ScriptAction {
+                script: {
+                    var alarm = alarmModel.get(index)
+                    alarm.cancel()
+                }
+            }
+        }
+
+        onItemClicked: {
+            if(alarmListView.isInSelectionMode) {
+                if(!alarmListView.selectItem(alarmDelegate)) {
+                    alarmListView.deselectItem(alarmDelegate)
+                }
+                return
+            }
+
+            else {
+                mainStack.push(Qt.resolvedUrl("EditAlarmPage.qml"),
+                               {"isNewAlarm": false, "alarmIndex": index})
+            }
+        }
+
+        onItemPressAndHold: {
+            if (!alarmListView.isInSelectionMode) {
+                alarmListView.startSelection()
+                alarmListView.selectItem(alarmDelegate)
+            }
         }
     }
 }

=== modified file 'app/alarm/AlarmPage.qml'
--- app/alarm/AlarmPage.qml	2014-08-01 19:31:37 +0000
+++ app/alarm/AlarmPage.qml	2014-08-11 15:43:15 +0000
@@ -21,25 +21,84 @@
 import "../components/Utils.js" as Utils
 
 Page {
-    title: "Alarms"
+    id: alarmPage
+
+    title: i18n.tr("Alarms")
     objectName: 'AlarmPage'
 
+    Component.onCompleted: Utils.log(debugMode, "Alarm Page loaded")
+
     flickable: null
 
-    head.actions: Action {
-        objectName: "addAlarmAction"
-        iconName: "add"
-        text: i18n.tr("Alarm")
-        onTriggered: {
-            mainStack.push(Qt.resolvedUrl("EditAlarmPage.qml"))
+    states: [
+        PageHeadState {
+            name: "default"
+            head: alarmPage.head
+            when: !alarmListView.isInSelectionMode
+            actions: [
+                Action {
+                    objectName: "addAlarmAction"
+                    iconName: "add"
+                    text: i18n.tr("Alarm")
+                    onTriggered: {
+                        mainStack.push(Qt.resolvedUrl("EditAlarmPage.qml"))
+                    }
+                }
+            ]
+        },
+
+        PageHeadState {
+            name: "selection"
+            head: alarmPage.head
+            when: alarmListView.isInSelectionMode
+            backAction: Action {
+                text: i18n.tr("Cancel selection")
+                iconName: "close"
+                onTriggered: {
+                    alarmListView.cancelSelection()
+                }
+            }
+
+            actions: [
+                Action {
+                    text: i18n.tr("Select All")
+                    iconName: "select"
+                    onTriggered: {
+                        if(alarmListView.selectedItems.count
+                                === alarmListView.count) {
+                            alarmListView.clearSelection()
+                        }
+                        else {
+                            alarmListView.selectAll()
+                        }
+                    }
+                },
+
+                Action {
+                    text: i18n.tr("Delete")
+                    iconName: "delete"
+                    onTriggered: {
+                        var items = alarmListView.selectedItems
+
+                        for(var i=0; i < items.count; i++) {
+                            var alarm = alarmModel.get(items.get(i).itemsIndex)
+                            alarm.cancel()
+                        }
+
+                        alarmListView.endSelection()
+                    }
+                }
+            ]
+
+            contents: Label {
+                text: ""
+            }
         }
-    }
-
-    Component.onCompleted: Utils.log(debugMode, "Alarm Page loaded")
+    ]
 
     AlarmList{
-        id: listAlarm
-        model: alarmModel
+        id: alarmListView
+        listModel: alarmModel
         anchors.fill: parent
     }
 }

=== modified file 'app/upstreamcomponents/ListItemWithActions.qml'
--- app/upstreamcomponents/ListItemWithActions.qml	2014-08-06 21:07:37 +0000
+++ app/upstreamcomponents/ListItemWithActions.qml	2014-08-11 15:43:15 +0000
@@ -262,6 +262,7 @@
             }
         }
         Behavior on color {
+            enabled: (root.color != root.selectedColor)
            ColorAnimation {}
         }
     }

=== added file 'app/upstreamcomponents/MultipleSelectionListView.qml'
--- app/upstreamcomponents/MultipleSelectionListView.qml	1970-01-01 00:00:00 +0000
+++ app/upstreamcomponents/MultipleSelectionListView.qml	2014-08-11 15:43:15 +0000
@@ -0,0 +1,199 @@
+/*
+ * Copyright (C) 2013 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/>.
+ */
+
+import QtQuick 2.2
+import Ubuntu.Components 1.1
+import Ubuntu.Components.Popups 1.0 as Popups
+
+/*!
+    \qmltype ContactSimpleListView
+    \inqmlmodule Ubuntu.Contacts 0.1
+    \ingroup ubuntu
+    \brief The MultipleSelectionListView provides a ListView with support to multiple selection
+
+    The MultipleSelectionListViewprovides a ListView with support to multiple selection which can be used by any
+    application.
+
+    Example:
+    \qml
+        import Ubuntu.Contacts 0.1
+
+        MultipleSelectionListView {
+            id: view
+            anchors.fill: paret
+            model: 100
+            delegate: Rectangle {
+                width: parent.width
+                height: 100
+                color: view.selectedItems.indexOf(index) == -1 ? "white" : "blue"
+
+                MouseArea {
+                    anchors.fill: parent
+                    onClicked: {
+                        if (view.isInSelectionModel) {
+                            view.selectItem(index)
+                        }
+                    }
+                    onPressAndHold: view.startSelection()
+                }
+            }
+            onSelectionDone: console.debug("Selected items:" + view.selectedItems)
+        }
+    \endqml
+*/
+
+ListView {
+    id: listView
+
+    /*!
+      \qmlproperty model selectedItems
+
+      This property holds the list of selected items
+    */
+    readonly property alias selectedItems: visualModel.selectedItems
+    /*!
+      \qmlproperty bool multipleSelection
+
+      This property holds if the selection will accept multiple items or single items
+    */
+    property bool multipleSelection: true
+
+    /*!
+      \qmlproperty model listModel
+
+      This property holds the model providing data for the list.
+    */
+    property alias listModel: visualModel.model
+    /*!
+      \qmlproperty Component listDelegate
+
+      The delegate provides a template defining each item instantiated by the view.
+    */
+    property alias listDelegate: visualModel.delegate
+
+    /*!
+      \qmlproperty bool isInSelectionMode
+
+      This property holds a list with the index of selected items
+    */
+    readonly property bool isInSelectionMode: state === "selection"
+    /*!
+      This handler is called when the selection mode is finished without be canceled
+    */
+    signal selectionDone(var items)
+    /*!
+      This handler is called when the selection mode is canceled
+    */
+    signal selectionCanceled()
+
+    /*!
+      Start the selection mode on the list view.
+    */
+    function startSelection()
+    {
+        state = "selection"
+    }
+    /*!
+      Check if the item is selected
+      Returns true if the item was marked as selected or false if the item is unselected
+    */
+    function isSelected(item)
+    {
+        if (item && item.VisualDataModel) {
+            return (item.VisualDataModel.inSelected === true)
+        } else {
+            return false
+        }
+    }
+    /*!
+      Mark the item as selected
+      Returns true if the item was marked as selected or false if the item is already selected
+    */
+    function selectItem(item)
+    {
+        if (item.VisualDataModel.inSelected) {
+            return false
+        } else {
+            if (!multipleSelection) {
+                clearSelection()
+            }
+            item.VisualDataModel.inSelected = true
+            return true
+        }
+    }
+    /*!
+      Remove the index from the selected list
+    */
+    function deselectItem(item)
+    {
+        var result = false
+        if (item.VisualDataModel.inSelected) {
+            item.VisualDataModel.inSelected = false
+            result = true
+        }
+        return result
+    }
+    /*!
+      Finish the selection mode with sucess
+    */
+    function endSelection()
+    {
+        selectionDone(listView.selectedItems)
+        clearSelection()
+        state = ""
+    }
+    /*!
+      Cancel the selection
+    */
+    function cancelSelection()
+    {
+        selectionCanceled()
+        clearSelection()
+        state = ""
+    }
+    /*!
+      Remove any selected item from the selection list
+    */
+    function clearSelection()
+    {
+        if (selectedItems.count > 0) {
+            selectedItems.remove(0, selectedItems.count)
+        }
+    }
+    /*!
+      Select all items in the list
+    */
+    function selectAll()
+    {
+        if (multipleSelection) {
+            visualModel.items.addGroups(0, visualModel.items.count, ["selected"] )
+        }
+    }
+
+    model: visualModel
+
+    MultipleSelectionVisualModel {
+        id: visualModel
+    }
+
+    Component.onCompleted: {
+        // FIXME: workaround for qtubuntu not returning values depending on the grid unit definition
+        // for Flickable.maximumFlickVelocity and Flickable.flickDeceleration
+        var scaleFactor = units.gridUnit / 8;
+        maximumFlickVelocity = maximumFlickVelocity * scaleFactor;
+        flickDeceleration = flickDeceleration * scaleFactor;
+    }
+}

=== added file 'app/upstreamcomponents/MultipleSelectionVisualModel.qml'
--- app/upstreamcomponents/MultipleSelectionVisualModel.qml	1970-01-01 00:00:00 +0000
+++ app/upstreamcomponents/MultipleSelectionVisualModel.qml	2014-08-11 15:43:15 +0000
@@ -0,0 +1,31 @@
+/*
+ * Copyright (C) 2012-2013 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/>.
+ */
+
+import QtQuick 2.2
+
+VisualDataModel {
+    id: contactVisualModel
+
+    property alias selectedItems: selectedGroup
+
+    groups: [
+        VisualDataGroup {
+            id: selectedGroup
+
+            name: "selected"
+        }
+    ]
+}

=== modified file 'app/upstreamcomponents/README.components'
--- app/upstreamcomponents/README.components	2014-08-07 01:01:36 +0000
+++ app/upstreamcomponents/README.components	2014-08-11 15:43:15 +0000
@@ -24,3 +24,10 @@
 
 https://bazaar.launchpad.net/~phablet-team/address-book-app/trunk/view/head:/src/imports/Ubuntu/Contacts/ListItemWithActionsCheckBox.qml
 
+MultipleSelectionListView.qml
+
+https://bazaar.launchpad.net/~phablet-team/address-book-app/trunk/view/head:/src/imports/Ubuntu/Contacts/MultipleSelectionListView.qml
+
+MultipleSelectionVisualModel.qml
+
+https://bazaar.launchpad.net/~phablet-team/address-book-app/trunk/view/head:/src/imports/Ubuntu/Contacts/MultipleSelectionVisualModel.qml

=== modified file 'tests/autopilot/ubuntu_clock_app/emulators.py'
--- tests/autopilot/ubuntu_clock_app/emulators.py	2014-08-08 09:11:06 +0000
+++ tests/autopilot/ubuntu_clock_app/emulators.py	2014-08-11 15:43:15 +0000
@@ -347,7 +347,7 @@
     @classmethod
     def select(cls, main_view):
         proxy_object = main_view.wait_select_single(
-            objectName='alarmListFlickable')
+            'AlarmList', objectName='alarmListView')
         proxy_object.visible.wait_for(True)
         return cls(proxy_object)
 
@@ -357,8 +357,7 @@
 
     def _get_saved_alarms_list(self):
         """Return the saved alarm list"""
-        return self.proxy_object.wait_select_single(
-            'QQuickRepeater', objectName='alarmListRepeater')
+        return self.proxy_object
 
     def get_saved_alarms(self):
         """Return a list with the information of the saved alarms.