Merge lp:~charlesk/indicator-power/lp-1215520 into lp:indicator-power/13.10

[Charles Kerr]

Revert bug #824629 code -- use the correct charge % when deciding what icon to use.

As described in bug #824629, on the Desktop it's sometimes difficult to tell whether a battery is charging or discharging because the lightning bolt is a little hard to see when laid against the background of a charged battery. The (IMO ugly) workaround at the time was to always use a nearly-empty battery icon so that the pixels beneath the lightning bolt were blank, making it easier to see.

The drawback of this approach is that the icon no longer gives useful information about the battery charge. This occurs on both desktop and tablet, but is more visible on the tablet because it has clearer icons.

This MP reverts the 824629 code to use the correct charge % when deciding what icon to use.

[Ted Gould (ted)]

Seems like a gain overall. Hopefully the icons will get fixed in the icon theme.

review: Approve

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:203
http://jenkins.qa.ubuntu.com/job/indicator-power-ci/62/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-power-saucy-amd64-ci/33
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-power-saucy-armhf-ci/33
        deb: http://jenkins.qa.ubuntu.com/job/indicator-power-saucy-armhf-ci/33/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins:8080/job/indicator-power-ci/62/rebuild

review: Approve (continuous-integration)

=== modified file 'src/device.c'
--- src/device.c	2013-08-23 17:07:06 +0000
+++ src/device.c	2013-10-01 14:13:24 +0000
@@ -328,10 +328,7 @@
 
   This function's logic differs from GSD's power plugin in some ways:
 
-  1. All charging batteries use the same icon regardless of progress.
-  <https://bugs.launchpad.net/indicator-power/+bug/824629/comments/7>
-
-  2. For discharging batteries, we decide whether or not to use the 'caution'
+  1. For discharging batteries, we decide whether or not to use the 'caution'
   icon based on whether or not we have <= 30 minutes remaining, rather than
   looking at the battery's percentage left.
   <https://bugs.launchpad.net/indicator-power/+bug/743823>
@@ -389,10 +386,6 @@
 
       case UP_DEVICE_STATE_CHARGING:
       case UP_DEVICE_STATE_PENDING_CHARGE:
-        /* When charging, always use the same icon regardless of percentage.
-           <http://bugs.launchpad.net/indicator-power/+bug/824629> */
-        percentage = 0;
-
         suffix_str = get_device_icon_suffix (percentage);
         index_str = get_device_icon_index (percentage);
         g_ptr_array_add (names, g_strdup_printf ("%s-%s-charging-symbolic", kind_str, suffix_str));

=== modified file 'tests/test-device.cc'
--- tests/test-device.cc	2013-08-23 17:10:26 +0000
+++ tests/test-device.cc	2013-10-01 14:13:24 +0000
@@ -318,9 +318,9 @@
                        INDICATOR_POWER_DEVICE_PERCENTAGE, 95.0,
                        NULL);
 
-      g_string_append_printf (expected, "%s-caution-charging-symbolic;", kind_str);
-      g_string_append_printf (expected, "gpm-%s-000-charging;", kind_str);
-      g_string_append_printf (expected, "%s-caution-charging", kind_str);
+      g_string_append_printf (expected, "%s-full-charging-symbolic;", kind_str);
+      g_string_append_printf (expected, "gpm-%s-100-charging;", kind_str);
+      g_string_append_printf (expected, "%s-full-charging", kind_str);
       check_icon_names (device, expected->str);
       g_string_truncate (expected, 0);
 
@@ -329,9 +329,9 @@
                        INDICATOR_POWER_DEVICE_STATE, UP_DEVICE_STATE_CHARGING,
                        INDICATOR_POWER_DEVICE_PERCENTAGE, 85.0,
                        NULL);
-      g_string_append_printf (expected, "%s-caution-charging-symbolic;", kind_str);
-      g_string_append_printf (expected, "gpm-%s-000-charging;", kind_str);
-      g_string_append_printf (expected, "%s-caution-charging", kind_str);
+      g_string_append_printf (expected, "%s-full-charging-symbolic;", kind_str);
+      g_string_append_printf (expected, "gpm-%s-080-charging;", kind_str);
+      g_string_append_printf (expected, "%s-full-charging", kind_str);
       check_icon_names (device, expected->str);
       g_string_truncate (expected, 0);
 
@@ -340,9 +340,9 @@
                        INDICATOR_POWER_DEVICE_STATE, UP_DEVICE_STATE_CHARGING,
                        INDICATOR_POWER_DEVICE_PERCENTAGE, 50.0,
                        NULL);
-      g_string_append_printf (expected, "%s-caution-charging-symbolic;", kind_str);
-      g_string_append_printf (expected, "gpm-%s-000-charging;", kind_str);
-      g_string_append_printf (expected, "%s-caution-charging", kind_str);
+      g_string_append_printf (expected, "%s-good-charging-symbolic;", kind_str);
+      g_string_append_printf (expected, "gpm-%s-060-charging;", kind_str);
+      g_string_append_printf (expected, "%s-good-charging", kind_str);
       check_icon_names (device, expected->str);
       g_string_truncate (expected, 0);
 
@@ -351,9 +351,9 @@
                        INDICATOR_POWER_DEVICE_STATE, UP_DEVICE_STATE_CHARGING,
                        INDICATOR_POWER_DEVICE_PERCENTAGE, 25.0,
                        NULL);
-      g_string_append_printf (expected, "%s-caution-charging-symbolic;", kind_str);
-      g_string_append_printf (expected, "gpm-%s-000-charging;", kind_str);
-      g_string_append_printf (expected, "%s-caution-charging", kind_str);
+      g_string_append_printf (expected, "%s-low-charging-symbolic;", kind_str);
+      g_string_append_printf (expected, "gpm-%s-020-charging;", kind_str);
+      g_string_append_printf (expected, "%s-low-charging", kind_str);
       check_icon_names (device, expected->str);
       g_string_truncate (expected, 0);