Ubuntu Clock App

Merge lp:~nik90/ubuntu-clock-app/sync-bottomedge-sep08 into lp:ubuntu-clock-app

  1. sync-bottomedge-sep08
  2. Merge into trunk
Proposed by Nekhelesh Ramananthan
Status: Merged
Approved by: Nekhelesh Ramananthan
Approved revision: 104
Merged at revision: 131
Proposed branch: lp:~nik90/ubuntu-clock-app/sync-bottomedge-sep08
Merge into: lp:ubuntu-clock-app
Diff against target: 535 lines (+188/-158)
7 files modified
app/clock/ClockPage.qml (+8/-1)
app/components/Clock.qml (+1/-0)
app/ubuntu-clock-app.qml (+0/-1)
app/upstreamcomponents/PageWithBottomEdge.qml (+164/-155)
debian/changelog (+12/-0)
manifest.json.in (+1/-1)
tests/autopilot/ubuntu_clock_app/emulators.py (+2/-0)
To merge this branch: bzr merge lp:~nik90/ubuntu-clock-app/sync-bottomedge-sep08
Reviewer Review Type Date Requested Status
Nekhelesh Ramananthan testing Approve
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
Renato Araujo Oliveira Filho Pending
Review via email: mp+236604@code.launchpad.net

Commit message

Sync PageWithBottomEdge.qml with upstream addressbook changes with regards to bug 1357945.

Description of the change

Sync PageWithBottomEdge.qml with upstream addressbook changes with regards to bug 1357945.

To post a comment you must log in.
Revision history for this message
Nekhelesh Ramananthan (nik90) wrote :

I notice 2 issues with this MP,

1. The bottom edge hint does not show automatically after opening the clock app.

2. The bottom edge hint does not hide when interacting with the content (scrolling, pressing button). This is also noticed in the upstream addressbook app as well.

3. When user stops interacting, it does not reappear after 5 seconds (also noticeable in upstream implementation).

review: Needs Fixing
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

FAILED: Continuous integration, rev:93
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/506/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/623
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/623/artifact/work/output/*zip*/output.zip
    FAILURE: http://91.189.93.70:8080/job/ubuntu-clock-app-utopic-amd64-ci/153/console

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/506/rebuild

review: Needs Fixing (continuous-integration)
lp:~nik90/ubuntu-clock-app/sync-bottomedge-sep08 updated
94. By Nekhelesh Ramananthan

Hide focus when flicking or interacting with clock page contents

95. By Nekhelesh Ramananthan

Synced with lp:~renatofilho/address-book-app/fix-1375513

Revision history for this message
Nekhelesh Ramananthan (nik90) wrote :

> I notice 2 issues with this MP,
>
> 1. The bottom edge hint does not show automatically after opening the clock
> app.
>

Still not fixed. Debugging atm.

> 2. The bottom edge hint does not hide when interacting with the content
> (scrolling, pressing button). This is also noticed in the upstream addressbook
> app as well.
>

Fixed in latest rev.

> 3. When user stops interacting, it does not reappear after 5 seconds (also
> noticeable in upstream implementation).

Renato mentioned that he agreed with the designers to not implement that, since it will be very complex to do and they are happy with the current implementation

Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

FAILED: Continuous integration, rev:95
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/507/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/625
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/625/artifact/work/output/*zip*/output.zip
    FAILURE: http://91.189.93.70:8080/job/ubuntu-clock-app-utopic-amd64-ci/154/console

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/507/rebuild

review: Needs Fixing (continuous-integration)
lp:~nik90/ubuntu-clock-app/sync-bottomedge-sep08 updated
96. By Nekhelesh Ramananthan

Fixed AP test and also solved bottom edge hint not getting active focus at clock app start using a hack

Revision history for this message
Nekhelesh Ramananthan (nik90) wrote :

All issues resolved (issue 1 solved with a hack). Let's see if we can resolve it properly.

Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

FAILED: Continuous integration, rev:96
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/508/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/631
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/631/artifact/work/output/*zip*/output.zip
    FAILURE: http://91.189.93.70:8080/job/ubuntu-clock-app-utopic-amd64-ci/155/console

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/508/rebuild

review: Needs Fixing (continuous-integration)
lp:~nik90/ubuntu-clock-app/sync-bottomedge-sep08 updated
97. By Nekhelesh Ramananthan

Removed ugly hack which was added before

Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

FAILED: Continuous integration, rev:97
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/509/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/632
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/632/artifact/work/output/*zip*/output.zip
    FAILURE: http://91.189.93.70:8080/job/ubuntu-clock-app-utopic-amd64-ci/156/console

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/509/rebuild

review: Needs Fixing (continuous-integration)
lp:~nik90/ubuntu-clock-app/sync-bottomedge-sep08 updated
98. By Nekhelesh Ramananthan

Fixed AP test by waiting for bottom edge hint to be shown

Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

FAILED: Continuous integration, rev:98
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/511/
Executed test runs:
    None: http://91.189.93.70:8080/job/ubuntu-clock-app-utopic-amd64-ci/158/console

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/511/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

FAILED: Continuous integration, rev:98
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/510/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/642
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/642/artifact/work/output/*zip*/output.zip
    FAILURE: http://91.189.93.70:8080/job/ubuntu-clock-app-utopic-amd64-ci/157/console

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/510/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Nekhelesh Ramananthan (nik90) wrote :

This has been design approved by Giorgio. Just need the AP tests to pass now before this can be merged!

Damn you Jenkins :P

lp:~nik90/ubuntu-clock-app/sync-bottomedge-sep08 updated
99. By Nekhelesh Ramananthan

Added debug

Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

FAILED: Continuous integration, rev:99
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/513/
Executed test runs:
    None: http://91.189.93.70:8080/job/ubuntu-clock-app-utopic-amd64-ci/160/console

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/513/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

FAILED: Continuous integration, rev:99
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/512/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/659
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/659/artifact/work/output/*zip*/output.zip
    FAILURE: http://91.189.93.70:8080/job/ubuntu-clock-app-utopic-amd64-ci/159/console

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/512/rebuild

review: Needs Fixing (continuous-integration)
lp:~nik90/ubuntu-clock-app/sync-bottomedge-sep08 updated
100. By Nekhelesh Ramananthan

Disabled alarms tests

Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

FAILED: Continuous integration, rev:100
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/514/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/662/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-clock-app-utopic-amd64-ci/161/console

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/514/rebuild

review: Needs Fixing (continuous-integration)
lp:~nik90/ubuntu-clock-app/sync-bottomedge-sep08 updated
101. By Nekhelesh Ramananthan

Reverted disabling tests

Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

FAILED: Continuous integration, rev:101
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/515/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/663
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/663/artifact/work/output/*zip*/output.zip
    FAILURE: http://91.189.93.70:8080/job/ubuntu-clock-app-utopic-amd64-ci/162/console

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/515/rebuild

review: Needs Fixing (continuous-integration)
lp:~nik90/ubuntu-clock-app/sync-bottomedge-sep08 updated
102. By Nekhelesh Ramananthan

Removed unnecessary function in bottom edge file

Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

FAILED: Continuous integration, rev:102
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/516/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/665
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/665/artifact/work/output/*zip*/output.zip
    FAILURE: http://91.189.93.70:8080/job/ubuntu-clock-app-utopic-amd64-ci/163/console

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/516/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Nekhelesh Ramananthan (nik90) wrote :

#blocked on Jenkins. This requires a patch to the Jenkins environment since the xvfb package which is used to run the clock app tests takes input focus away from the clock app when it is launched. This is causing the AP tests to be pass. Francis and Nicholas have been informed. Once jenkins is fixed, we should be good to merge this branch.

review: Needs Fixing
lp:~nik90/ubuntu-clock-app/sync-bottomedge-sep08 updated
103. By Nekhelesh Ramananthan

merged trunk lp:ubuntu-clock-app

Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

FAILED: Continuous integration, rev:103
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/535/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/790
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/790/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/535/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

PASSED: Continuous integration, rev:103
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/537/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/799
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/799/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/537/rebuild

review: Approve (continuous-integration)
Revision history for this message
Nekhelesh Ramananthan (nik90) wrote :

#unblocked

lp:~nik90/ubuntu-clock-app/sync-bottomedge-sep08 updated
104. By Nekhelesh Ramananthan

Updated changelog and bumped version to 3.2

Revision history for this message
Nekhelesh Ramananthan (nik90) wrote :

This MP only syncs the bottom edge component with upstream code. So no code review necessary. It was tested by myself and Giorgio (designer) on N4 and Krillin and confirmed to be working as expected.

Approving.

review: Approve (testing)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'app/clock/ClockPage.qml'
--- app/clock/ClockPage.qml 2014-09-26 11:36:12 +0000
+++ app/clock/ClockPage.qml 2014-10-09 16:31:17 +0000
@@ -33,13 +33,20 @@
3333
34 flickable: null34 flickable: null
3535
36 Component.onCompleted: Utils.log(debugMode, "Clock Page loaded")36 Component.onCompleted: {
37 Utils.log(debugMode, "Clock Page loaded")
38 _clockPage.setBottomEdgePage(Qt.resolvedUrl("../alarm/AlarmPage.qml"), {})
39 }
3740
38 Flickable {41 Flickable {
39 id: _flickable42 id: _flickable
4043
41 Component.onCompleted: otherElementsStartUpAnimation.start()44 Component.onCompleted: otherElementsStartUpAnimation.start()
4245
46 onFlickStarted: {
47 forceActiveFocus()
48 }
49
43 anchors.fill: parent50 anchors.fill: parent
44 contentWidth: parent.width51 contentWidth: parent.width
45 contentHeight: clock.height + date.height + locationRow.height52 contentHeight: clock.height + date.height + locationRow.height
4653
=== modified file 'app/components/Clock.qml'
--- app/components/Clock.qml 2014-09-06 15:16:43 +0000
+++ app/components/Clock.qml 2014-10-09 16:31:17 +0000
@@ -148,6 +148,7 @@
148 enabled: isMainClock148 enabled: isMainClock
149 anchors.fill: parent149 anchors.fill: parent
150 onClicked: {150 onClicked: {
151 forceActiveFocus()
151 clockFlipAnimation.start()152 clockFlipAnimation.start()
152 }153 }
153 }154 }
154155
=== modified file 'app/ubuntu-clock-app.qml'
--- app/ubuntu-clock-app.qml 2014-08-26 20:20:37 +0000
+++ app/ubuntu-clock-app.qml 2014-10-09 16:31:17 +0000
@@ -101,7 +101,6 @@
101 alarm. For instance it should read "Next alarm in 9h23m".101 alarm. For instance it should read "Next alarm in 9h23m".
102 */102 */
103 bottomEdgeTitle: i18n.tr("Alarms")103 bottomEdgeTitle: i18n.tr("Alarms")
104 bottomEdgePageComponent: AlarmPage {}
105 }104 }
106 }105 }
107}106}
108107
=== modified file 'app/upstreamcomponents/PageWithBottomEdge.qml'
--- app/upstreamcomponents/PageWithBottomEdge.qml 2014-09-20 10:47:21 +0000
+++ app/upstreamcomponents/PageWithBottomEdge.qml 2014-10-09 16:31:17 +0000
@@ -62,7 +62,7 @@
6262
63*/63*/
6464
65import QtQuick 2.365import QtQuick 2.2
66import Ubuntu.Components 1.166import Ubuntu.Components 1.1
6767
68Page {68Page {
@@ -71,7 +71,7 @@
71 property alias bottomEdgePageComponent: edgeLoader.sourceComponent71 property alias bottomEdgePageComponent: edgeLoader.sourceComponent
72 property alias bottomEdgePageSource: edgeLoader.source72 property alias bottomEdgePageSource: edgeLoader.source
73 property alias bottomEdgeTitle: tipLabel.text73 property alias bottomEdgeTitle: tipLabel.text
74 property alias bottomEdgeEnabled: bottomEdge.visible74 property bool bottomEdgeEnabled: true
75 property int bottomEdgeExpandThreshold: page.height * 0.275 property int bottomEdgeExpandThreshold: page.height * 0.2
76 property int bottomEdgeExposedArea: bottomEdge.state !== "expanded" ? (page.height - bottomEdge.y - bottomEdge.tipHeight) : _areaWhenExpanded76 property int bottomEdgeExposedArea: bottomEdge.state !== "expanded" ? (page.height - bottomEdge.y - bottomEdge.tipHeight) : _areaWhenExpanded
77 property bool reloadBottomEdgePage: true77 property bool reloadBottomEdgePage: true
@@ -87,7 +87,6 @@
87 signal bottomEdgeReleased()87 signal bottomEdgeReleased()
88 signal bottomEdgeDismissed()88 signal bottomEdgeDismissed()
8989
90
91 function showBottomEdgePage(source, properties)90 function showBottomEdgePage(source, properties)
92 {91 {
93 edgeLoader.setSource(source, properties)92 edgeLoader.setSource(source, properties)
@@ -142,13 +141,123 @@
142 z: 1141 z: 1
143 }142 }
144143
145 Timer {144 UbuntuShape {
146 id: hideIndicator145 id: tip
147146 objectName: "bottomEdgeTip"
148 interval: 3000147
149 running: true148 property bool hiden: (activeFocus === false) ||
150 repeat: false149 ((bottomEdge.y - units.gu(1)) < tip.y)
151 onTriggered: tip.hiden = true150
151 enabled: mouseArea.enabled
152 visible: page.bottomEdgeEnabled
153 anchors {
154 bottom: parent.bottom
155 horizontalCenter: bottomEdge.horizontalCenter
156 bottomMargin: hiden ? - height + units.gu(1) : -units.gu(1)
157 Behavior on bottomMargin {
158 SequentialAnimation {
159 // wait some msecs in case of the focus change again, to avoid flickering
160 PauseAnimation {
161 duration: 300
162 }
163 UbuntuNumberAnimation {
164 duration: UbuntuAnimation.SnapDuration
165 }
166 }
167 }
168 }
169
170 z: 1
171 width: tipLabel.paintedWidth + units.gu(6)
172 height: bottomEdge.tipHeight + units.gu(1)
173 color: Theme.palette.normal.overlay
174 Label {
175 id: tipLabel
176
177 anchors {
178 top: parent.top
179 left: parent.left
180 right: parent.right
181 }
182 height: bottomEdge.tipHeight
183 verticalAlignment: Text.AlignVCenter
184 horizontalAlignment: Text.AlignHCenter
185 opacity: tip.hiden ? 0.0 : 1.0
186 Behavior on opacity {
187 UbuntuNumberAnimation {
188 duration: UbuntuAnimation.SnapDuration
189 }
190 }
191 }
192 }
193
194 Rectangle {
195 id: shadow
196
197 anchors {
198 left: parent.left
199 right: parent.right
200 bottom: parent.bottom
201 }
202 height: units.gu(1)
203 z: 1
204 opacity: 0.0
205 gradient: Gradient {
206 GradientStop { position: 0.0; color: "transparent" }
207 GradientStop { position: 1.0; color: Qt.rgba(0, 0, 0, 0.2) }
208 }
209 }
210
211 MouseArea {
212 id: mouseArea
213
214 property real previousY: -1
215 property string dragDirection: "None"
216
217 preventStealing: true
218 drag {
219 axis: Drag.YAxis
220 target: bottomEdge
221 minimumY: bottomEdge.pageStartY
222 maximumY: page.height
223 }
224 enabled: edgeLoader.status == Loader.Ready
225 visible: page.bottomEdgeEnabled
226
227 anchors {
228 left: parent.left
229 right: parent.right
230 bottom: parent.bottom
231 }
232 height: bottomEdge.tipHeight
233 z: 1
234
235 onReleased: {
236 page.bottomEdgeReleased()
237 if ((dragDirection === "BottomToTop") &&
238 bottomEdge.y < (page.height - bottomEdgeExpandThreshold - bottomEdge.tipHeight)) {
239 bottomEdge.state = "expanded"
240 } else {
241 bottomEdge.state = "collapsed"
242 }
243 previousY = -1
244 dragDirection = "None"
245 }
246
247 onPressed: {
248 previousY = mouse.y
249 tip.forceActiveFocus()
250 }
251
252 onMouseYChanged: {
253 var yOffset = previousY - mouseY
254 // skip if was a small move
255 if (Math.abs(yOffset) <= units.gu(2)) {
256 return
257 }
258 previousY = mouseY
259 dragDirection = yOffset > 0 ? "BottomToTop" : "TopToBottom"
260 }
152 }261 }
153262
154 FakeHeader {263 FakeHeader {
@@ -177,7 +286,7 @@
177286
178 z: 1287 z: 1
179 color: Theme.palette.normal.background288 color: Theme.palette.normal.background
180 parent: page289 clip: true
181 anchors {290 anchors {
182 left: parent.left291 left: parent.left
183 right: parent.right292 right: parent.right
@@ -185,99 +294,7 @@
185 height: page.height294 height: page.height
186 y: height295 y: height
187296
188 UbuntuShape {297 visible: !page.isCollapsed
189 id: tip
190 objectName: "bottomEdgeTip"
191
192 property bool hiden: false
193
194 readonly property double visiblePosition: (page.height - bottomEdge.y) < units.gu(1) ? -bottomEdge.tipHeight + (page.height - bottomEdge.y) : 0
195 readonly property double invisiblePosition: (page.height - bottomEdge.y) < units.gu(1) ? -units.gu(1) : 0
196
197 z: -1
198 anchors.horizontalCenter: parent.horizontalCenter
199 y: hiden ? invisiblePosition : visiblePosition
200
201 width: tipLabel.paintedWidth + units.gu(6)
202 height: bottomEdge.tipHeight + units.gu(1)
203 color: Theme.palette.normal.overlay
204 Label {
205 id: tipLabel
206
207 anchors {
208 top: parent.top
209 left: parent.left
210 right: parent.right
211 }
212 height: bottomEdge.tipHeight
213 verticalAlignment: Text.AlignVCenter
214 horizontalAlignment: Text.AlignHCenter
215 opacity: tip.hiden ? 0.0 : 1.0
216 Behavior on opacity {
217 UbuntuNumberAnimation {
218 duration: UbuntuAnimation.SnapDuration
219 }
220 }
221 }
222 Behavior on y {
223 UbuntuNumberAnimation {
224 duration: UbuntuAnimation.SnapDuration
225 }
226 }
227 }
228
229 Rectangle {
230 id: shadow
231
232 anchors {
233 left: parent.left
234 right: parent.right
235 }
236 height: units.gu(1)
237 y: -height
238 z: -2
239 opacity: 0.0
240 gradient: Gradient {
241 GradientStop { position: 0.0; color: "transparent" }
242 GradientStop { position: 1.0; color: Qt.rgba(0, 0, 0, 0.2) }
243 }
244 }
245
246 MouseArea {
247 id: mouseArea
248
249 preventStealing: true
250 drag {
251 axis: Drag.YAxis
252 target: bottomEdge
253 minimumY: bottomEdge.pageStartY
254 maximumY: page.height
255 threshold: 100
256 }
257
258 anchors {
259 left: parent.left
260 right: parent.right
261 }
262 height: bottomEdge.tipHeight
263 y: -height
264
265 onReleased: {
266 page.bottomEdgeReleased()
267 if (bottomEdge.y < (page.height - bottomEdgeExpandThreshold - bottomEdge.tipHeight)) {
268 bottomEdge.state = "expanded"
269 } else {
270 bottomEdge.state = "collapsed"
271 bottomEdge.y = bottomEdge.height
272 }
273 }
274
275 onClicked: {
276 tip.hiden = false
277 hideIndicator.restart()
278 }
279 }
280
281 state: "collapsed"298 state: "collapsed"
282 states: [299 states: [
283 State {300 State {
@@ -290,14 +307,6 @@
290 target: fakeHeader307 target: fakeHeader
291 y: -fakeHeader.height308 y: -fakeHeader.height
292 }309 }
293 PropertyChanges {
294 target: tip
295 opacity: 1.0
296 }
297 PropertyChanges {
298 target: hideIndicator
299 running: true
300 }
301 },310 },
302 State {311 State {
303 name: "expanded"312 name: "expanded"
@@ -309,10 +318,6 @@
309 target: fakeHeader318 target: fakeHeader
310 y: 0319 y: 0
311 }320 }
312 PropertyChanges {
313 target: hideIndicator
314 running: false
315 }
316 },321 },
317 State {322 State {
318 name: "floating"323 name: "floating"
@@ -321,14 +326,6 @@
321 target: shadow326 target: shadow
322 opacity: 1.0327 opacity: 1.0
323 }328 }
324 PropertyChanges {
325 target: hideIndicator
326 running: false
327 }
328 PropertyChanges {
329 target: tip
330 hiden: false
331 }
332 }329 }
333 ]330 ]
334331
@@ -336,18 +333,35 @@
336 Transition {333 Transition {
337 to: "expanded"334 to: "expanded"
338 SequentialAnimation {335 SequentialAnimation {
336 alwaysRunToEnd: true
339 ParallelAnimation {337 ParallelAnimation {
340 UbuntuNumberAnimation {338 SmoothedAnimation {
341 target: bottomEdge339 target: bottomEdge
342 property: "y"340 property: "y"
343 duration: UbuntuAnimation.SlowDuration341 duration: UbuntuAnimation.FastDuration
342 easing.type: Easing.Linear
344 }343 }
345 UbuntuNumberAnimation {344 SmoothedAnimation {
346 target: fakeHeader345 target: fakeHeader
347 property: "y"346 property: "y"
348 duration: UbuntuAnimation.SlowDuration347 duration: UbuntuAnimation.FastDuration
348 easing.type: Easing.Linear
349 }349 }
350 }350 }
351 SmoothedAnimation {
352 target: edgeLoader
353 property: "anchors.topMargin"
354 to: - units.gu(4)
355 duration: UbuntuAnimation.FastDuration
356 easing.type: Easing.Linear
357 }
358 SmoothedAnimation {
359 target: edgeLoader
360 property: "anchors.topMargin"
361 to: 0
362 duration: UbuntuAnimation.FastDuration
363 easing: UbuntuAnimation.StandardEasing
364 }
351 ScriptAction {365 ScriptAction {
352 script: page._pushPage()366 script: page._pushPage()
353 }367 }
@@ -357,6 +371,8 @@
357 from: "expanded"371 from: "expanded"
358 to: "collapsed"372 to: "collapsed"
359 SequentialAnimation {373 SequentialAnimation {
374 alwaysRunToEnd: true
375
360 ScriptAction {376 ScriptAction {
361 script: {377 script: {
362 Qt.inputMethod.hide()378 Qt.inputMethod.hide()
@@ -366,12 +382,12 @@
366 }382 }
367 }383 }
368 ParallelAnimation {384 ParallelAnimation {
369 UbuntuNumberAnimation {385 SmoothedAnimation {
370 target: bottomEdge386 target: bottomEdge
371 property: "y"387 property: "y"
372 duration: UbuntuAnimation.SlowDuration388 duration: UbuntuAnimation.SlowDuration
373 }389 }
374 UbuntuNumberAnimation {390 SmoothedAnimation {
375 target: fakeHeader391 target: fakeHeader
376 property: "y"392 property: "y"
377 duration: UbuntuAnimation.SlowDuration393 duration: UbuntuAnimation.SlowDuration
@@ -382,14 +398,14 @@
382 // destroy current bottom page398 // destroy current bottom page
383 if (page.reloadBottomEdgePage) {399 if (page.reloadBottomEdgePage) {
384 edgeLoader.active = false400 edgeLoader.active = false
401 } else {
402 tip.forceActiveFocus()
385 }403 }
386404
387 // notify405 // notify
388 page.bottomEdgeDismissed()406 page.bottomEdgeDismissed()
389407
390 edgeLoader.active = true408 edgeLoader.active = true
391 tip.hiden = false
392 hideIndicator.restart()
393 }409 }
394 }410 }
395 }411 }
@@ -404,30 +420,23 @@
404 }420 }
405 ]421 ]
406422
407 Item {423 Loader {
424 id: edgeLoader
425
426 asynchronous: true
408 anchors.fill: parent427 anchors.fill: parent
409 clip: true428 //WORKAROUND: The SDK move the page contents down to allocate space for the header we need to avoid that during the page dragging
410429 Binding {
411 Loader {430 target: edgeLoader.status === Loader.Ready ? edgeLoader : null
412 id: edgeLoader431 property: "anchors.topMargin"
413432 value: edgeLoader.item && edgeLoader.item.flickable ? edgeLoader.item.flickable.contentY : 0
414 z: 1433 when: !page.isReady
415 active: true434 }
416 asynchronous: true435
417 anchors.fill: parent436 onLoaded: {
418437 tip.forceActiveFocus()
419 //WORKAROUND: The SDK move the page contents down to allocate space for the header we need to avoid that during the page dragging438 if (page.isReady && edgeLoader.item.active !== true) {
420 Binding {439 page._pushPage()
421 target: edgeLoader.status === Loader.Ready ? edgeLoader : null
422 property: "anchors.topMargin"
423 value: edgeLoader.item && edgeLoader.item.flickable ? edgeLoader.item.flickable.contentY : 0
424 when: !page.isReady
425 }
426
427 onLoaded: {
428 if (page.isReady && edgeLoader.item.active !== true) {
429 page._pushPage()
430 }
431 }440 }
432 }441 }
433 }442 }
434443
=== modified file 'debian/changelog'
--- debian/changelog 2014-09-25 11:29:41 +0000
+++ debian/changelog 2014-10-09 16:31:17 +0000
@@ -1,3 +1,15 @@
1ubuntu-clock-app (3.2) utopic; urgency=medium
2
3 [Nekhelesh Ramananthan]
4 * Fixed bottom edge hint timeout which made it possible for new users to not notice
5 the bottom edge action. (LP: #1357945)
6
7 [Akiva Shammai Avraham]
8 * Improved the analog clock performance by updating the clock hands every second
9 rather than every 10 milliseconds. (LP: #1363968)
10
11 -- Nekhelesh Ramananthan <krnekhelesh@gmail.com> Thu, 09 Oct 2014 18:22:31 +0200
12
1ubuntu-clock-app (3.1) utopic; urgency=medium13ubuntu-clock-app (3.1) utopic; urgency=medium
214
3 [Nekhelesh Ramananthan]15 [Nekhelesh Ramananthan]
416
=== modified file 'manifest.json.in'
--- manifest.json.in 2014-09-18 15:20:25 +0000
+++ manifest.json.in 2014-10-09 16:31:17 +0000
@@ -12,7 +12,7 @@
12 "urls": "share/url-dispatcher/urls/com.ubuntu.clock_clock.url-dispatcher"12 "urls": "share/url-dispatcher/urls/com.ubuntu.clock_clock.url-dispatcher"
13 }13 }
14 },14 },
15 "version": "3.1.@BZR_REVNO@",15 "version": "3.2.@BZR_REVNO@",
16 "maintainer": "Ubuntu App Cats <ubuntu-touch-coreapps@lists.launchpad.net>",16 "maintainer": "Ubuntu App Cats <ubuntu-touch-coreapps@lists.launchpad.net>",
17 "x-test": {17 "x-test": {
18 "autopilot": "ubuntu_clock_app"18 "autopilot": "ubuntu_clock_app"
1919
=== modified file 'tests/autopilot/ubuntu_clock_app/emulators.py'
--- tests/autopilot/ubuntu_clock_app/emulators.py 2014-09-12 19:44:18 +0000
+++ tests/autopilot/ubuntu_clock_app/emulators.py 2014-10-09 16:31:17 +0000
@@ -91,6 +91,8 @@
91 self.bottomEdgePageLoaded.wait_for(True)91 self.bottomEdgePageLoaded.wait_for(True)
92 try:92 try:
93 action_item = self.wait_select_single(objectName='bottomEdgeTip')93 action_item = self.wait_select_single(objectName='bottomEdgeTip')
94 action_item.hiden.wait_for(False)
95 action_item.enabled.wait_for(True)
94 start_x = (action_item.globalRect.x +96 start_x = (action_item.globalRect.x +
95 (action_item.globalRect.width * 0.5))97 (action_item.globalRect.width * 0.5))
96 start_y = (action_item.globalRect.y +98 start_y = (action_item.globalRect.y +

Subscribers

People subscribed via source and target branches