[QSDetailedView] Make the current InternetDialogDelegate legacy

This cl did the following thing to prepare for adding the shared
details content manager by the dialog and the non-dialog videw:
1) Added the `assertInNewMode` function in QsDetailedView flag.
2) Renamed `InternetDialogDelegate` -> `InternetDialogDelegateLegacy`.
Added a TODO to `assertInLegacyMode` in the constructor. If we add
this line directly, the UI will crash when the flag is enabled.
3) Corresponding tests change.

Bug:b/377388104
Flag: com.android.systemui.qs_tile_detailed_view
Test: InternetDialogDelegateLegacyTest
Change-Id: I27abec6eb145da42f873d67c490b839e4b8992ab
diff --git a/packages/SystemUI/Android.bp b/packages/SystemUI/Android.bp
index 7de258b..b88ae37 100644
--- a/packages/SystemUI/Android.bp
+++ b/packages/SystemUI/Android.bp
@@ -278,7 +278,7 @@
         "tests/src/**/systemui/media/controls/domain/pipeline/LegacyMediaDataManagerImplTest.kt",
         "tests/src/**/systemui/temporarydisplay/chipbar/SwipeChipbarAwayGestureHandlerTest.kt",
         "tests/src/**/systemui/qs/tiles/HotspotTileTest.java",
-        "tests/src/**/systemui/qs/tiles/dialog/InternetDialogDelegateTest.java",
+        "tests/src/**/systemui/qs/tiles/dialog/InternetDialogDelegateLegacyTest.java",
         "tests/src/**/systemui/navigationbar/NavigationBarControllerImplTest.java",
         "tests/src/**/systemui/wmshell/BubblesTest.java",
         "tests/src/**/systemui/statusbar/phone/StatusBarNotificationActivityStarterTest.java",
diff --git a/packages/SystemUI/src/com/android/systemui/qs/flags/QsDetailedView.kt b/packages/SystemUI/src/com/android/systemui/qs/flags/QsDetailedView.kt
index ffeec4e..c302cb2 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/flags/QsDetailedView.kt
+++ b/packages/SystemUI/src/com/android/systemui/qs/flags/QsDetailedView.kt
@@ -79,6 +79,14 @@
     @JvmStatic
     inline fun assertInLegacyMode() = RefactorFlagUtils.assertInLegacyMode(isEnabled, FLAG_NAME)
 
+    /**
+     * Called to ensure code is only run when the flag is enabled. This will throw an exception if
+     * the flag is not enabled to ensure that the refactor author catches issues in testing.
+     * Caution!! Using this check incorrectly will cause crashes in nextfood builds!
+     */
+    @JvmStatic
+    inline fun assertInNewMode() = RefactorFlagUtils.assertInNewMode(isEnabled, FLAG_NAME)
+
     /** Returns a developer-readable string that describes the current requirement list. */
     @JvmStatic
     fun requirementDescription(): String {
diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/dialog/InternetDialogDelegate.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/dialog/InternetDialogDelegateLegacy.java
similarity index 99%
rename from packages/SystemUI/src/com/android/systemui/qs/tiles/dialog/InternetDialogDelegate.java
rename to packages/SystemUI/src/com/android/systemui/qs/tiles/dialog/InternetDialogDelegateLegacy.java
index c2bc2a7..82367eb 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/tiles/dialog/InternetDialogDelegate.java
+++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/dialog/InternetDialogDelegateLegacy.java
@@ -90,7 +90,7 @@
 /**
  * Dialog for showing mobile network, connected Wi-Fi network and Wi-Fi networks.
  */
-public class InternetDialogDelegate implements
+public class InternetDialogDelegateLegacy implements
         SystemUIDialog.Delegate,
         InternetDetailsContentController.InternetDialogCallback {
     private static final String TAG = "InternetDialog";
@@ -184,7 +184,7 @@
 
     @AssistedFactory
     public interface Factory {
-        InternetDialogDelegate create(
+        InternetDialogDelegateLegacy create(
                 @Assisted(ABOVE_STATUS_BAR) boolean aboveStatusBar,
                 @Assisted(CAN_CONFIG_MOBILE_DATA) boolean canConfigMobileData,
                 @Assisted(CAN_CONFIG_WIFI) boolean canConfigWifi,
@@ -192,7 +192,7 @@
     }
 
     @AssistedInject
-    public InternetDialogDelegate(
+    public InternetDialogDelegateLegacy(
             @ShadeDisplayAware Context context,
             InternetDialogManager internetDialogManager,
             InternetDetailsContentController internetDetailsContentController,
@@ -207,6 +207,8 @@
             KeyguardStateController keyguardStateController,
             SystemUIDialog.Factory systemUIDialogFactory,
             ShadeDialogContextInteractor shadeDialogContextInteractor) {
+        // TODO: b/377388104 QsDetailedView.assertInLegacyMode();
+
         mAboveStatusBar = aboveStatusBar;
         mSystemUIDialogFactory = systemUIDialogFactory;
         mShadeDialogContextInteractor = shadeDialogContextInteractor;
diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/dialog/InternetDialogManager.kt b/packages/SystemUI/src/com/android/systemui/qs/tiles/dialog/InternetDialogManager.kt
index f674971..8a54648 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/tiles/dialog/InternetDialogManager.kt
+++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/dialog/InternetDialogManager.kt
@@ -32,13 +32,13 @@
 private const val TAG = "InternetDialogFactory"
 private val DEBUG = Log.isLoggable(TAG, Log.DEBUG)
 
-/** Factory to create [InternetDialogDelegate] objects. */
+/** Factory to create [InternetDialogDelegateLegacy] objects. */
 @SysUISingleton
 class InternetDialogManager
 @Inject
 constructor(
     private val dialogTransitionAnimator: DialogTransitionAnimator,
-    private val dialogFactory: InternetDialogDelegate.Factory,
+    private val dialogFactory: InternetDialogDelegateLegacy.Factory,
     @Background private val bgDispatcher: CoroutineDispatcher,
 ) {
     private lateinit var coroutineScope: CoroutineScope
@@ -48,8 +48,8 @@
     }
 
     /**
-     * Creates a [InternetDialogDelegate]. The dialog will be animated from [expandable] if it is
-     * not null.
+     * Creates a [InternetDialogDelegateLegacy]. The dialog will be animated from [expandable] if
+     * it is not null.
      */
     fun create(
         aboveStatusBar: Boolean,
@@ -64,6 +64,7 @@
             return
         } else {
             coroutineScope = CoroutineScope(bgDispatcher + newTracingContext("InternetDialogScope"))
+            // TODO: b/377388104 check the QsDetailedView flag to use the correct dialogFactory
             dialog =
                 dialogFactory
                     .create(aboveStatusBar, canConfigMobileData, canConfigWifi, coroutineScope)
diff --git a/packages/SystemUI/tests/src/com/android/systemui/qs/tiles/dialog/InternetDialogDelegateTest.java b/packages/SystemUI/tests/src/com/android/systemui/qs/tiles/dialog/InternetDialogDelegateLegacyTest.java
similarity index 73%
rename from packages/SystemUI/tests/src/com/android/systemui/qs/tiles/dialog/InternetDialogDelegateTest.java
rename to packages/SystemUI/tests/src/com/android/systemui/qs/tiles/dialog/InternetDialogDelegateLegacyTest.java
index a33bd98..2385515 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/qs/tiles/dialog/InternetDialogDelegateTest.java
+++ b/packages/SystemUI/tests/src/com/android/systemui/qs/tiles/dialog/InternetDialogDelegateLegacyTest.java
@@ -58,7 +58,7 @@
 @RunWith(AndroidJUnit4.class)
 @TestableLooper.RunWithLooper(setAsMainLooper = true)
 @UiThreadTest
-public class InternetDialogDelegateTest extends SysuiTestCase {
+public class InternetDialogDelegateLegacyTest extends SysuiTestCase {
 
     private static final String MOBILE_NETWORK_TITLE = "Mobile Title";
     private static final String MOBILE_NETWORK_SUMMARY = "Mobile Summary";
@@ -91,7 +91,7 @@
     private Window mWindow;
 
     private FakeExecutor mBgExecutor = new FakeExecutor(new FakeSystemClock());
-    private InternetDialogDelegate mInternetDialogDelegate;
+    private InternetDialogDelegateLegacy mInternetDialogDelegateLegacy;
     private View mDialogView;
     private View mSubTitle;
     private LinearLayout mEthernet;
@@ -137,7 +137,7 @@
     }
 
     private void createInternetDialog() {
-        mInternetDialogDelegate = new InternetDialogDelegate(
+        mInternetDialogDelegateLegacy = new InternetDialogDelegateLegacy(
                 mContext,
                 mock(InternetDialogManager.class),
                 mInternetDetailsContentController,
@@ -152,13 +152,13 @@
                 mKeyguard,
                 mSystemUIDialogFactory,
                 new FakeShadeDialogContextInteractor(mContext));
-        mInternetDialogDelegate.createDialog();
-        mInternetDialogDelegate.onCreate(mSystemUIDialog, null);
-        mInternetDialogDelegate.mAdapter = mInternetAdapter;
-        mInternetDialogDelegate.mConnectedWifiEntry = mInternetWifiEntry;
-        mInternetDialogDelegate.mWifiEntriesCount = mWifiEntries.size();
+        mInternetDialogDelegateLegacy.createDialog();
+        mInternetDialogDelegateLegacy.onCreate(mSystemUIDialog, null);
+        mInternetDialogDelegateLegacy.mAdapter = mInternetAdapter;
+        mInternetDialogDelegateLegacy.mConnectedWifiEntry = mInternetWifiEntry;
+        mInternetDialogDelegateLegacy.mWifiEntriesCount = mWifiEntries.size();
 
-        mDialogView = mInternetDialogDelegate.mDialogView;
+        mDialogView = mInternetDialogDelegateLegacy.mDialogView;
         mSubTitle = mDialogView.requireViewById(R.id.internet_dialog_subtitle);
         mEthernet = mDialogView.requireViewById(R.id.ethernet_layout);
         mMobileDataLayout = mDialogView.requireViewById(R.id.mobile_network_layout);
@@ -171,13 +171,13 @@
         mSeeAll = mDialogView.requireViewById(R.id.see_all_layout);
         mWifiScanNotify = mDialogView.requireViewById(R.id.wifi_scan_notify_layout);
         mAirplaneModeSummaryText = mDialogView.requireViewById(R.id.airplane_mode_summary);
-        mInternetDialogDelegate.onStart(mSystemUIDialog);
+        mInternetDialogDelegateLegacy.onStart(mSystemUIDialog);
     }
 
     @After
     public void tearDown() {
-        mInternetDialogDelegate.onStop(mSystemUIDialog);
-        mInternetDialogDelegate.dismissDialog();
+        mInternetDialogDelegateLegacy.onStop(mSystemUIDialog);
+        mInternetDialogDelegateLegacy.dismissDialog();
         mMockitoSession.finishMocking();
     }
 
@@ -189,9 +189,9 @@
 
     @Test
     public void hideWifiViews_WifiViewsGone() {
-        mInternetDialogDelegate.hideWifiViews();
+        mInternetDialogDelegateLegacy.hideWifiViews();
 
-        assertThat(mInternetDialogDelegate.mIsProgressBarVisible).isFalse();
+        assertThat(mInternetDialogDelegateLegacy.mIsProgressBarVisible).isFalse();
         assertThat(mWifiToggle.getVisibility()).isEqualTo(View.GONE);
         assertThat(mConnectedWifi.getVisibility()).isEqualTo(View.GONE);
         assertThat(mWifiList.getVisibility()).isEqualTo(View.GONE);
@@ -201,11 +201,11 @@
     @Test
     public void updateDialog_withApmOn_internetDialogSubTitleGone() {
         when(mInternetDetailsContentController.isAirplaneModeEnabled()).thenReturn(true);
-        mInternetDialogDelegate.updateDialog(true);
+        mInternetDialogDelegateLegacy.updateDialog(true);
         mBgExecutor.runAllReady();
 
-        mInternetDialogDelegate.mDataInternetContent.observe(
-                mInternetDialogDelegate.mLifecycleOwner, i -> {
+        mInternetDialogDelegateLegacy.mDataInternetContent.observe(
+                mInternetDialogDelegateLegacy.mLifecycleOwner, i -> {
                     assertThat(mSubTitle.getVisibility()).isEqualTo(View.VISIBLE);
                 });
     }
@@ -213,11 +213,11 @@
     @Test
     public void updateDialog_withApmOff_internetDialogSubTitleVisible() {
         when(mInternetDetailsContentController.isAirplaneModeEnabled()).thenReturn(false);
-        mInternetDialogDelegate.updateDialog(true);
+        mInternetDialogDelegateLegacy.updateDialog(true);
         mBgExecutor.runAllReady();
 
-        mInternetDialogDelegate.mDataInternetContent.observe(
-                mInternetDialogDelegate.mLifecycleOwner, i -> {
+        mInternetDialogDelegateLegacy.mDataInternetContent.observe(
+                mInternetDialogDelegateLegacy.mLifecycleOwner, i -> {
                     assertThat(mSubTitle.getVisibility()).isEqualTo(View.VISIBLE);
                 });
     }
@@ -226,11 +226,11 @@
     public void updateDialog_apmOffAndHasEthernet_showEthernet() {
         when(mInternetDetailsContentController.isAirplaneModeEnabled()).thenReturn(false);
         when(mInternetDetailsContentController.hasEthernet()).thenReturn(true);
-        mInternetDialogDelegate.updateDialog(true);
+        mInternetDialogDelegateLegacy.updateDialog(true);
         mBgExecutor.runAllReady();
 
-        mInternetDialogDelegate.mDataInternetContent.observe(
-                mInternetDialogDelegate.mLifecycleOwner, i -> {
+        mInternetDialogDelegateLegacy.mDataInternetContent.observe(
+                mInternetDialogDelegateLegacy.mLifecycleOwner, i -> {
                     assertThat(mEthernet.getVisibility()).isEqualTo(View.VISIBLE);
                 });
     }
@@ -239,11 +239,11 @@
     public void updateDialog_apmOffAndNoEthernet_hideEthernet() {
         when(mInternetDetailsContentController.isAirplaneModeEnabled()).thenReturn(false);
         when(mInternetDetailsContentController.hasEthernet()).thenReturn(false);
-        mInternetDialogDelegate.updateDialog(true);
+        mInternetDialogDelegateLegacy.updateDialog(true);
         mBgExecutor.runAllReady();
 
-        mInternetDialogDelegate.mDataInternetContent.observe(
-                mInternetDialogDelegate.mLifecycleOwner, i -> {
+        mInternetDialogDelegateLegacy.mDataInternetContent.observe(
+                mInternetDialogDelegateLegacy.mLifecycleOwner, i -> {
                     assertThat(mEthernet.getVisibility()).isEqualTo(View.GONE);
                 });
     }
@@ -252,11 +252,11 @@
     public void updateDialog_apmOnAndHasEthernet_showEthernet() {
         when(mInternetDetailsContentController.isAirplaneModeEnabled()).thenReturn(true);
         when(mInternetDetailsContentController.hasEthernet()).thenReturn(true);
-        mInternetDialogDelegate.updateDialog(true);
+        mInternetDialogDelegateLegacy.updateDialog(true);
         mBgExecutor.runAllReady();
 
-        mInternetDialogDelegate.mDataInternetContent.observe(
-                mInternetDialogDelegate.mLifecycleOwner, i -> {
+        mInternetDialogDelegateLegacy.mDataInternetContent.observe(
+                mInternetDialogDelegateLegacy.mLifecycleOwner, i -> {
                     assertThat(mEthernet.getVisibility()).isEqualTo(View.VISIBLE);
                 });
     }
@@ -265,11 +265,11 @@
     public void updateDialog_apmOnAndNoEthernet_hideEthernet() {
         when(mInternetDetailsContentController.isAirplaneModeEnabled()).thenReturn(true);
         when(mInternetDetailsContentController.hasEthernet()).thenReturn(false);
-        mInternetDialogDelegate.updateDialog(true);
+        mInternetDialogDelegateLegacy.updateDialog(true);
         mBgExecutor.runAllReady();
 
-        mInternetDialogDelegate.mDataInternetContent.observe(
-                mInternetDialogDelegate.mLifecycleOwner, i -> {
+        mInternetDialogDelegateLegacy.mDataInternetContent.observe(
+                mInternetDialogDelegateLegacy.mLifecycleOwner, i -> {
                     assertThat(mEthernet.getVisibility()).isEqualTo(View.GONE);
                 });
     }
@@ -280,11 +280,11 @@
         when(mInternetDetailsContentController.isCarrierNetworkActive()).thenReturn(false);
         when(mInternetDetailsContentController.isAirplaneModeEnabled()).thenReturn(false);
         when(mInternetDetailsContentController.hasActiveSubIdOnDds()).thenReturn(false);
-        mInternetDialogDelegate.updateDialog(true);
+        mInternetDialogDelegateLegacy.updateDialog(true);
         mBgExecutor.runAllReady();
 
-        mInternetDialogDelegate.mDataInternetContent.observe(
-                mInternetDialogDelegate.mLifecycleOwner, i -> {
+        mInternetDialogDelegateLegacy.mDataInternetContent.observe(
+                mInternetDialogDelegateLegacy.mLifecycleOwner, i -> {
                     assertThat(mMobileDataLayout.getVisibility()).isEqualTo(View.GONE);
                 });
     }
@@ -295,11 +295,11 @@
         when(mInternetDetailsContentController.isCarrierNetworkActive()).thenReturn(true);
         when(mInternetDetailsContentController.isAirplaneModeEnabled()).thenReturn(true);
         when(mInternetDetailsContentController.isWifiEnabled()).thenReturn(true);
-        mInternetDialogDelegate.updateDialog(true);
+        mInternetDialogDelegateLegacy.updateDialog(true);
         mBgExecutor.runAllReady();
 
-        mInternetDialogDelegate.mDataInternetContent.observe(
-                mInternetDialogDelegate.mLifecycleOwner, i -> {
+        mInternetDialogDelegateLegacy.mDataInternetContent.observe(
+                mInternetDialogDelegateLegacy.mLifecycleOwner, i -> {
                     assertThat(mMobileDataLayout.getVisibility()).isEqualTo(View.VISIBLE);
                 });
     }
@@ -310,11 +310,11 @@
         when(mInternetDetailsContentController.isCarrierNetworkActive()).thenReturn(true);
         when(mInternetDetailsContentController.isAirplaneModeEnabled()).thenReturn(true);
         when(mInternetDetailsContentController.isWifiEnabled()).thenReturn(false);
-        mInternetDialogDelegate.updateDialog(true);
+        mInternetDialogDelegateLegacy.updateDialog(true);
         mBgExecutor.runAllReady();
 
-        mInternetDialogDelegate.mDataInternetContent.observe(
-                mInternetDialogDelegate.mLifecycleOwner, i -> {
+        mInternetDialogDelegateLegacy.mDataInternetContent.observe(
+                mInternetDialogDelegateLegacy.mLifecycleOwner, i -> {
                     assertThat(mMobileDataLayout.getVisibility()).isEqualTo(View.GONE);
                 });
     }
@@ -323,11 +323,11 @@
     public void updateDialog_apmOnAndNoCarrierNetwork_mobileDataLayoutGone() {
         when(mInternetDetailsContentController.isCarrierNetworkActive()).thenReturn(false);
         when(mInternetDetailsContentController.isAirplaneModeEnabled()).thenReturn(true);
-        mInternetDialogDelegate.updateDialog(true);
+        mInternetDialogDelegateLegacy.updateDialog(true);
         mBgExecutor.runAllReady();
 
-        mInternetDialogDelegate.mDataInternetContent.observe(
-                mInternetDialogDelegate.mLifecycleOwner, i -> {
+        mInternetDialogDelegateLegacy.mDataInternetContent.observe(
+                mInternetDialogDelegateLegacy.mLifecycleOwner, i -> {
                     assertThat(mMobileDataLayout.getVisibility()).isEqualTo(View.GONE);
                 });
     }
@@ -336,13 +336,13 @@
     public void updateDialog_apmOnAndWifiOnHasCarrierNetwork_showAirplaneSummary() {
         when(mInternetDetailsContentController.isCarrierNetworkActive()).thenReturn(true);
         when(mInternetDetailsContentController.isAirplaneModeEnabled()).thenReturn(true);
-        mInternetDialogDelegate.mConnectedWifiEntry = null;
+        mInternetDialogDelegateLegacy.mConnectedWifiEntry = null;
         doReturn(false).when(mInternetDetailsContentController).activeNetworkIsCellular();
-        mInternetDialogDelegate.updateDialog(true);
+        mInternetDialogDelegateLegacy.updateDialog(true);
         mBgExecutor.runAllReady();
 
-        mInternetDialogDelegate.mDataInternetContent.observe(
-                mInternetDialogDelegate.mLifecycleOwner, i -> {
+        mInternetDialogDelegateLegacy.mDataInternetContent.observe(
+                mInternetDialogDelegateLegacy.mLifecycleOwner, i -> {
                     assertThat(mMobileDataLayout.getVisibility()).isEqualTo(View.VISIBLE);
                     assertThat(mAirplaneModeSummaryText.getVisibility()).isEqualTo(View.VISIBLE);
                 });
@@ -352,13 +352,13 @@
     public void updateDialog_apmOffAndWifiOnHasCarrierNetwork_notShowApmSummary() {
         when(mInternetDetailsContentController.isCarrierNetworkActive()).thenReturn(true);
         when(mInternetDetailsContentController.isAirplaneModeEnabled()).thenReturn(false);
-        mInternetDialogDelegate.mConnectedWifiEntry = null;
+        mInternetDialogDelegateLegacy.mConnectedWifiEntry = null;
         doReturn(false).when(mInternetDetailsContentController).activeNetworkIsCellular();
-        mInternetDialogDelegate.updateDialog(true);
+        mInternetDialogDelegateLegacy.updateDialog(true);
         mBgExecutor.runAllReady();
 
-        mInternetDialogDelegate.mDataInternetContent.observe(
-                mInternetDialogDelegate.mLifecycleOwner, i -> {
+        mInternetDialogDelegateLegacy.mDataInternetContent.observe(
+                mInternetDialogDelegateLegacy.mLifecycleOwner, i -> {
                     assertThat(mAirplaneModeSummaryText.getVisibility()).isEqualTo(View.GONE);
                 });
     }
@@ -367,11 +367,11 @@
     public void updateDialog_apmOffAndHasCarrierNetwork_notShowApmSummary() {
         when(mInternetDetailsContentController.isCarrierNetworkActive()).thenReturn(true);
         when(mInternetDetailsContentController.isAirplaneModeEnabled()).thenReturn(false);
-        mInternetDialogDelegate.updateDialog(true);
+        mInternetDialogDelegateLegacy.updateDialog(true);
         mBgExecutor.runAllReady();
 
-        mInternetDialogDelegate.mDataInternetContent.observe(
-                mInternetDialogDelegate.mLifecycleOwner, i -> {
+        mInternetDialogDelegateLegacy.mDataInternetContent.observe(
+                mInternetDialogDelegateLegacy.mLifecycleOwner, i -> {
                     assertThat(mAirplaneModeSummaryText.getVisibility()).isEqualTo(View.GONE);
                 });
     }
@@ -380,11 +380,11 @@
     public void updateDialog_apmOnAndNoCarrierNetwork_notShowApmSummary() {
         when(mInternetDetailsContentController.isCarrierNetworkActive()).thenReturn(false);
         when(mInternetDetailsContentController.isAirplaneModeEnabled()).thenReturn(true);
-        mInternetDialogDelegate.updateDialog(true);
+        mInternetDialogDelegateLegacy.updateDialog(true);
         mBgExecutor.runAllReady();
 
-        mInternetDialogDelegate.mDataInternetContent.observe(
-                mInternetDialogDelegate.mLifecycleOwner, i -> {
+        mInternetDialogDelegateLegacy.mDataInternetContent.observe(
+                mInternetDialogDelegateLegacy.mLifecycleOwner, i -> {
                     assertThat(mAirplaneModeSummaryText.getVisibility()).isEqualTo(View.GONE);
                 });
     }
@@ -395,11 +395,11 @@
         when(mInternetDetailsContentController.isCarrierNetworkActive()).thenReturn(true);
         when(mInternetDetailsContentController.isMobileDataEnabled()).thenReturn(true);
         mMobileToggleSwitch.setChecked(false);
-        mInternetDialogDelegate.updateDialog(true);
+        mInternetDialogDelegateLegacy.updateDialog(true);
         mBgExecutor.runAllReady();
 
-        mInternetDialogDelegate.mDataInternetContent.observe(
-                mInternetDialogDelegate.mLifecycleOwner, i -> {
+        mInternetDialogDelegateLegacy.mDataInternetContent.observe(
+                mInternetDialogDelegateLegacy.mLifecycleOwner, i -> {
                     assertThat(mMobileToggleSwitch.isChecked()).isTrue();
                 });
     }
@@ -410,11 +410,11 @@
         when(mInternetDetailsContentController.isCarrierNetworkActive()).thenReturn(true);
         when(mInternetDetailsContentController.isMobileDataEnabled()).thenReturn(false);
         mMobileToggleSwitch.setChecked(false);
-        mInternetDialogDelegate.updateDialog(true);
+        mInternetDialogDelegateLegacy.updateDialog(true);
         mBgExecutor.runAllReady();
 
-        mInternetDialogDelegate.mDataInternetContent.observe(
-                mInternetDialogDelegate.mLifecycleOwner, i -> {
+        mInternetDialogDelegateLegacy.mDataInternetContent.observe(
+                mInternetDialogDelegateLegacy.mLifecycleOwner, i -> {
                     assertThat(mMobileToggleSwitch.isChecked()).isFalse();
                 });
     }
@@ -426,11 +426,11 @@
         // The preconditions WiFi ON and Internet WiFi are already in setUp()
         doReturn(false).when(mInternetDetailsContentController).activeNetworkIsCellular();
 
-        mInternetDialogDelegate.updateDialog(true);
+        mInternetDialogDelegateLegacy.updateDialog(true);
         mBgExecutor.runAllReady();
 
-        mInternetDialogDelegate.mDataInternetContent.observe(
-                mInternetDialogDelegate.mLifecycleOwner, i -> {
+        mInternetDialogDelegateLegacy.mDataInternetContent.observe(
+                mInternetDialogDelegateLegacy.mLifecycleOwner, i -> {
                     assertThat(mConnectedWifi.getVisibility()).isEqualTo(View.VISIBLE);
                     LinearLayout secondaryLayout = mDialogView.requireViewById(
                             R.id.secondary_mobile_network_layout);
@@ -441,13 +441,13 @@
     @Test
     public void updateDialog_wifiOnAndNoConnectedWifi_hideConnectedWifi() {
         // The precondition WiFi ON is already in setUp()
-        mInternetDialogDelegate.mConnectedWifiEntry = null;
+        mInternetDialogDelegateLegacy.mConnectedWifiEntry = null;
         doReturn(false).when(mInternetDetailsContentController).activeNetworkIsCellular();
-        mInternetDialogDelegate.updateDialog(false);
+        mInternetDialogDelegateLegacy.updateDialog(false);
         mBgExecutor.runAllReady();
 
-        mInternetDialogDelegate.mDataInternetContent.observe(
-                mInternetDialogDelegate.mLifecycleOwner, i -> {
+        mInternetDialogDelegateLegacy.mDataInternetContent.observe(
+                mInternetDialogDelegateLegacy.mLifecycleOwner, i -> {
                     assertThat(mConnectedWifi.getVisibility()).isEqualTo(View.GONE);
                 });
     }
@@ -455,13 +455,13 @@
     @Test
     public void updateDialog_wifiOnAndNoWifiEntry_showWifiListAndSeeAllArea() {
         // The precondition WiFi ON is already in setUp()
-        mInternetDialogDelegate.mConnectedWifiEntry = null;
-        mInternetDialogDelegate.mWifiEntriesCount = 0;
-        mInternetDialogDelegate.updateDialog(false);
+        mInternetDialogDelegateLegacy.mConnectedWifiEntry = null;
+        mInternetDialogDelegateLegacy.mWifiEntriesCount = 0;
+        mInternetDialogDelegateLegacy.updateDialog(false);
         mBgExecutor.runAllReady();
 
-        mInternetDialogDelegate.mDataInternetContent.observe(
-                mInternetDialogDelegate.mLifecycleOwner, i -> {
+        mInternetDialogDelegateLegacy.mDataInternetContent.observe(
+                mInternetDialogDelegateLegacy.mLifecycleOwner, i -> {
                     assertThat(mConnectedWifi.getVisibility()).isEqualTo(View.GONE);
                     // Show a blank block to fix the dialog height even if there is no WiFi list
                     assertThat(mWifiList.getVisibility()).isEqualTo(View.VISIBLE);
@@ -473,13 +473,13 @@
     @Test
     public void updateDialog_wifiOnAndOneWifiEntry_showWifiListAndSeeAllArea() {
         // The precondition WiFi ON is already in setUp()
-        mInternetDialogDelegate.mConnectedWifiEntry = null;
-        mInternetDialogDelegate.mWifiEntriesCount = 1;
-        mInternetDialogDelegate.updateDialog(false);
+        mInternetDialogDelegateLegacy.mConnectedWifiEntry = null;
+        mInternetDialogDelegateLegacy.mWifiEntriesCount = 1;
+        mInternetDialogDelegateLegacy.updateDialog(false);
         mBgExecutor.runAllReady();
 
-        mInternetDialogDelegate.mDataInternetContent.observe(
-                mInternetDialogDelegate.mLifecycleOwner, i -> {
+        mInternetDialogDelegateLegacy.mDataInternetContent.observe(
+                mInternetDialogDelegateLegacy.mLifecycleOwner, i -> {
                     assertThat(mConnectedWifi.getVisibility()).isEqualTo(View.GONE);
                     // Show a blank block to fix the dialog height even if there is no WiFi list
                     assertThat(mWifiList.getVisibility()).isEqualTo(View.VISIBLE);
@@ -491,12 +491,12 @@
     @Test
     public void updateDialog_wifiOnAndHasConnectedWifi_showAllWifiAndSeeAllArea() {
         // The preconditions WiFi ON and WiFi entries are already in setUp()
-        mInternetDialogDelegate.mWifiEntriesCount = 0;
-        mInternetDialogDelegate.updateDialog(false);
+        mInternetDialogDelegateLegacy.mWifiEntriesCount = 0;
+        mInternetDialogDelegateLegacy.updateDialog(false);
         mBgExecutor.runAllReady();
 
-        mInternetDialogDelegate.mDataInternetContent.observe(
-                mInternetDialogDelegate.mLifecycleOwner, i -> {
+        mInternetDialogDelegateLegacy.mDataInternetContent.observe(
+                mInternetDialogDelegateLegacy.mLifecycleOwner, i -> {
                     assertThat(mConnectedWifi.getVisibility()).isEqualTo(View.VISIBLE);
                     // Show a blank block to fix the dialog height even if there is no WiFi list
                     assertThat(mWifiList.getVisibility()).isEqualTo(View.VISIBLE);
@@ -508,14 +508,14 @@
     @Test
     public void updateDialog_wifiOnAndHasMaxWifiList_showWifiListAndSeeAll() {
         // The preconditions WiFi ON and WiFi entries are already in setUp()
-        mInternetDialogDelegate.mConnectedWifiEntry = null;
-        mInternetDialogDelegate.mWifiEntriesCount = MAX_WIFI_ENTRY_COUNT;
-        mInternetDialogDelegate.mHasMoreWifiEntries = true;
-        mInternetDialogDelegate.updateDialog(false);
+        mInternetDialogDelegateLegacy.mConnectedWifiEntry = null;
+        mInternetDialogDelegateLegacy.mWifiEntriesCount = MAX_WIFI_ENTRY_COUNT;
+        mInternetDialogDelegateLegacy.mHasMoreWifiEntries = true;
+        mInternetDialogDelegateLegacy.updateDialog(false);
         mBgExecutor.runAllReady();
 
-        mInternetDialogDelegate.mDataInternetContent.observe(
-                mInternetDialogDelegate.mLifecycleOwner, i -> {
+        mInternetDialogDelegateLegacy.mDataInternetContent.observe(
+                mInternetDialogDelegateLegacy.mLifecycleOwner, i -> {
                     assertThat(mConnectedWifi.getVisibility()).isEqualTo(View.GONE);
                     assertThat(mWifiList.getVisibility()).isEqualTo(View.VISIBLE);
                     verify(mInternetAdapter).setMaxEntriesCount(3);
@@ -526,13 +526,13 @@
     @Test
     public void updateDialog_wifiOnAndHasBothWifiEntry_showBothWifiEntryAndSeeAll() {
         // The preconditions WiFi ON and WiFi entries are already in setUp()
-        mInternetDialogDelegate.mWifiEntriesCount = MAX_WIFI_ENTRY_COUNT - 1;
-        mInternetDialogDelegate.mHasMoreWifiEntries = true;
-        mInternetDialogDelegate.updateDialog(false);
+        mInternetDialogDelegateLegacy.mWifiEntriesCount = MAX_WIFI_ENTRY_COUNT - 1;
+        mInternetDialogDelegateLegacy.mHasMoreWifiEntries = true;
+        mInternetDialogDelegateLegacy.updateDialog(false);
         mBgExecutor.runAllReady();
 
-        mInternetDialogDelegate.mDataInternetContent.observe(
-                mInternetDialogDelegate.mLifecycleOwner, i -> {
+        mInternetDialogDelegateLegacy.mDataInternetContent.observe(
+                mInternetDialogDelegateLegacy.mLifecycleOwner, i -> {
                     assertThat(mConnectedWifi.getVisibility()).isEqualTo(View.VISIBLE);
                     assertThat(mWifiList.getVisibility()).isEqualTo(View.VISIBLE);
                     verify(mInternetAdapter).setMaxEntriesCount(2);
@@ -544,12 +544,12 @@
     public void updateDialog_deviceLockedAndNoConnectedWifi_showWifiToggle() {
         // The preconditions WiFi entries are already in setUp()
         when(mInternetDetailsContentController.isDeviceLocked()).thenReturn(true);
-        mInternetDialogDelegate.mConnectedWifiEntry = null;
-        mInternetDialogDelegate.updateDialog(false);
+        mInternetDialogDelegateLegacy.mConnectedWifiEntry = null;
+        mInternetDialogDelegateLegacy.updateDialog(false);
         mBgExecutor.runAllReady();
 
-        mInternetDialogDelegate.mDataInternetContent.observe(
-                mInternetDialogDelegate.mLifecycleOwner, i -> {
+        mInternetDialogDelegateLegacy.mDataInternetContent.observe(
+                mInternetDialogDelegateLegacy.mLifecycleOwner, i -> {
                     // Show WiFi Toggle without background
                     assertThat(mWifiToggle.getVisibility()).isEqualTo(View.VISIBLE);
                     assertThat(mWifiToggle.getBackground()).isNull();
@@ -564,11 +564,11 @@
     public void updateDialog_deviceLockedAndHasConnectedWifi_showWifiToggleWithBackground() {
         // The preconditions WiFi ON and WiFi entries are already in setUp()
         when(mInternetDetailsContentController.isDeviceLocked()).thenReturn(true);
-        mInternetDialogDelegate.updateDialog(false);
+        mInternetDialogDelegateLegacy.updateDialog(false);
         mBgExecutor.runAllReady();
 
-        mInternetDialogDelegate.mDataInternetContent.observe(
-                mInternetDialogDelegate.mLifecycleOwner, i -> {
+        mInternetDialogDelegateLegacy.mDataInternetContent.observe(
+                mInternetDialogDelegateLegacy.mLifecycleOwner, i -> {
                     // Show WiFi Toggle with highlight background
                     assertThat(mWifiToggle.getVisibility()).isEqualTo(View.VISIBLE);
                     assertThat(mWifiToggle.getBackground()).isNotNull();
@@ -581,14 +581,14 @@
 
     @Test
     public void updateDialog_disallowChangeWifiState_disableWifiSwitch() {
-        mInternetDialogDelegate.dismissDialog();
+        mInternetDialogDelegateLegacy.dismissDialog();
         when(WifiEnterpriseRestrictionUtils.isChangeWifiStateAllowed(mContext)).thenReturn(false);
         createInternetDialog();
-        mInternetDialogDelegate.updateDialog(false);
+        mInternetDialogDelegateLegacy.updateDialog(false);
         mBgExecutor.runAllReady();
 
-        mInternetDialogDelegate.mDataInternetContent.observe(
-                mInternetDialogDelegate.mLifecycleOwner, i -> {
+        mInternetDialogDelegateLegacy.mDataInternetContent.observe(
+                mInternetDialogDelegateLegacy.mLifecycleOwner, i -> {
                     // Disable Wi-Fi switch and show restriction message in summary.
                     assertThat(mWifiToggleSwitch.isEnabled()).isFalse();
                     assertThat(mWifiToggleSummary.getVisibility()).isEqualTo(View.VISIBLE);
@@ -598,14 +598,14 @@
 
     @Test
     public void updateDialog_allowChangeWifiState_enableWifiSwitch() {
-        mInternetDialogDelegate.dismissDialog();
+        mInternetDialogDelegateLegacy.dismissDialog();
         when(WifiEnterpriseRestrictionUtils.isChangeWifiStateAllowed(mContext)).thenReturn(true);
         createInternetDialog();
-        mInternetDialogDelegate.updateDialog(false);
+        mInternetDialogDelegateLegacy.updateDialog(false);
         mBgExecutor.runAllReady();
 
-        mInternetDialogDelegate.mDataInternetContent.observe(
-                mInternetDialogDelegate.mLifecycleOwner, i -> {
+        mInternetDialogDelegateLegacy.mDataInternetContent.observe(
+                mInternetDialogDelegateLegacy.mLifecycleOwner, i -> {
                     // Enable Wi-Fi switch and hide restriction message in summary.
                     assertThat(mWifiToggleSwitch.isEnabled()).isTrue();
                     assertThat(mWifiToggleSummary.getVisibility()).isEqualTo(View.GONE);
@@ -619,11 +619,11 @@
         doReturn(true).when(mInternetDetailsContentController).hasActiveSubIdOnDds();
         doReturn(false).when(mInternetDetailsContentController).isAirplaneModeEnabled();
         clearInvocations(mInternetDetailsContentController);
-        mInternetDialogDelegate.updateDialog(true);
+        mInternetDialogDelegateLegacy.updateDialog(true);
         mBgExecutor.runAllReady();
 
-        mInternetDialogDelegate.mDataInternetContent.observe(
-                mInternetDialogDelegate.mLifecycleOwner, i -> {
+        mInternetDialogDelegateLegacy.mDataInternetContent.observe(
+                mInternetDialogDelegateLegacy.mLifecycleOwner, i -> {
                     LinearLayout primaryLayout = mDialogView.requireViewById(
                             R.id.mobile_network_layout);
                     LinearLayout secondaryLayout = mDialogView.requireViewById(
@@ -639,11 +639,11 @@
     public void updateDialog_wifiOn_hideWifiScanNotify() {
         // The preconditions WiFi ON and WiFi entries are already in setUp()
 
-        mInternetDialogDelegate.updateDialog(false);
+        mInternetDialogDelegateLegacy.updateDialog(false);
         mBgExecutor.runAllReady();
 
-        mInternetDialogDelegate.mDataInternetContent.observe(
-                mInternetDialogDelegate.mLifecycleOwner, i -> {
+        mInternetDialogDelegateLegacy.mDataInternetContent.observe(
+                mInternetDialogDelegateLegacy.mLifecycleOwner, i -> {
                     assertThat(mWifiScanNotify.getVisibility()).isEqualTo(View.GONE);
                 });
 
@@ -654,11 +654,11 @@
     public void updateDialog_wifiOffAndWifiScanOff_hideWifiScanNotify() {
         when(mInternetDetailsContentController.isWifiEnabled()).thenReturn(false);
         when(mInternetDetailsContentController.isWifiScanEnabled()).thenReturn(false);
-        mInternetDialogDelegate.updateDialog(false);
+        mInternetDialogDelegateLegacy.updateDialog(false);
         mBgExecutor.runAllReady();
 
-        mInternetDialogDelegate.mDataInternetContent.observe(
-                mInternetDialogDelegate.mLifecycleOwner, i -> {
+        mInternetDialogDelegateLegacy.mDataInternetContent.observe(
+                mInternetDialogDelegateLegacy.mLifecycleOwner, i -> {
                     assertThat(mWifiScanNotify.getVisibility()).isEqualTo(View.GONE);
                 });
 
@@ -670,11 +670,11 @@
         when(mInternetDetailsContentController.isWifiEnabled()).thenReturn(false);
         when(mInternetDetailsContentController.isWifiScanEnabled()).thenReturn(true);
         when(mInternetDetailsContentController.isDeviceLocked()).thenReturn(true);
-        mInternetDialogDelegate.updateDialog(false);
+        mInternetDialogDelegateLegacy.updateDialog(false);
         mBgExecutor.runAllReady();
 
-        mInternetDialogDelegate.mDataInternetContent.observe(
-                mInternetDialogDelegate.mLifecycleOwner, i -> {
+        mInternetDialogDelegateLegacy.mDataInternetContent.observe(
+                mInternetDialogDelegateLegacy.mLifecycleOwner, i -> {
                     assertThat(mWifiScanNotify.getVisibility()).isEqualTo(View.GONE);
                 });
 
@@ -686,11 +686,11 @@
         when(mInternetDetailsContentController.isWifiEnabled()).thenReturn(false);
         when(mInternetDetailsContentController.isWifiScanEnabled()).thenReturn(true);
         when(mInternetDetailsContentController.isDeviceLocked()).thenReturn(false);
-        mInternetDialogDelegate.updateDialog(false);
+        mInternetDialogDelegateLegacy.updateDialog(false);
         mBgExecutor.runAllReady();
 
-        mInternetDialogDelegate.mDataInternetContent.observe(
-                mInternetDialogDelegate.mLifecycleOwner, i -> {
+        mInternetDialogDelegateLegacy.mDataInternetContent.observe(
+                mInternetDialogDelegateLegacy.mLifecycleOwner, i -> {
                     assertThat(mWifiScanNotify.getVisibility()).isEqualTo(View.VISIBLE);
                     TextView wifiScanNotifyText = mDialogView.requireViewById(
                             R.id.wifi_scan_notify_text);
@@ -703,11 +703,11 @@
     public void updateDialog_wifiIsDisabled_uncheckWifiSwitch() {
         when(mInternetDetailsContentController.isWifiEnabled()).thenReturn(false);
         mWifiToggleSwitch.setChecked(true);
-        mInternetDialogDelegate.updateDialog(false);
+        mInternetDialogDelegateLegacy.updateDialog(false);
         mBgExecutor.runAllReady();
 
-        mInternetDialogDelegate.mDataInternetContent.observe(
-                mInternetDialogDelegate.mLifecycleOwner, i -> {
+        mInternetDialogDelegateLegacy.mDataInternetContent.observe(
+                mInternetDialogDelegateLegacy.mLifecycleOwner, i -> {
                     assertThat(mWifiToggleSwitch.isChecked()).isFalse();
                 });
     }
@@ -716,11 +716,11 @@
     public void updateDialog_wifiIsEnabled_checkWifiSwitch() throws Exception {
         when(mInternetDetailsContentController.isWifiEnabled()).thenReturn(true);
         mWifiToggleSwitch.setChecked(false);
-        mInternetDialogDelegate.updateDialog(false);
+        mInternetDialogDelegateLegacy.updateDialog(false);
         mBgExecutor.runAllReady();
 
-        mInternetDialogDelegate.mDataInternetContent.observe(
-                mInternetDialogDelegate.mLifecycleOwner, i -> {
+        mInternetDialogDelegateLegacy.mDataInternetContent.observe(
+                mInternetDialogDelegateLegacy.mLifecycleOwner, i -> {
                     assertThat(mWifiToggleSwitch.isChecked()).isTrue();
                 });
     }
@@ -735,20 +735,20 @@
 
     @Test
     public void onWifiScan_isScanTrue_setProgressBarVisibleTrue() {
-        mInternetDialogDelegate.mIsProgressBarVisible = false;
+        mInternetDialogDelegateLegacy.mIsProgressBarVisible = false;
 
-        mInternetDialogDelegate.onWifiScan(true);
+        mInternetDialogDelegateLegacy.onWifiScan(true);
 
-        assertThat(mInternetDialogDelegate.mIsProgressBarVisible).isTrue();
+        assertThat(mInternetDialogDelegateLegacy.mIsProgressBarVisible).isTrue();
     }
 
     @Test
     public void onWifiScan_isScanFalse_setProgressBarVisibleFalse() {
-        mInternetDialogDelegate.mIsProgressBarVisible = true;
+        mInternetDialogDelegateLegacy.mIsProgressBarVisible = true;
 
-        mInternetDialogDelegate.onWifiScan(false);
+        mInternetDialogDelegateLegacy.onWifiScan(false);
 
-        assertThat(mInternetDialogDelegate.mIsProgressBarVisible).isFalse();
+        assertThat(mInternetDialogDelegateLegacy.mIsProgressBarVisible).isFalse();
     }
 
     @Test
@@ -757,46 +757,49 @@
         // Then the maximum count is equal to MAX_WIFI_ENTRY_COUNT.
         setNetworkVisible(false, false, false);
 
-        assertThat(mInternetDialogDelegate.getWifiListMaxCount()).isEqualTo(MAX_WIFI_ENTRY_COUNT);
+        assertThat(mInternetDialogDelegateLegacy.getWifiListMaxCount()).isEqualTo(
+                MAX_WIFI_ENTRY_COUNT);
 
         // If the Connected Wi-Fi is displayed then reduce one of the Wi-Fi list max count.
         setNetworkVisible(false, false, true);
 
-        assertThat(mInternetDialogDelegate.getWifiListMaxCount())
+        assertThat(mInternetDialogDelegateLegacy.getWifiListMaxCount())
                 .isEqualTo(MAX_WIFI_ENTRY_COUNT - 1);
 
         // Only one of Ethernet, MobileData is displayed.
         // Then the maximum count is equal to MAX_WIFI_ENTRY_COUNT.
         setNetworkVisible(true, false, false);
 
-        assertThat(mInternetDialogDelegate.getWifiListMaxCount()).isEqualTo(MAX_WIFI_ENTRY_COUNT);
+        assertThat(mInternetDialogDelegateLegacy.getWifiListMaxCount()).isEqualTo(
+                MAX_WIFI_ENTRY_COUNT);
 
         setNetworkVisible(false, true, false);
 
-        assertThat(mInternetDialogDelegate.getWifiListMaxCount()).isEqualTo(MAX_WIFI_ENTRY_COUNT);
+        assertThat(mInternetDialogDelegateLegacy.getWifiListMaxCount()).isEqualTo(
+                MAX_WIFI_ENTRY_COUNT);
 
         // If the Connected Wi-Fi is displayed then reduce one of the Wi-Fi list max count.
         setNetworkVisible(true, false, true);
 
-        assertThat(mInternetDialogDelegate.getWifiListMaxCount())
+        assertThat(mInternetDialogDelegateLegacy.getWifiListMaxCount())
                 .isEqualTo(MAX_WIFI_ENTRY_COUNT - 1);
 
         setNetworkVisible(false, true, true);
 
-        assertThat(mInternetDialogDelegate.getWifiListMaxCount())
+        assertThat(mInternetDialogDelegateLegacy.getWifiListMaxCount())
                 .isEqualTo(MAX_WIFI_ENTRY_COUNT - 1);
 
         // Both of Ethernet, MobileData, ConnectedWiFi is displayed.
         // Then the maximum count is equal to MAX_WIFI_ENTRY_COUNT - 1.
         setNetworkVisible(true, true, false);
 
-        assertThat(mInternetDialogDelegate.getWifiListMaxCount())
+        assertThat(mInternetDialogDelegateLegacy.getWifiListMaxCount())
                 .isEqualTo(MAX_WIFI_ENTRY_COUNT - 1);
 
         // If the Connected Wi-Fi is displayed then reduce one of the Wi-Fi list max count.
         setNetworkVisible(true, true, true);
 
-        assertThat(mInternetDialogDelegate.getWifiListMaxCount())
+        assertThat(mInternetDialogDelegateLegacy.getWifiListMaxCount())
                 .isEqualTo(MAX_WIFI_ENTRY_COUNT - 2);
     }
 
@@ -804,13 +807,14 @@
     public void updateDialog_shareWifiIntentNull_hideButton() {
         when(mInternetDetailsContentController.getConfiguratorQrCodeGeneratorIntentOrNull(any()))
                 .thenReturn(null);
-        mInternetDialogDelegate.updateDialog(false);
+        mInternetDialogDelegateLegacy.updateDialog(false);
         mBgExecutor.runAllReady();
 
-        mInternetDialogDelegate.mDataInternetContent.observe(
-                mInternetDialogDelegate.mLifecycleOwner, i -> {
-                    assertThat(mInternetDialogDelegate.mShareWifiButton.getVisibility()).isEqualTo(
-                            View.GONE);
+        mInternetDialogDelegateLegacy.mDataInternetContent.observe(
+                mInternetDialogDelegateLegacy.mLifecycleOwner, i -> {
+                    assertThat(
+                            mInternetDialogDelegateLegacy.mShareWifiButton.getVisibility())
+                            .isEqualTo(View.GONE);
                 });
     }
 
@@ -818,12 +822,12 @@
     public void updateDialog_shareWifiShareable_showButton() {
         when(mInternetDetailsContentController.getConfiguratorQrCodeGeneratorIntentOrNull(any()))
                 .thenReturn(new Intent());
-        mInternetDialogDelegate.updateDialog(false);
+        mInternetDialogDelegateLegacy.updateDialog(false);
         mBgExecutor.runAllReady();
 
-        mInternetDialogDelegate.mDataInternetContent.observe(
-                mInternetDialogDelegate.mLifecycleOwner, i -> {
-                    assertThat(mInternetDialogDelegate.mShareWifiButton.getVisibility())
+        mInternetDialogDelegateLegacy.mDataInternetContent.observe(
+                mInternetDialogDelegateLegacy.mLifecycleOwner, i -> {
+                    assertThat(mInternetDialogDelegateLegacy.mShareWifiButton.getVisibility())
                             .isEqualTo(View.VISIBLE);
                 });
     }