stop show preferred SIM card dialog during sim switch
Bug: 227169390 Test: manually test Change-Id: I242402e49b267c8cd61a85a46367c778d2d8bbf8 Merged-In: I242402e49b267c8cd61a85a46367c778d2d8bbf8
This commit is contained in:
@@ -16,8 +16,11 @@
|
||||
|
||||
package com.android.settings.sim;
|
||||
|
||||
import static android.content.Context.MODE_PRIVATE;
|
||||
|
||||
import android.app.Activity;
|
||||
import android.content.Intent;
|
||||
import android.content.SharedPreferences;
|
||||
import android.os.Bundle;
|
||||
import android.telecom.PhoneAccountHandle;
|
||||
import android.telecom.TelecomManager;
|
||||
@@ -32,6 +35,7 @@ import androidx.fragment.app.FragmentActivity;
|
||||
import androidx.fragment.app.FragmentManager;
|
||||
|
||||
import com.android.settings.R;
|
||||
import com.android.settings.network.telephony.SubscriptionActionDialogActivity;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@@ -60,6 +64,7 @@ public class SimDialogActivity extends FragmentActivity {
|
||||
@Override
|
||||
protected void onCreate(Bundle savedInstanceState) {
|
||||
super.onCreate(savedInstanceState);
|
||||
|
||||
getWindow().addSystemFlags(
|
||||
WindowManager.LayoutParams.SYSTEM_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS);
|
||||
showOrUpdateDialog();
|
||||
@@ -72,6 +77,13 @@ public class SimDialogActivity extends FragmentActivity {
|
||||
showOrUpdateDialog();
|
||||
}
|
||||
|
||||
private int getProgressState() {
|
||||
final SharedPreferences prefs = getSharedPreferences(
|
||||
SubscriptionActionDialogActivity.SIM_ACTION_DIALOG_PREFS, MODE_PRIVATE);
|
||||
return prefs.getInt(SubscriptionActionDialogActivity.KEY_PROGRESS_STATE,
|
||||
SubscriptionActionDialogActivity.PROGRESS_IS_NOT_SHOWING);
|
||||
}
|
||||
|
||||
private void showOrUpdateDialog() {
|
||||
final int dialogType = getIntent().getIntExtra(DIALOG_TYPE_KEY, INVALID_PICK);
|
||||
|
||||
@@ -80,6 +92,13 @@ public class SimDialogActivity extends FragmentActivity {
|
||||
return;
|
||||
}
|
||||
|
||||
if (dialogType == PREFERRED_PICK
|
||||
&& getProgressState() == SubscriptionActionDialogActivity.PROGRESS_IS_SHOWING) {
|
||||
Log.d(TAG, "Finish the sim dialog since the sim action dialog is showing the progress");
|
||||
finish();
|
||||
return;
|
||||
}
|
||||
|
||||
final String tag = Integer.toString(dialogType);
|
||||
final FragmentManager fragmentManager = getSupportFragmentManager();
|
||||
SimDialogFragment fragment = (SimDialogFragment) fragmentManager.findFragmentByTag(tag);
|
||||
|
Reference in New Issue
Block a user