From f68fbce16ec7905a64173fdf6aeda0684a4e2668 Mon Sep 17 00:00:00 2001 From: jackqdyulei Date: Tue, 2 May 2017 15:16:19 -0700 Subject: [PATCH] Hide subtitle for wifi and bluetooth Hide it for now because the usage time is not accurate. We may revisit it in the future. Bug: 37912143 Test: RunSettingsRoboTests Change-Id: I37b9dca6a188f2973a7a83641d12b24001d629ae --- .../settings/fuelgauge/PowerUsageAdvanced.java | 4 +++- .../settings/fuelgauge/PowerUsageAdvancedTest.java | 14 ++++++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/src/com/android/settings/fuelgauge/PowerUsageAdvanced.java b/src/com/android/settings/fuelgauge/PowerUsageAdvanced.java index 28dfe1d5a9c..6f73ae6b4cb 100644 --- a/src/com/android/settings/fuelgauge/PowerUsageAdvanced.java +++ b/src/com/android/settings/fuelgauge/PowerUsageAdvanced.java @@ -291,7 +291,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 diff --git a/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageAdvancedTest.java b/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageAdvancedTest.java index 7a1284a2ddd..48eb02bd9bc 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageAdvancedTest.java +++ b/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;