PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove context from batteryStatusFeatureProvider

Browse Source 
BatteryStatusFeatureProvider is created by using application context,
no need pass context in when get.

Bug: 286764889
Test: m Settings
Change-Id: Ie5f39c3f074a1937526461eba45f11f7ec212cba
This commit is contained in:
Chaohui Wang
2023-07-06 15:53:46 +08:00
parent b3b27451a3
commit 9ed6eccb75
7 changed files with 15 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/com/android/settings/fuelgauge/BatteryHeaderPreferenceController.java
View File

@@ -18,7 +18,6 @@ package com.android.settings.fuelgauge;
import android.app.Activity;
import android.content.Context;
import android.content.Intent;
import android.content.IntentFilter;
import android.icu.text.NumberFormat;
import android.os.BatteryManager;
import android.os.PowerManager;
@@ -67,8 +66,8 @@ public class BatteryHeaderPreferenceController extends BasePreferenceController
public BatteryHeaderPreferenceController(Context context, String key) {
super(context, key);
mPowerManager = context.getSystemService(PowerManager.class);
mBatteryStatusFeatureProvider = FeatureFactory.getFactory(context)
.getBatteryStatusFeatureProvider(context);
mBatteryStatusFeatureProvider = FeatureFactory.getFeatureFactory()
.getBatteryStatusFeatureProvider();
}
public void setActivity(Activity activity) {

6
src/com/android/settings/fuelgauge/TopLevelBatteryPreferenceController.java
View File

@@ -27,10 +27,10 @@ import androidx.preference.PreferenceScreen;
import com.android.settings.R;
import com.android.settings.core.BasePreferenceController;
import com.android.settings.overlay.FeatureFactory;
import com.android.settingslib.Utils;
import com.android.settingslib.core.lifecycle.LifecycleObserver;
import com.android.settingslib.core.lifecycle.events.OnStart;
import com.android.settingslib.core.lifecycle.events.OnStop;
import com.android.settingslib.Utils;
import com.android.settingslib.utils.ThreadUtils;
public class TopLevelBatteryPreferenceController extends BasePreferenceController implements
@@ -66,8 +66,8 @@ public class TopLevelBatteryPreferenceController extends BasePreferenceControlle
}, true /* shortString */);
});
mBatteryStatusFeatureProvider = FeatureFactory.getFactory(context)
.getBatteryStatusFeatureProvider(context);
mBatteryStatusFeatureProvider = FeatureFactory.getFeatureFactory()
.getBatteryStatusFeatureProvider();
}
@Override

4
src/com/android/settings/overlay/FeatureFactory.kt
View File

@@ -73,9 +73,7 @@ abstract class FeatureFactory {
/**
* Retrieves implementation for Battery Status feature.
*/
abstract fun getBatteryStatusFeatureProvider(
context: Context
): BatteryStatusFeatureProvider
abstract val batteryStatusFeatureProvider: BatteryStatusFeatureProvider
/**
* Gets implementation for Battery Settings provider.

8
src/com/android/settings/overlay/FeatureFactoryImpl.kt
View File

@@ -81,10 +81,6 @@ open class FeatureFactoryImpl : FeatureFactory() {
private val powerUsageFeatureProvider by lazy { PowerUsageFeatureProviderImpl(appContext) }
private val batteryStatusFeatureProvider by lazy {
BatteryStatusFeatureProviderImpl(appContext)
}
private val userFeatureProvider by lazy { UserFeatureProviderImpl(appContext) }
private val contextualCardFeatureProvider by lazy {
@@ -98,7 +94,9 @@ open class FeatureFactoryImpl : FeatureFactory() {
override fun getPowerUsageFeatureProvider(context: Context) = powerUsageFeatureProvider
override fun getBatteryStatusFeatureProvider(context: Context) = batteryStatusFeatureProvider
override val batteryStatusFeatureProvider by lazy {
BatteryStatusFeatureProviderImpl(appContext)
}
override val batterySettingsFeatureProvider by lazy { BatterySettingsFeatureProviderImpl() }

3
tests/robotests/src/com/android/settings/testutils/FakeFeatureFactory.java
View File

@@ -151,8 +151,9 @@ public class FakeFeatureFactory extends FeatureFactory {
return metricsFeatureProvider;
}
@NotNull
@Override
public BatteryStatusFeatureProvider getBatteryStatusFeatureProvider(Context context) {
public BatteryStatusFeatureProvider getBatteryStatusFeatureProvider() {
return batteryStatusFeatureProvider;
}

6
tests/spa_unit/src/com/android/settings/testutils/FakeFeatureFactory.kt
View File

@@ -36,7 +36,6 @@ import com.android.settings.inputmethod.KeyboardSettingsFeatureProvider
import com.android.settings.localepicker.LocaleFeatureProvider
import com.android.settings.overlay.DockUpdaterFeatureProvider
import com.android.settings.overlay.FeatureFactory
import com.android.settings.overlay.SupportFeatureProvider
import com.android.settings.overlay.SurveyFeatureProvider
import com.android.settings.panel.PanelFeatureProvider
import com.android.settings.search.SearchFeatureProvider
@@ -72,9 +71,8 @@ class FakeFeatureFactory : FeatureFactory() {
TODO("Not yet implemented")
}
override fun getBatteryStatusFeatureProvider(context: Context): BatteryStatusFeatureProvider {
TODO("Not yet implemented")
}
override val batteryStatusFeatureProvider: BatteryStatusFeatureProvider
get() = TODO("Not yet implemented")
override val batterySettingsFeatureProvider: BatterySettingsFeatureProvider
get() = TODO("Not yet implemented")

3
tests/unit/src/com/android/settings/testutils/FakeFeatureFactory.java
View File

@@ -150,8 +150,9 @@ public class FakeFeatureFactory extends FeatureFactory {
return metricsFeatureProvider;
}
@NotNull
@Override
public BatteryStatusFeatureProvider getBatteryStatusFeatureProvider(Context context) {
public BatteryStatusFeatureProvider getBatteryStatusFeatureProvider() {
return batteryStatusFeatureProvider;
}