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

Commit ac88fdc0 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "Settings: Jump to MSimMobileNetworkSubSettings in dual Sim UI"

parents 0934ecfd cfc246f5

src/com/android/settings/dashboard/SearchResultsSummary.java

+9 −0
Original line number Original line Diff line number Diff line
@@ -26,6 +26,7 @@ import android.database.Cursor; 
import android.graphics.drawable.Drawable;

import android.graphics.drawable.Drawable;

import android.os.AsyncTask;

import android.os.AsyncTask;

import android.os.Bundle;

import android.os.Bundle;

import android.telephony.TelephonyManager;

import android.text.TextUtils;

import android.text.TextUtils;

import android.util.Log;

import android.util.Log;

import android.view.LayoutInflater;

import android.view.LayoutInflater;
@@ -38,6 +39,7 @@ import android.widget.ListView; 
import android.widget.SearchView;

import android.widget.SearchView;

import android.widget.TextView;

import android.widget.TextView;

import com.android.settings.R;

import com.android.settings.R;

import com.android.settings.SelectSubscription;

import com.android.settings.SettingsActivity;

import com.android.settings.SettingsActivity;

import com.android.settings.Utils;

import com.android.settings.Utils;

import com.android.settings.search.Index;

import com.android.settings.search.Index;
@@ -198,10 +200,17 @@ public class SearchResultsSummary extends Fragment { 
                            Index.COLUMN_INDEX_INTENT_ACTION_TARGET_PACKAGE);

                            Index.COLUMN_INDEX_INTENT_ACTION_TARGET_PACKAGE);

                    final String targetClass = cursor.getString(

                    final String targetClass = cursor.getString(

                            Index.COLUMN_INDEX_INTENT_ACTION_TARGET_CLASS);

                            Index.COLUMN_INDEX_INTENT_ACTION_TARGET_CLASS);

                    final String targetSubClass = cursor.getString(

                            Index.COLUMN_INDEX_CLASS_NAME);

                    if (!TextUtils.isEmpty(targetPackage) && !TextUtils.isEmpty(targetClass)) {

                    if (!TextUtils.isEmpty(targetPackage) && !TextUtils.isEmpty(targetClass)) {

                        final ComponentName component =

                        final ComponentName component =

                                new ComponentName(targetPackage, targetClass);

                                new ComponentName(targetPackage, targetClass);

                        intent.setComponent(component);

                        intent.setComponent(component);

                        if (TelephonyManager.getDefault().isMultiSimEnabled() &&

                                !TextUtils.isEmpty(targetSubClass)) {

                            intent.putExtra(SelectSubscription.PACKAGE, targetPackage);

                            intent.putExtra(SelectSubscription.TARGET_CLASS, targetSubClass);

                        }

                    }

                    }

                    intent.putExtra(SettingsActivity.EXTRA_FRAGMENT_ARG_KEY, key);

                    intent.putExtra(SettingsActivity.EXTRA_FRAGMENT_ARG_KEY, key);