Merge lp:~ken-vandine/ubuntu-system-settings/less_phone_specific into lp:ubuntu-system-settings

[Ken VanDine]

Make cellular and phone dynamically visible

Make cellular and phone dynamically visible

[lp:~ken-vandine/ubuntu-system-settings/less_phone_specific]

1517. By Ken VanDine on 2016-02-04

String changes to make things less phone specific

1518. By Ken VanDine on 2016-02-04

Another "phone" string change

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1516
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/2597/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/6338
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-amd64-ci/371
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-i386-ci/780
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-touch/4866
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6349
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6349/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/27326

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/2597/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1518
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/2599/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/6348
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-amd64-ci/373
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-i386-ci/782
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-touch/4871
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6359
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6359/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/27335

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/2599/rebuild

review: Needs Fixing (continuous-integration)

[lp:~ken-vandine/ubuntu-system-settings/less_phone_specific]

1519. By Ken VanDine on 2016-02-04

Fixed the reset test to match the string change

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1519
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/2600/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/6351
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-amd64-ci/374
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-i386-ci/783
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-touch/4872
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6362
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6362/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/27338

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/2600/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1519
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/2602/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/6359
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-amd64-ci/376
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-i386-ci/785
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-touch/4877
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6370
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6370/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/27348

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/2602/rebuild

review: Needs Fixing (continuous-integration)

[lp:~ken-vandine/ubuntu-system-settings/less_phone_specific]

1520. By Ken VanDine on 2016-02-05

Changed more Phone strings to Device

1521. By Ken VanDine on 2016-02-05

Hide the phone related sounds in the sound panel when there isn't a modem available

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1520
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/2605/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/6368
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-amd64-ci/379
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-i386-ci/788
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-touch/4885
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6379
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6379/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/27366

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/2605/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1521
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/2606/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/6372/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-amd64-ci/380
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-i386-ci/789
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-touch/4887/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6383
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6383/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/27370

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/2606/rebuild

review: Needs Fixing (continuous-integration)

[lp:~ken-vandine/ubuntu-system-settings/less_phone_specific]

1522. By Ken VanDine on 2016-02-05

Hide the "Other Sounds" heading when there aren't other areas

1523. By Ken VanDine on 2016-02-05

Don't display the IMEI when there are no modems

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1523
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/2608/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/6376
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-amd64-ci/382
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-i386-ci/791
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-touch/4889
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6387
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6387/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/27374

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/2608/rebuild

review: Needs Fixing (continuous-integration)

[Jonas G. Drange (jonas-drange)]

LGTM! Thanks

review: Approve

=== modified file 'plugins/about/DevMode.qml'
--- plugins/about/DevMode.qml	2015-08-10 13:31:45 +0000
+++ plugins/about/DevMode.qml	2016-02-05 22:05:53 +0000
@@ -81,7 +81,7 @@
                         width: parent.width
                         horizontalAlignment: Text.AlignHCenter
                         wrapMode: Text.WordWrap
-                        text: i18n.tr("In Developer Mode, anyone can access, change or delete anything on this phone by connecting it to another device.")
+                        text: i18n.tr("In Developer Mode, anyone can access, change or delete anything on this device by connecting it to another device.")
                     }
                 }
             }

=== modified file 'plugins/about/PageComponent.qml'
--- plugins/about/PageComponent.qml	2016-01-22 19:57:26 +0000
+++ plugins/about/PageComponent.qml	2016-02-05 22:05:53 +0000
@@ -32,7 +32,7 @@
     id: root
     objectName: "aboutPage"
 
-    title: i18n.tr("About this phone")
+    title: i18n.tr("About")
     flickable: scrollWidget
     property var modemsSorted: []
 
@@ -109,7 +109,7 @@
                 text: "IMEI"
                 value: modemsSorted.length ? (imeiNumber || i18n.tr("None")) :
                     i18n.tr("None")
-                visible: modemsSorted.length <= 1
+                visible: modemsSorted.length == 1
             }
 
             ListItem.MultiValue {

=== modified file 'plugins/about/about.settings'
--- plugins/about/about.settings	2014-09-24 17:10:03 +0000
+++ plugins/about/about.settings	2016-02-05 22:05:53 +0000
@@ -1,6 +1,6 @@
 {
     "icon": "ubuntu-logo-symbolic",
-    "name": "About this phone",
+    "name": "About",
     "translations": "ubuntu-system-settings",
     "category": "uncategorized-bottom",
     "priority": 0,

=== modified file 'plugins/battery/SleepValues.qml'
--- plugins/battery/SleepValues.qml	2015-08-13 13:13:57 +0000
+++ plugins/battery/SleepValues.qml	2016-02-05 22:05:53 +0000
@@ -75,8 +75,8 @@
             anchors.right: parent.right
 
             SettingsItemTitle {
-                text: lockOnSuspend ? i18n.tr("Lock the phone when it's not in use:") :
-                                      i18n.tr("Put the phone to sleep when it is not in use:")
+                text: lockOnSuspend ? i18n.tr("Lock the device when it's not in use:") :
+                                      i18n.tr("Put the device to sleep when it is not in use:")
             }
 
             ListItem.ItemSelector {
@@ -122,7 +122,7 @@
             }
 
             ListItem.Caption {
-                text: lockOnSuspend ? i18n.tr("Shorter times are more secure. Phone won't lock during calls or video playback.") : i18n.tr("Phone won’t sleep during calls or video playback.")
+                text: lockOnSuspend ? i18n.tr("Shorter times are more secure. Device won't lock during calls or video playback.") : i18n.tr("Device won’t sleep during calls or video playback.")
             }
         }
     }

=== modified file 'plugins/cellular/CMakeLists.txt'
--- plugins/cellular/CMakeLists.txt	2015-08-06 15:12:39 +0000
+++ plugins/cellular/CMakeLists.txt	2016-02-05 22:05:53 +0000
@@ -1,4 +1,5 @@
 add_subdirectory(Components)
+add_subdirectory(plugin)
 
 install(FILES cellular.settings DESTINATION ${PLUGIN_MANIFEST_DIR})
 install(FILES settings-cellular.svg DESTINATION ${PLUGIN_MANIFEST_DIR}/icons)

=== modified file 'plugins/cellular/Components/NoSim.qml'
--- plugins/cellular/Components/NoSim.qml	2015-08-10 13:31:45 +0000
+++ plugins/cellular/Components/NoSim.qml	2016-02-05 22:05:53 +0000
@@ -42,7 +42,7 @@
 
     Label {
         anchors { left: parent.left; right: parent.right; }
-        text: i18n.tr("Insert a SIM, then restart the phone.")
+        text: i18n.tr("Insert a SIM, then restart the device.")
         horizontalAlignment: Text.AlignHCenter
         color: UbuntuColors.lightGrey
         wrapMode: Text.WordWrap

=== modified file 'plugins/cellular/cellular.settings'
--- plugins/cellular/cellular.settings	2015-08-13 12:49:29 +0000
+++ plugins/cellular/cellular.settings	2016-02-05 22:05:53 +0000
@@ -1,4 +1,5 @@
 {
+    "plugin": "cellular-plugin",
     "icon": "gsm-3g-high",
     "name": "Cellular",
     "translations": "ubuntu-system-settings",
@@ -23,6 +24,6 @@
         "sim"
     ],
     "has-dynamic-keywords": false,
-    "has-dynamic-visibility": false,
+    "has-dynamic-visibility": true,
     "page-component": "PageComponent.qml"
 }

=== added directory 'plugins/cellular/plugin'
=== added file 'plugins/cellular/plugin/CMakeLists.txt'
--- plugins/cellular/plugin/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ plugins/cellular/plugin/CMakeLists.txt	2016-02-05 22:05:53 +0000
@@ -0,0 +1,6 @@
+include_directories(${CMAKE_CURRENT_BINARY_DIR})
+
+add_library(cellular-plugin SHARED cellular-plugin.h cellular-plugin.cpp)
+qt5_use_modules(cellular-plugin Core Qml DBus)
+target_link_libraries(cellular-plugin SystemSettings)
+install(TARGETS cellular-plugin DESTINATION ${PLUGIN_MODULE_DIR})

=== added file 'plugins/cellular/plugin/cellular-plugin.cpp'
--- plugins/cellular/plugin/cellular-plugin.cpp	1970-01-01 00:00:00 +0000
+++ plugins/cellular/plugin/cellular-plugin.cpp	2016-02-05 22:05:53 +0000
@@ -0,0 +1,83 @@
+/*
+ * This file is part of system-settings
+ *
+ * Copyright (C) 2015 Canonical Ltd.
+ *
+ * Contact: Ken VanDine <[e-mail]>
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3, as published
+ * by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranties of
+ * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+ * PURPOSE.  See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "cellular-plugin.h"
+
+#include <QDebug>
+#include <QDBusInterface>
+#include <QDBusPendingReply>
+#include <QProcessEnvironment>
+#include <QtDBus>
+#include <SystemSettings/ItemBase>
+
+using namespace SystemSettings;
+
+class CellularItem: public ItemBase
+{
+    Q_OBJECT
+
+public:
+    explicit CellularItem(const QVariantMap &staticData, QObject *parent = 0);
+    void setVisibility(bool visible);
+};
+
+
+CellularItem::CellularItem(const QVariantMap &staticData, QObject *parent):
+    ItemBase(staticData, parent)
+{
+    QProcessEnvironment env = QProcessEnvironment::systemEnvironment();
+    if (env.contains(QLatin1String("USS_SHOW_ALL_UI"))) {
+        QString showAllS = env.value("USS_SHOW_ALL_UI", QString());
+
+        if(!showAllS.isEmpty()) {
+            setVisibility(true);
+            return;
+        }
+    }
+
+    bool supportedDevice(true);
+
+    QDBusInterface m_NetStatusPropertiesIface(
+            "com.ubuntu.connectivity1",
+            "/com/ubuntu/connectivity1/NetworkingStatus",
+            "org.freedesktop.DBus.Properties",
+            QDBusConnection::sessionBus());
+    QDBusPendingReply<QVariant> modemReply = m_NetStatusPropertiesIface.call(
+        "Get", "com.ubuntu.connectivity1.NetworkingStatus", "ModemAvailable");
+    modemReply.waitForFinished();
+    if (modemReply.isValid()) {
+        supportedDevice = modemReply.argumentAt<0>().toBool();
+    }
+
+    setVisibility(supportedDevice);
+}
+
+void CellularItem::setVisibility(bool visible)
+{
+    setVisible(visible);
+}
+
+ItemBase *CellularPlugin::createItem(const QVariantMap &staticData,
+                                 QObject *parent)
+{
+    return new CellularItem(staticData, parent);
+}
+
+#include "cellular-plugin.moc"

=== added file 'plugins/cellular/plugin/cellular-plugin.h'
--- plugins/cellular/plugin/cellular-plugin.h	1970-01-01 00:00:00 +0000
+++ plugins/cellular/plugin/cellular-plugin.h	2016-02-05 22:05:53 +0000
@@ -0,0 +1,38 @@
+/*
+ * This file is part of system-settings
+ *
+ * Copyright (C) 2015 Canonical Ltd.
+ *
+ * Contact: Ken VanDine <[e-mail]>
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3, as published
+ * by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranties of
+ * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+ * PURPOSE.  See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef SYSTEM_SETTINGS_CELLULAR_PLUGIN_H
+#define SYSTEM_SETTINGS_CELLULAR_PLUGIN_H
+
+#include <QObject>
+#include <SystemSettings/PluginInterface>
+
+class CellularPlugin: public QObject, public SystemSettings::PluginInterface2
+{
+    Q_OBJECT
+    Q_PLUGIN_METADATA(IID "com.ubuntu.SystemSettings.PluginInterface/2.0")
+    Q_INTERFACES(SystemSettings::PluginInterface2)
+
+public:
+    SystemSettings::ItemBase *createItem(const QVariantMap &staticData,
+                                         QObject *parent = 0);
+};
+
+#endif // SYSTEM_SETTINGS_CELLULAR_PLUGIN_H

=== modified file 'plugins/language/RebootNecessary.qml'
--- plugins/language/RebootNecessary.qml	2015-08-10 13:31:45 +0000
+++ plugins/language/RebootNecessary.qml	2016-02-05 22:05:53 +0000
@@ -31,7 +31,7 @@
     signal reboot()
     signal revert(int to)
 
-    text: i18n.tr("The phone needs to restart for changes to take effect.")
+    text: i18n.tr("The device needs to restart for changes to take effect.")
     Button {
         id: reboot
         objectName: "reboot"

=== modified file 'plugins/mouse/None.qml'
--- plugins/mouse/None.qml	2015-12-04 19:17:51 +0000
+++ plugins/mouse/None.qml	2016-02-05 22:05:53 +0000
@@ -33,7 +33,7 @@
             if (pocketPC)
                 return i18n.tr("Connect a mouse or touchpad via USB, or use a Bluetooth device. If a Bluetooth device isn’t detected, make sure it is turned on and its batteries are charged.")
             else
-                return i18n.tr("You need to use a Bluetooth mouse or touchpad with this display. Make sure it is close to the phone and its batteries are charged.")
+                return i18n.tr("You need to use a Bluetooth mouse or touchpad with this display. Make sure it is close to the device and its batteries are charged.")
         }
     }
 }

=== modified file 'plugins/phone/CMakeLists.txt'
--- plugins/phone/CMakeLists.txt	2015-06-19 18:06:18 +0000
+++ plugins/phone/CMakeLists.txt	2016-02-05 22:05:53 +0000
@@ -1,3 +1,5 @@
+add_subdirectory(plugin)
+
 set(QML_SOURCES
     CallForwarding.qml
     CallForwardItem.qml

=== modified file 'plugins/phone/phone.settings'
--- plugins/phone/phone.settings	2014-09-24 17:10:03 +0000
+++ plugins/phone/phone.settings	2016-02-05 22:05:53 +0000
@@ -1,4 +1,5 @@
 {
+    "plugin": "phone-plugin",
     "icon": "preferences-system-phone-symbolic",
     "name": "Phone",
     "translations": "ubuntu-system-settings",
@@ -19,5 +20,5 @@
     ],
     "page-component": "PageComponent.qml",
     "has-dynamic-keywords": false,
-    "has-dynamic-visibility": false
+    "has-dynamic-visibility": true
 }

=== added directory 'plugins/phone/plugin'
=== added file 'plugins/phone/plugin/CMakeLists.txt'
--- plugins/phone/plugin/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ plugins/phone/plugin/CMakeLists.txt	2016-02-05 22:05:53 +0000
@@ -0,0 +1,6 @@
+include_directories(${CMAKE_CURRENT_BINARY_DIR})
+
+add_library(phone-plugin SHARED phone-plugin.h phone-plugin.cpp)
+qt5_use_modules(phone-plugin Core Qml DBus)
+target_link_libraries(phone-plugin SystemSettings)
+install(TARGETS phone-plugin DESTINATION ${PLUGIN_MODULE_DIR})

=== added file 'plugins/phone/plugin/phone-plugin.cpp'
--- plugins/phone/plugin/phone-plugin.cpp	1970-01-01 00:00:00 +0000
+++ plugins/phone/plugin/phone-plugin.cpp	2016-02-05 22:05:53 +0000
@@ -0,0 +1,83 @@
+/*
+ * This file is part of system-settings
+ *
+ * Copyright (C) 2015 Canonical Ltd.
+ *
+ * Contact: Ken VanDine <[e-mail]>
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3, as published
+ * by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranties of
+ * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+ * PURPOSE.  See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "phone-plugin.h"
+
+#include <QDebug>
+#include <QDBusInterface>
+#include <QDBusPendingReply>
+#include <QProcessEnvironment>
+#include <QtDBus>
+#include <SystemSettings/ItemBase>
+
+using namespace SystemSettings;
+
+class PhoneItem: public ItemBase
+{
+    Q_OBJECT
+
+public:
+    explicit PhoneItem(const QVariantMap &staticData, QObject *parent = 0);
+    void setVisibility(bool visible);
+};
+
+
+PhoneItem::PhoneItem(const QVariantMap &staticData, QObject *parent):
+    ItemBase(staticData, parent)
+{
+    QProcessEnvironment env = QProcessEnvironment::systemEnvironment();
+    if (env.contains(QLatin1String("USS_SHOW_ALL_UI"))) {
+        QString showAllS = env.value("USS_SHOW_ALL_UI", QString());
+
+        if(!showAllS.isEmpty()) {
+            setVisibility(true);
+            return;
+        }
+    }
+
+    bool supportedDevice(true);
+
+    QDBusInterface m_NetStatusPropertiesIface(
+            "com.ubuntu.connectivity1",
+            "/com/ubuntu/connectivity1/NetworkingStatus",
+            "org.freedesktop.DBus.Properties",
+            QDBusConnection::sessionBus());
+    QDBusPendingReply<QVariant> modemReply = m_NetStatusPropertiesIface.call(
+        "Get", "com.ubuntu.connectivity1.NetworkingStatus", "ModemAvailable");
+    modemReply.waitForFinished();
+    if (modemReply.isValid()) {
+        supportedDevice = modemReply.argumentAt<0>().toBool();
+    }
+
+    setVisibility(supportedDevice);
+}
+
+void PhoneItem::setVisibility(bool visible)
+{
+    setVisible(visible);
+}
+
+ItemBase *PhonePlugin::createItem(const QVariantMap &staticData,
+                                 QObject *parent)
+{
+    return new PhoneItem(staticData, parent);
+}
+
+#include "phone-plugin.moc"

=== added file 'plugins/phone/plugin/phone-plugin.h'
--- plugins/phone/plugin/phone-plugin.h	1970-01-01 00:00:00 +0000
+++ plugins/phone/plugin/phone-plugin.h	2016-02-05 22:05:53 +0000
@@ -0,0 +1,38 @@
+/*
+ * This file is part of system-settings
+ *
+ * Copyright (C) 2015 Canonical Ltd.
+ *
+ * Contact: Ken VanDine <[e-mail]>
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3, as published
+ * by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranties of
+ * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+ * PURPOSE.  See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef SYSTEM_SETTINGS_PHONE_PLUGIN_H
+#define SYSTEM_SETTINGS_PHONE_PLUGIN_H
+
+#include <QObject>
+#include <SystemSettings/PluginInterface>
+
+class PhonePlugin: public QObject, public SystemSettings::PluginInterface2
+{
+    Q_OBJECT
+    Q_PLUGIN_METADATA(IID "com.ubuntu.SystemSettings.PluginInterface/2.0")
+    Q_INTERFACES(SystemSettings::PluginInterface2)
+
+public:
+    SystemSettings::ItemBase *createItem(const QVariantMap &staticData,
+                                         QObject *parent = 0);
+};
+
+#endif // SYSTEM_SETTINGS_PHONE_PLUGIN_H

=== modified file 'plugins/reset/EraseEverything.qml'
--- plugins/reset/EraseEverything.qml	2015-08-10 13:31:45 +0000
+++ plugins/reset/EraseEverything.qml	2016-02-05 22:05:53 +0000
@@ -38,7 +38,7 @@
             }
         }
         objectName: "factoryResetDialog"
-        text: i18n.tr("All documents, saved games, settings, and other items will be permanently deleted from this phone.")
+        text: i18n.tr("All documents, saved games, settings, and other items will be permanently deleted from this device.")
         Button {
             id: action
             text: i18n.tr("Erase & Reset Everything")

=== modified file 'plugins/reset/PageComponent.qml'
--- plugins/reset/PageComponent.qml	2015-08-10 13:31:45 +0000
+++ plugins/reset/PageComponent.qml	2016-02-05 22:05:53 +0000
@@ -29,7 +29,7 @@
 ItemPage {
     id: root
 
-    title: i18n.tr("Reset phone")
+    title: i18n.tr("Reset device")
     objectName: "resetPage"
     flickable: scrollWidget
 

=== modified file 'plugins/reset/reset.settings'
--- plugins/reset/reset.settings	2014-09-24 17:10:03 +0000
+++ plugins/reset/reset.settings	2016-02-05 22:05:53 +0000
@@ -1,6 +1,6 @@
 {
     "icon": "reset",
-    "name": "Reset phone",
+    "name": "Reset",
     "translations": "ubuntu-system-settings",
     "category": "uncategorized-bottom",
     "priority": 1,

=== modified file 'plugins/security-privacy/Location.qml'
--- plugins/security-privacy/Location.qml	2015-09-18 14:18:11 +0000
+++ plugins/security-privacy/Location.qml	2016-02-05 22:05:53 +0000
@@ -91,7 +91,7 @@
             anchors.right: parent.right
 
             SettingsItemTitle {
-                text: i18n.tr("Let the phone detect your location:")
+                text: i18n.tr("Let the device detect your location:")
             }
 
             ListItem.ItemSelector {

=== modified file 'plugins/security-privacy/LockSecurity.qml'
--- plugins/security-privacy/LockSecurity.qml	2015-08-10 13:31:45 +0000
+++ plugins/security-privacy/LockSecurity.qml	2016-02-05 22:05:53 +0000
@@ -35,7 +35,7 @@
     // The user can still press the main "back" button or other buttons on the
     // page while the "change password" dialog is up.  This is because the
     // dialog is not guaranteed to cover the whole screen; consider the case of
-    // turning a phone to landscape mode.  We'd rather not have the password
+    // turning a device to landscape mode.  We'd rather not have the password
     // changing operation interrupted by destroying the dialog out from under
     // it.  So we make sure the whole page and header back button are disabled
     // while the dialog is working.
@@ -442,7 +442,7 @@
             anchors.right: parent.right
 
             SettingsItemTitle {
-                text: i18n.tr("Unlock the phone using:")
+                text: i18n.tr("Unlock the device using:")
             }
 
             ListItem.ItemSelector {

=== modified file 'plugins/security-privacy/PhoneLocking.qml'
--- plugins/security-privacy/PhoneLocking.qml	2015-09-18 14:18:11 +0000
+++ plugins/security-privacy/PhoneLocking.qml	2016-02-05 22:05:53 +0000
@@ -146,7 +146,7 @@
 
             ListItem.Caption {
                 text: securityPrivacy.securityType === UbuntuSecurityPrivacyPanel.Swipe ?
-                      i18n.tr("Turn on lock security to restrict access when the phone is locked.") :
+                      i18n.tr("Turn on lock security to restrict access when the device is locked.") :
                       i18n.tr("Other apps and functions will prompt you to unlock.")
             }
         }

=== modified file 'plugins/security-privacy/SimPin.qml'
--- plugins/security-privacy/SimPin.qml	2015-08-10 13:31:45 +0000
+++ plugins/security-privacy/SimPin.qml	2016-02-05 22:05:53 +0000
@@ -441,7 +441,7 @@
             }
 
             ListItem.Caption {
-                text: i18n.tr("When a SIM PIN is set, it must be entered to access cellular services after restarting the phone or swapping the SIM.")
+                text: i18n.tr("When a SIM PIN is set, it must be entered to access cellular services after restarting the device or swapping the SIM.")
             }
 
             ListItem.Caption {

=== modified file 'plugins/sound/PageComponent.qml'
--- plugins/sound/PageComponent.qml	2015-10-23 14:57:26 +0000
+++ plugins/sound/PageComponent.qml	2016-02-05 22:05:53 +0000
@@ -22,6 +22,7 @@
 import QtQuick 2.4
 import Ubuntu.Components 1.3
 import Ubuntu.Components.ListItems 1.3 as ListItem
+import Ubuntu.Connectivity 1.0
 import SystemSettings 1.0
 import Ubuntu.SystemSettings.Sound 1.0
 import Ubuntu.Settings.Menus 0.1 as Menus
@@ -84,10 +85,6 @@
                 text: i18n.tr("Silent Mode")
             }
 
-            SettingsItemTitle {
-                text: i18n.tr("Ringer:")
-            }
-
             QDBusActionGroup {
                 id: soundActionGroup
                 busType: DBus.SessionBus
@@ -101,126 +98,136 @@
                 Component.onCompleted: start()
             }
 
-            Menus.SliderMenu {
-                id: volumeSlider
-                objectName: "sliderMenu"
-                enabled: soundActionGroup.volume.state != null
-                minimumValue: 0.0
-                maximumValue: 1.0
-                minIcon: "image://theme/audio-volume-low-zero"
-                maxIcon: "image://theme/audio-volume-high"
-
-                property real serverValue: soundActionGroup.volume.state
-
-                USC.ServerPropertySynchroniser {
-                    userTarget: volumeSlider
-                    userProperty: "value"
-                    serverTarget: volumeSlider
-                    serverProperty: "serverValue"
-                    maximumWaitBufferInterval: 16
-
-                    onSyncTriggered: soundActionGroup.volume.updateState(value);
-                }
-            }
-
-            ListItem.Standard {
-                id: highVolumeWarning
-                visible: soundActionGroup.highVolume.state == true
-                text: i18n.tr("High volume can damage your hearing.")
-            }
-
-            SettingsItemTitle {
-                text: i18n.tr("Phone calls:")
-            }
-
-            ListItem.SingleValue {
-                text: i18n.tr("Ringtone")
-                value: Utilities.buildDisplayName(
-                           backendInfo.incomingCallSound)
-                progression: true
-                onClicked: pageStack.push(
-                               Qt.resolvedUrl("SoundsList.qml"),
-                               { title: i18n.tr("Ringtone"),
-                                 showStopButton: true,
-                                 soundType: 0,
-                                 soundsDir:
-                                   "/usr/share/sounds/ubuntu/ringtones/" })
-            }
-
-            ListItem.Standard {
-                control: CheckBox {
-                    objectName: "callVibrate"
-                    property bool serverChecked: backendInfo.incomingCallVibrate
-                    onServerCheckedChanged: checked = serverChecked
-                    Component.onCompleted: checked = serverChecked
-                    onTriggered: backendInfo.incomingCallVibrate = checked
-                }
-                text: i18n.tr("Vibrate on ring")
-            }
-
-            ListItem.Standard {
-                control: CheckBox {
-                    objectName: "callVibrateSilentMode"
-                    property bool serverChecked: backendInfo.incomingCallVibrateSilentMode
-                    onServerCheckedChanged: checked = serverChecked
-                    Component.onCompleted: checked = serverChecked
-                    onTriggered: backendInfo.incomingCallVibrateSilentMode = checked
-                }
-                text: i18n.tr("Vibrate in Silent Mode")
-            }
-
-            ListItem.Standard {
-                control: Switch {
-                    objectName: "dialpadSounds"
-                    property bool serverChecked: backendInfo.dialpadSoundsEnabled
-                    onServerCheckedChanged: checked = serverChecked
-                    Component.onCompleted: checked = serverChecked
-                    onTriggered: backendInfo.dialpadSoundsEnabled = checked
-                }
-                text: i18n.tr("Dialpad tones")
-            }
-
-            SettingsItemTitle {
-                text: i18n.tr("Messages:")
-            }
-
-            ListItem.SingleValue {
-                text: i18n.tr("Message received")
-                value:Utilities.buildDisplayName(
-                          backendInfo.incomingMessageSound)
-                progression: true
-                onClicked: pageStack.push(
-                               Qt.resolvedUrl("SoundsList.qml"),
-                               { title: i18n.tr("Message received"),
-                                  soundType: 1,
-                                 soundsDir:
-                                   "/usr/share/sounds/ubuntu/notifications/" })
-            }
-
-            ListItem.Standard {
-                control: CheckBox {
-                    objectName: "messageVibrate"
-                    property bool serverChecked: backendInfo.incomingMessageVibrate
-                    onServerCheckedChanged: checked = serverChecked
-                    Component.onCompleted: checked = serverChecked
-                    onTriggered: backendInfo.incomingMessageVibrate = checked
-                }
-                text: i18n.tr("Vibrate with message sound")
-            }
-
-            ListItem.Standard {
-                control: CheckBox {
-                    objectName: "messageVibrateSilentMode"
-                    property bool serverChecked: backendInfo.incomingMessageVibrateSilentMode
-                    onServerCheckedChanged: checked = serverChecked
-                    Component.onCompleted: checked = serverChecked
-                    onTriggered: backendInfo.incomingMessageVibrateSilentMode = checked
-                }
-                text: i18n.tr("Vibrate in Silent Mode")
-            }
-
-            SettingsItemTitle {
-                text: i18n.tr("Other sounds:")
+            Column  {
+                anchors.left: parent.left
+                anchors.right: parent.right
+                visible: NetworkingStatus.modemAvailable
+
+                SettingsItemTitle {
+                    text: i18n.tr("Ringer:")
+                }
+
+                Menus.SliderMenu {
+                    id: volumeSlider
+                    objectName: "sliderMenu"
+                    enabled: soundActionGroup.volume.state != null
+                    minimumValue: 0.0
+                    maximumValue: 1.0
+                    minIcon: "image://theme/audio-volume-low-zero"
+                    maxIcon: "image://theme/audio-volume-high"
+
+                    property real serverValue: soundActionGroup.volume.state
+
+                    USC.ServerPropertySynchroniser {
+                        userTarget: volumeSlider
+                        userProperty: "value"
+                        serverTarget: volumeSlider
+                        serverProperty: "serverValue"
+                        maximumWaitBufferInterval: 16
+
+                        onSyncTriggered: soundActionGroup.volume.updateState(value);
+                    }
+                }
+
+                ListItem.Standard {
+                    id: highVolumeWarning
+                    visible: soundActionGroup.highVolume.state == true
+                    text: i18n.tr("High volume can damage your hearing.")
+                }
+
+                SettingsItemTitle {
+                    text: i18n.tr("Phone calls:")
+                }
+
+                ListItem.SingleValue {
+                    text: i18n.tr("Ringtone")
+                    value: Utilities.buildDisplayName(
+                               backendInfo.incomingCallSound)
+                    progression: true
+                    onClicked: pageStack.push(
+                                   Qt.resolvedUrl("SoundsList.qml"),
+                                   { title: i18n.tr("Ringtone"),
+                                     showStopButton: true,
+                                     soundType: 0,
+                                     soundsDir:
+                                       "/usr/share/sounds/ubuntu/ringtones/" })
+                }
+
+                ListItem.Standard {
+                    control: CheckBox {
+                        objectName: "callVibrate"
+                        property bool serverChecked: backendInfo.incomingCallVibrate
+                        onServerCheckedChanged: checked = serverChecked
+                        Component.onCompleted: checked = serverChecked
+                        onTriggered: backendInfo.incomingCallVibrate = checked
+                    }
+                    text: i18n.tr("Vibrate on ring")
+                }
+
+                ListItem.Standard {
+                    control: CheckBox {
+                        objectName: "callVibrateSilentMode"
+                        property bool serverChecked: backendInfo.incomingCallVibrateSilentMode
+                        onServerCheckedChanged: checked = serverChecked
+                        Component.onCompleted: checked = serverChecked
+                        onTriggered: backendInfo.incomingCallVibrateSilentMode = checked
+                    }
+                    text: i18n.tr("Vibrate in Silent Mode")
+                }
+
+                ListItem.Standard {
+                    control: Switch {
+                        objectName: "dialpadSounds"
+                        property bool serverChecked: backendInfo.dialpadSoundsEnabled
+                        onServerCheckedChanged: checked = serverChecked
+                        Component.onCompleted: checked = serverChecked
+                        onTriggered: backendInfo.dialpadSoundsEnabled = checked
+                    }
+                    text: i18n.tr("Dialpad tones")
+                }
+
+                SettingsItemTitle {
+                    text: i18n.tr("Messages:")
+                }
+
+                ListItem.SingleValue {
+                    text: i18n.tr("Message received")
+                    value:Utilities.buildDisplayName(
+                              backendInfo.incomingMessageSound)
+                    progression: true
+                    onClicked: pageStack.push(
+                                   Qt.resolvedUrl("SoundsList.qml"),
+                                   { title: i18n.tr("Message received"),
+                                      soundType: 1,
+                                     soundsDir:
+                                       "/usr/share/sounds/ubuntu/notifications/" })
+                }
+
+                ListItem.Standard {
+                    control: CheckBox {
+                        objectName: "messageVibrate"
+                        property bool serverChecked: backendInfo.incomingMessageVibrate
+                        onServerCheckedChanged: checked = serverChecked
+                        Component.onCompleted: checked = serverChecked
+                        onTriggered: backendInfo.incomingMessageVibrate = checked
+                    }
+                    text: i18n.tr("Vibrate with message sound")
+                }
+
+                ListItem.Standard {
+                    control: CheckBox {
+                        objectName: "messageVibrateSilentMode"
+                        property bool serverChecked: backendInfo.incomingMessageVibrateSilentMode
+                        onServerCheckedChanged: checked = serverChecked
+                        Component.onCompleted: checked = serverChecked
+                        onTriggered: backendInfo.incomingMessageVibrateSilentMode = checked
+                    }
+                    text: i18n.tr("Vibrate in Silent Mode")
+                }
+
+                SettingsItemTitle {
+                    text: i18n.tr("Other sounds:")
+                }
             }
 
             ListItem.Standard {

=== modified file 'plugins/system-update/PageComponent.qml'
--- plugins/system-update/PageComponent.qml	2015-12-16 16:19:04 +0000
+++ plugins/system-update/PageComponent.qml	2016-02-05 22:05:53 +0000
@@ -94,7 +94,7 @@
          Dialog {
              id: dialogueInstall
              title: i18n.tr("Update System")
-             text: root.batterySafeForUpdate ? i18n.tr("The phone needs to restart to install the system update.") : i18n.tr("Connect the phone to power before installing the system update.")
+             text: root.batterySafeForUpdate ? i18n.tr("The device needs to restart to install the system update.") : i18n.tr("Connect the device to power before installing the system update.")
 
              Button {
                  text: i18n.tr("Restart & Install")

=== modified file 'tests/autopilot/ubuntu_system_settings/tests/test_reset.py'
--- tests/autopilot/ubuntu_system_settings/tests/test_reset.py	2014-10-01 14:43:09 +0000
+++ tests/autopilot/ubuntu_system_settings/tests/test_reset.py	2016-02-05 22:05:53 +0000
@@ -29,7 +29,7 @@
         """Checks whether Reset page is available"""
         self.assertThat(
             self.reset_page.title,
-            Equals(_('Reset phone')))
+            Equals(_('Reset device')))
 
     def test_reset_launcher(self):
         gsettings = Gio.Settings.new('com.canonical.Unity.Launcher')