[gnome-shell/gnome-3-34] power: Handle "100% but charging" case

[Florian Müllner <fmuellner src gnome org>]

commit 7d34dee77fe0bfca6bbb520bb43da4fa81632d5b
Author: Philip Chimento <philip endlessm com>
Date:   Thu Nov 7 12:51:28 2019 -0800

    power: Handle "100% but charging" case
    
    I've observed that UPower can occasionally report a charge level of 100%
    while the state is still "charging". This usually doesn't last very long
    but it is noticeable because the power icon changes to a "missing icon"
    icon. This will handle that rare case correctly.
    
    https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/814

 js/ui/status/power.js | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)
---
diff --git a/js/ui/status/power.js b/js/ui/status/power.js
index 486a7fdd35..24edc5387a 100644
--- a/js/ui/status/power.js
+++ b/js/ui/status/power.js
@@ -111,9 +111,12 @@ var Indicator = class extends PanelMenu.SystemIndicator {
         let chargingState = this._proxy.State == UPower.DeviceState.CHARGING
             ? '-charging' : '';
         let fillLevel = 10 * Math.floor(this._proxy.Percentage / 10);
-        let icon = this._proxy.State == UPower.DeviceState.FULLY_CHARGED
-            ? 'battery-level-100-charged-symbolic'
-            : `battery-level-${fillLevel}${chargingState}-symbolic`;
+        let icon;
+        if (this._proxy.State == UPower.DeviceState.FULLY_CHARGED ||
+            fillLevel === 100)
+            icon = 'battery-level-100-charged-symbolic';
+        else
+            icon = `battery-level-${fillLevel}${chargingState}-symbolic`;
 
         // Make sure we fall back to fallback-icon-name and not GThemedIcon's
         // default fallbacks