commit 0a6d61883cb86208159f0518c0425a3fc3898d61
author TreeHugger Robot <treehugger-gerrit@google.com> Thu May 25 03:57:27 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu May 25 03:57:29 2017 +0000
tree a22eb8621e4a53b2e0ed83e766e3f11691806340
parent 7731b4244e5f5d3539c03100af095add953c29f2
parent 1d51b3cc15125354d0ba803f21506b7f3f2c7c42

Merge "Turn on power accounting in AOSP" into oc-dev

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

diff --git a/src/com/android/settings/fuelgauge/PowerUsageFeatureProviderImpl.java b/src/com/android/settings/fuelgauge/PowerUsageFeatureProviderImpl.java
index 10ffc49..be38855 100644
--- a/src/com/android/settings/fuelgauge/PowerUsageFeatureProviderImpl.java
+++ b/src/com/android/settings/fuelgauge/PowerUsageFeatureProviderImpl.java
@@ -77,11 +77,11 @@
 
     @Override
     public boolean isAdvancedUiEnabled() {
-        return false;
+        return true;
     }
 
     @Override
     public boolean isPowerAccountingToggleEnabled() {
-        return false;
+        return true;
     }
 }

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

diff --git a/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageFeatureProviderImplTest.java b/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageFeatureProviderImplTest.java
index f32ea7a..8e9febe 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageFeatureProviderImplTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageFeatureProviderImplTest.java
@@ -125,4 +125,14 @@
 
         assertThat(mPowerFeatureProvider.isTypeSystem(mBatterySipper)).isFalse();
     }
+
+    @Test
+    public void testIsAdvancedUiEnabled_returnTrue() {
+        assertThat(mPowerFeatureProvider.isAdvancedUiEnabled()).isTrue();
+    }
+
+    @Test
+    public void testIsPowerAccountingToggleEnabled_returnTrue() {
+        assertThat(mPowerFeatureProvider.isPowerAccountingToggleEnabled()).isTrue();
+    }
 }