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

Commit bb535f4b authored by ykhung's avatar ykhung Committed by Automerger Merge Worker
Browse files

Move allowed list definition in the battery usage to feature provider am: b62cdecc 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15785737

Change-Id: I01745bccfb5cf44fbdfeedd1db6ad2b88a0c71a2
parents 3ce2bc23 b62cdecc

res/values/arrays.xml

+0 −5
Original line number Diff line number Diff line
@@ -1536,11 +1536,6 @@ 
        <item>@string/enhanced_4g_lte_mode_summary_4g_calling</item>

    </string-array>



    <!-- An allowlist which packages won't show summary in battery usage screen.

         [CHAR LIMIT=NONE] -->

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

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

+5 −2
Original line number Diff line number Diff line
@@ -47,6 +47,7 @@ import com.android.settings.R; 
import com.android.settings.SettingsActivity;

import com.android.settings.core.InstrumentedPreferenceFragment;

import com.android.settings.core.PreferenceControllerMixin;

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;
@@ -440,8 +441,10 @@ public class BatteryAppListPreferenceController extends AbstractPreferenceContro 
    }



    private boolean shouldShowSummary(BatteryEntry entry) {

        final CharSequence[] allowlistPackages = mContext.getResources()

                .getTextArray(R.array.allowlist_hide_summary_in_battery_usage);

        final CharSequence[] allowlistPackages =

                FeatureFactory.getFactory(mContext)

                        .getPowerUsageFeatureProvider(mContext)

                        .getHideApplicationSummary(mContext);

        final String target = entry.getDefaultPackageName();



        for (CharSequence packageName : allowlistPackages) {

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

+6 −4
Original line number Diff line number Diff line
@@ -121,14 +121,16 @@ public class BatteryChartPreferenceController extends AbstractPreferenceControll 
        mFragment = fragment;

        mPreferenceKey = preferenceKey;

        mIs24HourFormat = DateFormat.is24HourFormat(context);

        mNotAllowShowSummaryPackages = context.getResources()

            .getTextArray(R.array.allowlist_hide_summary_in_battery_usage);

        mMetricsFeatureProvider =

            FeatureFactory.getFactory(mContext).getMetricsFeatureProvider();

        mNotAllowShowEntryPackages =

            FeatureFactory.getFactory(mContext)

            FeatureFactory.getFactory(context)

                .getPowerUsageFeatureProvider(context)

                .getHideApplicationEntries(context);

        mNotAllowShowSummaryPackages =

            FeatureFactory.getFactory(context)

                .getPowerUsageFeatureProvider(context)

                .getHideApplicationEntries(mContext);

                .getHideApplicationSummary(context);

        if (lifecycle != null) {

            lifecycle.addObserver(this);

        }

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

+5 −0
Original line number Diff line number Diff line
@@ -163,4 +163,9 @@ 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);

}

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

+5 −0
Original line number Diff line number Diff line
@@ -190,4 +190,9 @@ public class PowerUsageFeatureProviderImpl implements PowerUsageFeatureProvider 
    public CharSequence[] getHideApplicationEntries(Context context) {

        return new CharSequence[0];

    }



    @Override

    public CharSequence[] getHideApplicationSummary(Context context) {

        return new CharSequence[0];

    }

}