Merge "Ensure the VoicemailSettingsActivity supports edge to edge." into main
diff --git a/src/com/android/phone/settings/VoicemailSettingsActivity.java b/src/com/android/phone/settings/VoicemailSettingsActivity.java
index 909a3ad..baae26b 100644
--- a/src/com/android/phone/settings/VoicemailSettingsActivity.java
+++ b/src/com/android/phone/settings/VoicemailSettingsActivity.java
@@ -264,6 +264,8 @@
                 NotificationChannelController.CHANNEL_ID_VOICE_MAIL);
         intent.putExtra(Settings.EXTRA_APP_PACKAGE, mPhone.getContext().getPackageName());
         mVoicemailNotificationPreference.setIntent(intent);
+
+        SettingsConstants.setupEdgeToEdge(this);
     }
 
     @Override
@@ -289,6 +291,10 @@
         mPreviousVMProviderKey = mVoicemailProviders.getValue();
 
         mVoicemailSettings = (PreferenceScreen) findPreference(BUTTON_VOICEMAIL_SETTING_KEY);
+        // 😮‍💨 the legacy PreferenceScreen displays a dialog in its onClick.  Set a property on the
+        // PreferenceScreen to ensure that it will fit system windows to accommodate for edge to
+        // edge.
+        mVoicemailSettings.setDialogFitsSystemWindows(true);
 
         maybeHidePublicSettings();