1
=== modified file 'src/imports/Ubuntu/Contacts/ContactSimpleListView.qml'
2
--- src/imports/Ubuntu/Contacts/ContactSimpleListView.qml	2015-03-17 17:14:09 +0000
3
+++ src/imports/Ubuntu/Contacts/ContactSimpleListView.qml	2015-04-02 17:17:18 +0000
4
@@ -337,8 +337,11 @@
5
337
                return
337
                return
6
338
            // check if we should expand and display the details picker
338
            // check if we should expand and display the details picker
7
339
            } else if (detailToPick !== -1) {
339
            } else if (detailToPick !== -1) {
8
340
                //view.highlightFollowsCurrentItem = true
9
341
                contactListView.currentIndex = index
340
                contactListView.currentIndex = index
10
341
                if (index == 0) {
11
342
                    // WORKAROUND: Due the header the ListView does the wrong scolling for the first item
12
343
                    contactListView.positionViewAtIndex(0, ListView.Beginning)
13
344
                }
14
342
                return
345
                return
15
343
            } else if (detailToPick == -1) {
346
            } else if (detailToPick == -1) {
16
344
                contactListView.detailClicked(contact, null, "")
347
                contactListView.detailClicked(contact, null, "")
17
345
348
18
=== modified file 'src/imports/Ubuntu/Contacts/MostCalledModel.qml'
19
--- src/imports/Ubuntu/Contacts/MostCalledModel.qml	2014-10-14 15:57:09 +0000
20
+++ src/imports/Ubuntu/Contacts/MostCalledModel.qml	2015-04-02 17:17:18 +0000
21
@@ -58,6 +58,7 @@
22
58
        id: mostCalledModel
58
        id: mostCalledModel
23
59
59
24
60
        startInterval: new Date((new Date().getTime() - 2592000000)) // one month ago
60
        startInterval: new Date((new Date().getTime() - 2592000000)) // one month ago
25
61
        maxCount: 5
26
61
        onLoaded: root.loaded()
62
        onLoaded: root.loaded()
27
62
        sourceModel: historyEventModel
63
        sourceModel: historyEventModel
28
63
    }
64
    }
29
64
65
30
=== modified file 'src/imports/Ubuntu/Contacts/mostcalledproxymodel.cpp'
31
--- src/imports/Ubuntu/Contacts/mostcalledproxymodel.cpp	2014-09-05 02:22:31 +0000
32
+++ src/imports/Ubuntu/Contacts/mostcalledproxymodel.cpp	2015-04-02 17:17:18 +0000
33
@@ -337,7 +337,7 @@
34
337
            if (d.callCount >= m_average) {
337
            if (d.callCount >= m_average) {
35
338
                m_data << d;
338
                m_data << d;
36
339
            }
339
            }
38
340
            if ((uint) m_data.size() > m_maxCount) {
340
            if ((uint) m_data.size() >= m_maxCount) {
39
341
                break;
341
                break;
40
342
            }
342
            }
41
343
        }
343
        }
Status:	Merged
Approved by:	Bill Filler on 2015-04-07
Approved revision:	396
Merged at revision:	416
Proposed branch:	lp:~renatofilho/address-book-app/fix-1426359
Merge into:	lp:address-book-app
Diff against target:	41 lines (+6/-2) 3 files modified src/imports/Ubuntu/Contacts/ContactSimpleListView.qml (+4/-1) src/imports/Ubuntu/Contacts/MostCalledModel.qml (+1/-0) src/imports/Ubuntu/Contacts/mostcalledproxymodel.cpp (+1/-1)
To merge this branch:	bzr merge lp:~renatofilho/address-book-app/fix-1426359
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
PS Jenkins bot	continuous-integration		Needs Fixing on 2015-04-02
Ubuntu Phablet Team		2015-02-27	Pending
Review via email: mp+251310@code.launchpad.net