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

Commit 129c98bb authored by Raff Tsai's avatar Raff Tsai
Browse files

Remove summary loader in some fragments 

- Summary Loader only works in injected items, but those fragments
are not injected to Settings UI. The SummaryLoader class them are
useless.

Bug: 141653158
Test: robolectric
Change-Id: I1ca0bf5a1f417b7fe86b28e96aff7d4aee2cf2d3
parent 360d2f2c

AndroidManifest.xml

+0 −3
Original line number Diff line number Diff line
@@ -2344,9 +2344,6 @@ 
                <action android:name="android.intent.action.MAIN" />

                <category android:name="com.android.settings.SHORTCUT" />

            </intent-filter>

            <intent-filter>

                <action android:name="com.android.settings.action.SETTINGS" />

            </intent-filter>

            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"

                android:value="com.android.settings.datausage.DataUsageSummary" />

        </activity>

src/com/android/settings/applications/ProcessStatsSummary.java

+0 −38
Original line number Diff line number Diff line
@@ -15,7 +15,6 @@ 
 */

package com.android.settings.applications;



import android.app.Activity;

import android.app.settings.SettingsEnums;

import android.content.Context;

import android.os.Bundle;
@@ -30,7 +29,6 @@ import com.android.settings.SummaryPreference; 
import com.android.settings.Utils;

import com.android.settings.applications.ProcStatsData.MemInfo;

import com.android.settings.core.SubSettingLauncher;

import com.android.settings.dashboard.SummaryLoader;



public class ProcessStatsSummary extends ProcessStatsBase implements OnPreferenceClickListener {
@@ -127,40 +125,4 @@ public class ProcessStatsSummary extends ProcessStatsBase implements OnPreferenc 
        }

        return false;

    }



    private static class SummaryProvider implements SummaryLoader.SummaryProvider {



        private final Context mContext;

        private final SummaryLoader mSummaryLoader;



        public SummaryProvider(Context context, SummaryLoader summaryLoader) {

            mContext = context;

            mSummaryLoader = summaryLoader;

        }



        @Override

        public void setListening(boolean listening) {

            if (listening) {

                ProcStatsData statsManager = new ProcStatsData(mContext, false);

                statsManager.setDuration(sDurations[0]);

                MemInfo memInfo = statsManager.getMemInfo();

                String usedResult = Formatter.formatShortFileSize(mContext,

                        (long) memInfo.realUsedRam);

                String totalResult = Formatter.formatShortFileSize(mContext,

                        (long) memInfo.realTotalRam);

                mSummaryLoader.setSummary(this, mContext.getString(R.string.memory_summary,

                        usedResult, totalResult));

            }

        }

    }



    public static final SummaryLoader.SummaryProviderFactory SUMMARY_PROVIDER_FACTORY

            = new SummaryLoader.SummaryProviderFactory() {

        @Override

        public SummaryLoader.SummaryProvider createSummaryProvider(Activity activity,

                                                                   SummaryLoader summaryLoader) {

            return new SummaryProvider(activity, summaryLoader);

        }

    };



}

src/com/android/settings/applications/manageapplications/ManageApplications.java

+0 −36
Original line number Diff line number Diff line
@@ -92,7 +92,6 @@ import com.android.settings.applications.AppStateUsageBridge; 
import com.android.settings.applications.AppStateUsageBridge.UsageState;

import com.android.settings.applications.AppStateWriteSettingsBridge;

import com.android.settings.applications.AppStorageSettings;

import com.android.settings.applications.InstalledAppCounter;

import com.android.settings.applications.UsageAccessDetails;

import com.android.settings.applications.appinfo.AppInfoDashboardFragment;

import com.android.settings.applications.appinfo.DrawOverlayDetails;
@@ -100,7 +99,6 @@ import com.android.settings.applications.appinfo.ExternalSourcesDetails; 
import com.android.settings.applications.appinfo.WriteSettingsDetails;

import com.android.settings.core.InstrumentedFragment;

import com.android.settings.core.SubSettingLauncher;

import com.android.settings.dashboard.SummaryLoader;

import com.android.settings.fuelgauge.HighPowerDetail;

import com.android.settings.notification.AppNotificationSettings;

import com.android.settings.notification.ConfigureNotificationSettings;
@@ -1518,38 +1516,4 @@ public class ManageApplications extends InstrumentedFragment 
            }

        }

    }



    private static class SummaryProvider implements SummaryLoader.SummaryProvider {



        private final Context mContext;

        private final SummaryLoader mLoader;



        private SummaryProvider(Context context, SummaryLoader loader) {

            mContext = context;

            mLoader = loader;

        }



        @Override

        public void setListening(boolean listening) {

            if (listening) {

                new InstalledAppCounter(mContext, InstalledAppCounter.IGNORE_INSTALL_REASON,

                        mContext.getPackageManager()) {

                    @Override

                    protected void onCountComplete(int num) {

                        mLoader.setSummary(SummaryProvider.this,

                                mContext.getString(R.string.apps_summary, num));

                    }

                }.execute();

            }

        }

    }



    public static final SummaryLoader.SummaryProviderFactory SUMMARY_PROVIDER_FACTORY

            = new SummaryLoader.SummaryProviderFactory() {

        @Override

        public SummaryLoader.SummaryProvider createSummaryProvider(Activity activity,

                SummaryLoader summaryLoader) {

            return new SummaryProvider(activity, summaryLoader);

        }

    };

}

src/com/android/settings/datausage/DataUsageSummary.java

+0 −77
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ import android.net.NetworkTemplate; 
import android.os.Bundle;

import android.telephony.SubscriptionInfo;

import android.telephony.SubscriptionManager;

import android.telephony.SubscriptionPlan;

import android.text.BidiFormatter;

import android.text.Spannable;

import android.text.SpannableString;
@@ -34,11 +33,8 @@ import androidx.preference.Preference; 
import androidx.preference.PreferenceScreen;



import com.android.settings.R;

import com.android.settings.Utils;

import com.android.settings.dashboard.SummaryLoader;

import com.android.settingslib.NetworkPolicyEditor;

import com.android.settingslib.core.AbstractPreferenceController;

import com.android.settingslib.net.DataUsageController;



import java.util.ArrayList;

import java.util.List;
@@ -250,77 +246,4 @@ public class DataUsageSummary extends DataUsageBaseFragment implements DataUsage 
        updateState();

        mSummaryController.updateState(mSummaryPreference);

    }



    private static class SummaryProvider

            implements SummaryLoader.SummaryProvider {



        private final Activity mActivity;

        private final SummaryLoader mSummaryLoader;

        private final DataUsageController mDataController;



        public SummaryProvider(Activity activity, SummaryLoader summaryLoader) {

            mActivity = activity;

            mSummaryLoader = summaryLoader;

            mDataController = new DataUsageController(activity);

        }



        @Override

        public void setListening(boolean listening) {

            if (listening) {

                if (DataUsageUtils.hasSim(mActivity)) {

                    mSummaryLoader.setSummary(this,

                            mActivity.getString(R.string.data_usage_summary_format,

                                    formatUsedData()));

                } else {

                    final DataUsageController.DataUsageInfo info =

                            mDataController.getWifiDataUsageInfo();



                    if (info == null) {

                        mSummaryLoader.setSummary(this, null);

                    } else {

                        final CharSequence wifiFormat = mActivity

                                .getText(R.string.data_usage_wifi_format);

                        final CharSequence sizeText =

                                DataUsageUtils.formatDataUsage(mActivity, info.usageLevel);

                        mSummaryLoader.setSummary(this,

                                TextUtils.expandTemplate(wifiFormat, sizeText));

                    }

                }

            }

        }



        private CharSequence formatUsedData() {

            SubscriptionManager subscriptionManager = (SubscriptionManager) mActivity

                .getSystemService(Context.TELEPHONY_SUBSCRIPTION_SERVICE);

            int defaultSubId = subscriptionManager.getDefaultSubscriptionId();

            if (defaultSubId == SubscriptionManager.INVALID_SUBSCRIPTION_ID) {

                return formatFallbackData();

            }

            SubscriptionPlan dfltPlan = DataUsageSummaryPreferenceController

                    .getPrimaryPlan(subscriptionManager, defaultSubId);

            if (dfltPlan == null) {

                return formatFallbackData();

            }

            if (DataUsageSummaryPreferenceController.unlimited(dfltPlan.getDataLimitBytes())) {

                return DataUsageUtils.formatDataUsage(mActivity, dfltPlan.getDataUsageBytes());

            } else {

                return Utils.formatPercentage(dfltPlan.getDataUsageBytes(),

                    dfltPlan.getDataLimitBytes());

            }

        }



        private CharSequence formatFallbackData() {

            DataUsageController.DataUsageInfo info = mDataController.getDataUsageInfo();

            if (info == null) {

                return DataUsageUtils.formatDataUsage(mActivity, 0);

            } else if (info.limitLevel <= 0) {

                return DataUsageUtils.formatDataUsage(mActivity, info.usageLevel);

            } else {

                return Utils.formatPercentage(info.usageLevel, info.limitLevel);

            }

        }

    }



    public static final SummaryLoader.SummaryProviderFactory SUMMARY_PROVIDER_FACTORY

        = SummaryProvider::new;

}

src/com/android/settings/wifi/WifiSettings.java

+0 −38
Original line number Diff line number Diff line
@@ -60,12 +60,10 @@ import com.android.settings.RestrictedSettingsFragment; 
import com.android.settings.SettingsActivity;

import com.android.settings.core.FeatureFlags;

import com.android.settings.core.SubSettingLauncher;

import com.android.settings.dashboard.SummaryLoader;

import com.android.settings.datausage.DataUsagePreference;

import com.android.settings.datausage.DataUsageUtils;

import com.android.settings.location.ScanningSettings;

import com.android.settings.search.BaseSearchIndexProvider;

import com.android.settings.widget.SummaryUpdater.OnSummaryChangeListener;

import com.android.settings.widget.SwitchBarController;

import com.android.settings.wifi.details.WifiNetworkDetailsFragment;

import com.android.settings.wifi.dpp.WifiDppUtils;
@@ -1228,42 +1226,6 @@ public class WifiSettings extends RestrictedSettingsFragment 
                }

            };



    private static class SummaryProvider

            implements SummaryLoader.SummaryProvider, OnSummaryChangeListener {



        private final Context mContext;

        private final SummaryLoader mSummaryLoader;



        @VisibleForTesting

        WifiSummaryUpdater mSummaryHelper;



        public SummaryProvider(Context context, SummaryLoader summaryLoader) {

            mContext = context;

            mSummaryLoader = summaryLoader;

            mSummaryHelper = new WifiSummaryUpdater(mContext, this);

        }





        @Override

        public void setListening(boolean listening) {

            mSummaryHelper.register(listening);

        }



        @Override

        public void onSummaryChanged(String summary) {

            mSummaryLoader.setSummary(this, summary);

        }

    }



    public static final SummaryLoader.SummaryProviderFactory SUMMARY_PROVIDER_FACTORY

            = new SummaryLoader.SummaryProviderFactory() {

        @Override

        public SummaryLoader.SummaryProvider createSummaryProvider(Activity activity,

                SummaryLoader summaryLoader) {

            return new SummaryProvider(activity, summaryLoader);

        }

    };



    private void handleConfigNetworkSubmitEvent(Intent data) {

        final WifiConfiguration wifiConfiguration = data.getParcelableExtra(

                ConfigureAccessPointFragment.NETWORK_CONFIG_KEY);