diff --git a/src/com/android/settings/fuelgauge/PowerUsageFeatureProvider.java b/src/com/android/settings/fuelgauge/PowerUsageFeatureProvider.java index b17afa563fd..71d56aedb34 100644 --- a/src/com/android/settings/fuelgauge/PowerUsageFeatureProvider.java +++ b/src/com/android/settings/fuelgauge/PowerUsageFeatureProvider.java @@ -29,6 +29,11 @@ import java.util.Set; */ public interface PowerUsageFeatureProvider { + /** + * Check whether the battery usage button is enabled in the battery page + */ + boolean isBatteryUsageEnabled(Context context); + /** * Check whether location setting is enabled */ diff --git a/src/com/android/settings/fuelgauge/PowerUsageFeatureProviderImpl.java b/src/com/android/settings/fuelgauge/PowerUsageFeatureProviderImpl.java index 856f86a0952..932b35d50d7 100644 --- a/src/com/android/settings/fuelgauge/PowerUsageFeatureProviderImpl.java +++ b/src/com/android/settings/fuelgauge/PowerUsageFeatureProviderImpl.java @@ -65,6 +65,11 @@ public class PowerUsageFeatureProviderImpl implements PowerUsageFeatureProvider return false; } + @Override + public boolean isBatteryUsageEnabled(Context context) { + return true; + } + @Override public boolean isLocationSettingEnabled(String[] packages) { return false; diff --git a/src/com/android/settings/fuelgauge/batteryusage/PowerUsageSummary.java b/src/com/android/settings/fuelgauge/batteryusage/PowerUsageSummary.java index f2664927886..dea24317d46 100644 --- a/src/com/android/settings/fuelgauge/batteryusage/PowerUsageSummary.java +++ b/src/com/android/settings/fuelgauge/batteryusage/PowerUsageSummary.java @@ -255,6 +255,8 @@ public class PowerUsageSummary extends PowerUsageBase implements void initPreference() { mBatteryUsagePreference = findPreference(KEY_BATTERY_USAGE); mBatteryUsagePreference.setSummary(getString(R.string.advanced_battery_preference_summary)); + mBatteryUsagePreference.setVisible( + mPowerFeatureProvider.isBatteryUsageEnabled(getContext())); mHelpPreference = findPreference(KEY_BATTERY_ERROR); mHelpPreference.setVisible(false); diff --git a/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageFeatureProviderImplTest.java b/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageFeatureProviderImplTest.java index 648685a8d8f..ab61abce44c 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageFeatureProviderImplTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageFeatureProviderImplTest.java @@ -62,6 +62,11 @@ public class PowerUsageFeatureProviderImplTest { mPowerFeatureProvider.mPackageManager = mPackageManager; } + @Test + public void testIsBatteryUsageEnabled_returnFalse() { + assertThat(mPowerFeatureProvider.isBatteryUsageEnabled(mContext)).isTrue(); + } + @Test public void testIsTypeSystem_uidRoot_returnTrue() { assertThat(mPowerFeatureProvider.isTypeSystem(Process.ROOT_UID, null)).isTrue();