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

Update Dark theme slice for new behavior

Browse Source 
- Add an broadcast receiver to monitor the Home key.
- Add the sClickedInSlice flag to verify Dark theme is changed by slice or not.

Bug: 142476879
Fixes: 146149658
Fixes: 146652692
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.homepage
Change-Id: I174d0c861ea3b3f793201e3b2e0ff65a1e690f4e
This commit is contained in:
Sunny Shao
2019-12-17 22:04:58 +08:00
parent 4873d0e894
commit 31c5f39d57
2 changed files with 113 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
tests/robotests/src/com/android/settings/homepage/contextualcards/slices/DarkThemeSliceTest.java
View File

@@ -16,6 +16,9 @@
package com.android.settings.homepage.contextualcards.slices;
import static android.content.res.Configuration.UI_MODE_NIGHT_NO;
import static android.content.res.Configuration.UI_MODE_NIGHT_YES;
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.Mockito.doReturn;
@@ -68,7 +71,7 @@ public class DarkThemeSliceTest {
// Set-up specs for SliceMetadata.
SliceProvider.setSpecs(SliceLiveData.SUPPORTED_SPECS);
mDarkThemeSlice = spy(new DarkThemeSlice(mContext));
mDarkThemeSlice = new DarkThemeSlice(mContext);
mDarkThemeSlice.sKeepSliceShow = false;
}
@@ -81,7 +84,7 @@ public class DarkThemeSliceTest {
@Test
public void isAvailable_inDarkThemeMode_returnFalse() {
doReturn(true).when(mDarkThemeSlice).isDarkThemeMode(mContext);
mContext.getResources().getConfiguration().uiMode = UI_MODE_NIGHT_YES;
assertThat(mDarkThemeSlice.isAvailable(mContext)).isFalse();
}
@@ -111,7 +114,7 @@ public class DarkThemeSliceTest {
@Test
public void getSlice_notAvailable_returnErrorSlice() {
doReturn(true).when(mDarkThemeSlice).isDarkThemeMode(mContext);
mContext.getResources().getConfiguration().uiMode = UI_MODE_NIGHT_YES;
final Slice mediaSlice = mDarkThemeSlice.getSlice();
final SliceMetadata metadata = SliceMetadata.from(mContext, mediaSlice);
@@ -126,7 +129,7 @@ public class DarkThemeSliceTest {
mDarkThemeSlice.sActiveUiSession =
mFeatureFactory.slicesFeatureProvider.getUiSessionToken() + 1;
doReturn(true).when(mDarkThemeSlice).isDarkThemeMode(mContext);
mContext.getResources().getConfiguration().uiMode = UI_MODE_NIGHT_YES;
final Slice mediaSlice = mDarkThemeSlice.getSlice();
final SliceMetadata metadata = SliceMetadata.from(mContext, mediaSlice);
@@ -143,6 +146,26 @@ public class DarkThemeSliceTest {
assertThat(mDarkThemeSlice.getSlice()).isNotNull();
}
@Test
public void getSlice_sliceNotClicked_notAvailable_returnErrorSlice() {
mDarkThemeSlice.sSliceClicked = false;
mContext.getResources().getConfiguration().uiMode = UI_MODE_NIGHT_YES;
final Slice mediaSlice = mDarkThemeSlice.getSlice();
final SliceMetadata metadata = SliceMetadata.from(mContext, mediaSlice);
assertThat(metadata.isErrorSlice()).isTrue();
}
@Test
public void getSlice_sliceClicked_isAvailable_returnSlice() {
mDarkThemeSlice.sSliceClicked = true;
setBatteryCapacityLevel(40);
assertThat(mDarkThemeSlice.getSlice()).isNotNull();
}
@Test
public void getSlice_isAvailable_returnSlice() {
setBatteryCapacityLevel(40);
@@ -163,7 +186,7 @@ public class DarkThemeSliceTest {
}
private void setBatteryCapacityLevel(int power_level) {
doReturn(false).when(mDarkThemeSlice).isDarkThemeMode(mContext);
mContext.getResources().getConfiguration().uiMode = UI_MODE_NIGHT_NO;
doReturn(mBatteryManager).when(mContext).getSystemService(BatteryManager.class);
when(mBatteryManager.getIntProperty(BatteryManager.BATTERY_PROPERTY_CAPACITY))
.thenReturn(power_level);