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

Merge "Support VPN Proxy(2/2)" am: 2a695c4b7b

Browse Source 
am: e2f74af063

Change-Id: I61f6f949ab79cdcac5d61ae9409c2de09b75db49
This commit is contained in:
Chalard Jean
2019-03-08 07:44:56 -08:00
committed by android-build-merger
parent c1bdc0d512 e2f74af063
commit aa5d185d7b
3 changed files with 111 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
res/layout/vpn_dialog.xml
View File

@@ -140,6 +140,46 @@
android:labelFor="@+id/routes"/>
<EditText style="@style/vpn_value" android:id="@+id/routes"
android:hint="@string/vpn_not_used"/>
<TextView android:id="@+id/vpn_proxy_settings_title"
style="@style/vpn_label"
android:text="@string/proxy_settings_title"
android:labelFor="@+id/vpn_proxy_settings" />
<Spinner android:id="@+id/vpn_proxy_settings"
style="@style/vpn_value"
android:prompt="@string/proxy_settings_title"
android:entries="@array/vpn_proxy_settings" />
<LinearLayout
android:id="@+id/vpn_proxy_fields"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:visibility="gone" >
<TextView
style="@style/vpn_label"
android:text="@string/proxy_hostname_label"
android:labelFor="@+id/vpn_proxy_host" />
<EditText
android:id="@+id/vpn_proxy_host"
style="@style/vpn_value"
android:hint="@string/proxy_hostname_hint"
android:inputType="textNoSuggestions" />
<TextView
style="@style/vpn_label"
android:text="@string/proxy_port_label"
android:labelFor="@+id/vpn_proxy_port" />
<EditText
android:id="@+id/vpn_proxy_port"
style="@style/vpn_value"
android:hint="@string/proxy_port_hint"
android:inputType="number" />
</LinearLayout>
</LinearLayout>
<LinearLayout android:id="@+id/login"

8
res/values/arrays.xml
View File

@@ -939,6 +939,14 @@
<item>IPSec VPN with certificates and hybrid authentication</item>
</string-array>
<!-- VPN proxy settings. -->
<string-array name="vpn_proxy_settings">
<!-- No HTTP proxy is used for the current VPN [CHAR LIMIT=25] -->
<item>None</item>
<!-- Manual HTTP proxy settings are used for the current VPN [CHAR LIMIT=25] -->
<item>Manual</item>
</string-array>
<!-- Match this with the constants in LegacyVpnInfo. --> <skip />
<!-- Status for a VPN network. [CHAR LIMIT=100] -->
<string-array name="vpn_states">