Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5c642663 authored by Ioana Alexandru's avatar Ioana Alexandru Committed by Android (Google) Code Review
Browse files

Merge "Consolidate statusbar/notification and notification/" into main

parents 9b192cf1 b2dfa6a1

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

+2 −2
Original line number Diff line number Diff line
@@ -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

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

+2 −2
Original line number Diff line number Diff line
@@ -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

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

+1 −1
Original line number Diff line number Diff line
@@ -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 {