ubuntu-keyboard

Merge lp:~michael-sheldon/ubuntu-keyboard/fix-language-button into lp:ubuntu-keyboard

fix-language-button
Merge into trunk

Proposed by Bill Filler on 2015-02-24

Status:

Merged

Approved by:

Bill Filler on 2015-02-27

Approved revision:

309

Merged at revision:

329

Proposed branch:

lp:~michael-sheldon/ubuntu-keyboard/fix-language-button

Merge into:

lp:ubuntu-keyboard

Diff against target:

23 lines (+2/-5)

1 file modified

tests/autopilot/ubuntu_keyboard/tests/test_keyboard.py (+2/-5)

To merge this branch:

bzr merge lp:~michael-sheldon/ubuntu-keyboard/fix-language-button

Related bugs:

Bug #1416037: [osk] Language button should always be visible	High	Fix Released
Bug #1416157: [osk] emoji menu should toggle in both directions	High	Fix Released
Bug #1417048: Tapping input source button opens menu instead of cycling layouts	High	Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
PS Jenkins bot	continuous-integration	2015-02-24	Needs Fixing on 2015-02-24
Bill Filler			Pending
Review via email: mp+250799@code.launchpad.net

This proposal supersedes a proposal from 2015-02-06.

Commit message

re-merge to fix AP tests as not all of the changes got merged previously

Description of the change

re-merge to fix AP tests as not all of the changes got merged previously

Revision history for this message

Michael Sheldon (michael-sheldon) wrote on 2015-02-06: Posted in a previous version of this proposal

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/ubuntu-keyboard) on device or emulator?

* Yes

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

* Changed language button behaviour to match existing design spec

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

* No change

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

* No change

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-02-06: Posted in a previous version of this proposal

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

review: Approve (continuous-integration)

Revision history for this message

Bill Filler (bfiller) wrote on 2015-02-07: Posted in a previous version of this proposal

Couple of things
1) I think we are not clearing the previous-language setting when a keyboard layout is disabled from the system settings. For example, I had English and Spanish enabled and used the key to toggle between them. Then went to the settings and disabled Spanish. The lang key still toggled between them even though Spanish had been disabled. Probably in the case of only where there is only one language we should display the menu when pressing the key.

2) Not sure about having the ... long press hint on the globe key. Looks a bit cluttered even though we have it there for consistency. I think it might be better to remove it.

3) In the menu, could we change the text for "Settings" to "Settings..." and/or change the font style to visually differentiate Settings from the language names? Maybe a thicker separator after the last language name could help. And no separator after Settings entry.

4) If not difficult it would also help to have a check mark (or some visual indication) of the currently selected language in the menu when it is displayed.

review: Needs Fixing

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-02-09: Posted in a previous version of this proposal

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-02-09: Posted in a previous version of this proposal

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Bill Filler (bfiller) wrote on 2015-02-10: Posted in a previous version of this proposal

Code looks good and all working well. But seems autopilot test is failing still in CI (see previous run http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/1109).

Please take a look, could be a flaky test or timing related, or perhaps it's a problem with CI.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-02-10: Posted in a previous version of this proposal

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

review: Approve (continuous-integration)

Revision history for this message

Michael Sheldon (michael-sheldon) wrote on 2015-02-19: Posted in a previous version of this proposal

Looks like this was merged at an earlier revision than the final one, meaning one of the text fixes never made it in, so we may want to remerge this.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-02-24:

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

review: Needs Fixing (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

Subscribers

People subscribed via source and target branches

to all changes:

Bill Filler

IRIE Shinsuke

Michael Sheldon

Thomas Moenicke

kokoye2007 

1	=== modified file 'tests/autopilot/ubuntu_keyboard/tests/test_keyboard.py'
2	--- tests/autopilot/ubuntu_keyboard/tests/test_keyboard.py 2015-02-09 18:18:20 +0000
3	+++ tests/autopilot/ubuntu_keyboard/tests/test_keyboard.py 2015-02-24 16:42:59 +0000
4	@@ -160,11 +160,7 @@
5	TextField {
6	id: input;
7	objectName: "input"
8	- anchors {
9	- top: inputLabel.bottom
10	- horizontalCenter: parent.horizontalCenter
11	- topMargin: 10
12	- }
13	+ anchors.centerIn: parent
14	inputMethodHints: %(input_method)s
15	}
16	}
17	@@ -379,6 +375,7 @@
18	TextField {
19	id: input;
20	objectName: "input"
21	+ anchors.centerIn: parent
22	property int visibilityChangeCount: 0
23	}
24