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

Commit 1e745c65 authored by Shaleen Jain's avatar Shaleen Jain Committed by Gerrit Code Review
Browse files

Settings: msim - update dialogs 

Update multisim dialogs according to material guidlines

Change-Id: I50976fba78ed5109100dc8131f5cc1aeb94557f8
parent dcc364a7

res/values/cm_strings.xml

+4 −3
Original line number Diff line number Diff line
@@ -855,13 +855,14 @@ 
    <string name="sim_enabled">enabled</string>

    <string name="sim_disabled">disabled</string>

    <string name="sim_missing">missing or faulty</string>

    <string name="sim_enabler_need_disable_sim">SIM card will be deactivated. Do you want to continue?</string>

    <string name="sim_enabler_need_disable_sim">Deactivate SIM card?</string>

    <string name="sim_enabler_airplane_on">Unable to perform the operation while airplane mode is on.</string>

    <string name="sim_enabler_in_call">Unable to perform the operation while in call.</string>

    <string name="sim_enabler_both_inactive">Can\'t disable all SIM cards</string>

    <string name="sim_enabler_sim">SIM</string>

    <string name="sim_enabler_enabling">Activating\u2026</string>

    <string name="sim_enabler_disabling">Deactivating\u2026</string>

    <string name="sim_enabler_enabling">Activating <xliff:g id="name">%s</xliff:g>\u2026</string>

    <string name="sim_enabler_disabling">Deactivating <xliff:g id="name">%s</xliff:g>\u2026</string>

    <string name="sim_enabler_deactivate">Deactivate</string>

    <string name="sub_activate_success">SIM activated.</string>

    <string name="sub_deactivate_success">SIM deactivated.</string>

src/com/android/settings/sim/MultiSimEnablerPreference.java

+50 −52
Original line number Diff line number Diff line
@@ -81,7 +81,6 @@ public class MultiSimEnablerPreference extends Preference implements OnCheckedCh 


    private static final int CONFIRM_ALERT_DLG_ID = 1;

    private static final int ERROR_ALERT_DLG_ID = 2;

    private static final int RESULT_ALERT_DLG_ID = 3;



    private int mSlotId;

    private SubscriptionInfo mSir;
@@ -92,8 +91,8 @@ public class MultiSimEnablerPreference extends Preference implements OnCheckedCh 
    private int mSwitchVisibility = View.VISIBLE;

    private Switch mSwitch;

    private Handler mParentHandler = null;

    private static AlertDialog sAlertDialog = null;

    private static ProgressDialog sProgressDialog = null;

    private AlertDialog mAlertDialog = null;

    private ProgressDialog mProgressDialog = null;

    //Delay for progress dialog to dismiss

    private static final int PROGRESS_DLG_TIME_OUT = 30000;

    private static final int MSG_DELAY_TIME = 2000;
@@ -325,51 +324,50 @@ public class MultiSimEnablerPreference extends Preference implements OnCheckedCh 
    private void showAlertDialog(int dialogId, int msgId) {

        String title = mSir == null ? "SUB" : mSir.getDisplayName().toString();

        // Confirm only one AlertDialog instance to show.

        dismissDialog(sAlertDialog);

        dismissDialog(sProgressDialog);

        AlertDialog.Builder builder = new AlertDialog.Builder(mContext)

                .setIcon(android.R.drawable.ic_dialog_alert)

                .setTitle(title);

        dismissDialog(mAlertDialog);

        dismissDialog(mProgressDialog);

        AlertDialog.Builder builder = new AlertDialog.Builder(mContext);

        switch(dialogId) {

            case CONFIRM_ALERT_DLG_ID:

                builder.setTitle(title);

                builder.setMessage(mContext.getString(R.string.sim_enabler_need_disable_sim));

                builder.setPositiveButton(android.R.string.ok, mDialogClickListener);

                builder.setPositiveButton(R.string.sim_enabler_deactivate, mDialogClickListener);

                builder.setNegativeButton(android.R.string.no, mDialogClickListener);

                builder.setOnCancelListener(mDialogCanceListener);

                break;

            case ERROR_ALERT_DLG_ID:

                builder.setMessage(mContext.getString(msgId));

                builder.setNeutralButton(android.R.string.ok, mDialogClickListener);

                builder.setPositiveButton(android.R.string.ok,

                        new DialogInterface.OnClickListener() {

                            @Override

                            public void onClick(DialogInterface dialogInterface, int which) {

                                update();

                            }

                        });

                builder.setCancelable(false);

                break;

            case RESULT_ALERT_DLG_ID:

                String msg = mCurrentState ? mContext.getString(R.string.sub_activate_success) :

                        mContext.getString(R.string.sub_deactivate_success);

                builder.setMessage(msg);

                builder.setNeutralButton(android.R.string.ok, null);

                break;

            default:

                break;

        }



        sAlertDialog = builder.create();

        sAlertDialog.setCanceledOnTouchOutside(false);

        sAlertDialog.show();

        mAlertDialog = builder.create();

        mAlertDialog.setCanceledOnTouchOutside(false);

        mAlertDialog.show();

    }



    private void showProgressDialog() {

        String title = mSir == null ? "SUB" : mSir.getDisplayName().toString();

        String simName = mSir == null ? mContext.getString(R.string.sim_enabler_sim)

                : mSir.displayName;



        String msg = mContext.getString(mCurrentState ? R.string.sim_enabler_enabling

                : R.string.sim_enabler_disabling);

        dismissDialog(sProgressDialog);

        sProgressDialog = new ProgressDialog(mContext);

        sProgressDialog.setIndeterminate(true);

        sProgressDialog.setTitle(title);

        sProgressDialog.setMessage(msg);

        sProgressDialog.setCancelable(false);

        sProgressDialog.setCanceledOnTouchOutside(false);

        sProgressDialog.show();

                : R.string.sim_enabler_disabling, simName);

        dismissDialog(mProgressDialog);

        mProgressDialog = new ProgressDialog(mContext);

        mProgressDialog.setIndeterminate(true);

        mProgressDialog.setMessage(msg);

        mProgressDialog.setCancelable(false);

        mProgressDialog.setCanceledOnTouchOutside(false);

        mProgressDialog.show();



        sendMessage(EVT_PROGRESS_DLG_TIME_OUT, mHandler, PROGRESS_DLG_TIME_OUT);

    }
@@ -383,8 +381,8 @@ public class MultiSimEnablerPreference extends Preference implements OnCheckedCh 


    public void cleanUp() {

        unregisterReceiver();

        dismissDialog(sProgressDialog);

        dismissDialog(sAlertDialog);

        dismissDialog(mProgressDialog);

        dismissDialog(mAlertDialog);

    }



    private void unregisterReceiver() {
@@ -436,7 +434,7 @@ public class MultiSimEnablerPreference extends Preference implements OnCheckedCh 
                case EVT_SHOW_RESULT_DLG:

                    logd("EVT_SHOW_RESULT_DLG");

                    update();

                        showAlertDialog(RESULT_ALERT_DLG_ID, 0);

                    dismissDialog(mProgressDialog);

                    mHandler.removeMessages(EVT_PROGRESS_DLG_TIME_OUT);

                    break;

                case EVT_SHOW_PROGRESS_DLG:
@@ -445,7 +443,7 @@ public class MultiSimEnablerPreference extends Preference implements OnCheckedCh 
                    break;

                case EVT_PROGRESS_DLG_TIME_OUT:

                    logd("EVT_PROGRESS_DLG_TIME_OUT");

                        dismissDialog(sProgressDialog);

                    dismissDialog(mProgressDialog);

                    break;

                default:

                    break;