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

[Provider Model] Use new entry xml of Network & Internet

Browse Source 
Bug: 171874190
Test: manual
Change-Id: I542ba08c122cb50de37dafd06cfa08dead8e2e0f
This commit is contained in:
Zoey Chen
2020-10-28 22:32:24 +08:00
parent ee9e7b8642
commit 14602e302a
3 changed files with 163 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/com/android/settings/network/NetworkDashboardFragment.java
View File

@@ -21,6 +21,7 @@ import android.app.Dialog;
import android.app.settings.SettingsEnums;
import android.content.Context;
import android.os.Bundle;
import android.util.FeatureFlagUtils;
import android.util.Log;
import androidx.appcompat.app.AlertDialog;
@@ -57,14 +58,20 @@ public class NetworkDashboardFragment extends DashboardFragment implements
@Override
protected int getPreferenceScreenResId() {
return R.xml.network_and_internet;
if (isProviderModelEnabled(getContext())) {
return R.xml.network_provider_internet;
} else {
return R.xml.network_and_internet;
}
}
@Override
public void onAttach(Context context) {
super.onAttach(context);
use(MultiNetworkHeaderController.class).init(getSettingsLifecycle());
if (!isProviderModelEnabled(context)) {
use(MultiNetworkHeaderController.class).init(getSettingsLifecycle());
}
use(AirplaneModePreferenceController.class).setFragment(this);
getSettingsLifecycle().addObserver(use(AllInOneTetherPreferenceController.class));
}
@@ -164,4 +171,8 @@ public class NetworkDashboardFragment extends DashboardFragment implements
null /* mobilePlanHost */);
}
};
private static boolean isProviderModelEnabled(Context context) {
return FeatureFlagUtils.isEnabled(context, FeatureFlagUtils.SETTINGS_PROVIDER_MODEL);
}
}