Merge lp:~ken-vandine/content-hub/no_devices_section into lp:content-hub

[Ken VanDine]

  ContentPeerPicker: Make headers translatable and use a ResponsiveGridView
  for the devices grid to match the apps grid.

  ContentPeerPicker: hide the devices section until we have a way to populate it

  ContentPeerPicker: Make headers translatable and use a ResponsiveGridView
  for the devices grid to match the apps grid.

  ContentPeerPicker: hide the devices section until we have a way to populate it

[Ken VanDine (ken-vandine)]

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/content-hub) on device or emulator?

 * Yes

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

 * The only change to the UI is hiding a section that is currently known to be
   empty. When we have a way to show populate the section we should make
   the devices section visible again.

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

 * No changes

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:82
http://jenkins.qa.ubuntu.com/job/content-hub-ci/139/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/content-hub-trusty-amd64-ci/42
    SUCCESS: http://jenkins.qa.ubuntu.com/job/content-hub-trusty-armhf-ci/42
        deb: http://jenkins.qa.ubuntu.com/job/content-hub-trusty-armhf-ci/42/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/content-hub-trusty-i386-ci/42

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/content-hub-ci/139/rebuild

review: Approve (continuous-integration)

[Michael Sheldon (michael-sheldon)]

Did you perform an exploratory manual test run of the code change and any related functionality on device or emulator?

 * Yes

Did CI run pass? If not, please explain why.

 * Yes

Have you checked that submitter has accurately filled out the submitter checklist and has taken no shortcut?

 * Yes

review: Approve

[Michael Sheldon (michael-sheldon)]

Did you perform an exploratory manual test run of the code change and any related functionality on device or emulator?

 * Yes

Did CI run pass? If not, please explain why.

 * Yes

Have you checked that submitter has accurately filled out the submitter checklist and has taken no shortcut?

 * Yes

review: Approve

=== modified file 'import/Ubuntu/Content/ContentPeerPicker.qml'
--- import/Ubuntu/Content/ContentPeerPicker.qml	2014-03-20 13:04:57 +0000
+++ import/Ubuntu/Content/ContentPeerPicker.qml	2014-03-31 18:00:08 +0000
@@ -171,13 +171,13 @@
     ListItem.Header {
         id: appTitle
         anchors.top: header.visible ? header.bottom : parent.top
-        text: "Apps"
+        text: i18n.tr("Apps")
     }
 
     Rectangle {
         id: apps
         color: "#FFFFFF"
-        height: (parent.height / 2.4)
+        height: devices.visible ? (parent.height / 2.4) : parent.height
         width: parent.width
         clip: true
         anchors {
@@ -200,22 +200,25 @@
                 model: customPeerModelLoader ? customPeerModelLoader.item.peers : peerModelLoader.item.peers
                 delegate: peerDelegate
             }
-
         }
     }
 
     ListItem.Header {
         id: devTitle
+        // TODO: make this visible when we have a way to populate devices
+        visible: false
         anchors {
             left: parent.left
             right: parent.right
             top: apps.bottom
         }
-        text: "Devices"
+        text: i18n.tr("Devices")
     }
 
     Rectangle {
         id: devices
+        // TODO: make this visible when we have a way to populate devices
+        visible: false
         color: "#FFFFFF"
         width: parent.width
         radius: 0
@@ -230,14 +233,16 @@
         Flickable {
             anchors.fill: parent
 
-            GridView {
+            ResponsiveGridView {
                 id: devPeers
-                header: Item { height: units.gu(2) }
-                cellWidth: units.gu(13.5)
-                cellHeight: units.gu(16)
+                anchors.fill: parent
+                minimumHorizontalSpacing: units.gu(0.5)
+                maximumNumberOfColumns: 6
+                delegateWidth: units.gu(11)
+                delegateHeight: units.gu(9.5)
+                verticalSpacing: units.gu(2)
                 delegate: peerDelegate
             }
-
         }
     }