From 5e8a3947d2c9b638f438ef94cc0feb430eb92514 Mon Sep 17 00:00:00 2001 From: Yi-Ling Chuang Date: Tue, 8 Jun 2021 15:19:21 +0800 Subject: [PATCH] Suppress Shared Axis transiiton on the SIM dialog ToggleSubscriptionDialogActivity is an activity acting as a dialog. Applying the page transition to it will lead to an empty page when the toggle is switched. Hence, suppress the page transition on this dialog to fix this. Fixes: 190331062 Test: Toggle on/off "Use SIM" and don't see an empty page Change-Id: I5d6510625e3c36d5d9074a2dec4923d72093b024 --- .../network/telephony/ToggleSubscriptionDialogActivity.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/com/android/settings/network/telephony/ToggleSubscriptionDialogActivity.java b/src/com/android/settings/network/telephony/ToggleSubscriptionDialogActivity.java index 0064e6ccfd2..146b575442b 100644 --- a/src/com/android/settings/network/telephony/ToggleSubscriptionDialogActivity.java +++ b/src/com/android/settings/network/telephony/ToggleSubscriptionDialogActivity.java @@ -30,12 +30,14 @@ import android.util.Log; import com.android.internal.annotations.VisibleForTesting; import com.android.settings.R; import com.android.settings.SidecarFragment; +import com.android.settings.core.SettingsBaseActivity; import com.android.settings.network.EnableMultiSimSidecar; import com.android.settings.network.SubscriptionUtil; import com.android.settings.network.SwitchToEuiccSubscriptionSidecar; import com.android.settings.network.SwitchToRemovableSlotSidecar; import com.android.settings.network.UiccSlotUtil; import com.android.settings.sim.SimActivationNotifier; +import com.android.settingslib.transition.SettingsTransitionHelper; import com.google.common.collect.ImmutableList; @@ -68,6 +70,9 @@ public class ToggleSubscriptionDialogActivity extends SubscriptionActionDialogAc Intent intent = new Intent(context, ToggleSubscriptionDialogActivity.class); intent.putExtra(ARG_SUB_ID, subId); 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; }