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

Commit 042554a0 authored by Bill Yi's avatar Bill Yi
Browse files

Merge TP1A.220905.004 to aosp-master - DO NOT MERGE 

Merged-In: Id0c4e3c68ee40e5d0d57449b531228b31f2246ac
Merged-In: Ib71b6904b5c85b3d9f96563bd38bbf2d0305127d
Change-Id: I186ff56c007d17ad650b64facfbd4862cc06bf9a
parents 6672e378 79eeb2d7

src/com/android/settings/SettingsActivity.java

+15 −0
Original line number Diff line number Diff line
@@ -70,6 +70,7 @@ import com.android.settings.homepage.DeepLinkHomepageActivityInternal; 
import com.android.settings.homepage.SettingsHomepageActivity;

import com.android.settings.homepage.TopLevelSettings;

import com.android.settings.overlay.FeatureFactory;

import com.android.settings.password.PasswordUtils;

import com.android.settings.wfd.WifiDisplaySettings;

import com.android.settings.widget.SettingsMainSwitchBar;

import com.android.settingslib.core.instrumentation.Instrumentable;
@@ -154,6 +155,7 @@ public class SettingsActivity extends SettingsBaseActivity 
    public static final String EXTRA_IS_FROM_SLICE = "is_from_slice";



    public static final String EXTRA_USER_HANDLE = "user_handle";

    public static final String EXTRA_INITIAL_CALLING_PACKAGE = "initial_calling_package";



    /**

     * Personal or Work profile tab of {@link ProfileSelectFragment}
@@ -418,6 +420,8 @@ public class SettingsActivity extends SettingsBaseActivity 
    }



    private boolean tryStartTwoPaneDeepLink(Intent intent) {

        intent.putExtra(EXTRA_INITIAL_CALLING_PACKAGE, PasswordUtils.getCallingAppPackageName(

                getActivityToken()));

        final Intent trampolineIntent;

        if (intent.getBooleanExtra(EXTRA_IS_FROM_SLICE, false)) {

            // Get menu key for slice deep link case.
@@ -505,6 +509,17 @@ public class SettingsActivity extends SettingsBaseActivity 
        return true;

    }



    /** Returns the initial calling package name that launches the activity. */

    public String getInitialCallingPackage() {

        String callingPackage = PasswordUtils.getCallingAppPackageName(getActivityToken());

        if (!TextUtils.equals(callingPackage, getPackageName())) {

            return callingPackage;

        }



        String initialCallingPackage = getIntent().getStringExtra(EXTRA_INITIAL_CALLING_PACKAGE);

        return TextUtils.isEmpty(initialCallingPackage) ? callingPackage : initialCallingPackage;

    }



    /** Returns the initial fragment name that the activity will launch. */

    @VisibleForTesting

    public String getInitialFragmentName(Intent intent) {

src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragment.java

+3 −3
Original line number Diff line number Diff line
@@ -25,9 +25,9 @@ import android.util.Log; 
import androidx.annotation.VisibleForTesting;



import com.android.settings.R;

import com.android.settings.SettingsActivity;

import com.android.settings.core.SettingsUIDeviceConfig;

import com.android.settings.dashboard.DashboardFragment;

import com.android.settings.password.PasswordUtils;

import com.android.settings.search.BaseSearchIndexProvider;

import com.android.settings.slices.SlicePreferenceController;

import com.android.settingslib.search.SearchIndexable;
@@ -71,8 +71,8 @@ public class ConnectedDeviceDashboardFragment extends DashboardFragment { 
        super.onAttach(context);

        final boolean nearbyEnabled = DeviceConfig.getBoolean(DeviceConfig.NAMESPACE_SETTINGS_UI,

                SettingsUIDeviceConfig.BT_NEAR_BY_SUGGESTION_ENABLED, true);

        String callingAppPackageName = PasswordUtils.getCallingAppPackageName(

                getActivity().getActivityToken());

        String callingAppPackageName = ((SettingsActivity) getActivity())

                .getInitialCallingPackage();

        String action = getIntent() != null ? getIntent().getAction() : "";

        if (DEBUG) {

            Log.d(TAG, "onAttach() calling package name is : " + callingAppPackageName

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

+13 −1
Original line number Diff line number Diff line
@@ -60,9 +60,21 @@ public class SubscriptionActionDialogActivity extends FragmentActivity { 
     * @param message The string content should be displayed in the progress dialog.

     */

    protected void showProgressDialog(String message) {

        showProgressDialog(message,false);

    }



    /**

     * Displays a loading dialog.

     *

     * @param message The string content should be displayed in the progress dialog.

     * @param updateIfNeeded is whether to update the progress state in the SharedPreferences.

     */

    protected void showProgressDialog(String message, boolean updateIfNeeded) {

        ProgressDialogFragment.show(getFragmentManager(), message, null);

        if (updateIfNeeded) {

            setProgressState(PROGRESS_IS_SHOWING);

        }

    }



    /** Dismisses the loading dialog. */

    protected void dismissProgressDialog() {

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

+2 −2
Original line number Diff line number Diff line
@@ -220,8 +220,8 @@ public class ToggleSubscriptionDialogActivity extends SubscriptionActionDialogAc 
                showProgressDialog(

                        getString(

                                R.string.sim_action_switch_sub_dialog_progress,

                                SubscriptionUtil.getUniqueSubscriptionDisplayName(

                                        mSubInfo, this)));

                                SubscriptionUtil.getUniqueSubscriptionDisplayName(mSubInfo, this)),

                        removedSubInfo != null ? true : false);

                if (mIsEsimOperation) {

                    mSwitchToEuiccSubscriptionSidecar.run(mSubInfo.getSubscriptionId(),

                            UiccSlotUtil.INVALID_PORT_ID,