From b2dfa6a1235a26ad439618b8a728fc0ab686fbeb Mon Sep 17 00:00:00 2001
From: Ioana Alexandru <aioana@google.com>
Date: Fri, 21 Jun 2024 15:20:26 +0200
Subject: [PATCH] Consolidate statusbar/notification and notification/

Move everything to notification/ in SettingsLib. Also have all
corresponding tests as deviceless tests in the correct directory.

Bug: NA
Flag: EXEMPT trivial refactor
Test: existing tests pass
Change-Id: I1b5650424e7ee2eff5d42995ec0ce85555d19c04
---
 .../settings/notification/SettingsEnableZenModeDialog.java    | 4 ++--
 .../settings/notification/zen/SettingsZenDurationDialog.java  | 4 ++--
 .../notification/zen/ZenDurationDialogPreference.java         | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/com/android/settings/notification/SettingsEnableZenModeDialog.java b/src/com/android/settings/notification/SettingsEnableZenModeDialog.java
index 880db35b59c..d851caf3bdc 100644
--- a/src/com/android/settings/notification/SettingsEnableZenModeDialog.java
+++ b/src/com/android/settings/notification/SettingsEnableZenModeDialog.java
@@ -21,13 +21,13 @@ import android.app.settings.SettingsEnums;
 import android.os.Bundle;
 
 import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
+import com.android.settingslib.notification.modes.EnableZenModeDialog;
 
 public class SettingsEnableZenModeDialog extends InstrumentedDialogFragment {
 
     @Override
     public Dialog onCreateDialog(Bundle savedInstanceState) {
-         return new com.android.settingslib.notification.EnableZenModeDialog(
-                 getContext()).createDialog();
+         return new EnableZenModeDialog(getContext()).createDialog();
     }
 
     @Override
diff --git a/src/com/android/settings/notification/zen/SettingsZenDurationDialog.java b/src/com/android/settings/notification/zen/SettingsZenDurationDialog.java
index c8d6eb9735a..bb83a730837 100644
--- a/src/com/android/settings/notification/zen/SettingsZenDurationDialog.java
+++ b/src/com/android/settings/notification/zen/SettingsZenDurationDialog.java
@@ -21,13 +21,13 @@ import android.app.settings.SettingsEnums;
 import android.os.Bundle;
 
 import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
+import com.android.settingslib.notification.modes.ZenDurationDialog;
 
 public class SettingsZenDurationDialog extends InstrumentedDialogFragment {
 
     @Override
     public Dialog onCreateDialog(Bundle savedInstanceState) {
-        return new com.android.settingslib.notification.ZenDurationDialog(
-                getContext()).createDialog();
+        return new ZenDurationDialog(getContext()).createDialog();
     }
 
     @Override
diff --git a/src/com/android/settings/notification/zen/ZenDurationDialogPreference.java b/src/com/android/settings/notification/zen/ZenDurationDialogPreference.java
index 11def66c4d1..f243a5170b6 100644
--- a/src/com/android/settings/notification/zen/ZenDurationDialogPreference.java
+++ b/src/com/android/settings/notification/zen/ZenDurationDialogPreference.java
@@ -23,7 +23,7 @@ import android.util.AttributeSet;
 import androidx.appcompat.app.AlertDialog;
 
 import com.android.settingslib.CustomDialogPreferenceCompat;
-import com.android.settingslib.notification.ZenDurationDialog;
+import com.android.settingslib.notification.modes.ZenDurationDialog;
 
 public class ZenDurationDialogPreference extends CustomDialogPreferenceCompat {