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

Commit 3a8c1361 authored by Linux Build Service Account's avatar Linux Build Service Account
Browse files

Promotion of android_ui.lnx.2.1-00011. 

CRs      Change ID                                   Subject
--------------------------------------------------------------------------------------------------------------
1065085   I2bc20af9efa39f0fe4613ea3f7a11e8e869e542a   Hide the accounts which added for data pack
1041617   Ied5e4f74fab6dfb38352051bd2d1cfe435b2f09b   Settings: The APN cannot be edited after tapping right o

Change-Id: Id472751353b8cac0c7876d1160a2f3533c3f491b
CRs-Fixed: 1065085, 1041617
parents 0958a787 3f63f667

res/values/arrays.xml

+5 −0
Original line number Diff line number Diff line
@@ -1099,6 +1099,11 @@ 
        <item>com.android.sfr</item>

        <item>com.android.orange</item>

        <item>com.android.noos</item>

        <item>com.android.vodafone</item>

        <item>com.android.hotmail</item>

        <item>com.android.sapo</item>

        <item>com.android.netcabo</item>

        <item>com.android.clix</item>

    </string-array>



    <string-array name="plmn_list_for_apn_disable">

src/com/android/settings/ApnPreference.java

+4 −0
Original line number Diff line number Diff line
@@ -135,4 +135,8 @@ public class ApnPreference extends Preference implements 
    public void setApnReadOnly(boolean apnReadOnly) {

        mApnReadOnly = apnReadOnly;

    }



    public boolean getApnReadOnly() {

        return mApnReadOnly;

    }

}

src/com/android/settings/ApnSettings.java

+5 −1
Original line number Diff line number Diff line
@@ -561,7 +561,11 @@ public class ApnSettings extends RestrictedSettingsFragment implements 
    public boolean onPreferenceTreeClick(Preference preference) {

        int pos = Integer.parseInt(preference.getKey());

        Uri url = ContentUris.withAppendedId(Telephony.Carriers.CONTENT_URI, pos);

        startActivity(new Intent(Intent.ACTION_EDIT, url));

        Intent intent = new Intent(Intent.ACTION_EDIT, url);

        if (preference instanceof ApnPreference) {

            intent.putExtra("DISABLE_EDITOR", ((ApnPreference) preference).getApnReadOnly());

        }

        startActivity(intent);

        return true;

    }