Power settings: Remove 'While Charging' dropdown for devices that do not have an internal battery

If a device has no internal battery, it made no sense to use the phrase
"While charging" as it implies that there is a battery to be charged.
This change moves the idle power dropdown to the "When idle" section.

Screenshot: https://screenshot.googleplex.com/4qDUBZaQWDFyRwj

Fixed: 1096675
Test: browser_tests
Change-Id: Ib7e8cd1331b92ac9bf420d32833f14486f07befd
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2616800Reviewed-by: Regan Hsu <hsuregan@chromium.org>
Commit-Queue: Jimmy Gong <jimmyxgong@chromium.org>
Cr-Commit-Position: refs/heads/master@{#841647}

chrome/browser/resources/settings/chromeos/device_page/power.html

@@ -53,35 +53,55 @@
       </div>
     </div>
 
-    <div id="powerIdleLabel"
-        class$="cr-row [[getFirst_(batteryStatus_.present)]]"
-        aria-label="true">
-      $i18n{powerIdleLabel}
-    </div>
-    <div class="cr-row indented first">
-      <div class="flex" aria-hidden="true">
-        $i18n{powerIdleWhileChargingLabel}
+    <div class$="cr-row [[getFirst_(batteryStatus_.present)]]">
+      <div id="powerIdleLabel" class="flex" aria-label="true">
+        $i18n{powerIdleLabel}
       </div>
-      <template is="dom-if" if="[[acIdleManaged_]]" restamp>
-        <cr-policy-indicator id="acIdleManagedIndicator"
-            indicator-type="devicePolicy"
-            icon-aria-label="$i18n{powerIdleWhileChargingAriaLabel}">
-        </cr-policy-indicator>
-      </template>
-      <select id="acIdleSelect" class="md-select"
-          on-change="onAcIdleSelectChange_"
-          disabled="[[shouldAcIdleSelectBeDisabled_]]"
-          aria-label="$i18n{powerIdleWhileChargingAriaLabel}"
-          deep-link-focus-id$="[[Setting.kPowerIdleBehaviorWhileCharging]]">
-        <template is="dom-repeat" items="[[acIdleOptions_]]">
-          <option value="[[item.value]]" selected="[[item.selected]]">
-            [[item.name]]
-          </option>
+      <template is="dom-if" if="[[!batteryStatus_.present]]" restamp>
+        <template is="dom-if" if="[[acIdleManaged_]]" restamp>
+          <cr-policy-indicator id="noBatteryAcIdleManagedIndicator"
+              indicator-type="devicePolicy"
+              icon-aria-label="$i18n{powerIdleWhileChargingAriaLabel}">
+          </cr-policy-indicator>
         </template>
-      </select>
+        <select id="noBatteryAcIdleSelect" class="md-select"
+            on-change="onAcIdleSelectChange_"
+            disabled="[[shouldAcIdleSelectBeDisabled_]]"
+            aria-label="$i18n{powerIdleWhileChargingAriaLabel}"
+            deep-link-focus-id$="[[Setting.kPowerIdleBehaviorWhileCharging]]">
+          <template is="dom-repeat" items="[[acIdleOptions_]]">
+            <option value="[[item.value]]" selected="[[item.selected]]">
+              [[item.name]]
+            </option>
+          </template>
+        </select>
+      </template>
     </div>
 
     <template is="dom-if" if="[[batteryStatus_.present]]" restamp>
+      <div id="acIdleSettingBox" class="cr-row indented first">
+        <div class="flex" aria-hidden="true">
+          $i18n{powerIdleWhileChargingLabel}
+        </div>
+        <template is="dom-if" if="[[acIdleManaged_]]" restamp>
+          <cr-policy-indicator id="acIdleManagedIndicator"
+              indicator-type="devicePolicy"
+              icon-aria-label="$i18n{powerIdleWhileChargingAriaLabel}">
+          </cr-policy-indicator>
+        </template>
+        <select id="acIdleSelect" class="md-select"
+            on-change="onAcIdleSelectChange_"
+            disabled="[[shouldAcIdleSelectBeDisabled_]]"
+            aria-label="$i18n{powerIdleWhileChargingAriaLabel}"
+            deep-link-focus-id$="[[Setting.kPowerIdleBehaviorWhileCharging]]">
+          <template is="dom-repeat" items="[[acIdleOptions_]]">
+            <option value="[[item.value]]" selected="[[item.selected]]">
+              [[item.name]]
+            </option>
+          </template>
+        </select>
+      </div>
+
       <div id="batteryIdleSettingBox" class="cr-row indented">
         <div class="flex" aria-hidden="true">
           $i18n{powerIdleWhileOnBatteryLabel}

chrome/test/data/webui/settings/chromeos/device_page_tests.js

@@ -1547,7 +1547,6 @@ cr.define('device_page_tests', function() {
                     settings.DevicePageBrowserProxyImpl.getInstance()
                         .updatePowerStatusCalled_);
 
-                acIdleSelect = assert(powerPage.$$('#acIdleSelect'));
                 lidClosedToggle = assert(powerPage.$$('#lidClosedToggle'));
 
                 assertEquals(
@@ -1587,9 +1586,13 @@ cr.define('device_page_tests', function() {
 
           // Power source row is hidden since there's no battery.
           assertTrue(powerSourceRow.hidden);
-          // Idle settings while on battery should not be visible if the
-          // battery is not present.
+          // Idle settings while on battery and while charging should not be
+          // visible if the battery is not present.
           assertEquals(null, powerPage.$$('#batteryIdleSettingBox'));
+          assertEquals(null, powerPage.$$('#acIdleSettingBox'));
+
+          // Expect the "When idle" dropdown options to appear instead.
+          assert(powerPage.$$('#noBatteryAcIdleSelect'));
         });
 
         test('power sources', function() {
@@ -1666,6 +1669,19 @@ cr.define('device_page_tests', function() {
         });
 
         test('set AC idle behavior', function() {
+          const batteryStatus = {
+            present: true,
+            charging: false,
+            calculating: false,
+            percent: 50,
+            statusText: '5 hours left',
+          };
+          cr.webUIListenerCallback(
+              'battery-status-changed', Object.assign({}, batteryStatus));
+          setPowerSources([], '', false);
+          Polymer.dom.flush();
+
+          acIdleSelect = assert(powerPage.$$('#acIdleSelect'));
           selectValue(acIdleSelect, settings.IdleBehavior.DISPLAY_ON);
           expectEquals(
               settings.IdleBehavior.DISPLAY_ON,
@@ -1885,6 +1901,7 @@ cr.define('device_page_tests', function() {
                 });
               })
               .then(function() {
+                acIdleSelect = assert(powerPage.$$('#acIdleSelect'));
                 const batteryIdleSelect =
                     assert(powerPage.$$('#batteryIdleSelect'));
                 expectEquals(
@@ -1971,6 +1988,7 @@ cr.define('device_page_tests', function() {
                    powerPage.async(resolve);
                  })
               .then(function() {
+                acIdleSelect = assert(powerPage.$$('#acIdleSelect'));
                 const batteryIdleSelect =
                     assert(powerPage.$$('#batteryIdleSelect'));
                 expectEquals(