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

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

Merge 90cdcc84 on remote branch 

Change-Id: I40d6d654b013acdca92dee07d40aebddf4ee6f14
parents e1d32771 90cdcc84

AndroidManifest.xml

+3 −1
Original line number Diff line number Diff line
@@ -422,6 +422,7 @@ 
        <activity android:name="Settings$BluetoothSettingsActivity"

                android:label="@string/bluetooth_settings_title"

                android:icon="@drawable/ic_settings_bluetooth"

                android:configChanges="orientation|keyboardHidden|screenSize"

                android:taskAffinity="">

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

                <action android:name="android.settings.BLUETOOTH_SETTINGS" />
@@ -2014,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

+3 −2
Original line number Diff line number Diff line
@@ -46,8 +46,6 @@ 
    <!-- When true enable color temperature setting. -->

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



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



    <!-- carrier tethering default ssid and password begin -->

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

    <bool name="hotspot_default_ssid_with_imei_enable">false</bool>
@@ -91,4 +89,7 @@ 
    <bool name="config_regional_security_show_password_enable">false</bool>

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

+31 −2
Original line number Diff line number Diff line
@@ -7589,7 +7589,7 @@ 
    <string name="tethering_no_sim_alert_title">No SIM Card</string>

    <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="wifi_tether_first_use_message">Set up Wi-Fi 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>
@@ -7598,8 +7598,37 @@ 
    <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_title">USB tethering is activated</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>









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









    <string name="mobile_hotspot_help_dialog_text">You can turn your Android device into a portable Wi-Fi hotspot, to share your Android device\'s Internet connection with one or more computers or other devices. \n\n1.When your device is serving as a Wi-Fi hotspot, you can not use your device\'s applications to access the Internet via its Wi-Fi connection (but of course you remain connected to the Internet via your mobile data network). \n\n2.You configure the hotspot with the Wi-Fi hotspot settings</string>

















    <string name="wifiap_mobile_hotspot_help">Status</string>

















    <string name="dialog_font_warining_title">Information</string>









    <string name="dialog_font_warining_content">Very large font size will only be applied in specific applications.Large font size will be applied in all other application </string>









    <string name="dialog_font_warining_ck_information">Do not show this again</string>









    <string name="dialog_font_warining_ok">OK</string>









    <string name="choose_font_Minimum">Minimum</string>









    <string name="choose_font_Small">Small</string>









    <string name="choose_font_Medium">Medium</string>









    <string name="choose_font_Large">Large</string>









    <string name="choose_font_VeryLarge">VeryLarge</string>

















    <string name="maximum_connections_dialog_title_text">Set Maximum Connections</string>









    <string name="maximum_connections_dialog_positive_text">YES</string>









    <string name="maximum_connections_dialog_negative_text">NO</string>









    <string name="ssid_broadcast_dialog_title">Your HotSpot is not visible now</string>









    <string name="ssid_broadcast_dialog_text">If you switch the Broadcast Network Name (SSID) option off, your phone will not be visible to other devices and will not appear in the list of available Wi-Fi networks. Other devices can still connect to your HotSpot by entering its network name manually.</string>









    <string name="qtifeedback_settings_title">Hardware Feedback</string>









    <string name="qtifeedback_settings_subtitle">Qualcomm Technologies Reporting</string>









    <string name="qtifeedback_intent_action">com.qti.smq.snapdragonSettings</string>









    <string name="qtifeedback_package">com.qti.smq.qualcommFeedback</string>









    <string name="qtifeedback_activity">com.qti.smq.ui.QtiFeedbackActivity</string>

















    <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



+18
−21






























Original line number
Diff line number
Diff line







@@ -157,7 +157,6 @@ public class TetherSettings extends RestrictedSettingsFragment







    private boolean mUsbEnable = false;









    private WifiManager mWifiStatusManager;









    private boolean mIsWifiEnabled = false;









    private boolean mHaveWifiApConfig = false;



















    @Override









    protected int getMetricsCategory() {








@@ -283,24 +282,6 @@ public class TetherSettings extends RestrictedSettingsFragment







                Context.WIFI_SERVICE);









    }



















    @Override









    public void onResume() {









        super.onResume();









        if(mWifiManager != null) {









            WifiConfiguration config = mWifiManager.getWifiApConfiguration();









            boolean isNotNoneSecurity = config.getAuthType() > WifiConfiguration.KeyMgmt.NONE;









            // WifiConfiguration.KeyMgmt be used to management schemes,









            // WifiConfiguration.preSharedKey for use with WPA-PSK, it's password,









            // if preSharedKey is empty, the WifiConfiguration need to set password.









            if(isNotNoneSecurity) {









                mHaveWifiApConfig = config.preSharedKey != null &&









                    !config.preSharedKey.isEmpty();









            } else {









                mHaveWifiApConfig = true;









            }









        }









    }



















    @Override









    public void onDestroy() {









        mDataSaverBackend.remListener(this);








@@ -628,6 +609,20 @@ public class TetherSettings extends RestrictedSettingsFragment







                == TelephonyManager.SIM_STATE_READY);









    }



















    private boolean checkWifiApConfig() {









        WifiConfiguration config = mWifiManager.getWifiApConfiguration();









        boolean isNotNoneSecurity = config.getAuthType() > WifiConfiguration.KeyMgmt.NONE;









        // WifiConfiguration.KeyMgmt be used to management schemes,









        // WifiConfiguration.preSharedKey for use with WPA-PSK, it's password,









        // if preSharedKey is empty, the WifiConfiguration need to set password.









        if(isNotNoneSecurity) {









            return config.preSharedKey != null &&









                !config.preSharedKey.isEmpty();









        } else {









            return true;









        }









    }



















    @Override









    public boolean onPreferenceChange(Preference preference, Object value) {









        boolean enable = (Boolean) value;








@@ -638,7 +633,7 @@ public class TetherSettings extends RestrictedSettingsFragment







                ((HotspotPreference)preference).setChecked(false);









                return false;









            } else if(enableWifiApSettingsExt &&









                (isNeedShowHelp(getPrefContext()) || !mHaveWifiApConfig)) {









                (isNeedShowHelp(getPrefContext()) || !checkWifiApConfig())) {









                Intent intent = new Intent();









                intent.setAction(ACTION_HOTSPOT_PRE_CONFIGURE);









                intent.setPackage("com.qualcomm.qti.extsettings");








@@ -728,7 +723,7 @@ public class TetherSettings extends RestrictedSettingsFragment







        }



















        if (choice == TETHERING_USB) {









            if(mUsbTether.isChecked()) {









            if(mUsbTether.isChecked() && mUsbEnable) {









                mWifiManager.setWifiEnabled(false);









            }









        }








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







                }









                if (isFirstUseUSBTethering(getActivity())) {









                    showFirstUseUSBTetheringDialog(getActivity());









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









                    showTurnOffWifiDialog(getActivity());









                }









                startTethering(TETHERING_USB);









            } else {