Merge "[Help Page] Support help content under 2 CDMA SIM" into qt-qpr1-dev am: 20290d0451
am: 3cce668981
Change-Id: I16c4e2ef30bd62acec5d4b54fe57ac1ff25dbb90
This commit is contained in:
@@ -46,6 +46,7 @@ import android.telephony.TelephonyManager;
|
|||||||
import android.util.Log;
|
import android.util.Log;
|
||||||
|
|
||||||
import com.android.internal.annotations.VisibleForTesting;
|
import com.android.internal.annotations.VisibleForTesting;
|
||||||
|
import com.android.settings.HelpTrampoline;
|
||||||
import com.android.settings.R;
|
import com.android.settings.R;
|
||||||
import com.android.settings.network.SubscriptionUtil;
|
import com.android.settings.network.SubscriptionUtil;
|
||||||
import com.android.settings.network.telephony.MobileNetworkActivity;
|
import com.android.settings.network.telephony.MobileNetworkActivity;
|
||||||
@@ -292,10 +293,9 @@ public class SimSelectNotification extends BroadcastReceiver {
|
|||||||
.setAutoCancel(true);
|
.setAutoCancel(true);
|
||||||
|
|
||||||
// Create the pending intent that will lead to the helper page.
|
// Create the pending intent that will lead to the helper page.
|
||||||
Intent resultIntent = HelpUtils.getHelpIntent(
|
Intent resultIntent = new Intent(context, HelpTrampoline.class);
|
||||||
context,
|
resultIntent.putExtra(Intent.EXTRA_TEXT, "help_uri_sim_combination_warning");
|
||||||
context.getString(R.string.help_uri_sim_combination_warning),
|
|
||||||
context.getClass().getName());
|
|
||||||
PendingIntent resultPendingIntent = PendingIntent.getActivity(context, 0, resultIntent,
|
PendingIntent resultPendingIntent = PendingIntent.getActivity(context, 0, resultIntent,
|
||||||
PendingIntent.FLAG_CANCEL_CURRENT);
|
PendingIntent.FLAG_CANCEL_CURRENT);
|
||||||
builder.setContentIntent(resultPendingIntent);
|
builder.setContentIntent(resultPendingIntent);
|
||||||
|
Reference in New Issue
Block a user