Merge lp:~gcollura/ubuntu-calculator-app/reboot-fix-keyboard-rotation into lp:ubuntu-calculator-app

[Giulio Collura]

Fix keyboard layout switching on device rotation broken at rev #48. Hardcode architecture to 'all'.

I broke the keyboard rotation on the mobile device on rev #48. My bad. Here's a fix for that bug :)
Now if the device is rotated the keyboard successfully switch to landscape mode.

Edit: as requested by @popey, the architecture in manifest.json is now hardcoded to "all", since there's no binary in our package.

Thanks,
Giulio

[lp:~gcollura/ubuntu-calculator-app/reboot-fix-keyboard-rotation]

62. By Giulio Collura on 2015-01-14

hardcode architecture to 'all'

[Alan Pope 🍺🐧🐱 🦄 (popey)]

Fixed! Thanks! Tested on device.

http://people.canonical.com/~alan/screenshots/device-2015-01-14-150931.png

review: Approve

[Riccardo Padovani (rpadovani)]

Thanks Giulio!

review: Approve

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

review: Approve (continuous-integration)

=== modified file 'app/ubuntu-calculator-app.qml'
--- app/ubuntu-calculator-app.qml	2015-01-09 17:27:52 +0000
+++ app/ubuntu-calculator-app.qml	2015-01-14 15:02:27 +0000
@@ -421,7 +421,7 @@
         Loader {
             id: keyboardLoader
             width: parent.width
-            source: mainView.width > mainView.height ? "ui/LandscapeKeyboard.qml" : "ui/PortraiKeyboard.qml"
+            source: scrollableView.width > scrollableView.height ? "ui/LandscapeKeyboard.qml" : "ui/PortraiKeyboard.qml"
             opacity: ((y+height) >= scrollableView.contentY) && (y <= (scrollableView.contentY + scrollableView.height)) ? 1 : 0
         }
     }

=== modified file 'manifest.json.in'
--- manifest.json.in	2014-12-28 14:20:45 +0000
+++ manifest.json.in	2015-01-14 15:02:27 +0000
@@ -1,5 +1,5 @@
 {
-    "architecture": "@CLICK_ARCH@",
+    "architecture": "all",
     "description": "description of ubuntu-calculator-app",
     "framework": "ubuntu-sdk-14.10",
     "hooks": {