commit ce272a0bb0c2a48f78aa45de16f0d7f9e6113107
author Treehugger Robot <treehugger-gerrit@google.com> Wed Oct 21 04:02:19 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Oct 21 04:02:19 2020 +0000
tree 1bb8003159d93256b5102cad8861f70485f22c22
parent 3f92484ce85ab47b1101a6bd304d76ad6d86ae51
parent e3dd9644b66a1534ba4486dfb6fdf2dcdda6392b

Merge "Highlight the MMS messages preference for ACTION_MMS_MESSAGE_SETTING" am: 21846b228b am: 0a2c406023 am: d719de84c1 am: e3dd9644b6

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

Change-Id: Ie12fb48d3d17f6299ecc8be2000bc8e9142275aa

src/com/android/settings/network/telephony/MobileNetworkActivity.java

diff --git a/src/com/android/settings/network/telephony/MobileNetworkActivity.java b/src/com/android/settings/network/telephony/MobileNetworkActivity.java
index 6513384..b179770 100644
--- a/src/com/android/settings/network/telephony/MobileNetworkActivity.java
+++ b/src/com/android/settings/network/telephony/MobileNetworkActivity.java
@@ -16,6 +16,8 @@
 
 package com.android.settings.network.telephony;
 
+import static com.android.settings.SettingsActivity.EXTRA_FRAGMENT_ARG_KEY;
+
 import android.app.ActionBar;
 import android.content.Intent;
 import android.os.Bundle;
@@ -254,8 +256,13 @@
         final FragmentTransaction fragmentTransaction = fragmentManager.beginTransaction();
 
         final int subId = subInfo.getSubscriptionId();
+        final Intent intent = getIntent();
         final Bundle bundle = new Bundle();
         bundle.putInt(Settings.EXTRA_SUB_ID, subId);
+        if (intent != null && Settings.ACTION_MMS_MESSAGE_SETTING.equals(intent.getAction())) {
+            // highlight "mms_message" preference.
+            bundle.putString(EXTRA_FRAGMENT_ARG_KEY, "mms_message");
+        }
 
         final String fragmentTag = buildFragmentTag(subId);
         if (fragmentManager.findFragmentByTag(fragmentTag) != null) {