Merge lp:~feng-kylin/unity8/removeHorizonalRuleOnUnlockScreen into lp:unity8

[handsome_feng]

Removed the horizonal rule on pin unlock screen.

* Are there any related MPs required for this MP to build/function as expected? Please list.

no

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

yes

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

yes

 * If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?

n/a

 * If you changed the UI, has there been a design review?

yes

[Albert Astals Cid (aacid)]

By removing the thin divider the rest of the elements of the layout get shifted up, by the design decision i am not sure that's what they want. Can you make it so the divider is gone but the rest of elements show up in the same place?

review: Needs Fixing

[handsome_feng (feng-kylin)]

> By removing the thin divider the rest of the elements of the layout get
> shifted up, by the design decision i am not sure that's what they want. Can
> you make it so the divider is gone but the rest of elements show up in the
> same place?

I use an Item to replace the ThinDivider to keep the rest of the elements stay
in the same place, but it seems a little bit odd to put an item just for this.
Could it be better to change the "spacing" of Column ?

[Albert Astals Cid (aacid)]

 * 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.
CI didn't run but we don't really need it for this

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

review: Approve

[Michael Zanetti (mzanetti)]

I don't really like the placeholder Item...

This ends up being this right now:

Column {
  spacing: units.gu(2)

  UpperItem { }

  Item {}

  LowerItem {}
}

Wouldn't it be better to just drop the middle Item and adjust the spacing to units.gu(4)? (I know that'll cause things to be off by units.dp(2) but I don't think that's a problem as this behaves slightly different for different screen sizes anyways.

So yes, I agree with Feng.

[Albert Astals Cid (aacid)]

Ok, Feng please update to the spacing solution.

[Albert Astals Cid (aacid)]

review: Needs Fixing

[lp:~feng-kylin/unity8/removeHorizonalRuleOnUnlockScreen]

1780. By handsome_feng on 2015-05-28

Adjust the spacing to units.gu(4)

[Michael Zanetti (mzanetti)]

 * 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.

Ci doesn't run on 3rd party, but I've ran all the affected tests myself and they pass.

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

yes

review: Approve

=== modified file 'qml/Components/PinLockscreen.qml'
--- qml/Components/PinLockscreen.qml	2015-03-18 17:27:30 +0000
+++ qml/Components/PinLockscreen.qml	2015-05-28 07:48:13 +0000
@@ -52,7 +52,7 @@
             verticalCenter: parent.verticalCenter;
             verticalCenterOffset: Math.max(-units.gu(10), -(root.height - height) / 2) + units.gu(4)
         }
-        spacing: units.gu(2)
+        spacing: units.gu(4)
 
         Column {
             id: shakeContainer
@@ -154,10 +154,6 @@
             }
         }
 
-        ThinDivider {
-            anchors { left: parent.left; right: parent.right; margins: units.gu(2) }
-        }
-
         Grid {
             id: numbersGrid
             objectName: "numbersGrid"