Ubuntu Shorts App

Merge lp:~vthompson/ubuntu-rssreader-app/anchor-to-osk into lp:~ubuntu-shorts-dev/ubuntu-rssreader-app/trunk

  1. anchor-to-osk
  2. Merge into trunk
Proposed by Victor Thompson
Status: Merged
Approved by: David Planella
Approved revision: 162
Merged at revision: 169
Proposed branch: lp:~vthompson/ubuntu-rssreader-app/anchor-to-osk
Merge into: lp:~ubuntu-shorts-dev/ubuntu-rssreader-app/trunk
Diff against target: 55 lines (+8/-1)
3 files modified
feeds/CreateTopicPage.qml (+3/-1)
rssreader-app.qml (+2/-0)
tests/autopilot/ubuntu_rssreader_app/tests/test_rssreader.py (+3/-0)
To merge this branch: bzr merge lp:~vthompson/ubuntu-rssreader-app/anchor-to-osk
Reviewer Review Type Date Requested Status
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
Roman Shchekin Approve
Review via email: mp+201301@code.launchpad.net

Commit message

Anchor app to OSK to prevent buttons from being covered by OSK.

Description of the change

Anchor app to OSK to prevent buttons from being covered by OSK.

To post a comment you must log in.
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

FAILED: Continuous integration, rev:158
http://91.189.93.70:8080/job/ubuntu-rssreader-app-ci/140/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/667
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-rssreader-app-raring-amd64-ci/140
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-rssreader-app-saucy-amd64-ci/140
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-rssreader-app-trusty-amd64-ci/27

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-rssreader-app-ci/140/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:159
http://91.189.93.70:8080/job/ubuntu-rssreader-app-ci/141/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/668
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-rssreader-app-raring-amd64-ci/141
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-rssreader-app-saucy-amd64-ci/141
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-rssreader-app-trusty-amd64-ci/28

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

review: Needs Fixing (continuous-integration)
Revision history for this message
Roman Shchekin (mrqtros) wrote :

Seems that all is ok

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

PASSED: Continuous integration, rev:161
http://91.189.93.70:8080/job/ubuntu-rssreader-app-ci/143/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-trusty/676
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-rssreader-app-raring-amd64-ci/143
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-rssreader-app-saucy-amd64-ci/143
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-rssreader-app-trusty-amd64-ci/30

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

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

FAILED: Autolanding.
More details in the following jenkins job:
http://91.189.93.70:8080/job/ubuntu-rssreader-app-autolanding/104/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/ubuntu-rssreader-app-raring-amd64-autolanding/104/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-rssreader-app-saucy-amd64-autolanding/104/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-rssreader-app-trusty-amd64-autolanding/18/console

review: Needs Fixing (continuous-integration)
lp:~vthompson/ubuntu-rssreader-app/anchor-to-osk updated
162. By Victor Thompson

Merge with trunk to fix conflict

Revision history for this message
Victor Thompson (vthompson) wrote :

Merge conflict has been resolved

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

PASSED: Continuous integration, rev:162
http://91.189.93.70:8080/job/ubuntu-rssreader-app-ci/149/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-trusty/802
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-rssreader-app-raring-amd64-ci/149
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-rssreader-app-saucy-amd64-ci/149
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-rssreader-app-trusty-amd64-ci/36

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

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'feeds/CreateTopicPage.qml'
--- feeds/CreateTopicPage.qml 2013-10-14 19:03:52 +0000
+++ feeds/CreateTopicPage.qml 2014-01-25 07:24:40 +0000
@@ -166,7 +166,9 @@
166166
167 Label {167 Label {
168 visible: suggestionFeedsModel.count == 0168 visible: suggestionFeedsModel.count == 0
169 anchors.centerIn: parent169 anchors {
170 centerIn: suggestionFeeds
171 }
170 text: i18n.tr("No feeds")172 text: i18n.tr("No feeds")
171 fontSize: "large"173 fontSize: "large"
172 }174 }
173175
=== modified file 'rssreader-app.qml'
--- rssreader-app.qml 2014-01-15 21:41:16 +0000
+++ rssreader-app.qml 2014-01-25 07:24:40 +0000
@@ -14,6 +14,8 @@
14 id: mainView14 id: mainView
15 objectName: "mainView"15 objectName: "mainView"
16 applicationName: "com.ubuntu.shorts"16 applicationName: "com.ubuntu.shorts"
17 anchorToKeyboard: true
18
1719
18 width: units.gu(50)20 width: units.gu(50)
19 height: units.gu(75)21 height: units.gu(75)
2022
=== modified file 'tests/autopilot/ubuntu_rssreader_app/tests/test_rssreader.py'
--- tests/autopilot/ubuntu_rssreader_app/tests/test_rssreader.py 2014-01-15 16:33:04 +0000
+++ tests/autopilot/ubuntu_rssreader_app/tests/test_rssreader.py 2014-01-25 07:24:40 +0000
@@ -274,6 +274,7 @@
274 #add topic and feed274 #add topic and feed
275 #TODO, try several different feeds275 #TODO, try several different feeds
276 feed = "http://www.canonical.com/rss.xml"276 feed = "http://www.canonical.com/rss.xml"
277 feedName = "Insights"
277 topicName = "CanonicalTopic"278 topicName = "CanonicalTopic"
278279
279 #just for timing issues280 #just for timing issues
@@ -300,6 +301,7 @@
300 """test view modes and ensure feed items can be opened"""301 """test view modes and ensure feed items can be opened"""
301302
302 feed = "http://www.canonical.com/rss.xml"303 feed = "http://www.canonical.com/rss.xml"
304 feedName = "Insights"
303 topicName = "CanonicalTopic"305 topicName = "CanonicalTopic"
304306
305 #just for timing issues307 #just for timing issues
@@ -362,6 +364,7 @@
362 """test edit topic"""364 """test edit topic"""
363365
364 feed = "http://www.canonical.com/rss.xml"366 feed = "http://www.canonical.com/rss.xml"
367 feedName = "Insights"
365 topicName = "CanonicalTopic"368 topicName = "CanonicalTopic"
366369
367 #add topic and feed370 #add topic and feed

Subscribers

People subscribed via source and target branches