Refactor battery related feature provider

Merge BatteryInfoFeatureProvider to BatterySettingsFeatureProvider. Also
add a new string to indicate the unavailability when there's error
fetching the cycle count value.

Bug: 276399056
Test: robotests
Change-Id: Ic6a641d72d5bb295f2a0766dcebdcbe855d91125
This commit is contained in:
Yi-Ling Chuang
2023-05-23 14:21:44 +08:00
parent 097cd12494
commit ee97eaf2d9
17 changed files with 132 additions and 202 deletions

View File

@@ -47,8 +47,6 @@ import com.android.settings.dashboard.DashboardFeatureProvider;
import com.android.settings.dashboard.DashboardFeatureProviderImpl;
import com.android.settings.dashboard.suggestions.SuggestionFeatureProvider;
import com.android.settings.dashboard.suggestions.SuggestionFeatureProviderImpl;
import com.android.settings.deviceinfo.batteryinfo.BatteryInfoFeatureProvider;
import com.android.settings.deviceinfo.batteryinfo.BatteryInfoFeatureProviderImpl;
import com.android.settings.enterprise.EnterprisePrivacyFeatureProvider;
import com.android.settings.enterprise.EnterprisePrivacyFeatureProviderImpl;
import com.android.settings.fuelgauge.BatterySettingsFeatureProvider;
@@ -119,7 +117,6 @@ public class FeatureFactoryImpl extends FeatureFactory {
private AdvancedVpnFeatureProvider mAdvancedVpnFeatureProvider;
private WifiFeatureProvider mWifiFeatureProvider;
private KeyboardSettingsFeatureProvider mKeyboardSettingsFeatureProvider;
private BatteryInfoFeatureProvider mBatteryInfoFeatureProvider;
@Override
public SupportFeatureProvider getSupportFeatureProvider(Context context) {
@@ -379,12 +376,4 @@ public class FeatureFactoryImpl extends FeatureFactory {
}
return mKeyboardSettingsFeatureProvider;
}
@Override
public BatteryInfoFeatureProvider getBatteryInfoFeatureProvider() {
if (mBatteryInfoFeatureProvider == null) {
mBatteryInfoFeatureProvider = new BatteryInfoFeatureProviderImpl(getAppContext());
}
return mBatteryInfoFeatureProvider;
}
}