diff --git a/src/com/android/settings/applications/appinfo/AppBatteryPreferenceController.java b/src/com/android/settings/applications/appinfo/AppBatteryPreferenceController.java index 732163b6a36..c37f421c49f 100644 --- a/src/com/android/settings/applications/appinfo/AppBatteryPreferenceController.java +++ b/src/com/android/settings/applications/appinfo/AppBatteryPreferenceController.java @@ -131,7 +131,6 @@ public class AppBatteryPreferenceController extends BasePreferenceController mBatteryDiffEntry, Utils.formatPercentage( mBatteryDiffEntry.getPercentOfTotal(), /* round */ true), - /*isValidToShowSummary=*/ true, /*slotInformation=*/ null); return true; } diff --git a/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetail.java b/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetail.java index 9cebd1e1b9c..32e2e2f0b54 100644 --- a/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetail.java +++ b/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetail.java @@ -133,8 +133,7 @@ public class AdvancedPowerUsageDetail extends DashboardFragment implements /** Launches battery details page for an individual battery consumer. */ public static void startBatteryDetailPage( Activity caller, InstrumentedPreferenceFragment fragment, - BatteryDiffEntry diffEntry, String usagePercent, - boolean isValidToShowSummary, String slotInformation) { + BatteryDiffEntry diffEntry, String usagePercent, String slotInformation) { final BatteryHistEntry histEntry = diffEntry.mBatteryHistEntry; final LaunchBatteryDetailPageArgs launchArgs = new LaunchBatteryDetailPageArgs(); // configure the launch argument. @@ -145,10 +144,8 @@ public class AdvancedPowerUsageDetail extends DashboardFragment implements launchArgs.mUid = (int) histEntry.mUid; launchArgs.mIconId = diffEntry.getAppIconId(); launchArgs.mConsumedPower = (int) diffEntry.mConsumePower; - launchArgs.mForegroundTimeMs = - isValidToShowSummary ? diffEntry.mForegroundUsageTimeInMs : 0; - launchArgs.mBackgroundTimeMs = - isValidToShowSummary ? diffEntry.mBackgroundUsageTimeInMs : 0; + launchArgs.mForegroundTimeMs = diffEntry.mForegroundUsageTimeInMs; + launchArgs.mBackgroundTimeMs = diffEntry.mBackgroundUsageTimeInMs; launchArgs.mIsUserEntry = histEntry.isUserEntry(); startBatteryDetailPage(caller, fragment, launchArgs); } diff --git a/src/com/android/settings/fuelgauge/PowerUsageFeatureProvider.java b/src/com/android/settings/fuelgauge/PowerUsageFeatureProvider.java index 94a93b83be0..1720845c1f1 100644 --- a/src/com/android/settings/fuelgauge/PowerUsageFeatureProvider.java +++ b/src/com/android/settings/fuelgauge/PowerUsageFeatureProvider.java @@ -173,9 +173,4 @@ public interface PowerUsageFeatureProvider { * Returns package names for hidding application in the usage screen. */ CharSequence[] getHideApplicationEntries(Context context); - - /** - * Returns package names for hidding summary in the usage screen. - */ - CharSequence[] getHideApplicationSummary(Context context); } diff --git a/src/com/android/settings/fuelgauge/PowerUsageFeatureProviderImpl.java b/src/com/android/settings/fuelgauge/PowerUsageFeatureProviderImpl.java index 0adfc9d1537..48f4421c431 100644 --- a/src/com/android/settings/fuelgauge/PowerUsageFeatureProviderImpl.java +++ b/src/com/android/settings/fuelgauge/PowerUsageFeatureProviderImpl.java @@ -25,7 +25,6 @@ import android.util.ArraySet; import android.util.SparseIntArray; import com.android.internal.util.ArrayUtils; -import com.android.settings.R; import com.android.settings.fuelgauge.batteryusage.BatteryHistEntry; import com.android.settingslib.fuelgauge.Estimate; @@ -190,10 +189,4 @@ public class PowerUsageFeatureProviderImpl implements PowerUsageFeatureProvider public CharSequence[] getHideApplicationEntries(Context context) { return new CharSequence[0]; } - - @Override - public CharSequence[] getHideApplicationSummary(Context context) { - return context.getResources().getTextArray( - R.array.allowlist_hide_summary_in_battery_usage); - } } diff --git a/src/com/android/settings/fuelgauge/batteryusage/BatteryAppListPreferenceController.java b/src/com/android/settings/fuelgauge/batteryusage/BatteryAppListPreferenceController.java index f752dad5f89..92b27e8c9ec 100644 --- a/src/com/android/settings/fuelgauge/batteryusage/BatteryAppListPreferenceController.java +++ b/src/com/android/settings/fuelgauge/batteryusage/BatteryAppListPreferenceController.java @@ -49,7 +49,6 @@ import com.android.settings.core.InstrumentedPreferenceFragment; import com.android.settings.core.PreferenceControllerMixin; import com.android.settings.fuelgauge.AdvancedPowerUsageDetail; import com.android.settings.fuelgauge.BatteryUtils; -import com.android.settings.overlay.FeatureFactory; import com.android.settingslib.core.AbstractPreferenceController; import com.android.settingslib.core.lifecycle.Lifecycle; import com.android.settingslib.core.lifecycle.LifecycleObserver; @@ -60,7 +59,6 @@ import com.android.settingslib.utils.StringUtil; import java.util.ArrayList; import java.util.Comparator; import java.util.List; -import java.util.Set; /** * Controller that update the battery header view @@ -85,7 +83,6 @@ public class BatteryAppListPreferenceController extends AbstractPreferenceContro private final PackageManager mPackageManager; private final SettingsActivity mActivity; private final InstrumentedPreferenceFragment mFragment; - private final Set mNotAllowShowSummaryPackages; private final String mPreferenceKey; private Context mPrefContext; @@ -164,10 +161,6 @@ public class BatteryAppListPreferenceController extends AbstractPreferenceContro mPackageManager = context.getPackageManager(); mActivity = activity; mFragment = fragment; - mNotAllowShowSummaryPackages = Set.of( - FeatureFactory.getFactory(context) - .getPowerUsageFeatureProvider(context) - .getHideApplicationSummary(context)); } @Override @@ -439,15 +432,9 @@ public class BatteryAppListPreferenceController extends AbstractPreferenceContro if (BatteryEntry.isSystemUid(entry.getUid())) { return; } - String packageName = entry.getDefaultPackageName(); - if (packageName != null - && mNotAllowShowSummaryPackages != null - && mNotAllowShowSummaryPackages.contains(packageName)) { - return; - } // Only show summary when usage time is longer than one minute final long usageTimeMs = entry.getTimeInForegroundMs(); - if (shouldShowSummary(entry) && usageTimeMs >= DateUtils.MINUTE_IN_MILLIS) { + if (usageTimeMs >= DateUtils.MINUTE_IN_MILLIS) { final CharSequence timeSequence = StringUtil.formatElapsedTime(mContext, usageTimeMs, false, false); preference.setSummary( @@ -470,21 +457,6 @@ public class BatteryAppListPreferenceController extends AbstractPreferenceContro } } - private boolean shouldShowSummary(BatteryEntry entry) { - final CharSequence[] allowlistPackages = - FeatureFactory.getFactory(mContext) - .getPowerUsageFeatureProvider(mContext) - .getHideApplicationSummary(mContext); - final String target = entry.getDefaultPackageName(); - - for (CharSequence packageName : allowlistPackages) { - if (TextUtils.equals(target, packageName)) { - return false; - } - } - return true; - } - private static boolean isSharedGid(int uid) { return UserHandle.getAppIdFromSharedAppGid(uid) > 0; } diff --git a/src/com/android/settings/fuelgauge/batteryusage/BatteryChartPreferenceController.java b/src/com/android/settings/fuelgauge/batteryusage/BatteryChartPreferenceController.java index 2c924885c3b..07c3362c9ed 100644 --- a/src/com/android/settings/fuelgauge/batteryusage/BatteryChartPreferenceController.java +++ b/src/com/android/settings/fuelgauge/batteryusage/BatteryChartPreferenceController.java @@ -119,7 +119,6 @@ public class BatteryChartPreferenceController extends AbstractPreferenceControll private final String mPreferenceKey; private final SettingsActivity mActivity; private final InstrumentedPreferenceFragment mFragment; - private final CharSequence[] mNotAllowShowSummaryPackages; private final MetricsFeatureProvider mMetricsFeatureProvider; private final Handler mHandler = new Handler(Looper.getMainLooper()); private final AnimatorListenerAdapter mHourlyChartFadeInAdapter = @@ -149,10 +148,6 @@ public class BatteryChartPreferenceController extends AbstractPreferenceControll mIs24HourFormat = DateFormat.is24HourFormat(context); mMetricsFeatureProvider = FeatureFactory.getFactory(mContext).getMetricsFeatureProvider(); - mNotAllowShowSummaryPackages = - FeatureFactory.getFactory(context) - .getPowerUsageFeatureProvider(context) - .getHideApplicationSummary(context); if (lifecycle != null) { lifecycle.addObserver(this); } @@ -257,8 +252,7 @@ public class BatteryChartPreferenceController extends AbstractPreferenceControll Log.d(TAG, String.format("handleClick() label=%s key=%s package=%s", diffEntry.getAppLabel(), histEntry.getKey(), histEntry.mPackageName)); AdvancedPowerUsageDetail.startBatteryDetailPage( - mActivity, mFragment, diffEntry, powerPref.getPercent(), - isValidToShowSummary(packageName), getSlotInformation()); + mActivity, mFragment, diffEntry, powerPref.getPercent(), getSlotInformation()); return true; } @@ -634,11 +628,6 @@ public class BatteryChartPreferenceController extends AbstractPreferenceControll final long foregroundUsageTimeInMs = entry.mForegroundUsageTimeInMs; final long backgroundUsageTimeInMs = entry.mBackgroundUsageTimeInMs; final long totalUsageTimeInMs = foregroundUsageTimeInMs + backgroundUsageTimeInMs; - // Checks whether the package is allowed to show summary or not. - if (!isValidToShowSummary(entry.getPackageName())) { - preference.setSummary(null); - return; - } String usageTimeSummary = null; // Not shows summary for some system components without usage time. if (totalUsageTimeInMs == 0) { @@ -677,11 +666,6 @@ public class BatteryChartPreferenceController extends AbstractPreferenceControll return mPrefContext.getString(resourceId, timeSequence); } - @VisibleForTesting - boolean isValidToShowSummary(String packageName) { - return !DataProcessor.contains(packageName, mNotAllowShowSummaryPackages); - } - private void animateBatteryChartViewGroup() { if (mBatteryChartViewGroup != null && mBatteryChartViewGroup.getAlpha() == 0) { mBatteryChartViewGroup.animate().alpha(1f).setDuration(FADE_IN_ANIMATION_DURATION) diff --git a/src/com/android/settings/fuelgauge/batteryusage/DataProcessor.java b/src/com/android/settings/fuelgauge/batteryusage/DataProcessor.java index 4bf429b446f..e4e99c003b6 100644 --- a/src/com/android/settings/fuelgauge/batteryusage/DataProcessor.java +++ b/src/com/android/settings/fuelgauge/batteryusage/DataProcessor.java @@ -157,20 +157,6 @@ public final class DataProcessor { processedBatteryHistoryMap); } - /** - * @return Returns whether the target is in the CharSequence array. - */ - public static boolean contains(String target, CharSequence[] packageNames) { - if (target != null && packageNames != null) { - for (CharSequence packageName : packageNames) { - if (TextUtils.equals(target, packageName)) { - return true; - } - } - } - return false; - } - /** * Gets the {@link BatteryUsageStats} from system service. */ @@ -1223,6 +1209,20 @@ public final class DataProcessor { countOfAppBeforePurge - countOfAppAfterPurge); } + /** + * @return Returns whether the target is in the CharSequence array. + */ + private static boolean contains(String target, CharSequence[] packageNames) { + if (target != null && packageNames != null) { + for (CharSequence packageName : packageNames) { + if (TextUtils.equals(target, packageName)) { + return true; + } + } + } + return false; + } + private static void log(Context context, final String content, final long timestamp, final BatteryHistEntry entry) { if (DEBUG) { diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BatteryAppListPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BatteryAppListPreferenceControllerTest.java index 5815bae6b6e..e003c151d2c 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BatteryAppListPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BatteryAppListPreferenceControllerTest.java @@ -83,8 +83,6 @@ public class BatteryAppListPreferenceControllerTest { when(mContext.getApplicationContext()).thenReturn(mContext); when(mContext.getSystemService(UserManager.class)).thenReturn(mUserManager); when(mUserManager.getProfileIdsWithDisabled(anyInt())).thenReturn(new int[]{}); - when(mFeatureFactory.powerUsageFeatureProvider.getHideApplicationSummary(mContext)) - .thenReturn(new String[]{"com.android.googlequicksearchbox"}); mPreference = new PowerGaugePreference(mContext); @@ -131,20 +129,6 @@ public class BatteryAppListPreferenceControllerTest { assertThat(mPreference.getSummary().toString()).isEqualTo("Used for 2 min"); } - @Test - public void testSetUsageSummary_timeMoreThanOneMinute_GoogleApp_shouldNotSetScreenSummary() { - when(mBatteryEntry.getTimeInForegroundMs()).thenReturn(2 * DateUtils.MINUTE_IN_MILLIS); - when(mBatteryEntry.getDefaultPackageName()) - .thenReturn("com.android.googlequicksearchbox"); - doReturn(mContext.getText(R.string.battery_used_for)).when(mFragment).getText( - R.string.battery_used_for); - doReturn(mContext).when(mFragment).getContext(); - - mPreferenceController.setUsageSummary(mPreference, mBatteryEntry); - - assertThat(mPreference.getSummary()).isNull(); - } - @Test public void testSetUsageSummary_timeMoreThanOneMinute_hiddenApp_setUsedSummary() { when(mBatteryEntry.getTimeInForegroundMs()).thenReturn(2 * DateUtils.MINUTE_IN_MILLIS); diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BatteryChartPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BatteryChartPreferenceControllerTest.java index 4e552b941c0..8f817fadb4a 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BatteryChartPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BatteryChartPreferenceControllerTest.java @@ -114,9 +114,6 @@ public final class BatteryChartPreferenceControllerTest { final Resources resources = spy(mContext.getResources()); resources.getConfiguration().setLocales(new LocaleList(new Locale("en_US"))); doReturn(resources).when(mContext).getResources(); - doReturn(new String[]{"com.android.googlequicksearchbox"}) - .when(mFeatureFactory.powerUsageFeatureProvider) - .getHideApplicationSummary(mContext); doReturn(new String[]{"com.android.gms.persistent"}) .when(mFeatureFactory.powerUsageFeatureProvider) .getHideApplicationEntries(mContext); @@ -518,21 +515,6 @@ public final class BatteryChartPreferenceControllerTest { assertThat(pref.getSummary()).isEqualTo("Total: 2 min\nBackground: 1 min"); } - @Test - public void setPreferenceSummary_notAllowShownPackage_setSummayAsNull() { - final PowerGaugePreference pref = new PowerGaugePreference(mContext); - pref.setSummary(PREF_SUMMARY); - final BatteryDiffEntry batteryDiffEntry = - spy(createBatteryDiffEntry( - /*foregroundUsageTimeInMs=*/ DateUtils.MINUTE_IN_MILLIS, - /*backgroundUsageTimeInMs=*/ DateUtils.MINUTE_IN_MILLIS)); - doReturn("com.android.googlequicksearchbox").when(batteryDiffEntry) - .getPackageName(); - - mBatteryChartPreferenceController.setPreferenceSummary(pref, batteryDiffEntry); - assertThat(pref.getSummary()).isNull(); - } - @Test public void onExpand_expandedIsTrue_addSystemEntriesToPreferenceGroup() { doReturn(1).when(mAppListGroup).getPreferenceCount(); @@ -679,18 +661,6 @@ public final class BatteryChartPreferenceControllerTest { assertThat(mBatteryChartPreferenceController.mIsExpanded).isTrue(); } - @Test - public void isValidToShowSummary_returnExpectedResult() { - assertThat(mBatteryChartPreferenceController - .isValidToShowSummary("com.google.android.apps.scone")) - .isTrue(); - - // Verifies the item which is defined in the array list. - assertThat(mBatteryChartPreferenceController - .isValidToShowSummary("com.android.googlequicksearchbox")) - .isFalse(); - } - @Test public void getTotalHours_getExpectedResult() { Map> batteryHistoryMap = createBatteryHistoryMap(60); diff --git a/tests/robotests/src/com/android/settings/testutils/BatteryTestUtils.java b/tests/robotests/src/com/android/settings/testutils/BatteryTestUtils.java index fa3ee10cc86..80e6828a5d9 100644 --- a/tests/robotests/src/com/android/settings/testutils/BatteryTestUtils.java +++ b/tests/robotests/src/com/android/settings/testutils/BatteryTestUtils.java @@ -30,7 +30,6 @@ import com.android.settings.fuelgauge.batteryusage.db.BatteryStateDatabase; import com.google.common.collect.ImmutableList; import org.robolectric.Shadows; -import org.robolectric.shadows.ShadowUserManager; public class BatteryTestUtils { @@ -54,11 +53,7 @@ public class BatteryTestUtils { public static void setWorkProfile(Context context) { final UserManager userManager = context.getSystemService(UserManager.class); Shadows.shadowOf(userManager).setManagedProfile(true); - // Changes out of the default system user so isSystemUser() returns false. - final int userId = 1001; - Shadows.shadowOf(userManager) - .addUser(userId, "name", /*flags=*/ ShadowUserManager.FLAG_PRIMARY); - Shadows.shadowOf(userManager).switchUser(userId); + Shadows.shadowOf(userManager).setIsSystemUser(false); } /** Creates and sets up the in-memory {@link BatteryStateDatabase}. */