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
This commit is contained in:
@@ -21,13 +21,13 @@ import android.app.settings.SettingsEnums;
|
|||||||
import android.os.Bundle;
|
import android.os.Bundle;
|
||||||
|
|
||||||
import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
|
import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
|
||||||
|
import com.android.settingslib.notification.modes.EnableZenModeDialog;
|
||||||
|
|
||||||
public class SettingsEnableZenModeDialog extends InstrumentedDialogFragment {
|
public class SettingsEnableZenModeDialog extends InstrumentedDialogFragment {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public Dialog onCreateDialog(Bundle savedInstanceState) {
|
public Dialog onCreateDialog(Bundle savedInstanceState) {
|
||||||
return new com.android.settingslib.notification.EnableZenModeDialog(
|
return new EnableZenModeDialog(getContext()).createDialog();
|
||||||
getContext()).createDialog();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
@@ -21,13 +21,13 @@ import android.app.settings.SettingsEnums;
|
|||||||
import android.os.Bundle;
|
import android.os.Bundle;
|
||||||
|
|
||||||
import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
|
import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
|
||||||
|
import com.android.settingslib.notification.modes.ZenDurationDialog;
|
||||||
|
|
||||||
public class SettingsZenDurationDialog extends InstrumentedDialogFragment {
|
public class SettingsZenDurationDialog extends InstrumentedDialogFragment {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public Dialog onCreateDialog(Bundle savedInstanceState) {
|
public Dialog onCreateDialog(Bundle savedInstanceState) {
|
||||||
return new com.android.settingslib.notification.ZenDurationDialog(
|
return new ZenDurationDialog(getContext()).createDialog();
|
||||||
getContext()).createDialog();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
@@ -23,7 +23,7 @@ import android.util.AttributeSet;
|
|||||||
import androidx.appcompat.app.AlertDialog;
|
import androidx.appcompat.app.AlertDialog;
|
||||||
|
|
||||||
import com.android.settingslib.CustomDialogPreferenceCompat;
|
import com.android.settingslib.CustomDialogPreferenceCompat;
|
||||||
import com.android.settingslib.notification.ZenDurationDialog;
|
import com.android.settingslib.notification.modes.ZenDurationDialog;
|
||||||
|
|
||||||
public class ZenDurationDialogPreference extends CustomDialogPreferenceCompat {
|
public class ZenDurationDialogPreference extends CustomDialogPreferenceCompat {
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user