commit d35ea04c83a839be2046379399571043bd0f2eb0
author Zoey Chen <zoeychen@google.com> Wed Dec 15 03:26:38 2021 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Dec 15 03:26:38 2021 +0000
tree 41dc39e05601e6aff66d8f0fe83c97843997791a
parent 370ab66900d401ea92edea4dd0d88ae6b0ff1da1
parent 2c1fe3ca474c83dbbd0e8214c2205dde3613650d

Merge "[Settings] Remove the legacy 2-pane registration"

src/com/android/settings/network/MobileNetworkTwoPaneUtils.java

diff --git a/src/com/android/settings/network/MobileNetworkTwoPaneUtils.java b/src/com/android/settings/network/MobileNetworkTwoPaneUtils.java
deleted file mode 100644
index 8b3503e..0000000
--- a/src/com/android/settings/network/MobileNetworkTwoPaneUtils.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package com.android.settings.network;
-
-import android.annotation.Nullable;
-import android.content.Context;
-import android.content.Intent;
-import android.util.Log;
-
-import com.android.settings.activityembedding.ActivityEmbeddingRulesController;
-
-public class MobileNetworkTwoPaneUtils {
-
-    private static final String TAG = "MobileNetworkTwoPaneUtils";
-
-    /**
-     * TODO: b/206061070, the problem of multi-instance should be fixed in Android T to apply the
-     * Settings' architecture and 2 panes mode instead of registering the rule.
-     *
-     * The launchMode of MobileNetworkActivity is singleTask, set SplitPairRule to show in 2-pane.
-     */
-    public static void registerTwoPaneForMobileNetwork(Context context, Intent intent,
-            @Nullable String secondaryIntentAction) {
-        Log.d(TAG, "registerTwoPaneForMobileNetwork");
-        ActivityEmbeddingRulesController.registerTwoPanePairRuleForSettingsHome(
-                context,
-                intent.getComponent(),
-                secondaryIntentAction /* secondaryIntentAction */,
-                false /* clearTop */);
-    }
-}

src/com/android/settings/sim/SimSelectNotification.java

diff --git a/src/com/android/settings/sim/SimSelectNotification.java b/src/com/android/settings/sim/SimSelectNotification.java
index 84b7523..6d15737 100644
--- a/src/com/android/settings/sim/SimSelectNotification.java
+++ b/src/com/android/settings/sim/SimSelectNotification.java
@@ -52,7 +52,6 @@
 import com.android.internal.annotations.VisibleForTesting;
 import com.android.settings.HelpTrampoline;
 import com.android.settings.R;
-import com.android.settings.network.MobileNetworkTwoPaneUtils;
 import com.android.settings.network.SubscriptionUtil;
 import com.android.settings.network.telephony.MobileNetworkActivity;
 
@@ -264,9 +263,6 @@
         Intent resultIntent = new Intent(Settings.ACTION_MMS_MESSAGE_SETTING);
         resultIntent.setClass(context, MobileNetworkActivity.class);
         resultIntent.putExtra(Settings.EXTRA_SUB_ID, subId);
-        // MobileNetworkActivity is singleTask, set SplitPairRule to show in 2-pane.
-        MobileNetworkTwoPaneUtils.registerTwoPaneForMobileNetwork(context, resultIntent,
-                Settings.ACTION_MMS_MESSAGE_SETTING);
         PendingIntent resultPendingIntent = PendingIntent.getActivity(context, 0, resultIntent,
                 PendingIntent.FLAG_CANCEL_CURRENT | PendingIntent.FLAG_IMMUTABLE);
         builder.setContentIntent(resultPendingIntent);