Move legacy hide applications in usage screen list to SettingsGoogle
Bug: 195306545 Test: make SettingsRoboTests Change-Id: Iccb3530c40bc32c20d74d65aa3f26eb2d6719106
This commit is contained in:
@@ -1531,12 +1531,6 @@
|
|||||||
<string-array name="allowlist_hide_summary_in_battery_usage" translatable="false">
|
<string-array name="allowlist_hide_summary_in_battery_usage" translatable="false">
|
||||||
</string-array>
|
</string-array>
|
||||||
|
|
||||||
<!-- An allowlist which packages won't show entry in battery usage screen.
|
|
||||||
[CHAR LIMIT=NONE] -->
|
|
||||||
<string-array name="allowlist_hide_entry_in_battery_usage" translatable="false">
|
|
||||||
<item>"com.google.android.gms.persistent"</item>
|
|
||||||
</string-array>
|
|
||||||
|
|
||||||
<!-- Array of titles palette list for accessibility. -->
|
<!-- Array of titles palette list for accessibility. -->
|
||||||
<string-array name="setting_palette_data" translatable="false" >
|
<string-array name="setting_palette_data" translatable="false" >
|
||||||
<item>@string/color_red</item>
|
<item>@string/color_red</item>
|
||||||
|
@@ -123,10 +123,12 @@ public class BatteryChartPreferenceController extends AbstractPreferenceControll
|
|||||||
mIs24HourFormat = DateFormat.is24HourFormat(context);
|
mIs24HourFormat = DateFormat.is24HourFormat(context);
|
||||||
mNotAllowShowSummaryPackages = context.getResources()
|
mNotAllowShowSummaryPackages = context.getResources()
|
||||||
.getTextArray(R.array.allowlist_hide_summary_in_battery_usage);
|
.getTextArray(R.array.allowlist_hide_summary_in_battery_usage);
|
||||||
mNotAllowShowEntryPackages = context.getResources()
|
|
||||||
.getTextArray(R.array.allowlist_hide_entry_in_battery_usage);
|
|
||||||
mMetricsFeatureProvider =
|
mMetricsFeatureProvider =
|
||||||
FeatureFactory.getFactory(mContext).getMetricsFeatureProvider();
|
FeatureFactory.getFactory(mContext).getMetricsFeatureProvider();
|
||||||
|
mNotAllowShowEntryPackages =
|
||||||
|
FeatureFactory.getFactory(mContext)
|
||||||
|
.getPowerUsageFeatureProvider(context)
|
||||||
|
.getHideApplicationEntries(mContext);
|
||||||
if (lifecycle != null) {
|
if (lifecycle != null) {
|
||||||
lifecycle.addObserver(this);
|
lifecycle.addObserver(this);
|
||||||
}
|
}
|
||||||
|
@@ -302,10 +302,10 @@ public final class ConvertUtils {
|
|||||||
private static void purgeLowPercentageAndFakeData(
|
private static void purgeLowPercentageAndFakeData(
|
||||||
final Context context,
|
final Context context,
|
||||||
final Map<Integer, List<BatteryDiffEntry>> indexedUsageMap) {
|
final Map<Integer, List<BatteryDiffEntry>> indexedUsageMap) {
|
||||||
final List<CharSequence> backgroundUsageTimeHideList =
|
final Set<CharSequence> backgroundUsageTimeHideList =
|
||||||
FeatureFactory.getFactory(context)
|
FeatureFactory.getFactory(context)
|
||||||
.getPowerUsageFeatureProvider(context)
|
.getPowerUsageFeatureProvider(context)
|
||||||
.getHideBackgroundUsageTimeList(context);
|
.getHideBackgroundUsageTimeSet(context);
|
||||||
for (List<BatteryDiffEntry> entries : indexedUsageMap.values()) {
|
for (List<BatteryDiffEntry> entries : indexedUsageMap.values()) {
|
||||||
final Iterator<BatteryDiffEntry> iterator = entries.iterator();
|
final Iterator<BatteryDiffEntry> iterator = entries.iterator();
|
||||||
while (iterator.hasNext()) {
|
while (iterator.hasNext()) {
|
||||||
|
@@ -24,8 +24,8 @@ import android.util.SparseIntArray;
|
|||||||
import com.android.internal.os.BatterySipper;
|
import com.android.internal.os.BatterySipper;
|
||||||
import com.android.settingslib.fuelgauge.Estimate;
|
import com.android.settingslib.fuelgauge.Estimate;
|
||||||
|
|
||||||
import java.util.List;
|
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
import java.util.Set;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Feature Provider used in power usage
|
* Feature Provider used in power usage
|
||||||
@@ -150,7 +150,12 @@ public interface PowerUsageFeatureProvider {
|
|||||||
Uri getBatteryHistoryUri();
|
Uri getBatteryHistoryUri();
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Returns {@link List} for hidding applications background usage time.
|
* Returns {@link Set} for hidding applications background usage time.
|
||||||
*/
|
*/
|
||||||
List<CharSequence> getHideBackgroundUsageTimeList(Context context);
|
Set<CharSequence> getHideBackgroundUsageTimeSet(Context context);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Returns package names for hidding application in the usage screen.
|
||||||
|
*/
|
||||||
|
CharSequence[] getHideApplicationEntries(Context context);
|
||||||
}
|
}
|
||||||
|
@@ -27,9 +27,9 @@ import com.android.internal.os.BatterySipper;
|
|||||||
import com.android.internal.util.ArrayUtils;
|
import com.android.internal.util.ArrayUtils;
|
||||||
import com.android.settingslib.fuelgauge.Estimate;
|
import com.android.settingslib.fuelgauge.Estimate;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.HashSet;
|
||||||
import java.util.List;
|
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
import java.util.Set;
|
||||||
|
|
||||||
public class PowerUsageFeatureProviderImpl implements PowerUsageFeatureProvider {
|
public class PowerUsageFeatureProviderImpl implements PowerUsageFeatureProvider {
|
||||||
|
|
||||||
@@ -177,7 +177,12 @@ public class PowerUsageFeatureProviderImpl implements PowerUsageFeatureProvider
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public List<CharSequence> getHideBackgroundUsageTimeList(Context context) {
|
public Set<CharSequence> getHideBackgroundUsageTimeSet(Context context) {
|
||||||
return new ArrayList<>();
|
return new HashSet<>();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public CharSequence[] getHideApplicationEntries(Context context) {
|
||||||
|
return new CharSequence[0];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@@ -40,6 +40,7 @@ import org.robolectric.RuntimeEnvironment;
|
|||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.Arrays;
|
import java.util.Arrays;
|
||||||
import java.util.HashMap;
|
import java.util.HashMap;
|
||||||
|
import java.util.HashSet;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Locale;
|
import java.util.Locale;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
@@ -339,8 +340,8 @@ public final class ConvertUtilsTest {
|
|||||||
"package3", "label3", 500, 5L, 3600000L, 7200000L);
|
"package3", "label3", 500, 5L, 3600000L, 7200000L);
|
||||||
entryMap.put(entry.getKey(), entry);
|
entryMap.put(entry.getKey(), entry);
|
||||||
batteryHistoryMap.put(Long.valueOf(batteryHistoryKeys[2]), entryMap);
|
batteryHistoryMap.put(Long.valueOf(batteryHistoryKeys[2]), entryMap);
|
||||||
when(mPowerUsageFeatureProvider.getHideBackgroundUsageTimeList(mContext))
|
when(mPowerUsageFeatureProvider.getHideBackgroundUsageTimeSet(mContext))
|
||||||
.thenReturn(Arrays.asList((CharSequence) "package3"));
|
.thenReturn(new HashSet(Arrays.asList((CharSequence) "package3")));
|
||||||
|
|
||||||
final Map<Integer, List<BatteryDiffEntry>> purgedResultMap =
|
final Map<Integer, List<BatteryDiffEntry>> purgedResultMap =
|
||||||
ConvertUtils.getIndexedUsageMap(
|
ConvertUtils.getIndexedUsageMap(
|
||||||
|
Reference in New Issue
Block a user