Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 45c646d6 authored by Zoey Chen's avatar Zoey Chen Committed by Automerger Merge Worker
Browse files

Merge "[Settings] Update the title if launch the fragment from search app" am:... 

Merge "[Settings] Update the title if launch the fragment from search app" am: eef6d0cb am: 8b0070a5

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2331882



Change-Id: Iffed6efb8542259ae3f1ca22c198cc768a4ad126
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 89ad53e3 8b0070a5

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

+22 −20
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ public class MobileNetworkIntentConverter implements Function<Intent, Intent> { 
    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

     */
@@ -63,7 +63,8 @@ public class MobileNetworkIntentConverter implements Function<Intent, Intent> { 
            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

            ImsRcsManager.ACTION_SHOW_CAPABILITY_DISCOVERY_OPT_IN,

            INTENT_TRAMPOLINE

    };



    private static final String RE_ROUTE_TAG = ":reroute:" + TAG;
@@ -112,7 +113,8 @@ public class MobileNetworkIntentConverter implements Function<Intent, Intent> { 
        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))