commit a3c97876bbe41a29698482b1542c06f3492fdf7b
author Zoey Chen <zoeychen@google.com> Wed Dec 07 07:18:35 2022 +0000
committer Zoey Chen <zoeychen@google.com> Wed Dec 07 07:18:42 2022 +0000
tree 5507fba529868526c4875dd68efe1ac5051f9c1f
parent cfb4ed4b7f0ad5fefbd1e2b122e8078d01e9cc2c

[Settings] Update the title if launch the fragment from search app

Bug: 245613972
Change-Id: I937a4acf0917a16660ff237d0511a5883864a1b9
Test: manual
Merged-In: I07bf9a8f59ea14fc8133e2473746a59a5c187d47

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

diff --git a/src/com/android/settings/network/MobileNetworkIntentConverter.java b/src/com/android/settings/network/MobileNetworkIntentConverter.java
index 648ac61..651215a 100644
--- a/src/com/android/settings/network/MobileNetworkIntentConverter.java
+++ b/src/com/android/settings/network/MobileNetworkIntentConverter.java
@@ -53,17 +53,18 @@
     private static final ComponentName sTargetComponent = ComponentName
             .createRelative("com.android.settings",
                     MobileNetworkActivity.class.getTypeName());
-
+    private static final String INTENT_TRAMPOLINE = "android.settings.SEARCH_RESULT_TRAMPOLINE";
     /**
      * These actions has better aligned with definitions within AndroidManifest.xml
      */
-    private static final String [] sPotentialActions = new String [] {
-        null,
-        Intent.ACTION_MAIN,
-        android.provider.Settings.ACTION_NETWORK_OPERATOR_SETTINGS,
-        android.provider.Settings.ACTION_DATA_ROAMING_SETTINGS,
-        android.provider.Settings.ACTION_MMS_MESSAGE_SETTING,
-        ImsRcsManager.ACTION_SHOW_CAPABILITY_DISCOVERY_OPT_IN
+    private static final String[] sPotentialActions = new String[]{
+            null,
+            Intent.ACTION_MAIN,
+            android.provider.Settings.ACTION_NETWORK_OPERATOR_SETTINGS,
+            android.provider.Settings.ACTION_DATA_ROAMING_SETTINGS,
+            android.provider.Settings.ACTION_MMS_MESSAGE_SETTING,
+            ImsRcsManager.ACTION_SHOW_CAPABILITY_DISCOVERY_OPT_IN,
+            INTENT_TRAMPOLINE
     };
 
     private static final String RE_ROUTE_TAG = ":reroute:" + TAG;
@@ -112,30 +113,31 @@
         if (TextUtils.equals(action,
                 android.provider.Settings.ACTION_NETWORK_OPERATOR_SETTINGS)
                 || TextUtils.equals(action,
-                        android.provider.Settings.ACTION_DATA_ROAMING_SETTINGS)) {
+                android.provider.Settings.ACTION_DATA_ROAMING_SETTINGS)
+                || TextUtils.equals(action, INTENT_TRAMPOLINE)) {
             // Accepted.
             ops = ops.andThen(intent -> extractArguments(intent, subId))
-                     .andThen(args -> rePackIntent(args, reqIntent))
-                     .andThen(intent -> updateFragment(intent, mAppContext, subId));
+                    .andThen(args -> rePackIntent(args, reqIntent))
+                    .andThen(intent -> updateFragment(intent, mAppContext, subId));
         } else if (TextUtils.equals(action,
                 android.provider.Settings.ACTION_MMS_MESSAGE_SETTING)) {
             ops = ops.andThen(intent -> extractArguments(intent, subId))
-                     .andThen(args -> convertMmsArguments(args))
-                     .andThen(args -> rePackIntent(args, reqIntent))
-                     .andThen(intent -> updateFragment(intent, mAppContext, subId));
+                    .andThen(args -> convertMmsArguments(args))
+                    .andThen(args -> rePackIntent(args, reqIntent))
+                    .andThen(intent -> updateFragment(intent, mAppContext, subId));
         } else if (TextUtils.equals(action,
                 ImsRcsManager.ACTION_SHOW_CAPABILITY_DISCOVERY_OPT_IN)) {
             ops = ops.andThen(intent -> extractArguments(intent, subId))
-                     .andThen(args -> supportContactDiscoveryDialog(args, mAppContext, subId))
-                     .andThen(args -> rePackIntent(args, reqIntent))
-                     .andThen(intent -> updateFragment(intent, mAppContext, subId));
+                    .andThen(args -> supportContactDiscoveryDialog(args, mAppContext, subId))
+                    .andThen(args -> rePackIntent(args, reqIntent))
+                    .andThen(intent -> updateFragment(intent, mAppContext, subId));
         } else if ((sTargetComponent.compareTo(mComponent) == 0)
                 && ((action == null) || Intent.ACTION_MAIN.equals(action))) {
             Log.d(TAG, "Support default actions direct to this component");
             ops = ops.andThen(intent -> extractArguments(intent, subId))
-                     .andThen(args -> rePackIntent(args, reqIntent))
-                     .andThen(intent -> replaceIntentAction(intent))
-                     .andThen(intent -> updateFragment(intent, mAppContext, subId));
+                    .andThen(args -> rePackIntent(args, reqIntent))
+                    .andThen(intent -> replaceIntentAction(intent))
+                    .andThen(intent -> updateFragment(intent, mAppContext, subId));
         } else {
             return null;
         }