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 am: a097d68c4b

Browse Source 
am: 92597b0e26

Change-Id: I68323c887d22b0f0df9801adcba436629503270b
This commit is contained in:
jackqdyulei
2017-08-23 03:52:51 +00:00
committed by android-build-merger
parent 47784a1cb0 92597b0e26
commit 868adaa8db
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.settings.R;
import com.android.settings.Utils;
import com.android.settings.datausage.DataUsageUtils;
import com.android.settings.fuelgauge.PowerUsageAdvanced.PowerUsageData.UsageType;
import com.android.settings.overlay.FeatureFactory;
import com.android.settings.search.BaseSearchIndexProvider;
@@ -243,7 +244,9 @@ public class PowerUsageAdvanced extends PowerUsageBase {
boolean shouldHideCategory(PowerUsageData powerUsageData) {
return powerUsageData.usageType == UsageType.UNACCOUNTED
|| 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