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

[Michael Sheldon]

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

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

[Michael Sheldon (michael-sheldon)]

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

[PS Jenkins bot (ps-jenkins)]

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]

171. By Michael Sheldon on 2014-06-04

Merge from trunk

172. By Michael Sheldon on 2014-06-04

Update popover images with non-transparent backgrounds

[PS Jenkins bot (ps-jenkins)]

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)

[Bill Filler (bfiller)]

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.

[Bill Filler (bfiller)]

review: Needs Fixing

[lp:~michael-sheldon/ubuntu-keyboard/increase-magnification]

173. By Michael Sheldon on 2014-06-06

Restore original magnifier size

[PS Jenkins bot (ps-jenkins)]

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)

[Bill Filler (bfiller)]

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

[Bill Filler (bfiller)]

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

review: Approve

=== modified file 'data/styles/ubuntu/images/keyboard_popover.png'
Binary 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/[e-mail]'
Binary files qml/images/[e-mail]	2013-09-30 08:56:44 +0000 and qml/images/[e-mail]	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 @@
             anchors.centerIn: parent
 
             font.family: UI.fontFamily
-            font.pixelSize: units.gu( UI.fontSize )
+            font.pixelSize: units.gu( UI.fontSizeMagnified )
             font.bold: UI.fontBold
             color: UI.fontColor
         }

=== 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 @@
 
 var keyMargins  =   1.8;    // dp
 var fontSize    =   2;    // gu
+var fontSizeMagnified   =   2; // gu
 var fontFamily  =   "Ubuntu Medium";
 var fontColor   =   "#666666"
 var fontBold    =   true

=== 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 @@
             anchors.margins: 50;
             spacing: 0
 
-            CharKey { label: "1"; }
-            CharKey { label: "2"; }
-            CharKey { label: "3"; }
-        }
-
-        Row {
-            anchors.horizontalCenter: parent.horizontalCenter;
-            anchors.margins: 50;
-            spacing: 0
-
-            CharKey { label: "4"; }
-            CharKey { label: "5"; }
-            CharKey { label: "6"; }
-        }
-
-        Row {
-            anchors.horizontalCenter: parent.horizontalCenter;
-            anchors.margins: 50;
-            spacing: 0
-
-            CharKey { label: "7"; }
-            CharKey { label: "8"; }
-            CharKey { label: "9"; }
-        }
-
-        Row {
-            anchors.horizontalCenter: parent.horizontalCenter;
-            anchors.margins: 50;
-            spacing: 0
-
-            CharKey { label: "."; extended: ["-", "."]}
-            CharKey { label: "0"; }
+            CharKey { label: "1"; noMagnifier: true; }
+            CharKey { label: "2"; noMagnifier: true; }
+            CharKey { label: "3"; noMagnifier: true; }
+        }
+
+        Row {
+            anchors.horizontalCenter: parent.horizontalCenter;
+            anchors.margins: 50;
+            spacing: 0
+
+            CharKey { label: "4"; noMagnifier: true; }
+            CharKey { label: "5"; noMagnifier: true; }
+            CharKey { label: "6"; noMagnifier: true; }
+        }
+
+        Row {
+            anchors.horizontalCenter: parent.horizontalCenter;
+            anchors.margins: 50;
+            spacing: 0
+
+            CharKey { label: "7"; noMagnifier: true; }
+            CharKey { label: "8"; noMagnifier: true; }
+            CharKey { label: "9"; noMagnifier: true; }
+        }
+
+        Row {
+            anchors.horizontalCenter: parent.horizontalCenter;
+            anchors.margins: 50;
+            spacing: 0
+
+            CharKey { label: "."; extended: ["-", "."]; noMagnifier: true; }
+            CharKey { label: "0"; noMagnifier: true; }
             BackspaceKey { padding: 0; }
         }
     } // column

=== 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 @@
             anchors.margins: 50;
             spacing: 0
 
-            CharKey { label: "1"; }
-            CharKey { label: "2"; }
-            CharKey { label: "3"; }
-        }
-
-        Row {
-            anchors.horizontalCenter: parent.horizontalCenter;
-            anchors.margins: 50;
-            spacing: 0
-
-            CharKey { label: "4"; }
-            CharKey { label: "5"; }
-            CharKey { label: "6"; }
-        }
-
-        Row {
-            anchors.horizontalCenter: parent.horizontalCenter;
-            anchors.margins: 50;
-            spacing: 0
-
-            CharKey { label: "7"; }
-            CharKey { label: "8"; }
-            CharKey { label: "9"; }
-        }
-
-        Row {
-            anchors.horizontalCenter: parent.horizontalCenter;
-            anchors.margins: 50;
-            spacing: 0
-
-            CharKey { label: "+"; annotation: "+*#"; extended: ["*", "#", "(", ")"] }
-            CharKey { label: "0"; }
+            CharKey { label: "1"; noMagnifier: true; }
+            CharKey { label: "2"; noMagnifier: true; }
+            CharKey { label: "3"; noMagnifier: true; }
+        }
+
+        Row {
+            anchors.horizontalCenter: parent.horizontalCenter;
+            anchors.margins: 50;
+            spacing: 0
+
+            CharKey { label: "4"; noMagnifier: true; }
+            CharKey { label: "5"; noMagnifier: true; }
+            CharKey { label: "6"; noMagnifier: true; }
+        }
+
+        Row {
+            anchors.horizontalCenter: parent.horizontalCenter;
+            anchors.margins: 50;
+            spacing: 0
+
+            CharKey { label: "7"; noMagnifier: true; }
+            CharKey { label: "8"; noMagnifier: true; }
+            CharKey { label: "9"; noMagnifier: true; }
+        }
+
+        Row {
+            anchors.horizontalCenter: parent.horizontalCenter;
+            anchors.margins: 50;
+            spacing: 0
+
+            CharKey { label: "+"; annotation: "+*#"; extended: ["*", "#", "(", ")"]; noMagnifier: true; }
+            CharKey { label: "0"; noMagnifier: true; }
             BackspaceKey { padding: 0; }
         }
     } // column