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

@@ -29,7 +29,6 @@ import com.android.settings.biometrics2.factory.BiometricsRepositoryProvider;
import com.android.settings.bluetooth.BluetoothFeatureProvider;
import com.android.settings.dashboard.DashboardFeatureProvider;
import com.android.settings.dashboard.suggestions.SuggestionFeatureProvider;
import com.android.settings.deviceinfo.batteryinfo.BatteryInfoFeatureProvider;
import com.android.settings.enterprise.EnterprisePrivacyFeatureProvider;
import com.android.settings.fuelgauge.BatterySettingsFeatureProvider;
import com.android.settings.fuelgauge.BatteryStatusFeatureProvider;
@@ -78,7 +77,6 @@ public class FakeFeatureFactory extends FeatureFactory {
public final AwareFeatureProvider mAwareFeatureProvider;
public final FaceFeatureProvider mFaceFeatureProvider;
public final BiometricsRepositoryProvider mBiometricsRepositoryProvider;
public final BatteryInfoFeatureProvider mBatteryInfoFeatureProvider;
public PanelFeatureProvider panelFeatureProvider;
public SlicesFeatureProvider slicesFeatureProvider;
@@ -136,7 +134,6 @@ public class FakeFeatureFactory extends FeatureFactory {
mAdvancedVpnFeatureProvider = mock(AdvancedVpnFeatureProvider.class);
mWifiFeatureProvider = mock(WifiFeatureProvider.class);
mKeyboardSettingsFeatureProvider = mock(KeyboardSettingsFeatureProvider.class);
mBatteryInfoFeatureProvider = mock(BatteryInfoFeatureProvider.class);
}
@Override
@@ -293,9 +290,4 @@ public class FakeFeatureFactory extends FeatureFactory {
public KeyboardSettingsFeatureProvider getKeyboardSettingsFeatureProvider() {
return mKeyboardSettingsFeatureProvider;
}
@Override
public BatteryInfoFeatureProvider getBatteryInfoFeatureProvider() {
return mBatteryInfoFeatureProvider;
}
}