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

Add power consumption footer in screen timeout page.

Browse Source 
- show this footer when there's no footer about work profile
Screenshots:
[without work profile]: https://screenshot.googleplex.com/5pAD2xBvP6QSBvY
[with work profile]:  https://screenshot.googleplex.com/7BRd6ToAjFN9QZx

Bug: 300245790
Test: manual
Test: make RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings.display.ScreenTimeoutSettingsTest"
Change-Id: I6df018d7758fbec3277179358b17eb11fa1aee34
This commit is contained in:
mxyyiyi
2023-11-24 15:08:43 +08:00
parent 6ab64aa71f
commit 027db802fe
3 changed files with 41 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
tests/robotests/src/com/android/settings/display/ScreenTimeoutSettingsTest.java
View File

@@ -92,6 +92,9 @@ public class ScreenTimeoutSettingsTest {
@Mock
FooterPreference mDisableOptionsPreference;
@Mock
FooterPreference mPowerConsumptionPreference;
@Mock
private PackageManager mPackageManager;
@@ -182,11 +185,28 @@ public class ScreenTimeoutSettingsTest {
public void updateCandidates_enforcedAdmin_showDisabledByAdminPreference() {
mSettings.mAdmin = new RestrictedLockUtils.EnforcedAdmin();
mSettings.mDisableOptionsPreference = mDisableOptionsPreference;
mSettings.mPowerConsumptionPreference = mPowerConsumptionPreference;
doNothing().when(mSettings).setupDisabledFooterPreference();
doNothing().when(mSettings).setupPowerConsumptionFooterPreference();
mSettings.updateCandidates();
verify(mPreferenceScreen, atLeast(1)).addPreference(mDisableOptionsPreference);
verify(mPreferenceScreen, never()).addPreference(mPowerConsumptionPreference);
}
@Test
public void updateCandidates_withoutAdmin_showPowerConsumptionPreference() {
mSettings.mAdmin = null;
mSettings.mDisableOptionsPreference = mDisableOptionsPreference;
mSettings.mPowerConsumptionPreference = mPowerConsumptionPreference;
doNothing().when(mSettings).setupDisabledFooterPreference();
doNothing().when(mSettings).setupPowerConsumptionFooterPreference();
mSettings.updateCandidates();
verify(mPreferenceScreen, never()).addPreference(mDisableOptionsPreference);
verify(mPreferenceScreen, atLeast(1)).addPreference(mPowerConsumptionPreference);
}
@Test