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

Commit 07534f76 authored by Ioana Alexandru's avatar Ioana Alexandru
Browse files

Rename SettingsEnableZenModeDialog to EnableDndDialogFragment 

We also renamed the base EnableZenModeDialog to
EnableDndDialogFactory, see other CL in topic.

Flag: EXEMPT trivial rename
Test: builds
Bug: 388261320
Change-Id: Iaa2043bbb8d1f62482d0c38d0951da4025676f27
parent 9c144753

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

+4 −4
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;

import com.android.settingslib.notification.modes.EnableDndDialogFactory;



public class SettingsEnableZenModeDialog extends InstrumentedDialogFragment {

public class EnableDndDialogFragment extends InstrumentedDialogFragment {



    @Override

    public Dialog onCreateDialog(Bundle savedInstanceState) {

         return new EnableZenModeDialog(getContext()).createDialog();

        return new EnableDndDialogFactory(getContext()).createDialog();

    }



    @Override

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

+2 −2
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ import androidx.fragment.app.Fragment; 
import androidx.preference.Preference;



import com.android.settings.R;

import com.android.settings.notification.SettingsEnableZenModeDialog;

import com.android.settings.notification.EnableDndDialogFragment;

import com.android.settingslib.notification.modes.ZenMode;

import com.android.settingslib.notification.modes.ZenModesBackend;

import com.android.settingslib.widget.LayoutPreference;
@@ -69,7 +69,7 @@ class ZenModeButtonPreferenceController extends AbstractZenModePreferenceControl 
                    int zenDuration = mDurationHelper.getZenDuration();

                    switch (zenDuration) {

                        case Settings.Secure.ZEN_DURATION_PROMPT:

                            new SettingsEnableZenModeDialog().show(

                            new EnableDndDialogFragment().show(

                                    mParent.getParentFragmentManager(), TAG);

                            break;

                        case Settings.Secure.ZEN_DURATION_FOREVER:

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;

import com.android.settingslib.notification.modes.DndDurationDialogFactory;



public class SettingsZenDurationDialog extends InstrumentedDialogFragment {



    @Override

    public Dialog onCreateDialog(Bundle savedInstanceState) {

        return new ZenDurationDialog(getContext()).createDialog();

        return new DndDurationDialogFactory(getContext()).createDialog();

    }



    @Override

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

+2 −2
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.modes.ZenDurationDialog;

import com.android.settingslib.notification.modes.DndDurationDialogFactory;



public class ZenDurationDialogPreference extends CustomDialogPreferenceCompat {
@@ -48,7 +48,7 @@ public class ZenDurationDialogPreference extends CustomDialogPreferenceCompat { 
            DialogInterface.OnClickListener listener) {

        super.onPrepareDialogBuilder(builder, listener);



        ZenDurationDialog zenDialog = new ZenDurationDialog(getContext());

        DndDurationDialogFactory zenDialog = new DndDurationDialogFactory(getContext());

        zenDialog.setupDialog(builder);

    }

}

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

+2 −2
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ import androidx.preference.Preference; 
import com.android.settings.R;

import com.android.settings.core.PreferenceControllerMixin;

import com.android.settings.dashboard.DashboardFragment;

import com.android.settings.notification.SettingsEnableZenModeDialog;

import com.android.settings.notification.EnableDndDialogFragment;

import com.android.settingslib.core.lifecycle.Lifecycle;

import com.android.settingslib.widget.LayoutPreference;
@@ -118,7 +118,7 @@ public class ZenModeButtonPreferenceController extends AbstractZenModePreference 
            int zenDuration = getZenDuration();

            switch (zenDuration) {

                case Settings.Secure.ZEN_DURATION_PROMPT:

                    new SettingsEnableZenModeDialog().show(mFragment, TAG);

                    new EnableDndDialogFragment().show(mFragment, TAG);

                    break;

                case Settings.Secure.ZEN_DURATION_FOREVER:

                    mBackend.setZenMode(Settings.Global.ZEN_MODE_IMPORTANT_INTERRUPTIONS);