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:
@@ -31,7 +31,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;
|
||||
@@ -83,7 +82,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;
|
||||
@@ -150,7 +148,6 @@ public class FakeFeatureFactory extends FeatureFactory {
|
||||
mAdvancedVpnFeatureProvider = mock(AdvancedVpnFeatureProvider.class);
|
||||
mWifiFeatureProvider = mock(WifiFeatureProvider.class);
|
||||
mKeyboardSettingsFeatureProvider = mock(KeyboardSettingsFeatureProvider.class);
|
||||
mBatteryInfoFeatureProvider = mock(BatteryInfoFeatureProvider.class);
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -307,9 +304,4 @@ public class FakeFeatureFactory extends FeatureFactory {
|
||||
public KeyboardSettingsFeatureProvider getKeyboardSettingsFeatureProvider() {
|
||||
return mKeyboardSettingsFeatureProvider;
|
||||
}
|
||||
|
||||
@Override
|
||||
public BatteryInfoFeatureProvider getBatteryInfoFeatureProvider() {
|
||||
return mBatteryInfoFeatureProvider;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user