PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 4e42c808: Merge "Add PAC UI to Wi-Fi Settings" into klp-dev

Browse Source 
* commit '4e42c80872e3543247913afd270fe5b9950b2969':
  Add PAC UI to Wi-Fi Settings
This commit is contained in:
Jason Monk
2013-11-05 18:22:58 -08:00
committed by Android Git Automerger
parent e202393f79 4e42c80872
commit c85359ef11
3 changed files with 16 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
res/layout/wifi_dialog.xml
View File

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

3
res/values/strings.xml
View File

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