Merge lp:~charlesk/indicator-power/lp-1186181-icon-should-match-battery-percentage into lp:indicator-power/14.10

[Charles Kerr]

Choose the icon that's closest to the current battery charge percentage

Choose the icon that's closest to the current battery charge percentage.

This patch removes code that chose the "40% charge" icon if >30 minutes were left on the battery, no matter how low the actual % charge was. This can be confusing now that we actually show the numeric percentage as well.

https://bugs.launchpad.net/ubuntu-ux/+bug/1186181/comments/12 has background on why the code previously chose the 40% icon.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:253
http://jenkins.qa.ubuntu.com/job/indicator-power-ci/121/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-power-utopic-amd64-ci/22
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-power-utopic-armhf-ci/22
        deb: http://jenkins.qa.ubuntu.com/job/indicator-power-utopic-armhf-ci/22/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[Antti Kaijanmäki (kaijanmaki)]

LGTM.

review: Approve

[lp:~charlesk/indicator-power/lp-1186181-icon-should-match-battery-percentage]

254. By Charles Kerr on 2014-08-22

sync with trunk.

255. By Charles Kerr on 2014-08-22

in debian/control, bump standards version from 3.9.2 to 3.9.5 to make lintian happy

=== modified file 'debian/control'
--- debian/control	2014-07-21 23:12:11 +0000
+++ debian/control	2014-08-22 15:04:06 +0000
@@ -17,7 +17,7 @@
                python3-dbusmock,
                dbus-test-runner,
                libdbustest1-dev,
-Standards-Version: 3.9.2
+Standards-Version: 3.9.5
 Homepage: https://launchpad.net/indicator-power
 # If you aren't a member of ~indicator-applet-developers but need to upload
 # packaging changes, just go ahead.  ~indicator-applet-developers will notice

=== modified file 'src/device.c'
--- src/device.c	2014-07-14 04:33:16 +0000
+++ src/device.c	2014-08-22 15:04:06 +0000
@@ -353,13 +353,6 @@
   indicator_power_device_get_icon_names:
   @device: #IndicatorPowerDevice from which to generate the icon names
 
-  This function's logic differs from GSD's power plugin in some ways:
-
-  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>
-
   See also indicator_power_device_get_gicon().
 
   Return value: (array zero-terminated=1) (transfer full):
@@ -423,13 +416,6 @@
       case UP_DEVICE_STATE_PENDING_CHARGE:
       case UP_DEVICE_STATE_DISCHARGING:
       case UP_DEVICE_STATE_PENDING_DISCHARGE:
-        /* Don't show the caution/red icons unless we have <=30 min left.
-           <https://bugs.launchpad.net/indicator-power/+bug/743823>
-           Themes use the caution color when the percentage is 0% or 20%,
-           so if we have >30 min left, use 30% as the icon's percentage floor */
-        if (indicator_power_device_get_time (device) > (30*60))
-          percentage = MAX(percentage, 30);
-
         suffix_str = get_device_icon_suffix (percentage);
         index_str = get_device_icon_index (percentage);
         g_ptr_array_add (names, g_strdup_printf ("%s-%s", kind_str, index_str));

=== modified file 'tests/test-device.cc'
--- tests/test-device.cc	2014-07-17 19:46:23 +0000
+++ tests/test-device.cc	2014-08-22 15:04:06 +0000
@@ -422,10 +422,10 @@
                        INDICATOR_POWER_DEVICE_PERCENTAGE, 25.0,
                        INDICATOR_POWER_DEVICE_TIME, (guint64)(60*60),
                        NULL);
-      g_string_append_printf (expected, "%s-040;", kind_str);
-      g_string_append_printf (expected, "gpm-%s-040;", kind_str);
-      g_string_append_printf (expected, "%s-good-symbolic;", kind_str);
-      g_string_append_printf (expected, "%s-good", kind_str);
+      g_string_append_printf (expected, "%s-020;", kind_str);
+      g_string_append_printf (expected, "gpm-%s-020;", kind_str);
+      g_string_append_printf (expected, "%s-low-symbolic;", kind_str);
+      g_string_append_printf (expected, "%s-low", kind_str);
       check_icon_names (device, expected->str);
       g_string_truncate (expected, 0);
 
@@ -448,10 +448,10 @@
                        INDICATOR_POWER_DEVICE_PERCENTAGE, 5.0,
                        INDICATOR_POWER_DEVICE_TIME, (guint64)(60*60),
                    NULL);
-      g_string_append_printf (expected, "%s-040;", kind_str);
-      g_string_append_printf (expected, "gpm-%s-040;", kind_str);
-      g_string_append_printf (expected, "%s-good-symbolic;", kind_str);
-      g_string_append_printf (expected, "%s-good", kind_str);
+      g_string_append_printf (expected, "%s-000;", kind_str);
+      g_string_append_printf (expected, "gpm-%s-000;", kind_str);
+      g_string_append_printf (expected, "%s-caution-symbolic;", kind_str);
+      g_string_append_printf (expected, "%s-caution", kind_str);
       check_icon_names (device, expected->str);
       g_string_truncate (expected, 0);