PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Suppress Shared Axis transiiton on the SIM dialog" into sc-dev am: 562ad29721

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14880642

Change-Id: I7ee7cebf5286051bb20cf3de07dabcf9a1fe0f68
This commit is contained in:
Yi-Ling Chuang
2021-06-09 13:22:09 +00:00
committed by Automerger Merge Worker
parent ee2b43c9f1 562ad29721
commit e031b6f551
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/com/android/settings/network/telephony/ToggleSubscriptionDialogActivity.java
View File

@@ -30,12 +30,14 @@ import android.util.Log;
import com.android.internal.annotations.VisibleForTesting; import com.android.internal.annotations.VisibleForTesting;
import com.android.settings.R; import com.android.settings.R;
import com.android.settings.SidecarFragment; import com.android.settings.SidecarFragment;
import com.android.settings.core.SettingsBaseActivity;
import com.android.settings.network.EnableMultiSimSidecar; import com.android.settings.network.EnableMultiSimSidecar;
import com.android.settings.network.SubscriptionUtil; import com.android.settings.network.SubscriptionUtil;
import com.android.settings.network.SwitchToEuiccSubscriptionSidecar; import com.android.settings.network.SwitchToEuiccSubscriptionSidecar;
import com.android.settings.network.SwitchToRemovableSlotSidecar; import com.android.settings.network.SwitchToRemovableSlotSidecar;
import com.android.settings.network.UiccSlotUtil; import com.android.settings.network.UiccSlotUtil;
import com.android.settings.sim.SimActivationNotifier; import com.android.settings.sim.SimActivationNotifier;
import com.android.settingslib.transition.SettingsTransitionHelper;
import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableList;
@@ -68,6 +70,9 @@ public class ToggleSubscriptionDialogActivity extends SubscriptionActionDialogAc
Intent intent = new Intent(context, ToggleSubscriptionDialogActivity.class); Intent intent = new Intent(context, ToggleSubscriptionDialogActivity.class);
intent.putExtra(ARG_SUB_ID, subId); intent.putExtra(ARG_SUB_ID, subId);
intent.putExtra(ARG_enable, enable); intent.putExtra(ARG_enable, enable);
// suppress page transition as this is a dialog
intent.putExtra(SettingsBaseActivity.EXTRA_PAGE_TRANSITION_TYPE,
SettingsTransitionHelper.TransitionType.TRANSITION_NONE);
return intent; return intent;
} }