Unity 8

Merge lp:~feng-kylin/unity8/fix-lp1379327 into lp:unity8

  1. fix-lp1379327
  2. Merge into trunk
Proposed by handsome_feng
Status: Merged
Approved by: Albert Astals Cid
Approved revision: 1583
Merged at revision: 1598
Proposed branch: lp:~feng-kylin/unity8/fix-lp1379327
Merge into: lp:unity8
Diff against target: 31 lines (+3/-0)
2 files modified
qml/Dash/GenericScopeView.qml (+1/-0)
qml/Dash/PageHeader.qml (+2/-0)
To merge this branch: bzr merge lp:~feng-kylin/unity8/fix-lp1379327
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Albert Astals Cid (community) Approve
Review via email: mp+248215@code.launchpad.net

Commit message

makes the header fully reveal when tapping the search icon.

Description of the change

tapping search icon in header makes the header fully reveal.

To post a comment you must log in.
Revision history for this message
Albert Astals Cid (aacid) wrote :

What we need to do is show the header, not move to the beginning of the list.

review: Needs Fixing
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:1582
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~feng-kylin/unity8/fix-lp1379327/+merge/248215/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/unity8-ci/5222/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/1131
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/386
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/387
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/387
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/1009
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1129
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1129/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/17715

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/5222/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
handsome_feng (feng-kylin) wrote :

oh, yes, i made a mistake.thanks.

lp:~feng-kylin/unity8/fix-lp1379327 updated
1583. By handsome_feng

use showHeader() instead of positionAtBeginning()

Revision history for this message
Michał Sawicz (saviq) wrote :

Feng, we'll need you to sign the Contributor Agreement to accept your contribution. Please read http://www.ubuntu.com/legal/contributors

Revision history for this message
handsome_feng (feng-kylin) wrote :

> Feng, we'll need you to sign the Contributor Agreement to accept your
> contribution. Please read http://www.ubuntu.com/legal/contributors

i have done it , thanks.

Revision history for this message
Albert Astals Cid (aacid) wrote :

Thanks for the patch :)

 * Did you perform an exploratory manual test run of the code change and any related functionality?
Yes

 * Did CI run pass? If not, please explain why.
No, unrelated known broken tests

 * Did you make sure that the branch does not contain spurious tags?
Yes

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:1582
http://jenkins.qa.ubuntu.com/job/unity8-ci/5284/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/1290
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/448
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/449
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/449
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/1140
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1288
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1288/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/17957

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/5284/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:1582
http://jenkins.qa.ubuntu.com/job/unity8-ci/5293/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/1300
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/457
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/458
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/458
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/1149
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1298
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1298/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/17967

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/5293/rebuild

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'qml/Dash/GenericScopeView.qml'
--- qml/Dash/GenericScopeView.qml 2015-01-13 11:54:11 +0000
+++ qml/Dash/GenericScopeView.qml 2015-02-05 01:34:27 +0000
@@ -565,6 +565,7 @@
565 onBackClicked: scopeView.backClicked()565 onBackClicked: scopeView.backClicked()
566 onSettingsClicked: subPageLoader.openSubPage("settings")566 onSettingsClicked: subPageLoader.openSubPage("settings")
567 onFavoriteClicked: scopeView.scope.favorite = !scopeView.scope.favorite567 onFavoriteClicked: scopeView.scope.favorite = !scopeView.scope.favorite
568 onSearchTextFieldFocused: scopeView.showHeader()
568 }569 }
569 }570 }
570 }571 }
571572
=== modified file 'qml/Dash/PageHeader.qml'
--- qml/Dash/PageHeader.qml 2014-12-09 15:34:34 +0000
+++ qml/Dash/PageHeader.qml 2015-02-05 01:34:27 +0000
@@ -51,6 +51,7 @@
51 signal storeClicked()51 signal storeClicked()
52 signal settingsClicked()52 signal settingsClicked()
53 signal favoriteClicked()53 signal favoriteClicked()
54 signal searchTextFieldFocused()
5455
55 onScopeStyleChanged: refreshLogo()56 onScopeStyleChanged: refreshLogo()
56 onSearchQueryChanged: {57 onSearchQueryChanged: {
@@ -228,6 +229,7 @@
228229
229 onActiveFocusChanged: {230 onActiveFocusChanged: {
230 if (activeFocus) {231 if (activeFocus) {
232 root.searchTextFieldFocused();
231 root.openSearchHistory();233 root.openSearchHistory();
232 }234 }
233 }235 }

Subscribers

People subscribed via source and target branches