Merge "Fixed EditText Talkback issue in VPN Settings" into main (17053176) · Commits · e / os / android_packages_apps_Settings

res/layout/vpn_dialog.xml

+87 −47

Original line number	Diff line number	Diff line
		@@ -13,7 +13,10 @@
		See the License for the specific language governing permissions and
		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_height="wrap_content"
		android:orientation="vertical"
		@@ -45,12 +48,17 @@
		android:orientation="vertical"
		android:visibility="gone">

		<TextView style="@style/vpn_label"
		android:text="@string/vpn_name"
		android:labelFor="@+id/name"/>
		<EditText style="@style/vpn_value"
		<com.google.android.material.textfield.TextInputLayout
		style="@style/vpn_label"
		android:id="@+id/name_layout"
		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:inputType="textCapWords"/>
		</com.google.android.material.textfield.TextInputLayout>

		<TextView style="@style/vpn_label"
		android:text="@string/vpn_type"
		@@ -60,23 +68,34 @@
		android:prompt="@string/vpn_type"
		android:entries="@array/vpn_types"/>

		<TextView style="@style/vpn_label"
		android:text="@string/vpn_server"
		android:labelFor="@+id/server"/>
		<EditText style="@style/vpn_value"
		<com.google.android.material.textfield.TextInputLayout
		style="@style/vpn_label"
		android:id="@+id/server_layout"
		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"/>
		</com.google.android.material.textfield.TextInputLayout>

		<LinearLayout android:id="@+id/options_ipsec_identity"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:orientation="vertical"
		android:visibility="gone">
		<TextView style="@style/vpn_label"
		android:text="@string/vpn_ipsec_identifier"
		android:labelFor="@+id/ipsec_identifier"/>
		<EditText style="@style/vpn_value"
		android:id="@+id/ipsec_identifier"
		android:hint="@string/vpn_not_used"/>
		<com.google.android.material.textfield.TextInputLayout
		style="@style/vpn_label"
		android:id="@+id/ipsec_identifier_layout"
		android:hint="@string/vpn_ipsec_identifier"
		app:endIconMode="clear_text"
		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 android:id="@+id/ipsec_psk"
		@@ -84,12 +103,17 @@
		android:layout_height="wrap_content"
		android:orientation="vertical"
		android:visibility="gone">
		<TextView style="@style/vpn_label"
		android:text="@string/vpn_ipsec_secret"
		android:labelFor="@+id/ipsec_secret"/>
		<EditText style="@style/vpn_value"
		<com.google.android.material.textfield.TextInputLayout
		style="@style/vpn_label"
		android:id="@+id/ipsec_secret_layout"
		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:password="true"/>
		android:inputType="textPassword"/>
		</com.google.android.material.textfield.TextInputLayout>
		</LinearLayout>

		<LinearLayout android:id="@+id/ipsec_user"
		@@ -153,27 +177,33 @@
		android:orientation="vertical"
		android:visibility="gone" >

		<TextView
		<com.google.android.material.textfield.TextInputLayout
		style="@style/vpn_label"
		android:text="@string/proxy_hostname_label"
		android:labelFor="@+id/vpn_proxy_host" />

		<EditText
		android:id="@+id/vpn_proxy_host"
		android:id="@+id/vpn_proxy_host_layout"
		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:hint="@string/proxy_hostname_hint"
		android:id="@+id/vpn_proxy_host"
		android:inputType="textNoSuggestions"/>
		</com.google.android.material.textfield.TextInputLayout>

		<TextView
		<com.google.android.material.textfield.TextInputLayout
		style="@style/vpn_label"
		android:text="@string/proxy_port_label"
		android:labelFor="@+id/vpn_proxy_port" />

		<EditText
		android:id="@+id/vpn_proxy_port"
		android:id="@+id/vpn_proxy_port_layout"
		android:hint="@string/proxy_port_label"
		app:endIconMode="clear_text"
		app:helperTextEnabled="true"
		app:helperText="@string/proxy_port_hint"
		app:errorEnabled="true">
		<com.google.android.material.textfield.TextInputEditText
		style="@style/vpn_value"
		android:hint="@string/proxy_port_hint"
		android:id="@+id/vpn_proxy_port"
		android:inputType="number"/>
		</com.google.android.material.textfield.TextInputLayout>
		</LinearLayout>
		</LinearLayout>

		@@ -182,18 +212,28 @@
		android:layout_height="wrap_content"
		android:orientation="vertical">

		<TextView style="@style/vpn_label"
		android:text="@string/vpn_username"
		android:labelFor="@+id/username"/>
		<EditText style="@style/vpn_value"
		<com.google.android.material.textfield.TextInputLayout
		style="@style/vpn_label"
		android:id="@+id/username_layout"
		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"/>
		</com.google.android.material.textfield.TextInputLayout>

		<TextView style="@style/vpn_label"
		android:text="@string/vpn_password"
		android:labelFor="@+id/password"/>
		<EditText style="@style/vpn_value"
		<com.google.android.material.textfield.TextInputLayout
		style="@style/vpn_label"
		android:id="@+id/password_layout"
		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:password="true"/>
		android:inputType="textPassword"/>
		</com.google.android.material.textfield.TextInputLayout>

		<CheckBox style="@style/vpn_value"
		android:id="@+id/save_login"