Keep "Resetting your internet" when screen rotates

- The fragment of Internet Settings will be destroyed and recreated when screen rotates

- Move connectivity recovery class into singleton class to avoid service being killed when fragment context is destroyed

- Check if connectivity is recovering when fragment is recreated and show resettings message if necessary

Bug: 202802736
Test: manual test
atest -c InternetResetHelperTest
make RunSettingsRoboTests ROBOTEST_FILTER=NetworkProviderSettingsTest

Merged-In: Iae9585ff8366b8b71b4c39dc0ec7e87a0320fa5a
Change-Id: Iae9585ff8366b8b71b4c39dc0ec7e87a0320fa5a

src/com/android/settings/network/NetworkProviderSettings.java

@@ -334,6 +334,8 @@ public class NetworkProviderSettings extends RestrictedSettingsFragment
         addConnectedEthernetNetworkController();
         addWifiSwitchPreferenceController();
         mWifiStatusMessagePreference = findPreference(PREF_KEY_WIFI_STATUS_MESSAGE);
+
+        checkConnectivityRecovering();
     }
 
     private void updateAirplaneModeMsgPreference(boolean visible) {
@@ -379,6 +381,17 @@ public class NetworkProviderSettings extends RestrictedSettingsFragment
         mWifiSwitchPreferenceController.displayPreference(getPreferenceScreen());
     }
 
+    private void checkConnectivityRecovering() {
+        mInternetResetHelper = new InternetResetHelper(getContext(), getLifecycle(),
+                mNetworkMobileProviderController,
+                findPreference(WifiSwitchPreferenceController.KEY),
+                mConnectedWifiEntryPreferenceCategory,
+                mFirstWifiEntryPreferenceCategory,
+                mWifiEntryPreferenceCategory,
+                mResetInternetPreference);
+        mInternetResetHelper.checkRecovering();
+    }
+
     @Override
     public void onActivityCreated(Bundle savedInstanceState) {
         super.onActivityCreated(savedInstanceState);
@@ -1447,16 +1460,6 @@ public class NetworkProviderSettings extends RestrictedSettingsFragment
     }
 
     private void fixConnectivity() {
-        if (mInternetResetHelper == null) {
-            mInternetResetHelper = new InternetResetHelper(getContext(), getLifecycle());
-            mInternetResetHelper.setResettingPreference(mResetInternetPreference);
-            mInternetResetHelper.setMobileNetworkController(mNetworkMobileProviderController);
-            mInternetResetHelper.setWifiTogglePreference(
-                    findPreference(WifiSwitchPreferenceController.KEY));
-            mInternetResetHelper.addWifiNetworkPreference(mConnectedWifiEntryPreferenceCategory);
-            mInternetResetHelper.addWifiNetworkPreference(mFirstWifiEntryPreferenceCategory);
-            mInternetResetHelper.addWifiNetworkPreference(mWifiEntryPreferenceCategory);
-        }
         mInternetResetHelper.restart();
     }