Merge "Add PAC UI to Wi-Fi Settings" into klp-dev
diff --git a/res/layout/wifi_dialog.xml b/res/layout/wifi_dialog.xml
index cd968b1..7275c73 100644
--- a/res/layout/wifi_dialog.xml
+++ b/res/layout/wifi_dialog.xml
@@ -196,6 +196,12 @@
style="@style/wifi_item_content"
android:prompt="@string/proxy_settings_title"
android:entries="@array/wifi_proxy_settings" />
+
+ <TextView android:id="@+id/proxy_pac_info"
+ style="@style/wifi_item_content"
+ android:textStyle="bold"
+ android:textAlignment="viewStart"
+ android:visibility="gone"/>
</LinearLayout>
<LinearLayout android:id="@+id/proxy_warning_limited_support"
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 9e283dd..61de8a6 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -436,6 +436,9 @@
<!-- HTTP proxy settings. Warning message about limited application support [CHAR LIMIT=100]-->
<string name="proxy_warning_limited_support">The HTTP proxy is used by the browser but may not be used by the other apps.</string>
+ <!-- HTTP proxy settings. Title for Proxy-Auto Config URL. [CHAR LIMIT=NONE]-->
+ <string name="proxy_url">"PAC URL: "</string>
+
<!-- Radio Info screen. Label for a status item. Used for diagnostic info screens, precise translation isn't needed -->
<string name="radio_info_signal_location_label">Location:</string>
<!-- Radio Info screen. Label for a status item. Used for diagnostic info screens, precise translation isn't needed -->
diff --git a/src/com/android/settings/wifi/WifiConfigController.java b/src/com/android/settings/wifi/WifiConfigController.java
index 90aef86..55dc033 100644
--- a/src/com/android/settings/wifi/WifiConfigController.java
+++ b/src/com/android/settings/wifi/WifiConfigController.java
@@ -239,6 +239,13 @@
if (config.proxySettings == ProxySettings.STATIC) {
mProxySettingsSpinner.setSelection(PROXY_STATIC);
showAdvancedFields = true;
+ } else if (config.proxySettings == ProxySettings.PAC) {
+ mProxySettingsSpinner.setVisibility(View.GONE);
+ TextView textView = (TextView)mView.findViewById(R.id.proxy_pac_info);
+ textView.setVisibility(View.VISIBLE);
+ textView.setText(context.getString(R.string.proxy_url) +
+ config.linkProperties.getHttpProxy().getPacFileUrl());
+ showAdvancedFields = true;
} else {
mProxySettingsSpinner.setSelection(PROXY_NONE);
}