Snap for 13166373 from d83aa9b83c27ddfff43b0436b83736fbb89b26ef to 25Q2-release (c222eb56) · 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"

res/values/strings.xml

+1 −0

Original line number	Diff line number	Diff line
		@@ -1054,6 +1054,7 @@
		<!-- Watch unlock enrollment and settings --><skip />
		<!-- Title shown for menu item that launches watch unlock settings. [CHAR LIMIT=40] -->
		<string name ="security_settings_activeunlock_preference_title">Watch Unlock</string>
		<string name="security_settings_activeunlock">Watch</string>
		<!-- Introduction shown in face and fingerprint page to introduce the biometric feature. [CHAR LIMIT=NONE]-->
		<string name="biometric_settings_intro_with_activeunlock">When you set up Face Unlock and Fingerprint Unlock, your phone will ask for your fingerprint when you wear a mask or are in a dark area.\n\nWatch Unlock is another convenient way to unlock your phone, for example, when your fingers are wet or face isn\u2019t recognized.</string>
		<!-- Introduction shown in fingerprint page to explain that watch unlock can be used if fingerprint isn't recognized. [CHAR LIMIT=NONE]-->

res/xml/mouse_settings.xml

+3 −3

Original line number	Diff line number	Diff line
		@@ -28,11 +28,11 @@
		settings:controller="com.android.settings.inputmethod.MousePointerAccelerationPreferenceController" />

		<com.android.settings.widget.SeekBarPreference
		android:key="trackpad_pointer_speed"
		android:title="@string/trackpad_pointer_speed"
		android:key="pointer_speed"
		android:title="@string/pointer_speed"
		android:order="20"
		android:selectable="false"
		settings:controller="com.android.settings.inputmethod.TouchpadPointerSpeedPreferenceController"/>
		settings:controller="com.android.settings.inputmethod.MousePointerSpeedPreferenceController"/>

		<SwitchPreferenceCompat
		android:key="mouse_swap_primary_button"

res/xml/night_display_settings.xml

+1 −1

Original line number	Diff line number	Diff line
		@@ -52,7 +52,7 @@
		android:title="@string/night_display_end_time_title"
		settings:controller="com.android.settings.display.NightDisplayCustomEndTimePreferenceController"/>

		<com.android.settings.widget.SeekBarPreference
		<com.android.settingslib.widget.SliderPreference
		android:key="night_display_temperature"
		android:title="@string/night_display_temperature_title"
		settings:keywords="@string/keywords_display_night_display"

src/com/android/settings/accessibility/AccessibilityActivityPreference.java

+3 −4

Original line number	Diff line number	Diff line
		@@ -127,14 +127,13 @@ public class AccessibilityActivityPreference extends RestrictedPreference {
		final String htmlDescription = mA11yShortcutInfo.loadHtmlDescription(mPm);
		final String settingsClassName = mA11yShortcutInfo.getSettingsActivityName();
		final String tileServiceClassName = mA11yShortcutInfo.getTileServiceName();
		final int metricsCategory = FeatureFactory.getFeatureFactory()
		.getAccessibilityMetricsFeatureProvider()
		.getDownloadedFeatureMetricsCategory(mComponentName);
		final int pageIdCategory = FeatureFactory.getFeatureFactory()
		.getAccessibilityPageIdFeatureProvider().getCategory(mComponentName);

		ThreadUtils.getUiThreadHandler().post(() -> {
		RestrictedPreferenceHelper.putBasicExtras(
		this, prefKey, getTitle(), intro, description, imageRes,
		htmlDescription, mComponentName, metricsCategory);
		htmlDescription, mComponentName, pageIdCategory);
		RestrictedPreferenceHelper.putSettingsExtras(this, getPackageName(), settingsClassName);
		RestrictedPreferenceHelper.putTileServiceExtras(
		this, getPackageName(), tileServiceClassName);