Reorganize notification Settings classes

The notification package was getting too big.

Test: make -j64 RunSettingsRoboTests
Fixes: 145224451
Change-Id: I25ba82f42f7a137d8adcce72dcf8089d0e018bdc

AndroidManifest.xml

@@ -745,13 +745,13 @@
                 <category android:name="com.android.settings.SHORTCUT" />
             </intent-filter>
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
-                android:value="com.android.settings.notification.ZenModeSettings" />
+                android:value="com.android.settings.notification.zen.ZenModeSettings" />
             <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
                 android:value="true" />
         </activity>
 
         <activity
-            android:name=".notification.ZenSuggestionActivity"
+            android:name=".notification.zen.ZenSuggestionActivity"
             android:label="@string/zen_mode_settings_title"
             android:icon="@drawable/ic_suggestion_dnd"
             android:theme="@android:style/Theme.NoDisplay">
@@ -773,7 +773,7 @@
         </activity>
 
         <activity
-            android:name=".notification.ZenOnboardingActivity"
+            android:name=".notification.zen.ZenOnboardingActivity"
             android:label="@string/zen_onboarding_dnd_visual_disturbances_header"
             android:icon="@drawable/ic_notifications"
             android:theme="@*android:style/Theme.DeviceDefault.Settings.Dialog.NoActionBar"
@@ -797,7 +797,7 @@
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
-                       android:value="com.android.settings.notification.ZenModeAutomationSettings" />
+                       android:value="com.android.settings.notification.zen.ZenModeAutomationSettings" />
             <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
                        android:value="true" />
         </activity>
@@ -860,7 +860,7 @@
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
-                android:value="com.android.settings.notification.ZenModeScheduleRuleSettings" />
+                android:value="com.android.settings.notification.zen.ZenModeScheduleRuleSettings" />
             <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
                 android:value="true" />
         </activity>
@@ -873,7 +873,7 @@
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
-                android:value="com.android.settings.notification.ZenModeEventRuleSettings" />
+                android:value="com.android.settings.notification.zen.ZenModeEventRuleSettings" />
             <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
                 android:value="true" />
         </activity>
@@ -1169,10 +1169,10 @@
                 <category android:name="com.android.settings.SHORTCUT" />
             </intent-filter>
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
-                android:value="com.android.settings.notification.NotificationStation" />
+                android:value="com.android.settings.notification.history.NotificationStation" />
         </activity>
 
-        <activity android:name=".notification.ZenModeVoiceActivity"
+        <activity android:name=".notification.zen.ZenModeVoiceActivity"
                 android:theme="@*android:style/Theme.DeviceDefault.Settings.Dialog.NoActionBar"
                 android:label="@string/zen_mode_settings_title">
             <intent-filter>
@@ -2434,7 +2434,7 @@
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
-                       android:value="com.android.settings.notification.ZenAccessSettings" />
+                       android:value="com.android.settings.notification.zen.ZenAccessSettings" />
         </activity>
 
         <activity
@@ -2463,7 +2463,7 @@
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
-                       android:value="com.android.settings.notification.AppBubbleNotificationSettings" />
+                       android:value="com.android.settings.notification.app.AppBubbleNotificationSettings" />
         </activity>
 
         <activity
@@ -2508,7 +2508,7 @@
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
-                android:value="com.android.settings.notification.AppNotificationSettings" />
+                android:value="com.android.settings.notification.app.AppNotificationSettings" />
         </activity>
 
         <!-- Show channel-level notification settings (channel passed in as extras) -->
@@ -2520,7 +2520,7 @@
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
-                       android:value="com.android.settings.notification.ChannelNotificationSettings" />
+                       android:value="com.android.settings.notification.app.ChannelNotificationSettings" />
         </activity>
 
         <!-- Show Manual (from settings item) -->

res/xml/app_notification_settings.xml

@@ -26,7 +26,7 @@
         android:key="block"
         android:layout="@layout/styled_switch_bar" />
 
-    <com.android.settings.notification.NotificationFooterPreference
+    <com.android.settings.notification.app.NotificationFooterPreference
         android:key="block_desc" />
 
     <!-- Channels/Channel groups added here -->
@@ -76,11 +76,11 @@
 
     </PreferenceCategory>
 
-    <com.android.settings.notification.NotificationFooterPreference
+    <com.android.settings.notification.app.NotificationFooterPreference
         android:key="desc"
         android:order="5000" />
 
-    <com.android.settings.notification.NotificationFooterPreference
+    <com.android.settings.notification.app.NotificationFooterPreference
         android:key="deleted"
         android:order="8000" />
 

res/xml/channel_notification_settings.xml

@@ -38,7 +38,7 @@
         android:summary="@string/allow_interruption_summary" />
 
     <!-- Importance -->
-    <com.android.settings.notification.ImportancePreference
+    <com.android.settings.notification.app.ImportancePreference
         android:key="importance"
         android:order="4"
         android:title="@string/notification_importance_title"
@@ -64,7 +64,7 @@
         settings:initialExpandedChildrenCount="0">
 
         <!-- Default ringtone -->
-        <com.android.settings.notification.NotificationSoundPreference
+        <com.android.settings.notification.app.NotificationSoundPreference
             android:key="ringtone"
             android:title="@string/notification_channel_sound_title"
             android:dialogTitle="@string/notification_channel_sound_title"
@@ -121,11 +121,11 @@
             settings:allowDividerAbove="true"/>
     </PreferenceCategory>
 
-    <com.android.settings.notification.NotificationFooterPreference
+    <com.android.settings.notification.app.NotificationFooterPreference
         android:key="desc"
         android:order="100"/>
 
-    <com.android.settings.notification.NotificationFooterPreference
+    <com.android.settings.notification.app.NotificationFooterPreference
         android:key="block_desc"
         android:order="110"
         settings:allowDividerAbove="false"/>

res/xml/configure_notification_settings.xml

@@ -128,8 +128,8 @@
             android:key="zen_mode_notifications"
             android:title="@string/zen_mode_settings_title"
             settings:useAdminDisabledSummary="true"
-            android:fragment="com.android.settings.notification.ZenModeSettings"
-            settings:controller="com.android.settings.notification.ZenModePreferenceController"
+            android:fragment="com.android.settings.notification.zen.ZenModeSettings"
+            settings:controller="com.android.settings.notification.zen.ZenModePreferenceController"
             settings:allowDividerAbove="false"/>
     </PreferenceCategory>
 </PreferenceScreen>

res/xml/sound_settings.xml

@@ -98,12 +98,12 @@
     <com.android.settingslib.RestrictedPreference
         android:key="zen_mode"
         android:title="@string/zen_mode_settings_title"
-        android:fragment="com.android.settings.notification.ZenModeSettings"
+        android:fragment="com.android.settings.notification.zen.ZenModeSettings"
         android:order="-120"
         settings:useAdminDisabledSummary="true"
         settings:keywords="@string/keywords_sounds_and_notifications_interruptions"
         settings:allowDividerAbove="true"
-        settings:controller="com.android.settings.notification.ZenModePreferenceController"/>
+        settings:controller="com.android.settings.notification.zen.ZenModePreferenceController"/>
 
     <Preference
         android:key="gesture_prevent_ringing_sound"

res/xml/special_access.xml

@@ -52,7 +52,7 @@
     <Preference
         android:key="zen_access"
         android:title="@string/manage_zen_access_title"
-        android:fragment="com.android.settings.notification.ZenAccessSettings"
+        android:fragment="com.android.settings.notification.zen.ZenAccessSettings"
         settings:controller="com.android.settings.applications.specialaccess.zenaccess.ZenAccessController" />
 
     <Preference

res/xml/zen_mode_custom_rule_settings.xml

@@ -22,11 +22,11 @@
 
     <PreferenceCategory
         android:key="zen_custom_rule_category">
-        <com.android.settings.notification.ZenCustomRadioButtonPreference
+        <com.android.settings.notification.zen.ZenCustomRadioButtonPreference
             android:key="zen_custom_rule_setting_default"
             android:title="@string/zen_mode_custom_behavior_summary_default"/>
 
-        <com.android.settings.notification.ZenCustomRadioButtonPreference
+        <com.android.settings.notification.zen.ZenCustomRadioButtonPreference
             android:key="zen_custom_rule_setting"
             android:title="@string/zen_mode_custom_behavior_summary" />
     </PreferenceCategory>

res/xml/zen_mode_restrict_notifications_settings.xml

@@ -23,17 +23,17 @@
     <PreferenceCategory
         android:key="restrict_category"
         android:title="@string/zen_mode_settings_category">
-        <com.android.settings.notification.ZenCustomRadioButtonPreference
+        <com.android.settings.notification.zen.ZenCustomRadioButtonPreference
             android:key="zen_mute_notifications"
             android:title="@string/zen_mode_restrict_notifications_mute"
             android:summary="@string/zen_mode_restrict_notifications_mute_summary"/>
 
-        <com.android.settings.notification.ZenCustomRadioButtonPreference
+        <com.android.settings.notification.zen.ZenCustomRadioButtonPreference
             android:key="zen_hide_notifications"
             android:title="@string/zen_mode_restrict_notifications_hide"
             android:summary="@string/zen_mode_restrict_notifications_hide_summary"/>
 
-        <com.android.settings.notification.ZenCustomRadioButtonPreference
+        <com.android.settings.notification.zen.ZenCustomRadioButtonPreference
             android:key="zen_custom"
             android:title="@string/zen_mode_restrict_notifications_custom" />
 

res/xml/zen_mode_settings.xml

@@ -29,19 +29,19 @@
         <Preference
             android:key="zen_mode_behavior_calls"
             android:title="@string/zen_mode_calls_title"
-            android:fragment="com.android.settings.notification.ZenModeCallsSettings" />
+            android:fragment="com.android.settings.notification.zen.ZenModeCallsSettings" />
 
         <!-- Messages -->
         <Preference
             android:key="zen_mode_behavior_messages"
             android:title="@string/zen_mode_messages_title"
-            android:fragment="com.android.settings.notification.ZenModeMessagesSettings" />
+            android:fragment="com.android.settings.notification.zen.ZenModeMessagesSettings" />
 
         <!-- All sounds -->
         <Preference
             android:key="zen_sound_vibration_settings"
             android:title="@string/zen_sound_title"
-            android:fragment="com.android.settings.notification.ZenModeSoundVibrationSettings"
+            android:fragment="com.android.settings.notification.zen.ZenModeSoundVibrationSettings"
             android:icon="@drawable/ic_chevron_right_24dp"/>
     </PreferenceCategory>
 
@@ -49,11 +49,11 @@
     <Preference
         android:key="zen_mode_block_effects_settings"
         android:title="@string/zen_mode_restrict_notifications_title"
-        android:fragment="com.android.settings.notification.ZenModeRestrictNotificationsSettings"
+        android:fragment="com.android.settings.notification.zen.ZenModeRestrictNotificationsSettings"
         settings:allowDividerAbove="true"/>
 
     <!-- DND duration settings -->
-    <com.android.settings.notification.ZenDurationDialogPreference
+    <com.android.settings.notification.zen.ZenDurationDialogPreference
         android:key="zen_mode_duration_settings"
         android:title="@string/zen_mode_duration_settings_title"
         android:widgetLayout="@null"/>
@@ -62,7 +62,7 @@
     <Preference
         android:key="zen_mode_automation_settings"
         android:title="@string/zen_mode_automation_settings_title"
-        android:fragment="com.android.settings.notification.ZenModeAutomationSettings"/>
+        android:fragment="com.android.settings.notification.zen.ZenModeAutomationSettings"/>
 
     <!-- Turn on DND button -->
     <com.android.settingslib.widget.LayoutPreference

res/xml/zen_mode_sound_vibration_settings.xml

@@ -28,13 +28,13 @@
         <Preference
             android:key="zen_mode_calls_settings"
             android:title="@string/zen_mode_calls"
-            android:fragment="com.android.settings.notification.ZenModeCallsSettings" />
+            android:fragment="com.android.settings.notification.zen.ZenModeCallsSettings" />
 
         <!-- Messages -->
         <Preference
             android:key="zen_mode_messages_settings"
             android:title="@string/zen_mode_messages"
-            android:fragment="com.android.settings.notification.ZenModeMessagesSettings" />
+            android:fragment="com.android.settings.notification.zen.ZenModeMessagesSettings" />
 
         <!-- Alarms -->
         <SwitchPreference
@@ -65,7 +65,7 @@
         <Preference
             android:key="zen_mode_bypassing_apps"
             android:title="@string/zen_mode_bypassing_apps"
-            android:fragment="com.android.settings.notification.ZenModeBypassingAppsSettings"/>
+            android:fragment="com.android.settings.notification.zen.ZenModeBypassingAppsSettings"/>
 
     </PreferenceCategory>
 

src/com/android/settings/applications/appinfo/AppNotificationPreferenceController.java

@@ -25,7 +25,7 @@ import androidx.preference.Preference;
 
 import com.android.settings.R;
 import com.android.settings.SettingsPreferenceFragment;
-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;
 

src/com/android/settings/applications/manageapplications/ManageApplications.java

@@ -102,7 +102,7 @@ import com.android.settings.core.InstrumentedFragment;
 import com.android.settings.core.SubSettingLauncher;
 import com.android.settings.dashboard.profileselector.ProfileSelectFragment;
 import com.android.settings.fuelgauge.HighPowerDetail;
-import com.android.settings.notification.AppNotificationSettings;
+import com.android.settings.notification.app.AppNotificationSettings;
 import com.android.settings.notification.ConfigureNotificationSettings;
 import com.android.settings.notification.NotificationBackend;
 import com.android.settings.widget.LoadingViewController;

src/com/android/settings/core/gateway/SettingsGateway.java

@@ -105,20 +105,20 @@ import com.android.settings.network.MobileNetworkListFragment;
 import com.android.settings.network.NetworkDashboardFragment;
 import com.android.settings.nfc.AndroidBeam;
 import com.android.settings.nfc.PaymentSettings;
-import com.android.settings.notification.AppBubbleNotificationSettings;
-import com.android.settings.notification.AppNotificationSettings;
-import com.android.settings.notification.ChannelNotificationSettings;
+import com.android.settings.notification.app.AppBubbleNotificationSettings;
+import com.android.settings.notification.app.AppNotificationSettings;
+import com.android.settings.notification.app.ChannelNotificationSettings;
 import com.android.settings.notification.ConfigureNotificationSettings;
 import com.android.settings.notification.NotificationAccessSettings;
 import com.android.settings.notification.NotificationAssistantPicker;
-import com.android.settings.notification.NotificationStation;
+import com.android.settings.notification.history.NotificationStation;
 import com.android.settings.notification.SoundSettings;
-import com.android.settings.notification.ZenAccessSettings;
-import com.android.settings.notification.ZenModeAutomationSettings;
-import com.android.settings.notification.ZenModeBlockedEffectsSettings;
-import com.android.settings.notification.ZenModeEventRuleSettings;
-import com.android.settings.notification.ZenModeScheduleRuleSettings;
-import com.android.settings.notification.ZenModeSettings;
+import com.android.settings.notification.zen.ZenAccessSettings;
+import com.android.settings.notification.zen.ZenModeAutomationSettings;
+import com.android.settings.notification.zen.ZenModeBlockedEffectsSettings;
+import com.android.settings.notification.zen.ZenModeEventRuleSettings;
+import com.android.settings.notification.zen.ZenModeScheduleRuleSettings;
+import com.android.settings.notification.zen.ZenModeSettings;
 import com.android.settings.password.ChooseLockPassword;
 import com.android.settings.password.ChooseLockPattern;
 import com.android.settings.print.PrintJobSettingsFragment;

src/com/android/settings/dashboard/DashboardFragmentRegistry.java

@@ -38,7 +38,7 @@ import com.android.settings.language.LanguageAndInputSettings;
 import com.android.settings.network.NetworkDashboardFragment;
 import com.android.settings.notification.ConfigureNotificationSettings;
 import com.android.settings.notification.SoundSettings;
-import com.android.settings.notification.ZenModeSettings;
+import com.android.settings.notification.zen.ZenModeSettings;
 import com.android.settings.privacy.PrivacyDashboardFragment;
 import com.android.settings.security.LockscreenDashboardFragment;
 import com.android.settings.security.SecuritySettings;

src/com/android/settings/dashboard/suggestions/SuggestionFeatureProviderImpl.java

@@ -27,8 +27,8 @@ import com.android.settings.Settings.NightDisplaySuggestionActivity;
 import com.android.settings.biometrics.fingerprint.FingerprintEnrollSuggestionActivity;
 import com.android.settings.biometrics.fingerprint.FingerprintSuggestionActivity;
 import com.android.settings.display.NightDisplayPreferenceController;
-import com.android.settings.notification.ZenOnboardingActivity;
-import com.android.settings.notification.ZenSuggestionActivity;
+import com.android.settings.notification.zen.ZenOnboardingActivity;
+import com.android.settings.notification.zen.ZenSuggestionActivity;
 import com.android.settings.overlay.FeatureFactory;
 import com.android.settings.password.ScreenLockSuggestionActivity;
 import com.android.settings.wallpaper.StyleSuggestionActivity;

src/com/android/settings/homepage/contextualcards/conditional/DndConditionCardController.java

@@ -30,7 +30,7 @@ import androidx.annotation.VisibleForTesting;
 import com.android.settings.R;
 import com.android.settings.core.SubSettingLauncher;
 import com.android.settings.homepage.contextualcards.ContextualCard;
-import com.android.settings.notification.ZenModeSettings;
+import com.android.settings.notification.zen.ZenModeSettings;
 
 import java.util.Objects;
 

src/com/android/settings/homepage/contextualcards/slices/NotificationChannelSlice.java

@@ -49,10 +49,11 @@ import com.android.settings.Utils;
 import com.android.settings.applications.AppAndNotificationDashboardFragment;
 import com.android.settings.applications.AppInfoBase;
 import com.android.settings.core.SubSettingLauncher;
-import com.android.settings.notification.AppNotificationSettings;
-import com.android.settings.notification.ChannelNotificationSettings;
+import com.android.settings.notification.app.AppNotificationSettings;
+import com.android.settings.notification.app.ChannelNotificationSettings;
 import com.android.settings.notification.NotificationBackend;
 import com.android.settings.notification.NotificationBackend.NotificationsSentState;
+import com.android.settings.notification.app.ChannelListPreferenceController;
 import com.android.settings.slices.CustomSliceRegistry;
 import com.android.settings.slices.CustomSliceable;
 import com.android.settings.slices.SliceBroadcastReceiver;
@@ -107,7 +108,7 @@ public class NotificationChannelSlice implements CustomSliceable {
      *
      * Note:
      * When the sent count of notification channels is the same, follow the sorting mechanism from
-     * {@link com.android.settings.notification.ChannelListPreferenceController}.
+     * {@link ChannelListPreferenceController}.
      * Since slice view only shows displayable notification channels, so those deleted ones are
      * excluded from the comparison here.
      */

src/com/android/settings/notification/NotificationSwitchBarPreference.java

@@ -1,82 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.notification;
-
-import android.content.Context;
-import android.util.AttributeSet;
-import android.view.View;
-
-import androidx.preference.PreferenceViewHolder;
-
-import com.android.settings.widget.ToggleSwitch;
-import com.android.settingslib.RestrictedLockUtils;
-import com.android.settingslib.widget.LayoutPreference;
-
-public class NotificationSwitchBarPreference extends LayoutPreference {
-    private ToggleSwitch mSwitch;
-    private boolean mChecked;
-    private boolean mEnableSwitch = true;
-
-    public NotificationSwitchBarPreference(Context context, AttributeSet attrs) {
-        super(context, attrs);
-    }
-
-    @Override
-    public void onBindViewHolder(PreferenceViewHolder holder) {
-        super.onBindViewHolder(holder);
-        mSwitch = (ToggleSwitch) holder.findViewById(android.R.id.switch_widget);
-        if (mSwitch != null) {
-            mSwitch.setOnClickListener(new View.OnClickListener() {
-                @Override
-                public void onClick(View v) {
-                    if (!mSwitch.isEnabled()) {
-                        return;
-                    }
-                    mChecked = !mChecked;
-                    setChecked(mChecked);
-                    if (!callChangeListener(mChecked)) {
-                        setChecked(!mChecked);
-                    }
-                }
-            });
-            mSwitch.setChecked(mChecked);
-            mSwitch.setEnabled(mEnableSwitch);
-        }
-    }
-
-    public boolean isChecked() {
-        return mSwitch != null && mSwitch.isEnabled() && mChecked;
-    }
-
-    public void setChecked(boolean checked) {
-        mChecked = checked;
-        if (mSwitch != null) {
-            mSwitch.setChecked(checked);
-        }
-    }
-
-    public void setSwitchEnabled(boolean enabled) {
-        mEnableSwitch = enabled;
-        if (mSwitch != null) {
-            mSwitch.setEnabled(enabled);
-        }
-    }
-
-    public void setDisabledByAdmin(RestrictedLockUtils.EnforcedAdmin admin) {
-        setSwitchEnabled(admin == null);
-    }
-}

src/com/android/settings/notification/RecentNotifyingAppsPreferenceController.java

@@ -21,7 +21,6 @@ import android.app.settings.SettingsEnums;
 import android.app.usage.IUsageStatsManager;
 import android.app.usage.UsageEvents;
 import android.content.Context;
-import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.os.Bundle;
 import android.os.RemoteException;
@@ -32,15 +31,15 @@ import android.text.TextUtils;
 import android.util.ArrayMap;
 import android.util.ArraySet;
 import android.util.IconDrawableFactory;
-import android.util.Log;
 
 import com.android.settings.R;
 import com.android.settings.Utils;
 import com.android.settings.applications.AppInfoBase;
 import com.android.settings.core.PreferenceControllerMixin;
 import com.android.settings.core.SubSettingLauncher;
+import com.android.settings.notification.app.AppNotificationSettings;
+import com.android.settings.notification.app.NotificationAppPreference;
 import com.android.settingslib.TwoTargetPreference;
-import com.android.settingslib.applications.AppUtils;
 import com.android.settingslib.applications.ApplicationsState;
 import com.android.settingslib.core.AbstractPreferenceController;
 import com.android.settingslib.utils.StringUtil;

src/com/android/settings/notification/app/AllowSoundPreferenceController.java

@@ -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;
@@ -27,6 +27,7 @@ import android.util.Log;
 import androidx.preference.Preference;
 
 import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settings.notification.NotificationBackend;
 import com.android.settingslib.RestrictedSwitchPreference;
 
 public class AllowSoundPreferenceController extends NotificationPreferenceController

src/com/android/settings/notification/app/AppBubbleNotificationSettings.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.notification;
+package com.android.settings.notification.app;
 
 import android.app.settings.SettingsEnums;
 import android.content.Context;
@@ -22,6 +22,7 @@ import android.text.TextUtils;
 import android.util.Log;
 
 import com.android.settings.R;
+import com.android.settings.notification.NotificationBackend;
 import com.android.settings.search.BaseSearchIndexProvider;
 import com.android.settingslib.core.AbstractPreferenceController;
 import com.android.settingslib.search.SearchIndexable;

src/com/android/settings/notification/app/AppLinkPreferenceController.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.notification;
+package com.android.settings.notification.app;
 
 import android.content.Context;
 

src/com/android/settings/notification/app/AppNotificationSettings.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.notification;
+package com.android.settings.notification.app;
 
 import android.app.settings.SettingsEnums;
 import android.content.Context;

src/com/android/settings/notification/app/BadgePreferenceController.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.notification;
+package com.android.settings.notification.app;
 
 import static android.provider.Settings.Secure.NOTIFICATION_BADGING;
 
@@ -24,6 +24,7 @@ import android.provider.Settings;
 import androidx.preference.Preference;
 
 import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settings.notification.NotificationBackend;
 import com.android.settingslib.RestrictedSwitchPreference;
 
 public class BadgePreferenceController extends NotificationPreferenceController

src/com/android/settings/notification/app/BlockPreferenceController.java

@@ -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_NONE;
@@ -28,6 +28,7 @@ import androidx.preference.Preference;
 
 import com.android.settings.R;
 import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settings.notification.NotificationBackend;
 import com.android.settings.widget.SwitchBar;
 import com.android.settingslib.widget.LayoutPreference;
 

src/com/android/settings/notification/app/BubblePreferenceController.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.notification;
+package com.android.settings.notification.app;
 
 import static android.provider.Settings.Global.NOTIFICATION_BUBBLES;
 
@@ -24,6 +24,7 @@ import android.provider.Settings;
 
 import com.android.settings.R;
 import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settings.notification.NotificationBackend;
 import com.android.settingslib.RestrictedSwitchPreference;
 
 import androidx.annotation.VisibleForTesting;

src/com/android/settings/notification/app/BubbleSummaryPreferenceController.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.notification;
+package com.android.settings.notification.app;
 
 import static android.provider.Settings.Global.NOTIFICATION_BUBBLES;
 
@@ -26,6 +26,7 @@ import android.provider.Settings;
 import com.android.settings.R;
 import com.android.settings.applications.AppInfoBase;
 import com.android.settings.core.SubSettingLauncher;
+import com.android.settings.notification.NotificationBackend;
 
 import androidx.annotation.VisibleForTesting;
 import androidx.preference.Preference;

src/com/android/settings/notification/app/BubbleWarningDialogFragment.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.settings.notification;
+package com.android.settings.notification.app;
 
 import android.app.Dialog;
 import android.app.settings.SettingsEnums;

src/com/android/settings/notification/app/ChannelListPreferenceController.java

@@ -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;
@@ -36,6 +36,7 @@ import com.android.settings.R;
 import com.android.settings.Utils;
 import com.android.settings.applications.AppInfoBase;
 import com.android.settings.core.SubSettingLauncher;
+import com.android.settings.notification.NotificationBackend;
 import com.android.settings.widget.MasterSwitchPreference;
 import com.android.settingslib.RestrictedSwitchPreference;
 

src/com/android/settings/notification/app/ChannelNotificationSettings.java

@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.android.settings.notification;
+package com.android.settings.notification.app;
 
-import static com.android.settings.notification.ChannelListPreferenceController.ARG_FROM_SETTINGS;
+import static com.android.settings.notification.app.ChannelListPreferenceController.ARG_FROM_SETTINGS;
 
 import android.app.settings.SettingsEnums;
 import android.content.Context;

src/com/android/settings/notification/app/DeletedChannelsPreferenceController.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.notification;
+package com.android.settings.notification.app;
 
 import android.content.Context;
 
@@ -22,6 +22,7 @@ import androidx.preference.Preference;
 
 import com.android.settings.R;
 import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settings.notification.NotificationBackend;
 
 public class DeletedChannelsPreferenceController extends NotificationPreferenceController
         implements PreferenceControllerMixin {

src/com/android/settings/notification/app/DescriptionPreferenceController.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.notification;
+package com.android.settings.notification.app;
 
 import android.content.Context;
 import android.text.TextUtils;

src/com/android/settings/notification/app/DndPreferenceController.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.notification;
+package com.android.settings.notification.app;
 
 import android.app.NotificationChannel;
 import android.content.Context;
@@ -22,6 +22,7 @@ import android.content.Context;
 import androidx.preference.Preference;
 
 import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settings.notification.NotificationBackend;
 import com.android.settingslib.RestrictedSwitchPreference;
 
 public class DndPreferenceController extends NotificationPreferenceController

src/com/android/settings/notification/app/GlobalBubblePermissionObserverMixin.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.notification;
+package com.android.settings.notification.app;
 
 import android.content.Context;
 import android.database.ContentObserver;

src/com/android/settings/notification/app/HeaderPreferenceController.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.notification;
+package com.android.settings.notification.app;
 
 import static com.android.settings.widget.EntityHeaderController.PREF_KEY_APP_HEADER;
 

src/com/android/settings/notification/app/HighImportancePreferenceController.java

@@ -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;
@@ -23,6 +23,7 @@ import android.app.NotificationChannel;
 import android.content.Context;
 
 import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settings.notification.NotificationBackend;
 import com.android.settingslib.RestrictedSwitchPreference;
 
 import androidx.preference.Preference;

src/com/android/settings/notification/app/ImportancePreference.java

@@ -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;

src/com/android/settings/notification/app/ImportancePreferenceController.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.notification;
+package com.android.settings.notification.app;
 
 import static android.app.NotificationChannel.USER_LOCKED_SOUND;
 import static android.app.NotificationManager.IMPORTANCE_DEFAULT;
@@ -25,6 +25,7 @@ import android.media.RingtoneManager;
 import android.provider.Settings;
 
 import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settings.notification.NotificationBackend;
 
 import androidx.preference.Preference;
 

src/com/android/settings/notification/app/LightsPreferenceController.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.notification;
+package com.android.settings.notification.app;
 
 import android.app.NotificationManager;
 import android.content.Context;
@@ -23,6 +23,7 @@ import android.provider.Settings;
 import androidx.preference.Preference;
 
 import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settings.notification.NotificationBackend;
 import com.android.settingslib.RestrictedSwitchPreference;
 
 public class LightsPreferenceController extends NotificationPreferenceController

src/com/android/settings/notification/app/MinImportancePreferenceController.java

@@ -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_MIN;
@@ -23,6 +23,7 @@ import android.app.NotificationChannel;
 import android.content.Context;
 
 import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settings.notification.NotificationBackend;
 import com.android.settingslib.RestrictedSwitchPreference;
 
 import androidx.preference.Preference;

src/com/android/settings/notification/app/NotificationAppPreference.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.settings.notification;
+package com.android.settings.notification.app;
 
 import android.content.Context;
 import android.util.AttributeSet;

src/com/android/settings/notification/app/NotificationFooterPreference.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.notification;
+package com.android.settings.notification.app;
 
 import android.content.Context;
 import android.text.method.LinkMovementMethod;

src/com/android/settings/notification/app/NotificationPreferenceController.java

@@ -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;
 
@@ -29,6 +29,7 @@ import android.util.Log;
 
 import androidx.preference.Preference;
 
+import com.android.settings.notification.NotificationBackend;
 import com.android.settingslib.RestrictedLockUtils;
 import com.android.settingslib.core.AbstractPreferenceController;
 

src/com/android/settings/notification/app/NotificationSettings.java

@@ -14,10 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.notification;
-
-import static android.app.NotificationManager.IMPORTANCE_LOW;
-import static android.app.NotificationManager.IMPORTANCE_NONE;
+package com.android.settings.notification.app;
 
 import static com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
 
@@ -35,11 +32,6 @@ import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
 import android.content.pm.PackageManager.NameNotFoundException;
 import android.content.pm.ResolveInfo;
-import android.graphics.BlendMode;
-import android.graphics.BlendModeColorFilter;
-import android.graphics.drawable.Drawable;
-import android.graphics.drawable.GradientDrawable;
-import android.graphics.drawable.LayerDrawable;
 import android.os.Bundle;
 import android.os.UserHandle;
 import android.provider.Settings;
@@ -47,21 +39,18 @@ import android.text.TextUtils;
 import android.util.Log;
 import android.widget.Toast;
 
-import androidx.preference.Preference;
-import androidx.preference.PreferenceGroup;
 import androidx.preference.PreferenceScreen;
 
 import com.android.settings.R;
 import com.android.settings.SettingsActivity;
-import com.android.settings.Utils;
 import com.android.settings.applications.AppInfoBase;
-import com.android.settings.core.SubSettingLauncher;
 import com.android.settings.dashboard.DashboardFragment;
-import com.android.settings.widget.MasterSwitchPreference;
+import com.android.settings.notification.NotificationBackend;
+import com.android.settings.notification.app.HeaderPreferenceController;
+import com.android.settings.notification.app.NotificationPreferenceController;
 import com.android.settingslib.RestrictedLockUtilsInternal;
 
 import java.util.ArrayList;
-import java.util.Comparator;
 import java.util.List;
 
 abstract public class NotificationSettings extends DashboardFragment {

src/com/android/settings/notification/app/NotificationSoundPreference.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.notification;
+package com.android.settings.notification.app;
 
 import android.content.ContentResolver;
 import android.content.Context;

src/com/android/settings/notification/app/NotificationsOffPreferenceController.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.notification;
+package com.android.settings.notification.app;
 
 import android.content.Context;
 

src/com/android/settings/notification/app/SoundPreferenceController.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.notification;
+package com.android.settings.notification.app;
 
 import static android.media.AudioAttributes.USAGE_ALARM;
 import static android.media.AudioAttributes.USAGE_NOTIFICATION_RINGTONE;
@@ -32,6 +32,7 @@ import androidx.preference.PreferenceScreen;
 
 import com.android.settings.SettingsPreferenceFragment;
 import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settings.notification.NotificationBackend;
 
 public class SoundPreferenceController extends NotificationPreferenceController
         implements PreferenceControllerMixin, Preference.OnPreferenceChangeListener,

src/com/android/settings/notification/app/VibrationPreferenceController.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.notification;
+package com.android.settings.notification.app;
 
 import android.app.NotificationManager;
 import android.content.Context;
@@ -23,6 +23,8 @@ import android.os.Vibrator;
 import androidx.preference.Preference;
 
 import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settings.notification.NotificationBackend;
+import com.android.settings.notification.app.NotificationPreferenceController;
 import com.android.settingslib.RestrictedSwitchPreference;
 
 public class VibrationPreferenceController extends NotificationPreferenceController

src/com/android/settings/notification/app/VisibilityPreferenceController.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.notification;
+package com.android.settings.notification.app;
 
 import android.app.Notification;
 import android.app.NotificationChannel;
@@ -32,6 +32,8 @@ import com.android.internal.widget.LockPatternUtils;
 import com.android.settings.R;
 import com.android.settings.RestrictedListPreference;
 import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settings.notification.NotificationBackend;
+import com.android.settings.notification.app.NotificationPreferenceController;
 import com.android.settingslib.RestrictedLockUtils;
 import com.android.settingslib.RestrictedLockUtilsInternal;
 

src/com/android/settings/notification/history/NotificationStation.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.notification;
+package com.android.settings.notification.history;
 
 import static android.provider.Settings.EXTRA_APP_PACKAGE;
 import static android.provider.Settings.EXTRA_CHANNEL_ID;

src/com/android/settings/notification/zen/AbstractZenCustomRulePreferenceController.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.notification;
+package com.android.settings.notification.zen;
 
 import android.app.AutomaticZenRule;
 import android.content.Context;

src/com/android/settings/notification/zen/AbstractZenModeAutomaticRulePreferenceController.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.notification;
+package com.android.settings.notification.zen;
 
 import android.app.AutomaticZenRule;
 import android.app.NotificationManager;

src/com/android/settings/notification/zen/AbstractZenModePreferenceController.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.notification;
+package com.android.settings.notification.zen;
 
 import android.app.ActivityManager;
 import android.app.AlarmManager;

src/com/android/settings/notification/zen/SettingsZenDurationDialog.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.notification;
+package com.android.settings.notification.zen;
 
 import android.app.Dialog;
 import android.app.settings.SettingsEnums;

src/com/android/settings/notification/zen/ZenAccessSettings.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.notification;
+package com.android.settings.notification.zen;
 
 import android.annotation.Nullable;
 import android.app.ActivityManager;

src/com/android/settings/notification/zen/ZenAutomaticRuleHeaderPreferenceController.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.notification;
+package com.android.settings.notification.zen;
 
 import static com.android.settings.widget.EntityHeaderController.PREF_KEY_APP_HEADER;
 

src/com/android/settings/notification/zen/ZenAutomaticRuleSwitchPreferenceController.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.notification;
+package com.android.settings.notification.zen;
 
 import android.app.AutomaticZenRule;
 import android.content.Context;

src/com/android/settings/notification/zen/ZenCustomRadioButtonPreference.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.notification;
+package com.android.settings.notification.zen;
 
 import android.content.Context;
 import android.util.AttributeSet;

src/com/android/settings/notification/zen/ZenCustomRuleBlockedEffectsSettings.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.notification;
+package com.android.settings.notification.zen;
 
 import android.app.settings.SettingsEnums;
 import android.content.Context;

src/com/android/settings/notification/zen/ZenCustomRuleCallsSettings.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.notification;
+package com.android.settings.notification.zen;
 
 import android.app.settings.SettingsEnums;
 import android.content.Context;

src/com/android/settings/notification/zen/ZenCustomRuleConfigSettings.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.notification;
+package com.android.settings.notification.zen;
 
 import android.app.NotificationManager;
 import android.app.settings.SettingsEnums;

src/com/android/settings/notification/zen/ZenCustomRuleMessagesSettings.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.notification;
+package com.android.settings.notification.zen;
 
 import android.app.settings.SettingsEnums;
 import android.content.Context;

src/com/android/settings/notification/zen/ZenCustomRuleNotificationsSettings.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.notification;
+package com.android.settings.notification.zen;
 
 import android.app.settings.SettingsEnums;
 import android.content.Context;

src/com/android/settings/notification/zen/ZenCustomRuleSettings.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.notification;
+package com.android.settings.notification.zen;
 
 import android.app.settings.SettingsEnums;
 import android.content.Context;

src/com/android/settings/notification/zen/ZenCustomRuleSettingsBase.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.notification;
+package com.android.settings.notification.zen;
 
 import android.app.AutomaticZenRule;
 import android.content.Context;

src/com/android/settings/notification/zen/ZenDeleteRuleDialog.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.notification;
+package com.android.settings.notification.zen;
 
 import android.app.Dialog;
 import android.app.settings.SettingsEnums;

src/com/android/settings/notification/zen/ZenDurationDialogPreference.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.notification;
+package com.android.settings.notification.zen;
 
 import android.content.Context;
 import android.content.DialogInterface;

src/com/android/settings/notification/zen/ZenFooterPreferenceController.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.notification;
+package com.android.settings.notification.zen;
 
 import android.app.NotificationManager.Policy;
 import android.content.Context;

src/com/android/settings/notification/zen/ZenModeAddAutomaticRulePreferenceController.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.notification;
+package com.android.settings.notification.zen;
 
 import android.content.Context;
 import android.content.Intent;

src/com/android/settings/notification/zen/ZenModeAlarmsPreferenceController.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.notification;
+package com.android.settings.notification.zen;
 
 import android.app.NotificationManager.Policy;
 import android.app.settings.SettingsEnums;

src/com/android/settings/notification/zen/ZenModeAllBypassingAppsPreferenceController.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.notification;
+package com.android.settings.notification.zen;
 
 import android.app.Application;
 import android.app.NotificationChannel;
@@ -33,6 +33,8 @@ import com.android.settings.R;
 import com.android.settings.applications.AppInfoBase;
 import com.android.settings.core.PreferenceControllerMixin;
 import com.android.settings.core.SubSettingLauncher;
+import com.android.settings.notification.app.ChannelNotificationSettings;
+import com.android.settings.notification.NotificationBackend;
 import com.android.settingslib.applications.ApplicationsState;
 import com.android.settingslib.core.AbstractPreferenceController;
 import com.android.settingslib.widget.apppreference.AppPreference;

src/com/android/settings/notification/zen/ZenModeAutomaticRulesPreferenceController.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.notification;
+package com.android.settings.notification.zen;
 
 import android.app.AutomaticZenRule;
 import android.content.Context;

src/com/android/settings/notification/zen/ZenModeAutomationPreferenceController.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.notification;
+package com.android.settings.notification.zen;
 
 import android.content.Context;
 

src/com/android/settings/notification/zen/ZenModeAutomationSettings.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.notification;
+package com.android.settings.notification.zen;
 
 import android.app.AlertDialog;
 import android.app.AutomaticZenRule;

src/com/android/settings/notification/zen/ZenModeBackend.java

@@ -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_SCREEN_OFF;
 import static android.app.NotificationManager.Policy.SUPPRESSED_EFFECT_SCREEN_ON;

src/com/android/settings/notification/zen/ZenModeBehaviorFooterPreferenceController.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.notification;
+package com.android.settings.notification.zen;
 
 import android.content.ComponentName;
 import android.content.Context;

src/com/android/settings/notification/zen/ZenModeBlockedEffectsPreferenceController.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.notification;
+package com.android.settings.notification.zen;
 
 import android.content.Context;
 

src/com/android/settings/notification/zen/ZenModeBlockedEffectsSettings.java

@@ -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;

src/com/android/settings/notification/zen/ZenModeButtonPreferenceController.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.notification;
+package com.android.settings.notification.zen;
 
 import android.app.settings.SettingsEnums;
 import android.content.Context;
@@ -27,6 +27,7 @@ import androidx.preference.Preference;
 
 import com.android.settings.R;
 import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settings.notification.SettingsEnableZenModeDialog;
 import com.android.settingslib.core.lifecycle.Lifecycle;
 import com.android.settingslib.widget.LayoutPreference;
 

src/com/android/settings/notification/zen/ZenModeBypassingAppsPreferenceController.java

@@ -1,9 +1,10 @@
-package com.android.settings.notification;
+package com.android.settings.notification.zen;
 
 import android.content.Context;
 import android.os.UserHandle;
 
 import com.android.settings.R;
+import com.android.settings.notification.NotificationBackend;
 import com.android.settingslib.core.lifecycle.Lifecycle;
 
 public class ZenModeBypassingAppsPreferenceController extends AbstractZenModePreferenceController {

src/com/android/settings/notification/zen/ZenModeBypassingAppsSettings.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.notification;
+package com.android.settings.notification.zen;
 
 import android.app.Activity;
 import android.app.Application;

src/com/android/settings/notification/zen/ZenModeCallsPreferenceController.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.notification;
+package com.android.settings.notification.zen;
 
 import android.app.NotificationManager;
 import android.content.Context;

src/com/android/settings/notification/zen/ZenModeCallsSettings.java

@@ -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;
 

src/com/android/settings/notification/zen/ZenModeDurationPreferenceController.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.notification;
+package com.android.settings.notification.zen;
 
 import android.content.Context;
 

src/com/android/settings/notification/zen/ZenModeEventRuleSettings.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.notification;
+package com.android.settings.notification.zen;
 
 import android.app.AutomaticZenRule;
 import android.app.settings.SettingsEnums;

src/com/android/settings/notification/zen/ZenModeEventsPreferenceController.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.notification;
+package com.android.settings.notification.zen;
 
 import android.app.NotificationManager.Policy;
 import android.app.settings.SettingsEnums;

src/com/android/settings/notification/zen/ZenModeMediaPreferenceController.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.notification;
+package com.android.settings.notification.zen;
 
 import android.app.NotificationManager.Policy;
 import android.content.Context;

src/com/android/settings/notification/zen/ZenModeMessagesPreferenceController.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.notification;
+package com.android.settings.notification.zen;
 
 import android.app.NotificationManager;
 import android.content.Context;

src/com/android/settings/notification/zen/ZenModeMessagesSettings.java

@@ -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_MESSAGES;
 

src/com/android/settings/notification/zen/ZenModePreferenceController.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.notification;
+package com.android.settings.notification.zen;
 
 import android.content.ContentResolver;
 import android.content.Context;

src/com/android/settings/notification/zen/ZenModePriorityCallsPreferenceController.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.notification;
+package com.android.settings.notification.zen;
 
 import android.app.NotificationManager;
 import android.content.Context;

src/com/android/settings/notification/zen/ZenModePriorityMessagesPreferenceController.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.notification;
+package com.android.settings.notification.zen;
 
 import android.app.NotificationManager;
 import android.content.Context;

src/com/android/settings/notification/zen/ZenModeRemindersPreferenceController.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.notification;
+package com.android.settings.notification.zen;
 
 import android.app.NotificationManager;
 import android.app.settings.SettingsEnums;

src/com/android/settings/notification/zen/ZenModeRepeatCallersPreferenceController.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.notification;
+package com.android.settings.notification.zen;
 
 import android.app.NotificationManager.Policy;
 import android.app.settings.SettingsEnums;

src/com/android/settings/notification/zen/ZenModeRestrictNotificationsSettings.java

@@ -14,12 +14,11 @@
  * limitations under the License.
  */
 
-package com.android.settings.notification;
+package com.android.settings.notification.zen;
 
 import android.app.settings.SettingsEnums;
 import android.content.Context;
 import android.os.Bundle;
-import android.provider.SearchIndexableResource;
 
 import com.android.settings.R;
 import com.android.settings.search.BaseSearchIndexProvider;

src/com/android/settings/notification/zen/ZenModeRuleSettingsBase.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.notification;
+package com.android.settings.notification.zen;
 
 import android.app.AutomaticZenRule;
 import android.app.NotificationManager;

src/com/android/settings/notification/zen/ZenModeScheduleDaysSelection.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.notification;
+package com.android.settings.notification.zen;
 
 import android.content.Context;
 import android.util.SparseBooleanArray;

src/com/android/settings/notification/zen/ZenModeScheduleRuleSettings.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.notification;
+package com.android.settings.notification.zen;
 
 import android.app.AutomaticZenRule;
 import android.app.Dialog;

src/com/android/settings/notification/zen/ZenModeSettings.java

@@ -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_ALARMS;
 import static android.app.NotificationManager.Policy.PRIORITY_CATEGORY_CALLS;
@@ -30,7 +30,6 @@ import android.app.NotificationManager;
 import android.app.NotificationManager.Policy;
 import android.app.settings.SettingsEnums;
 import android.content.Context;
-import android.provider.SearchIndexableResource;
 import android.provider.Settings;
 import android.service.notification.ZenModeConfig;
 
@@ -39,13 +38,11 @@ import androidx.fragment.app.FragmentManager;
 
 import com.android.settings.R;
 import com.android.settings.search.BaseSearchIndexProvider;
-import com.android.settingslib.search.Indexable;
 import com.android.settingslib.core.AbstractPreferenceController;
 import com.android.settingslib.core.lifecycle.Lifecycle;
 import com.android.settingslib.search.SearchIndexable;
 
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;

src/com/android/settings/notification/zen/ZenModeSettingsBase.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.notification;
+package com.android.settings.notification.zen;
 
 import android.content.Context;
 import android.database.ContentObserver;