PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename SettingsEnableZenModeDialog to EnableDndDialogFragment

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

Flag: EXEMPT trivial rename
Test: builds
Bug: 388261320
Change-Id: Iaa2043bbb8d1f62482d0c38d0951da4025676f27
This commit is contained in:
Ioana Alexandru
2025-01-15 16:50:46 +01:00
parent 9c1447536a
commit 07534f76a9
5 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/com/android/settings/notification/SettingsEnableZenModeDialog.java → src/com/android/settings/notification/EnableDndDialogFragment.java
View File

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

4
src/com/android/settings/notification/modes/ZenModeButtonPreferenceController.java
View File

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

4
src/com/android/settings/notification/zen/SettingsZenDurationDialog.java
View File

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

4
src/com/android/settings/notification/zen/ZenDurationDialogPreference.java
View File

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

4
src/com/android/settings/notification/zen/ZenModeButtonPreferenceController.java
View File

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