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

Clean up AwareFeatureProvider from Settings

Browse Source 
Bug: 287566056
Test: m Settings
Change-Id: I7f7f57809c55bf8824b427f0d4a232cacdbe88a7
This commit is contained in:
Chaohui Wang
2023-06-19 22:58:18 +08:00
parent 5464140360
commit 2e4141e4ab
15 changed files with 5 additions and 259 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
tests/robotests/src/com/android/settings/display/AlwaysOnDisplaySliceTest.java
View File

@@ -37,9 +37,7 @@ import androidx.slice.SliceProvider;
import androidx.slice.widget.SliceLiveData;
import com.android.settings.R;
import com.android.settings.aware.AwareFeatureProvider;
import com.android.settings.slices.CustomSliceRegistry;
import com.android.settings.testutils.FakeFeatureFactory;
import org.junit.Before;
import org.junit.Test;
@@ -55,8 +53,6 @@ public class AlwaysOnDisplaySliceTest {
private Context mContext;
private AlwaysOnDisplaySlice mSlice;
private FakeFeatureFactory mFeatureFactory;
private AwareFeatureProvider mFeatureProvider;
@Mock
private AmbientDisplayConfiguration mConfig;
@@ -65,8 +61,6 @@ public class AlwaysOnDisplaySliceTest {
public void setUp() {
MockitoAnnotations.initMocks(this);
mContext = RuntimeEnvironment.application;
mFeatureFactory = FakeFeatureFactory.setupForTest();
mFeatureProvider = mFeatureFactory.getAwareFeatureProvider();
// Set-up specs for SliceMetadata.
SliceProvider.setSpecs(SliceLiveData.SUPPORTED_SPECS);
@@ -116,11 +110,9 @@ public class AlwaysOnDisplaySliceTest {
}
@Test
public void onNotifyChange_toggleOn_awareNotSupported_enableAoD() {
public void onNotifyChange_toggleOn_enableAoD() {
final Intent intent = new Intent();
intent.putExtra(android.app.slice.Slice.EXTRA_TOGGLE_STATE, true);
when(mFeatureProvider.isEnabled(mContext)).thenReturn(false);
when(mFeatureProvider.isSupported(mContext)).thenReturn(false);
mSlice.onNotifyChange(intent);
@@ -128,32 +120,4 @@ public class AlwaysOnDisplaySliceTest {
assertThat(Settings.Secure.getInt(resolver, DOZE_ALWAYS_ON, 0)).isEqualTo(1);
assertThat(Settings.Secure.getInt(resolver, DOZE_WAKE_DISPLAY_GESTURE, 0)).isEqualTo(0);
}
@Test
public void onNotifyChange_toggleOn_awareDisabled_enableAoD() {
final Intent intent = new Intent();
intent.putExtra(android.app.slice.Slice.EXTRA_TOGGLE_STATE, true);
when(mFeatureProvider.isEnabled(mContext)).thenReturn(false);
when(mFeatureProvider.isSupported(mContext)).thenReturn(true);
mSlice.onNotifyChange(intent);
final ContentResolver resolver = mContext.getContentResolver();
assertThat(Settings.Secure.getInt(resolver, DOZE_ALWAYS_ON, 0)).isEqualTo(1);
assertThat(Settings.Secure.getInt(resolver, DOZE_WAKE_DISPLAY_GESTURE, 0)).isEqualTo(0);
}
@Test
public void onNotifyChange_toggleOn_awareSupported_enableAoD() {
final Intent intent = new Intent();
intent.putExtra(android.app.slice.Slice.EXTRA_TOGGLE_STATE, true);
when(mFeatureProvider.isEnabled(mContext)).thenReturn(true);
when(mFeatureProvider.isSupported(mContext)).thenReturn(true);
mSlice.onNotifyChange(intent);
final ContentResolver resolver = mContext.getContentResolver();
assertThat(Settings.Secure.getInt(resolver, DOZE_ALWAYS_ON, 0)).isEqualTo(1);
assertThat(Settings.Secure.getInt(resolver, DOZE_WAKE_DISPLAY_GESTURE, 0)).isEqualTo(1);
}
}