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

Commit 966ac324 authored by Danny Baumann's avatar Danny Baumann
Browse files

Cleanup. 

Don't make variables unnecessarily static, remove redundant variable and
clean up naming scheme.

Change-Id: Ida2dc05d3016bad9c94032cb84c885d1edc05796
parent a0407dcf

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

+10 −15
Original line number Diff line number Diff line
@@ -64,10 +64,10 @@ public class SimSettings extends RestrictedSettingsFragment implements Indexable 
    private static final String KEY_ACTIVITIES = "activities";

    private static final String KEY_PRIMARY_SUB_SELECT = "select_primary_sub";



    private long mPreferredDataSubscription;



    private static final int EVT_UPDATE = 1;

    private static int mNumSlots = 0;



    private long mPreferredDataSubscription;

    private int mNumSlots = 0;



    /**

     * By UX design we have use only one Subscription Information(SubInfo) record per SIM slot.
@@ -78,7 +78,7 @@ public class SimSettings extends RestrictedSettingsFragment implements Indexable 
    private List<SubscriptionInfo> mSubInfoList = null;

    private Preference mPrimarySubSelect = null;



    private static List<MultiSimEnablerPreference> mSimEnablers = null;

    private List<MultiSimEnablerPreference> mSimEnablers = null;



    private SubscriptionInfo mCellularData = null;

    private SubscriptionInfo mCalls = null;
@@ -88,10 +88,7 @@ public class SimSettings extends RestrictedSettingsFragment implements Indexable 
    private int mPhoneCount;

    private int[] mCallState;

    private PhoneStateListener[] mPhoneStateListener;



    private boolean inActivity;

    private boolean dataDisableToastDisplayed = false;



    private boolean mDataDisableToastDisplayed = false;

    private SubscriptionManager mSubscriptionManager;



    public SimSettings() {
@@ -314,14 +311,14 @@ public class SimSettings extends RestrictedSettingsFragment implements Indexable 
        simPref.setEnabled((mNumSims > 1) && callStateIdle);

        // Display toast only once when the user enters the activity even though the call moves

        // through multiple call states (eg - ringing to offhook for incoming calls)

        if (callStateIdle == false && inActivity && dataDisableToastDisplayed == false) {

        if (callStateIdle == false && isResumed() && !mDataDisableToastDisplayed) {

            Toast.makeText(getActivity(), R.string.data_disabled_in_active_call,

                    Toast.LENGTH_SHORT).show();

            dataDisableToastDisplayed = true;

            mDataDisableToastDisplayed = true;

        }

        // Reset dataDisableToastDisplayed

        if (callStateIdle == true) {

            dataDisableToastDisplayed = false;

        if (callStateIdle) {

            mDataDisableToastDisplayed = false;

        }

    }
@@ -350,9 +347,8 @@ public class SimSettings extends RestrictedSettingsFragment implements Indexable 
    @Override

    public void onPause() {

        super.onPause();

        inActivity = false;

        Log.d(TAG,"on Pause");

        dataDisableToastDisplayed = false;

        mDataDisableToastDisplayed = false;

        for (int i = 0; i < mSimEnablers.size(); ++i) {

            MultiSimEnablerPreference simEnabler = mSimEnablers.get(i);

            if (simEnabler != null) simEnabler.cleanUp();
@@ -362,7 +358,6 @@ public class SimSettings extends RestrictedSettingsFragment implements Indexable 
    @Override

    public void onResume() {

        super.onResume();

        inActivity = true;

        Log.d(TAG,"on Resume, number of slots = " + mNumSlots);

        initLTEPreference();

        updateAllOptions();