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

Commit bff75531 authored by jianzhou's avatar jianzhou Committed by Xiaojing Zhang
Browse files

Settings: Display APN PPP number 

Display the APN PPP number if it is present in the APN settings.

Change-Id: Iec30a2beadcdf078eaa6acd3a12f2e406ba9174e
parent 550af896

res/values-zh-rCN/strings.xml

+1 −0
Original line number Diff line number Diff line
@@ -981,6 +981,7 @@ 
    <string name="apn_type" msgid="469613123902220544">"APN 类型"</string>

    <string name="apn_protocol" msgid="3272222921649348640">"APN 协议"</string>

    <string name="apn_roaming_protocol" msgid="3386954381510788422">"APN 漫游协议"</string>

    <string name="apn_ppp_number">"PPP 拨叫号码""</string>

    <string name="carrier_enabled" msgid="407655861175280806">"APN 启用/停用"</string>

    <string name="carrier_enabled_summaryOn" msgid="6338915271908057531">"APN 已启用"</string>

    <string name="carrier_enabled_summaryOff" msgid="4300790190221203756">"未启用 APN"</string>

res/values/strings.xml

+3 −0
Original line number Diff line number Diff line
@@ -2468,6 +2468,9 @@ 
    <string name="apn_protocol">APN protocol</string>

    <!-- Edit access point labels: The protocol of the APN when roaming, e.g., "IPv4", "IPv6", or "IPv4/IPv6". -->

    <string name="apn_roaming_protocol">APN roaming protocol</string>

    <!-- Edit access point labels: PPP number -->

    <string name="apn_ppp_number">APN PPP phone number</string>

    <string name="ppp_number">ppp_number</string>

    <!-- Edit enable/disable of APN -->

    <string name="carrier_enabled">APN enable/disable</string>

    <string name="carrier_enabled_summaryOn">APN enabled</string>

res/xml/apn_editor.xml

+7 −0
Original line number Diff line number Diff line
@@ -154,4 +154,11 @@ 
        android:singleLine="true"

        android:inputType="text"

        />

    <EditTextPreference

        android:title="@string/apn_ppp_number"

        android:dialogTitle="@string/apn_ppp_number"

        android:key="apn_ppp_number"

        android:singleLine="true"

        android:inputType="textNoSuggestions"

        />

</PreferenceScreen>

src/com/android/settings/ApnEditor.java

+30 −1
Original line number Diff line number Diff line
@@ -59,6 +59,8 @@ public class ApnEditor extends PreferenceActivity 
    private final static String KEY_CARRIER_ENABLED = "carrier_enabled";

    private final static String KEY_BEARER = "bearer";

    private final static String KEY_MVNO_TYPE = "mvno_type";

    //Add China Telecom's PLMN

    private final static String CT_NUMERIC = "46003";



    private static final int MENU_DELETE = Menu.FIRST;

    private static final int MENU_SAVE = Menu.FIRST + 1;
@@ -86,6 +88,7 @@ public class ApnEditor extends PreferenceActivity 
    private ListPreference mBearer;

    private ListPreference mMvnoType;

    private EditTextPreference mMvnoMatchData;

    private EditTextPreference mPppNumber;



    private String mCurMnc;

    private String mCurMcc;
@@ -123,7 +126,8 @@ public class ApnEditor extends PreferenceActivity 
            Telephony.Carriers.BEARER, // 18

            Telephony.Carriers.ROAMING_PROTOCOL, // 19

            Telephony.Carriers.MVNO_TYPE,   // 20

            Telephony.Carriers.MVNO_MATCH_DATA  // 21

            Telephony.Carriers.MVNO_MATCH_DATA,  // 21

            "ppp_number"  // 22

    };



    private static final int ID_INDEX = 0;
@@ -147,6 +151,7 @@ public class ApnEditor extends PreferenceActivity 
    private static final int ROAMING_PROTOCOL_INDEX = 19;

    private static final int MVNO_TYPE_INDEX = 20;

    private static final int MVNO_MATCH_DATA_INDEX = 21;

    private static final int PPP_NUMBER_INDEX = 22;





    @Override
@@ -169,6 +174,7 @@ public class ApnEditor extends PreferenceActivity 
        mMcc = (EditTextPreference) findPreference("apn_mcc");

        mMnc = (EditTextPreference) findPreference("apn_mnc");

        mApnType = (EditTextPreference) findPreference("apn_type");

        mPppNumber = (EditTextPreference) findPreference("apn_ppp_number");



        mAuthType = (ListPreference) findPreference(KEY_AUTH_TYPE);

        mAuthType.setOnPreferenceChangeListener(this);
@@ -294,6 +300,17 @@ public class ApnEditor extends PreferenceActivity 
            mMvnoType.setValue(mCursor.getString(MVNO_TYPE_INDEX));

            mMvnoMatchData.setEnabled(false);

            mMvnoMatchData.setText(mCursor.getString(MVNO_MATCH_DATA_INDEX));



            String pppNumber = mCursor.getString(PPP_NUMBER_INDEX);

            mPppNumber.setText(pppNumber);

            if (pppNumber == null) {

                if (!mNewApn) {

                    getPreferenceScreen().removePreference(mPppNumber);

                } else if (!CT_NUMERIC.equals(defaultOperatorNumeric)) {

                    getPreferenceScreen().removePreference(mPppNumber);

                }

            }



        }



        mName.setSummary(checkNull(mName.getText()));
@@ -310,6 +327,13 @@ public class ApnEditor extends PreferenceActivity 
        mMnc.setSummary(checkNull(mMnc.getText()));

        mApnType.setSummary(checkNull(mApnType.getText()));



        String pppNumber = mPppNumber.getText();

        if (pppNumber != null) {

            // Remove this preference if PPP number is not present

            // in the APN settings

            mPppNumber.setSummary(checkNull(pppNumber));

        }



        String authVal = mAuthType.getValue();

        if (authVal != null) {

            int authValIndex = Integer.parseInt(authVal);
@@ -566,6 +590,11 @@ public class ApnEditor extends PreferenceActivity 


        values.put(Telephony.Carriers.NUMERIC, mcc + mnc);



        String pppNumber = mPppNumber.getText();

        if (pppNumber != null) {

            values.put(getResources().getString(R.string.ppp_number),pppNumber);

        }



        if (mCurMnc != null && mCurMcc != null) {

            if (mCurMnc.equals(mnc) && mCurMcc.equals(mcc) &&

                    mSubId == SubscriptionManager.getDefaultDataSubId()) {