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

Merge "Reorganize notification Settings classes"

Browse Source
This commit is contained in:
TreeHugger Robot
2019-12-02 13:54:05 +00:00
committed by Android (Google) Code Review
parent 79efb45f0f aceccce75c
commit 7e117fba33
201 changed files with 402 additions and 388 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
tests/robotests/assets/grandfather_not_implementing_index_provider
View File

@@ -60,18 +60,18 @@ com.android.settings.location.LocationWorkProfileSettings
com.android.settings.network.ApnEditor
com.android.settings.network.ApnSettings
com.android.settings.network.telephony.NetworkSelectSettings
com.android.settings.notification.AppNotificationSettings
com.android.settings.notification.ChannelNotificationSettings
com.android.settings.notification.NotificationStation
com.android.settings.notification.app.AppNotificationSettings
com.android.settings.notification.app.ChannelNotificationSettings
com.android.settings.notification.history.NotificationStation
com.android.settings.notification.RedactionInterstitial$RedactionInterstitialFragment
com.android.settings.notification.ZenModeEventRuleSettings
com.android.settings.notification.ZenModeScheduleRuleSettings
com.android.settings.notification.ZenCustomRuleNotificationsSettings
com.android.settings.notification.ZenCustomRuleCallsSettings
com.android.settings.notification.ZenCustomRuleConfigSettings
com.android.settings.notification.ZenCustomRuleSettings
com.android.settings.notification.ZenCustomRuleBlockedEffectsSettings
com.android.settings.notification.ZenCustomRuleMessagesSettings
com.android.settings.notification.zen.ZenModeEventRuleSettings
com.android.settings.notification.zen.ZenModeScheduleRuleSettings
com.android.settings.notification.zen.ZenCustomRuleNotificationsSettings
com.android.settings.notification.zen.ZenCustomRuleCallsSettings
com.android.settings.notification.zen.ZenCustomRuleConfigSettings
com.android.settings.notification.zen.ZenCustomRuleSettings
com.android.settings.notification.zen.ZenCustomRuleBlockedEffectsSettings
com.android.settings.notification.zen.ZenCustomRuleMessagesSettings
com.android.settings.password.ChooseLockGeneric$ChooseLockGenericFragment
com.android.settings.password.SetupChooseLockGeneric$InternalActivity$InternalSetupChooseLockGenericFragment
com.android.settings.password.SetupChooseLockGeneric$SetupChooseLockGenericFragment

2
tests/robotests/src/com/android/settings/applications/appinfo/AppInfoPreferenceControllerBaseTest.java
View File

@@ -35,7 +35,7 @@ import androidx.preference.PreferenceScreen;
import com.android.settings.SettingsActivity;
import com.android.settings.SettingsPreferenceFragment;
import com.android.settings.core.BasePreferenceController;
import com.android.settings.notification.AppNotificationSettings;
import com.android.settings.notification.app.AppNotificationSettings;
import com.android.settingslib.applications.ApplicationsState;
import org.junit.Before;

2
tests/robotests/src/com/android/settings/applications/appinfo/AppNotificationPreferenceControllerTest.java
View File

@@ -35,7 +35,7 @@ import androidx.fragment.app.FragmentActivity;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
import com.android.settings.notification.AppNotificationSettings;
import com.android.settings.notification.app.AppNotificationSettings;
import com.android.settings.notification.NotificationBackend;
import com.android.settingslib.applications.ApplicationsState;

3
tests/robotests/src/com/android/settings/notification/AllowSoundPreferenceControllerTest.java → tests/robotests/src/com/android/settings/notification/app/AllowSoundPreferenceControllerTest.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package com.android.settings.notification;
package com.android.settings.notification.app;
import static android.app.NotificationChannel.DEFAULT_CHANNEL_ID;
import static android.app.NotificationManager.IMPORTANCE_HIGH;
@@ -40,6 +40,7 @@ import android.os.UserManager;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
import com.android.settings.notification.NotificationBackend;
import com.android.settingslib.RestrictedLockUtils;
import com.android.settingslib.RestrictedSwitchPreference;

5
tests/robotests/src/com/android/settings/notification/AppLinkPreferenceControllerTest.java → tests/robotests/src/com/android/settings/notification/app/AppLinkPreferenceControllerTest.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package com.android.settings.notification;
package com.android.settings.notification.app;
import static android.app.NotificationChannel.DEFAULT_CHANNEL_ID;
import static android.app.NotificationManager.IMPORTANCE_LOW;
@@ -35,6 +35,9 @@ import android.os.UserManager;
import androidx.preference.Preference;
import com.android.settings.notification.NotificationBackend;
import com.android.settings.notification.app.AppLinkPreferenceController;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;

4
tests/robotests/src/com/android/settings/notification/BadgePreferenceControllerTest.java → tests/robotests/src/com/android/settings/notification/app/BadgePreferenceControllerTest.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package com.android.settings.notification;
package com.android.settings.notification.app;
import static android.app.NotificationChannel.DEFAULT_CHANNEL_ID;
import static android.app.NotificationManager.IMPORTANCE_HIGH;
@@ -43,6 +43,8 @@ import android.provider.Settings;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
import com.android.settings.notification.NotificationBackend;
import com.android.settings.notification.app.BadgePreferenceController;
import com.android.settingslib.RestrictedLockUtils;
import com.android.settingslib.RestrictedSwitchPreference;

5
tests/robotests/src/com/android/settings/notification/BlockPreferenceControllerTest.java → tests/robotests/src/com/android/settings/notification/app/BlockPreferenceControllerTest.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package com.android.settings.notification;
package com.android.settings.notification.app;
import static android.app.NotificationChannel.DEFAULT_CHANNEL_ID;
import static android.app.NotificationManager.IMPORTANCE_DEFAULT;
@@ -44,6 +44,9 @@ import android.content.Context;
import android.os.UserManager;
import com.android.settings.R;
import com.android.settings.notification.NotificationBackend;
import com.android.settings.notification.app.BlockPreferenceController;
import com.android.settings.notification.app.NotificationSettings;
import com.android.settings.widget.SwitchBar;
import com.android.settingslib.widget.LayoutPreference;

8
tests/robotests/src/com/android/settings/notification/BubblePreferenceControllerTest.java → tests/robotests/src/com/android/settings/notification/app/BubblePreferenceControllerTest.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package com.android.settings.notification;
package com.android.settings.notification.app;
import static android.app.NotificationChannel.DEFAULT_CHANNEL_ID;
import static android.app.NotificationManager.IMPORTANCE_HIGH;
@@ -22,8 +22,8 @@ import static android.app.NotificationManager.IMPORTANCE_LOW;
import static android.app.NotificationManager.IMPORTANCE_NONE;
import static android.provider.Settings.Global.NOTIFICATION_BUBBLES;
import static com.android.settings.notification.BubblePreferenceController.SYSTEM_WIDE_OFF;
import static com.android.settings.notification.BubblePreferenceController.SYSTEM_WIDE_ON;
import static com.android.settings.notification.app.BubblePreferenceController.SYSTEM_WIDE_OFF;
import static com.android.settings.notification.app.BubblePreferenceController.SYSTEM_WIDE_ON;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
@@ -44,6 +44,8 @@ import android.content.Context;
import android.os.UserManager;
import android.provider.Settings;
import com.android.settings.notification.NotificationBackend;
import com.android.settings.notification.app.BubblePreferenceController;
import com.android.settingslib.RestrictedLockUtils;
import com.android.settingslib.RestrictedSwitchPreference;

18
tests/robotests/src/com/android/settings/notification/BubbleSummaryPreferenceControllerTest.java → tests/robotests/src/com/android/settings/notification/app/BubbleSummaryPreferenceControllerTest.java
View File

@@ -14,16 +14,14 @@
* limitations under the License.
*/
package com.android.settings.notification;
package com.android.settings.notification.app;
import static android.app.NotificationChannel.DEFAULT_CHANNEL_ID;
import static android.app.NotificationManager.IMPORTANCE_HIGH;
import static android.app.NotificationManager.IMPORTANCE_LOW;
import static android.app.NotificationManager.IMPORTANCE_NONE;
import static android.provider.Settings.Global.NOTIFICATION_BUBBLES;
import static com.android.settings.notification.BubbleSummaryPreferenceController.SYSTEM_WIDE_OFF;
import static com.android.settings.notification.BubbleSummaryPreferenceController.SYSTEM_WIDE_ON;
import static com.android.settings.notification.app.BubbleSummaryPreferenceController.SYSTEM_WIDE_OFF;
import static com.android.settings.notification.app.BubbleSummaryPreferenceController.SYSTEM_WIDE_ON;
import static junit.framework.TestCase.assertEquals;
@@ -31,27 +29,22 @@ import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyInt;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import android.app.NotificationChannel;
import android.app.NotificationManager;
import android.content.Context;
import android.os.UserManager;
import android.provider.Settings;
import com.android.settingslib.RestrictedLockUtils;
import com.android.settingslib.RestrictedSwitchPreference;
import com.android.settings.notification.NotificationBackend;
import com.android.settings.notification.app.BubbleSummaryPreferenceController;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Answers;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RobolectricTestRunner;
@@ -59,7 +52,6 @@ import org.robolectric.RuntimeEnvironment;
import org.robolectric.shadows.ShadowApplication;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
@RunWith(RobolectricTestRunner.class)
public class BubbleSummaryPreferenceControllerTest {

5
tests/robotests/src/com/android/settings/notification/DeletedChannelsPreferenceControllerTest.java → tests/robotests/src/com/android/settings/notification/app/DeletedChannelsPreferenceControllerTest.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package com.android.settings.notification;
package com.android.settings.notification.app;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
@@ -34,6 +34,9 @@ import android.os.UserManager;
import androidx.preference.Preference;
import com.android.settings.notification.NotificationBackend;
import com.android.settings.notification.app.DeletedChannelsPreferenceController;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;

5
tests/robotests/src/com/android/settings/notification/DescriptionPreferenceControllerTest.java → tests/robotests/src/com/android/settings/notification/app/DescriptionPreferenceControllerTest.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package com.android.settings.notification;
package com.android.settings.notification.app;
import static android.app.NotificationManager.IMPORTANCE_LOW;
import static android.app.NotificationManager.IMPORTANCE_NONE;
@@ -34,6 +34,9 @@ import android.os.UserManager;
import androidx.preference.Preference;
import com.android.settings.notification.NotificationBackend;
import com.android.settings.notification.app.DescriptionPreferenceController;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;

4
tests/robotests/src/com/android/settings/notification/DndPreferenceControllerTest.java → tests/robotests/src/com/android/settings/notification/app/DndPreferenceControllerTest.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package com.android.settings.notification;
package com.android.settings.notification.app;
import static android.app.NotificationChannel.DEFAULT_CHANNEL_ID;
import static android.app.NotificationManager.IMPORTANCE_HIGH;
@@ -40,6 +40,8 @@ import android.os.UserManager;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
import com.android.settings.notification.NotificationBackend;
import com.android.settings.notification.app.DndPreferenceController;
import com.android.settingslib.RestrictedLockUtils;
import com.android.settingslib.RestrictedSwitchPreference;

4
tests/robotests/src/com/android/settings/notification/HeaderPreferenceControllerTest.java → tests/robotests/src/com/android/settings/notification/app/HeaderPreferenceControllerTest.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package com.android.settings.notification;
package com.android.settings.notification.app;
import static android.app.NotificationManager.IMPORTANCE_NONE;
@@ -36,6 +36,8 @@ import android.view.View;
import androidx.fragment.app.FragmentActivity;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.notification.NotificationBackend;
import com.android.settings.notification.app.HeaderPreferenceController;
import com.android.settingslib.widget.LayoutPreference;
import org.junit.Before;

5
tests/robotests/src/com/android/settings/notification/HighImportancePreferenceControllerTest.java → tests/robotests/src/com/android/settings/notification/app/HighImportancePreferenceControllerTest.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package com.android.settings.notification;
package com.android.settings.notification.app;
import static android.app.NotificationChannel.DEFAULT_CHANNEL_ID;
import static android.app.NotificationManager.IMPORTANCE_DEFAULT;
@@ -35,6 +35,9 @@ import android.app.NotificationManager;
import android.content.Context;
import android.os.UserManager;
import com.android.settings.notification.NotificationBackend;
import com.android.settings.notification.app.HighImportancePreferenceController;
import com.android.settings.notification.app.NotificationSettings;
import com.android.settingslib.RestrictedLockUtils;
import com.android.settingslib.RestrictedSwitchPreference;

6
tests/robotests/src/com/android/settings/notification/ImportancePreferenceControllerTest.java → tests/robotests/src/com/android/settings/notification/app/ImportancePreferenceControllerTest.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package com.android.settings.notification;
package com.android.settings.notification.app;
import static android.app.NotificationChannel.DEFAULT_CHANNEL_ID;
import static android.app.NotificationManager.IMPORTANCE_DEFAULT;
@@ -45,6 +45,10 @@ import android.os.UserManager;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
import com.android.settings.notification.NotificationBackend;
import com.android.settings.notification.app.ImportancePreference;
import com.android.settings.notification.app.ImportancePreferenceController;
import com.android.settings.notification.app.NotificationSettings;
import com.android.settingslib.RestrictedLockUtils;
import org.junit.Before;

6
tests/robotests/src/com/android/settings/notification/ImportancePreferenceTest.java → tests/robotests/src/com/android/settings/notification/app/ImportancePreferenceTest.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package com.android.settings.notification;
package com.android.settings.notification.app;
import static android.app.NotificationManager.IMPORTANCE_DEFAULT;
import static android.app.NotificationManager.IMPORTANCE_LOW;
@@ -31,12 +31,10 @@ import android.graphics.drawable.Drawable;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.Button;
import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.TextView;
import com.android.settings.R;
import com.android.settings.notification.app.ImportancePreference;
import org.junit.Before;
import org.junit.Test;

4
tests/robotests/src/com/android/settings/notification/LightsPreferenceControllerTest.java → tests/robotests/src/com/android/settings/notification/app/LightsPreferenceControllerTest.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package com.android.settings.notification;
package com.android.settings.notification.app;
import static android.app.NotificationChannel.DEFAULT_CHANNEL_ID;
import static android.app.NotificationManager.IMPORTANCE_DEFAULT;
@@ -41,6 +41,8 @@ import android.provider.Settings;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
import com.android.settings.notification.NotificationBackend;
import com.android.settings.notification.app.LightsPreferenceController;
import com.android.settings.testutils.shadow.SettingsShadowResources;
import com.android.settingslib.RestrictedLockUtils;
import com.android.settingslib.RestrictedSwitchPreference;

5
tests/robotests/src/com/android/settings/notification/MinImportancePreferenceControllerTest.java → tests/robotests/src/com/android/settings/notification/app/MinImportancePreferenceControllerTest.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package com.android.settings.notification;
package com.android.settings.notification.app;
import static android.app.NotificationChannel.DEFAULT_CHANNEL_ID;
import static android.app.NotificationManager.IMPORTANCE_LOW;
@@ -35,6 +35,9 @@ import android.app.NotificationManager;
import android.content.Context;
import android.os.UserManager;
import com.android.settings.notification.NotificationBackend;
import com.android.settings.notification.app.MinImportancePreferenceController;
import com.android.settings.notification.app.NotificationSettings;
import com.android.settingslib.RestrictedLockUtils;
import com.android.settingslib.RestrictedSwitchPreference;

3
tests/robotests/src/com/android/settings/notification/NotificationAppPreferenceTest.java → tests/robotests/src/com/android/settings/notification/app/NotificationAppPreferenceTest.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package com.android.settings.notification;
package com.android.settings.notification.app;
import static com.google.common.truth.Truth.assertThat;
@@ -31,6 +31,7 @@ import androidx.preference.Preference;
import androidx.preference.PreferenceViewHolder;
import com.android.settings.R;
import com.android.settings.notification.app.NotificationAppPreference;
import com.android.settingslib.RestrictedLockUtils;
import org.junit.Before;

4
tests/robotests/src/com/android/settings/notification/NotificationPreferenceControllerTest.java → tests/robotests/src/com/android/settings/notification/app/NotificationPreferenceControllerTest.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package com.android.settings.notification;
package com.android.settings.notification.app;
import static android.app.NotificationManager.IMPORTANCE_DEFAULT;
import static android.app.NotificationManager.IMPORTANCE_HIGH;
@@ -41,6 +41,8 @@ import android.os.UserManager;
import androidx.preference.Preference;
import com.android.settings.notification.NotificationBackend;
import com.android.settings.notification.app.NotificationPreferenceController;
import com.android.settingslib.RestrictedLockUtils;
import org.junit.Before;

5
tests/robotests/src/com/android/settings/notification/NotificationsOffPreferenceControllerTest.java → tests/robotests/src/com/android/settings/notification/app/NotificationsOffPreferenceControllerTest.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package com.android.settings.notification;
package com.android.settings.notification.app;
import static android.app.NotificationManager.IMPORTANCE_NONE;
@@ -32,6 +32,9 @@ import android.os.UserManager;
import androidx.preference.Preference;
import com.android.settings.notification.NotificationBackend;
import com.android.settings.notification.app.NotificationsOffPreferenceController;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;

3
tests/robotests/src/com/android/settings/notification/SoundPreferenceControllerTest.java → tests/robotests/src/com/android/settings/notification/app/SoundPreferenceControllerTest.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package com.android.settings.notification;
package com.android.settings.notification.app;
import static android.app.NotificationChannel.DEFAULT_CHANNEL_ID;
import static android.app.NotificationManager.IMPORTANCE_DEFAULT;
@@ -50,6 +50,7 @@ import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
import com.android.settings.SettingsPreferenceFragment;
import com.android.settings.notification.NotificationBackend;
import com.android.settingslib.RestrictedLockUtils;
import org.junit.Before;

4
tests/robotests/src/com/android/settings/notification/VibrationPreferenceControllerTest.java → tests/robotests/src/com/android/settings/notification/app/VibrationPreferenceControllerTest.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package com.android.settings.notification;
package com.android.settings.notification.app;
import static android.app.NotificationChannel.DEFAULT_CHANNEL_ID;
import static android.app.NotificationManager.IMPORTANCE_DEFAULT;
@@ -41,6 +41,8 @@ import android.os.Vibrator;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
import com.android.settings.notification.NotificationBackend;
import com.android.settings.notification.app.VibrationPreferenceController;
import com.android.settingslib.RestrictedLockUtils;
import com.android.settingslib.RestrictedSwitchPreference;

4
tests/robotests/src/com/android/settings/notification/VisibilityPreferenceControllerTest.java → tests/robotests/src/com/android/settings/notification/app/VisibilityPreferenceControllerTest.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package com.android.settings.notification;
package com.android.settings.notification.app;
import static android.app.Notification.VISIBILITY_PRIVATE;
import static android.app.NotificationChannel.DEFAULT_CHANNEL_ID;
@@ -47,6 +47,8 @@ import android.provider.Settings;
import com.android.internal.widget.LockPatternUtils;
import com.android.settings.RestrictedListPreference;
import com.android.settings.notification.NotificationBackend;
import com.android.settings.notification.app.VisibilityPreferenceController;
import com.android.settings.testutils.shadow.ShadowRestrictionUtils;
import com.android.settingslib.RestrictedLockUtils;

3
tests/robotests/src/com/android/settings/notification/ZenCustomRadioButtonPreferenceTest.java → tests/robotests/src/com/android/settings/notification/zen/ZenCustomRadioButtonPreferenceTest.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package com.android.settings.notification;
package com.android.settings.notification.zen;
import static com.google.common.truth.Truth.assertThat;
@@ -29,6 +29,7 @@ import android.widget.RadioButton;
import androidx.preference.PreferenceViewHolder;
import com.android.settings.R;
import com.android.settings.notification.zen.ZenCustomRadioButtonPreference;
import org.junit.Before;
import org.junit.Test;

4
tests/robotests/src/com/android/settings/notification/ZenFooterPreferenceControllerTest.java → tests/robotests/src/com/android/settings/notification/zen/ZenFooterPreferenceControllerTest.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package com.android.settings.notification;
package com.android.settings.notification.zen;
import static android.app.NotificationManager.Policy.SUPPRESSED_EFFECT_AMBIENT;
import static android.app.NotificationManager.Policy.SUPPRESSED_EFFECT_BADGE;
@@ -38,6 +38,8 @@ import android.content.Context;
import androidx.preference.PreferenceScreen;
import com.android.settings.R;
import com.android.settings.notification.zen.ZenFooterPreferenceController;
import com.android.settings.notification.zen.ZenModeBackend;
import com.android.settingslib.core.lifecycle.Lifecycle;
import com.android.settingslib.widget.FooterPreference;

4
tests/robotests/src/com/android/settings/notification/ZenModeAlarmsPreferenceControllerTest.java → tests/robotests/src/com/android/settings/notification/zen/ZenModeAlarmsPreferenceControllerTest.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package com.android.settings.notification;
package com.android.settings.notification.zen;
import static android.provider.Settings.Global.ZEN_MODE;
import static android.provider.Settings.Global.ZEN_MODE_ALARMS;
@@ -30,6 +30,8 @@ import android.content.ContentResolver;
import android.content.Context;
import android.provider.Settings;
import com.android.settings.notification.zen.ZenModeAlarmsPreferenceController;
import com.android.settings.notification.zen.ZenModeBackend;
import com.android.settingslib.core.lifecycle.Lifecycle;
import org.junit.Before;

4
tests/robotests/src/com/android/settings/notification/ZenModeAllBypassingAppsPreferenceControllerTest.java → tests/robotests/src/com/android/settings/notification/zen/ZenModeAllBypassingAppsPreferenceControllerTest.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package com.android.settings.notification;
package com.android.settings.notification.zen;
import static com.google.common.truth.Truth.assertThat;
@@ -30,6 +30,8 @@ import android.content.Context;
import android.content.pm.ApplicationInfo;
import android.content.pm.ParceledListSlice;
import com.android.settings.notification.NotificationBackend;
import com.android.settings.notification.zen.ZenModeAllBypassingAppsPreferenceController;
import com.android.settingslib.applications.ApplicationsState;
import org.junit.Before;

6
tests/robotests/src/com/android/settings/notification/ZenModeAutomaticRulesPreferenceControllerTest.java → tests/robotests/src/com/android/settings/notification/zen/ZenModeAutomaticRulesPreferenceControllerTest.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package com.android.settings.notification;
package com.android.settings.notification.zen;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyInt;
@@ -34,6 +34,10 @@ import androidx.fragment.app.Fragment;
import androidx.preference.PreferenceCategory;
import androidx.preference.PreferenceScreen;
import com.android.settings.notification.zen.ZenModeAutomaticRulesPreferenceController;
import com.android.settings.notification.zen.ZenModeBackend;
import com.android.settings.notification.zen.ZenRulePreference;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;

4
tests/robotests/src/com/android/settings/notification/ZenModeBackendTest.java → tests/robotests/src/com/android/settings/notification/zen/ZenModeBackendTest.java
View File

@@ -1,4 +1,4 @@
package com.android.settings.notification;
package com.android.settings.notification.zen;
import static com.google.common.truth.Truth.assertThat;
@@ -15,6 +15,8 @@ import android.database.Cursor;
import android.provider.Settings;
import android.service.notification.ZenModeConfig;
import com.android.settings.notification.zen.ZenModeBackend;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;

5
tests/robotests/src/com/android/settings/notification/ZenModeBehaviorFooterPreferenceControllerTest.java → tests/robotests/src/com/android/settings/notification/zen/ZenModeBehaviorFooterPreferenceControllerTest.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package com.android.settings.notification;
package com.android.settings.notification.zen;
import static android.provider.Settings.Global.ZEN_MODE;
import static android.provider.Settings.Global.ZEN_MODE_ALARMS;
@@ -42,7 +42,8 @@ import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
import com.android.settings.R;
import com.android.settings.notification.AbstractZenModePreferenceController.ZenModeConfigWrapper;
import com.android.settings.notification.zen.AbstractZenModePreferenceController.ZenModeConfigWrapper;
import com.android.settings.notification.zen.ZenModeBehaviorFooterPreferenceController;
import com.android.settingslib.core.lifecycle.Lifecycle;
import org.junit.Before;

4
tests/robotests/src/com/android/settings/notification/ZenModeBlockedEffectsPreferenceControllerTest.java → tests/robotests/src/com/android/settings/notification/zen/ZenModeBlockedEffectsPreferenceControllerTest.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package com.android.settings.notification;
package com.android.settings.notification.zen;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
@@ -24,6 +24,8 @@ import static org.mockito.Mockito.when;
import android.app.NotificationManager;
import android.content.Context;
import com.android.settings.notification.zen.ZenModeBackend;
import com.android.settings.notification.zen.ZenModeBlockedEffectsPreferenceController;
import com.android.settingslib.core.lifecycle.Lifecycle;
import org.junit.Before;

4
tests/robotests/src/com/android/settings/notification/ZenModeButtonPreferenceControllerTest.java → tests/robotests/src/com/android/settings/notification/zen/ZenModeButtonPreferenceControllerTest.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package com.android.settings.notification;
package com.android.settings.notification.zen;
import static android.provider.Settings.Global.ZEN_MODE;
import static android.provider.Settings.Global.ZEN_MODE_ALARMS;
@@ -37,6 +37,8 @@ import androidx.fragment.app.FragmentManager;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
import com.android.settings.notification.zen.ZenModeBackend;
import com.android.settings.notification.zen.ZenModeButtonPreferenceController;
import com.android.settingslib.core.lifecycle.Lifecycle;
import org.junit.Before;

4
tests/robotests/src/com/android/settings/notification/ZenModeBypassingAppsPreferenceControllerTest.java → tests/robotests/src/com/android/settings/notification/zen/ZenModeBypassingAppsPreferenceControllerTest.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package com.android.settings.notification;
package com.android.settings.notification.zen;
import static com.google.common.truth.Truth.assertThat;
@@ -24,6 +24,8 @@ import static org.mockito.Mockito.when;
import android.content.Context;
import com.android.settings.notification.NotificationBackend;
import com.android.settings.notification.zen.ZenModeBypassingAppsPreferenceController;
import com.android.settingslib.core.lifecycle.Lifecycle;
import org.junit.Before;

4
tests/robotests/src/com/android/settings/notification/ZenModeCallsPreferenceControllerTest.java → tests/robotests/src/com/android/settings/notification/zen/ZenModeCallsPreferenceControllerTest.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package com.android.settings.notification;
package com.android.settings.notification.zen;
import static org.junit.Assert.assertTrue;
import static org.mockito.ArgumentMatchers.any;
@@ -25,6 +25,8 @@ import static org.mockito.Mockito.when;
import android.app.NotificationManager;
import android.content.Context;
import com.android.settings.notification.zen.ZenModeBackend;
import com.android.settings.notification.zen.ZenModeCallsPreferenceController;
import com.android.settingslib.core.lifecycle.Lifecycle;
import org.junit.Before;

4
tests/robotests/src/com/android/settings/notification/ZenModeDurationPreferenceControllerTest.java → tests/robotests/src/com/android/settings/notification/zen/ZenModeDurationPreferenceControllerTest.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package com.android.settings.notification;
package com.android.settings.notification.zen;
import static org.junit.Assert.assertEquals;
import static org.mockito.Mockito.mock;
@@ -26,6 +26,8 @@ import android.content.Context;
import android.provider.Settings;
import com.android.settings.R;
import com.android.settings.notification.zen.ZenModeBackend;
import com.android.settings.notification.zen.ZenModeDurationPreferenceController;
import com.android.settingslib.core.lifecycle.Lifecycle;
import org.junit.Before;

3
tests/robotests/src/com/android/settings/notification/ZenModeEventRuleSettingsTest.java → tests/robotests/src/com/android/settings/notification/zen/ZenModeEventRuleSettingsTest.java
View File

@@ -14,7 +14,7 @@
* limitations under the License
*/
package com.android.settings.notification;
package com.android.settings.notification.zen;
import static com.google.common.truth.Truth.assertThat;
@@ -32,6 +32,7 @@ import android.content.res.Resources;
import androidx.fragment.app.FragmentActivity;
import com.android.settings.R;
import com.android.settings.notification.zen.ZenModeEventRuleSettings;
import org.junit.Before;
import org.junit.Test;

4
tests/robotests/src/com/android/settings/notification/ZenModeEventsPreferenceControllerTest.java → tests/robotests/src/com/android/settings/notification/zen/ZenModeEventsPreferenceControllerTest.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package com.android.settings.notification;
package com.android.settings.notification.zen;
import static android.provider.Settings.Global.ZEN_MODE;
import static android.provider.Settings.Global.ZEN_MODE_ALARMS;
@@ -33,6 +33,8 @@ import android.provider.Settings;
import androidx.preference.PreferenceScreen;
import androidx.preference.SwitchPreference;
import com.android.settings.notification.zen.ZenModeBackend;
import com.android.settings.notification.zen.ZenModeEventsPreferenceController;
import com.android.settingslib.core.lifecycle.Lifecycle;
import org.junit.Before;

4
tests/robotests/src/com/android/settings/notification/ZenModeMediaPreferenceControllerTest.java → tests/robotests/src/com/android/settings/notification/zen/ZenModeMediaPreferenceControllerTest.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package com.android.settings.notification;
package com.android.settings.notification.zen;
import static android.provider.Settings.Global.ZEN_MODE;
import static android.provider.Settings.Global.ZEN_MODE_ALARMS;
@@ -33,6 +33,8 @@ import android.provider.Settings;
import androidx.preference.PreferenceScreen;
import androidx.preference.SwitchPreference;
import com.android.settings.notification.zen.ZenModeBackend;
import com.android.settings.notification.zen.ZenModeMediaPreferenceController;
import com.android.settingslib.core.lifecycle.Lifecycle;
import org.junit.Before;

4
tests/robotests/src/com/android/settings/notification/ZenModeMessagesPreferenceControllerTest.java → tests/robotests/src/com/android/settings/notification/zen/ZenModeMessagesPreferenceControllerTest.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package com.android.settings.notification;
package com.android.settings.notification.zen;
import static org.junit.Assert.assertTrue;
import static org.mockito.ArgumentMatchers.any;
@@ -27,6 +27,8 @@ import android.content.Context;
import androidx.preference.Preference;
import com.android.settings.notification.zen.ZenModeBackend;
import com.android.settings.notification.zen.ZenModeMessagesPreferenceController;
import com.android.settingslib.core.lifecycle.Lifecycle;
import org.junit.Before;

4
tests/robotests/src/com/android/settings/notification/ZenModePreferenceControllerTest.java → tests/robotests/src/com/android/settings/notification/zen/ZenModePreferenceControllerTest.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package com.android.settings.notification;
package com.android.settings.notification.zen;
import static com.android.settings.core.BasePreferenceController.AVAILABLE_UNSEARCHABLE;
@@ -34,6 +34,8 @@ import android.content.Context;
import androidx.preference.Preference;
import com.android.settings.R;
import com.android.settings.notification.zen.ZenModePreferenceController;
import com.android.settings.notification.zen.ZenModeSettings;
import org.junit.Before;
import org.junit.Test;

7
tests/robotests/src/com/android/settings/notification/ZenModePriorityCallsPreferenceControllerTest.java → tests/robotests/src/com/android/settings/notification/zen/ZenModePriorityCallsPreferenceControllerTest.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package com.android.settings.notification;
package com.android.settings.notification.zen;
import static android.provider.Settings.Global.ZEN_MODE;
import static android.provider.Settings.Global.ZEN_MODE_ALARMS;
@@ -34,6 +34,8 @@ import androidx.preference.ListPreference;
import androidx.preference.PreferenceScreen;
import com.android.settings.R;
import com.android.settings.notification.zen.ZenModeBackend;
import com.android.settings.notification.zen.ZenModePriorityCallsPreferenceController;
import com.android.settingslib.core.lifecycle.Lifecycle;
import org.junit.Before;
@@ -46,9 +48,6 @@ import org.robolectric.RuntimeEnvironment;
import org.robolectric.shadows.ShadowApplication;
import org.robolectric.util.ReflectionHelpers;
import androidx.preference.ListPreference;
import androidx.preference.PreferenceScreen;
@RunWith(RobolectricTestRunner.class)
public class ZenModePriorityCallsPreferenceControllerTest {

7
tests/robotests/src/com/android/settings/notification/ZenModePriorityMessagesPreferenceControllerTest.java → tests/robotests/src/com/android/settings/notification/zen/ZenModePriorityMessagesPreferenceControllerTest.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package com.android.settings.notification;
package com.android.settings.notification.zen;
import static android.provider.Settings.Global.ZEN_MODE;
import static android.provider.Settings.Global.ZEN_MODE_ALARMS;
@@ -34,6 +34,8 @@ import androidx.preference.ListPreference;
import androidx.preference.PreferenceScreen;
import com.android.settings.R;
import com.android.settings.notification.zen.ZenModeBackend;
import com.android.settings.notification.zen.ZenModePriorityMessagesPreferenceController;
import com.android.settingslib.core.lifecycle.Lifecycle;
import org.junit.Before;
@@ -46,9 +48,6 @@ import org.robolectric.RuntimeEnvironment;
import org.robolectric.shadows.ShadowApplication;
import org.robolectric.util.ReflectionHelpers;
import androidx.preference.ListPreference;
import androidx.preference.PreferenceScreen;
@RunWith(RobolectricTestRunner.class)
public class ZenModePriorityMessagesPreferenceControllerTest {

4
tests/robotests/src/com/android/settings/notification/ZenModeRemindersPreferenceControllerTest.java → tests/robotests/src/com/android/settings/notification/zen/ZenModeRemindersPreferenceControllerTest.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package com.android.settings.notification;
package com.android.settings.notification.zen;
import static android.provider.Settings.Global.ZEN_MODE;
import static android.provider.Settings.Global.ZEN_MODE_ALARMS;
@@ -33,6 +33,8 @@ import android.provider.Settings;
import androidx.preference.PreferenceScreen;
import androidx.preference.SwitchPreference;
import com.android.settings.notification.zen.ZenModeBackend;
import com.android.settings.notification.zen.ZenModeRemindersPreferenceController;
import com.android.settingslib.core.lifecycle.Lifecycle;
import org.junit.Before;

4
tests/robotests/src/com/android/settings/notification/ZenModeRepeatCallersPreferenceControllerTest.java → tests/robotests/src/com/android/settings/notification/zen/ZenModeRepeatCallersPreferenceControllerTest.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package com.android.settings.notification;
package com.android.settings.notification.zen;
import static android.provider.Settings.Global.ZEN_MODE;
import static android.provider.Settings.Global.ZEN_MODE_ALARMS;
@@ -33,6 +33,8 @@ import android.provider.Settings;
import androidx.preference.PreferenceScreen;
import androidx.preference.SwitchPreference;
import com.android.settings.notification.zen.ZenModeBackend;
import com.android.settings.notification.zen.ZenModeRepeatCallersPreferenceController;
import com.android.settingslib.core.lifecycle.Lifecycle;
import org.junit.Before;

3
tests/robotests/src/com/android/settings/notification/ZenModeScheduleRuleSettingsTest.java → tests/robotests/src/com/android/settings/notification/zen/ZenModeScheduleRuleSettingsTest.java
View File

@@ -14,7 +14,7 @@
* limitations under the License
*/
package com.android.settings.notification;
package com.android.settings.notification.zen;
import static com.google.common.truth.Truth.assertThat;
@@ -32,6 +32,7 @@ import android.content.res.Resources;
import androidx.fragment.app.FragmentActivity;
import com.android.settings.R;
import com.android.settings.notification.zen.ZenModeScheduleRuleSettings;
import org.junit.Before;
import org.junit.Test;

5
tests/robotests/src/com/android/settings/notification/ZenModeSettingsFooterPreferenceControllerTest.java → tests/robotests/src/com/android/settings/notification/zen/ZenModeSettingsFooterPreferenceControllerTest.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package com.android.settings.notification;
package com.android.settings.notification.zen;
import static android.provider.Settings.Global.ZEN_MODE;
import static android.provider.Settings.Global.ZEN_MODE_ALARMS;
@@ -43,7 +43,8 @@ import androidx.fragment.app.FragmentManager;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
import com.android.settings.notification.AbstractZenModePreferenceController.ZenModeConfigWrapper;
import com.android.settings.notification.zen.AbstractZenModePreferenceController.ZenModeConfigWrapper;
import com.android.settings.notification.zen.ZenModeSettingsFooterPreferenceController;
import com.android.settingslib.core.lifecycle.Lifecycle;
import org.junit.Before;

3
tests/robotests/src/com/android/settings/notification/ZenModeSettingsTest.java → tests/robotests/src/com/android/settings/notification/zen/ZenModeSettingsTest.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package com.android.settings.notification;
package com.android.settings.notification.zen;
import static com.google.common.truth.Truth.assertThat;
@@ -26,6 +26,7 @@ import android.content.Context;
import android.provider.SearchIndexableResource;
import com.android.settings.R;
import com.android.settings.notification.zen.ZenModeSettings;
import org.junit.Before;
import org.junit.Test;

3
tests/robotests/src/com/android/settings/notification/ZenModeSliceBuilderTest.java → tests/robotests/src/com/android/settings/notification/zen/ZenModeSliceBuilderTest.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
package com.android.settings.notification;
package com.android.settings.notification.zen;
import static android.app.slice.Slice.EXTRA_TOGGLE_STATE;
@@ -32,6 +32,7 @@ import androidx.slice.core.SliceAction;
import androidx.slice.widget.SliceLiveData;
import com.android.settings.R;
import com.android.settings.notification.zen.ZenModeSliceBuilder;
import com.android.settings.testutils.shadow.ShadowNotificationManager;
import org.junit.Before;

7
tests/robotests/src/com/android/settings/notification/ZenModeStarredContactsPreferenceControllerTest.java → tests/robotests/src/com/android/settings/notification/zen/ZenModeStarredContactsPreferenceControllerTest.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package com.android.settings.notification;
package com.android.settings.notification.zen;
import static android.app.NotificationManager.Policy.PRIORITY_CATEGORY_CALLS;
import static android.app.NotificationManager.Policy.PRIORITY_CATEGORY_MESSAGES;
@@ -22,7 +22,6 @@ import static android.app.NotificationManager.Policy.PRIORITY_CATEGORY_MESSAGES;
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.doAnswer;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
@@ -34,6 +33,8 @@ import android.content.Intent;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
import com.android.settings.notification.zen.ZenModeBackend;
import com.android.settings.notification.zen.ZenModeStarredContactsPreferenceController;
import com.android.settingslib.core.lifecycle.Lifecycle;
import org.junit.Before;
@@ -41,8 +42,6 @@ import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.mockito.invocation.InvocationOnMock;
import org.mockito.stubbing.Answer;
import org.robolectric.RobolectricTestRunner;
import org.robolectric.RuntimeEnvironment;
import org.robolectric.shadows.ShadowApplication;

4
tests/robotests/src/com/android/settings/notification/ZenModeSystemPreferenceControllerTest.java → tests/robotests/src/com/android/settings/notification/zen/ZenModeSystemPreferenceControllerTest.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package com.android.settings.notification;
package com.android.settings.notification.zen;
import static android.provider.Settings.Global.ZEN_MODE;
import static android.provider.Settings.Global.ZEN_MODE_ALARMS;
@@ -33,6 +33,8 @@ import android.provider.Settings;
import androidx.preference.PreferenceScreen;
import androidx.preference.SwitchPreference;
import com.android.settings.notification.zen.ZenModeBackend;
import com.android.settings.notification.zen.ZenModeSystemPreferenceController;
import com.android.settingslib.core.lifecycle.Lifecycle;
import org.junit.Before;

4
tests/robotests/src/com/android/settings/notification/ZenModeVisEffectPreferenceControllerTest.java → tests/robotests/src/com/android/settings/notification/zen/ZenModeVisEffectPreferenceControllerTest.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package com.android.settings.notification;
package com.android.settings.notification.zen;
import static android.app.NotificationManager.Policy.SUPPRESSED_EFFECT_BADGE;
import static android.app.NotificationManager.Policy.SUPPRESSED_EFFECT_LIGHTS;
@@ -37,6 +37,8 @@ import android.content.res.Resources;
import androidx.preference.PreferenceScreen;
import com.android.settings.notification.zen.ZenModeBackend;
import com.android.settings.notification.zen.ZenModeVisEffectPreferenceController;
import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settings.widget.DisabledCheckBoxPreference;
import com.android.settingslib.core.lifecycle.Lifecycle;

5
tests/robotests/src/com/android/settings/notification/ZenModeVisEffectsAllPreferenceControllerTest.java → tests/robotests/src/com/android/settings/notification/zen/ZenModeVisEffectsAllPreferenceControllerTest.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package com.android.settings.notification;
package com.android.settings.notification.zen;
import static android.app.NotificationManager.Policy.SUPPRESSED_EFFECT_AMBIENT;
import static android.app.NotificationManager.Policy.SUPPRESSED_EFFECT_BADGE;
@@ -40,6 +40,9 @@ import android.content.Context;
import androidx.preference.PreferenceScreen;
import com.android.settings.notification.zen.ZenCustomRadioButtonPreference;
import com.android.settings.notification.zen.ZenModeBackend;
import com.android.settings.notification.zen.ZenModeVisEffectsAllPreferenceController;
import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settingslib.core.lifecycle.Lifecycle;

5
tests/robotests/src/com/android/settings/notification/ZenModeVisEffectsCustomPreferenceControllerTest.java → tests/robotests/src/com/android/settings/notification/zen/ZenModeVisEffectsCustomPreferenceControllerTest.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package com.android.settings.notification;
package com.android.settings.notification.zen;
import static android.app.NotificationManager.Policy.SUPPRESSED_EFFECT_AMBIENT;
import static android.app.NotificationManager.Policy.SUPPRESSED_EFFECT_BADGE;
@@ -38,6 +38,9 @@ import android.content.Context;
import androidx.preference.PreferenceScreen;
import com.android.settings.notification.zen.ZenCustomRadioButtonPreference;
import com.android.settings.notification.zen.ZenModeBackend;
import com.android.settings.notification.zen.ZenModeVisEffectsCustomPreferenceController;
import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settingslib.core.lifecycle.Lifecycle;

5
tests/robotests/src/com/android/settings/notification/ZenModeVisEffectsNonePreferenceControllerTest.java → tests/robotests/src/com/android/settings/notification/zen/ZenModeVisEffectsNonePreferenceControllerTest.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package com.android.settings.notification;
package com.android.settings.notification.zen;
import static android.app.NotificationManager.Policy.SUPPRESSED_EFFECT_AMBIENT;
import static android.app.NotificationManager.Policy.SUPPRESSED_EFFECT_BADGE;
@@ -40,6 +40,9 @@ import android.content.Context;
import androidx.preference.PreferenceScreen;
import com.android.settings.notification.zen.ZenCustomRadioButtonPreference;
import com.android.settings.notification.zen.ZenModeBackend;
import com.android.settings.notification.zen.ZenModeVisEffectsNonePreferenceController;
import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settingslib.core.lifecycle.Lifecycle;

9
tests/robotests/src/com/android/settings/notification/ZenOnboardingActivityTest.java → tests/robotests/src/com/android/settings/notification/zen/ZenOnboardingActivityTest.java
View File

@@ -14,16 +14,16 @@
* limitations under the License
*/
package com.android.settings.notification;
package com.android.settings.notification.zen;
import static android.app.NotificationManager.Policy.PRIORITY_CATEGORY_ALARMS;
import static android.app.NotificationManager.Policy.PRIORITY_CATEGORY_REPEAT_CALLERS;
import static android.app.NotificationManager.Policy.SUPPRESSED_EFFECT_SCREEN_ON;
import static com.android.settings.notification.ZenOnboardingActivity.ALWAYS_SHOW_THRESHOLD;
import static com.android.settings.notification.ZenOnboardingActivity
import static com.android.settings.notification.zen.ZenOnboardingActivity.ALWAYS_SHOW_THRESHOLD;
import static com.android.settings.notification.zen.ZenOnboardingActivity
.PREF_KEY_SUGGESTION_FIRST_DISPLAY_TIME;
import static com.android.settings.notification.ZenOnboardingActivity.isSuggestionComplete;
import static com.android.settings.notification.zen.ZenOnboardingActivity.isSuggestionComplete;
import static com.google.common.truth.Truth.assertThat;
@@ -40,6 +40,7 @@ import android.provider.Settings;
import com.android.internal.logging.MetricsLogger;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.notification.zen.ZenOnboardingActivity;
import com.android.settings.testutils.FakeFeatureFactory;
import org.junit.Before;

2
tests/robotests/src/com/android/settings/notification/ZenRuleCustomPolicyPreferenceControllerTest.java → tests/robotests/src/com/android/settings/notification/zen/ZenRuleCustomPolicyPreferenceControllerTest.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package com.android.settings.notification;
package com.android.settings.notification.zen;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;

4
tests/robotests/src/com/android/settings/notification/ZenRuleCustomPrefContrTestBase.java → tests/robotests/src/com/android/settings/notification/zen/ZenRuleCustomPrefContrTestBase.java
View File

@@ -14,12 +14,14 @@
* limitations under the License.
*/
package com.android.settings.notification;
package com.android.settings.notification.zen;
import android.app.AutomaticZenRule;
import android.app.NotificationManager;
import android.service.notification.ZenPolicy;
import com.android.settings.notification.zen.AbstractZenCustomRulePreferenceController;
import org.junit.runner.RunWith;
import org.robolectric.RobolectricTestRunner;

2
tests/robotests/src/com/android/settings/notification/ZenRuleCustomSwitchPreferenceControllerTest.java → tests/robotests/src/com/android/settings/notification/zen/ZenRuleCustomSwitchPreferenceControllerTest.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package com.android.settings.notification;
package com.android.settings.notification.zen;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;

2
tests/robotests/src/com/android/settings/notification/ZenRuleDefaultPolicyPreferenceControllerTest.java → tests/robotests/src/com/android/settings/notification/zen/ZenRuleDefaultPolicyPreferenceControllerTest.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package com.android.settings.notification;
package com.android.settings.notification.zen;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;

5
tests/robotests/src/com/android/settings/notification/ZenRulePreferenceControllerTest.java → tests/robotests/src/com/android/settings/notification/zen/ZenRulePreferenceControllerTest.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package com.android.settings.notification;
package com.android.settings.notification.zen;
import static junit.framework.Assert.assertEquals;
@@ -28,6 +28,9 @@ import android.content.Context;
import androidx.preference.PreferenceScreen;
import com.android.settings.notification.zen.AbstractZenCustomRulePreferenceController;
import com.android.settings.notification.zen.ZenCustomRadioButtonPreference;
import com.android.settings.notification.zen.ZenModeBackend;
import com.android.settingslib.core.lifecycle.Lifecycle;
import org.junit.Before;

2
tests/robotests/src/com/android/settings/notification/ZenRuleRepeatCallersPreferenceControllerTest.java → tests/robotests/src/com/android/settings/notification/zen/ZenRuleRepeatCallersPreferenceControllerTest.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package com.android.settings.notification;
package com.android.settings.notification.zen;
import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.Mockito.mock;

2
tests/robotests/src/com/android/settings/notification/ZenRuleStarredContactsPreferenceControllerTest.java → tests/robotests/src/com/android/settings/notification/zen/ZenRuleStarredContactsPreferenceControllerTest.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package com.android.settings.notification;
package com.android.settings.notification.zen;
import static com.google.common.truth.Truth.assertThat;

2
tests/robotests/src/com/android/settings/notification/ZenRuleVisEffectPreferenceControllerTest.java → tests/robotests/src/com/android/settings/notification/zen/ZenRuleVisEffectPreferenceControllerTest.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package com.android.settings.notification;
package com.android.settings.notification.zen;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;

2
tests/robotests/src/com/android/settings/notification/ZenRuleVisEffectsAllPreferenceControllerTest.java → tests/robotests/src/com/android/settings/notification/zen/ZenRuleVisEffectsAllPreferenceControllerTest.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package com.android.settings.notification;
package com.android.settings.notification.zen;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;

2
tests/robotests/src/com/android/settings/notification/ZenRuleVisEffectsCustomPreferenceControllerTest.java → tests/robotests/src/com/android/settings/notification/zen/ZenRuleVisEffectsCustomPreferenceControllerTest.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package com.android.settings.notification;
package com.android.settings.notification.zen;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;

2
tests/robotests/src/com/android/settings/notification/ZenRuleVisEffectsNonePreferenceControllerTest.java → tests/robotests/src/com/android/settings/notification/zen/ZenRuleVisEffectsNonePreferenceControllerTest.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package com.android.settings.notification;
package com.android.settings.notification.zen;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;

2
tests/robotests/src/com/android/settings/suggestions/SettingsSuggestionsTest.java
View File

@@ -29,7 +29,7 @@ import com.android.settings.R;
import com.android.settings.Settings;
import com.android.settings.biometrics.fingerprint.FingerprintEnrollSuggestionActivity;
import com.android.settings.biometrics.fingerprint.FingerprintSuggestionActivity;
import com.android.settings.notification.ZenSuggestionActivity;
import com.android.settings.notification.zen.ZenSuggestionActivity;
import com.android.settings.wallpaper.WallpaperSuggestionActivity;
import com.android.settings.wifi.calling.WifiCallingSuggestionActivity;