[Passpointv2] Provide two views for saved networks

List all passpoint network under "Subscriptions" view and others under
"Wi-Fi networks".

Bug: 116362877
Test: hard code verify subscribed network
Change-Id: I9750e9964e8b5affc2e91ea86a058c3ba65b3588

src/com/android/settings/wifi/savedaccesspoints/SavedAccessPointsWifiSettings.java

@@ -75,6 +75,8 @@ public class SavedAccessPointsWifiSettings extends DashboardFragment
                 .getApplicationContext().getSystemService(Context.WIFI_SERVICE);
         use(SavedAccessPointsPreferenceController.class)
                 .setHost(this);
+        use(SubscribedAccessPointsPreferenceController.class)
+                .setHost(this);
     }
 
     @Override
@@ -172,10 +174,15 @@ public class SavedAccessPointsWifiSettings extends DashboardFragment
                     Log.e(TAG, "Failed to remove Passpoint configuration for "
                             + mSelectedAccessPoint.getConfigName());
                 }
-                use(SavedAccessPointsPreferenceController.class)
-                        .postRefreshSavedAccessPoints();
+                if (isSubscriptionsFeatureEnabled()) {
+                    use(SubscribedAccessPointsPreferenceController.class)
+                            .postRefreshSubscribedAccessPoints();
+                } else {
+                    use(SavedAccessPointsPreferenceController.class)
+                            .postRefreshSavedAccessPoints();
+                }
             } else {
-                // mForgetListener will call initPreferences upon completion
+                // both onSuccess/onFailure will call postRefreshSavedAccessPoints
                 mWifiManager.forget(mSelectedAccessPoint.getConfig().networkId,
                         use(SavedAccessPointsPreferenceController.class));
             }
@@ -198,4 +205,9 @@ public class SavedAccessPointsWifiSettings extends DashboardFragment
         }
         return false;
     }
+
+    boolean isSubscriptionsFeatureEnabled() {
+        return FeatureFlagUtils.isEnabled(getContext(), FeatureFlags.MOBILE_NETWORK_V2)
+                && FeatureFlagPersistent.isEnabled(getContext(), FeatureFlags.NETWORK_INTERNET_V2);
+    }
 }