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

Merge "Fixed EditText Talkback issue in VPN Settings" into main

Browse Source
This commit is contained in:
Treehugger Robot
2025-03-04 17:24:50 -08:00
committed by Android (Google) Code Review
parent 5c7811274e a361eca799
commit 170531768d
1 changed files with 87 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

134
res/layout/vpn_dialog.xml
View File

@@ -13,7 +13,10 @@
See the License for the specific language governing permissions and See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
--> -->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:theme="@style/Theme.Material3.DynamicColors.DayNight"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical" android:orientation="vertical"
@@ -45,12 +48,17 @@
android:orientation="vertical" android:orientation="vertical"
android:visibility="gone"> android:visibility="gone">
<TextView style="@style/vpn_label" <com.google.android.material.textfield.TextInputLayout
android:text="@string/vpn_name" style="@style/vpn_label"
android:labelFor="@+id/name"/> android:id="@+id/name_layout"
<EditText style="@style/vpn_value" android:hint="@string/vpn_name"
app:endIconMode="clear_text"
app:errorEnabled="true">
<com.google.android.material.textfield.TextInputEditText
style="@style/vpn_value"
android:id="@+id/name" android:id="@+id/name"
android:inputType="textCapWords"/> android:inputType="textCapWords"/>
</com.google.android.material.textfield.TextInputLayout>
<TextView style="@style/vpn_label" <TextView style="@style/vpn_label"
android:text="@string/vpn_type" android:text="@string/vpn_type"
@@ -60,23 +68,34 @@
android:prompt="@string/vpn_type" android:prompt="@string/vpn_type"
android:entries="@array/vpn_types"/> android:entries="@array/vpn_types"/>
<TextView style="@style/vpn_label" <com.google.android.material.textfield.TextInputLayout
android:text="@string/vpn_server" style="@style/vpn_label"
android:labelFor="@+id/server"/> android:id="@+id/server_layout"
<EditText style="@style/vpn_value" android:hint="@string/vpn_server"
app:endIconMode="clear_text"
app:errorEnabled="true">
<com.google.android.material.textfield.TextInputEditText
style="@style/vpn_value"
android:id="@+id/server"/> android:id="@+id/server"/>
</com.google.android.material.textfield.TextInputLayout>
<LinearLayout android:id="@+id/options_ipsec_identity" <LinearLayout android:id="@+id/options_ipsec_identity"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical" android:orientation="vertical"
android:visibility="gone"> android:visibility="gone">
<TextView style="@style/vpn_label" <com.google.android.material.textfield.TextInputLayout
android:text="@string/vpn_ipsec_identifier" style="@style/vpn_label"
android:labelFor="@+id/ipsec_identifier"/> android:id="@+id/ipsec_identifier_layout"
<EditText style="@style/vpn_value" android:hint="@string/vpn_ipsec_identifier"
android:id="@+id/ipsec_identifier" app:endIconMode="clear_text"
android:hint="@string/vpn_not_used"/> app:helperTextEnabled="true"
app:helperText="@string/vpn_not_used"
app:errorEnabled="true">
<com.google.android.material.textfield.TextInputEditText
style="@style/vpn_value"
android:id="@+id/ipsec_identifier"/>
</com.google.android.material.textfield.TextInputLayout>
</LinearLayout> </LinearLayout>
<LinearLayout android:id="@+id/ipsec_psk" <LinearLayout android:id="@+id/ipsec_psk"
@@ -84,12 +103,17 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical" android:orientation="vertical"
android:visibility="gone"> android:visibility="gone">
<TextView style="@style/vpn_label" <com.google.android.material.textfield.TextInputLayout
android:text="@string/vpn_ipsec_secret" style="@style/vpn_label"
android:labelFor="@+id/ipsec_secret"/> android:id="@+id/ipsec_secret_layout"
<EditText style="@style/vpn_value" android:hint="@string/vpn_ipsec_secret"
app:endIconMode="password_toggle"
app:errorEnabled="true">
<com.google.android.material.textfield.TextInputEditText
style="@style/vpn_value"
android:id="@+id/ipsec_secret" android:id="@+id/ipsec_secret"
android:password="true"/> android:inputType="textPassword"/>
</com.google.android.material.textfield.TextInputLayout>
</LinearLayout> </LinearLayout>
<LinearLayout android:id="@+id/ipsec_user" <LinearLayout android:id="@+id/ipsec_user"
@@ -153,27 +177,33 @@
android:orientation="vertical" android:orientation="vertical"
android:visibility="gone" > android:visibility="gone" >
<TextView <com.google.android.material.textfield.TextInputLayout
style="@style/vpn_label" style="@style/vpn_label"
android:text="@string/proxy_hostname_label" android:id="@+id/vpn_proxy_host_layout"
android:labelFor="@+id/vpn_proxy_host" /> android:hint="@string/proxy_hostname_label"
app:endIconMode="clear_text"
app:helperTextEnabled="true"
app:helperText="@string/proxy_hostname_hint"
app:errorEnabled="true">
<com.google.android.material.textfield.TextInputEditText
style="@style/vpn_value"
android:id="@+id/vpn_proxy_host"
android:inputType="textNoSuggestions"/>
</com.google.android.material.textfield.TextInputLayout>
<EditText <com.google.android.material.textfield.TextInputLayout
android:id="@+id/vpn_proxy_host"
style="@style/vpn_value"
android:hint="@string/proxy_hostname_hint"
android:inputType="textNoSuggestions" />
<TextView
style="@style/vpn_label" style="@style/vpn_label"
android:text="@string/proxy_port_label" android:id="@+id/vpn_proxy_port_layout"
android:labelFor="@+id/vpn_proxy_port" /> android:hint="@string/proxy_port_label"
app:endIconMode="clear_text"
<EditText app:helperTextEnabled="true"
android:id="@+id/vpn_proxy_port" app:helperText="@string/proxy_port_hint"
style="@style/vpn_value" app:errorEnabled="true">
android:hint="@string/proxy_port_hint" <com.google.android.material.textfield.TextInputEditText
android:inputType="number" /> style="@style/vpn_value"
android:id="@+id/vpn_proxy_port"
android:inputType="number"/>
</com.google.android.material.textfield.TextInputLayout>
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
@@ -182,18 +212,28 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical"> android:orientation="vertical">
<TextView style="@style/vpn_label" <com.google.android.material.textfield.TextInputLayout
android:text="@string/vpn_username" style="@style/vpn_label"
android:labelFor="@+id/username"/> android:id="@+id/username_layout"
<EditText style="@style/vpn_value" android:hint="@string/vpn_username"
app:endIconMode="clear_text"
app:errorEnabled="true">
<com.google.android.material.textfield.TextInputEditText
style="@style/vpn_value"
android:id="@+id/username"/> android:id="@+id/username"/>
</com.google.android.material.textfield.TextInputLayout>
<TextView style="@style/vpn_label" <com.google.android.material.textfield.TextInputLayout
android:text="@string/vpn_password" style="@style/vpn_label"
android:labelFor="@+id/password"/> android:id="@+id/password_layout"
<EditText style="@style/vpn_value" android:hint="@string/vpn_password"
app:endIconMode="password_toggle"
app:errorEnabled="true">
<com.google.android.material.textfield.TextInputEditText
style="@style/vpn_value"
android:id="@+id/password" android:id="@+id/password"
android:password="true"/> android:inputType="textPassword"/>
</com.google.android.material.textfield.TextInputLayout>
<CheckBox style="@style/vpn_value" <CheckBox style="@style/vpn_value"
android:id="@+id/save_login" android:id="@+id/save_login"