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

Merge "Delete carrier entry from mobile network details page." into qt-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2019-04-08 20:00:29 +00:00
committed by Android (Google) Code Review
parent 5c28e42538 95c915d9dc
commit b93761d252
2 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
res/xml/mobile_network_settings_v2.xml
View File

@@ -93,11 +93,6 @@
android:dialogTitle="@string/preferred_network_mode_dialogtitle" android:dialogTitle="@string/preferred_network_mode_dialogtitle"
settings:controller="com.android.settings.network.telephony.EnabledNetworkModePreferenceController"/> settings:controller="com.android.settings.network.telephony.EnabledNetworkModePreferenceController"/>
<Preference
android:key="carrier_settings_euicc_key"
android:title="@string/carrier_settings_euicc"
settings:controller="com.android.settings.network.telephony.EuiccPreferenceController" />
<Preference <Preference
android:key="carrier_settings_version_key" android:key="carrier_settings_version_key"
android:title="@string/carrier_settings_version" android:title="@string/carrier_settings_version"

2
src/com/android/settings/network/telephony/MobileNetworkSettings.java
View File

@@ -143,7 +143,9 @@ public class MobileNetworkSettings extends RestrictedDashboardFragment {
use(PreferredNetworkModePreferenceController.class).init(mSubId); use(PreferredNetworkModePreferenceController.class).init(mSubId);
use(EnabledNetworkModePreferenceController.class).init(mSubId); use(EnabledNetworkModePreferenceController.class).init(mSubId);
use(DataServiceSetupPreferenceController.class).init(mSubId); use(DataServiceSetupPreferenceController.class).init(mSubId);
if (!FeatureFlagPersistent.isEnabled(getContext(), FeatureFlags.NETWORK_INTERNET_V2)) {
use(EuiccPreferenceController.class).init(mSubId); use(EuiccPreferenceController.class).init(mSubId);
}
use(WifiCallingPreferenceController.class).init(mSubId); use(WifiCallingPreferenceController.class).init(mSubId);
final OpenNetworkSelectPagePreferenceController openNetworkSelectPagePreferenceController = final OpenNetworkSelectPagePreferenceController openNetworkSelectPagePreferenceController =