Merge lp:~boiko/dialer-app/qsg_optimizations into lp:dialer-app

Proposed by Gustavo Pichorim Boiko
Status: Merged
Approved by: Arthur Mello
Approved revision: 301
Merged at revision: 313
Proposed branch: lp:~boiko/dialer-app/qsg_optimizations
Merge into: lp:dialer-app
Diff against target: 96 lines (+24/-18)
5 files modified
src/qml/DialerPage/DialerPage.qml (+12/-0)
src/qml/DialerPage/KeypadButton.qml (+0/-1)
src/qml/HistoryPage/HistoryDetailsPage.qml (+0/-5)
src/qml/LiveCallPage/LiveCall.qml (+12/-0)
src/qml/dialer-app.qml (+0/-12)
To merge this branch: bzr merge lp:~boiko/dialer-app/qsg_optimizations
Reviewer Review Type Date Requested Status
Arthur Mello (community) Approve
PS Jenkins bot continuous-integration Needs Fixing
Review via email: mp+239041@code.launchpad.net

Commit message

Do some basic QSceneGraph rendering optimizations.

Description of the change

Do some basic QSceneGraph rendering optimizations.

== Checklist ==
Are there any related MPs required for this MP to build/function as expected? Please list.
No

Is your branch in sync with latest trunk (e.g. bzr pull lp:trunk -> no changes)
Yes

Did you perform an exploratory manual test run of your code change and any related functionality on device or emulator?
Yes

Did you successfully run all tests found in your component's Test Plan (https://wiki.ubuntu.com/Process/Merges/TestPlan/<package-name>) on device or emulator?
Yes

If you changed the UI, was the change specified/approved by design?
N/A

If you changed UI labels, did you update the pot file?
N/A

If you changed the packaging (debian), did you add a core-dev as a reviewer to this MP?
N/A

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
Arthur Mello (artmello) wrote :

Did you perform an exploratory manual test run of the code change and any related functionality on device or emulator?
yes

Did you successfully run all tests found in your component's Test Plan (https://wiki.ubuntu.com/Process/Merges/TestPlan/dialer-app) on device or emulator?
yes

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

Have you checked that submitter has accurately filled out the submitter checklist and has taken no shortcut?
yes

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'src/qml/DialerPage/DialerPage.qml'
--- src/qml/DialerPage/DialerPage.qml 2014-10-07 17:01:18 +0000
+++ src/qml/DialerPage/DialerPage.qml 2014-10-21 12:52:29 +0000
@@ -199,6 +199,18 @@
199 }199 }
200 }200 }
201201
202 Image {
203 id: background
204 anchors {
205 left: parent.left
206 right: parent.right
207 bottom: parent.bottom
208 }
209
210 source: Qt.resolvedUrl("../assets/dialer_background_full.png")
211 asynchronous: true
212 }
213
202 FocusScope {214 FocusScope {
203 id: keypadContainer215 id: keypadContainer
204216
205217
=== modified file 'src/qml/DialerPage/KeypadButton.qml'
--- src/qml/DialerPage/KeypadButton.qml 2014-09-08 17:18:12 +0000
+++ src/qml/DialerPage/KeypadButton.qml 2014-10-21 12:52:29 +0000
@@ -52,7 +52,6 @@
52 objectName: "keypadButtonLabelsContainer"52 objectName: "keypadButtonLabelsContainer"
53 height: childrenRect.height53 height: childrenRect.height
54 width: parent.width54 width: parent.width
55 clip: true
56 anchors.centerIn: parent55 anchors.centerIn: parent
57 scale: button.pressed ? 0.9 : 156 scale: button.pressed ? 0.9 : 1
5857
5958
=== modified file 'src/qml/HistoryPage/HistoryDetailsPage.qml'
--- src/qml/HistoryPage/HistoryDetailsPage.qml 2014-09-19 13:55:32 +0000
+++ src/qml/HistoryPage/HistoryDetailsPage.qml 2014-10-21 12:52:29 +0000
@@ -118,11 +118,6 @@
118 }118 }
119 }119 }
120120
121 Rectangle {
122 anchors.fill: parent
123 color: Theme.palette.normal.background
124 }
125
126 ListView {121 ListView {
127 id: eventsView122 id: eventsView
128 anchors.fill: parent123 anchors.fill: parent
129124
=== modified file 'src/qml/LiveCallPage/LiveCall.qml'
--- src/qml/LiveCallPage/LiveCall.qml 2014-10-07 17:01:28 +0000
+++ src/qml/LiveCallPage/LiveCall.qml 2014-10-21 12:52:29 +0000
@@ -288,6 +288,18 @@
288 return i18n.tr("Unknown device")288 return i18n.tr("Unknown device")
289 }289 }
290290
291 Image {
292 id: background
293 anchors {
294 left: parent.left
295 right: parent.right
296 bottom: parent.bottom
297 }
298
299 source: Qt.resolvedUrl("../assets/dialer_background_full.png")
300 asynchronous: true
301 }
302
291 // FIXME: this invisible label is only used for303 // FIXME: this invisible label is only used for
292 // calculating the size of the screen and resizing304 // calculating the size of the screen and resizing
293 // the dtmf string accordingly so it can fit the page header305 // the dtmf string accordingly so it can fit the page header
294306
=== modified file 'src/qml/dialer-app.qml'
--- src/qml/dialer-app.qml 2014-10-06 19:59:17 +0000
+++ src/qml/dialer-app.qml 2014-10-21 12:52:29 +0000
@@ -343,18 +343,6 @@
343 }343 }
344 }344 }
345345
346 Image {
347 id: background
348 anchors {
349 left: parent.left
350 right: parent.right
351 bottom: parent.bottom
352 }
353
354 source: Qt.resolvedUrl("assets/dialer_background_full.png")
355 asynchronous: true
356 }
357
358 Component {346 Component {
359 id: noNetworkDialog347 id: noNetworkDialog
360 Dialog {348 Dialog {

Subscribers

People subscribed via source and target branches