Clean up used EntityHeaderController

From DataUsageSummaryPreferenceController and
BatteryHeaderPreferenceController.

There are no entity header UI for these 2 controllers, so no need to
create EntityHeaderController instance.

Bug: 295260929
Test: manual - on mobile settings page
Test: manual - on data usage page
Test: manual - on battery settings page
Change-Id: Ib96c9ae93de31f86434e5203ef4acac3af50e0ef

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

@@ -154,10 +154,9 @@ public class DataUsageSummary extends DataUsageBaseFragment implements DataUsage
             return controllers;
         }
         mSummaryController =
-                new DataUsageSummaryPreferenceController(activity, this,
+                new DataUsageSummaryPreferenceController(activity,
                         DataUsageUtils.getDefaultSubscriptionId(activity));
         controllers.add(mSummaryController);
-        getSettingsLifecycle().addObserver(mSummaryController);
         return controllers;
     }
 

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

@@ -32,7 +32,6 @@ import android.util.RecurrenceRule;
 
 import androidx.annotation.VisibleForTesting;
 import androidx.preference.Preference;
-import androidx.preference.PreferenceFragmentCompat;
 
 import com.android.internal.util.CollectionUtils;
 import com.android.settings.R;
@@ -40,9 +39,6 @@ import com.android.settings.core.PreferenceControllerMixin;
 import com.android.settings.datausage.lib.DataUsageLib;
 import com.android.settings.network.ProxySubscriptionManager;
 import com.android.settings.network.telephony.TelephonyBasePreferenceController;
-import com.android.settings.widget.EntityHeaderController;
-import com.android.settingslib.core.lifecycle.LifecycleObserver;
-import com.android.settingslib.core.lifecycle.events.OnStart;
 import com.android.settingslib.net.DataUsageController;
 import com.android.settingslib.utils.ThreadUtils;
 
@@ -55,14 +51,12 @@ import java.util.concurrent.Future;
  * framework and falls back to legacy usage data if none are available.
  */
 public class DataUsageSummaryPreferenceController extends TelephonyBasePreferenceController
-        implements PreferenceControllerMixin, LifecycleObserver, OnStart {
+        implements PreferenceControllerMixin {
 
     private static final String TAG = "DataUsageController";
     private static final String KEY = "status_header";
     private static final long PETA = 1000000000000000L;
 
-    private EntityHeaderController mEntityHeaderController;
-    private final PreferenceFragmentCompat mFragment;
     protected DataUsageController mDataUsageController;
     protected DataUsageInfoController mDataInfoController;
     private NetworkTemplate mDefaultTemplate;
@@ -93,11 +87,9 @@ public class DataUsageSummaryPreferenceController extends TelephonyBasePreferenc
 
     private Future<Long> mHistoricalUsageLevel;
 
-    public DataUsageSummaryPreferenceController(
-            Activity activity, PreferenceFragmentCompat fragment, int subscriptionId) {
+    public DataUsageSummaryPreferenceController(Activity activity, int subscriptionId) {
         super(activity, KEY);
 
-        mFragment = fragment;
         init(subscriptionId);
     }
 
@@ -137,27 +129,15 @@ public class DataUsageSummaryPreferenceController extends TelephonyBasePreferenc
             DataUsageInfoController dataInfoController,
             NetworkTemplate defaultTemplate,
             Activity activity,
-            EntityHeaderController entityHeaderController,
-            PreferenceFragmentCompat fragment,
             int subscriptionId) {
         super(activity, KEY);
         mDataUsageController = dataUsageController;
         mDataInfoController = dataInfoController;
         mDefaultTemplate = defaultTemplate;
         mHasMobileData = true;
-        mEntityHeaderController = entityHeaderController;
-        mFragment = fragment;
         mSubId = subscriptionId;
     }
 
-    @Override
-    public void onStart() {
-        if (mEntityHeaderController == null) {
-            mEntityHeaderController =
-                    EntityHeaderController.newInstance((Activity) mContext, mFragment, null);
-        }
-    }
-
     @VisibleForTesting
     List<SubscriptionPlan> getSubscriptionPlans(int subscriptionId) {
         return ProxySubscriptionManager.getInstance(mContext).get()

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

@@ -21,7 +21,6 @@ import android.net.NetworkTemplate;
 import android.telephony.SubscriptionManager;
 
 import androidx.preference.Preference;
-import androidx.preference.PreferenceFragmentCompat;
 
 import com.android.settingslib.net.DataUsageController;
 
@@ -34,9 +33,8 @@ import java.util.Set;
 public class WifiDataUsageSummaryPreferenceController extends DataUsageSummaryPreferenceController {
     final Set<String> mAllNetworkKeys;
 
-    public WifiDataUsageSummaryPreferenceController(
-            Activity activity, PreferenceFragmentCompat fragment, Set<String> allNetworkKeys) {
-        super(activity, fragment, SubscriptionManager.INVALID_SUBSCRIPTION_ID);
+    public WifiDataUsageSummaryPreferenceController(Activity activity, Set<String> allNetworkKeys) {
+        super(activity, SubscriptionManager.INVALID_SUBSCRIPTION_ID);
         mAllNetworkKeys = new HashSet<>(allNetworkKeys);
     }