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

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

Merge 50878ce5 on remote branch 

Change-Id: I7202c211dfc66e9c00c7087ab939cd8679fb0924
parents 453baf4b 50878ce5

AndroidManifest.xml

+0 −1
Original line number Diff line number Diff line
@@ -491,7 +491,6 @@ 
                <action android:name="android.intent.action.MAIN" />

                <category android:name="android.intent.category.DEFAULT" />

                <category android:name="android.intent.category.VOICE_LAUNCH" />

                <category android:name="com.android.settings.SHORTCUT" />

            </intent-filter>

            <intent-filter android:priority="1">

                <action android:name="com.android.settings.action.SETTINGS" />

res/values/arrays.xml

+10 −0
Original line number Diff line number Diff line
@@ -1089,5 +1089,15 @@ 
        <item>com.qualcomm.qti.RIDL</item>

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

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

    </string-array>

</resources>

res/values/bools.xml

100755 → 100644
+5 −0
Original line number Diff line number Diff line
@@ -39,6 +39,9 @@ 
    <!-- Whether to show a preference item for mobile plan -->

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



    <!-- Whether to add AGPS parameter settings -->

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



    <!-- Whether none security option is hide or not  (country specific). -->

    <bool name="config_hide_none_security_option">false</bool>
@@ -98,4 +101,6 @@ 
    <bool name="config_hidesupl_enable">false</bool>

    <!-- Whether to hide mms apn-->

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

    <!-- show pop up notification for turn off wifi begin -->

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

</resources>

res/values/strings.xml

+6 −0
Original line number Diff line number Diff line
@@ -2286,6 +2286,8 @@ 
    <!-- About phone screen,  setting option name  [CHAR LIMIT=40] -->

    <string name="build_number">Build number</string>

    <!-- About phone screen,  setting option name  [CHAR LIMIT=40] -->

    <string name="qgp_version">QGP Version</string>

    <!-- About phone screen,  setting option name  [CHAR LIMIT=40] -->

    <string name="selinux_status">SELinux status</string>









    <!-- About phone screen, show when a value of some status item is unavailable. -->








@@ -7584,4 +7586,8 @@







    <string name="tethering_no_sim_card_text">Please install SIM card in order to share your data connection with other devices using Mobile HotSpot or USB tethering for Internet access.</string>









    <string name="tether_settings_launch_title">Mobile HotSpot</string>









    <string name="wifi_tether_first_use_message">Set up Mobile HotSpot at the First Use</string>









    <string name="lte_data_and_voice_calling_enabled">LTE data and Voice Calling (IMS/VoLTE) service enabled </string>









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









</resources>

























res/xml/device_info_settings.xml



+6
−0






























Original line number
Diff line number
Diff line







@@ -120,6 +120,12 @@







                android:title="@string/build_number"









                android:summary="@string/device_info_default"/>



















        <!-- Device QGP version -->









        <Preference android:key="qgp_version"









                style="?android:preferenceInformationStyle"









                android:title="@string/qgp_version"









		android:summary="@string/device_info_default"/>



















        <!-- SELinux status information -->









        <Preference android:key="selinux_status"









                android:enabled="false"