Merge lp:~xavi-garcia-mena/indicator-location/bug-1351299-location-settings into lp:indicator-location/15.10

[Xavi Garcia]

This branch removes the GPS entry and adds Location Settings.

This branch removes the GPS entry and adds Location Settings.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:149
http://jenkins.qa.ubuntu.com/job/indicator-location-ci/67/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-location-wily-amd64-ci/2
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-location-wily-armhf-ci/2
        deb: http://jenkins.qa.ubuntu.com/job/indicator-location-wily-armhf-ci/2/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/indicator-location-ci/67/rebuild

review: Approve (continuous-integration)

[Pete Woods (pete-woods)]

Simple and straightforward :)

review: Approve

[lp:~xavi-garcia-mena/indicator-location/bug-1351299-location-settings]

150. By Xavi Garcia on 2015-11-20

Disable GPS when Location is turned off

151. By Xavi Garcia on 2015-11-20

Disable root icon only when disabling location

152. By Xavi Garcia on 2015-11-23

Fixes issue when HERE is activated/disabled

153. By Xavi Garcia on 2015-11-23

Updated changelog

154. By Xavi Garcia on 2015-11-27

Avoid disabling GPS when turning off location to keep settings when turning location on again

Unmerged revisions

154. By Xavi Garcia on 2015-11-27

Avoid disabling GPS when turning off location to keep settings when turning location on again

153. By Xavi Garcia on 2015-11-23

Updated changelog

152. By Xavi Garcia on 2015-11-23

Fixes issue when HERE is activated/disabled

151. By Xavi Garcia on 2015-11-20

Disable root icon only when disabling location

150. By Xavi Garcia on 2015-11-20

Disable GPS when Location is turned off

149. By Xavi Garcia on 2015-11-05

Bug 1496061. Removed GPS entry and added Location settings

=== modified file 'debian/changelog'
--- debian/changelog	2015-07-27 18:06:47 +0000
+++ debian/changelog	2015-11-27 11:07:39 +0000
@@ -1,3 +1,9 @@
+indicator-location (13.10.0+15.10.20150727-0ubuntu2) UNRELEASED; urgency=medium
+
+  * Updated layout removing the GPS item and adding Location Settings
+
+ -- xavigarcia <[e-mail]>  Mon, 23 Nov 2015 18:22:55 +0100
+
 indicator-location (13.10.0+15.10.20150727-0ubuntu1) wily; urgency=medium
 
   [ CI Train Bot ]

=== modified file 'src/phone.cc'
--- src/phone.cc	2015-04-15 14:23:25 +0000
+++ src/phone.cc	2015-11-27 11:07:39 +0000
@@ -77,9 +77,8 @@
     return false;
 
   // as per "Indicators - RTM Usability Fix" document:
-  // visible iff location and/or GPS is enabled
-  return controller->is_location_service_enabled()
-      || controller->is_gps_enabled();
+  // visible iff location is enabled
+  return controller->is_location_service_enabled();
 }
 
 GVariant *
@@ -327,9 +326,6 @@
   /* populate the submenu */
   rebuild_submenu();
 
-  // disabled for 13.04 -- the location settings panel isn't complete
-  // g_menu_append (submenu, _("Location settings…"), "indicator." SETTINGS_ACTION_KEY "::location");
-
   /* add the submenu to a new header */
   header = g_menu_item_new (nullptr, "indicator." HEADER_ACTION_KEY);
   g_menu_item_set_attribute (header, "x-canonical-type", "s", "com.canonical.indicator.root");
@@ -359,9 +355,5 @@
                   "indicator." LICENCE_ACTION_KEY);
   }
 
-  GMenuItem * gps = g_menu_item_new(_("GPS"), "indicator." GPS_ACTION_KEY);
-  g_menu_item_set_attribute(gps, "x-canonical-type", "s",
-                            "com.canonical.indicator.switch");
-  g_menu_append_item(submenu.get(), gps);
-  g_object_unref(gps);
+  g_menu_append (submenu.get(), _("Location settings…"), "indicator." SETTINGS_ACTION_KEY "::security-privacy");
 }

=== modified file 'tests/phone-test.cc'
--- tests/phone-test.cc	2015-04-15 14:24:14 +0000
+++ tests/phone-test.cc	2015-11-27 11:07:39 +0000
@@ -97,8 +97,8 @@
 TEST_F (PhoneTest, MenuitemsExist)
 {
   ASSERT_TRUE (action_menuitem_exists ("indicator.location-detection-enabled"));
-  ASSERT_TRUE (action_menuitem_exists ("indicator.gps-detection-enabled"));
-  //ASSERT_TRUE (action_menuitem_exists ("indicator.settings"));
+  ASSERT_FALSE (action_menuitem_exists ("indicator.gps-detection-enabled"));
+  ASSERT_TRUE (action_menuitem_exists ("indicator.settings"));
 }
 
 TEST_F (PhoneTest, IsValidEnabled)
@@ -125,9 +125,9 @@
 TEST_F (PhoneTest, IsValidVisible)
 {
   // make sure something's enabled so that the indicator should be visible
-  if (!myController->is_gps_enabled()) {
-    myController->set_gps_enabled(true);
-    wait_for_action_state_change("gps-detection-enabled");
+  if (!myController->is_location_service_enabled()) {
+    myController->set_location_service_enabled(true);
+    wait_for_action_state_change("location-detection-enabled");
   }
 
   // test the header's 'invisible' entry tracks the controller's is_valid() state
@@ -327,7 +327,7 @@
     bool expected_visible;
   } visibility_tests[] = {
     { false, false, false },
-    { true,  false, true },
+    { true,  false, false },
     { false, true,  true },
     { true,  true,  true }
   };