Projects >> packages_apps_Phone >>85971429acef3eee79c0867ecc92e543880ab4f7

Chunk
Conflicting content 
import android.preference.Preference;
import android.preference.PreferenceActivity;
import android.preference.PreferenceScreen;
<<<<<<< HEAD

import com.android.internal.telephony.Phone;
=======
import android.text.TextUtils;
>>>>>>> 462b1c2194ca3537f5543cbf33402e8714ce5a98

/**
 * List of CDMA Phone-specific network settings screens.
Solution content 
import android.preference.Preference;
import android.preference.PreferenceActivity;
import android.preference.PreferenceScreen;
import android.text.TextUtils;

/**
File
CdmaOptions.java
Developer's decision
Version 2
Kind of conflict
Import
Chunk
Conflicting content 
    private static final String BUTTON_CDMA_SYSTEM_SELECT_KEY = "cdma_system_select_key";
    private static final String BUTTON_CDMA_SUBSCRIPTION_KEY = "cdma_subscription_key";

<<<<<<< HEAD
=======
        addPreferencesFromResource(R.xml.cdma_options);
    private static final String BUTTON_CDMA_ROAMING_KEY = "cdma_roaming_mode_key";

    @Override
    protected void onCreate(Bundle icicle) {
        if (PhoneApp.getPhone().getPhoneType() != Phone.PHONE_TYPE_CDMA) {
            throw new RuntimeException("This should be called only for CDMA phone");
        }

        super.onCreate(icicle);

    private PreferenceActivity mPrefActivity;
    private PreferenceScreen mPrefScreen;

    public CdmaOptions(PreferenceActivity prefActivity, PreferenceScreen prefScreen) {
        mPrefActivity = prefActivity;
        mPrefScreen = prefScreen;
        create();
    }

    protected void create() {
        mPrefActivity.addPreferencesFromResource(R.xml.cdma_options);

        mButtonCdmaSystemSelect = (CdmaSystemSelectListPreference)mPrefScreen
                .findPreference(BUTTON_CDMA_SYSTEM_SELECT_KEY);

        mButtonCdmaSubscription = (CdmaSubscriptionListPreference)mPrefScreen
                .findPreference(BUTTON_CDMA_SUBSCRIPTION_KEY);

        mButtonCdmaSystemSelect.setEnabled(true);
        if(deviceSupportsNvAndRuim()) {
            log("Both NV and Ruim supported, ENABLE subscription type selection");
            mButtonCdmaSubscription.setEnabled(true);
        } else {
            log("Both NV and Ruim NOT supported, REMOVE subscription type selection");
            mPrefScreen.removePreference(mPrefScreen
                                .findPreference(BUTTON_CDMA_SUBSCRIPTION_KEY));
        }
>>>>>>> 462b1c2194ca3537f5543cbf33402e8714ce5a98
    }

    private boolean deviceSupportsNvAndRuim() {
Solution content 
    private static final String BUTTON_CDMA_SYSTEM_SELECT_KEY = "cdma_system_select_key";
    private static final String BUTTON_CDMA_SUBSCRIPTION_KEY = "cdma_subscription_key";

    private PreferenceActivity mPrefActivity;
    private PreferenceScreen mPrefScreen;

    public CdmaOptions(PreferenceActivity prefActivity, PreferenceScreen prefScreen) {
        mPrefActivity = prefActivity;
        mPrefScreen = prefScreen;
        create();
    }

    protected void create() {
        mPrefActivity.addPreferencesFromResource(R.xml.cdma_options);

        mButtonCdmaSystemSelect = (CdmaSystemSelectListPreference)mPrefScreen
                .findPreference(BUTTON_CDMA_SYSTEM_SELECT_KEY);

        mButtonCdmaSubscription = (CdmaSubscriptionListPreference)mPrefScreen
                .findPreference(BUTTON_CDMA_SUBSCRIPTION_KEY);

        mButtonCdmaSystemSelect.setEnabled(true);
        if(deviceSupportsNvAndRuim()) {
            log("Both NV and Ruim supported, ENABLE subscription type selection");
            mButtonCdmaSubscription.setEnabled(true);
        } else {
            log("Both NV and Ruim NOT supported, REMOVE subscription type selection");
            mPrefScreen.removePreference(mPrefScreen
                                .findPreference(BUTTON_CDMA_SUBSCRIPTION_KEY));
        }
    }

    private boolean deviceSupportsNvAndRuim() {
File
CdmaOptions.java
Developer's decision
Version 2
Kind of conflict
Annotation
Attribute
Cast expression
If statement
Method declaration
Method invocation
Method signature
Chunk
Conflicting content 
    private PreferenceActivity mPrefActivity;
    private PreferenceScreen mPrefScreen;

<<<<<<< HEAD
    @Override
    protected void onCreate(Bundle icicle) {

        // This class should only be created for GSM/UMTS Phone
        if (PhoneApp.getPhone().getPhoneType() != Phone.PHONE_TYPE_GSM) {
            throw new RuntimeException("This should be called only for GSM/UMTS phone");
        }

        super.onCreate(icicle);

        addPreferencesFromResource(R.xml.gsm_umts_options);


=======
    public GsmUmtsOptions(PreferenceActivity prefActivity, PreferenceScreen prefScreen) {
        mPrefActivity = prefActivity;
        mPrefScreen = prefScreen;
        create();
    }

    protected void create() {
        mPrefActivity.addPreferencesFromResource(R.xml.gsm_umts_options);
        mButtonAPNExpand = (PreferenceScreen) mPrefScreen.findPreference(BUTTON_APN_EXPAND_KEY);
        mButtonOperatorSelectionExpand =
                (PreferenceScreen) mPrefScreen.findPreference(BUTTON_OPERATOR_SELECTION_EXPAND_KEY);
        mButtonPrefer2g = (CheckBoxPreference) mPrefScreen.findPreference(BUTTON_PREFER_2G_KEY);
        if (PhoneFactory.getDefaultPhone().getPhoneType() != Phone.PHONE_TYPE_GSM) {
            log("Not a GSM phone");
            mButtonAPNExpand.setEnabled(false);
            mButtonOperatorSelectionExpand.setEnabled(false);
            mButtonPrefer2g.setEnabled(false);
        }
>>>>>>> 462b1c2194ca3537f5543cbf33402e8714ce5a98
    }

    public boolean preferenceTreeClick(Preference preference) {
Solution content 
    private PreferenceActivity mPrefActivity;
    private PreferenceScreen mPrefScreen;

    public GsmUmtsOptions(PreferenceActivity prefActivity, PreferenceScreen prefScreen) {
        mPrefActivity = prefActivity;
        mPrefScreen = prefScreen;
        create();
    }

    protected void create() {
        mPrefActivity.addPreferencesFromResource(R.xml.gsm_umts_options);
        mButtonAPNExpand = (PreferenceScreen) mPrefScreen.findPreference(BUTTON_APN_EXPAND_KEY);
        mButtonOperatorSelectionExpand =
                (PreferenceScreen) mPrefScreen.findPreference(BUTTON_OPERATOR_SELECTION_EXPAND_KEY);
        mButtonPrefer2g = (CheckBoxPreference) mPrefScreen.findPreference(BUTTON_PREFER_2G_KEY);
        if (PhoneFactory.getDefaultPhone().getPhoneType() != Phone.PHONE_TYPE_GSM) {
            log("Not a GSM phone");
            mButtonAPNExpand.setEnabled(false);
            mButtonOperatorSelectionExpand.setEnabled(false);
            mButtonPrefer2g.setEnabled(false);
        }
    }

    public boolean preferenceTreeClick(Preference preference) {
File
GsmUmtsOptions.java
Developer's decision
Version 2
Kind of conflict
Annotation
Attribute
Cast expression
Comment
If statement
Method declaration
Method invocation
Method signature