Merge "Hide User category if only one user in device" into oc-dev (55a3944d) · Commits · e / os / android_packages_apps_Settings

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

+7 −6

Original line number	Diff line number	Diff line
		@@ -218,12 +218,9 @@ public class PowerUsageAdvanced extends PowerUsageBase {

		@VisibleForTesting
		boolean shouldHideCategory(PowerUsageData powerUsageData) {
		if (powerUsageData.usageType == UsageType.UNACCOUNTED
		\|\| powerUsageData.usageType == UsageType.OVERCOUNTED) {
		return true;
		}

		return false;
		return powerUsageData.usageType == UsageType.UNACCOUNTED
		\|\| powerUsageData.usageType == UsageType.OVERCOUNTED
		\|\| (powerUsageData.usageType == UsageType.USER && mUserManager.getUserCount() == 1);
		}

		@VisibleForTesting
		@@ -316,6 +313,10 @@ public class PowerUsageAdvanced extends PowerUsageBase {
		void setPowerUsageFeatureProvider(PowerUsageFeatureProvider provider) {
		mPowerUsageFeatureProvider = provider;
		}
		@VisibleForTesting
		void setUserManager(UserManager userManager) {
		mUserManager = userManager;
		}

		/**
		* Class that contains data used in {@link PowerGaugePreference}.

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

+21 −2

Original line number	Diff line number	Diff line
		@@ -17,6 +17,7 @@ package com.android.settings.fuelgauge;

		import android.content.Context;
		import android.content.pm.PackageManager;
		import android.os.UserManager;

		import com.android.internal.os.BatterySipper;
		import com.android.internal.os.BatterySipper.DrainType;
		@@ -75,6 +76,8 @@ public class PowerUsageAdvancedTest {
		private PowerUsageFeatureProvider mPowerUsageFeatureProvider;
		@Mock
		private PackageManager mPackageManager;
		@Mock
		private UserManager mUserManager;
		private PowerUsageAdvanced mPowerUsageAdvanced;
		private PowerUsageData mPowerUsageData;
		private Context mShadowContext;
		@@ -104,6 +107,7 @@ public class PowerUsageAdvancedTest {
		doReturn(STUB_STRING).when(mPowerUsageAdvanced).getString(anyInt(), any());
		mPowerUsageAdvanced.setPackageManager(mPackageManager);
		mPowerUsageAdvanced.setPowerUsageFeatureProvider(mPowerUsageFeatureProvider);
		mPowerUsageAdvanced.setUserManager(mUserManager);

		mPowerUsageData = new PowerUsageData(UsageType.APP);
		mMaxBatterySipper.totalPowerMah = TYPE_BLUETOOTH_USAGE;
		@@ -225,13 +229,12 @@ public class PowerUsageAdvancedTest {
		}

		@Test
		public void testShouldHide_typeUnAccounted_returnTrue() {
		public void testShouldHideCategory_typeUnAccounted_returnTrue() {
		mPowerUsageData.usageType = UsageType.UNACCOUNTED;

		assertThat(mPowerUsageAdvanced.shouldHideCategory(mPowerUsageData)).isTrue();
		}


		@Test
		public void testShouldHideCategory_typeOverCounted_returnTrue() {
		mPowerUsageData.usageType = UsageType.OVERCOUNTED;
		@@ -239,6 +242,22 @@ public class PowerUsageAdvancedTest {
		assertThat(mPowerUsageAdvanced.shouldHideCategory(mPowerUsageData)).isTrue();
		}

		@Test
		public void testShouldHideCategory_typeUserAndOnlyOne_returnTrue() {
		mPowerUsageData.usageType = UsageType.USER;
		doReturn(1).when(mUserManager).getUserCount();

		assertThat(mPowerUsageAdvanced.shouldHideCategory(mPowerUsageData)).isTrue();
		}

		@Test
		public void testShouldHideCategory_typeUserAndMoreThanOne_returnFalse() {
		mPowerUsageData.usageType = UsageType.USER;
		doReturn(2).when(mUserManager).getUserCount();

		assertThat(mPowerUsageAdvanced.shouldHideCategory(mPowerUsageData)).isFalse();
		}

		@Test
		public void testShouldHideCategory_typeNormal_returnFalse() {
		mPowerUsageData.usageType = UsageType.APP;