From 79f0f6e368e15dece67ca6fac77bf32290f57121 Mon Sep 17 00:00:00 2001 From: Chaohui Wang Date: Mon, 18 Sep 2023 23:45:54 +0800 Subject: [PATCH] Clean up ChartDataUsagePreference.setColors() This method is no-op. Bug: 290856342 Test: manual - on DataUsageList Change-Id: Ice64630bc43afe7116b797425a5ea81b2d0ad5af --- .../datausage/ChartDataUsagePreference.java | 8 ----- .../settings/datausage/DataUsageList.java | 32 ------------------- 2 files changed, 40 deletions(-) diff --git a/src/com/android/settings/datausage/ChartDataUsagePreference.java b/src/com/android/settings/datausage/ChartDataUsagePreference.java index 12fb03b6258..e2a103ed2dd 100644 --- a/src/com/android/settings/datausage/ChartDataUsagePreference.java +++ b/src/com/android/settings/datausage/ChartDataUsagePreference.java @@ -56,8 +56,6 @@ public class ChartDataUsagePreference extends Preference { private long mStart; private long mEnd; private NetworkCycleChartData mNetworkCycleChartData; - private int mSecondaryColor; - private int mSeriesColor; public ChartDataUsagePreference(Context context, AttributeSet attrs) { super(context, attrs); @@ -310,10 +308,4 @@ public class ChartDataUsagePreference extends Preference { mEnd = data.getEndTime(); notifyChanged(); } - - public void setColors(int seriesColor, int secondaryColor) { - mSeriesColor = seriesColor; - mSecondaryColor = secondaryColor; - notifyChanged(); - } } diff --git a/src/com/android/settings/datausage/DataUsageList.java b/src/com/android/settings/datausage/DataUsageList.java index e4bad128f37..39287c19471 100644 --- a/src/com/android/settings/datausage/DataUsageList.java +++ b/src/com/android/settings/datausage/DataUsageList.java @@ -18,14 +18,12 @@ import android.app.Activity; import android.app.settings.SettingsEnums; import android.content.Context; import android.content.Intent; -import android.graphics.Color; import android.net.ConnectivityManager; import android.net.NetworkPolicy; import android.net.NetworkTemplate; import android.os.Bundle; import android.os.UserManager; import android.provider.Settings; -import android.telephony.SubscriptionInfo; import android.telephony.SubscriptionManager; import android.util.EventLog; import android.util.Log; @@ -50,7 +48,6 @@ import com.android.settings.core.SubSettingLauncher; import com.android.settings.datausage.CycleAdapter.SpinnerInterface; import com.android.settings.network.MobileDataEnabledListener; import com.android.settings.network.MobileNetworkRepository; -import com.android.settings.network.ProxySubscriptionManager; import com.android.settings.widget.LoadingViewController; import com.android.settingslib.mobile.dataservice.SubscriptionInfoEntity; import com.android.settingslib.net.NetworkCycleChartData; @@ -214,8 +211,6 @@ public class DataUsageList extends DataUsageBaseFragment // network history when showing app detail. getLoaderManager().restartLoader(LOADER_CHART_DATA, buildArgs(mTemplate), mNetworkCycleDataCallbacks); - - updateBody(); } @Override @@ -275,33 +270,6 @@ public class DataUsageList extends DataUsageBaseFragment updatePolicy(); } - /** - * Update body content based on current tab. Loads network cycle data from system, and - * binds them to visible controls. - */ - private void updateBody() { - if (!isAdded()) return; - - final Context context = getActivity(); - - // detail mode can change visible menus, invalidate - getActivity().invalidateOptionsMenu(); - - int seriesColor = context.getColor(R.color.sim_noitification); - if (mSubId != SubscriptionManager.INVALID_SUBSCRIPTION_ID) { - final SubscriptionInfo sir = ProxySubscriptionManager.getInstance(context) - .getActiveSubscriptionInfo(mSubId); - - if (sir != null) { - seriesColor = sir.getIconTint(); - } - } - - final int secondaryColor = Color.argb(127, Color.red(seriesColor), Color.green(seriesColor), - Color.blue(seriesColor)); - mChart.setColors(seriesColor, secondaryColor); - } - private Bundle buildArgs(NetworkTemplate template) { final Bundle args = new Bundle(); args.putParcelable(KEY_TEMPLATE, template);