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

Commit 1986cd21 authored by Steve Kondik's avatar Steve Kondik
Browse files

Add proxy settings. 

Thanks to the Android-X86 project and Yuan Song.
parent a3b30c76

res/values/strings.xml

+4 −0
Original line number Diff line number Diff line
@@ -2062,4 +2062,8 @@ found in the list of installed applications.</string> 
    <!-- Apps2SD On Summary -->

    <string name="apps2sd_summary_on">New applications will be installed on SD card</string>



    <!-- Proxy settings -->

    <string name="proxy_setting">Proxy settings</string>

    <string name="proxy_setting_summary">Configure a proxy to access the internet</string>



</resources>

res/xml/wireless_settings.xml

+8 −0
Original line number Diff line number Diff line
@@ -84,5 +84,13 @@ 
                    android:persistent="false"

                    android:disableDependentsState="true" />



    <PreferenceScreen

        android:title="@string/proxy_setting"

        android:summary="@string/proxy_setting_summary">

        <intent

            android:action="android.intent.action.MAIN"

            android:targetPackage="com.android.settings"

            android:targetClass="com.android.settings.ProxySelector" />

    </PreferenceScreen>



</PreferenceScreen>

src/com/android/settings/WirelessSettings.java

+4 −2
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ public class WirelessSettings extends PreferenceActivity { 
    

    private static final String KEY_WIFI_SETTINGS = "wifi_settings";

    private static final String KEY_VPN_SETTINGS = "vpn_settings";

    private static final String KEY_PROXY_SETTING = "proxy_setting";



    private WifiEnabler mWifiEnabler;

    private AirplaneModeEnabler mAirplaneModeEnabler;
@@ -78,6 +79,7 @@ public class WirelessSettings extends PreferenceActivity { 
        Preference wifiSettings = findPreference(KEY_WIFI_SETTINGS);

        Preference vpnSettings = findPreference(KEY_VPN_SETTINGS);

        Preference tetheringPreference = findPreference(KEY_TOGGLE_TETHERING);

        Preference proxySetting = findPreference(KEY_PROXY_SETTING);

        

        mWifiEnabler = new WifiEnabler(

                this, (WifiManager) getSystemService(WIFI_SERVICE),
@@ -99,7 +101,7 @@ public class WirelessSettings extends PreferenceActivity { 
            wifiSettings.setDependency(airplanePreference.getKey());

            vpnSettings.setDependency(airplanePreference.getKey());

            tetheringPreference.setDependency(airplanePreference.getKey());

            proxySetting.setDependency(airplanePreference.getKey());

        }

    }



}