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

Config notifs page updates

Browse Source 
- Remove unused settings
- Regroup and combine lockscreen settings. The original
lockscreen controller is used in other places (SUW and privacy)
and so it's left untouched for those uses for now.

Test: atest
Bug: 132971502
Change-Id: Ic82817ff98cab27ca35b9488ae2e0eb6922a18e8
This commit is contained in:
Julia Reynolds
2019-05-21 10:21:21 -04:00
parent 6cb224b38b
commit 4fe79c266e
9 changed files with 895 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
tests/robotests/src/com/android/settings/notification/ConfigureNotificationSettingsTest.java
View File

@@ -16,14 +16,7 @@
package com.android.settings.notification;
import static com.android.settings.notification.ConfigureNotificationSettings.KEY_LOCKSCREEN;
import static com.android.settings.notification.ConfigureNotificationSettings
.KEY_LOCKSCREEN_WORK_PROFILE;
import static com.android.settings.notification.ConfigureNotificationSettings
.KEY_LOCKSCREEN_WORK_PROFILE_HEADER;
import static com.android.settings.notification.ConfigureNotificationSettings.KEY_SWIPE_DOWN;
import static com.android.settings.notification.ConfigureNotificationSettings
.SUMMARY_PROVIDER_FACTORY;
import static com.android.settings.notification.ConfigureNotificationSettings.SUMMARY_PROVIDER_FACTORY;
import static com.google.common.truth.Truth.assertThat;
@@ -37,8 +30,6 @@ import android.app.Activity;
import com.android.settings.dashboard.SummaryLoader;
import com.android.settings.notification.ConfigureNotificationSettings.SummaryProvider;
import com.android.settings.testutils.shadow.ShadowLockPatternUtils;
import com.android.settings.testutils.shadow.ShadowUtils;
import org.junit.Before;
import org.junit.Test;
@@ -46,10 +37,6 @@ import org.junit.runner.RunWith;
import org.mockito.ArgumentCaptor;
import org.robolectric.Robolectric;
import org.robolectric.RobolectricTestRunner;
import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config;
import java.util.List;
@RunWith(RobolectricTestRunner.class)
public class ConfigureNotificationSettingsTest {
@@ -61,20 +48,6 @@ public class ConfigureNotificationSettingsTest {
mActivity = spy(Robolectric.buildActivity(Activity.class).get());
}
@Test
@Config(shadows = {
ShadowUtils.class,
ShadowLockPatternUtils.class
})
public void getNonIndexableKeys_shouldContainLockScreenPrefs() {
final List<String> keys = ConfigureNotificationSettings.SEARCH_INDEX_DATA_PROVIDER
.getNonIndexableKeys(RuntimeEnvironment.application);
assertThat(keys).containsAllOf(
KEY_SWIPE_DOWN, KEY_LOCKSCREEN, KEY_LOCKSCREEN_WORK_PROFILE,
KEY_LOCKSCREEN_WORK_PROFILE_HEADER);
}
@Test
public void getSummary_noneBlocked() {
SummaryLoader loader = mock(SummaryLoader.class);