diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 6e82b11ad29f9466dc2e9eb85f1f0f9dd7133b80..584d7c02a1ba5764ae3fc74037126e881ce71929 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -238,17 +238,14 @@ android:value="true" /> - - + + @@ -259,14 +256,6 @@ - - - - @@ -549,7 +538,6 @@ diff --git a/src/com/android/settings/Settings.java b/src/com/android/settings/Settings.java index 4e919d66bddc857649c4f1105f5d0cf0aba54ced..8d04ab8daaea3bee2f34528ef215101099e90d8e 100644 --- a/src/com/android/settings/Settings.java +++ b/src/com/android/settings/Settings.java @@ -19,12 +19,17 @@ package com.android.settings; import android.content.Context; import android.content.Intent; import android.os.Bundle; +import android.telephony.SubscriptionInfo; +import android.telephony.SubscriptionManager; +import android.telephony.ims.ImsRcsManager; import android.text.TextUtils; import android.util.FeatureFlagUtils; import com.android.internal.annotations.VisibleForTesting; import com.android.settings.core.FeatureFlags; import com.android.settings.enterprise.EnterprisePrivacySettings; +import com.android.settings.network.SubscriptionUtil; +import com.android.settings.network.telephony.MobileNetworkUtils; import com.android.settings.overlay.FeatureFactory; import com.android.settings.security.SecuritySettingsFeatureProvider; @@ -304,7 +309,51 @@ public class Settings extends SettingsActivity { public static class WifiCallingDisclaimerActivity extends SettingsActivity { /* empty */ } public static class MobileNetworkListActivity extends SettingsActivity {} public static class PowerMenuSettingsActivity extends SettingsActivity {} - public static class SubscriptionSettingsActivity extends SettingsActivity { /* empty */ } + public static class MobileNetworkActivity extends SettingsActivity { + + public static final String EXTRA_MMS_MESSAGE = "mms_message"; + public static final String EXTRA_SHOW_CAPABILITY_DISCOVERY_OPT_IN = + "show_capability_discovery_opt_in"; + + @Override + public Intent getIntent() { + final Intent intent = new Intent(super.getIntent()); + int subId = intent.getIntExtra(android.provider.Settings.EXTRA_SUB_ID, + SubscriptionManager.INVALID_SUBSCRIPTION_ID); + SubscriptionInfo subInfo = SubscriptionUtil.getSubscriptionOrDefault( + getApplicationContext(), subId); + CharSequence title = SubscriptionUtil.getUniqueSubscriptionDisplayName( + subInfo, getApplicationContext()); + intent.putExtra(SettingsActivity.EXTRA_SHOW_FRAGMENT_TITLE, title); + intent.putExtra(android.provider.Settings.EXTRA_SUB_ID, subId); + if (android.provider.Settings.ACTION_MMS_MESSAGE_SETTING.equals(intent.getAction())) { + // highlight "mms_message" preference. + intent.putExtra(EXTRA_FRAGMENT_ARG_KEY, EXTRA_MMS_MESSAGE); + } + + if (doesIntentContainOptInAction(intent)) { + intent.putExtra(EXTRA_SHOW_CAPABILITY_DISCOVERY_OPT_IN, + maybeShowContactDiscoveryDialog(subId)); + } + + return intent; + } + + private boolean maybeShowContactDiscoveryDialog(int subId) { + // If this activity was launched using ACTION_SHOW_CAPABILITY_DISCOVERY_OPT_IN, show the + // associated dialog only if the opt-in has not been granted yet. + return MobileNetworkUtils.isContactDiscoveryVisible(getApplicationContext(), subId) + // has the user already enabled this configuration? + && !MobileNetworkUtils.isContactDiscoveryEnabled( + getApplicationContext(), subId); + } + + public static boolean doesIntentContainOptInAction(Intent intent) { + String intentAction = (intent != null ? intent.getAction() : null); + return TextUtils.equals(intentAction, + ImsRcsManager.ACTION_SHOW_CAPABILITY_DISCOVERY_OPT_IN); + } + } /** * Activity for BugReportHandlerPicker. diff --git a/src/com/android/settings/network/MobileNetworkListController.java b/src/com/android/settings/network/MobileNetworkListController.java index d7fc8b4d586af4e99f435c07c5d9fe6d4a717ad4..fd40c8fa6ef2d1cb8b4a7120d2fb1411d5e7524f 100644 --- a/src/com/android/settings/network/MobileNetworkListController.java +++ b/src/com/android/settings/network/MobileNetworkListController.java @@ -16,6 +16,8 @@ package com.android.settings.network; +import static com.android.settings.Utils.SETTINGS_PACKAGE_NAME; + import static androidx.lifecycle.Lifecycle.Event.ON_PAUSE; import static androidx.lifecycle.Lifecycle.Event.ON_RESUME; @@ -34,7 +36,6 @@ import androidx.preference.PreferenceScreen; import com.android.internal.annotations.VisibleForTesting; import com.android.settings.R; -import com.android.settings.network.telephony.MobileNetworkActivity; import com.android.settings.network.telephony.MobileNetworkUtils; import com.android.settingslib.core.AbstractPreferenceController; @@ -137,7 +138,8 @@ public class MobileNetworkListController extends AbstractPreferenceController im && !SubscriptionUtil.showToggleForPhysicalSim(mSubscriptionManager)) { SubscriptionUtil.startToggleSubscriptionDialogActivity(mContext, subId, true); } else { - final Intent intent = new Intent(mContext, MobileNetworkActivity.class); + final Intent intent = new Intent(Settings.ACTION_NETWORK_OPERATOR_SETTINGS); + intent.setPackage(SETTINGS_PACKAGE_NAME); intent.putExtra(Settings.EXTRA_SUB_ID, info.getSubscriptionId()); mContext.startActivity(intent); } diff --git a/src/com/android/settings/network/MobileNetworkPreferenceController.java b/src/com/android/settings/network/MobileNetworkPreferenceController.java index 527a632d706f6d96dbbafb68ea571c48655d9e5d..b49613a7a94b92095012e8878f37d6250da5b5c4 100644 --- a/src/com/android/settings/network/MobileNetworkPreferenceController.java +++ b/src/com/android/settings/network/MobileNetworkPreferenceController.java @@ -18,6 +18,8 @@ package com.android.settings.network; import static android.os.UserHandle.myUserId; import static android.os.UserManager.DISALLOW_CONFIG_MOBILE_NETWORKS; +import static com.android.settings.Utils.SETTINGS_PACKAGE_NAME; + import static androidx.lifecycle.Lifecycle.Event; import android.content.BroadcastReceiver; @@ -38,7 +40,6 @@ import androidx.preference.Preference; import androidx.preference.PreferenceScreen; import com.android.settings.core.PreferenceControllerMixin; -import com.android.settings.network.telephony.MobileNetworkActivity; import com.android.settings.network.telephony.MobileNetworkUtils; import com.android.settingslib.RestrictedLockUtilsInternal; import com.android.settingslib.RestrictedPreference; @@ -146,7 +147,8 @@ public class MobileNetworkPreferenceController extends AbstractPreferenceControl @Override public boolean handlePreferenceTreeClick(Preference preference) { if (KEY_MOBILE_NETWORK_SETTINGS.equals(preference.getKey())) { - final Intent intent = new Intent(mContext, MobileNetworkActivity.class); + final Intent intent = new Intent(Settings.ACTION_NETWORK_OPERATOR_SETTINGS); + intent.setPackage(SETTINGS_PACKAGE_NAME); mContext.startActivity(intent); return true; } diff --git a/src/com/android/settings/network/telephony/MobileDataSlice.java b/src/com/android/settings/network/telephony/MobileDataSlice.java index 22bb5818f9c62249478dbd8f952daf1c807ef30e..d25ae65d0407f61c4b7c9a10cf8b7675301f2ab7 100644 --- a/src/com/android/settings/network/telephony/MobileDataSlice.java +++ b/src/com/android/settings/network/telephony/MobileDataSlice.java @@ -18,6 +18,8 @@ package com.android.settings.network.telephony; import static android.app.slice.Slice.EXTRA_TOGGLE_STATE; +import static com.android.settings.Utils.SETTINGS_PACKAGE_NAME; + import android.annotation.ColorInt; import android.app.PendingIntent; import android.content.Context; @@ -27,6 +29,7 @@ import android.database.ContentObserver; import android.net.Uri; import android.os.Handler; import android.os.Looper; +import android.provider.Settings; import android.telephony.SubscriptionInfo; import android.telephony.SubscriptionManager; import android.telephony.TelephonyManager; @@ -142,7 +145,8 @@ public class MobileDataSlice implements CustomSliceable { @Override public Intent getIntent() { - return new Intent(mContext, MobileNetworkActivity.class); + return new Intent(Settings.ACTION_NETWORK_OPERATOR_SETTINGS).setPackage( + SETTINGS_PACKAGE_NAME); } @Override diff --git a/src/com/android/settings/network/telephony/MobileNetworkActivity.java b/src/com/android/settings/network/telephony/MobileNetworkActivity.java deleted file mode 100644 index d3ff54699210e3b0ec854b07f729fab9210c71ce..0000000000000000000000000000000000000000 --- a/src/com/android/settings/network/telephony/MobileNetworkActivity.java +++ /dev/null @@ -1,121 +0,0 @@ -/* - * Copyright (C) 2018 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.telephony; - -import static com.android.settings.SettingsActivity.EXTRA_FRAGMENT_ARG_KEY; - -import android.app.Activity; -import android.app.settings.SettingsEnums; -import android.content.Intent; -import android.os.Bundle; -import android.os.UserManager; -import android.provider.Settings; -import android.telephony.SubscriptionInfo; -import android.telephony.SubscriptionManager; -import android.telephony.ims.ImsRcsManager; -import android.text.TextUtils; -import android.util.Log; - - -import com.android.settings.SettingsActivity; -import com.android.settings.Utils; -import com.android.settings.activityembedding.ActivityEmbeddingUtils; -import com.android.settings.network.SubscriptionUtil; - -/** - * Activity for displaying MobileNetworkSettings. - * - * @Deprecated The MobileNetworkActivity should be removed in Android U. Instead of using the - * singleTask activity which will cause an additional window transition when users launch the SIMs - * page, using the {@link com.android.settings.Settings.SubscriptionSettingsActivity} which can be - * managed by {@link SettingsActivity} and be migrated into the Settings architecture. - */ -@Deprecated -public class MobileNetworkActivity extends Activity { - - private static final String TAG = "MobileNetworkActivity"; - public static final String SHOW_CAPABILITY_DISCOVERY_OPT_IN = - "show_capability_discovery_opt_in"; - @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - final UserManager userManager = this.getSystemService(UserManager.class); - if (!userManager.isAdminUser()) { - this.finish(); - return; - } - - // TODO: Move these intent's extra into SubscriptionSettingsActivity if the - // MobileNetworkActivity is removed in Android U. - Intent intent = getIntent(); - if (intent == null) { - Log.d(TAG, "onCreate(), intent = null"); - this.finish(); - return; - } - - Intent trampolineIntent; - final Intent subscriptionSettingsIntent = new Intent(this, - com.android.settings.Settings.SubscriptionSettingsActivity.class); - if (!ActivityEmbeddingUtils.isEmbeddingActivityEnabled(this) || !isTaskRoot()) { - trampolineIntent = subscriptionSettingsIntent; - } else { - trampolineIntent = new Intent(Settings.ACTION_SETTINGS_EMBED_DEEP_LINK_ACTIVITY) - .setPackage(Utils.SETTINGS_PACKAGE_NAME); - trampolineIntent.putExtra( - android.provider.Settings.EXTRA_SETTINGS_EMBEDDED_DEEP_LINK_INTENT_URI, - subscriptionSettingsIntent.toUri(Intent.URI_INTENT_SCHEME)); - } - - int subId = intent.getIntExtra(Settings.EXTRA_SUB_ID, - SubscriptionManager.INVALID_SUBSCRIPTION_ID); - SubscriptionInfo subInfo = SubscriptionUtil.getSubscriptionOrDefault(this, subId); - CharSequence title = SubscriptionUtil.getUniqueSubscriptionDisplayName(subInfo, this); - trampolineIntent.putExtra(SettingsActivity.EXTRA_SHOW_FRAGMENT_TITLE, title); - trampolineIntent.putExtra(Settings.EXTRA_SUB_ID, subId); - if (Settings.ACTION_MMS_MESSAGE_SETTING.equals(intent.getAction())) { - // highlight "mms_message" preference. - trampolineIntent.putExtra(EXTRA_FRAGMENT_ARG_KEY, "mms_message"); - } - - if (doesIntentContainOptInAction(intent)) { - trampolineIntent.putExtra(SHOW_CAPABILITY_DISCOVERY_OPT_IN, - maybeShowContactDiscoveryDialog(subId)); - } - - startActivity(trampolineIntent); - if (isTaskRoot()) { - finishAndRemoveTask(); - } else { - finish(); - } - } - - private boolean maybeShowContactDiscoveryDialog(int subId) { - // If this activity was launched using ACTION_SHOW_CAPABILITY_DISCOVERY_OPT_IN, show the - // associated dialog only if the opt-in has not been granted yet. - return MobileNetworkUtils.isContactDiscoveryVisible(this, subId) - // has the user already enabled this configuration? - && !MobileNetworkUtils.isContactDiscoveryEnabled(this, subId); - } - - public static boolean doesIntentContainOptInAction(Intent intent) { - String intentAction = (intent != null ? intent.getAction() : null); - return TextUtils.equals(intentAction, - ImsRcsManager.ACTION_SHOW_CAPABILITY_DISCOVERY_OPT_IN); - } -} diff --git a/src/com/android/settings/network/telephony/MobileNetworkSettings.java b/src/com/android/settings/network/telephony/MobileNetworkSettings.java index cf0f889befd23294a6e3938f31c4b32ef5941e0b..f1a40183a205907d67d03330703af348e670b398 100644 --- a/src/com/android/settings/network/telephony/MobileNetworkSettings.java +++ b/src/com/android/settings/network/telephony/MobileNetworkSettings.java @@ -26,7 +26,6 @@ import android.provider.Settings; import android.telephony.SubscriptionInfo; import android.telephony.SubscriptionManager; import android.telephony.TelephonyManager; -import android.telephony.ims.ImsRcsManager; import android.text.TextUtils; import android.util.Log; import android.view.Menu; @@ -37,6 +36,7 @@ import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; import com.android.settings.R; +import com.android.settings.Settings.MobileNetworkActivity; import com.android.settings.datausage.BillingCyclePreferenceController; import com.android.settings.datausage.DataUsageSummaryPreferenceController; import com.android.settings.network.ActiveSubscriptionsListener; diff --git a/src/com/android/settings/sim/SimSelectNotification.java b/src/com/android/settings/sim/SimSelectNotification.java index 6d1573706718b2a5daf87a336a4054412a2feede..5902b926020b0d885be896cb22f528fde237d151 100644 --- a/src/com/android/settings/sim/SimSelectNotification.java +++ b/src/com/android/settings/sim/SimSelectNotification.java @@ -53,7 +53,6 @@ import com.android.internal.annotations.VisibleForTesting; import com.android.settings.HelpTrampoline; import com.android.settings.R; import com.android.settings.network.SubscriptionUtil; -import com.android.settings.network.telephony.MobileNetworkActivity; public class SimSelectNotification extends BroadcastReceiver { private static final String TAG = "SimSelectNotification"; @@ -261,7 +260,7 @@ public class SimSelectNotification extends BroadcastReceiver { // Create the pending intent that will lead to the subscription setting page. Intent resultIntent = new Intent(Settings.ACTION_MMS_MESSAGE_SETTING); - resultIntent.setClass(context, MobileNetworkActivity.class); + resultIntent.setPackage(SETTINGS_PACKAGE_NAME); resultIntent.putExtra(Settings.EXTRA_SUB_ID, subId); PendingIntent resultPendingIntent = PendingIntent.getActivity(context, 0, resultIntent, PendingIntent.FLAG_CANCEL_CURRENT | PendingIntent.FLAG_IMMUTABLE); diff --git a/tests/componenttests/src/com/android/settings/network/telephony/MobileDataPreferenceControllerComponentTest.java b/tests/componenttests/src/com/android/settings/network/telephony/MobileDataPreferenceControllerComponentTest.java index d80faf23445812940a9459ce28e8c79cc1edd184..78a2c92f329db0fe5b3b191aaafe01dc5b9f01d7 100644 --- a/tests/componenttests/src/com/android/settings/network/telephony/MobileDataPreferenceControllerComponentTest.java +++ b/tests/componenttests/src/com/android/settings/network/telephony/MobileDataPreferenceControllerComponentTest.java @@ -37,6 +37,7 @@ import androidx.test.ext.junit.runners.AndroidJUnit4; import androidx.test.filters.SmallTest; import androidx.test.platform.app.InstrumentationRegistry; +import com.android.settings.Settings; import com.android.settings.testutils.CommonUtils; import com.android.settings.testutils.UiUtils; @@ -68,7 +69,7 @@ public class MobileDataPreferenceControllerComponentTest { Context.TELECOM_SERVICE); @Rule - public ActivityScenarioRule + public ActivityScenarioRule rule = new ActivityScenarioRule<>( new Intent(android.provider.Settings.ACTION_DATA_ROAMING_SETTINGS) .setFlags(Intent.FLAG_ACTIVITY_NEW_TASK)); diff --git a/tests/robotests/src/com/android/settings/network/MobileNetworkSummaryControllerTest.java b/tests/robotests/src/com/android/settings/network/MobileNetworkSummaryControllerTest.java index 6870e7ac8a3f782f2e471e2180ca830eb30b345b..ca6600fbd3f2c66df202c2b1074ca0eb7c881b75 100644 --- a/tests/robotests/src/com/android/settings/network/MobileNetworkSummaryControllerTest.java +++ b/tests/robotests/src/com/android/settings/network/MobileNetworkSummaryControllerTest.java @@ -44,7 +44,7 @@ import android.util.FeatureFlagUtils; import androidx.lifecycle.Lifecycle; import androidx.preference.PreferenceScreen; -import com.android.settings.network.telephony.MobileNetworkActivity; +import com.android.settings.Settings.MobileNetworkActivity; import com.android.settings.widget.AddPreference; import com.android.settingslib.RestrictedLockUtils; diff --git a/tests/robotests/src/com/android/settings/network/telephony/MobileNetworkActivityTest.java b/tests/robotests/src/com/android/settings/network/telephony/MobileNetworkActivityTest.java deleted file mode 100644 index 5729208ecfe85a7d804512caaaa20899c41ac4ee..0000000000000000000000000000000000000000 --- a/tests/robotests/src/com/android/settings/network/telephony/MobileNetworkActivityTest.java +++ /dev/null @@ -1,108 +0,0 @@ -/* - * Copyright (C) 2018 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.telephony; - - -import static com.google.common.truth.Truth.assertThat; - -import static org.mockito.Mockito.doReturn; -import static org.robolectric.Shadows.shadowOf; - -import android.content.Context; -import android.content.Intent; -import android.os.Bundle; -import android.os.UserManager; -import android.provider.Settings; -import android.telephony.SubscriptionInfo; -import android.telephony.SubscriptionManager; - -import androidx.test.core.app.ActivityScenario; -import androidx.test.core.app.ApplicationProvider; -import androidx.test.ext.junit.runners.AndroidJUnit4; - -import com.android.settings.SettingsActivity; - -import org.junit.After; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.mockito.Mock; -import org.mockito.MockitoAnnotations; -import org.robolectric.RuntimeEnvironment; -import org.robolectric.shadow.api.Shadow; -import org.robolectric.shadows.ShadowContextImpl; -import org.robolectric.shadows.ShadowSubscriptionManager; -import org.robolectric.shadows.ShadowSubscriptionManager.SubscriptionInfoBuilder; - -@RunWith(AndroidJUnit4.class) -public class MobileNetworkActivityTest { - - private static final int SUB_ID = 1; - private static final String DISPLAY_NAME = "SUB_ID"; - - private Context mContext; - private ShadowContextImpl mShadowContextImpl; - private Intent mTestIntent; - @Mock - private UserManager mUserManager; - private ShadowSubscriptionManager mSubscriptionManager; - private SubscriptionInfo mSubscriptionInfo; - private ActivityScenario mMobileNetworkActivity; - - @Before - public void setUp() { - MockitoAnnotations.initMocks(this); - - mContext = ApplicationProvider.getApplicationContext(); - mShadowContextImpl = Shadow.extract(RuntimeEnvironment.application.getBaseContext()); - mSubscriptionManager = shadowOf(mContext.getSystemService(SubscriptionManager.class)); - mShadowContextImpl.setSystemService(Context.USER_SERVICE, mUserManager); - doReturn(true).when(mUserManager).isAdminUser(); - - mTestIntent = new Intent(mContext, MobileNetworkActivity.class); - mSubscriptionInfo = SubscriptionInfoBuilder.newBuilder() - .setId(SUB_ID).setDisplayName(DISPLAY_NAME).buildSubscriptionInfo(); - mTestIntent.putExtra(Settings.EXTRA_SUB_ID, SUB_ID); - mTestIntent.putExtra(SettingsActivity.EXTRA_SHOW_FRAGMENT_TITLE, - mSubscriptionInfo.getDisplayName()); - } - - @After - public void cleanUp() { - if (mMobileNetworkActivity != null) { - mMobileNetworkActivity.close(); - } - } - - private ActivityScenario createTargetActivity(Intent activityIntent) { - return ActivityScenario.launch(activityIntent); - } - - @Test - public void onCreate_getExtraFromIntent() { - mSubscriptionManager.setActiveSubscriptionInfos(mSubscriptionInfo); - mMobileNetworkActivity = createTargetActivity(mTestIntent); - - mMobileNetworkActivity.onActivity(activity -> { - final Bundle bundle = new Bundle(); - activity.onCreate(bundle); - assertThat(bundle.getInt(Settings.EXTRA_SUB_ID)).isEqualTo(SUB_ID); - assertThat(bundle.getString(SettingsActivity.EXTRA_SHOW_FRAGMENT_TITLE)).isEqualTo( - DISPLAY_NAME); - }); - } -}