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

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

Promotion of android_ui.lnx.2.1-00016. 

CRs      Change ID                                   Subject
--------------------------------------------------------------------------------------------------------------
1069229   Ia866ac02c8d75308d3ff99f1400f11318f898621   Settings: Fix settings force close in monkey test.
1064477   I877b6db7908b87a883bf00a6897f8da78c896242   Settings: Modify irregular strings on Settings.
1069294   Ibdf89c869b4a30305855e2179de070915aab6aac   Settings: Fix AssertionError in monkey
1069517   I7bd5f4c2621d68908dae2e592539861c20ec74a8   Settings: WiFi: Fix pop up dialog to notify WiFi enabled
1042913   I81c3bf6172d3fcb420278f530f155a39c3c4086c   Settings:add vpn setting activity as primary profile
1056105   I1e6cfa594075cbde37f1e974264c71274d7d655f   Hide the accounts which added for data pack
1054925   I6d8c7caf3cebd916bd968515da2b384bb9e03a3b   Settings: Phone process crash in SIM Status.
1069288   Iade3148a846962875f5f38c5d2bf5631d0d9ac42   Settings: Fix SparseArray null pointer issue in monkey i
1069216   I4a8cce4a2e228bc405e896cd77fc9c3756ca265d   Settings: Fix settings force close in monkey test.
1067300   I66fadb0770a609ce88f134200e1e03463d9340fd   SAP: Enable 5Ghz AP band option only when a valid countr
1070552   I34d3ceda1fb49a73ee91850db451381d9feb5ce4   Settings: Open WiFi network when pull out the USB line.
1066739   I4a14deca29c9951eb105304fcd2d0a082701f5d5   Settings: Make APN of CT can be edited and be saved.
1069244   I0684a951afa785d5a5900ae819944862cb3d36bd   Settings: Fix settings force close in monkey test.
1064551   Ia35ad1f46578a2daf69cb17a74beffd436e62e1f   Fix:first use USB-Tethering have no notifcation dialog
1064551   I51366ef920056991a650528f33d7f7bbbed56235   Fix no pop-up to notify user install sim card for usb te
1069238   Ie373d760cbd22a3b24b4b735b3a5fbe290fc25c4   Settings: Fix settings force close in monkey test.
1069392   I752dcfcbee00c9ce4b77584222f464100e68d9a4   Settings: Set security password visible as default

Change-Id: I803ea7f475abbbf6648bc982e8f45061071484f1
CRs-Fixed: 1066739, 1069238, 1069229, 1070552, 1064551, 1056105, 1042913, 1069216, 1067300, 1064477, 1069392, 1069288, 1054925, 1069294, 1069517, 1069244
parents 3a8c1361 7e1f49d2

AndroidManifest.xml

+2 −0
Original line number Diff line number Diff line
@@ -559,6 +559,8 @@ 
            </intent-filter>

            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"

                android:value="com.android.settings.vpn2.VpnSettings" />

            <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"

                android:value="true" />

        </activity>



        <activity android:name="Settings$SystemUpdateActivity"

res/values/arrays.xml

+25 −0
Original line number Diff line number Diff line
@@ -1089,6 +1089,31 @@ 
        <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>

res/values/bools.xml

+3 −0
Original line number Diff line number Diff line
@@ -33,6 +33,9 @@ 
    <!-- Whether to show a preference item for the manual in About phone -->

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



    <!-- only one provider that matches,flag show one email -->

    <bool name="config_show_email">true</bool>



    <!-- Whether to show a preference item for regulatory information in About phone -->

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

res/values/config.xml

+3 −4
Original line number Diff line number Diff line
@@ -72,12 +72,10 @@ 


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

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

    <!-- Config to enable/disable the USB line-->

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

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

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

    <!-- Tethering & Mobile HotSpots display summary on Tmoblie -->

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

    <!-- Config to Tethering & Mobile HotSpots display summary -->

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



    <!-- Config to enable/disable wifi call notification -->

    <bool name="config_regional_wifi_calling_notificaion_enable">false</bool>
@@ -90,4 +88,5 @@ 
    <bool name="config_regional_hotspot_show_maximum_connection_enable">false</bool>

    <string-array translatable="false" name="carrier_operator_list">

    </string-array>

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

</resources>

res/values/strings.xml

+6 −0
Original line number Diff line number Diff line
@@ -7590,6 +7590,12 @@ 
    <string name="lte_data_service_enabled">LTE data service enabled </string>

    <string name="turn_off_wifi_dialog_title">Turn off Wi-Fi</string>

    <string name="turn_off_wifi_dialog_text">Wi-Fi is turned off when Mobile HotSpot is active. To turn on Wi-Fi, please turn off Mobile HotSpot.</string>









    <string name="show_battery_percentage">Show battery percentage</string>









    <string name="show_battery_percentage_summary">Show battery level percentage inside the status bar</string>

















    <string name="learn_usb_dialog_title">First Time Notification Use</string>









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









    <string name="mobile_tether_help_dialog_title">Mobile HotSpot Help</string>









    <string name="mobile_usb_help_dialog_text">You can tether your Android device to your computer with a USB cable, to share your device\'s Internet connection with your computer. \n\n1. USB tethering works with Windows Vista, Windows 7, and Linux, the USB drivers for tethering may be needed.\n\n2. If your device has an SD card or USB storage, you can\'t mount it on your computer when USB tethered</string>









</resources>