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
This commit is contained in:
@@ -15,7 +15,6 @@
|
||||
|
||||
package com.android.settings.fuelgauge;
|
||||
|
||||
import android.app.Activity;
|
||||
import android.content.Context;
|
||||
import android.content.Intent;
|
||||
import android.icu.text.NumberFormat;
|
||||
@@ -25,7 +24,6 @@ import android.text.TextUtils;
|
||||
import android.util.Log;
|
||||
|
||||
import androidx.annotation.VisibleForTesting;
|
||||
import androidx.preference.PreferenceFragmentCompat;
|
||||
import androidx.preference.PreferenceScreen;
|
||||
|
||||
import com.android.settings.R;
|
||||
@@ -33,18 +31,14 @@ import com.android.settings.core.BasePreferenceController;
|
||||
import com.android.settings.core.PreferenceControllerMixin;
|
||||
import com.android.settings.fuelgauge.batterytip.tips.BatteryTip;
|
||||
import com.android.settings.overlay.FeatureFactory;
|
||||
import com.android.settings.widget.EntityHeaderController;
|
||||
import com.android.settingslib.Utils;
|
||||
import com.android.settingslib.core.lifecycle.LifecycleObserver;
|
||||
import com.android.settingslib.core.lifecycle.events.OnStart;
|
||||
import com.android.settingslib.widget.UsageProgressBarPreference;
|
||||
|
||||
/**
|
||||
* Controller that update the battery header view
|
||||
*/
|
||||
public class BatteryHeaderPreferenceController extends BasePreferenceController
|
||||
implements PreferenceControllerMixin, LifecycleObserver, OnStart,
|
||||
BatteryPreferenceController {
|
||||
implements PreferenceControllerMixin, BatteryPreferenceController {
|
||||
private static final String TAG = "BatteryHeaderPreferenceController";
|
||||
|
||||
@VisibleForTesting
|
||||
@@ -56,8 +50,6 @@ public class BatteryHeaderPreferenceController extends BasePreferenceController
|
||||
@VisibleForTesting
|
||||
UsageProgressBarPreference mBatteryUsageProgressBarPref;
|
||||
|
||||
private Activity mActivity;
|
||||
private PreferenceFragmentCompat mHost;
|
||||
private BatteryTip mBatteryTip;
|
||||
private final PowerManager mPowerManager;
|
||||
|
||||
@@ -68,14 +60,6 @@ public class BatteryHeaderPreferenceController extends BasePreferenceController
|
||||
.getBatteryStatusFeatureProvider();
|
||||
}
|
||||
|
||||
public void setActivity(Activity activity) {
|
||||
mActivity = activity;
|
||||
}
|
||||
|
||||
public void setFragment(PreferenceFragmentCompat fragment) {
|
||||
mHost = fragment;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void displayPreference(PreferenceScreen screen) {
|
||||
super.displayPreference(screen);
|
||||
@@ -96,11 +80,6 @@ public class BatteryHeaderPreferenceController extends BasePreferenceController
|
||||
return AVAILABLE_UNSEARCHABLE;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onStart() {
|
||||
EntityHeaderController.newInstance(mActivity, mHost, null /* header view */);
|
||||
}
|
||||
|
||||
private CharSequence generateLabel(BatteryInfo info) {
|
||||
if (Utils.containsIncompatibleChargers(mContext, TAG)) {
|
||||
return mContext.getString(
|
||||
|
Reference in New Issue
Block a user