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

Merge "Refactor battery related feature provider" into udc-qpr-dev

Browse Source
This commit is contained in:
Yi-Ling Chuang
2023-05-24 06:55:17 +00:00
committed by Android (Google) Code Review
parent c34cee7c73 ee97eaf2d9
commit 75af9aa3f5
17 changed files with 132 additions and 202 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
res/values/strings.xml
View File

@@ -2724,6 +2724,8 @@
<string name="battery_first_use_date">Date of first use</string>
<!-- About phone, status item title. Count of battery full charge/discharge cycles [CHAR LIMIT=60]-->
<string name="battery_cycle_count">Cycle count</string>
<!-- About phone, status item title. The status summary for cycle count that's not available. [CHAR LIMIT=40] -->
<string name="battery_cycle_count_not_available">Unavailable</string>
<!-- SD card & phone storage settings summary. Displayed when the total memory usage is being calculated. Will be replaced with a number like "12.3 GB" when finished calucating. [CHAR LIMIT=30] -->
<string name="memory_calculating_size">Calculating\u2026</string>

12
src/com/android/settings/deviceinfo/batteryinfo/BatteryCycleCountPreferenceController.java
View File

@@ -18,10 +18,11 @@ package com.android.settings.deviceinfo.batteryinfo;
import android.content.Context;
import android.content.Intent;
import android.content.IntentFilter;
import android.os.BatteryManager;
import com.android.settings.R;
import com.android.settings.core.BasePreferenceController;
import com.android.settingslib.fuelgauge.BatteryUtils;
/**
* A controller that manages the information about battery cycle count.
@@ -40,10 +41,11 @@ public class BatteryCycleCountPreferenceController extends BasePreferenceControl
@Override
public CharSequence getSummary() {
final IntentFilter intentFilter = new IntentFilter(Intent.ACTION_BATTERY_CHANGED);
final Intent batteryStatus = mContext.registerReceiver(null, intentFilter);
final int cycleCount = batteryStatus.getIntExtra(BatteryManager.EXTRA_CYCLE_COUNT, -1);
final Intent batteryIntent = BatteryUtils.getBatteryIntent(mContext);
final int cycleCount = batteryIntent.getIntExtra(BatteryManager.EXTRA_CYCLE_COUNT, -1);
return Integer.toString(cycleCount);
return cycleCount == -1
? mContext.getText(R.string.battery_cycle_count_not_available)
: Integer.toString(cycleCount);
}
}

11
src/com/android/settings/deviceinfo/batteryinfo/BatteryFirstUseDatePreferenceController.java
View File

@@ -19,6 +19,7 @@ package com.android.settings.deviceinfo.batteryinfo;
import android.content.Context;
import com.android.settings.core.BasePreferenceController;
import com.android.settings.fuelgauge.BatterySettingsFeatureProvider;
import com.android.settings.overlay.FeatureFactory;
/**
@@ -26,22 +27,22 @@ import com.android.settings.overlay.FeatureFactory;
*/
public class BatteryFirstUseDatePreferenceController extends BasePreferenceController {
private BatteryInfoFeatureProvider mBatteryInfoFeatureProvider;
private BatterySettingsFeatureProvider mBatterySettingsFeatureProvider;
public BatteryFirstUseDatePreferenceController(Context context, String preferenceKey) {
super(context, preferenceKey);
mBatteryInfoFeatureProvider = FeatureFactory.getFactory(
context).getBatteryInfoFeatureProvider();
mBatterySettingsFeatureProvider = FeatureFactory.getFactory(
context).getBatterySettingsFeatureProvider(context);
}
@Override
public int getAvailabilityStatus() {
return mBatteryInfoFeatureProvider.isFirstUseDateAvailable()
return mBatterySettingsFeatureProvider.isFirstUseDateAvailable()
? AVAILABLE : CONDITIONALLY_UNAVAILABLE;
}
@Override
public CharSequence getSummary() {
return mBatteryInfoFeatureProvider.getFirstUseDateSummary();
return mBatterySettingsFeatureProvider.getFirstUseDateSummary();
}
}

35
src/com/android/settings/deviceinfo/batteryinfo/BatteryInfoFeatureProvider.java
View File

@@ -1,35 +0,0 @@
/*
* Copyright (C) 2023 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.android.settings.deviceinfo.batteryinfo;
/**
* Feature Provider used for getting battery information.
*/
public interface BatteryInfoFeatureProvider {
/** Returns true if Manufacture date should be shown */
boolean isManufactureDateAvailable();
/** Returns true if First use date should be shown */
boolean isFirstUseDateAvailable();
/** Returns the summary of battery manufacture date */
CharSequence getManufactureDateSummary();
/** Returns the summary of battery first use date */
CharSequence getFirstUseDateSummary();
}

91
src/com/android/settings/deviceinfo/batteryinfo/BatteryInfoFeatureProviderImpl.java
View File

@@ -1,91 +0,0 @@
/*
* Copyright (C) 2023 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.android.settings.deviceinfo.batteryinfo;
import android.content.Context;
import android.os.BatteryManager;
import java.text.DateFormat;
import java.util.Date;
/** Implementation of {@code BatteryInfoFeatureProvider} */
public class BatteryInfoFeatureProviderImpl implements BatteryInfoFeatureProvider {
private BatteryManager mBatteryManager;
private Context mContext;
private long mManufactureDateInSec;
private long mFirstUseDateInSec;
public BatteryInfoFeatureProviderImpl(Context context) {
mContext = context;
mBatteryManager = mContext.getSystemService(BatteryManager.class);
}
@Override
public boolean isManufactureDateAvailable() {
return false;
}
@Override
public boolean isFirstUseDateAvailable() {
return false;
}
@Override
public CharSequence getManufactureDateSummary() {
if (!isManufactureDateAvailable()) {
return null;
}
final long manufactureDateInSec = getManufactureDate();
return getFormattedDate(manufactureDateInSec * 1000L);
}
@Override
public CharSequence getFirstUseDateSummary() {
if (!isFirstUseDateAvailable()) {
return null;
}
final long firstUseDateInSec = getFirstUseDate();
return getFormattedDate(firstUseDateInSec * 1000L);
}
protected long getManufactureDate() {
if (mManufactureDateInSec == 0L) {
mManufactureDateInSec = mBatteryManager.getLongProperty(
BatteryManager.BATTERY_PROPERTY_MANUFACTURING_DATE);
}
return mManufactureDateInSec;
}
protected long getFirstUseDate() {
if (mFirstUseDateInSec == 0L) {
mFirstUseDateInSec = mBatteryManager.getLongProperty(
BatteryManager.BATTERY_PROPERTY_FIRST_USAGE_DATE);
}
return mFirstUseDateInSec;
}
private CharSequence getFormattedDate(long dateInMs) {
final Date date = new Date(dateInMs);
final CharSequence formattedDate =
DateFormat.getDateInstance(DateFormat.LONG).format(date.getTime());
return formattedDate;
}
}

11
src/com/android/settings/deviceinfo/batteryinfo/BatteryManufactureDatePreferenceController.java
View File

@@ -19,6 +19,7 @@ package com.android.settings.deviceinfo.batteryinfo;
import android.content.Context;
import com.android.settings.core.BasePreferenceController;
import com.android.settings.fuelgauge.BatterySettingsFeatureProvider;
import com.android.settings.overlay.FeatureFactory;
/**
@@ -26,22 +27,22 @@ import com.android.settings.overlay.FeatureFactory;
*/
public class BatteryManufactureDatePreferenceController extends BasePreferenceController {
private BatteryInfoFeatureProvider mBatteryInfoFeatureProvider;
private BatterySettingsFeatureProvider mBatterySettingsFeatureProvider;
public BatteryManufactureDatePreferenceController(Context context, String preferenceKey) {
super(context, preferenceKey);
mBatteryInfoFeatureProvider = FeatureFactory.getFactory(
context).getBatteryInfoFeatureProvider();
mBatterySettingsFeatureProvider = FeatureFactory.getFactory(
context).getBatterySettingsFeatureProvider(context);
}
@Override
public int getAvailabilityStatus() {
return mBatteryInfoFeatureProvider.isManufactureDateAvailable()
return mBatterySettingsFeatureProvider.isManufactureDateAvailable()
? AVAILABLE : CONDITIONALLY_UNAVAILABLE;
}
@Override
public CharSequence getSummary() {
return mBatteryInfoFeatureProvider.getManufactureDateSummary();
return mBatterySettingsFeatureProvider.getManufactureDateSummary();
}
}

14
src/com/android/settings/fuelgauge/BatterySettingsFeatureProvider.java
View File

@@ -16,9 +16,19 @@
package com.android.settings.fuelgauge;
import android.content.ComponentName;
/** Feature provider for battery settings usage. */
public interface BatterySettingsFeatureProvider {
/** Returns true if manufacture date should be shown */
boolean isManufactureDateAvailable();
/** Returns true if first use date should be shown */
boolean isFirstUseDateAvailable();
/** Returns the summary of battery manufacture date */
CharSequence getManufactureDateSummary();
/** Returns the summary of battery first use date */
CharSequence getFirstUseDateSummary();
}

63
src/com/android/settings/fuelgauge/BatterySettingsFeatureProviderImpl.java
View File

@@ -17,13 +17,76 @@
package com.android.settings.fuelgauge;
import android.content.Context;
import android.os.BatteryManager;
import java.time.Instant;
import java.time.ZoneId;
import java.time.format.DateTimeFormatter;
import java.time.format.FormatStyle;
import java.util.concurrent.TimeUnit;
/** Feature provider implementation for battery settings usage. */
public class BatterySettingsFeatureProviderImpl implements BatterySettingsFeatureProvider {
protected Context mContext;
private BatteryManager mBatteryManager;
private long mManufactureDateInMs;
private long mFirstUseDateInMs;
public BatterySettingsFeatureProviderImpl(Context context) {
mContext = context.getApplicationContext();
mBatteryManager = mContext.getSystemService(BatteryManager.class);
}
@Override
public boolean isManufactureDateAvailable() {
return false;
}
@Override
public boolean isFirstUseDateAvailable() {
return false;
}
@Override
public CharSequence getManufactureDateSummary() {
return isManufactureDateAvailable()
? getFormattedDate(getManufactureDate())
: null;
}
@Override
public CharSequence getFirstUseDateSummary() {
return isFirstUseDateAvailable()
? getFormattedDate(getFirstUseDate())
: null;
}
protected long getManufactureDate() {
if (mManufactureDateInMs == 0L) {
final long manufactureDateInSec = mBatteryManager.getLongProperty(
BatteryManager.BATTERY_PROPERTY_MANUFACTURING_DATE);
mManufactureDateInMs = TimeUnit.MILLISECONDS.convert(manufactureDateInSec,
TimeUnit.SECONDS);
}
return mManufactureDateInMs;
}
protected long getFirstUseDate() {
if (mFirstUseDateInMs == 0L) {
final long firstUseDateInSec = mBatteryManager.getLongProperty(
BatteryManager.BATTERY_PROPERTY_FIRST_USAGE_DATE);
mFirstUseDateInMs = TimeUnit.MILLISECONDS.convert(firstUseDateInSec, TimeUnit.SECONDS);
}
return mFirstUseDateInMs;
}
private CharSequence getFormattedDate(long dateInMs) {
final Instant instant = Instant.ofEpochMilli(dateInMs);
final String localDate = instant.atZone(ZoneId.systemDefault()).toLocalDate().format(
DateTimeFormatter.ofLocalizedDate(FormatStyle.LONG));
return localDate;
}
}

6
src/com/android/settings/overlay/FeatureFactory.java
View File

@@ -33,7 +33,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;
@@ -205,11 +204,6 @@ public abstract class FeatureFactory {
*/
public abstract KeyboardSettingsFeatureProvider getKeyboardSettingsFeatureProvider();
/**
* Retrieves implementation for Battery information feature.
*/
public abstract BatteryInfoFeatureProvider getBatteryInfoFeatureProvider();
public static final class FactoryNotFoundException extends RuntimeException {
public FactoryNotFoundException(Throwable throwable) {
super("Unable to create factory. Did you misconfigure Proguard?", throwable);

11
src/com/android/settings/overlay/FeatureFactoryImpl.java
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;
}
}

11
tests/robotests/src/com/android/settings/deviceinfo/batteryinfo/BatteryCycleCountPreferenceControllerTest.java
View File

@@ -32,6 +32,8 @@ import android.os.BatteryManager;
import androidx.test.core.app.ApplicationProvider;
import com.android.settings.R;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -62,4 +64,13 @@ public class BatteryCycleCountPreferenceControllerTest {
assertThat(mController.getSummary()).isEqualTo("10");
}
@Test
public void getSummary_noValue_returnUnavailable() {
final Intent batteryIntent = new Intent();
doReturn(batteryIntent).when(mContext).registerReceiver(any(), any());
assertThat(mController.getSummary()).isEqualTo(
mContext.getText(R.string.battery_cycle_count_not_available));
}
}

4
tests/robotests/src/com/android/settings/deviceinfo/batteryinfo/BatteryFirstUseDatePreferenceControllerTest.java
View File

@@ -50,14 +50,14 @@ public class BatteryFirstUseDatePreferenceControllerTest {
@Test
public void getAvailabilityStatus_dateAvailable_returnAvailable() {
when(mFactory.mBatteryInfoFeatureProvider.isFirstUseDateAvailable()).thenReturn(true);
when(mFactory.batterySettingsFeatureProvider.isFirstUseDateAvailable()).thenReturn(true);
assertThat(mController.getAvailabilityStatus()).isEqualTo(AVAILABLE);
}
@Test
public void getAvailabilityStatus_dateUnavailable_returnNotAvailable() {
when(mFactory.mBatteryInfoFeatureProvider.isFirstUseDateAvailable()).thenReturn(false);
when(mFactory.batterySettingsFeatureProvider.isFirstUseDateAvailable()).thenReturn(false);
assertThat(mController.getAvailabilityStatus()).isEqualTo(CONDITIONALLY_UNAVAILABLE);
}

5
tests/robotests/src/com/android/settings/deviceinfo/batteryinfo/BatteryManufactureDatePreferenceControllerTest.java
View File

@@ -51,14 +51,15 @@ public class BatteryManufactureDatePreferenceControllerTest {
@Test
public void getAvailabilityStatus_dateAvailable_returnAvailable() {
when(mFactory.mBatteryInfoFeatureProvider.isManufactureDateAvailable()).thenReturn(true);
when(mFactory.batterySettingsFeatureProvider.isManufactureDateAvailable()).thenReturn(true);
assertThat(mController.getAvailabilityStatus()).isEqualTo(AVAILABLE);
}
@Test
public void getAvailabilityStatus_dateUnavailable_returnNotAvailable() {
when(mFactory.mBatteryInfoFeatureProvider.isManufactureDateAvailable()).thenReturn(false);
when(mFactory.batterySettingsFeatureProvider.isManufactureDateAvailable())
.thenReturn(false);
assertThat(mController.getAvailabilityStatus()).isEqualTo(CONDITIONALLY_UNAVAILABLE);
}

37
tests/robotests/src/com/android/settings/deviceinfo/batteryinfo/BatteryInfoFeatureProviderImplTest.java → tests/robotests/src/com/android/settings/fuelgauge/BatterySettingsFeatureProviderImplTest.java
View File

@@ -14,39 +14,42 @@
* limitations under the License.
*/
package com.android.settings.deviceinfo.batteryinfo;
package com.android.settings.fuelgauge;
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.when;
import static org.robolectric.Shadows.shadowOf;
import android.content.Context;
import android.os.BatteryManager;
import androidx.test.core.app.ApplicationProvider;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RobolectricTestRunner;
import org.robolectric.annotation.Config;
import org.robolectric.shadows.ShadowBatteryManager;
@RunWith(RobolectricTestRunner.class)
public class BatteryInfoFeatureProviderImplTest {
@Mock
@Config(shadows = {ShadowBatteryManager.class})
public class BatterySettingsFeatureProviderImplTest {
private BatteryManager mBatteryManager;
private ShadowBatteryManager mShadowBatteryManager;
private Context mContext;
private BatteryInfoFeatureProviderImpl mImpl;
private BatterySettingsFeatureProviderImpl mImpl;
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
mContext = spy(org.robolectric.RuntimeEnvironment.application);
doReturn(mBatteryManager).when(mContext).getSystemService(BatteryManager.class);
mImpl = spy(new BatteryInfoFeatureProviderImpl(mContext));
mContext = spy(ApplicationProvider.getApplicationContext());
mBatteryManager = mContext.getSystemService(BatteryManager.class);
mShadowBatteryManager = shadowOf(mBatteryManager);
mImpl = spy(new BatterySettingsFeatureProviderImpl(mContext));
}
@Test
@@ -62,12 +65,12 @@ public class BatteryInfoFeatureProviderImplTest {
@Test
public void getManufactureDateSummary_available_returnExpectedDate() {
doReturn(true).when(mImpl).isManufactureDateAvailable();
when(mBatteryManager.getLongProperty(BatteryManager.BATTERY_PROPERTY_MANUFACTURING_DATE))
.thenReturn(1669680000L);
mShadowBatteryManager.setLongProperty(BatteryManager.BATTERY_PROPERTY_MANUFACTURING_DATE,
1669680000L);
final CharSequence result = mImpl.getManufactureDateSummary();
assertThat(result).isEqualTo("November 29, 2022");
assertThat(result.toString()).isEqualTo("November 29, 2022");
}
@Test
@@ -80,12 +83,12 @@ public class BatteryInfoFeatureProviderImplTest {
@Test
public void getFirstUseDateSummary_available_returnExpectedDate() {
doReturn(true).when(mImpl).isFirstUseDateAvailable();
when(mBatteryManager.getLongProperty(BatteryManager.BATTERY_PROPERTY_FIRST_USAGE_DATE))
.thenReturn(1669680000L);
mShadowBatteryManager.setLongProperty(BatteryManager.BATTERY_PROPERTY_FIRST_USAGE_DATE,
1669680000L);
final CharSequence result = mImpl.getFirstUseDateSummary();
assertThat(result).isEqualTo("November 29, 2022");
assertThat(result.toString()).isEqualTo("November 29, 2022");
}
@Test

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

@@ -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;
}
}

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

@@ -27,7 +27,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
@@ -188,8 +187,4 @@ class FakeFeatureFactory : FeatureFactory() {
override fun getKeyboardSettingsFeatureProvider(): KeyboardSettingsFeatureProvider {
TODO("Not yet implemented")
}
override fun getBatteryInfoFeatureProvider(): BatteryInfoFeatureProvider {
TODO("Not yet implemented")
}
}

8
tests/unit/src/com/android/settings/testutils/FakeFeatureFactory.java
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;
}
}