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

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

Promotion of android_ui.lnx.2.1.c1-00004. 

CRs      Change ID                                   Subject
--------------------------------------------------------------------------------------------------------------
1071041   I5a86ed19c06c55032a6d4a7ddac30466885b57bd   Settings:Change the way of email account displayed
1082388   I46a101022f677a83b38bbcc4c88b2d8195c5ab18   Settings: APN value change to "Not set" and APN disappea
1070422   Ic91afe656477c4012d78a3d53669fa6b227c8bac   HotSpot: Mandatory Inactivity timer options

Change-Id: I379b6b630c324101b1a023687e5a632d5680ee3d
CRs-Fixed: 1070422, 1071041, 1082388
parents f54b22e4 7490210d

AndroidManifest.xml

+2 −1
Original line number Diff line number Diff line
@@ -2015,7 +2015,8 @@ 
                android:permission="android.permission.MOUNT_UNMOUNT_FILESYSTEMS" />



        <activity android:name="Settings$ApnEditorActivity"

                android:label="@string/apn_edit">

                android:label="@string/apn_edit"

                android:configChanges="orientation|keyboardHidden|screenSize">

            <intent-filter>

                <action android:name="android.intent.action.VIEW" />

                <action android:name="android.intent.action.EDIT" />

res/values/arrays.xml

+5 −45
Original line number Diff line number Diff line
@@ -1084,51 +1084,11 @@ 
        <item>45507</item>

    </string-array>



    <!-- Defined the hide accounts' type -->

    <string-array name="hide_account_list">

        <item>com.qualcomm.qti.RIDL</item>

        <item>com.android.localphone</item>

        <item>com.android.sim</item>

        <item>com.android.wanadoo</item>

        <item>com.android.orangemail</item>

        <item>com.android.correoorange</item>

        <item>com.android.orangemobile</item>

        <item>com.android.multibox</item>

        <item>com.android.belgacom</item>

        <item>com.android.skynet</item>

        <item>com.android.telenet</item>

        <item>com.android.scarlet</item>

        <item>com.android.euphony</item>

        <item>com.android.voo</item>

        <item>com.android.tele2</item>

        <item>com.android.versatel</item>

        <item>com.android.tiscali</item>

        <item>com.android.swing</item>

        <item>com.android.versatelasdl</item>

        <item>com.android.brutele</item>

        <item>com.android.teledisnet</item>

        <item>com.android.tvcablenet</item>

        <item>com.android.mobistar</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>

        <item>com.android.alice</item>

        <item>com.android.yahoo</item>

        <item>com.android.outlook</item>

        <item>com.android.gmail</item>

        <item>com.android.aol</item>

        <item>com.android.free</item>

        <item>com.android.laposte</item>

        <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>

    <!-- Defined the show accounts' type -->

    <string-array name="show_account_list">

        <item>com.android.exchange</item>

        <item>com.google</item>

        <item>com.android.email</item>

    </string-array>



    <string-array name="plmn_list_for_apn_disable">

res/values/config.xml

+2 −0
Original line number Diff line number Diff line
@@ -92,4 +92,6 @@ 
    <!-- Config to show bluetooth menu-->

    <bool name="config_hide_bluetooth_menu">false</bool>

    <bool name="config_hotspot_need_show_activated_dialog">false</bool>

    <bool name="config_keep_hotspot_on_10mins_default">false</bool>

    <bool name="hotspot_show_alert_for_open_security">false</bool>

</resources>

res/values/strings.xml

+1 −0
Original line number Diff line number Diff line
@@ -7630,4 +7630,5 @@ 








    <string name="learn_hotspot_dialog_title">Wi-Fi tethering is activated</string>









    <string name="learn_hotspot_dialog_text">Would you like to learn more about wifi Tethering on your phone?</string>









    <string name="open_security_settings_note">With Open security, any device can connect to your Mobile HotSpot and use your mobile data connection.</string>









</resources>

























src/com/android/settings/TetherSettings.java



+2
−0






























Original line number
Diff line number
Diff line







@@ -742,6 +742,8 @@ public class TetherSettings extends RestrictedSettingsFragment







                }









                if (isFirstUseUSBTethering(getActivity())) {









                    showFirstUseUSBTetheringDialog(getActivity());









                } else if(checkWifiConnectivityState(getActivity())) {









                    showTurnOffWifiDialog(getActivity());









                }









                startTethering(TETHERING_USB);









            } else {