commit fad5a00b8482fabefe2b497e665846dcab41ce2a
author Bonian Chen <bonianchen@google.com> Wed Sep 11 14:35:15 2019 +0800
committer Bonian Chen <bonianchen@google.com> Wed Sep 18 22:20:25 2019 +0000
tree a99943f6476bb669d15c309db663ef36d1d58acd
parent 1ae748b09fe6b59dd734d468030572715b7bcddf

[Help Page] Support help content under 2 CDMA SIM

Fix the design for displaying help content.

Launch help content from notification (PendingIntent) could not be resolved correctly.
Route through HelpTrampoline to fix it.

Bug: 139040358
Test: Manual with fake from framework side for dual CDMA SIM
Change-Id: Iff3a6e9095c3908b3c5b1a25e2535bcab1858ae2

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 fb83a4d..fbf766c 100644
--- a/src/com/android/settings/sim/SimSelectNotification.java
+++ b/src/com/android/settings/sim/SimSelectNotification.java
@@ -46,6 +46,7 @@
 import android.util.Log;
 
 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;
@@ -292,10 +293,9 @@
                         .setAutoCancel(true);
 
         // Create the pending intent that will lead to the helper page.
-        Intent resultIntent = HelpUtils.getHelpIntent(
-                context,
-                context.getString(R.string.help_uri_sim_combination_warning),
-                context.getClass().getName());
+        Intent resultIntent = new Intent(context, HelpTrampoline.class);
+        resultIntent.putExtra(Intent.EXTRA_TEXT, "help_uri_sim_combination_warning");
+
         PendingIntent resultPendingIntent = PendingIntent.getActivity(context, 0, resultIntent,
                 PendingIntent.FLAG_CANCEL_CURRENT);
         builder.setContentIntent(resultPendingIntent);