Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0a037587 authored by ykhung's avatar ykhung
Browse files

Move legacy hide applications in usage screen list to SettingsGoogle 

Bug: 195306545
Test: make SettingsRoboTests
Change-Id: Iccb3530c40bc32c20d74d65aa3f26eb2d6719106
parent 2401ec42

res/values/arrays.xml

+0 −6
Original line number Diff line number Diff line
@@ -1531,12 +1531,6 @@ 
    <string-array name="allowlist_hide_summary_in_battery_usage" translatable="false">

    </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. -->

    <string-array name="setting_palette_data" translatable="false" >

        <item>@string/color_red</item>

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

+4 −2
Original line number Diff line number Diff line
@@ -123,10 +123,12 @@ public class BatteryChartPreferenceController extends AbstractPreferenceControll 
        mIs24HourFormat = DateFormat.is24HourFormat(context);

        mNotAllowShowSummaryPackages = context.getResources()

            .getTextArray(R.array.allowlist_hide_summary_in_battery_usage);

        mNotAllowShowEntryPackages = context.getResources()

            .getTextArray(R.array.allowlist_hide_entry_in_battery_usage);

        mMetricsFeatureProvider =

            FeatureFactory.getFactory(mContext).getMetricsFeatureProvider();

        mNotAllowShowEntryPackages =

            FeatureFactory.getFactory(mContext)

                .getPowerUsageFeatureProvider(context)

                .getHideApplicationEntries(mContext);

        if (lifecycle != null) {

            lifecycle.addObserver(this);

        }

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

+2 −2
Original line number Diff line number Diff line
@@ -302,10 +302,10 @@ public final class ConvertUtils { 
    private static void purgeLowPercentageAndFakeData(

            final Context context,

            final Map<Integer, List<BatteryDiffEntry>> indexedUsageMap) {

        final List<CharSequence> backgroundUsageTimeHideList =

        final Set<CharSequence> backgroundUsageTimeHideList =

                FeatureFactory.getFactory(context)

                        .getPowerUsageFeatureProvider(context)

                        .getHideBackgroundUsageTimeList(context);

                        .getHideBackgroundUsageTimeSet(context);

        for (List<BatteryDiffEntry> entries : indexedUsageMap.values()) {

            final Iterator<BatteryDiffEntry> iterator = entries.iterator();

            while (iterator.hasNext()) {

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

+8 −3
Original line number Diff line number Diff line
@@ -24,8 +24,8 @@ import android.util.SparseIntArray; 
import com.android.internal.os.BatterySipper;

import com.android.settingslib.fuelgauge.Estimate;



import java.util.List;

import java.util.Map;

import java.util.Set;



/**

 * Feature Provider used in power usage
@@ -150,7 +150,12 @@ public interface PowerUsageFeatureProvider { 
    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);

}

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

+9 −4
Original line number Diff line number Diff line
@@ -27,9 +27,9 @@ import com.android.internal.os.BatterySipper; 
import com.android.internal.util.ArrayUtils;

import com.android.settingslib.fuelgauge.Estimate;



import java.util.ArrayList;

import java.util.List;

import java.util.HashSet;

import java.util.Map;

import java.util.Set;



public class PowerUsageFeatureProviderImpl implements PowerUsageFeatureProvider {
@@ -177,7 +177,12 @@ public class PowerUsageFeatureProviderImpl implements PowerUsageFeatureProvider 
    }



    @Override

    public List<CharSequence> getHideBackgroundUsageTimeList(Context context) {

        return new ArrayList<>();

    public Set<CharSequence> getHideBackgroundUsageTimeSet(Context context) {

        return new HashSet<>();

    }



    @Override

    public CharSequence[] getHideApplicationEntries(Context context) {

        return new CharSequence[0];

    }

}