Merge "Hide subtitle for wifi and bluetooth" into oc-dev

src/com/android/settings/fuelgauge/PowerUsageAdvanced.java

@@ -305,7 +305,9 @@ public class PowerUsageAdvanced extends PowerUsageBase {
     boolean shouldHideSummary(PowerUsageData powerUsageData) {
         @UsageType final int usageType = powerUsageData.usageType;
 
-        return usageType == UsageType.CELL;
+        return usageType == UsageType.CELL
+                || usageType == UsageType.BLUETOOTH
+                || usageType == UsageType.WIFI;
     }
 
     @VisibleForTesting

tests/robotests/src/com/android/settings/fuelgauge/PowerUsageAdvancedTest.java

@@ -278,6 +278,20 @@ public class PowerUsageAdvancedTest {
         assertThat(mPowerUsageAdvanced.shouldHideSummary(mPowerUsageData)).isTrue();
     }
 
+    @Test
+    public void testShouldHideSummary_typeWifi_returnTrue() {
+        mPowerUsageData.usageType = UsageType.WIFI;
+
+        assertThat(mPowerUsageAdvanced.shouldHideSummary(mPowerUsageData)).isTrue();
+    }
+
+    @Test
+    public void testShouldHideSummary_typeBluetooth_returnTrue() {
+        mPowerUsageData.usageType = UsageType.BLUETOOTH;
+
+        assertThat(mPowerUsageAdvanced.shouldHideSummary(mPowerUsageData)).isTrue();
+    }
+
     @Test
     public void testShouldHideSummary_typeNormal_returnFalse() {
         mPowerUsageData.usageType = UsageType.APP;