PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Stop display "Cell network" item for tablet" into oc-mr1-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2017-08-23 01:42:42 +00:00
committed by Android (Google) Code Review
parent a6b67d15eb 28284a52e6
commit a097d68c4b
2 changed files with 27 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/com/android/settings/fuelgauge/PowerUsageAdvanced.java
View File

@@ -40,6 +40,7 @@ import com.android.internal.os.BatterySipper.DrainType;
import com.android.internal.os.BatteryStatsHelper; import com.android.internal.os.BatteryStatsHelper;
import com.android.settings.R; import com.android.settings.R;
import com.android.settings.Utils; import com.android.settings.Utils;
import com.android.settings.datausage.DataUsageUtils;
import com.android.settings.fuelgauge.PowerUsageAdvanced.PowerUsageData.UsageType; import com.android.settings.fuelgauge.PowerUsageAdvanced.PowerUsageData.UsageType;
import com.android.settings.overlay.FeatureFactory; import com.android.settings.overlay.FeatureFactory;
import com.android.settings.search.BaseSearchIndexProvider; import com.android.settings.search.BaseSearchIndexProvider;
@@ -243,7 +244,9 @@ public class PowerUsageAdvanced extends PowerUsageBase {
boolean shouldHideCategory(PowerUsageData powerUsageData) { boolean shouldHideCategory(PowerUsageData powerUsageData) {
return powerUsageData.usageType == UsageType.UNACCOUNTED return powerUsageData.usageType == UsageType.UNACCOUNTED
|| powerUsageData.usageType == UsageType.OVERCOUNTED || powerUsageData.usageType == UsageType.OVERCOUNTED
|| (powerUsageData.usageType == UsageType.USER && mUserManager.getUserCount() == 1); || (powerUsageData.usageType == UsageType.USER && mUserManager.getUserCount() == 1)
|| (powerUsageData.usageType == UsageType.CELL
&& !DataUsageUtils.hasMobileData(getContext()));
} }
@VisibleForTesting @VisibleForTesting

23
tests/robotests/src/com/android/settings/fuelgauge/PowerUsageAdvancedTest.java
View File

@@ -31,6 +31,7 @@ import static org.mockito.Mockito.when;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.content.pm.PackageManager; import android.content.pm.PackageManager;
import android.net.ConnectivityManager;
import android.os.UserManager; import android.os.UserManager;
import android.support.v7.preference.PreferenceCategory; import android.support.v7.preference.PreferenceCategory;
import android.support.v7.preference.PreferenceGroup; import android.support.v7.preference.PreferenceGroup;
@@ -91,6 +92,8 @@ public class PowerUsageAdvancedTest {
private BatteryHistoryPreference mHistPref; private BatteryHistoryPreference mHistPref;
@Mock @Mock
private PreferenceGroup mUsageListGroup; private PreferenceGroup mUsageListGroup;
@Mock
private ConnectivityManager mConnectivityManager;
private PowerUsageAdvanced mPowerUsageAdvanced; private PowerUsageAdvanced mPowerUsageAdvanced;
private PowerUsageData mPowerUsageData; private PowerUsageData mPowerUsageData;
private Context mShadowContext; private Context mShadowContext;
@@ -127,6 +130,8 @@ public class PowerUsageAdvancedTest {
mPowerUsageAdvanced.setPowerUsageFeatureProvider(mPowerUsageFeatureProvider); mPowerUsageAdvanced.setPowerUsageFeatureProvider(mPowerUsageFeatureProvider);
mPowerUsageAdvanced.setUserManager(mUserManager); mPowerUsageAdvanced.setUserManager(mUserManager);
mPowerUsageAdvanced.setBatteryUtils(BatteryUtils.getInstance(mShadowContext)); mPowerUsageAdvanced.setBatteryUtils(BatteryUtils.getInstance(mShadowContext));
when(mShadowContext.getSystemService(Context.CONNECTIVITY_SERVICE)).thenReturn(
mConnectivityManager);
mPowerUsageData = new PowerUsageData(UsageType.SYSTEM); mPowerUsageData = new PowerUsageData(UsageType.SYSTEM);
mMaxBatterySipper.totalPowerMah = TYPE_BLUETOOTH_USAGE; mMaxBatterySipper.totalPowerMah = TYPE_BLUETOOTH_USAGE;
@@ -296,6 +301,24 @@ public class PowerUsageAdvancedTest {
assertThat(mPowerUsageAdvanced.shouldHideCategory(mPowerUsageData)).isTrue(); assertThat(mPowerUsageAdvanced.shouldHideCategory(mPowerUsageData)).isTrue();
} }
@Test
public void testShouldHideCategory_typeCellWhileNotSupported_returnTrue() {
mPowerUsageData.usageType = UsageType.CELL;
doReturn(false).when(mConnectivityManager).isNetworkSupported(
ConnectivityManager.TYPE_MOBILE);
assertThat(mPowerUsageAdvanced.shouldHideCategory(mPowerUsageData)).isTrue();
}
@Test
public void testShouldHideCategory_typeCellWhileSupported_returnFalse() {
mPowerUsageData.usageType = UsageType.CELL;
doReturn(true).when(mConnectivityManager).isNetworkSupported(
ConnectivityManager.TYPE_MOBILE);
assertThat(mPowerUsageAdvanced.shouldHideCategory(mPowerUsageData)).isFalse();
}
@Test @Test
public void testShouldHideCategory_typeUserAndMoreThanOne_returnFalse() { public void testShouldHideCategory_typeUserAndMoreThanOne_returnFalse() {
mPowerUsageData.usageType = UsageType.USER; mPowerUsageData.usageType = UsageType.USER;