diff --git a/res/values/config.xml b/res/values/config.xml index 73ee1083c12..c30a0478c9c 100644 --- a/res/values/config.xml +++ b/res/values/config.xml @@ -349,9 +349,6 @@ Fetch resource from overlay package directly if this is set. --> - - true - false diff --git a/res/values/strings.xml b/res/values/strings.xml index 859a59c44f7..45570a72924 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -3457,9 +3457,6 @@ Mobile network - - Mobile plan - SMS app Change SMS app? @@ -3473,18 +3470,6 @@ Use %s to manage your network connections? - - Unknown SIM operator - - - %1$s has no known provisioning website - - - Please insert SIM card and restart - - - Please connect to the internet - Recent location requests diff --git a/res/xml/network_provider_internet.xml b/res/xml/network_provider_internet.xml index b055ea37d4d..8e9d45d6d9c 100644 --- a/res/xml/network_provider_internet.xml +++ b/res/xml/network_provider_internet.xml @@ -58,15 +58,6 @@ settings:controller="com.android.settings.network.AirplaneModePreferenceController" settings:userRestriction="no_airplane_mode"/> - - createPreferenceControllers(Context context) { - return buildPreferenceControllers(context, getSettingsLifecycle(), mMetricsFeatureProvider, - this /* fragment */, this /* mobilePlanHost */, this /* LifecycleOwner */); + return buildPreferenceControllers(context, getSettingsLifecycle(), + this /* LifecycleOwner */); } private static List buildPreferenceControllers(Context context, - Lifecycle lifecycle, MetricsFeatureProvider metricsFeatureProvider, Fragment fragment, - MobilePlanPreferenceHost mobilePlanHost, LifecycleOwner lifecycleOwner) { - final MobilePlanPreferenceController mobilePlanPreferenceController = - new MobilePlanPreferenceController(context, mobilePlanHost); + Lifecycle lifecycle, LifecycleOwner lifecycleOwner) { final InternetPreferenceController internetPreferenceController = new InternetPreferenceController(context, lifecycle, lifecycleOwner); @@ -102,7 +91,6 @@ public class NetworkDashboardFragment extends DashboardFragment implements new PrivateDnsPreferenceController(context); if (lifecycle != null) { - lifecycle.addObserver(mobilePlanPreferenceController); lifecycle.addObserver(vpnPreferenceController); lifecycle.addObserver(privateDnsPreferenceController); } @@ -113,7 +101,6 @@ public class NetworkDashboardFragment extends DashboardFragment implements controllers.add(new TetherPreferenceController(context, lifecycle)); controllers.add(vpnPreferenceController); controllers.add(new ProxyPreferenceController(context)); - controllers.add(mobilePlanPreferenceController); if (internetPreferenceController != null) { controllers.add(internetPreferenceController); } @@ -126,36 +113,6 @@ public class NetworkDashboardFragment extends DashboardFragment implements return controllers; } - @Override - public void showMobilePlanMessageDialog() { - showDialog(MANAGE_MOBILE_PLAN_DIALOG_ID); - } - - @Override - public Dialog onCreateDialog(int dialogId) { - Log.d(TAG, "onCreateDialog: dialogId=" + dialogId); - switch (dialogId) { - case MANAGE_MOBILE_PLAN_DIALOG_ID: - final MobilePlanPreferenceController controller = - use(MobilePlanPreferenceController.class); - return new AlertDialog.Builder(getActivity()) - .setMessage(controller.getMobilePlanDialogMessage()) - .setCancelable(false) - .setPositiveButton(com.android.internal.R.string.ok, - (dialog, id) -> controller.setMobilePlanDialogMessage(null)) - .create(); - } - return super.onCreateDialog(dialogId); - } - - @Override - public int getDialogMetricsCategory(int dialogId) { - if (MANAGE_MOBILE_PLAN_DIALOG_ID == dialogId) { - return SettingsEnums.DIALOG_MANAGE_MOBILE_PLAN; - } - return 0; - } - public void onActivityResult(int requestCode, int resultCode, Intent data) { super.onActivityResult(requestCode, resultCode, data); @@ -173,20 +130,7 @@ public class NetworkDashboardFragment extends DashboardFragment implements public List createPreferenceControllers(Context context) { return buildPreferenceControllers(context, null /* lifecycle */, - null /* metricsFeatureProvider */, null /* fragment */, - null /* mobilePlanHost */, null /* LifecycleOwner */); - } - - @Override - public List getNonIndexableKeys(Context context) { - final List keys = super.getNonIndexableKeys(context); - - MobilePlanPreferenceController mppc = - new MobilePlanPreferenceController(context, null); - if (!mppc.isAvailable()) { - keys.add(MobilePlanPreferenceController.KEY_MANAGE_MOBILE_PLAN); - } - return keys; + null /* LifecycleOwner */); } }; } diff --git a/tests/unit/src/com/android/settings/network/MobilePlanPreferenceControllerTest.java b/tests/unit/src/com/android/settings/network/MobilePlanPreferenceControllerTest.java deleted file mode 100644 index 9b38e5b4c2d..00000000000 --- a/tests/unit/src/com/android/settings/network/MobilePlanPreferenceControllerTest.java +++ /dev/null @@ -1,50 +0,0 @@ -/* - * Copyright (C) 2020 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.android.settings.network; - -import static com.google.common.truth.Truth.assertThat; - -import android.content.Context; - -import androidx.test.core.app.ApplicationProvider; -import androidx.test.ext.junit.runners.AndroidJUnit4; - -import com.android.settings.testutils.ResourcesUtils; - -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; - -@RunWith(AndroidJUnit4.class) -public class MobilePlanPreferenceControllerTest { - - private Context mContext; - - @Before - public void setUp() { - mContext = ApplicationProvider.getApplicationContext(); - } - - @Test - public void testNoProvisionStringFormattedCorrectly() { - final String operator = "test_operator"; - - assertThat( - ResourcesUtils.getResourcesString(mContext, "mobile_no_provisioning_url", operator)) - .contains(operator); - } -}