ubuntu-keyboard

Merge lp:~michael-sheldon/ubuntu-keyboard/increase-magnification into lp:ubuntu-keyboard

  1. increase-magnification
  2. Merge into trunk
Proposed by Michael Sheldon
Status: Merged
Approved by: Bill Filler
Approved revision: 173
Merged at revision: 172
Proposed branch: lp:~michael-sheldon/ubuntu-keyboard/increase-magnification
Merge into: lp:ubuntu-keyboard
Diff against target: 178 lines (+66/-65)
4 files modified
qml/keys/Magnifier.qml (+1/-1)
qml/keys/key_constants.js (+1/-0)
qml/languages/Keyboard_numbers.qml (+32/-32)
qml/languages/Keyboard_telephone.qml (+32/-32)
To merge this branch: bzr merge lp:~michael-sheldon/ubuntu-keyboard/increase-magnification
Reviewer Review Type Date Requested Status
Bill Filler (community) Approve
PS Jenkins bot continuous-integration Approve
Review via email: mp+221215@code.launchpad.net

Commit message

Disable magnification on the dial pad and number pad layouts, remove transparency from magnifier background.

Description of the change

Disable magnification on the dial pad and number pad layouts, remove transparency from magnifier background.

To post a comment you must log in.
Revision history for this message
Michael Sheldon (michael-sheldon) wrote :

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?

 * Increases magnifier size, discussed in Malta design meeting

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

 * No change

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

PASSED: Continuous integration, rev:170
http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-ci/395/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-utopic-amd64-ci/20
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-utopic-armhf-ci/20
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-utopic-armhf-ci/20/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-utopic-i386-ci/20

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

review: Approve (continuous-integration)
lp:~michael-sheldon/ubuntu-keyboard/increase-magnification updated
171. By Michael Sheldon

Merge from trunk

172. By Michael Sheldon

Update popover images with non-transparent backgrounds

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

PASSED: Continuous integration, rev:172
http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-ci/398/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-utopic-amd64-ci/23
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-utopic-armhf-ci/23
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-utopic-armhf-ci/23/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-utopic-i386-ci/23

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

review: Approve (continuous-integration)
Revision history for this message
Bill Filler (bfiller) wrote :

Works well, but did notice a couple of issues with the increased magnifier size
- the magnifiers get cut off when pressing p or q keys (on the sides). I think we'd need to do something like iphone does where it uses a slighty different image and skews it toward the middle so it doesn't look truncated. Or maybe something else that is easy..
- are all of the keys aligned vertically in the same way inside the magnifer? For example press "f" and the "g" key. The "f" looks higher than the "g" key looks. They should all be consistent vertically aligned from the top of the magnifier I think.

Revision history for this message
Bill Filler (bfiller) :
review: Needs Fixing
lp:~michael-sheldon/ubuntu-keyboard/increase-magnification updated
173. By Michael Sheldon

Restore original magnifier size

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

PASSED: Continuous integration, rev:173
http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-ci/399/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-utopic-amd64-ci/24
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-utopic-armhf-ci/24
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-utopic-armhf-ci/24/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-utopic-i386-ci/24

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

review: Approve (continuous-integration)
Revision history for this message
Bill Filler (bfiller) wrote :

there is a nasty black border partially drawn around the top of the magnifier/popover that is especially noticeable against a white background (open browser and clear all text from the URL field then press on top rows of keys). this should be eliminated

review: Needs Fixing
Revision history for this message
Bill Filler (bfiller) wrote :

Works other than issue noted above, but turns out that is an existing issue not related to this change.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'data/styles/ubuntu/images/keyboard_popover.png'
0Binary files data/styles/ubuntu/images/keyboard_popover.png 2013-08-13 15:33:41 +0000 and data/styles/ubuntu/images/keyboard_popover.png 2014-06-06 14:05:26 +0000 differ0Binary files data/styles/ubuntu/images/keyboard_popover.png 2013-08-13 15:33:41 +0000 and data/styles/ubuntu/images/keyboard_popover.png 2014-06-06 14:05:26 +0000 differ
=== modified file 'qml/images/popover@27.png'
1Binary files qml/images/popover@27.png 2013-09-30 08:56:44 +0000 and qml/images/popover@27.png 2014-06-06 14:05:26 +0000 differ1Binary files qml/images/popover@27.png 2013-09-30 08:56:44 +0000 and qml/images/popover@27.png 2014-06-06 14:05:26 +0000 differ
=== modified file 'qml/keys/Magnifier.qml'
--- qml/keys/Magnifier.qml 2013-10-08 10:36:32 +0000
+++ qml/keys/Magnifier.qml 2014-06-06 14:05:26 +0000
@@ -59,7 +59,7 @@
59 anchors.centerIn: parent59 anchors.centerIn: parent
6060
61 font.family: UI.fontFamily61 font.family: UI.fontFamily
62 font.pixelSize: units.gu( UI.fontSize )62 font.pixelSize: units.gu( UI.fontSizeMagnified )
63 font.bold: UI.fontBold63 font.bold: UI.fontBold
64 color: UI.fontColor64 color: UI.fontColor
65 }65 }
6666
=== modified file 'qml/keys/key_constants.js'
--- qml/keys/key_constants.js 2014-03-03 16:21:35 +0000
+++ qml/keys/key_constants.js 2014-06-06 14:05:26 +0000
@@ -18,6 +18,7 @@
1818
19var keyMargins = 1.8; // dp19var keyMargins = 1.8; // dp
20var fontSize = 2; // gu20var fontSize = 2; // gu
21var fontSizeMagnified = 2; // gu
21var fontFamily = "Ubuntu Medium";22var fontFamily = "Ubuntu Medium";
22var fontColor = "#666666"23var fontColor = "#666666"
23var fontBold = true24var fontBold = true
2425
=== modified file 'qml/languages/Keyboard_numbers.qml'
--- qml/languages/Keyboard_numbers.qml 2013-09-11 15:45:50 +0000
+++ qml/languages/Keyboard_numbers.qml 2014-06-06 14:05:26 +0000
@@ -35,38 +35,38 @@
35 anchors.margins: 50;35 anchors.margins: 50;
36 spacing: 036 spacing: 0
3737
38 CharKey { label: "1"; }38 CharKey { label: "1"; noMagnifier: true; }
39 CharKey { label: "2"; }39 CharKey { label: "2"; noMagnifier: true; }
40 CharKey { label: "3"; }40 CharKey { label: "3"; noMagnifier: true; }
41 }41 }
4242
43 Row {43 Row {
44 anchors.horizontalCenter: parent.horizontalCenter;44 anchors.horizontalCenter: parent.horizontalCenter;
45 anchors.margins: 50;45 anchors.margins: 50;
46 spacing: 046 spacing: 0
4747
48 CharKey { label: "4"; }48 CharKey { label: "4"; noMagnifier: true; }
49 CharKey { label: "5"; }49 CharKey { label: "5"; noMagnifier: true; }
50 CharKey { label: "6"; }50 CharKey { label: "6"; noMagnifier: true; }
51 }51 }
5252
53 Row {53 Row {
54 anchors.horizontalCenter: parent.horizontalCenter;54 anchors.horizontalCenter: parent.horizontalCenter;
55 anchors.margins: 50;55 anchors.margins: 50;
56 spacing: 056 spacing: 0
5757
58 CharKey { label: "7"; }58 CharKey { label: "7"; noMagnifier: true; }
59 CharKey { label: "8"; }59 CharKey { label: "8"; noMagnifier: true; }
60 CharKey { label: "9"; }60 CharKey { label: "9"; noMagnifier: true; }
61 }61 }
6262
63 Row {63 Row {
64 anchors.horizontalCenter: parent.horizontalCenter;64 anchors.horizontalCenter: parent.horizontalCenter;
65 anchors.margins: 50;65 anchors.margins: 50;
66 spacing: 066 spacing: 0
6767
68 CharKey { label: "."; extended: ["-", "."]}68 CharKey { label: "."; extended: ["-", "."]; noMagnifier: true; }
69 CharKey { label: "0"; }69 CharKey { label: "0"; noMagnifier: true; }
70 BackspaceKey { padding: 0; }70 BackspaceKey { padding: 0; }
71 }71 }
72 } // column72 } // column
7373
=== modified file 'qml/languages/Keyboard_telephone.qml'
--- qml/languages/Keyboard_telephone.qml 2013-09-11 09:53:33 +0000
+++ qml/languages/Keyboard_telephone.qml 2014-06-06 14:05:26 +0000
@@ -35,38 +35,38 @@
35 anchors.margins: 50;35 anchors.margins: 50;
36 spacing: 036 spacing: 0
3737
38 CharKey { label: "1"; }38 CharKey { label: "1"; noMagnifier: true; }
39 CharKey { label: "2"; }39 CharKey { label: "2"; noMagnifier: true; }
40 CharKey { label: "3"; }40 CharKey { label: "3"; noMagnifier: true; }
41 }41 }
4242
43 Row {43 Row {
44 anchors.horizontalCenter: parent.horizontalCenter;44 anchors.horizontalCenter: parent.horizontalCenter;
45 anchors.margins: 50;45 anchors.margins: 50;
46 spacing: 046 spacing: 0
4747
48 CharKey { label: "4"; }48 CharKey { label: "4"; noMagnifier: true; }
49 CharKey { label: "5"; }49 CharKey { label: "5"; noMagnifier: true; }
50 CharKey { label: "6"; }50 CharKey { label: "6"; noMagnifier: true; }
51 }51 }
5252
53 Row {53 Row {
54 anchors.horizontalCenter: parent.horizontalCenter;54 anchors.horizontalCenter: parent.horizontalCenter;
55 anchors.margins: 50;55 anchors.margins: 50;
56 spacing: 056 spacing: 0
5757
58 CharKey { label: "7"; }58 CharKey { label: "7"; noMagnifier: true; }
59 CharKey { label: "8"; }59 CharKey { label: "8"; noMagnifier: true; }
60 CharKey { label: "9"; }60 CharKey { label: "9"; noMagnifier: true; }
61 }61 }
6262
63 Row {63 Row {
64 anchors.horizontalCenter: parent.horizontalCenter;64 anchors.horizontalCenter: parent.horizontalCenter;
65 anchors.margins: 50;65 anchors.margins: 50;
66 spacing: 066 spacing: 0
6767
68 CharKey { label: "+"; annotation: "+*#"; extended: ["*", "#", "(", ")"] }68 CharKey { label: "+"; annotation: "+*#"; extended: ["*", "#", "(", ")"]; noMagnifier: true; }
69 CharKey { label: "0"; }69 CharKey { label: "0"; noMagnifier: true; }
70 BackspaceKey { padding: 0; }70 BackspaceKey { padding: 0; }
71 }71 }
72 } // column72 } // column

Subscribers

People subscribed via source and target branches