Merge "Add package filtering to NLSes" into sc-dev
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 8b3160f..ee11802 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -517,12 +517,12 @@
<activity android:name=".network.telephony.ToggleSubscriptionDialogActivity"
android:exported="false"
android:permission="android.permission.WRITE_EMBEDDED_SUBSCRIPTIONS"
- android:theme="@style/Transparent" />
+ android:theme="@*android:style/Theme.DeviceDefault.Dialog.Alert.DayNight" />
<activity android:name=".network.telephony.DeleteEuiccSubscriptionDialogActivity"
android:exported="false"
android:permission="android.permission.WRITE_EMBEDDED_SUBSCRIPTIONS"
- android:theme="@style/Transparent" />
+ android:theme="@*android:style/Theme.DeviceDefault.Dialog.Alert.DayNight" />
<activity
android:name="Settings$TetherSettingsActivity"
@@ -954,7 +954,7 @@
<category android:name="com.android.settings.SHORTCUT" />
</intent-filter>
<meta-data android:name="com.android.settings.FRAGMENT_CLASS"
- android:value="com.android.settings.DisplaySettings" />
+ android:value="@string/rotate_settings_class" />
<meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
android:value="true" />
</activity>
@@ -3662,6 +3662,14 @@
</receiver>
<receiver
+ android:name=".sim.receivers.SuwFinishReceiver"
+ android:exported="true">
+ <intent-filter>
+ <action android:name="com.google.android.setupwizard.SETUP_WIZARD_FINISHED" />
+ </intent-filter>
+ </receiver>
+
+ <receiver
android:name=".sim.receivers.SimCompleteBootReceiver"
android:exported="true">
<intent-filter>
@@ -3669,6 +3677,26 @@
</intent-filter>
</receiver>
+ <activity
+ android:name=".sim.ChooseSimActivity"
+ android:theme="@style/GlifV3Theme.DayNight.NoActionBar"
+ android:launchMode="singleInstance"
+ android:exported="false"/>
+
+ <activity
+ android:name=".sim.SwitchToEsimConfirmDialogActivity"
+ android:exported="false"
+ android:permission="android.permission.WRITE_EMBEDDED_SUBSCRIPTIONS"
+ android:launchMode="singleInstance"
+ android:theme="@style/Transparent" />
+
+ <activity
+ android:name=".sim.DsdsDialogActivity"
+ android:exported="false"
+ android:permission="android.permission.WRITE_EMBEDDED_SUBSCRIPTIONS"
+ android:launchMode="singleInstance"
+ android:theme="@style/Transparent" />
+
<service android:name=".sim.SimNotificationService"
android:permission="android.permission.BIND_JOB_SERVICE" />
diff --git a/color-check-baseline.xml b/color-check-baseline.xml
index d42f582..4aa67ab 100644
--- a/color-check-baseline.xml
+++ b/color-check-baseline.xml
@@ -2677,6 +2677,54 @@
priority="4"
summary="Using hardcoded color"
explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.
This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
+ errorLine1=" android:fillColor="@color/homepage_generic_icon_background" />"
+ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="res/drawable/ic_network_signal_blue.xml"
+ line="23"
+ column="11"/>
+ </issue>
+
+ <issue
+ id="HardCodedColor"
+ severity="Error"
+ message="Avoid using hardcoded color"
+ category="Correctness"
+ priority="4"
+ summary="Using hardcoded color"
+ explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.
This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
+ errorLine1=" android:fillColor="@color/homepage_generic_icon_background" />"
+ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="res/drawable/ic_network_signal_blue.xml"
+ line="25"
+ column="11"/>
+ </issue>
+
+ <issue
+ id="HardCodedColor"
+ severity="Error"
+ message="Avoid using hardcoded color"
+ category="Correctness"
+ priority="4"
+ summary="Using hardcoded color"
+ explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.
This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
+ errorLine1=" android:fillColor="@color/homepage_generic_icon_background" />"
+ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="res/drawable/ic_network_signal_blue.xml"
+ line="27"
+ column="11"/>
+ </issue>
+
+ <issue
+ id="HardCodedColor"
+ severity="Error"
+ message="Avoid using hardcoded color"
+ category="Correctness"
+ priority="4"
+ summary="Using hardcoded color"
+ explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.
This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
errorLine1=" android:color="@color/homepage_notification_background" />"
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
<location
diff --git a/res/drawable/ic_apps.xml b/res/drawable/ic_apps.xml
index 8e9ba82..20583a1 100644
--- a/res/drawable/ic_apps.xml
+++ b/res/drawable/ic_apps.xml
@@ -19,11 +19,7 @@
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
- android:pathData="M6 8c1.1 0 2-.9 2-2s-.9-2-2-2-2 .9-2 2 .9 2 2 2zm6 12c1.1 0 2-.9 2-2s-.9-2-2-2-2
-.9-2 2 .9 2 2 2zm-6 0c1.1 0 2-.9 2-2s-.9-2-2-2-2 .9-2 2 .9 2 2 2zm0-6c1.1 0 2-.9
-2-2s-.9-2-2-2-2 .9-2 2 .9 2 2 2zm6 0c1.1 0 2-.9 2-2s-.9-2-2-2-2 .9-2 2 .9 2 2
-2zm4-8c0 1.1 .9 2 2 2s2-.9 2-2-.9-2-2-2-2 .9-2 2zm-4 2c1.1 0 2-.9
-2-2s-.9-2-2-2-2 .9-2 2 .9 2 2 2zm6 6c1.1 0 2-.9 2-2s-.9-2-2-2-2 .9-2 2 .9 2 2
-2zm0 6c1.1 0 2-.9 2-2s-.9-2-2-2-2 .9-2 2 .9 2 2 2z"
+ android:pathData="M16,6C16,7.1 16.9,8 18,8C19.1,8 20,7.1 20,6C20,4.9 19.1,4 18,4C16.9,4 16,4.9 16,6ZM6,8C7.1,8 8,7.1 8,6C8,4.9 7.1,4 6,4C4.9,4 4,4.9 4,6C4,7.1 4.9,8 6,8ZM12.001,20C13.101,20 14.001,19.1 14.001,18C14.001,16.9 13.101,16 12.001,16C10.901,16 10.001,16.9 10.001,18C10.001,19.1 10.901,20 12.001,20ZM8.001,18C8.001,19.1 7.101,20 6.001,20C4.901,20 4.001,19.1 4.001,18C4.001,16.9 4.901,16 6.001,16C7.101,16 8.001,16.9 8.001,18ZM6.001,14C7.101,14 8.001,13.1 8.001,12C8.001,10.9 7.101,10 6.001,10C4.901,10 4.001,10.9 4.001,12C4.001,13.1 4.901,14 6.001,14ZM14.001,12C14.001,13.1 13.101,14 12.001,14C10.901,14 10.001,13.1 10.001,12C10.001,10.9 10.901,10 12.001,10C13.101,10 14.001,10.9 14.001,12ZM14.001,6C14.001,7.1 13.101,8 12.001,8C10.901,8 10.001,7.1 10.001,6C10.001,4.9 10.901,4 12.001,4C13.101,4 14.001,4.9 14.001,6ZM18,14C19.1,14 20,13.1 20,12C20,10.9 19.1,10 18,10C16.9,10 16,10.9 16,12C16,13.1 16.9,14 18,14ZM20,18C20,19.1 19.1,20 18,20C16.9,20 16,19.1 16,18C16,16.9 16.9,16 18,16C19.1,16 20,16.9 20,18Z"
+ android:fillType="evenOdd"
android:fillColor="?android:attr/colorPrimary"/>
</vector>
diff --git a/res/drawable/ic_devices_other.xml b/res/drawable/ic_devices_other.xml
index 5ef9f16..3d29264 100644
--- a/res/drawable/ic_devices_other.xml
+++ b/res/drawable/ic_devices_other.xml
@@ -16,11 +16,10 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
- android:autoMirrored="true"
- android:viewportHeight="24"
- android:viewportWidth="24">
+ android:viewportWidth="24.0"
+ android:viewportHeight="24.0">
<path
- android:fillColor="?android:attr/colorPrimary"
- android:pathData="M3,6h18V4H3C1.9,4 1,4.9 1,6v12c0,1.1 0.9,2 2,2h4v-2H3V6zM13,12H9v1.78C8.39,14.33 8,15.11 8,16c0,0.89 0.39,1.67 1,2.22V20h4v-1.78c0.61,-0.55 1,-1.34 1,-2.22s-0.39,-1.67 -1,-2.22V12zM11,17.5c-0.83,0 -1.5,-0.67 -1.5,-1.5s0.67,-1.5 1.5,-1.5s1.5,0.67 1.5,1.5S11.83,17.5 11,17.5zM22,8h-6c-0.5,0 -1,0.5 -1,1v10c0,0.5 0.5,1 1,1h6c0.5,0 1,-0.5 1,-1V9C23,8.5 22.5,8 22,8zM21,18h-4v-8h4V18z"/>
+ android:pathData="M3,6.003H21V4.003H3C1.9,4.003 1,4.903 1,6.003V18.003C1,19.103 1.9,20.003 3,20.003H7V18.003H3V6.003ZM13.002,12.001H9.002V13.781C8.392,14.331 8.002,15.111 8.002,16.001C8.002,16.891 8.392,17.671 9.002,18.221V20.001H13.002V18.221C13.612,17.671 14.002,16.881 14.002,16.001C14.002,15.121 13.612,14.331 13.002,13.781V12.001ZM9.501,16.003C9.501,16.833 10.171,17.503 11.001,17.503C11.831,17.503 12.501,16.833 12.501,16.003C12.501,15.173 11.831,14.503 11.001,14.503C10.171,14.503 9.501,15.173 9.501,16.003ZM22,8.004H16C15.5,8.004 15,8.504 15,9.004V19.004C15,19.504 15.5,20.004 16,20.004H22C22.5,20.004 23,19.504 23,19.004V9.004C23,8.504 22.5,8.004 22,8.004ZM17.002,18H21.002V10H17.002V18Z"
+ android:fillType="evenOdd"
+ android:fillColor="?android:attr/colorPrimary"/>
</vector>
-
diff --git a/res/drawable/ic_help.xml b/res/drawable/ic_help.xml
index c0afa14..9d78193 100644
--- a/res/drawable/ic_help.xml
+++ b/res/drawable/ic_help.xml
@@ -19,6 +19,7 @@
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
- android:fillColor="?android:attr/colorPrimary"
- android:pathData="M11,18h2v-2h-2V18zM12,2C6.48,2 2,6.48 2,12s4.48,10 10,10s10,-4.48 10,-10S17.52,2 12,2zM12,20c-4.41,0 -8,-3.59 -8,-8s3.59,-8 8,-8s8,3.59 8,8S16.41,20 12,20zM12,6c-2.21,0 -4,1.79 -4,4h2c0,-1.1 0.9,-2 2,-2s2,0.9 2,2c0,2 -3,1.75 -3,5h2c0,-2.25 3,-2.5 3,-5C16,7.79 14.21,6 12,6z"/>
+ android:pathData="M2,12C2,6.48 6.48,2 12,2C17.52,2 22,6.48 22,12C22,17.52 17.52,22 12,22C6.48,22 2,17.52 2,12ZM13,16V18H11V16H13ZM12,20C7.59,20 4,16.41 4,12C4,7.59 7.59,4 12,4C16.41,4 20,7.59 20,12C20,16.41 16.41,20 12,20ZM8,10C8,7.79 9.79,6 12,6C14.21,6 16,7.79 16,10C16,11.283 15.21,11.973 14.441,12.646C13.711,13.283 13,13.905 13,15H11C11,13.179 11.942,12.457 12.77,11.822C13.42,11.324 14,10.879 14,10C14,8.9 13.1,8 12,8C10.9,8 10,8.9 10,10H8Z"
+ android:fillType="evenOdd"
+ android:fillColor="?android:attr/colorPrimary"/>
</vector>
diff --git a/res/drawable/ic_network_signal_blue.xml b/res/drawable/ic_network_signal_blue.xml
new file mode 100644
index 0000000..939bd1a
--- /dev/null
+++ b/res/drawable/ic_network_signal_blue.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (C) 2021 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="32dp"
+ android:height="32dp"
+ android:viewportWidth="32"
+ android:viewportHeight="32">
+
+ <path android:pathData="M 0 0 H 32 V 32 H 0 V 0 Z" />
+ <path android:fillColor="@color/homepage_generic_icon_background"
+ android:pathData="M24,5.33h1.33c0.74,0,1.33,0.6,1.33,1.33v18.67c0,0.74-0.6,1.33-1.33,1.33H24c-0.74,0-1.33-0.6-1.33-1.33V6.67C22.67,5.93,23.26,5.33,24,5.33z" />
+ <path android:fillColor="@color/homepage_generic_icon_background"
+ android:pathData="M8,18.67h1.33c0.74,0,1.33,0.6,1.33,1.33v5.33c0,0.74-0.6,1.33-1.33,1.33H8c-0.74,0-1.33-0.6-1.33-1.33V20C6.67,19.26,7.26,18.67,8,18.67z" />
+ <path android:fillColor="@color/homepage_generic_icon_background"
+ android:pathData="M16,12h1.33c0.74,0,1.33,0.6,1.33,1.33v12c0,0.74-0.6,1.33-1.33,1.33H16c-0.74,0-1.33-0.6-1.33-1.33v-12C14.67,12.6,15.26,12,16,12z" />
+</vector>
diff --git a/res/drawable/ic_notifications.xml b/res/drawable/ic_notifications.xml
index 20e9e5d..37d77d8 100644
--- a/res/drawable/ic_notifications.xml
+++ b/res/drawable/ic_notifications.xml
@@ -20,9 +20,7 @@
android:viewportHeight="24.0"
android:tint="?android:attr/colorControlNormal">
<path
- android:fillColor="#FFFFFFFF"
- android:pathData="M18,17v-6c0,-3.07 -1.63,-5.64 -4.5,-6.32V4c0,-0.83 -0.67,-1.5 -1.5,-1.5S10.5,3.17 10.5,4v0.68C7.64,5.36 6,7.92 6,11v6H4v2h10h0.38H20v-2H18zM16,17H8v-6c0,-2.48 1.51,-4.5 4,-4.5s4,2.02 4,4.5V17z"/>
- <path
- android:fillColor="#FFFFFFFF"
- android:pathData="M12,22c1.1,0 2,-0.9 2,-2h-4C10,21.1 10.9,22 12,22z"/>
+ android:pathData="M18,17V11C18,7.93 16.37,5.36 13.5,4.68V4C13.5,3.17 12.83,2.5 12,2.5C11.17,2.5 10.5,3.17 10.5,4V4.68C7.64,5.36 6,7.92 6,11V17H4V19H14H14.38H20V17H18ZM16,17H8V11C8,8.52 9.51,6.5 12,6.5C14.49,6.5 16,8.52 16,11V17ZM14,20C14,21.1 13.1,22 12,22C10.9,22 10,21.1 10,20H14Z"
+ android:fillType="evenOdd"
+ android:fillColor="?android:attr/colorPrimary"/>
</vector>
diff --git a/res/drawable/ic_phone_info.xml b/res/drawable/ic_phone_info.xml
index e0b64ee..3675c8b 100644
--- a/res/drawable/ic_phone_info.xml
+++ b/res/drawable/ic_phone_info.xml
@@ -1,9 +1,25 @@
+<!--
+ Copyright (C) 2018 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
- android:fillColor="?android:attr/colorPrimary"
- android:pathData="M17,1.01L7,1C5.9,1 5,1.9 5,3v18c0,1.1 0.9,2 2,2h10c1.1,0 2,-0.9 2,-2V3C19,1.9 18.1,1.01 17,1.01zM17,21H7v-1h10V21zM17,18H7V6h10V18zM7,4V3h10v1H7zM11,7h2v2h-2V7zM11,11h2v6h-2V11z"/>
+ android:pathData="M7,1L17,1.01C18.1,1.01 19,1.9 19,3V21C19,22.1 18.1,23 17,23H7C5.9,23 5,22.1 5,21V3C5,1.9 5.9,1 7,1ZM7,21H17V20H7V21ZM17,18H7V6H17V18ZM7,3V4H17V3H7ZM11,7H13V9H11V7ZM13,11H11V17H13V11Z"
+ android:fillType="evenOdd"
+ android:fillColor="?android:attr/colorPrimary"/>
</vector>
diff --git a/res/drawable/ic_settings_accessibility.xml b/res/drawable/ic_settings_accessibility.xml
index 0055a65..58a5fc2 100644
--- a/res/drawable/ic_settings_accessibility.xml
+++ b/res/drawable/ic_settings_accessibility.xml
@@ -14,14 +14,16 @@
limitations under the License.
-->
<vector xmlns:android="http://schemas.android.com/apk/res/android"
- android:width="24.0dp"
- android:height="24.0dp"
+ android:width="24dp"
+ android:height="24dp"
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
- android:fillColor="?android:attr/colorPrimary"
- android:pathData="M20.5,4c-2.61,0.7 -5.67,1 -8.5,1S6.11,4.7 3.5,4L3,6c1.86,0.5 4,0.83 6,1v13h2v-6h2v6h2V7c2,-0.17 4.14,-0.5 6,-1L20.5,4zM12,4c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2s-2,0.9 -2,2S10.9,4 12,4z"/>
+ android:pathData="M14,2C14,3.1 13.1,4 12,4C10.9,4 10,3.1 10,2C10,0.9 10.9,0 12,0C13.1,0 14,0.9 14,2ZM12,5C14.83,5 17.89,4.7 20.5,4L21,6C19.14,6.5 17,6.83 15,7V20H13V14H11V20H9V7C7,6.83 4.86,6.5 3,6L3.5,4C6.11,4.7 9.17,5 12,5Z"
+ android:fillType="evenOdd"
+ android:fillColor="?android:attr/colorPrimary"/>
<path
- android:fillColor="?android:attr/colorPrimary"
- android:pathData="M7,24h2v-2H7V24zM11,24h2v-2h-2V24zM15,24h2v-2h-2V24z"/>
+ android:pathData="M7,24H9V22H7V24ZM11,24H13V22H11V24ZM17,24H15V22H17V24Z"
+ android:fillType="evenOdd"
+ android:fillColor="?android:attr/colorPrimary"/>
</vector>
diff --git a/res/drawable/ic_settings_accounts.xml b/res/drawable/ic_settings_accounts.xml
index 50dcf76..c0c93dd 100644
--- a/res/drawable/ic_settings_accounts.xml
+++ b/res/drawable/ic_settings_accounts.xml
@@ -19,9 +19,11 @@
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
- android:fillColor="?android:attr/colorPrimary"
- android:pathData="M19,3H5C3.89,3 3,3.9 3,5v14c0,1.1 0.89,2 2,2h14c1.1,0 2,-0.9 2,-2V5C21,3.9 20.1,3 19,3zM19,5v10.79C16.52,14.37 13.23,14 12,14s-4.52,0.37 -7,1.79V5H19zM5,19v-0.77C6.74,16.66 10.32,16 12,16s5.26,0.66 7,2.23V19H5z"/>
+ android:pathData="M19,3H5C3.89,3 3,3.9 3,5V19C3,20.1 3.89,21 5,21H19C20.1,21 21,20.1 21,19V5C21,3.9 20.1,3 19,3ZM19,5V15.79C16.52,14.37 13.23,14 12,14C10.77,14 7.48,14.37 5,15.79V5H19ZM5,18.23V19H19V18.23C17.26,16.66 13.68,16 12,16C10.32,16 6.74,16.66 5,18.23Z"
+ android:fillType="evenOdd"
+ android:fillColor="?android:attr/colorPrimary"/>
<path
- android:fillColor="?android:attr/colorPrimary"
- android:pathData="M12,13c1.94,0 3.5,-1.56 3.5,-3.5C15.5,7.56 13.94,6 12,6c-1.94,0 -3.5,1.56 -3.5,3.5C8.5,11.44 10.06,13 12,13zM12,8c0.83,0 1.5,0.67 1.5,1.5c0,0.83 -0.67,1.5 -1.5,1.5c-0.83,0 -1.5,-0.67 -1.5,-1.5C10.5,8.67 11.17,8 12,8z"/>
+ android:pathData="M15.5,9.5C15.5,11.44 13.94,13 12,13C10.06,13 8.5,11.44 8.5,9.5C8.5,7.56 10.06,6 12,6C13.94,6 15.5,7.56 15.5,9.5ZM13.5,9.5C13.5,8.67 12.83,8 12,8C11.17,8 10.5,8.67 10.5,9.5C10.5,10.33 11.17,11 12,11C12.83,11 13.5,10.33 13.5,9.5Z"
+ android:fillType="evenOdd"
+ android:fillColor="?android:attr/colorPrimary"/>
</vector>
diff --git a/res/drawable/ic_settings_battery_white.xml b/res/drawable/ic_settings_battery_white.xml
index d1f91c5..e042249 100644
--- a/res/drawable/ic_settings_battery_white.xml
+++ b/res/drawable/ic_settings_battery_white.xml
@@ -19,6 +19,10 @@
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
- android:fillColor="?android:attr/colorPrimary"
- android:pathData="M15.67,4H14V2h-4v2H8.33C7.6,4 7,4.6 7,5.33v15.33C7,21.4 7.6,22 8.33,22h7.33c0.74,0 1.34,-0.6 1.34,-1.33V5.33C17,4.6 16.4,4 15.67,4z"/>
+ android:pathData="M9.5,4V2H14.5V4H16.67C17.4,4 18,4.6 18,5.33V15V20.67C18,21.4 17.4,22 16.66,22H7.33C6.6,22 6,21.4 6,20.67V15V5.33C6,4.6 6.6,4 7.33,4H9.5ZM8,15V20H16V15V6H8V15Z"
+ android:fillType="evenOdd"
+ android:fillColor="?android:attr/colorPrimary"/>
+ <path
+ android:pathData="M16.67,22H7.33C6.6,22 6,21.4 6,20.67V5.33C6,4.6 6.6,4 7.33,4H16.67C17.4,4 18,4.6 18,5.33V20.67C18,21.4 17.4,22 16.67,22Z"
+ android:fillColor="?android:attr/colorPrimary"/>
</vector>
diff --git a/res/drawable/ic_settings_display_white.xml b/res/drawable/ic_settings_display_white.xml
index 96be116..6e20144 100644
--- a/res/drawable/ic_settings_display_white.xml
+++ b/res/drawable/ic_settings_display_white.xml
@@ -14,11 +14,12 @@
limitations under the License.
-->
<vector xmlns:android="http://schemas.android.com/apk/res/android"
- android:width="24.0dp"
- android:height="24.0dp"
+ android:width="24dp"
+ android:height="24dp"
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
- android:fillColor="?android:attr/colorPrimary"
- android:pathData="M20,8.69V4h-4.69L12,0.69L8.69,4H4v4.69L0.69,12L4,15.31V20h4.69L12,23.31L15.31,20H20v-4.69L23.31,12L20,8.69zM18,14.48V18h-3.52L12,20.48L9.52,18H6v-3.52L3.52,12L6,9.52V6h3.52L12,3.52L14.48,6H18v3.52L20.48,12L18,14.48zM12,17c2.76,0 5,-2.24 5,-5s-2.24,-5 -5,-5V17z"/>
+ android:pathData="M20.31,9V4.31H15.62L12.31,1L9,4.31H4.31V9L1,12.31L4.31,15.62V20.31H9L12.31,23.62L15.62,20.31H20.31V15.62L23.62,12.31L20.31,9ZM18.31,14.79V18.31H14.79L12.31,20.79L9.83,18.31H6.31V14.79L3.83,12.31L6.31,9.83V6.31H9.83L12.31,3.83L14.79,6.31H18.31V9.83L20.79,12.31L18.31,14.79ZM17.31,12.31C17.31,15.07 15.07,17.31 12.31,17.31V7.31C15.07,7.31 17.31,9.55 17.31,12.31Z"
+ android:fillType="evenOdd"
+ android:fillColor="?android:attr/colorPrimary"/>
</vector>
diff --git a/res/drawable/ic_settings_emergency.xml b/res/drawable/ic_settings_emergency.xml
index f145346..25d4272 100644
--- a/res/drawable/ic_settings_emergency.xml
+++ b/res/drawable/ic_settings_emergency.xml
@@ -14,11 +14,11 @@
limitations under the License.
-->
<vector xmlns:android="http://schemas.android.com/apk/res/android"
- android:width="24.0dp"
- android:height="24.0dp"
+ android:width="24dp"
+ android:height="24dp"
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
- android:pathData="M9.3207,2V7.359L4.6795,4.6795L2,9.3207L6.6412,12L2,14.6795L4.6795,19.3205L9.3207,16.641V22H14.6797V16.641L19.3207,19.3205L22.0002,14.6795L17.359,12L22.0002,9.3207L19.3207,4.6795L14.6797,7.3588V2H9.3207Z"
+ android:pathData="M9.321,2V7.359L4.68,4.68L2,9.321L6.641,12L2,14.679L4.68,19.32L9.321,16.641V22H14.68V16.641L19.321,19.32L22,14.679L17.359,12L22,9.321L19.321,4.68L14.68,7.359V2H9.321Z"
android:fillColor="?android:attr/colorPrimary"/>
</vector>
diff --git a/res/drawable/ic_settings_location.xml b/res/drawable/ic_settings_location.xml
index e1156a9..9bd630b 100644
--- a/res/drawable/ic_settings_location.xml
+++ b/res/drawable/ic_settings_location.xml
@@ -14,14 +14,15 @@
limitations under the License.
-->
<vector xmlns:android="http://schemas.android.com/apk/res/android"
- android:width="24.0dp"
- android:height="24.0dp"
+ android:width="24dp"
+ android:height="24dp"
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
- android:fillColor="?android:attr/colorPrimary"
- android:pathData="M12,2C8.13,2 5,5.13 5,9c0,5.25 7,13 7,13s7,-7.75 7,-13C19,5.13 15.87,2 12,2zM7,9c0,-2.76 2.24,-5 5,-5s5,2.24 5,5c0,2.88 -2.88,7.19 -5,9.88C9.92,16.21 7,11.85 7,9z"/>
+ android:pathData="M5,9C5,5.13 8.13,2 12,2C15.87,2 19,5.13 19,9C19,14.25 12,22 12,22C12,22 5,14.25 5,9ZM12,4C9.24,4 7,6.24 7,9C7,11.85 9.92,16.21 12,18.88C14.12,16.19 17,11.88 17,9C17,6.24 14.76,4 12,4Z"
+ android:fillType="evenOdd"
+ android:fillColor="?android:attr/colorPrimary"/>
<path
- android:fillColor="?android:attr/colorPrimary"
- android:pathData="M12,9m-2.5,0a2.5,2.5 0,1 1,5 0a2.5,2.5 0,1 1,-5 0"/>
+ android:pathData="M12,11.5C13.381,11.5 14.5,10.381 14.5,9C14.5,7.619 13.381,6.5 12,6.5C10.619,6.5 9.5,7.619 9.5,9C9.5,10.381 10.619,11.5 12,11.5Z"
+ android:fillColor="?android:attr/colorPrimary"/>
</vector>
diff --git a/res/drawable/ic_settings_privacy.xml b/res/drawable/ic_settings_privacy.xml
index cdb2ac6..af0f9fd 100644
--- a/res/drawable/ic_settings_privacy.xml
+++ b/res/drawable/ic_settings_privacy.xml
@@ -13,19 +13,25 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-
<vector xmlns:android="http://schemas.android.com/apk/res/android"
- android:width="24dp"
- android:height="24dp"
- android:viewportWidth="24"
- android:viewportHeight="24">
- <path
- android:fillColor="?android:attr/colorPrimary"
- android:pathData="M21.25,16.5v-0.66c0,-1.13 -1.03,-2.09 -2.25,-2.09s-2.25,0.96 -2.25,2.09v0.66H16V22h6v-5.5H21.25zM19.75,16.5h-1.5v-0.66c0,-0.29 0.38,-0.59 0.75,-0.59s0.75,0.3 0.75,0.59V16.5z"/>
- <path
- android:fillColor="?android:attr/colorPrimary"
- android:pathData="M12,17c-3.79,0 -7.17,-2.13 -8.82,-5.5C4.83,8.13 8.21,6 12,6s7.17,2.13 8.82,5.5H23C21.27,7.11 17,4 12,4S2.73,7.11 1,11.5C2.73,15.89 7,19 12,19c0.68,0 1.35,-0.06 2,-0.17v-2.05C13.35,16.91 12.69,17 12,17z"/>
- <path
- android:fillColor="?android:attr/colorPrimary"
- android:pathData="M16.43,12.23c0.04,-0.24 0.07,-0.48 0.07,-0.73C16.5,9.02 14.48,7 12,7s-4.5,2.02 -4.5,4.5S9.52,16 12,16c0.77,0 1.48,-0.21 2.12,-0.55C14.41,14.08 15.27,12.93 16.43,12.23zM12,14.2c-1.49,0 -2.7,-1.21 -2.7,-2.7s1.21,-2.7 2.7,-2.7s2.7,1.21 2.7,2.7S13.49,14.2 12,14.2z"/>
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24.0"
+ android:viewportHeight="24.0">
+ <path
+ android:pathData="M21.25,15.84V16.5H22V22H16V16.5H16.75V15.84C16.75,14.71 17.78,13.75 19,13.75C20.22,13.75 21.25,14.71 21.25,15.84ZM18.25,16.5H19.75V15.84C19.75,15.55 19.37,15.25 19,15.25C18.63,15.25 18.25,15.55 18.25,15.84V16.5Z"
+ android:fillType="evenOdd"
+ android:fillColor="?android:attr/colorPrimary"/>
+ <path
+ android:pathData="M12,17C8.21,17 4.83,14.87 3.18,11.5C4.83,8.13 8.21,6 12,6C15.79,6 19.17,8.13 20.82,11.5H23C21.27,7.11 17,4 12,4C7,4 2.73,7.11 1,11.5C2.73,15.89 7,19 12,19C12.68,19 13.35,18.94 14,18.83V16.78C13.35,16.91 12.69,17 12,17Z"
+ android:fillType="evenOdd"
+ android:fillColor="?android:attr/colorPrimary"/>
+ <path
+ android:pathData="M21.25,15.84V16.5H22V22H16V16.5H16.75V15.84C16.75,14.71 17.78,13.75 19,13.75C20.22,13.75 21.25,14.71 21.25,15.84ZM18.25,16.5H19.75V15.84C19.75,15.55 19.37,15.25 19,15.25C18.63,15.25 18.25,15.55 18.25,15.84V16.5Z"
+ android:fillType="evenOdd"
+ android:fillColor="?android:attr/colorPrimary"/>
+ <path
+ android:pathData="M16.5,11.5C16.5,11.75 16.47,11.99 16.43,12.23C15.27,12.93 14.41,14.08 14.12,15.45C13.48,15.79 12.77,16 12,16C9.52,16 7.5,13.98 7.5,11.5C7.5,9.02 9.52,7 12,7C14.48,7 16.5,9.02 16.5,11.5ZM9.3,11.5C9.3,12.99 10.51,14.2 12,14.2C13.49,14.2 14.7,12.99 14.7,11.5C14.7,10.01 13.49,8.8 12,8.8C10.51,8.8 9.3,10.01 9.3,11.5Z"
+ android:fillType="evenOdd"
+ android:fillColor="?android:attr/colorPrimary"/>
</vector>
diff --git a/res/drawable/ic_settings_security_white.xml b/res/drawable/ic_settings_security_white.xml
index a90bb8f..7d18275 100644
--- a/res/drawable/ic_settings_security_white.xml
+++ b/res/drawable/ic_settings_security_white.xml
@@ -16,9 +16,10 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
- android:viewportWidth="24"
- android:viewportHeight="24">
-<path
- android:fillColor="?android:attr/colorPrimary"
- android:pathData="M18,8h-1L17,6c0,-2.76 -2.24,-5 -5,-5S7,3.24 7,6v2L6,8c-1.1,0 -2,0.9 -2,2v10c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2L20,10c0,-1.1 -0.9,-2 -2,-2zM9,6c0,-1.66 1.34,-3 3,-3s3,1.34 3,3v2L9,8L9,6zM18,20L6,20L6,10h12v10zM12,17c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2 -2,0.9 -2,2 0.9,2 2,2z"/>
+ android:viewportWidth="24.0"
+ android:viewportHeight="24.0">
+ <path
+ android:pathData="M17,8H18C19.1,8 20,8.9 20,10V20C20,21.1 19.1,22 18,22H6C4.9,22 4,21.1 4,20V10C4,8.9 4.9,8 6,8H7V6C7,3.24 9.24,1 12,1C14.76,1 17,3.24 17,6V8ZM12,3C10.34,3 9,4.34 9,6V8H15V6C15,4.34 13.66,3 12,3ZM6,20V10H18V20H6ZM14,15C14,16.1 13.1,17 12,17C10.9,17 10,16.1 10,15C10,13.9 10.9,13 12,13C13.1,13 14,13.9 14,15Z"
+ android:fillType="evenOdd"
+ android:fillColor="?android:attr/colorPrimary"/>
</vector>
\ No newline at end of file
diff --git a/res/drawable/ic_settings_system_dashboard_white.xml b/res/drawable/ic_settings_system_dashboard_white.xml
index cf3bb7b..b12ae75 100644
--- a/res/drawable/ic_settings_system_dashboard_white.xml
+++ b/res/drawable/ic_settings_system_dashboard_white.xml
@@ -14,17 +14,18 @@
limitations under the License.
-->
<vector xmlns:android="http://schemas.android.com/apk/res/android"
- android:width="24.0dp"
- android:height="24.0dp"
+ android:width="24dp"
+ android:height="24dp"
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
- android:fillColor="?android:attr/colorPrimary"
- android:pathData="M11,7h2v2h-2z"/>
+ android:pathData="M11,7h2v2h-2z"
+ android:fillColor="?android:attr/colorPrimary"/>
<path
- android:fillColor="?android:attr/colorPrimary"
- android:pathData="M11,11h2v6h-2z"/>
+ android:pathData="M11,11h2v6h-2z"
+ android:fillColor="?android:attr/colorPrimary"/>
<path
- android:fillColor="?android:attr/colorPrimary"
- android:pathData="M12,2C6.48,2 2,6.48 2,12c0,5.52 4.48,10 10,10s10,-4.48 10,-10C22,6.48 17.52,2 12,2zM12,20c-4.41,0 -8,-3.59 -8,-8c0,-4.41 3.59,-8 8,-8s8,3.59 8,8C20,16.41 16.41,20 12,20z"/>
+ android:pathData="M2,12C2,6.48 6.48,2 12,2C17.52,2 22,6.48 22,12C22,17.52 17.52,22 12,22C6.48,22 2,17.52 2,12ZM4,12C4,16.41 7.59,20 12,20C16.41,20 20,16.41 20,12C20,7.59 16.41,4 12,4C7.59,4 4,7.59 4,12Z"
+ android:fillType="evenOdd"
+ android:fillColor="?android:attr/colorPrimary"/>
</vector>
diff --git a/res/drawable/ic_settings_wallpaper_white.xml b/res/drawable/ic_settings_wallpaper_white.xml
index 8591fb5..9ff68a6 100644
--- a/res/drawable/ic_settings_wallpaper_white.xml
+++ b/res/drawable/ic_settings_wallpaper_white.xml
@@ -14,12 +14,12 @@
limitations under the License.
-->
<vector xmlns:android="http://schemas.android.com/apk/res/android"
- android:width="24.0dp"
- android:height="24.0dp"
+ android:width="24dp"
+ android:height="24dp"
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
- android:fillColor="?android:attr/colorPrimary"
+ android:pathData="M11,5H5V11H3V5C3,3.9 3.9,3 5,3H11V5ZM11.14,15.29L9,12.71L6,16.57H18L14.14,11.42L11.14,15.29ZM19,13V19H13V21H19C20.1,21 21,20.1 21,19V13H19ZM5,13V19H11V21H5C3.9,21 3,20.1 3,19V13H5ZM19,5V11H21V5C21,3.9 20.1,3 19,3H13V5H19ZM17,8C17,8.55 16.55,9 16,9C15.45,9 15,8.55 15,8C15,7.45 15.45,7 16,7C16.55,7 17,7.45 17,8Z"
android:fillType="evenOdd"
- android:pathData="M11,5H5V11H3V5C3,3.9 3.9,3 5,3H11V5ZM11.14,15.29L9,12.71L6,16.57H18L14.14,11.42L11.14,15.29ZM19,13V19H13V21H19C20.1,21 21,20.1 21,19V13H19ZM5,13V19H11V21H5C3.9,21 3,20.1 3,19V13H5ZM19,5V11H21V5C21,3.9 20.1,3 19,3H13V5H19ZM17,8C17,8.55 16.55,9 16,9C15.45,9 15,8.55 15,8C15,7.45 15.45,7 16,7C16.55,7 17,7.45 17,8Z"/>
+ android:fillColor="?android:attr/colorPrimary"/>
</vector>
diff --git a/res/drawable/ic_settings_wireless.xml b/res/drawable/ic_settings_wireless.xml
index f9b4bbc..f9ea5d0 100644
--- a/res/drawable/ic_settings_wireless.xml
+++ b/res/drawable/ic_settings_wireless.xml
@@ -20,6 +20,11 @@
android:viewportHeight="24.0"
android:tint="?android:attr/colorControlNormal">
<path
- android:fillColor="#FFFFFFFF"
- android:pathData="M1,9l2,2c4.97,-4.97 13.03,-4.97 18,0l2,-2C16.93,2.93 7.08,2.93 1,9zM9,17l3,3l3,-3C13.35,15.34 10.66,15.34 9,17zM5,13l2,2c2.76,-2.76 7.24,-2.76 10,0l2,-2C15.14,9.14 8.87,9.14 5,13z"/>
+ android:pathData="M1.003,9L3.003,11C7.973,6.03 16.033,6.03 21.003,11L23.003,9C16.933,2.93 7.083,2.93 1.003,9ZM9.003,17L12.003,20L15.003,17C13.353,15.34 10.663,15.34 9.003,17ZM7.005,15L5.005,13C8.875,9.14 15.145,9.14 19.005,13L17.005,15C14.245,12.241 9.765,12.241 7.005,15Z"
+ android:fillType="evenOdd"
+ android:fillColor="?android:attr/colorPrimary"/>
+ <path
+ android:pathData="M0,0H24V24H0V0ZM0,0H24V24H0V0Z"
+ android:fillType="evenOdd"
+ android:fillColor="?android:attr/colorPrimary"/>
</vector>
diff --git a/res/drawable/ic_storage_white.xml b/res/drawable/ic_storage_white.xml
index 3b5d3c3..d1149a8 100644
--- a/res/drawable/ic_storage_white.xml
+++ b/res/drawable/ic_storage_white.xml
@@ -19,6 +19,7 @@
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
- android:fillColor="?android:attr/colorPrimary"
- android:pathData="M3,20h18v-4H3V20zM5,17h2v2H5V17zM3,4v4h18V4H3zM7,7H5V5h2V7zM3,14h18v-4H3V14zM5,11h2v2H5V11z"/>
+ android:pathData="M3,4V8H21V4H3ZM21,20H3V16H21V20ZM7,17H5V19H7V17ZM5,7H7V5H5V7ZM3,14H21V10H3V14ZM7,11H5V13H7V11Z"
+ android:fillType="evenOdd"
+ android:fillColor="?android:attr/colorPrimary"/>
</vector>
diff --git a/res/drawable/ic_volume_up_24dp.xml b/res/drawable/ic_volume_up_24dp.xml
index a1136d3..ca5ffa5 100644
--- a/res/drawable/ic_volume_up_24dp.xml
+++ b/res/drawable/ic_volume_up_24dp.xml
@@ -13,19 +13,19 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
- android:fillColor="?android:attr/colorPrimary"
- android:pathData="M3,9v6h4l5,5V4L7,9H3zM10,8.83v6.34L7.83,13H5v-2h2.83L10,8.83z"/>
+ android:pathData="M3,15V9H7L12,4V20L7,15H3ZM10,15.17V8.83L7.83,11H5V13H7.83L10,15.17Z"
+ android:fillType="evenOdd"
+ android:fillColor="?android:attr/colorPrimary"/>
<path
- android:fillColor="?android:attr/colorPrimary"
- android:pathData="M16.5,12c0,-1.77 -1.02,-3.29 -2.5,-4.03v8.05C15.48,15.29 16.5,13.77 16.5,12z"/>
+ android:pathData="M16.5,12C16.5,10.23 15.48,8.71 14,7.97V16.02C15.48,15.29 16.5,13.77 16.5,12Z"
+ android:fillColor="?android:attr/colorPrimary"/>
<path
- android:fillColor="?android:attr/colorPrimary"
- android:pathData="M14,3.23v2.06c2.89,0.86 5,3.54 5,6.71c0,3.17 -2.11,5.85 -5,6.71v2.06c4.01,-0.91 7,-4.49 7,-8.77C21,7.72 18.01,4.14 14,3.23z"/>
+ android:pathData="M14,3.23V5.29C16.89,6.15 19,8.83 19,12C19,15.17 16.89,17.85 14,18.71V20.77C18.01,19.86 21,16.28 21,12C21,7.72 18.01,4.14 14,3.23Z"
+ android:fillColor="?android:attr/colorPrimary"/>
</vector>
diff --git a/res/layout/choose_sim_activity.xml b/res/layout/choose_sim_activity.xml
new file mode 100644
index 0000000..05ab230
--- /dev/null
+++ b/res/layout/choose_sim_activity.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2021 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<com.google.android.setupdesign.GlifLayout
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:id="@+id/glif_layout"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:icon="@drawable/ic_network_signal_blue">
+
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="vertical">
+
+ <LinearLayout
+ style="@style/SudContentFrame"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:paddingBottom="@dimen/subtitle_bottom_padding">
+ <TextView
+ android:id="@+id/subtitle"
+ style="@style/SudDescription.Glif"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content" />
+ </LinearLayout>
+
+ <com.google.android.setupdesign.GlifRecyclerLayout
+ android:id="@+id/recycler_list"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:entries="@xml/items_multiple_carrier" />
+
+ </LinearLayout>
+</com.google.android.setupdesign.GlifLayout>
diff --git a/res/layout/dark_ui_activation_button.xml b/res/layout/dark_ui_activation_button.xml
deleted file mode 100644
index 5f9eefc..0000000
--- a/res/layout/dark_ui_activation_button.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- Copyright (C) 2019 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<LinearLayout
- xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:minHeight="?android:attr/listPreferredItemHeight">
-
- <Button
- android:id="@+id/dark_ui_turn_on_button"
- style="@style/ActionPrimaryButton"
- android:layout_marginStart="@dimen/screen_margin_sides"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="center_vertical" />
-
- <Button
- android:id="@+id/dark_ui_turn_off_button"
- style="@style/ActionSecondaryButton"
- android:layout_marginStart="@dimen/screen_margin_sides"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="center_vertical" />
-
-</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/night_display_activation_button.xml b/res/layout/night_display_activation_button.xml
deleted file mode 100644
index df160ec..0000000
--- a/res/layout/night_display_activation_button.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- Copyright (C) 2018 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<LinearLayout
- xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:minHeight="?android:attr/listPreferredItemHeight">
-
- <Button
- android:id="@+id/night_display_turn_on_button"
- style="@style/ActionPrimaryButton"
- android:layout_marginStart="@dimen/screen_margin_sides"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="center_vertical" />
-
- <Button
- android:id="@+id/night_display_turn_off_button"
- style="@style/ActionSecondaryButton"
- android:layout_marginStart="@dimen/screen_margin_sides"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="center_vertical" />
-
-</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/panel_layout.xml b/res/layout/panel_layout.xml
index 5f33c32..ac7a72b 100644
--- a/res/layout/panel_layout.xml
+++ b/res/layout/panel_layout.xml
@@ -48,11 +48,13 @@
</LinearLayout>
<LinearLayout
+ android:id="@+id/header_layout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginEnd="16dp"
android:orientation="vertical">
+
<TextView
android:id="@+id/header_title"
android:layout_width="wrap_content"
@@ -67,8 +69,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:ellipsize="end"
- android:maxLines="1" />
-
+ android:maxLines="1"/>
</LinearLayout>
</LinearLayout>
diff --git a/res/layout/search_bar.xml b/res/layout/search_bar.xml
index 75b43f0..63f1c95 100644
--- a/res/layout/search_bar.xml
+++ b/res/layout/search_bar.xml
@@ -17,14 +17,12 @@
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/search_bar_margin"
android:layout_marginStart="@dimen/search_bar_margin"
android:layout_marginEnd="@dimen/search_bar_margin"
- android:layout_marginBottom="@dimen/search_bar_margin_bottom"
- app:layout_scrollFlags="scroll|enterAlways">
+ android:layout_marginBottom="@dimen/search_bar_margin_bottom">
<com.google.android.material.card.MaterialCardView
android:id="@+id/search_bar"
diff --git a/res/layout/settings_homepage_container.xml b/res/layout/settings_homepage_container.xml
index d65d140..d9bcb83 100644
--- a/res/layout/settings_homepage_container.xml
+++ b/res/layout/settings_homepage_container.xml
@@ -70,13 +70,16 @@
android:layout_width="match_parent"
android:layout_height="@dimen/suggestion_height"
android:paddingHorizontal="@dimen/suggestion_padding_horizontal"
- android:paddingBottom="@dimen/suggestion_padding_bottom"
+ android:paddingVertical="@dimen/suggestion_padding_vertical"
android:orientation="vertical"
android:gravity="bottom"
android:visibility="gone">
<TextView
android:id="@+id/suggestion_title"
+ android:layout_width="match_parent"
+ android:layout_height="0dp"
+ android:layout_weight="1"
android:text="@string/settings_label"
style="@style/ContextualSuggestionText"/>
diff --git a/res/layout/udfps_enroll_layout.xml b/res/layout/udfps_enroll_layout.xml
index 0c432d3..8338589 100644
--- a/res/layout/udfps_enroll_layout.xml
+++ b/res/layout/udfps_enroll_layout.xml
@@ -40,12 +40,6 @@
android:layout_marginEnd="0dp"
android:layout_marginStart="0dp" />
- <Space
- android:id="@+id/space_below_title"
- android:layout_width="0dp"
- android:layout_height="0dp"
- android:layout_weight="1" />
-
<FrameLayout
android:id="@+id/description_area"
android:layout_width="match_parent"
@@ -80,19 +74,4 @@
android:paddingEnd="5dp"
android:paddingStart="5dp"
android:visibility="invisible" />
-
- <Space
- android:id="@+id/space_above_animation"
- android:layout_width="0dp"
- android:layout_height="0dp"
- android:layout_weight="1" />
-
- <com.android.settings.widget.RingProgressBar
- android:id="@+id/fingerprint_progress_bar"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:minHeight="@dimen/fingerprint_progress_bar_min_size"
- android:progress="0"
- android:layout_gravity="center"/>
-
</com.android.settings.biometrics.fingerprint.UdfpsEnrollLayout>
diff --git a/res/layout/zen_mode_settings_button.xml b/res/layout/zen_mode_settings_button.xml
deleted file mode 100644
index db889ff..0000000
--- a/res/layout/zen_mode_settings_button.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- Copyright (C) 2017 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<LinearLayout
- xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:orientation="vertical">
-
- <TextView
- android:text="@string/zen_mode_settings_summary"
- android:textAppearance="?android:attr/textAppearanceSmall"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_marginStart="@dimen/screen_margin_sides"
- android:layout_marginEnd="@dimen/description_margin_sides"
- android:layout_marginTop="@dimen/zen_mode_settings_button_margin_vertical"/>
-
- <Button
- android:id="@+id/zen_mode_settings_turn_on_button"
- style="@style/ActionPrimaryButton"
- android:layout_marginStart="@dimen/screen_margin_sides"
- android:layout_marginEnd="@dimen/description_margin_sides"
- android:layout_marginTop="@dimen/zen_mode_settings_button_margin_vertical"
- android:layout_marginBottom="@dimen/zen_mode_settings_button_margin_vertical"
- android:text="@string/zen_mode_button_turn_on"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"/>
-
- <Button
- android:id="@+id/zen_mode_settings_turn_off_button"
- style="@style/ActionSecondaryButton"
- android:layout_marginStart="@dimen/screen_margin_sides"
- android:layout_marginEnd="@dimen/description_margin_sides"
- android:layout_marginTop="@dimen/zen_mode_settings_button_margin_vertical"
- android:layout_marginBottom="@dimen/zen_mode_settings_button_margin_vertical"
- android:text="@string/zen_mode_button_turn_off"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"/>
-
-</LinearLayout>
\ No newline at end of file
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index 18fd9fb..f866c47 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -2267,8 +2267,7 @@
<item quantity="other"><xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> gestoorde gehoortoestelle</item>
<item quantity="one"><xliff:g id="NUMBER_DEVICE_COUNT_0">%1$d</xliff:g> gestoorde gehoortoestel</item>
</plurals>
- <!-- no translation found for accessibility_audio_adjustment_title (1332113739136802997) -->
- <skip />
+ <string name="accessibility_audio_adjustment_title" msgid="1332113739136802997">"Oudio-aanpassing"</string>
<string name="accessibility_summary_shortcut_enabled" msgid="4030427268146752644">"Kortpad is aan"</string>
<string name="accessibility_summary_shortcut_disabled" msgid="564005462092499068">"Af"</string>
<string name="accessibility_summary_state_enabled" msgid="1065431632216039369">"Aan"</string>
@@ -2437,6 +2436,7 @@
<string name="bluetooth_on_time" msgid="8424625554628450028">"Wi-Fi betyds"</string>
<string name="advanced_battery_title" msgid="3005993394776555079">"Batterygebruik"</string>
<string name="history_details_title" msgid="8628584613889559355">"Geskiedenisdetails"</string>
+ <string name="advanced_battery_preference_title" msgid="6518802648205311326">"Bekyk batterygebruik"</string>
<string name="battery_details_title" msgid="4531369291819754178">"Batterygebruik"</string>
<string name="details_subtitle" msgid="2550872569652785527">"Gebruikdetails"</string>
<string name="controls_subtitle" msgid="3759606830916441564">"Verstel kraggebruik"</string>
@@ -4098,6 +4098,7 @@
<string name="usb_use" msgid="6783183432648438528">"Gebruik USB vir"</string>
<string name="usb_default_label" msgid="3372838450371060750">"Verstek-USB-opstelling"</string>
<string name="usb_default_info" msgid="167172599497085266">"Wanneer \'n ander toestel gekoppel is en jou foon is ontsluit, sal hierdie instellings toegepas word. Koppel net aan vertroude toestelle."</string>
+ <string name="usb_power_title" msgid="5602112548385798646">"Kragopsies"</string>
<string name="usb_pref" msgid="8521832005703261700">"USB"</string>
<string name="usb_preference" msgid="5084550082591493765">"USB-voorkeure"</string>
<string name="usb_control_title" msgid="1946791559052157693">"USB word beheer deur"</string>
@@ -4937,8 +4938,8 @@
<string name="mobile_data_ap_mode_disabled" msgid="6067959496888990983">"Onbeskibaar tydens vliegtuigmodus"</string>
<string name="force_desktop_mode" msgid="1336913605091334238">"Dwangrekenaarmodus"</string>
<string name="force_desktop_mode_summary" msgid="4587416867846930479">"Verplig eksperimentele rekenaarmodus op sekondêre skerms"</string>
- <string name="enable_sizecompat_freeform" msgid="3799755160777404309">"Aktiveer versoenbare groottes in vrye vorm"</string>
- <string name="enable_sizecompat_freeform_summary" msgid="1484050174538201499">"Laai toe dat programme met versoenbare groottes in vrye vorm is"</string>
+ <string name="enable_non_resizable_multi_window" msgid="6832903754625404477">"Aktiveer nieveranderbare grootte in multivenster"</string>
+ <string name="enable_non_resizable_multi_window_summary" msgid="3275763753261901999">"Laat programme met nieveranderbare grootte toe in multivenster"</string>
<string name="hwui_force_dark_title" msgid="4256904905631994219">"Ignoreer gedwonge donkermodus"</string>
<string name="hwui_force_dark_summary" msgid="6515748781487952769">"Ignoreer die gedwonge donkermoduskenmerk om altyd aan te wees"</string>
<string name="enable_blurs_on_windows_title" msgid="4218144213800778872">"Aktiveer wasighede"</string>
@@ -5060,8 +5061,8 @@
<string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"vliegtuig, vliegtuigveilig"</string>
<string name="calls_and_sms" msgid="1931855083959003306">"Oproepe en SMS\'e"</string>
<string name="calls_and_sms_category" msgid="2021321997884906046">"Wi‑fi-oproepe"</string>
- <string name="calls_sms_wfc_summary" msgid="4930471357980272294">"Maak en ontvang oproepe oor niediensverskaffer-netwerke soos wi-fi"</string>
- <string name="calls_sms_footnote" msgid="7002461875954024216">"Met Wi-fi-oproepe kan jy oproepe oor niediensverskaffer-netwerke soos sommige wi-fi-netwerke maak en ontvang."</string>
+ <string name="calls_sms_wfc_summary" msgid="3940529919408667336">"Maak en ontvang oproepe oor wi-fi"</string>
+ <string name="calls_sms_footnote" msgid="8051604228144899434">"Met Wi-fi-oproepe word oproepe oor niediensverskaffer-wi-fi-netwerke gemaak en ontvang."</string>
<string name="calls_preference_title" msgid="7536882032182563800">"Oproepe"</string>
<string name="sms_preference_title" msgid="8392745501754864395">"SMS"</string>
<string name="calls_sms_preferred" msgid="6016477652522583496">"voorkeur"</string>
@@ -5080,10 +5081,10 @@
<string name="reset_internet_text" product="tablet" msgid="8797910368942544453">"Dit sal jou foonoproep beëindig"</string>
<string name="resetting_internet_text" msgid="6696779371800051806">"Stel tans jou internet terug …"</string>
<string name="fix_connectivity" msgid="2781433603228089501">"Stel konnektiwiteit reg"</string>
- <!-- no translation found for airplane_mode_network_available (1059499681300395240) -->
- <skip />
- <!-- no translation found for to_switch_networks_disconnect_ethernet (6615374552827587197) -->
- <skip />
+ <string name="airplane_mode_network_available" msgid="1059499681300395240">"Vliegtuigmodusnetwerke is beskikbaar"</string>
+ <string name="to_switch_networks_disconnect_ethernet" msgid="6615374552827587197">"Ontkoppel Ethernet om netwerke te wissel"</string>
+ <string name="cannot_switch_networks_while_connected" msgid="3867944849171754777">"Kan nie netwerke oorskakel terwyl dit gekoppel is nie"</string>
+ <string name="airplane_mode_network_panel_title" msgid="6385046104863403604">"Vliegtuigmodusnetwerke"</string>
<string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g> / <xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
<string name="mobile_data_connection_active" msgid="2422223108911581552">"Gekoppel"</string>
<string name="mobile_data_off_summary" msgid="3841411571485837651">"Internet sal nie outomaties koppel nie"</string>
@@ -5105,4 +5106,16 @@
<string name="category_name_others" msgid="2366006298768550310">"Ander"</string>
<string name="category_name_general" msgid="7737273712848115886">"Algemeen"</string>
<string name="default_see_all_apps_title" msgid="7481113230662612178">"Sien alle programme"</string>
+ <string name="smart_forwarding_title" msgid="8368634861971949799">"Slimaanstuur"</string>
+ <string name="smart_forwarding_summary_enabled" msgid="3341062878373185604">"Slimaanstuur is geaktiveer"</string>
+ <string name="smart_forwarding_summary_disabled" msgid="5033880700091914809">"Slimaanstuur is gedeaktiveer"</string>
+ <string name="smart_forwarding_ongoing_title" msgid="962226849074401228">"Oproepinstellings"</string>
+ <string name="smart_forwarding_ongoing_text" msgid="2189209372407117114">"Dateer tans instellings op …"</string>
+ <string name="smart_forwarding_failed_title" msgid="1859891191023516080">"Oproepinstellingsfout"</string>
+ <string name="smart_forwarding_failed_text" msgid="5370431503707373653">"Netwerk- of SIM-kaartfout."</string>
+ <string name="smart_forwarding_failed_not_activated_text" msgid="997396203001257904">"SIM is nie geaktiveer nie."</string>
+ <string name="smart_forwarding_input_mdn_title" msgid="5105463748849841763">"Voer foonnommers in"</string>
+ <string name="smart_forwarding_input_mdn_dialog_title" msgid="7542216086697868415">"Voer foonnommer in"</string>
+ <string name="smart_forwarding_missing_mdn_text" msgid="2907314684242542226">"Foonnommer ontbreek."</string>
+ <string name="smart_forwarding_missing_alert_dialog_text" msgid="7870419247987316112">"OK"</string>
</resources>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index 63a86ec..c04da07 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -2436,6 +2436,7 @@
<string name="bluetooth_on_time" msgid="8424625554628450028">"Wi-Fi በጊዜ"</string>
<string name="advanced_battery_title" msgid="3005993394776555079">"የባትሪ አጠቃቀም"</string>
<string name="history_details_title" msgid="8628584613889559355">"የታሪክ ዝርዝሮች"</string>
+ <string name="advanced_battery_preference_title" msgid="6518802648205311326">"የባትሪ አጠቃቀምን ይመልከቱ"</string>
<string name="battery_details_title" msgid="4531369291819754178">"የባትሪ አጠቃቀም"</string>
<string name="details_subtitle" msgid="2550872569652785527">"ዝርዝሮችን ተጠቀም"</string>
<string name="controls_subtitle" msgid="3759606830916441564">"የኃይል አጠቃቀም አስተካክል"</string>
@@ -4097,6 +4098,7 @@
<string name="usb_use" msgid="6783183432648438528">"ዩኤስቢ ተጠቀም ለ"</string>
<string name="usb_default_label" msgid="3372838450371060750">"ነባሪ የዩኤስቢ ውቅረት"</string>
<string name="usb_default_info" msgid="167172599497085266">"ሌላ መሣሪያ ሲገናኝ እና የእርስዎ ስልክ ሲከፈት እነዚህ ቅንብሮች ተፈጻሚ ይሆናሉ። ከሚታመኑ መሣሪያዎች ጋር ብቻ ይገናኙ።"</string>
+ <string name="usb_power_title" msgid="5602112548385798646">"የኃይል አማራጮች"</string>
<string name="usb_pref" msgid="8521832005703261700">"ዩ ኤስ ቢ"</string>
<string name="usb_preference" msgid="5084550082591493765">"የዩኤስቢ ምርጫዎች"</string>
<string name="usb_control_title" msgid="1946791559052157693">"ዩኤስቢ በሚከተለው ቁጥጥር ይደረግበታል፦"</string>
@@ -4936,8 +4938,8 @@
<string name="mobile_data_ap_mode_disabled" msgid="6067959496888990983">"በአይሮፕላን ሁነታ ወቅት የማይገኝ"</string>
<string name="force_desktop_mode" msgid="1336913605091334238">"የዴስክቶፕ ሁነታን አስገድድ"</string>
<string name="force_desktop_mode_summary" msgid="4587416867846930479">"በሁለተኛ ማሳያዎች ላይ የሙከራ ዴስክቶፕ ሁነታን አስገድድ"</string>
- <string name="enable_sizecompat_freeform" msgid="3799755160777404309">"ነጻ ቅርጽ በመጠድን ተኳኝን አንቃ"</string>
- <string name="enable_sizecompat_freeform_summary" msgid="1484050174538201499">"በመጠን ተኳዃኝ የሆኑ መተግበሪያዎችን በነጻ ቅርጽ እንዲሆኑ ይፈቅዳል"</string>
+ <string name="enable_non_resizable_multi_window" msgid="6832903754625404477">"በብዝሃ-መስኮት ውስጥ መጠን መቀየር የማይቻለውን አንቃ"</string>
+ <string name="enable_non_resizable_multi_window_summary" msgid="3275763753261901999">"መጠን መቀየር የማይቻሉትን መተግበሪያዎች በብዝሃ-መስኮት ውስጥ እንዲሆኑ ይፈቅዳል"</string>
<string name="hwui_force_dark_title" msgid="4256904905631994219">"አስገዳጅ ጨለማን ሻር"</string>
<string name="hwui_force_dark_summary" msgid="6515748781487952769">"አስገዳጅ ጨለማ ባህሪን ሁልጊዜ እንዲበራ የተቀመጠውን ደንብ ይሽራል"</string>
<string name="enable_blurs_on_windows_title" msgid="4218144213800778872">"ድብዘዛዎችን አንቃ"</string>
@@ -5059,8 +5061,8 @@
<string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"አውሮፕላን፣ የአውሮፕላን ድህንነቱ የተጠበቀ"</string>
<string name="calls_and_sms" msgid="1931855083959003306">"ጥሪዎች እና ኤስኤምኤስ"</string>
<string name="calls_and_sms_category" msgid="2021321997884906046">"የWi-Fi ጥሪ ማድረጊያ"</string>
- <string name="calls_sms_wfc_summary" msgid="4930471357980272294">"እንደ Wi‑Fi ባሉ የአገልግሎት አቅራቢ ባልሆኑ አውታረ መረቦች ላይ ጥሪዎችን ያድርጉ እና ይቀበሉ"</string>
- <string name="calls_sms_footnote" msgid="7002461875954024216">"የWi‑Fi ጥሪ እንደ አንዳንድ የWi-Fi አውታረ መረቦች ያሉ የአገልግሎት አቅራቢ ባልሆኑ አውታረ መረቦች ላይ ጥሪዎችን እንዲያደርጉ እና እንዲቀበሉ ያስችልዎታል።"</string>
+ <string name="calls_sms_wfc_summary" msgid="3940529919408667336">"ጥሪዎችን በWi-Fi ያድርጉ እና ይቀበሉ"</string>
+ <string name="calls_sms_footnote" msgid="8051604228144899434">"በWi-Fi ጥሪ ማድረጊያ ጥሪዎችን ማድረግ እና መቀበል ጥሪ አቅራቢ ባልሆኑ የWi‑Fi አውታረ መረቦች ላይ ነው የሚደረጉት።"</string>
<string name="calls_preference_title" msgid="7536882032182563800">"ጥሪዎች"</string>
<string name="sms_preference_title" msgid="8392745501754864395">"ኤስኤምኤስ"</string>
<string name="calls_sms_preferred" msgid="6016477652522583496">"የተመረጡ"</string>
@@ -5079,10 +5081,10 @@
<string name="reset_internet_text" product="tablet" msgid="8797910368942544453">"ይህ የስልክ ጥሪዎን ይጨርሳል"</string>
<string name="resetting_internet_text" msgid="6696779371800051806">"በይነመረብዎን ዳግም በማስጀመር ላይ…"</string>
<string name="fix_connectivity" msgid="2781433603228089501">"ግንኙነትን ያስተካክሉ"</string>
- <!-- no translation found for airplane_mode_network_available (1059499681300395240) -->
- <skip />
- <!-- no translation found for to_switch_networks_disconnect_ethernet (6615374552827587197) -->
- <skip />
+ <string name="airplane_mode_network_available" msgid="1059499681300395240">"የአውሮፕላን ሁነታ አውታረ መረቦች ይገኛሉ"</string>
+ <string name="to_switch_networks_disconnect_ethernet" msgid="6615374552827587197">"አውታረ መረቦችን ለመቀየር፣ የኢተርኔት ግንኙነት ያቋርጡ"</string>
+ <string name="cannot_switch_networks_while_connected" msgid="3867944849171754777">"በሚገናኙበት ጊዜ አውታረ መረቦችን መቀየር አይቻልም"</string>
+ <string name="airplane_mode_network_panel_title" msgid="6385046104863403604">"የአውሮፕላን ሁነታ አውታረ መረቦች"</string>
<string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g> / <xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
<string name="mobile_data_connection_active" msgid="2422223108911581552">"ተገናኝቷል"</string>
<string name="mobile_data_off_summary" msgid="3841411571485837651">"በይነመረብ በራስ-ሰር አይገናኝም"</string>
@@ -5104,4 +5106,16 @@
<string name="category_name_others" msgid="2366006298768550310">"ሌሎች"</string>
<string name="category_name_general" msgid="7737273712848115886">"ጠቅላላ"</string>
<string name="default_see_all_apps_title" msgid="7481113230662612178">"ሁሉንም መተግበሪያዎች ይመልከቱ"</string>
+ <string name="smart_forwarding_title" msgid="8368634861971949799">"ብልህ ማስተላለፍ"</string>
+ <string name="smart_forwarding_summary_enabled" msgid="3341062878373185604">"ዘመናዊ ማስተላለፍ ነቅቷል"</string>
+ <string name="smart_forwarding_summary_disabled" msgid="5033880700091914809">"ዘመናዊ ማስተላለፍ ተሰናክሏል"</string>
+ <string name="smart_forwarding_ongoing_title" msgid="962226849074401228">"የጥሪ ቅንብሮች"</string>
+ <string name="smart_forwarding_ongoing_text" msgid="2189209372407117114">"ቅንብሮችን በማዘመን ላይ…"</string>
+ <string name="smart_forwarding_failed_title" msgid="1859891191023516080">"የጥሪ ቅንብሮች ስህተት"</string>
+ <string name="smart_forwarding_failed_text" msgid="5370431503707373653">"የአውታረ መረብ ወይም የሲም ካርድ ስህተት።"</string>
+ <string name="smart_forwarding_failed_not_activated_text" msgid="997396203001257904">"ሲም ገብር አልሆነም።"</string>
+ <string name="smart_forwarding_input_mdn_title" msgid="5105463748849841763">"የስልክ ቁጥሮች ያስገቡ"</string>
+ <string name="smart_forwarding_input_mdn_dialog_title" msgid="7542216086697868415">"የስልክ ቁጥር ያስገቡ"</string>
+ <string name="smart_forwarding_missing_mdn_text" msgid="2907314684242542226">"የስልክ ቁጥር ይቀራል።"</string>
+ <string name="smart_forwarding_missing_alert_dialog_text" msgid="7870419247987316112">"እሺ"</string>
</resources>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 9e7a473..6fe928d 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -2367,8 +2367,7 @@
<item quantity="other">تم حفظ <xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> سماعة أذن طبية</item>
<item quantity="one">تم حفظ <xliff:g id="NUMBER_DEVICE_COUNT_0">%1$d</xliff:g> سماعة أذن طبية</item>
</plurals>
- <!-- no translation found for accessibility_audio_adjustment_title (1332113739136802997) -->
- <skip />
+ <string name="accessibility_audio_adjustment_title" msgid="1332113739136802997">"تعديل الصوت"</string>
<string name="accessibility_summary_shortcut_enabled" msgid="4030427268146752644">"الاختصار مفعَّل"</string>
<string name="accessibility_summary_shortcut_disabled" msgid="564005462092499068">"غير مفعَّل"</string>
<string name="accessibility_summary_state_enabled" msgid="1065431632216039369">"مفعّل"</string>
@@ -2561,6 +2560,7 @@
<string name="bluetooth_on_time" msgid="8424625554628450028">"وقت تفعيل Wi-Fi"</string>
<string name="advanced_battery_title" msgid="3005993394776555079">"استخدام البطارية"</string>
<string name="history_details_title" msgid="8628584613889559355">"تفاصيل السجل"</string>
+ <string name="advanced_battery_preference_title" msgid="6518802648205311326">"عرض نسبة استخدام البطارية"</string>
<string name="battery_details_title" msgid="4531369291819754178">"استخدام البطارية"</string>
<string name="details_subtitle" msgid="2550872569652785527">"استخدام التفاصيل"</string>
<string name="controls_subtitle" msgid="3759606830916441564">"ضبط استخدام الطاقة"</string>
@@ -4346,6 +4346,7 @@
<string name="usb_use" msgid="6783183432648438528">"استخدام USB في"</string>
<string name="usb_default_label" msgid="3372838450371060750">"إعداد USB التلقائية"</string>
<string name="usb_default_info" msgid="167172599497085266">"عند الاتصال بجهاز آخر وإلغاء قفل هاتفك، سيتم تطبيق هذه الإعدادات. لذلك يجب الاتصال بالأجهزة الموثوق بها فقط."</string>
+ <string name="usb_power_title" msgid="5602112548385798646">"خيارات التشغيل"</string>
<string name="usb_pref" msgid="8521832005703261700">"USB"</string>
<string name="usb_preference" msgid="5084550082591493765">"إعدادات USB"</string>
<string name="usb_control_title" msgid="1946791559052157693">"يتم التحكم في USB بواسطة"</string>
@@ -5261,8 +5262,8 @@
<string name="mobile_data_ap_mode_disabled" msgid="6067959496888990983">"غير متاح أثناء وضع الطيران"</string>
<string name="force_desktop_mode" msgid="1336913605091334238">"فرض وضع سطح المكتب"</string>
<string name="force_desktop_mode_summary" msgid="4587416867846930479">"فرض وضع سطح المكتب التجريبي على شاشات العرض الثانوية"</string>
- <string name="enable_sizecompat_freeform" msgid="3799755160777404309">"تفعيل الشكل الحر للتطيبقات المتوافقة الحجم"</string>
- <string name="enable_sizecompat_freeform_summary" msgid="1484050174538201499">"السماح بالشكل الحر للتطبيقات المتوافقة الحجم."</string>
+ <string name="enable_non_resizable_multi_window" msgid="6832903754625404477">"استخدام التطبيقات التي لا يتغير حجمها في النوافذ المتعددة"</string>
+ <string name="enable_non_resizable_multi_window_summary" msgid="3275763753261901999">"السماح باستخدام التطبيقات التي لا يتغير حجمها في النوافذ المتعددة"</string>
<string name="hwui_force_dark_title" msgid="4256904905631994219">"إلغاء ميزة فرض تعتيم الشاشة"</string>
<string name="hwui_force_dark_summary" msgid="6515748781487952769">"لإلغاء ميزة فرض تعتيم الشاشة بحيث يتم تفعيلها دائمًا"</string>
<string name="enable_blurs_on_windows_title" msgid="4218144213800778872">"تفعيل عمليات التعتيم"</string>
@@ -5392,8 +5393,8 @@
<string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"وضع الطيران، آمنة في وضع الطيران"</string>
<string name="calls_and_sms" msgid="1931855083959003306">"المكالمات والرسائل القصيرة SMS"</string>
<string name="calls_and_sms_category" msgid="2021321997884906046">"الاتصال عبر Wi-Fi"</string>
- <string name="calls_sms_wfc_summary" msgid="4930471357980272294">"يمكنك إجراء مكالمات وتلقّيها عبر شبكات غير تابعة لمشغّلي شبكات الجوّال، مثلاً عبر شبكة Wi-Fi."</string>
- <string name="calls_sms_footnote" msgid="7002461875954024216">"تسمح لك ميزة \"الاتصال عبر Wi-Fi\" بإجراء مكالمات وتلقّيها عبر شبكات غير تابعة لمشغّلي شبكات الجوّال."</string>
+ <string name="calls_sms_wfc_summary" msgid="3940529919408667336">"يمكنك إجراء مكالمات وتلقّيها عبر شبكة Wi-Fi."</string>
+ <string name="calls_sms_footnote" msgid="8051604228144899434">"باستخدام ميزة \"الاتصال عبر Wi-Fi\"، يتم إجراء المكالمات وتلقّيها عبر شبكات Wi-Fi غير تابعة لمشغّلي شبكات الجوّال."</string>
<string name="calls_preference_title" msgid="7536882032182563800">"المكالمات"</string>
<string name="sms_preference_title" msgid="8392745501754864395">"SMS"</string>
<string name="calls_sms_preferred" msgid="6016477652522583496">"مفضّلة"</string>
@@ -5412,10 +5413,10 @@
<string name="reset_internet_text" product="tablet" msgid="8797910368942544453">"سيؤدي هذا إلى إنهاء مكالمتك الهاتفية."</string>
<string name="resetting_internet_text" msgid="6696779371800051806">"جارٍ إعادة ضبط شبكات الإنترنت…"</string>
<string name="fix_connectivity" msgid="2781433603228089501">"حل مشكلة اتصال البيانات"</string>
- <!-- no translation found for airplane_mode_network_available (1059499681300395240) -->
- <skip />
- <!-- no translation found for to_switch_networks_disconnect_ethernet (6615374552827587197) -->
- <skip />
+ <string name="airplane_mode_network_available" msgid="1059499681300395240">"الشبكات متاحة في وضع الطيران."</string>
+ <string name="to_switch_networks_disconnect_ethernet" msgid="6615374552827587197">"للتبديل بين الشبكات، يجب فصل إيثرنت."</string>
+ <string name="cannot_switch_networks_while_connected" msgid="3867944849171754777">"لا يمكن التبديل بين الشبكات أثناء الاتصال بشبكة إيثرنت."</string>
+ <string name="airplane_mode_network_panel_title" msgid="6385046104863403604">"الشبكات المتاحة في وضع الطيران"</string>
<string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g> / <xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
<string name="mobile_data_connection_active" msgid="2422223108911581552">"متصلة بالإنترنت"</string>
<string name="mobile_data_off_summary" msgid="3841411571485837651">"لن يتم الاتصال بالإنترنت تلقائيًا."</string>
@@ -5437,4 +5438,16 @@
<string name="category_name_others" msgid="2366006298768550310">"غير ذلك"</string>
<string name="category_name_general" msgid="7737273712848115886">"عام"</string>
<string name="default_see_all_apps_title" msgid="7481113230662612178">"عرض كل التطبيقات"</string>
+ <string name="smart_forwarding_title" msgid="8368634861971949799">"إعادة التوجيه الذكية"</string>
+ <string name="smart_forwarding_summary_enabled" msgid="3341062878373185604">"تم تفعيل ميزة \"إعادة التوجيه الذكية\"."</string>
+ <string name="smart_forwarding_summary_disabled" msgid="5033880700091914809">"تم إيقاف ميزة \"إعادة التوجيه الذكية\"."</string>
+ <string name="smart_forwarding_ongoing_title" msgid="962226849074401228">"إعدادات المكالمات"</string>
+ <string name="smart_forwarding_ongoing_text" msgid="2189209372407117114">"جارٍ تعديل الإعدادات..."</string>
+ <string name="smart_forwarding_failed_title" msgid="1859891191023516080">"خطأ في \"إعدادات الاتصال\""</string>
+ <string name="smart_forwarding_failed_text" msgid="5370431503707373653">"حدث خطأ في الشبكة أو في شريحة SIM."</string>
+ <string name="smart_forwarding_failed_not_activated_text" msgid="997396203001257904">"شريحة SIM غير مفعّلة."</string>
+ <string name="smart_forwarding_input_mdn_title" msgid="5105463748849841763">"إدخال أرقام الهواتف"</string>
+ <string name="smart_forwarding_input_mdn_dialog_title" msgid="7542216086697868415">"إدخال رقم الهاتف"</string>
+ <string name="smart_forwarding_missing_mdn_text" msgid="2907314684242542226">"رقم الهاتف مفقود."</string>
+ <string name="smart_forwarding_missing_alert_dialog_text" msgid="7870419247987316112">"حسنًا"</string>
</resources>
diff --git a/res/values-as/strings.xml b/res/values-as/strings.xml
index fb89367..d0a45f8 100644
--- a/res/values-as/strings.xml
+++ b/res/values-as/strings.xml
@@ -2436,6 +2436,7 @@
<string name="bluetooth_on_time" msgid="8424625554628450028">"ৱাই-ফাই অন হৈ থকা সময়"</string>
<string name="advanced_battery_title" msgid="3005993394776555079">"বেটাৰিৰ ব্যৱহাৰ"</string>
<string name="history_details_title" msgid="8628584613889559355">"ইতিহাসৰ বিৱৰণ"</string>
+ <string name="advanced_battery_preference_title" msgid="6518802648205311326">"বেটাৰীৰ ব্যৱহাৰ চাওক"</string>
<string name="battery_details_title" msgid="4531369291819754178">"বেটাৰিৰ ব্যৱহাৰ"</string>
<string name="details_subtitle" msgid="2550872569652785527">"ব্যৱহাৰৰ বিৱৰণ"</string>
<string name="controls_subtitle" msgid="3759606830916441564">"পাৱাৰৰ ব্যৱহাৰ খাপ খুৱাওক"</string>
@@ -4097,6 +4098,7 @@
<string name="usb_use" msgid="6783183432648438528">"ইয়াৰ বাবে ইউএছবি ব্যৱহাৰ কৰক"</string>
<string name="usb_default_label" msgid="3372838450371060750">"ইউএছবিৰ ডিফ\'ল্ট কনফিগাৰেশ্বন"</string>
<string name="usb_default_info" msgid="167172599497085266">"অন্য ডিভাইচ সংযোগ হ\'লে আৰু আপোনাৰ ফ\'ন আনলক কৰা থাকিলে, এই ছেটিংসমূহ প্ৰযোজ্য হ\'ব৷ মাত্ৰ বিশ্বাসী ডিভাইচসমূহৰ সৈতেহে সংযোগ কৰক৷"</string>
+ <string name="usb_power_title" msgid="5602112548385798646">"পাৱাৰৰ বিকল্প"</string>
<string name="usb_pref" msgid="8521832005703261700">"ইউএছবি"</string>
<string name="usb_preference" msgid="5084550082591493765">"ইউএছবিৰ অগ্ৰাধিকাৰসমূহ"</string>
<string name="usb_control_title" msgid="1946791559052157693">"নিম্ন বস্তুয়ে ইউএছবিক নিয়ন্ত্ৰিত কৰে"</string>
@@ -4936,8 +4938,8 @@
<string name="mobile_data_ap_mode_disabled" msgid="6067959496888990983">"এয়াৰপ্লেইন ম’ড অন থাকিলে উপলব্ধ নহয়"</string>
<string name="force_desktop_mode" msgid="1336913605091334238">"বলপূৰ্বক ডেস্কটপ ম’ড"</string>
<string name="force_desktop_mode_summary" msgid="4587416867846930479">"দ্বিতীয় ডিছপ্লে’ত পৰীক্ষামূলক ডেস্কটপ ম’ড বলপূৰ্বকভাৱে প্ৰয়োগ কৰক"</string>
- <string name="enable_sizecompat_freeform" msgid="3799755160777404309">"ফ্ৰীফৰ্ম ছাইজকম্পেক্ট সক্ষম কৰক"</string>
- <string name="enable_sizecompat_freeform_summary" msgid="1484050174538201499">"ছাইজকম্পেক্ট এপ্সমূহক ফ্ৰীফৰ্মত থাকিবলৈ দিয়ে"</string>
+ <string name="enable_non_resizable_multi_window" msgid="6832903754625404477">"একাধিক ৱিণ্ড’ত আকাৰ সলনি কৰিব নোৱৰা সুবিধাটো সক্ষম কৰক"</string>
+ <string name="enable_non_resizable_multi_window_summary" msgid="3275763753261901999">"আকাৰ সলনি কৰিব নোৱৰা এপক একাধিক ৱিণ্ড’ত থকাৰ অনুমতি দিয়ে"</string>
<string name="hwui_force_dark_title" msgid="4256904905631994219">"বলপূর্বকভাৱে গাঢ় ৰঙৰ থীম ব্যৱহাৰ কৰা সুবিধাটো অ\'ভাৰৰাইড কৰক"</string>
<string name="hwui_force_dark_summary" msgid="6515748781487952769">"বলপূর্বকভাৱে গাঢ় ৰঙৰ থীম ব্যৱহাৰ কৰা সুবিধাটো সদায় অন হৈ থাকিবলৈ অ\'ভাৰৰাইড কৰে"</string>
<string name="enable_blurs_on_windows_title" msgid="4218144213800778872">"ধূসৰতা সক্ষম কৰক"</string>
@@ -5059,8 +5061,8 @@
<string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"এয়াৰপ্লেন, এয়াৰপ্লেন-সুৰক্ষিত"</string>
<string name="calls_and_sms" msgid="1931855083959003306">"কল আৰু এছএমএছ"</string>
<string name="calls_and_sms_category" msgid="2021321997884906046">"ৱাই-ফাই কলিং"</string>
- <string name="calls_sms_wfc_summary" msgid="4930471357980272294">"ৱাই-ফাই নেটৱৰ্কৰ দৰে বাহক বহিৰ্ভূত নেটৱৰ্কৰ জৰিয়তে কল কৰক আৰু লাভ কৰক"</string>
- <string name="calls_sms_footnote" msgid="7002461875954024216">"ৱাই-ফাই কলিঙৰ সুবিধাটোৱে আপোনাক কিছুমান ৱাই-ফাই নেটৱৰ্কৰ দৰে বাহক বহিৰ্ভূত নেটৱৰ্কৰ জৰিয়তে কল কৰিবলৈ আৰু লাভ কৰিবলৈ সুবিধা দিয়ে।"</string>
+ <string name="calls_sms_wfc_summary" msgid="3940529919408667336">"ৱাই-ফাই নেটৱৰ্কৰ জৰিয়তে কল কৰক আৰু গ্ৰহণ কৰক"</string>
+ <string name="calls_sms_footnote" msgid="8051604228144899434">"ৱাই-ফাই কলিঙৰ সহায়ত বাহক বহিৰ্ভূত ৱাই-ফাই নেটৱৰ্কৰ জৰিয়তে কল কৰা আৰু গ্ৰহণ কৰা হয়।"</string>
<string name="calls_preference_title" msgid="7536882032182563800">"কল"</string>
<string name="sms_preference_title" msgid="8392745501754864395">"এছএমএছ"</string>
<string name="calls_sms_preferred" msgid="6016477652522583496">"অগ্ৰাধিকাৰ দিয়া"</string>
@@ -5079,10 +5081,10 @@
<string name="reset_internet_text" product="tablet" msgid="8797910368942544453">"এইটোৱে আপোনাৰ ফ’ন কলটোৰ অন্ত পেলাব"</string>
<string name="resetting_internet_text" msgid="6696779371800051806">"আপোনাৰ ইণ্টাৰনেট ৰিছেট কৰি থকা হৈছে…"</string>
<string name="fix_connectivity" msgid="2781433603228089501">"সংযোগ ঠিক কৰক"</string>
- <!-- no translation found for airplane_mode_network_available (1059499681300395240) -->
- <skip />
- <!-- no translation found for to_switch_networks_disconnect_ethernet (6615374552827587197) -->
- <skip />
+ <string name="airplane_mode_network_available" msgid="1059499681300395240">"এয়াৰপ্লেন ম’ডৰ নেটৱৰ্ক উপলব্ধ"</string>
+ <string name="to_switch_networks_disconnect_ethernet" msgid="6615374552827587197">"নেটৱৰ্ক সলনি কৰিবলৈ ইথাৰনেটৰ পৰা সংযোগ বিচ্ছিন্ন কৰক"</string>
+ <string name="cannot_switch_networks_while_connected" msgid="3867944849171754777">"সংযুক্ত হৈ থাকোঁতে নেটৱৰ্ক সলনি কৰিব নোৱাৰি"</string>
+ <string name="airplane_mode_network_panel_title" msgid="6385046104863403604">"এয়াৰপ্লেন ম’ডত উপলব্ধ নেটৱৰ্ক"</string>
<string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g> / <xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
<string name="mobile_data_connection_active" msgid="2422223108911581552">"সংযোজিত হৈ আছে"</string>
<string name="mobile_data_off_summary" msgid="3841411571485837651">"ইণ্টাৰনেট স্বয়ংক্ৰিয়ভাৱে সংযুক্ত নহ’ব"</string>
@@ -5104,4 +5106,16 @@
<string name="category_name_others" msgid="2366006298768550310">"অন্যান্য"</string>
<string name="category_name_general" msgid="7737273712848115886">"সাধাৰণ"</string>
<string name="default_see_all_apps_title" msgid="7481113230662612178">"আটাইবোৰ এপ্ চাওক"</string>
+ <string name="smart_forwarding_title" msgid="8368634861971949799">"স্মাৰ্ট ফৰৱাৰ্ডিং"</string>
+ <string name="smart_forwarding_summary_enabled" msgid="3341062878373185604">"স্মাৰ্ট ফৰৱাৰ্ডিঙৰ সুবিধাটো সক্ষম কৰা আছে"</string>
+ <string name="smart_forwarding_summary_disabled" msgid="5033880700091914809">"স্মাৰ্ট ফৰৱাৰ্ডিঙৰ সুবিধাটো অক্ষম কৰা আছে"</string>
+ <string name="smart_forwarding_ongoing_title" msgid="962226849074401228">"কলৰ ছেটিং"</string>
+ <string name="smart_forwarding_ongoing_text" msgid="2189209372407117114">"ছেটিং আপডে’ট কৰি থকা হৈছে…"</string>
+ <string name="smart_forwarding_failed_title" msgid="1859891191023516080">"কলৰ ছেটিঙত আসোঁৱাহ হৈছে"</string>
+ <string name="smart_forwarding_failed_text" msgid="5370431503707373653">"নেটৱৰ্ক অথবা ছিম কাৰ্ডৰ আসোঁৱাহ হৈছে।"</string>
+ <string name="smart_forwarding_failed_not_activated_text" msgid="997396203001257904">"ছিম সক্ৰিয় কৰা হোৱা নাই।"</string>
+ <string name="smart_forwarding_input_mdn_title" msgid="5105463748849841763">"ফ’ন নম্বৰসমূহ দিয়ক"</string>
+ <string name="smart_forwarding_input_mdn_dialog_title" msgid="7542216086697868415">"ফ’ন নম্বৰটো দিয়ক"</string>
+ <string name="smart_forwarding_missing_mdn_text" msgid="2907314684242542226">"ফ’ন নম্বৰটো নাই।"</string>
+ <string name="smart_forwarding_missing_alert_dialog_text" msgid="7870419247987316112">"ঠিক আছে"</string>
</resources>
diff --git a/res/values-az/strings.xml b/res/values-az/strings.xml
index bb65787..90f3f46 100644
--- a/res/values-az/strings.xml
+++ b/res/values-az/strings.xml
@@ -1211,7 +1211,7 @@
<string name="peak_refresh_rate_title" msgid="1878771412897140903">"Rahat Displey"</string>
<string name="peak_refresh_rate_summary" msgid="1527087897198455042">"Bəzi məzmun üçün yeniləmə dərəcəsini 60 Hs-dən 90 Hs-ə avtomatik yüksəldir. Batareya istifadəsini artırır."</string>
<string name="force_high_refresh_rate_toggle" msgid="5861514655252832828">"90 Hs yeniləmə dərəcəsini məcbur tətbiq edin"</string>
- <string name="force_high_refresh_rate_desc" msgid="7794566420873814875">"Təkmilləşdirilmiş toxunuş həssaslığı və animasiya keyfiyyəti üçün yüksək yeniləmə dərəcəsi. Batareya istifadəsini artırır."</string>
+ <string name="force_high_refresh_rate_desc" msgid="7794566420873814875">"Daha həssas sensor və daha axıcı animasiyalar üçün yüksək təzələmə dərəcəsi. Enerji sərfiyyatını artırır."</string>
<string name="adaptive_sleep_title" msgid="2987961991423539233">"Ekran həssaslığı"</string>
<string name="adaptive_sleep_summary_on" msgid="313187971631243800">"Aktiv/ Ekrana baxırsınızsa, sönməyəcək"</string>
<string name="adaptive_sleep_summary_off" msgid="5272156339202897523">"Deaktiv"</string>
@@ -1434,7 +1434,7 @@
<string name="dlg_confirm_unmount_text" product="default" msgid="3887768438615563697">"SD kartınızı çıxarsanız, istifadə etdiyiniz bəzi tətbiqlər SD kartı geri qaytarana kimi işləməyəcəklər."</string>
<string name="dlg_error_unmount_title" product="nosdcard" msgid="2205587942165199845"></string>
<string name="dlg_error_unmount_title" product="default" msgid="2205587942165199845"></string>
- <string name="dlg_error_unmount_text" product="nosdcard" msgid="7876201891724279436">"USB yaddaşı çıxarmaq mümkün olmadı. Daha sonra yenidən cəhd edin."</string>
+ <string name="dlg_error_unmount_text" product="nosdcard" msgid="7876201891724279436">"USB-ni çıxarmaq olmur. Sonra cəhd edin."</string>
<string name="dlg_error_unmount_text" product="default" msgid="2185659901137961711">"SD kart çıxarıla bilmədi. Sonra cəhd edin.."</string>
<string name="unmount_inform_text" product="nosdcard" msgid="5932607205977999175">"USB yaddaş çıxarılacaq."</string>
<string name="unmount_inform_text" product="default" msgid="716578785262713312">"SD cart çıxarılacaq."</string>
@@ -2267,8 +2267,7 @@
<item quantity="other"><xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> yadda saxlanmış qulaqlıq</item>
<item quantity="one"><xliff:g id="NUMBER_DEVICE_COUNT_0">%1$d</xliff:g> yadda saxlanmış qulaqlıq</item>
</plurals>
- <!-- no translation found for accessibility_audio_adjustment_title (1332113739136802997) -->
- <skip />
+ <string name="accessibility_audio_adjustment_title" msgid="1332113739136802997">"Audio tənzimlənməsi"</string>
<string name="accessibility_summary_shortcut_enabled" msgid="4030427268146752644">"Qısayol aktivdir"</string>
<string name="accessibility_summary_shortcut_disabled" msgid="564005462092499068">"Deaktiv"</string>
<string name="accessibility_summary_state_enabled" msgid="1065431632216039369">"Aktiv"</string>
@@ -2437,6 +2436,7 @@
<string name="bluetooth_on_time" msgid="8424625554628450028">"Wi-Fi zamanı"</string>
<string name="advanced_battery_title" msgid="3005993394776555079">"Batareya istifadəsi"</string>
<string name="history_details_title" msgid="8628584613889559355">"Tarixçə detalları"</string>
+ <string name="advanced_battery_preference_title" msgid="6518802648205311326">"Batareya istifadəsinə baxın"</string>
<string name="battery_details_title" msgid="4531369291819754178">"Batareya istifadəsi"</string>
<string name="details_subtitle" msgid="2550872569652785527">"Ətraflı istifadə"</string>
<string name="controls_subtitle" msgid="3759606830916441564">"Enerji istifadəsini idarə edin"</string>
@@ -2904,7 +2904,7 @@
<string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="6387714350903085918">"İnternet üzərindən hesabınıza etdiyiniz istənilən dəyişiklik planşetdə avtomatik qeyd ediləcək.\n\nBəzi hesablar planşet vasitəsilə internetdə etdiyiniz dəyişiklikləri avtomatik kopyalaya bilər. Google Hesabları da belə edir."</string>
<string name="data_usage_auto_sync_on_dialog" product="default" msgid="6457107552266187107">"İnternet üzərindən hesabınıza etdiyiniz istənilən dəyişiklik telefonda avtomatik qeyd ediləcək.\n\nBəzi hesablar telefon vasitəsilə internetdə etdiyiniz dəyişiklikləri avtomatik kopyalaya bilər. Google Hesabları da belə edir."</string>
<string name="data_usage_auto_sync_off_dialog_title" msgid="1783917145440587470">"Avto-sinxronizasiya deaktiv edilsin?"</string>
- <string name="data_usage_auto_sync_off_dialog" msgid="6523112583569674837">"Bu, data və batareya istifadəsinə qənaət edəcək, lakin Siz sonuncu məlumatları toplamaq üçün hər hesabı əl ilə sinxronlaşdırmalı olacaqsınız. Və güncəlləşmə vaxtı gələndə Sizə bildiriş gəlməyəcək."</string>
+ <string name="data_usage_auto_sync_off_dialog" msgid="6523112583569674837">"Trafik və enerji sərfiyyatı azalacaq, lakin yeni datanın əldə edilməsi üçün hesab əl ilə sinxronlaşdırılmalı olacaq. Yeni güncəllənmə olanda sizə bildiriş gəlməyəcək."</string>
<string name="data_usage_cycle_editor_title" msgid="2019035830921480941">"Tarixin dövri sıfırlanması istifadəsi"</string>
<string name="data_usage_cycle_editor_subtitle" msgid="1026234456777365545">"Hər ayın tarixi:"</string>
<string name="data_usage_cycle_editor_positive" msgid="6110165528024717527">"Ayarlayın"</string>
@@ -4098,6 +4098,7 @@
<string name="usb_use" msgid="6783183432648438528">"USB istifadəsi"</string>
<string name="usb_default_label" msgid="3372838450371060750">"Defolt USB konfiqurasiyası"</string>
<string name="usb_default_info" msgid="167172599497085266">"Digər cihaz qoşulu olduqda və telefon kiliddə olmadıqda bu ayarlar tətbiq olunacaq. Yalnız etibar edilən cihazlara qoşulacaqsınız."</string>
+ <string name="usb_power_title" msgid="5602112548385798646">"Enerji seçimləri"</string>
<string name="usb_pref" msgid="8521832005703261700">"USB"</string>
<string name="usb_preference" msgid="5084550082591493765">"USB Tərcihləri"</string>
<string name="usb_control_title" msgid="1946791559052157693">"USB nəzarətçisi"</string>
@@ -4937,8 +4938,8 @@
<string name="mobile_data_ap_mode_disabled" msgid="6067959496888990983">"Təyyarə rejimində əlçatan deyil"</string>
<string name="force_desktop_mode" msgid="1336913605091334238">"Masaüstü rejiminə keçin"</string>
<string name="force_desktop_mode_summary" msgid="4587416867846930479">"İkinci displeylərdə eksperimental masaüstü rejimə keçin"</string>
- <string name="enable_sizecompat_freeform" msgid="3799755160777404309">"Sərbəst formalı tətbiqləri aktiv edin"</string>
- <string name="enable_sizecompat_freeform_summary" msgid="1484050174538201499">"Ölçüsü dəyişdirilə bilən tətbiqlərə sərbəst formada olmağa imkan verir"</string>
+ <string name="enable_non_resizable_multi_window" msgid="6832903754625404477">"Çoxpəncərəli rejimdə ölçüsü dəyişməyənləri aktiv edin"</string>
+ <string name="enable_non_resizable_multi_window_summary" msgid="3275763753261901999">"Çoxpəncərəli rejimdə ölçüsü dəyişməyən tətbiqlərin olmasına imkan verir"</string>
<string name="hwui_force_dark_title" msgid="4256904905631994219">"Qaranlıq rejimini ləğv edir"</string>
<string name="hwui_force_dark_summary" msgid="6515748781487952769">"Qaranlıq rejiminin həmişə aktiv olmasını ləğv edir"</string>
<string name="enable_blurs_on_windows_title" msgid="4218144213800778872">"Tutqunluqları aktivləşdirin"</string>
@@ -5060,8 +5061,8 @@
<string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"təyyarə, güvənli təyyarə şəbəkəsi"</string>
<string name="calls_and_sms" msgid="1931855083959003306">"Zənglər və SMS"</string>
<string name="calls_and_sms_category" msgid="2021321997884906046">"Wi-Fi Zəngi"</string>
- <string name="calls_sms_wfc_summary" msgid="4930471357980272294">"Wi‑Fi kimi operator olmayan şəbəkələr üzərindən zəng edin və qəbul edin"</string>
- <string name="calls_sms_footnote" msgid="7002461875954024216">"Wi-Fi zəngi bəzi Wi‑Fi şəbəkələri kimi operator olmayan şəbəkələr üzərindən zəng etmək və qəbul etməyinizə imkan verir."</string>
+ <string name="calls_sms_wfc_summary" msgid="3940529919408667336">"Zəngləri Wi‑Fi üzərindən edin və qəbul edin"</string>
+ <string name="calls_sms_footnote" msgid="8051604228144899434">"Wi‑Fi zəngi ilə zənglər operatordan kənar Wi‑Fi şəbəkələri üzərindən edilir və qəbul edilir."</string>
<string name="calls_preference_title" msgid="7536882032182563800">"Zənglər"</string>
<string name="sms_preference_title" msgid="8392745501754864395">"SMS"</string>
<string name="calls_sms_preferred" msgid="6016477652522583496">"tərcih edilənlər"</string>
@@ -5080,10 +5081,10 @@
<string name="reset_internet_text" product="tablet" msgid="8797910368942544453">"Bu, telefon zəngini bitirəcək"</string>
<string name="resetting_internet_text" msgid="6696779371800051806">"İnternet sıfırlanır…"</string>
<string name="fix_connectivity" msgid="2781433603228089501">"Bağlantını düzəldin"</string>
- <!-- no translation found for airplane_mode_network_available (1059499681300395240) -->
- <skip />
- <!-- no translation found for to_switch_networks_disconnect_ethernet (6615374552827587197) -->
- <skip />
+ <string name="airplane_mode_network_available" msgid="1059499681300395240">"Təyyarə rejimi şəbəkələri əlçatandır"</string>
+ <string name="to_switch_networks_disconnect_ethernet" msgid="6615374552827587197">"Şəbəkələri dəyişmək üçün etherneti ayırın"</string>
+ <string name="cannot_switch_networks_while_connected" msgid="3867944849171754777">"Qoşulduqdan sonra şəbəkələri dəyişmək olmur"</string>
+ <string name="airplane_mode_network_panel_title" msgid="6385046104863403604">"Təyyatə rejimi şəbəkələri"</string>
<string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g> / <xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
<string name="mobile_data_connection_active" msgid="2422223108911581552">"Qoşulub"</string>
<string name="mobile_data_off_summary" msgid="3841411571485837651">"İnternet avtomatik qoşulmayacaq"</string>
@@ -5105,4 +5106,16 @@
<string name="category_name_others" msgid="2366006298768550310">"Digərləri"</string>
<string name="category_name_general" msgid="7737273712848115886">"Ümumi"</string>
<string name="default_see_all_apps_title" msgid="7481113230662612178">"Bütün tətbiqlərə baxın"</string>
+ <string name="smart_forwarding_title" msgid="8368634861971949799">"Ağıllı Yönləndirmə"</string>
+ <string name="smart_forwarding_summary_enabled" msgid="3341062878373185604">"Ağıllı Yönləndirmə aktivdir"</string>
+ <string name="smart_forwarding_summary_disabled" msgid="5033880700091914809">"Ağıllı Yönləndirmə deaktivdir"</string>
+ <string name="smart_forwarding_ongoing_title" msgid="962226849074401228">"Zəng Ayarları"</string>
+ <string name="smart_forwarding_ongoing_text" msgid="2189209372407117114">"Ayarlar yenilənir…"</string>
+ <string name="smart_forwarding_failed_title" msgid="1859891191023516080">"Zəng ayarları xətası"</string>
+ <string name="smart_forwarding_failed_text" msgid="5370431503707373653">"Şəbəkə və ya SİM kart xətası."</string>
+ <string name="smart_forwarding_failed_not_activated_text" msgid="997396203001257904">"Sim aktiv deyil."</string>
+ <string name="smart_forwarding_input_mdn_title" msgid="5105463748849841763">"Telefon nömrələrini daxil edin"</string>
+ <string name="smart_forwarding_input_mdn_dialog_title" msgid="7542216086697868415">"Telefon nömrəsini daxil edin"</string>
+ <string name="smart_forwarding_missing_mdn_text" msgid="2907314684242542226">"Telefon nömrəsi yoxdur."</string>
+ <string name="smart_forwarding_missing_alert_dialog_text" msgid="7870419247987316112">"OK"</string>
</resources>
diff --git a/res/values-b+sr+Latn/strings.xml b/res/values-b+sr+Latn/strings.xml
index 7a5e5e2..04f5ddd 100644
--- a/res/values-b+sr+Latn/strings.xml
+++ b/res/values-b+sr+Latn/strings.xml
@@ -2292,8 +2292,7 @@
<item quantity="few"><xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> sačuvana slušna aparata</item>
<item quantity="other"><xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> sačuvanih slušnih aparata</item>
</plurals>
- <!-- no translation found for accessibility_audio_adjustment_title (1332113739136802997) -->
- <skip />
+ <string name="accessibility_audio_adjustment_title" msgid="1332113739136802997">"Prilagođavanje zvuka"</string>
<string name="accessibility_summary_shortcut_enabled" msgid="4030427268146752644">"Prečica je uključena"</string>
<string name="accessibility_summary_shortcut_disabled" msgid="564005462092499068">"Isključeno"</string>
<string name="accessibility_summary_state_enabled" msgid="1065431632216039369">"Uključeno"</string>
@@ -2468,6 +2467,7 @@
<string name="bluetooth_on_time" msgid="8424625554628450028">"Vreme od uključivanja WiFi mreže"</string>
<string name="advanced_battery_title" msgid="3005993394776555079">"Potrošnja baterije"</string>
<string name="history_details_title" msgid="8628584613889559355">"Detalji istorije"</string>
+ <string name="advanced_battery_preference_title" msgid="6518802648205311326">"Prikaži potrošnju baterije"</string>
<string name="battery_details_title" msgid="4531369291819754178">"Potrošnja baterije"</string>
<string name="details_subtitle" msgid="2550872569652785527">"Korišćenje detalja"</string>
<string name="controls_subtitle" msgid="3759606830916441564">"Prilagođavanje korišćenja napajanja"</string>
@@ -4160,6 +4160,7 @@
<string name="usb_use" msgid="6783183432648438528">"Koristi USB za"</string>
<string name="usb_default_label" msgid="3372838450371060750">"Podrazumevana USB konfiguracija"</string>
<string name="usb_default_info" msgid="167172599497085266">"Kad se poveže drugi uređaj, a telefon je otključan, primenjuju se ova podešavanja. Povezujte se samo sa pouzdanim uređajima."</string>
+ <string name="usb_power_title" msgid="5602112548385798646">"Opcije napajanja"</string>
<string name="usb_pref" msgid="8521832005703261700">"USB"</string>
<string name="usb_preference" msgid="5084550082591493765">"Podešavanja USB-a"</string>
<string name="usb_control_title" msgid="1946791559052157693">"USB kontroliše:"</string>
@@ -5018,8 +5019,8 @@
<string name="mobile_data_ap_mode_disabled" msgid="6067959496888990983">"Nedostupno tokom režima rada u avionu"</string>
<string name="force_desktop_mode" msgid="1336913605091334238">"Nametni režim računara"</string>
<string name="force_desktop_mode_summary" msgid="4587416867846930479">"Nametni eksperimentalni režim računara na sekundarnim ekranima"</string>
- <string name="enable_sizecompat_freeform" msgid="3799755160777404309">"Omogući slobodni oblik aplikacija sa nepromenjivom veličinom"</string>
- <string name="enable_sizecompat_freeform_summary" msgid="1484050174538201499">"Omogućava aplikacijama sa nepromenjivom veličinom da budu u slobodnom obliku"</string>
+ <string name="enable_non_resizable_multi_window" msgid="6832903754625404477">"Omogući aplikacije nepromenjive veličine u više prozora"</string>
+ <string name="enable_non_resizable_multi_window_summary" msgid="3275763753261901999">"Omogućava da aplikacije nepromenjive veličine budu u više prozora"</string>
<string name="hwui_force_dark_title" msgid="4256904905631994219">"Zameni funkciju nametanja tamne teme"</string>
<string name="hwui_force_dark_summary" msgid="6515748781487952769">"Menja funkciju nametanja tamne teme tako da bude uvek uključena"</string>
<string name="enable_blurs_on_windows_title" msgid="4218144213800778872">"Omogući zamagljivanja"</string>
@@ -5143,8 +5144,8 @@
<string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"avion, bezbedno po avion"</string>
<string name="calls_and_sms" msgid="1931855083959003306">"Pozivi i SMS"</string>
<string name="calls_and_sms_category" msgid="2021321997884906046">"Pozivanje preko WiFi-a"</string>
- <string name="calls_sms_wfc_summary" msgid="4930471357980272294">"Upućujte i primajte pozive preko mreža koje ne pripadaju mobilnom operateru, na primer, WiFi-ja"</string>
- <string name="calls_sms_footnote" msgid="7002461875954024216">"Pozivanje preko WiFi-ja vam omogućava da primate i upućujete pozive preko mreža koje ne pripadaju mobilnom operateru, na primer, nekih WiFi mreža."</string>
+ <string name="calls_sms_wfc_summary" msgid="3940529919408667336">"Upućujte i primajte pozive preko WiFi-ja"</string>
+ <string name="calls_sms_footnote" msgid="8051604228144899434">"Kada koristite Pozivanje preko WiFi-ja, pozivi se upućuju i primaju preko WiFi mreža koje ne pripadaju mobilnom operateru."</string>
<string name="calls_preference_title" msgid="7536882032182563800">"Pozivi"</string>
<string name="sms_preference_title" msgid="8392745501754864395">"SMS"</string>
<string name="calls_sms_preferred" msgid="6016477652522583496">"prednost"</string>
@@ -5163,10 +5164,10 @@
<string name="reset_internet_text" product="tablet" msgid="8797910368942544453">"Ovim završavate telefonski poziv"</string>
<string name="resetting_internet_text" msgid="6696779371800051806">"Resetuje se internet…"</string>
<string name="fix_connectivity" msgid="2781433603228089501">"Reši problem sa povezivanjem"</string>
- <!-- no translation found for airplane_mode_network_available (1059499681300395240) -->
- <skip />
- <!-- no translation found for to_switch_networks_disconnect_ethernet (6615374552827587197) -->
- <skip />
+ <string name="airplane_mode_network_available" msgid="1059499681300395240">"Dostupne su mreže za režim rada u avionu"</string>
+ <string name="to_switch_networks_disconnect_ethernet" msgid="6615374552827587197">"Da biste promenili mrežu, prekinite eternet vezu"</string>
+ <string name="cannot_switch_networks_while_connected" msgid="3867944849171754777">"Ne možete da promenite mrežu dok ste povezani"</string>
+ <string name="airplane_mode_network_panel_title" msgid="6385046104863403604">"Mreže u režimu rada u avionu"</string>
<string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g>/<xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
<string name="mobile_data_connection_active" msgid="2422223108911581552">"Povezano"</string>
<string name="mobile_data_off_summary" msgid="3841411571485837651">"Automatsko povezivanje na internet nije moguće"</string>
@@ -5188,4 +5189,16 @@
<string name="category_name_others" msgid="2366006298768550310">"Drugo"</string>
<string name="category_name_general" msgid="7737273712848115886">"Opšte"</string>
<string name="default_see_all_apps_title" msgid="7481113230662612178">"Prikaži sve aplikacije"</string>
+ <string name="smart_forwarding_title" msgid="8368634861971949799">"Pametno prosleđivanje"</string>
+ <string name="smart_forwarding_summary_enabled" msgid="3341062878373185604">"Pametno prosleđivanje je omogućeno"</string>
+ <string name="smart_forwarding_summary_disabled" msgid="5033880700091914809">"Pametno prosleđivanje je onemogućeno"</string>
+ <string name="smart_forwarding_ongoing_title" msgid="962226849074401228">"Podešavanja poziva"</string>
+ <string name="smart_forwarding_ongoing_text" msgid="2189209372407117114">"Ažuriraju se podešavanja…"</string>
+ <string name="smart_forwarding_failed_title" msgid="1859891191023516080">"Greška u podešavanjima poziva"</string>
+ <string name="smart_forwarding_failed_text" msgid="5370431503707373653">"Greška na mreži ili SIM kartici."</string>
+ <string name="smart_forwarding_failed_not_activated_text" msgid="997396203001257904">"SIM kartica nije aktivirana."</string>
+ <string name="smart_forwarding_input_mdn_title" msgid="5105463748849841763">"Unesite brojeve telefona"</string>
+ <string name="smart_forwarding_input_mdn_dialog_title" msgid="7542216086697868415">"Unesite broj telefona"</string>
+ <string name="smart_forwarding_missing_mdn_text" msgid="2907314684242542226">"Nije naveden broj telefona."</string>
+ <string name="smart_forwarding_missing_alert_dialog_text" msgid="7870419247987316112">"Potvrdi"</string>
</resources>
diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml
index 8b2506d..e021abf 100644
--- a/res/values-be/strings.xml
+++ b/res/values-be/strings.xml
@@ -2317,8 +2317,7 @@
<item quantity="many">Захавана <xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> слыхавых апаратаў</item>
<item quantity="other">Захавана <xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> слыхавога апарата</item>
</plurals>
- <!-- no translation found for accessibility_audio_adjustment_title (1332113739136802997) -->
- <skip />
+ <string name="accessibility_audio_adjustment_title" msgid="1332113739136802997">"Настройка аўдыя"</string>
<string name="accessibility_summary_shortcut_enabled" msgid="4030427268146752644">"Хуткі доступ уключаны"</string>
<string name="accessibility_summary_shortcut_disabled" msgid="564005462092499068">"Выключана"</string>
<string name="accessibility_summary_state_enabled" msgid="1065431632216039369">"Уключана"</string>
@@ -2499,6 +2498,7 @@
<string name="bluetooth_on_time" msgid="8424625554628450028">"Wi-Fi у тэрмiн"</string>
<string name="advanced_battery_title" msgid="3005993394776555079">"Выкарыстанне зараду"</string>
<string name="history_details_title" msgid="8628584613889559355">"Падрабязнасці гісторыі"</string>
+ <string name="advanced_battery_preference_title" msgid="6518802648205311326">"Прагляд даных пра выкарыстанне зараду"</string>
<string name="battery_details_title" msgid="4531369291819754178">"Выкарыстанне зараду"</string>
<string name="details_subtitle" msgid="2550872569652785527">"Падрабязнасці выкарыстання"</string>
<string name="controls_subtitle" msgid="3759606830916441564">"Адрэгуляваць спажыванне энергіі"</string>
@@ -4222,6 +4222,7 @@
<string name="usb_use" msgid="6783183432648438528">"Выкарыстанне USB"</string>
<string name="usb_default_label" msgid="3372838450371060750">"Стандартная канфігурацыя USB"</string>
<string name="usb_default_info" msgid="167172599497085266">"Гэтыя налады прымяняюцца, калі падключана іншая прылада, а ваш тэлефон разблакіраваны. Падключайце толькі давераныя прылады."</string>
+ <string name="usb_power_title" msgid="5602112548385798646">"Налады кнопкі сілкавання"</string>
<string name="usb_pref" msgid="8521832005703261700">"USB"</string>
<string name="usb_preference" msgid="5084550082591493765">"Налады USB"</string>
<string name="usb_control_title" msgid="1946791559052157693">"Рэжым працы USB"</string>
@@ -5099,8 +5100,8 @@
<string name="mobile_data_ap_mode_disabled" msgid="6067959496888990983">"Недаступна ў рэжыме палёту"</string>
<string name="force_desktop_mode" msgid="1336913605091334238">"Прымусова ўключаць рэжым працоўнага стала"</string>
<string name="force_desktop_mode_summary" msgid="4587416867846930479">"Прымусова ўключаць эксперыментальны рэжым працоўнага стала на дадатковых экранах"</string>
- <string name="enable_sizecompat_freeform" msgid="3799755160777404309">"Уключыць адвольную форму sizecompat"</string>
- <string name="enable_sizecompat_freeform_summary" msgid="1484050174538201499">"Дазваляе праграмам sizecompat мець адвольную форму"</string>
+ <string name="enable_non_resizable_multi_window" msgid="6832903754625404477">"У рэжыме некалькіх вокнаў уключыць нязменны памер"</string>
+ <string name="enable_non_resizable_multi_window_summary" msgid="3275763753261901999">"Дазваляе выкарыстоўваць праграмы, якія маюць нязменны памер, у рэжыме некалькіх вокнаў"</string>
<string name="hwui_force_dark_title" msgid="4256904905631994219">"Перавызначэнне ўключэння цёмнай тэмы"</string>
<string name="hwui_force_dark_summary" msgid="6515748781487952769">"Змяняе наладу прымусовага ўключэння цёмнай тэмы на \"Заўсёды ўключана\""</string>
<string name="enable_blurs_on_windows_title" msgid="4218144213800778872">"Уключыць размыццё"</string>
@@ -5226,8 +5227,8 @@
<string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"самалёт, бяспека ў самалёце"</string>
<string name="calls_and_sms" msgid="1931855083959003306">"Выклікі і SMS"</string>
<string name="calls_and_sms_category" msgid="2021321997884906046">"Wi-Fi-тэлефанія"</string>
- <string name="calls_sms_wfc_summary" msgid="4930471357980272294">"Рабіце і атрымлівайце выклікі з выкарыстаннем сетак, якія не належаць аператарам, напрыклад Wi-Fi"</string>
- <string name="calls_sms_footnote" msgid="7002461875954024216">"Wi-Fi-тэлефанія дазваляе рабіць і прымаць выклікі праз сеткі, якія не належаць аператарам, напрыклад праз некаторыя сеткі Wi‑Fi."</string>
+ <string name="calls_sms_wfc_summary" msgid="3940529919408667336">"Рабіць і прымаць выклікі праз Wi‑Fi"</string>
+ <string name="calls_sms_footnote" msgid="8051604228144899434">"Wi-Fi-тэлефанія дазваляе рабіць і прымаць выклікі праз сеткі Wi-Fi, якія не належаць аператарам."</string>
<string name="calls_preference_title" msgid="7536882032182563800">"Выклікі"</string>
<string name="sms_preference_title" msgid="8392745501754864395">"SMS"</string>
<string name="calls_sms_preferred" msgid="6016477652522583496">"прыярытэтны"</string>
@@ -5246,10 +5247,10 @@
<string name="reset_internet_text" product="tablet" msgid="8797910368942544453">"Гэта дзеянне завершыць ваш выклік"</string>
<string name="resetting_internet_text" msgid="6696779371800051806">"Налады інтэрнэту скідваюцца…"</string>
<string name="fix_connectivity" msgid="2781433603228089501">"Выправіць праблему з падключэннем"</string>
- <!-- no translation found for airplane_mode_network_available (1059499681300395240) -->
- <skip />
- <!-- no translation found for to_switch_networks_disconnect_ethernet (6615374552827587197) -->
- <skip />
+ <string name="airplane_mode_network_available" msgid="1059499681300395240">"Сеткі даступныя ў рэжыме палёту"</string>
+ <string name="to_switch_networks_disconnect_ethernet" msgid="6615374552827587197">"Каб падключыцца да сетак, выключыце Ethernet"</string>
+ <string name="cannot_switch_networks_while_connected" msgid="3867944849171754777">"Пакуль падключана праз Ethernet, нельга пераключыць сетку"</string>
+ <string name="airplane_mode_network_panel_title" msgid="6385046104863403604">"Сеткі ў рэжыме палёту"</string>
<string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g> / <xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
<string name="mobile_data_connection_active" msgid="2422223108911581552">"Падключана"</string>
<string name="mobile_data_off_summary" msgid="3841411571485837651">"Аўтаматычнае падключэнне да інтэрнэту адсутнічае"</string>
@@ -5271,4 +5272,16 @@
<string name="category_name_others" msgid="2366006298768550310">"Іншае"</string>
<string name="category_name_general" msgid="7737273712848115886">"Агульныя налады"</string>
<string name="default_see_all_apps_title" msgid="7481113230662612178">"Паказаць усе праграмы"</string>
+ <string name="smart_forwarding_title" msgid="8368634861971949799">"Функцыя разумнай пераадрасацыі"</string>
+ <string name="smart_forwarding_summary_enabled" msgid="3341062878373185604">"Функцыя разумнай пераадрасацыі ўключана"</string>
+ <string name="smart_forwarding_summary_disabled" msgid="5033880700091914809">"Функцыя разумнай пераадрасацыі выключана"</string>
+ <string name="smart_forwarding_ongoing_title" msgid="962226849074401228">"Налады выклікаў"</string>
+ <string name="smart_forwarding_ongoing_text" msgid="2189209372407117114">"Абнаўляюцца налады…"</string>
+ <string name="smart_forwarding_failed_title" msgid="1859891191023516080">"Памылка налад выкліку"</string>
+ <string name="smart_forwarding_failed_text" msgid="5370431503707373653">"Памылка сеткі ці SIM-карты."</string>
+ <string name="smart_forwarding_failed_not_activated_text" msgid="997396203001257904">"SIM-карта не актывавана."</string>
+ <string name="smart_forwarding_input_mdn_title" msgid="5105463748849841763">"Увядзіце нумары тэлефона"</string>
+ <string name="smart_forwarding_input_mdn_dialog_title" msgid="7542216086697868415">"Увядзіце нумар тэлефона"</string>
+ <string name="smart_forwarding_missing_mdn_text" msgid="2907314684242542226">"Нумар тэлефона адсутнічае."</string>
+ <string name="smart_forwarding_missing_alert_dialog_text" msgid="7870419247987316112">"ОК"</string>
</resources>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index 523747c..e4dc16c 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -2267,8 +2267,7 @@
<item quantity="other">Запазени са <xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> слухови апарата</item>
<item quantity="one">Запазен е <xliff:g id="NUMBER_DEVICE_COUNT_0">%1$d</xliff:g> слухов апарат</item>
</plurals>
- <!-- no translation found for accessibility_audio_adjustment_title (1332113739136802997) -->
- <skip />
+ <string name="accessibility_audio_adjustment_title" msgid="1332113739136802997">"Коригиране на звука"</string>
<string name="accessibility_summary_shortcut_enabled" msgid="4030427268146752644">"Прекият път е включен"</string>
<string name="accessibility_summary_shortcut_disabled" msgid="564005462092499068">"Изкл."</string>
<string name="accessibility_summary_state_enabled" msgid="1065431632216039369">"Включено"</string>
@@ -2437,6 +2436,7 @@
<string name="bluetooth_on_time" msgid="8424625554628450028">"Време на включен Wi‑Fi"</string>
<string name="advanced_battery_title" msgid="3005993394776555079">"Използване на батерията"</string>
<string name="history_details_title" msgid="8628584613889559355">"История"</string>
+ <string name="advanced_battery_preference_title" msgid="6518802648205311326">"Преглед на използването на батерията"</string>
<string name="battery_details_title" msgid="4531369291819754178">"Използване на батерията"</string>
<string name="details_subtitle" msgid="2550872569652785527">"Подробности"</string>
<string name="controls_subtitle" msgid="3759606830916441564">"Настройване на захранването"</string>
@@ -4098,6 +4098,7 @@
<string name="usb_use" msgid="6783183432648438528">"Използване на USB за"</string>
<string name="usb_default_label" msgid="3372838450371060750">"Стандартна конфигурация за USB"</string>
<string name="usb_default_info" msgid="167172599497085266">"Тези настройки ще се прилагат, когато е установена връзка с друго устройство и телефонът ви е отключен. Свързвайте се само с надеждни устройства."</string>
+ <string name="usb_power_title" msgid="5602112548385798646">"Опции за захранването"</string>
<string name="usb_pref" msgid="8521832005703261700">"USB"</string>
<string name="usb_preference" msgid="5084550082591493765">"Предпочитания за USB"</string>
<string name="usb_control_title" msgid="1946791559052157693">"USB се контролира от"</string>
@@ -4937,8 +4938,8 @@
<string name="mobile_data_ap_mode_disabled" msgid="6067959496888990983">"Не е налице в самолетен режим"</string>
<string name="force_desktop_mode" msgid="1336913605091334238">"Принудително задаване на настолен режим"</string>
<string name="force_desktop_mode_summary" msgid="4587416867846930479">"Принудително задаване на експерименталния настолен режим на алтернативни дисплеи"</string>
- <string name="enable_sizecompat_freeform" msgid="3799755160777404309">"Непреоразмерими приложения в свободна форма: Акт."</string>
- <string name="enable_sizecompat_freeform_summary" msgid="1484050174538201499">"Разрешава на приложенията, които не могат да се преоразмеряват, да бъдат в свободна форма"</string>
+ <string name="enable_non_resizable_multi_window" msgid="6832903754625404477">"Активиране на непреоразмерими елементи в „Няколко прозореца“"</string>
+ <string name="enable_non_resizable_multi_window_summary" msgid="3275763753261901999">"Разрешава на приложенията, които не могат да се преоразмеряват, да бъдат в режим за няколко прозореца"</string>
<string name="hwui_force_dark_title" msgid="4256904905631994219">"Отмяна на налагането на тъмен режим"</string>
<string name="hwui_force_dark_summary" msgid="6515748781487952769">"Отменя постоянното включено състояние на функцията за налагане на тъмен режим"</string>
<string name="enable_blurs_on_windows_title" msgid="4218144213800778872">"Активира замъгляването"</string>
@@ -5060,8 +5061,8 @@
<string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"самолет, безопасно за използване по време на полет"</string>
<string name="calls_and_sms" msgid="1931855083959003306">"Обаждания и SMS"</string>
<string name="calls_and_sms_category" msgid="2021321997884906046">"Обаждания през Wi‑Fi"</string>
- <string name="calls_sms_wfc_summary" msgid="4930471357980272294">"Извършване и получаване на обаждания през мрежи, които не са на мобилни оператори, като например Wi-Fi мрежи"</string>
- <string name="calls_sms_footnote" msgid="7002461875954024216">"Функцията за обаждания през Wi-Fi ви дава възможност да извършвате и получавате обаждания през мрежи, които не са на мобилни оператори, като например някои Wi-Fi мрежи."</string>
+ <string name="calls_sms_wfc_summary" msgid="3940529919408667336">"Извършване и получаване на обаждания през Wi‑Fi"</string>
+ <string name="calls_sms_footnote" msgid="8051604228144899434">"Посредством функцията за обаждания през Wi-Fi повикванията се извършват и получават през Wi-Fi мрежи, които не са на мобилни оператори."</string>
<string name="calls_preference_title" msgid="7536882032182563800">"Обаждания"</string>
<string name="sms_preference_title" msgid="8392745501754864395">"SMS"</string>
<string name="calls_sms_preferred" msgid="6016477652522583496">"предпочитани"</string>
@@ -5082,6 +5083,8 @@
<string name="fix_connectivity" msgid="2781433603228089501">"Отстраняване на проблеми с връзката"</string>
<string name="airplane_mode_network_available" msgid="1059499681300395240">"Мрежите за самолетен режим са налице"</string>
<string name="to_switch_networks_disconnect_ethernet" msgid="6615374552827587197">"За да превключите мрежите, прекъснете връзката с Ethernet"</string>
+ <string name="cannot_switch_networks_while_connected" msgid="3867944849171754777">"Не може да се превключи към друга мрежа, докато сте свързани"</string>
+ <string name="airplane_mode_network_panel_title" msgid="6385046104863403604">"Мрежи за самолетен режим"</string>
<string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g>/<xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
<string name="mobile_data_connection_active" msgid="2422223108911581552">"Свързано"</string>
<string name="mobile_data_off_summary" msgid="3841411571485837651">"Няма автоматично да се установи връзка с интернет"</string>
@@ -5103,4 +5106,16 @@
<string name="category_name_others" msgid="2366006298768550310">"Други"</string>
<string name="category_name_general" msgid="7737273712848115886">"Общи"</string>
<string name="default_see_all_apps_title" msgid="7481113230662612178">"Вижте всички приложения"</string>
+ <string name="smart_forwarding_title" msgid="8368634861971949799">"Интелигентно препращане"</string>
+ <string name="smart_forwarding_summary_enabled" msgid="3341062878373185604">"Функцията „Интелигентно препращане“ е активирана"</string>
+ <string name="smart_forwarding_summary_disabled" msgid="5033880700091914809">"Функцията „Интелигентно препращане“ е деактивирана"</string>
+ <string name="smart_forwarding_ongoing_title" msgid="962226849074401228">"Настройки за обаждане"</string>
+ <string name="smart_forwarding_ongoing_text" msgid="2189209372407117114">"Настройките се актуализират…"</string>
+ <string name="smart_forwarding_failed_title" msgid="1859891191023516080">"Грешка в настройките за обаждане"</string>
+ <string name="smart_forwarding_failed_text" msgid="5370431503707373653">"Грешка в мрежата или SIM картата."</string>
+ <string name="smart_forwarding_failed_not_activated_text" msgid="997396203001257904">"SIM картата не е активирана."</string>
+ <string name="smart_forwarding_input_mdn_title" msgid="5105463748849841763">"Въведете телефонни номера"</string>
+ <string name="smart_forwarding_input_mdn_dialog_title" msgid="7542216086697868415">"Въведете телефонен номер"</string>
+ <string name="smart_forwarding_missing_mdn_text" msgid="2907314684242542226">"Липсва телефонен номер."</string>
+ <string name="smart_forwarding_missing_alert_dialog_text" msgid="7870419247987316112">"OK"</string>
</resources>
diff --git a/res/values-bn/strings.xml b/res/values-bn/strings.xml
index ceb2d12..f2a5f27 100644
--- a/res/values-bn/strings.xml
+++ b/res/values-bn/strings.xml
@@ -2267,8 +2267,7 @@
<item quantity="one"><xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g>টি সেভ করা হিয়ারিং এড</item>
<item quantity="other"><xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g>টি সেভ করা হিয়ারিং এড</item>
</plurals>
- <!-- no translation found for accessibility_audio_adjustment_title (1332113739136802997) -->
- <skip />
+ <string name="accessibility_audio_adjustment_title" msgid="1332113739136802997">"অডিও অ্যাডজাস্টমেন্ট"</string>
<string name="accessibility_summary_shortcut_enabled" msgid="4030427268146752644">"শর্টকাট চালু করুন"</string>
<string name="accessibility_summary_shortcut_disabled" msgid="564005462092499068">"বন্ধ করুন"</string>
<string name="accessibility_summary_state_enabled" msgid="1065431632216039369">"চালু"</string>
@@ -2437,6 +2436,7 @@
<string name="bluetooth_on_time" msgid="8424625554628450028">"ওয়াই-ফাই চালু থাকা মোট সময়"</string>
<string name="advanced_battery_title" msgid="3005993394776555079">"ব্যাটারির ব্যবহার"</string>
<string name="history_details_title" msgid="8628584613889559355">"ইতিহাস বিবরণ"</string>
+ <string name="advanced_battery_preference_title" msgid="6518802648205311326">"ব্যাটারির ব্যবহার দেখুন"</string>
<string name="battery_details_title" msgid="4531369291819754178">"ব্যাটারির ব্যবহার"</string>
<string name="details_subtitle" msgid="2550872569652785527">"বিবরণ ব্যবহার করুন"</string>
<string name="controls_subtitle" msgid="3759606830916441564">"বিদ্যুতের ব্যবহার সামঞ্জস্য করুন"</string>
@@ -4098,6 +4098,7 @@
<string name="usb_use" msgid="6783183432648438528">"এর জন্য USB ব্যবহার করুন"</string>
<string name="usb_default_label" msgid="3372838450371060750">"ডিফল্ট ইউএসবি কনফিগারেশন"</string>
<string name="usb_default_info" msgid="167172599497085266">"যখন অন্য একটি ডিভাইস কানেক্ট হয়ে আছে এবং আপনার ফোন আনলক অবস্থায় থাকে তখন এই সেটিংস প্রয়োগ করা হবে। শুধুমাত্র বিশ্বস্ত ডিভাইসগুলির সাথেই কানেক্ট করুন।"</string>
+ <string name="usb_power_title" msgid="5602112548385798646">"পাওয়ারের বিভিন্ন বিকল্প"</string>
<string name="usb_pref" msgid="8521832005703261700">"USB"</string>
<string name="usb_preference" msgid="5084550082591493765">"ইউএসবি অভিরুচি"</string>
<string name="usb_control_title" msgid="1946791559052157693">"ইউএসবি দ্বারা নিয়ন্ত্রিত"</string>
@@ -4937,8 +4938,8 @@
<string name="mobile_data_ap_mode_disabled" msgid="6067959496888990983">"বিমান মোডে উপলভ্য নয়"</string>
<string name="force_desktop_mode" msgid="1336913605091334238">"ফোর্স ডেস্কটপ মোড"</string>
<string name="force_desktop_mode_summary" msgid="4587416867846930479">"সেকেন্ডারি ডিসপ্লেতে ফোর্স এক্সপেরিমেন্টাল ডেস্কটপ মোড চালু করা আছে"</string>
- <string name="enable_sizecompat_freeform" msgid="3799755160777404309">"সাইজ দিয়ে কম্প্রেস করা থেকে ফ্রি-ফর্ম-মোডে চালু করুন"</string>
- <string name="enable_sizecompat_freeform_summary" msgid="1484050174538201499">"সাইজ অনুযায়ী কম্প্রেস করে রাখা অ্যাপগুলিকে ফ্রি-ফর্ম মোডে চালু করুন"</string>
+ <string name="enable_non_resizable_multi_window" msgid="6832903754625404477">"ছোট বড় করা যায় না এমন একাধিক উইন্ডো চালু করুন"</string>
+ <string name="enable_non_resizable_multi_window_summary" msgid="3275763753261901999">"একাধিক উইন্ডোয় ছোট বড় করা যায় না এমন অ্যাপের অনুমতি দিন"</string>
<string name="hwui_force_dark_title" msgid="4256904905631994219">"ফোর্স-ডার্ক ফিচার ওভাররাইড করুন"</string>
<string name="hwui_force_dark_summary" msgid="6515748781487952769">"ফোর্স-ডার্ক ফিচার চালু রাখার জন্য ওভাররাইড করা হয়"</string>
<string name="enable_blurs_on_windows_title" msgid="4218144213800778872">"ঝাপসা করে দেওয়া চালু করে"</string>
@@ -5060,8 +5061,8 @@
<string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"বিমান, বিমান-সুরক্ষা"</string>
<string name="calls_and_sms" msgid="1931855083959003306">"কল ও এসএমএস"</string>
<string name="calls_and_sms_category" msgid="2021321997884906046">"ওয়াই-ফাই কলিং"</string>
- <string name="calls_sms_wfc_summary" msgid="4930471357980272294">"ওয়াই-ফাই নেটওয়ার্কের মতো পরিষেবা প্রদানকারী নয় এমন নেটওয়ার্ক ব্যবহার করে কল করুন এবং কল রিসিভ করুন"</string>
- <string name="calls_sms_footnote" msgid="7002461875954024216">"ওয়াই-ফাই কলিংয়ের সাহায্যে ওয়াই-ফাই নেটওয়ার্কের মতো কিছু পরিষেবা প্রদানকারী নয় এমন নেটওয়ার্ক ব্যবহার করে কল করতে এবং কল রিসিভ করতে পারবেন।"</string>
+ <string name="calls_sms_wfc_summary" msgid="3940529919408667336">"ওয়াই-ফাই দিয়ে কল করুন ও কল ধরুন"</string>
+ <string name="calls_sms_footnote" msgid="8051604228144899434">"ওয়াই-ফাই কলিংয়ের সাহায্যে, পরিষেবা প্রদানকারী নয় এমন ওয়াই-ফাই নেটওয়ার্কে কল করা ও কল ধরা যাবে।"</string>
<string name="calls_preference_title" msgid="7536882032182563800">"কল"</string>
<string name="sms_preference_title" msgid="8392745501754864395">"এসএমএস"</string>
<string name="calls_sms_preferred" msgid="6016477652522583496">"পছন্দসই"</string>
@@ -5080,10 +5081,10 @@
<string name="reset_internet_text" product="tablet" msgid="8797910368942544453">"এর ফলে আপনার ফোন কলটি কেটে যাবে"</string>
<string name="resetting_internet_text" msgid="6696779371800051806">"ইন্টারনেট কানেকশন রিসেট করা হচ্ছে…"</string>
<string name="fix_connectivity" msgid="2781433603228089501">"কানেক্টিভিটি সংক্রান্ত সমস্যার সমাধান"</string>
- <!-- no translation found for airplane_mode_network_available (1059499681300395240) -->
- <skip />
- <!-- no translation found for to_switch_networks_disconnect_ethernet (6615374552827587197) -->
- <skip />
+ <string name="airplane_mode_network_available" msgid="1059499681300395240">"বিমান মোডে উপলভ্য নেটওয়ার্ক"</string>
+ <string name="to_switch_networks_disconnect_ethernet" msgid="6615374552827587197">"নেটওয়ার্ক বদলাতে ইথারনেট ডিসকানেক্ট করুন"</string>
+ <string name="cannot_switch_networks_while_connected" msgid="3867944849171754777">"কানেক্ট থাকার সময় অন্য নেটওয়ার্কে পরিবর্তন করা যাবে না"</string>
+ <string name="airplane_mode_network_panel_title" msgid="6385046104863403604">"বিমান মোড নেটওয়ার্ক"</string>
<string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g> / <xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
<string name="mobile_data_connection_active" msgid="2422223108911581552">"কানেক্ট করা আছে"</string>
<string name="mobile_data_off_summary" msgid="3841411571485837651">"ইন্টারনেট নিজে থেকে কানেক্ট হবে না"</string>
@@ -5105,4 +5106,16 @@
<string name="category_name_others" msgid="2366006298768550310">"অন্যান্য"</string>
<string name="category_name_general" msgid="7737273712848115886">"সাধারণ"</string>
<string name="default_see_all_apps_title" msgid="7481113230662612178">"সমস্ত অ্যাপ দেখুন"</string>
+ <string name="smart_forwarding_title" msgid="8368634861971949799">"স্মার্ট ফরওয়ার্ডিং"</string>
+ <string name="smart_forwarding_summary_enabled" msgid="3341062878373185604">"স্মার্ট ফরওয়ার্ডিং চালু আছে"</string>
+ <string name="smart_forwarding_summary_disabled" msgid="5033880700091914809">"স্মার্ট ফরওয়ার্ডিং বন্ধ আছে"</string>
+ <string name="smart_forwarding_ongoing_title" msgid="962226849074401228">"কল সেটিংস"</string>
+ <string name="smart_forwarding_ongoing_text" msgid="2189209372407117114">"সেটিংস আপডেট হচ্ছে…"</string>
+ <string name="smart_forwarding_failed_title" msgid="1859891191023516080">"কল সেটিংসে সমস্যা হয়েছে"</string>
+ <string name="smart_forwarding_failed_text" msgid="5370431503707373653">"নেটওয়ার্ক বা সিম কার্ডে সমস্যা হয়েছে।"</string>
+ <string name="smart_forwarding_failed_not_activated_text" msgid="997396203001257904">"সিম চালু নেই।"</string>
+ <string name="smart_forwarding_input_mdn_title" msgid="5105463748849841763">"ফোন নম্বর লিখুন"</string>
+ <string name="smart_forwarding_input_mdn_dialog_title" msgid="7542216086697868415">"ফোন নম্বর লিখুন"</string>
+ <string name="smart_forwarding_missing_mdn_text" msgid="2907314684242542226">"ফোন নম্বর নেই।"</string>
+ <string name="smart_forwarding_missing_alert_dialog_text" msgid="7870419247987316112">"ঠিক আছে"</string>
</resources>
diff --git a/res/values-bs/strings.xml b/res/values-bs/strings.xml
index 2933674..449b282 100644
--- a/res/values-bs/strings.xml
+++ b/res/values-bs/strings.xml
@@ -341,7 +341,7 @@
<string name="security_settings_face_enroll_education_title_unlock_disabled" msgid="8810954233979716906">"Koristite lice za autentifikaciju"</string>
<string name="security_settings_face_enroll_education_message" msgid="4308030157487176799"></string>
<string name="security_settings_face_enroll_education_start" msgid="8830924400907195590">"Započni"</string>
- <string name="security_settings_face_enroll_education_accessibility_dialog_message" msgid="4681495507974718824">"Ako je otključavanje licem za pristupačnost isključeno, neki koraci za postavljanje možda neće funkcionirati ispravno s Talkbackom."</string>
+ <string name="security_settings_face_enroll_education_accessibility_dialog_message" msgid="4681495507974718824">"Ako je otključavanje licem za pristupačnost isključeno, neki koraci za postavljanje možda neće funkcionirati ispravno s TalkBackom."</string>
<string name="security_settings_face_enroll_education_accessibility_dialog_negative" msgid="7872647360361245461">"Nazad"</string>
<string name="security_settings_face_enroll_education_accessibility_dialog_positive" msgid="3148077647572203458">"Nastavi postavljanje"</string>
<string name="security_settings_face_enroll_introduction_accessibility" msgid="5748221179069430975">"Koristi postavku za pristupačnost"</string>
@@ -552,17 +552,17 @@
<string name="fingerprint_unlock_set_unlock_pin" msgid="4724451168139460493">"Otisak prsta i PIN"</string>
<string name="fingerprint_unlock_set_unlock_password" msgid="5614333047430835971">"Otisak prsta i lozinka"</string>
<string name="fingerprint_unlock_skip_fingerprint" msgid="7631242444064287891">"Nastavi bez postavljanja otiska prsta"</string>
- <string name="fingerprint_unlock_title" msgid="4978686534505944042">"Možete otključati telefon pomoću otiska prsta. Iz sigurnosnih razloga, ova opcija zahtijeva alternativni način zaključavanja ekrana."</string>
+ <string name="fingerprint_unlock_title" msgid="4978686534505944042">"Možete otključati telefon pomoću otiska prsta. Iz sigurnosnih razloga ova opcija zahtijeva alternativni način zaključavanja ekrana."</string>
<string name="face_unlock_set_unlock_pattern" msgid="5991691559532427891">"Otključavanje licem + uzorak"</string>
<string name="face_unlock_set_unlock_pin" msgid="8990569318587034610">"Otključavanje licem + PIN"</string>
<string name="face_unlock_set_unlock_password" msgid="8612535943511761549">"Otključavanje licem + lozinka"</string>
<string name="face_unlock_skip_face" msgid="7117201898540606846">"Nastavite s otključavanjem licem"</string>
- <string name="face_unlock_title" msgid="7344830351598247267">"Možete otključati telefon pomoću svog lica. Iz sigurnosnih razloga, ova opcija zahtijeva alternativni način zaključavanja ekrana."</string>
+ <string name="face_unlock_title" msgid="7344830351598247267">"Možete otključati telefon pomoću svog lica. Iz sigurnosnih razloga ova opcija zahtijeva alternativni način zaključavanja ekrana."</string>
<string name="biometrics_unlock_set_unlock_pattern" msgid="8871485472202659">"Biometrija + uzorak"</string>
<string name="biometrics_unlock_set_unlock_pin" msgid="1729940978662427512">"Biometrija + PIN"</string>
<string name="biometrics_unlock_set_unlock_password" msgid="5368133215008755916">"Biometrija + lozinka"</string>
<string name="biometrics_unlock_skip_biometrics" msgid="8260715582785687329">"Nastavite bez biometrije"</string>
- <string name="biometrics_unlock_title" msgid="7769374223959937435">"Telefon možete otključati pomoću biometrije. Iz sigurnosnih razloga, ova opcija zahtijeva rezervni način zaključavanja ekrana."</string>
+ <string name="biometrics_unlock_title" msgid="7769374223959937435">"Telefon možete otključati pomoću biometrije. Iz sigurnosnih razloga ova opcija zahtijeva rezervni način zaključavanja ekrana."</string>
<string name="unlock_set_unlock_disabled_summary" msgid="4022867760387966129">"Onemogućio administrator, pravila šifriranja ili pohrana akreditiva"</string>
<string name="unlock_set_unlock_mode_off" msgid="4632139864722236359">"Ništa"</string>
<string name="unlock_set_unlock_mode_none" msgid="5596049938457028214">"Prevlačenje prstom"</string>
@@ -2165,7 +2165,7 @@
<string name="user_installed_services_category_title" msgid="2639470729311439731">"Preuzete aplikacije"</string>
<string name="experimental_category_title" msgid="898904396646344152">"Eksperimentalno"</string>
<string name="feature_flags_dashboard_title" msgid="348990373716658289">"Oznake funkcija"</string>
- <string name="talkback_title" msgid="8756080454514251327">"Talkback"</string>
+ <string name="talkback_title" msgid="8756080454514251327">"TalkBack"</string>
<string name="talkback_summary" msgid="5820927220378864281">"Čitač ekrana prvenstveno za slijepe i slabovidne osobe"</string>
<string name="select_to_speak_summary" msgid="1995285446766920925">"Dodirnite stavke na ekranu da se naglas pročitaju"</string>
<string name="accessibility_captioning_title" msgid="4561871958958925225">"Postavke titlova"</string>
@@ -2467,6 +2467,7 @@
<string name="bluetooth_on_time" msgid="8424625554628450028">"Wi‑Fi na vrijeme"</string>
<string name="advanced_battery_title" msgid="3005993394776555079">"Potrošnja baterije"</string>
<string name="history_details_title" msgid="8628584613889559355">"Detalji historije"</string>
+ <string name="advanced_battery_preference_title" msgid="6518802648205311326">"Prikaži potrošnju baterije"</string>
<string name="battery_details_title" msgid="4531369291819754178">"Potrošnja baterije"</string>
<string name="details_subtitle" msgid="2550872569652785527">"Detalji o upotrebi"</string>
<string name="controls_subtitle" msgid="3759606830916441564">"Podesite potrošnju energije"</string>
@@ -4159,6 +4160,7 @@
<string name="usb_use" msgid="6783183432648438528">"Koristite USB za"</string>
<string name="usb_default_label" msgid="3372838450371060750">"Zadana USB konfiguracija"</string>
<string name="usb_default_info" msgid="167172599497085266">"Kada se poveže drugi uređaj i vaš telefon je otključan, primijenit će se ove postavke. Povežite se samo s pouzdanim uređajima."</string>
+ <string name="usb_power_title" msgid="5602112548385798646">"Opcije napajanja"</string>
<string name="usb_pref" msgid="8521832005703261700">"USB"</string>
<string name="usb_preference" msgid="5084550082591493765">"Postavke USB-a"</string>
<string name="usb_control_title" msgid="1946791559052157693">"USB-om upravlja"</string>
@@ -5017,8 +5019,8 @@
<string name="mobile_data_ap_mode_disabled" msgid="6067959496888990983">"Nije dostupno dok je aktiviran način rada u avionu"</string>
<string name="force_desktop_mode" msgid="1336913605091334238">"Nametni način rada na računaru"</string>
<string name="force_desktop_mode_summary" msgid="4587416867846930479">"Nametanje eksperimentalnog načina rada na računaru na sekundarnim ekranima"</string>
- <string name="enable_sizecompat_freeform" msgid="3799755160777404309">"Omogući slobodni oblik aplikacija nepromenljive veličine"</string>
- <string name="enable_sizecompat_freeform_summary" msgid="1484050174538201499">"Omogućava aplikacijama nepromenljive veličine da budu u slobodnom obliku"</string>
+ <string name="enable_non_resizable_multi_window" msgid="6832903754625404477">"Omogućite apl. nepromjenjive veličine u višestrukom prozoru"</string>
+ <string name="enable_non_resizable_multi_window_summary" msgid="3275763753261901999">"Omogućava prikaz aplikacija nepromjenjive veličine u višestrukom prozoru"</string>
<string name="hwui_force_dark_title" msgid="4256904905631994219">"Nadjačaj nametanje tamne teme"</string>
<string name="hwui_force_dark_summary" msgid="6515748781487952769">"Nadjačava funkciju nametanja tamne teme tako da je uvijek uključena"</string>
<string name="enable_blurs_on_windows_title" msgid="4218144213800778872">"Omogući zamućivanje"</string>
@@ -5142,8 +5144,8 @@
<string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"avion, sigurno za rad u avionu"</string>
<string name="calls_and_sms" msgid="1931855083959003306">"Pozivi i SMS"</string>
<string name="calls_and_sms_category" msgid="2021321997884906046">"Pozivanje putem WiFi-ja"</string>
- <string name="calls_sms_wfc_summary" msgid="4930471357980272294">"Uspostavljajte i primajte pozive putem mreža koje ne pripadaju mobilnom operateru, kao što je WiFi"</string>
- <string name="calls_sms_footnote" msgid="7002461875954024216">"Pozivanje putem WiFi-ja vam omogućava da uspostavite i primate pozive putem mreža koje ne pripadaju mobilnom operateru, kao što su neke WiFi mreže."</string>
+ <string name="calls_sms_wfc_summary" msgid="3940529919408667336">"Uspostavljajte i primajte pozive putem WiFi mreže"</string>
+ <string name="calls_sms_footnote" msgid="8051604228144899434">"Uz Pozivanje putem WiFi-ja, pozivi se uspostavljaju i primaju putem WiFi mreža koje ne pripadaju mobilnom operateru."</string>
<string name="calls_preference_title" msgid="7536882032182563800">"Pozivi"</string>
<string name="sms_preference_title" msgid="8392745501754864395">"SMS"</string>
<string name="calls_sms_preferred" msgid="6016477652522583496">"preferirano"</string>
@@ -5162,10 +5164,10 @@
<string name="reset_internet_text" product="tablet" msgid="8797910368942544453">"Ovim će se prekinuti vaš telefonski poziv"</string>
<string name="resetting_internet_text" msgid="6696779371800051806">"Vraćanje internetske veze na zadano…"</string>
<string name="fix_connectivity" msgid="2781433603228089501">"Popravi povezivost"</string>
- <!-- no translation found for airplane_mode_network_available (1059499681300395240) -->
- <skip />
- <!-- no translation found for to_switch_networks_disconnect_ethernet (6615374552827587197) -->
- <skip />
+ <string name="airplane_mode_network_available" msgid="1059499681300395240">"Dostupne su mreže za način rada u zrakoplovu"</string>
+ <string name="to_switch_networks_disconnect_ethernet" msgid="6615374552827587197">"Da biste se prebacili na drugu mrežu, odspojite ethernet"</string>
+ <string name="cannot_switch_networks_while_connected" msgid="3867944849171754777">"Nije moguće promijeniti mreže kada ste povezani"</string>
+ <string name="airplane_mode_network_panel_title" msgid="6385046104863403604">"Mreže za način rada u avionu"</string>
<string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g>/<xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
<string name="mobile_data_connection_active" msgid="2422223108911581552">"Povezano"</string>
<string name="mobile_data_off_summary" msgid="3841411571485837651">"Nije se moguće automatski povezati s internetom"</string>
@@ -5187,4 +5189,16 @@
<string name="category_name_others" msgid="2366006298768550310">"Ostalo"</string>
<string name="category_name_general" msgid="7737273712848115886">"Općenito"</string>
<string name="default_see_all_apps_title" msgid="7481113230662612178">"Pogledajte sve aplikacije"</string>
+ <string name="smart_forwarding_title" msgid="8368634861971949799">"Pametno prosljeđivanje"</string>
+ <string name="smart_forwarding_summary_enabled" msgid="3341062878373185604">"Pametno prosljeđivanje je omogućeno"</string>
+ <string name="smart_forwarding_summary_disabled" msgid="5033880700091914809">"Pametno prosljeđivanje je onemogućeno"</string>
+ <string name="smart_forwarding_ongoing_title" msgid="962226849074401228">"Postavke poziva"</string>
+ <string name="smart_forwarding_ongoing_text" msgid="2189209372407117114">"Ažuriranje postavki..."</string>
+ <string name="smart_forwarding_failed_title" msgid="1859891191023516080">"Greška u postavkama poziva"</string>
+ <string name="smart_forwarding_failed_text" msgid="5370431503707373653">"Greška na mreži ili SIM kartici."</string>
+ <string name="smart_forwarding_failed_not_activated_text" msgid="997396203001257904">"SIM nije aktiviran."</string>
+ <string name="smart_forwarding_input_mdn_title" msgid="5105463748849841763">"Unesite brojeve telefona"</string>
+ <string name="smart_forwarding_input_mdn_dialog_title" msgid="7542216086697868415">"Unesite broj telefona"</string>
+ <string name="smart_forwarding_missing_mdn_text" msgid="2907314684242542226">"Broj telefona nedostaje."</string>
+ <string name="smart_forwarding_missing_alert_dialog_text" msgid="7870419247987316112">"Uredu"</string>
</resources>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index dbd7059..6bc2519 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -2267,8 +2267,7 @@
<item quantity="other">S\'han desat <xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> audiòfons</item>
<item quantity="one">S\'ha desat <xliff:g id="NUMBER_DEVICE_COUNT_0">%1$d</xliff:g> audiòfon</item>
</plurals>
- <!-- no translation found for accessibility_audio_adjustment_title (1332113739136802997) -->
- <skip />
+ <string name="accessibility_audio_adjustment_title" msgid="1332113739136802997">"Ajust d\'àudio"</string>
<string name="accessibility_summary_shortcut_enabled" msgid="4030427268146752644">"Drecera activada"</string>
<string name="accessibility_summary_shortcut_disabled" msgid="564005462092499068">"Desactivat"</string>
<string name="accessibility_summary_state_enabled" msgid="1065431632216039369">"Activat"</string>
@@ -2437,6 +2436,7 @@
<string name="bluetooth_on_time" msgid="8424625554628450028">"Wi-Fi a temps"</string>
<string name="advanced_battery_title" msgid="3005993394776555079">"Ús de la bateria"</string>
<string name="history_details_title" msgid="8628584613889559355">"Detalls de l\'historial"</string>
+ <string name="advanced_battery_preference_title" msgid="6518802648205311326">"Mostra l\'ús de la bateria"</string>
<string name="battery_details_title" msgid="4531369291819754178">"Ús de la bateria"</string>
<string name="details_subtitle" msgid="2550872569652785527">"Detalls d\'ús"</string>
<string name="controls_subtitle" msgid="3759606830916441564">"Redueix el consum de la bateria"</string>
@@ -2802,7 +2802,7 @@
<string name="background_data" msgid="321903213000101158">"Dades en segon pla"</string>
<string name="background_data_summary" msgid="6572245922513522466">"Les aplicacions poden sincronitzar, enviar i rebre dades en qualsevol moment"</string>
<string name="background_data_dialog_title" msgid="1692005302993229867">"Desactiva dades segon pla?"</string>
- <string name="background_data_dialog_message" msgid="7760280837612824670">"Desactivar les dades en segon pla augmenta la durada de la bateria i disminueix l\'ús de dades. És possible que algunes aplicacions continuïn utilitzant la connexió de dades en segon pla."</string>
+ <string name="background_data_dialog_message" msgid="7760280837612824670">"Desactivar les dades en segon pla allarga la durada de la bateria i disminueix l\'ús de dades. És possible que algunes aplicacions continuïn utilitzant la connexió de dades en segon pla."</string>
<string name="sync_automatically" msgid="4874122892765430304">"Sincronitza dades aplicacions autom."</string>
<string name="sync_enabled" msgid="5794103781356455043">"Sincronització activa"</string>
<string name="sync_disabled" msgid="1636223106968593391">"Sincronització desactivada"</string>
@@ -3315,7 +3315,7 @@
<string name="keywords_display_adaptive_sleep" msgid="8003895686008403685">"pantalla atenuada, repòs, bateria, temps d\'espera, atenció, pantalla, inactivitat"</string>
<string name="keywords_auto_rotate" msgid="7914655570000378975">"gir, canvi, rotació, retrat, paisatge, orientació, vertical, horitzontal"</string>
<string name="keywords_system_update_settings" msgid="5769003488814164931">"actualitzar, android"</string>
- <string name="keywords_zen_mode_settings" msgid="7810203406522669584">"no molestis, programar, notificacions, bloqueig, silenci, vibrar, mentre dormo, mentre treballo, concentració, so, silenciar, dia, dia laborable, cap de setmana, nit entre setmana, esdeveniment"</string>
+ <string name="keywords_zen_mode_settings" msgid="7810203406522669584">"no molestis, programar, notificacions, bloqueig, silenci, vibrar, mentre dormo, mentre treballo, concentració, so, silenciar, dia, dia laborable, dia entre setmana, cap de setmana, nit entre setmana, esdeveniment"</string>
<string name="keywords_screen_timeout" msgid="8921857020437540572">"pantalla, temps de bloqueig, temps d\'espera, pantalla de bloqueig"</string>
<string name="keywords_storage_settings" msgid="6018856193950281898">"memòria, memòria cau, dades, suprimir, esborrar, alliberar, espai"</string>
<string name="keywords_bluetooth_settings" msgid="2588159530959868188">"connectat, dispositiu, auriculars, auriculars amb micro, altaveu, sense fil, vincular, música, multimèdia"</string>
@@ -4098,6 +4098,7 @@
<string name="usb_use" msgid="6783183432648438528">"Utilitza l\'USB per a"</string>
<string name="usb_default_label" msgid="3372838450371060750">"Configuració d\'USB predeterminada"</string>
<string name="usb_default_info" msgid="167172599497085266">"Quan hi ha un altre dispositiu connectat i el telèfon està desbloquejat, s\'aplica aquesta configuració. Connecta\'t només a dispositius de confiança."</string>
+ <string name="usb_power_title" msgid="5602112548385798646">"Opcions d\'engegada"</string>
<string name="usb_pref" msgid="8521832005703261700">"USB"</string>
<string name="usb_preference" msgid="5084550082591493765">"Preferències d\'USB"</string>
<string name="usb_control_title" msgid="1946791559052157693">"USB controlat per"</string>
@@ -4937,8 +4938,8 @@
<string name="mobile_data_ap_mode_disabled" msgid="6067959496888990983">"No disponible en mode d\'avió"</string>
<string name="force_desktop_mode" msgid="1336913605091334238">"Força el mode d\'escriptori"</string>
<string name="force_desktop_mode_summary" msgid="4587416867846930479">"Força el mode d\'escriptori experimental en pantalles secundàries"</string>
- <string name="enable_sizecompat_freeform" msgid="3799755160777404309">"Activa les apps de mida compatible amb format lliure"</string>
- <string name="enable_sizecompat_freeform_summary" msgid="1484050174538201499">"Permet que les aplicacions de mida compatible tinguin un format lliure"</string>
+ <string name="enable_non_resizable_multi_window" msgid="6832903754625404477">"Activa la mida no ajustable al mode multifinestra"</string>
+ <string name="enable_non_resizable_multi_window_summary" msgid="3275763753261901999">"Permet les aplicacions de mida no ajustable al mode multifinestra"</string>
<string name="hwui_force_dark_title" msgid="4256904905631994219">"Substitueix forçar el mode fosc"</string>
<string name="hwui_force_dark_summary" msgid="6515748781487952769">"Substitueix la funció forçar el mode fosc perquè estigui sempre activada"</string>
<string name="enable_blurs_on_windows_title" msgid="4218144213800778872">"Activa el desenfocament"</string>
@@ -5060,8 +5061,8 @@
<string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"mode d\'avió, segur per al mode d\'avió"</string>
<string name="calls_and_sms" msgid="1931855083959003306">"Trucades i SMS"</string>
<string name="calls_and_sms_category" msgid="2021321997884906046">"Trucades per Wi‑Fi"</string>
- <string name="calls_sms_wfc_summary" msgid="4930471357980272294">"Fes i rep trucades per xarxes sense operador, com ara una Wi‑Fi"</string>
- <string name="calls_sms_footnote" msgid="7002461875954024216">"La funció Trucades per Wi‑Fi et permet fer i rebre trucades per xarxes sense operador, com ara algunes xarxes Wi‑Fi."</string>
+ <string name="calls_sms_wfc_summary" msgid="3940529919408667336">"Fes i rep trucades per Wi‑Fi"</string>
+ <string name="calls_sms_footnote" msgid="8051604228144899434">"Amb la funció Trucades per Wi‑Fi, pots fer i rebre trucades per xarxes Wi‑Fi sense operador."</string>
<string name="calls_preference_title" msgid="7536882032182563800">"Trucades"</string>
<string name="sms_preference_title" msgid="8392745501754864395">"SMS"</string>
<string name="calls_sms_preferred" msgid="6016477652522583496">"preferit"</string>
@@ -5080,10 +5081,10 @@
<string name="reset_internet_text" product="tablet" msgid="8797910368942544453">"Aquesta acció finalitzarà la trucada"</string>
<string name="resetting_internet_text" msgid="6696779371800051806">"S\'està restablint la connexió a Internet…"</string>
<string name="fix_connectivity" msgid="2781433603228089501">"Corregeix la connectivitat"</string>
- <!-- no translation found for airplane_mode_network_available (1059499681300395240) -->
- <skip />
- <!-- no translation found for to_switch_networks_disconnect_ethernet (6615374552827587197) -->
- <skip />
+ <string name="airplane_mode_network_available" msgid="1059499681300395240">"Hi ha xarxes en mode d\'avió disponibles"</string>
+ <string name="to_switch_networks_disconnect_ethernet" msgid="6615374552827587197">"Per canviar de xarxa, desconnecta la connexió Ethernet"</string>
+ <string name="cannot_switch_networks_while_connected" msgid="3867944849171754777">"No es pot canviar de xarxa quan el dispositiu està connectat"</string>
+ <string name="airplane_mode_network_panel_title" msgid="6385046104863403604">"Xarxes en mode d\'avió"</string>
<string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g> / <xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
<string name="mobile_data_connection_active" msgid="2422223108911581552">"Connectat"</string>
<string name="mobile_data_off_summary" msgid="3841411571485837651">"No es connectarà automàticament a Internet"</string>
@@ -5105,4 +5106,16 @@
<string name="category_name_others" msgid="2366006298768550310">"Altres"</string>
<string name="category_name_general" msgid="7737273712848115886">"General"</string>
<string name="default_see_all_apps_title" msgid="7481113230662612178">"Mostra totes les aplicacions"</string>
+ <string name="smart_forwarding_title" msgid="8368634861971949799">"Desviació intel·ligent"</string>
+ <string name="smart_forwarding_summary_enabled" msgid="3341062878373185604">"S\'ha activat la desviació intel·ligent"</string>
+ <string name="smart_forwarding_summary_disabled" msgid="5033880700091914809">"S\'ha desactivat la desviació intel·ligent"</string>
+ <string name="smart_forwarding_ongoing_title" msgid="962226849074401228">"Configuració de trucades"</string>
+ <string name="smart_forwarding_ongoing_text" msgid="2189209372407117114">"S\'està actualitzant la configuració..."</string>
+ <string name="smart_forwarding_failed_title" msgid="1859891191023516080">"Error de configuració de trucada"</string>
+ <string name="smart_forwarding_failed_text" msgid="5370431503707373653">"Error de la xarxa o de la targeta SIM."</string>
+ <string name="smart_forwarding_failed_not_activated_text" msgid="997396203001257904">"La SIM no està activada."</string>
+ <string name="smart_forwarding_input_mdn_title" msgid="5105463748849841763">"Introdueix números de telèfon"</string>
+ <string name="smart_forwarding_input_mdn_dialog_title" msgid="7542216086697868415">"Introdueix un número de telèfon"</string>
+ <string name="smart_forwarding_missing_mdn_text" msgid="2907314684242542226">"Falta el número de telèfon."</string>
+ <string name="smart_forwarding_missing_alert_dialog_text" msgid="7870419247987316112">"D\'acord"</string>
</resources>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index d4b7eb9..52fa3f3 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -2317,8 +2317,7 @@
<item quantity="other"><xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> uložených naslouchátek</item>
<item quantity="one"><xliff:g id="NUMBER_DEVICE_COUNT_0">%1$d</xliff:g> uložené naslouchátko</item>
</plurals>
- <!-- no translation found for accessibility_audio_adjustment_title (1332113739136802997) -->
- <skip />
+ <string name="accessibility_audio_adjustment_title" msgid="1332113739136802997">"Úprava zvuku"</string>
<string name="accessibility_summary_shortcut_enabled" msgid="4030427268146752644">"Zkratka zapnuta"</string>
<string name="accessibility_summary_shortcut_disabled" msgid="564005462092499068">"Vypnuto"</string>
<string name="accessibility_summary_state_enabled" msgid="1065431632216039369">"Zapnuto"</string>
@@ -2499,6 +2498,7 @@
<string name="bluetooth_on_time" msgid="8424625554628450028">"Doba provozu modulu Wi-Fi"</string>
<string name="advanced_battery_title" msgid="3005993394776555079">"Využití baterie"</string>
<string name="history_details_title" msgid="8628584613889559355">"Podrobnosti historie"</string>
+ <string name="advanced_battery_preference_title" msgid="6518802648205311326">"Zobrazit využití baterie"</string>
<string name="battery_details_title" msgid="4531369291819754178">"Využití baterie"</string>
<string name="details_subtitle" msgid="2550872569652785527">"Podrobnosti využívání"</string>
<string name="controls_subtitle" msgid="3759606830916441564">"Upravit spotřebu energie"</string>
@@ -4222,6 +4222,7 @@
<string name="usb_use" msgid="6783183432648438528">"Použití USB:"</string>
<string name="usb_default_label" msgid="3372838450371060750">"Výchozí konfigurace USB"</string>
<string name="usb_default_info" msgid="167172599497085266">"Tato nastavení se použijí, když bude telefon odemknut a připojí se jiné zařízení. Připojujte pouze důvěryhodná zařízení."</string>
+ <string name="usb_power_title" msgid="5602112548385798646">"Možnosti napájení"</string>
<string name="usb_pref" msgid="8521832005703261700">"USB"</string>
<string name="usb_preference" msgid="5084550082591493765">"Předvolby USB"</string>
<string name="usb_control_title" msgid="1946791559052157693">"USB ovládá:"</string>
@@ -5099,8 +5100,8 @@
<string name="mobile_data_ap_mode_disabled" msgid="6067959496888990983">"V režimu Letadlo nedostupné"</string>
<string name="force_desktop_mode" msgid="1336913605091334238">"Vynutit režim počítače"</string>
<string name="force_desktop_mode_summary" msgid="4587416867846930479">"Vynutit na sekundárních displejích experimentální režim počítače"</string>
- <string name="enable_sizecompat_freeform" msgid="3799755160777404309">"Povolit volný tvar u kompatibility rozměru"</string>
- <string name="enable_sizecompat_freeform_summary" msgid="1484050174538201499">"Umožňuje, aby aplikace s kompatibilitou rozměru měly volný tvar"</string>
+ <string name="enable_non_resizable_multi_window" msgid="6832903754625404477">"Aktivovat neměnnou velikost v režimu několika oken"</string>
+ <string name="enable_non_resizable_multi_window_summary" msgid="3275763753261901999">"Povolí aplikace s neměnnou velikostí v režimu několika oken"</string>
<string name="hwui_force_dark_title" msgid="4256904905631994219">"Přepsat vynucení tmavého režimu"</string>
<string name="hwui_force_dark_summary" msgid="6515748781487952769">"Přepíše vynucení stálého zapnutí tmavého režimu"</string>
<string name="enable_blurs_on_windows_title" msgid="4218144213800778872">"Povolit rozmazání"</string>
@@ -5226,8 +5227,8 @@
<string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"letadlo, bezpečné v letadle"</string>
<string name="calls_and_sms" msgid="1931855083959003306">"Volání a SMS"</string>
<string name="calls_and_sms_category" msgid="2021321997884906046">"Volání přes Wi‑Fi"</string>
- <string name="calls_sms_wfc_summary" msgid="4930471357980272294">"Uskutečňujte a přijímejte hovory přes sítě nespravované operátory, např. přes Wi-Fi"</string>
- <string name="calls_sms_footnote" msgid="7002461875954024216">"Volání přes Wi-Fi umožňuje uskutečňovat a přijímat hovory ze sítí nespravované operátory, jako jsou některé sítě Wi-Fi."</string>
+ <string name="calls_sms_wfc_summary" msgid="3940529919408667336">"Uskutečňujte a přijímejte hovory přes Wi-Fi"</string>
+ <string name="calls_sms_footnote" msgid="8051604228144899434">"Volání přes Wi-Fi využívá sítě Wi-Fi, které nepatří operátorovi."</string>
<string name="calls_preference_title" msgid="7536882032182563800">"Volání"</string>
<string name="sms_preference_title" msgid="8392745501754864395">"SMS"</string>
<string name="calls_sms_preferred" msgid="6016477652522583496">"preferované"</string>
@@ -5246,10 +5247,10 @@
<string name="reset_internet_text" product="tablet" msgid="8797910368942544453">"Telefonní hovor bude ukončen"</string>
<string name="resetting_internet_text" msgid="6696779371800051806">"Resetování internetu…"</string>
<string name="fix_connectivity" msgid="2781433603228089501">"Opravit připojení"</string>
- <!-- no translation found for airplane_mode_network_available (1059499681300395240) -->
- <skip />
- <!-- no translation found for to_switch_networks_disconnect_ethernet (6615374552827587197) -->
- <skip />
+ <string name="airplane_mode_network_available" msgid="1059499681300395240">"Sítě dostupné v režimu Letadlo"</string>
+ <string name="to_switch_networks_disconnect_ethernet" msgid="6615374552827587197">"Pokud chcete přepnout sítě, odpojte ethernet"</string>
+ <string name="cannot_switch_networks_while_connected" msgid="3867944849171754777">"Při připojení nelze změnit síť"</string>
+ <string name="airplane_mode_network_panel_title" msgid="6385046104863403604">"Sítě v režimu Letadlo"</string>
<string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g> / <xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
<string name="mobile_data_connection_active" msgid="2422223108911581552">"Připojeno"</string>
<string name="mobile_data_off_summary" msgid="3841411571485837651">"Internet se nebude automaticky připojovat"</string>
@@ -5271,4 +5272,16 @@
<string name="category_name_others" msgid="2366006298768550310">"Jiné"</string>
<string name="category_name_general" msgid="7737273712848115886">"Obecné"</string>
<string name="default_see_all_apps_title" msgid="7481113230662612178">"Zobrazit všechny aplikace"</string>
+ <string name="smart_forwarding_title" msgid="8368634861971949799">"Chytré přesměrování"</string>
+ <string name="smart_forwarding_summary_enabled" msgid="3341062878373185604">"Chytré přesměrování je aktivováno"</string>
+ <string name="smart_forwarding_summary_disabled" msgid="5033880700091914809">"Chytré přesměrování není aktivováno"</string>
+ <string name="smart_forwarding_ongoing_title" msgid="962226849074401228">"Nastavení hovorů"</string>
+ <string name="smart_forwarding_ongoing_text" msgid="2189209372407117114">"Probíhá aktualizace nastavení…"</string>
+ <string name="smart_forwarding_failed_title" msgid="1859891191023516080">"Chyba nastavení hovorů"</string>
+ <string name="smart_forwarding_failed_text" msgid="5370431503707373653">"Došlo k chybě sítě nebo SIM karty."</string>
+ <string name="smart_forwarding_failed_not_activated_text" msgid="997396203001257904">"SIM karta není aktivována."</string>
+ <string name="smart_forwarding_input_mdn_title" msgid="5105463748849841763">"Zadejte telefonní čísla"</string>
+ <string name="smart_forwarding_input_mdn_dialog_title" msgid="7542216086697868415">"Zadejte telefonní číslo"</string>
+ <string name="smart_forwarding_missing_mdn_text" msgid="2907314684242542226">"Chybí telefonní číslo."</string>
+ <string name="smart_forwarding_missing_alert_dialog_text" msgid="7870419247987316112">"OK"</string>
</resources>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 1887047..1cd3322 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -2267,8 +2267,7 @@
<item quantity="one"><xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> gemt høreapparat</item>
<item quantity="other"><xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> gemte høreapparater</item>
</plurals>
- <!-- no translation found for accessibility_audio_adjustment_title (1332113739136802997) -->
- <skip />
+ <string name="accessibility_audio_adjustment_title" msgid="1332113739136802997">"Lydjustering"</string>
<string name="accessibility_summary_shortcut_enabled" msgid="4030427268146752644">"Genvejen er aktiveret"</string>
<string name="accessibility_summary_shortcut_disabled" msgid="564005462092499068">"Fra"</string>
<string name="accessibility_summary_state_enabled" msgid="1065431632216039369">"Til"</string>
@@ -2437,6 +2436,7 @@
<string name="bluetooth_on_time" msgid="8424625554628450028">"Wi-Fi til tiden"</string>
<string name="advanced_battery_title" msgid="3005993394776555079">"Batteriforbrug"</string>
<string name="history_details_title" msgid="8628584613889559355">"Detaljeret historik"</string>
+ <string name="advanced_battery_preference_title" msgid="6518802648205311326">"Se batteriforbrug"</string>
<string name="battery_details_title" msgid="4531369291819754178">"Batteriforbrug"</string>
<string name="details_subtitle" msgid="2550872569652785527">"Brugsdetaljer"</string>
<string name="controls_subtitle" msgid="3759606830916441564">"Juster strømforbrug"</string>
@@ -4098,6 +4098,7 @@
<string name="usb_use" msgid="6783183432648438528">"Brug USB til"</string>
<string name="usb_default_label" msgid="3372838450371060750">"Standardkonfiguration for USB"</string>
<string name="usb_default_info" msgid="167172599497085266">"Disse indstillinger anvendes, når der er oprettet forbindelse til en anden enhed, og din telefon er ulåst. Opret kun forbindelse til godkendte enheder."</string>
+ <string name="usb_power_title" msgid="5602112548385798646">"Indstillinger for afbryderknappen"</string>
<string name="usb_pref" msgid="8521832005703261700">"USB"</string>
<string name="usb_preference" msgid="5084550082591493765">"USB-præferencer"</string>
<string name="usb_control_title" msgid="1946791559052157693">"USB styres af"</string>
@@ -4937,8 +4938,8 @@
<string name="mobile_data_ap_mode_disabled" msgid="6067959496888990983">"Der er ingen forbindelse i flytilstand"</string>
<string name="force_desktop_mode" msgid="1336913605091334238">"Gennemtving skrivebordstilstand"</string>
<string name="force_desktop_mode_summary" msgid="4587416867846930479">"Gennemtving eksperimentel skrivebordstilstand på sekundære skærme"</string>
- <string name="enable_sizecompat_freeform" msgid="3799755160777404309">"Aktivér frit format for sizecompat"</string>
- <string name="enable_sizecompat_freeform_summary" msgid="1484050174538201499">"Tillad, at sizecompat-apps har frit format"</string>
+ <string name="enable_non_resizable_multi_window" msgid="6832903754625404477">"Aktivér app, hvis størrelse ikke kan justeres, i multivindue"</string>
+ <string name="enable_non_resizable_multi_window_summary" msgid="3275763753261901999">"Tillader, at apps, hvis størrelse ikke kan justeres, kan være i et multivindue"</string>
<string name="hwui_force_dark_title" msgid="4256904905631994219">"Tilsidesæt force-dark"</string>
<string name="hwui_force_dark_summary" msgid="6515748781487952769">"Tilsidesætter funktionen force-dark og anvender Altid aktiveret"</string>
<string name="enable_blurs_on_windows_title" msgid="4218144213800778872">"Aktiverer sløring"</string>
@@ -5060,8 +5061,8 @@
<string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"fly, sikkert netværk i fly"</string>
<string name="calls_and_sms" msgid="1931855083959003306">"Opkald og sms-beskeder"</string>
<string name="calls_and_sms_category" msgid="2021321997884906046">"Wi‑Fi-opkald"</string>
- <string name="calls_sms_wfc_summary" msgid="4930471357980272294">"Foretag og modtag opkald via netværk, der ikke er mobilnetværk, f.eks. Wi-Fi-netværk"</string>
- <string name="calls_sms_footnote" msgid="7002461875954024216">"Med Wi-Fi-opkald kan du foretage og modtage opkald via netværk, der ikke er mobilnetværk, f.eks. Wi‑Fi-netværk."</string>
+ <string name="calls_sms_wfc_summary" msgid="3940529919408667336">"Foretag og modtag opkald via Wi-Fi"</string>
+ <string name="calls_sms_footnote" msgid="8051604228144899434">"Med Wi-Fi-opkald kan du foretage og modtage opkald via Wi-Fi-netværk, der ikke er mobilnetværk."</string>
<string name="calls_preference_title" msgid="7536882032182563800">"Opkald"</string>
<string name="sms_preference_title" msgid="8392745501754864395">"Sms"</string>
<!-- no translation found for calls_sms_preferred (6016477652522583496) -->
@@ -5085,10 +5086,10 @@
<string name="reset_internet_text" product="tablet" msgid="8797910368942544453">"Dette afslutter telefonopkaldet"</string>
<string name="resetting_internet_text" msgid="6696779371800051806">"Nulstiller dit internet…"</string>
<string name="fix_connectivity" msgid="2781433603228089501">"Løs problem med forbindelsen"</string>
- <!-- no translation found for airplane_mode_network_available (1059499681300395240) -->
- <skip />
- <!-- no translation found for to_switch_networks_disconnect_ethernet (6615374552827587197) -->
- <skip />
+ <string name="airplane_mode_network_available" msgid="1059499681300395240">"Tilgængelige netværk i flytilstand"</string>
+ <string name="to_switch_networks_disconnect_ethernet" msgid="6615374552827587197">"Afbryd ethernetforbindelsen for at skifte netværk"</string>
+ <string name="cannot_switch_networks_while_connected" msgid="3867944849171754777">"Du kan ikke skifte netværk, når du har oprettet forbindelse"</string>
+ <string name="airplane_mode_network_panel_title" msgid="6385046104863403604">"Netværk, der kan bruges i flytilstand"</string>
<string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g>/<xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
<string name="mobile_data_connection_active" msgid="2422223108911581552">"Forbundet"</string>
<string name="mobile_data_off_summary" msgid="3841411571485837651">"Der oprettes ikke automatisk internetforbindelse"</string>
@@ -5110,4 +5111,16 @@
<string name="category_name_others" msgid="2366006298768550310">"Andre"</string>
<string name="category_name_general" msgid="7737273712848115886">"Generelt"</string>
<string name="default_see_all_apps_title" msgid="7481113230662612178">"Se alle apps"</string>
+ <string name="smart_forwarding_title" msgid="8368634861971949799">"Intelligent viderestilling"</string>
+ <string name="smart_forwarding_summary_enabled" msgid="3341062878373185604">"Intelligent viderestilling er aktiveret"</string>
+ <string name="smart_forwarding_summary_disabled" msgid="5033880700091914809">"Intelligent viderestilling er deaktiveret"</string>
+ <string name="smart_forwarding_ongoing_title" msgid="962226849074401228">"Indstillinger for opkald"</string>
+ <string name="smart_forwarding_ongoing_text" msgid="2189209372407117114">"Opdaterer indstillinger..."</string>
+ <string name="smart_forwarding_failed_title" msgid="1859891191023516080">"Fejl i indstillinger for opkald."</string>
+ <string name="smart_forwarding_failed_text" msgid="5370431503707373653">"Fejl på netværk eller SIM-kort."</string>
+ <string name="smart_forwarding_failed_not_activated_text" msgid="997396203001257904">"SIM-kortet er ikke aktiveret."</string>
+ <string name="smart_forwarding_input_mdn_title" msgid="5105463748849841763">"Angiv telefonnumre"</string>
+ <string name="smart_forwarding_input_mdn_dialog_title" msgid="7542216086697868415">"Angiv telefonnummer"</string>
+ <string name="smart_forwarding_missing_mdn_text" msgid="2907314684242542226">"Telefonnummeret mangler."</string>
+ <string name="smart_forwarding_missing_alert_dialog_text" msgid="7870419247987316112">"OK"</string>
</resources>
diff --git a/res/values-de/arrays.xml b/res/values-de/arrays.xml
index afebfad..18358ac 100644
--- a/res/values-de/arrays.xml
+++ b/res/values-de/arrays.xml
@@ -498,7 +498,7 @@
<string-array name="wifi_metered_entries">
<item msgid="3237321077949659241">"Automatisch erkennen"</item>
<item msgid="3779092145391320375">"Wie \"kostenpflichtig\" behandeln"</item>
- <item msgid="2047166446768045816">"Wie \"kostenlos\" behandeln"</item>
+ <item msgid="2047166446768045816">"Wie \"ohne Datenlimit\" behandeln"</item>
</string-array>
<string-array name="wifi_privacy_entries">
<item msgid="3485945604919292489">"Zufällige MAC-Adresse verwenden (Standard)"</item>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 026156d..70ddaf4 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -2268,8 +2268,7 @@
<item quantity="other"><xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> gespeicherte Hörhilfen</item>
<item quantity="one"><xliff:g id="NUMBER_DEVICE_COUNT_0">%1$d</xliff:g> gespeicherte Hörhilfe</item>
</plurals>
- <!-- no translation found for accessibility_audio_adjustment_title (1332113739136802997) -->
- <skip />
+ <string name="accessibility_audio_adjustment_title" msgid="1332113739136802997">"Audioanpassung"</string>
<string name="accessibility_summary_shortcut_enabled" msgid="4030427268146752644">"Verknüpfung aktiviert"</string>
<string name="accessibility_summary_shortcut_disabled" msgid="564005462092499068">"Aus"</string>
<string name="accessibility_summary_state_enabled" msgid="1065431632216039369">"An"</string>
@@ -2438,6 +2437,7 @@
<string name="bluetooth_on_time" msgid="8424625554628450028">"WLAN-Aktivzeit"</string>
<string name="advanced_battery_title" msgid="3005993394776555079">"Akkunutzung"</string>
<string name="history_details_title" msgid="8628584613889559355">"Verlaufsdetails"</string>
+ <string name="advanced_battery_preference_title" msgid="6518802648205311326">"Akkunutzung anzeigen"</string>
<string name="battery_details_title" msgid="4531369291819754178">"Akkunutzung"</string>
<string name="details_subtitle" msgid="2550872569652785527">"Details"</string>
<string name="controls_subtitle" msgid="3759606830916441564">"Energieverbrauch anpassen"</string>
@@ -4099,6 +4099,7 @@
<string name="usb_use" msgid="6783183432648438528">"Verwendungszweck für USB-Verbindung"</string>
<string name="usb_default_label" msgid="3372838450371060750">"Standard-USB-Konfiguration"</string>
<string name="usb_default_info" msgid="167172599497085266">"Wenn ein anderes Gerät verbunden und dein Smartphone entsperrt ist, werden diese Einstellungen angewendet. Stell nur Verbindungen zu vertrauenswürdigen Geräten her."</string>
+ <string name="usb_power_title" msgid="5602112548385798646">"Optionen für Ein-/Aus-Taste"</string>
<string name="usb_pref" msgid="8521832005703261700">"USB"</string>
<string name="usb_preference" msgid="5084550082591493765">"USB-Einstellungen"</string>
<string name="usb_control_title" msgid="1946791559052157693">"Gerät, das die USB-Verbindung steuert"</string>
@@ -4938,8 +4939,8 @@
<string name="mobile_data_ap_mode_disabled" msgid="6067959496888990983">"Im Flugmodus nicht verfügbar"</string>
<string name="force_desktop_mode" msgid="1336913605091334238">"Desktop-Modus erzwingen"</string>
<string name="force_desktop_mode_summary" msgid="4587416867846930479">"Experiementellen Desktop-Modus auf sekundären Bildschirmen erzwingen"</string>
- <string name="enable_sizecompat_freeform" msgid="3799755160777404309">"Größenkompatible Freiform-Apps aktivieren"</string>
- <string name="enable_sizecompat_freeform_summary" msgid="1484050174538201499">"Größenkompatible Apps können in Freiform sein"</string>
+ <string name="enable_non_resizable_multi_window" msgid="6832903754625404477">"Mehrfenstermodus für nicht änderbare Größe aktivieren"</string>
+ <string name="enable_non_resizable_multi_window_summary" msgid="3275763753261901999">"Erlaubt Mehrfenstermodus für Apps mit nicht änderbarer Größe"</string>
<string name="hwui_force_dark_title" msgid="4256904905631994219">"Erzwingen des dunklen Modus außer Kraft setzen"</string>
<string name="hwui_force_dark_summary" msgid="6515748781487952769">"Apps werden nicht gezwungen, den dunklen Modus zu verwenden"</string>
<string name="enable_blurs_on_windows_title" msgid="4218144213800778872">"Weichzeichnen aktivieren"</string>
@@ -5061,8 +5062,8 @@
<string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"Flug, Flugzeug, flugsicher"</string>
<string name="calls_and_sms" msgid="1931855083959003306">"Anrufe & SMS"</string>
<string name="calls_and_sms_category" msgid="2021321997884906046">"WLAN-Anrufe"</string>
- <string name="calls_sms_wfc_summary" msgid="4930471357980272294">"Anrufe über Netzwerke ohne Mobilfunkanbieter starten und empfangen wie über ein WLAN"</string>
- <string name="calls_sms_footnote" msgid="7002461875954024216">"Mit WLAN-Telefonie kannst du Anrufe über Netzwerke ohne Mobilfunkanbieter starten und empfangen, wie etwa über einige WLAN-Netzwerke."</string>
+ <string name="calls_sms_wfc_summary" msgid="3940529919408667336">"Anrufe über WLAN starten und empfangen"</string>
+ <string name="calls_sms_footnote" msgid="8051604228144899434">"Mit WLAN-Telefonie kannst du Anrufe über WLANs ohne Mobilfunkanbieter starten und empfangen."</string>
<string name="calls_preference_title" msgid="7536882032182563800">"Anrufe"</string>
<string name="sms_preference_title" msgid="8392745501754864395">"SMS"</string>
<string name="calls_sms_preferred" msgid="6016477652522583496">"bevorzugt"</string>
@@ -5081,10 +5082,10 @@
<string name="reset_internet_text" product="tablet" msgid="8797910368942544453">"Dadurch wird dein Telefongespräch beendet"</string>
<string name="resetting_internet_text" msgid="6696779371800051806">"Internetverbindung wird zurückgesetzt…"</string>
<string name="fix_connectivity" msgid="2781433603228089501">"Konnektivitätsprobleme beheben"</string>
- <!-- no translation found for airplane_mode_network_available (1059499681300395240) -->
- <skip />
- <!-- no translation found for to_switch_networks_disconnect_ethernet (6615374552827587197) -->
- <skip />
+ <string name="airplane_mode_network_available" msgid="1059499681300395240">"Im Flugmodus verfügbare Netzwerke"</string>
+ <string name="to_switch_networks_disconnect_ethernet" msgid="6615374552827587197">"Trenne das Ethernetkabel, um das Netzwerk zu wechseln"</string>
+ <string name="cannot_switch_networks_while_connected" msgid="3867944849171754777">"Netzwerkwechsel während einer Verbindung nicht möglich"</string>
+ <string name="airplane_mode_network_panel_title" msgid="6385046104863403604">"Flugmodus-Netzwerke"</string>
<string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g>/<xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
<string name="mobile_data_connection_active" msgid="2422223108911581552">"Verbunden"</string>
<string name="mobile_data_off_summary" msgid="3841411571485837651">"Keine automatische Verbindung mit dem Internet"</string>
@@ -5106,4 +5107,16 @@
<string name="category_name_others" msgid="2366006298768550310">"Sonstige"</string>
<string name="category_name_general" msgid="7737273712848115886">"Allgemein"</string>
<string name="default_see_all_apps_title" msgid="7481113230662612178">"Alle Apps anzeigen"</string>
+ <string name="smart_forwarding_title" msgid="8368634861971949799">"Intelligente Weiterleitung"</string>
+ <string name="smart_forwarding_summary_enabled" msgid="3341062878373185604">"Intelligente Weiterleitung aktiviert"</string>
+ <string name="smart_forwarding_summary_disabled" msgid="5033880700091914809">"Intelligente Weiterleitung deaktiviert"</string>
+ <string name="smart_forwarding_ongoing_title" msgid="962226849074401228">"Anrufeinstellungen"</string>
+ <string name="smart_forwarding_ongoing_text" msgid="2189209372407117114">"Einstellungen werden aktualisiert…"</string>
+ <string name="smart_forwarding_failed_title" msgid="1859891191023516080">"Fehler bei Anrufeinstellungen"</string>
+ <string name="smart_forwarding_failed_text" msgid="5370431503707373653">"Netz- oder SIM-Kartenfehler."</string>
+ <string name="smart_forwarding_failed_not_activated_text" msgid="997396203001257904">"SIM ist nicht aktiviert."</string>
+ <string name="smart_forwarding_input_mdn_title" msgid="5105463748849841763">"Telefonnummern eingeben"</string>
+ <string name="smart_forwarding_input_mdn_dialog_title" msgid="7542216086697868415">"Telefonnummer eingeben"</string>
+ <string name="smart_forwarding_missing_mdn_text" msgid="2907314684242542226">"Telefonnummer fehlt."</string>
+ <string name="smart_forwarding_missing_alert_dialog_text" msgid="7870419247987316112">"OK"</string>
</resources>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 0fdcd20..5563e8f 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -2267,8 +2267,7 @@
<item quantity="other"><xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> αποθηκευμένα ακουστικά βοηθήματα</item>
<item quantity="one"><xliff:g id="NUMBER_DEVICE_COUNT_0">%1$d</xliff:g> αποθηκευμένο ακουστικό βοήθημα</item>
</plurals>
- <!-- no translation found for accessibility_audio_adjustment_title (1332113739136802997) -->
- <skip />
+ <string name="accessibility_audio_adjustment_title" msgid="1332113739136802997">"Προσαρμογή ήχου"</string>
<string name="accessibility_summary_shortcut_enabled" msgid="4030427268146752644">"Συντόμευση ενεργή"</string>
<string name="accessibility_summary_shortcut_disabled" msgid="564005462092499068">"Απενεργοποιημένο"</string>
<string name="accessibility_summary_state_enabled" msgid="1065431632216039369">"Ενεργή"</string>
@@ -2437,6 +2436,7 @@
<string name="bluetooth_on_time" msgid="8424625554628450028">"Wi-Fi στην ώρα του"</string>
<string name="advanced_battery_title" msgid="3005993394776555079">"Χρήση μπαταρίας"</string>
<string name="history_details_title" msgid="8628584613889559355">"Λεπτομέρειες ιστορικού"</string>
+ <string name="advanced_battery_preference_title" msgid="6518802648205311326">"Προβολή χρήσης μπαταρίας"</string>
<string name="battery_details_title" msgid="4531369291819754178">"Χρήση της μπαταρίας"</string>
<string name="details_subtitle" msgid="2550872569652785527">"Λεπτομέρειες χρήσης"</string>
<string name="controls_subtitle" msgid="3759606830916441564">"Προσαρμογή χρήσης ισχύος"</string>
@@ -4098,6 +4098,7 @@
<string name="usb_use" msgid="6783183432648438528">"Χρήση USB για"</string>
<string name="usb_default_label" msgid="3372838450371060750">"Προεπιλεγμένη διαμόρφωση USB"</string>
<string name="usb_default_info" msgid="167172599497085266">"Όταν συνδέεται μια άλλη συσκευή και το τηλέφωνό σας ξεκλειδώνει, θα εφαρμοστούν αυτές οι ρυθμίσεις. Να συνδέεστε μόνο σε αξιόπιστες συσκευές."</string>
+ <string name="usb_power_title" msgid="5602112548385798646">"Επιλογές λειτουργίας"</string>
<string name="usb_pref" msgid="8521832005703261700">"USB"</string>
<string name="usb_preference" msgid="5084550082591493765">"Προτιμήσεις USB"</string>
<string name="usb_control_title" msgid="1946791559052157693">"Έλεγχος USB από"</string>
@@ -4937,8 +4938,8 @@
<string name="mobile_data_ap_mode_disabled" msgid="6067959496888990983">"Μη διαθέσιμο κατά τη λειτουργία πτήσης"</string>
<string name="force_desktop_mode" msgid="1336913605091334238">"Αναγκαστική λειτουργία επιτραπέζιου υπολογιστή"</string>
<string name="force_desktop_mode_summary" msgid="4587416867846930479">"Αναγκαστική πειραματική λειτουργία επιτραπέζιου υπολογιστή σε δευτερεύουσες οθόνες"</string>
- <string name="enable_sizecompat_freeform" msgid="3799755160777404309">"Ενεργοποίηση sizecompat ελεύθερης μορφής."</string>
- <string name="enable_sizecompat_freeform_summary" msgid="1484050174538201499">"Επιτρέπει σε εφαρμογές sizecompat να εμφανίζονται με ελεύθερη μορφή."</string>
+ <string name="enable_non_resizable_multi_window" msgid="6832903754625404477">"Ενεργ. εφαρμ. χωρίς δυνατ. αλλαγής μεγέθ. σε πολλαπλά παραθ."</string>
+ <string name="enable_non_resizable_multi_window_summary" msgid="3275763753261901999">"Επιτρέπει εφαρμογές χωρίς δυνατότητα αλλαγής μεγέθους σε λειτουργία πολλαπλών παραθύρων"</string>
<string name="hwui_force_dark_title" msgid="4256904905631994219">"Παράκαμψη αναγκ. χρήσης σκούρου θέματος"</string>
<string name="hwui_force_dark_summary" msgid="6515748781487952769">"Παρακάμπτει τη λειτουργία σκούρου θέματος προκειμένου να είναι πάντα ενεργή"</string>
<string name="enable_blurs_on_windows_title" msgid="4218144213800778872">"Ενεργοποιεί τα θαμπώματα"</string>
@@ -5060,8 +5061,8 @@
<string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"πτήση, ασφαλή για την πτήση"</string>
<string name="calls_and_sms" msgid="1931855083959003306">"Κλήσεις και SMS"</string>
<string name="calls_and_sms_category" msgid="2021321997884906046">"Κλήση Wi-Fi"</string>
- <string name="calls_sms_wfc_summary" msgid="4930471357980272294">"Πραγματοποίηση και λήψη κλήσεων μέσω δικτύων που δεν ανήκουν στην εταιρεία κινητής τηλεφωνίας, όπως Wi‑Fi."</string>
- <string name="calls_sms_footnote" msgid="7002461875954024216">"Με τη λειτουργία Κλήση Wi-Fi μπορείτε να πραγματοποιείτε και να λαμβάνετε κλήσεις μέσω δικτύων που δεν ανήκουν στην εταιρεία κινητής τηλεφωνίας, όπως ορισμένα δίκτυα Wi-Fi."</string>
+ <string name="calls_sms_wfc_summary" msgid="3940529919408667336">"Πραγματοποίηση και λήψη κλήσεων μέσω Wi‑Fi"</string>
+ <string name="calls_sms_footnote" msgid="8051604228144899434">"Με την Κλήση Wi-Fi, οι κλήσεις πραγματοποιούνται και λαμβάνονται μέσω δικτύων Wi‑Fi που δεν σχετίζονται με εταιρείες κινητής τηλεφωνίας."</string>
<string name="calls_preference_title" msgid="7536882032182563800">"Κλήσεις"</string>
<string name="sms_preference_title" msgid="8392745501754864395">"SMS"</string>
<string name="calls_sms_preferred" msgid="6016477652522583496">"προτιμώνται"</string>
@@ -5080,10 +5081,10 @@
<string name="reset_internet_text" product="tablet" msgid="8797910368942544453">"Με αυτήν την ενέργεια θα τερματιστεί η τηλεφωνική σας κλήση"</string>
<string name="resetting_internet_text" msgid="6696779371800051806">"Γίνεται επαναφορά της σύνδεσής σας στο διαδίκτυο…"</string>
<string name="fix_connectivity" msgid="2781433603228089501">"Διόρθωση συνδεσιμότητας"</string>
- <!-- no translation found for airplane_mode_network_available (1059499681300395240) -->
- <skip />
- <!-- no translation found for to_switch_networks_disconnect_ethernet (6615374552827587197) -->
- <skip />
+ <string name="airplane_mode_network_available" msgid="1059499681300395240">"Διαθέσιμα δίκτυα λειτουργίας πτήσης"</string>
+ <string name="to_switch_networks_disconnect_ethernet" msgid="6615374552827587197">"Για εναλλαγή δικτύων, αποσυνδέστε το ethernet."</string>
+ <string name="cannot_switch_networks_while_connected" msgid="3867944849171754777">"Δεν είναι δυνατή η εναλλαγή δικτύων όταν είστε συνδεδεμένοι"</string>
+ <string name="airplane_mode_network_panel_title" msgid="6385046104863403604">"Δίκτυα λειτουργίας πτήσης"</string>
<string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g> / <xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
<string name="mobile_data_connection_active" msgid="2422223108911581552">"Συνδέθηκε"</string>
<string name="mobile_data_off_summary" msgid="3841411571485837651">"Δεν θα γίνει αυτόματη σύνδεση στο διαδίκτυο"</string>
@@ -5105,4 +5106,16 @@
<string name="category_name_others" msgid="2366006298768550310">"Άλλα"</string>
<string name="category_name_general" msgid="7737273712848115886">"Γενικά"</string>
<string name="default_see_all_apps_title" msgid="7481113230662612178">"Εμφάνιση όλων των εφαρμογών"</string>
+ <string name="smart_forwarding_title" msgid="8368634861971949799">"Έξυπνη προώθηση"</string>
+ <string name="smart_forwarding_summary_enabled" msgid="3341062878373185604">"Η Έξυπνη προώθηση έχει ενεργοποιηθεί"</string>
+ <string name="smart_forwarding_summary_disabled" msgid="5033880700091914809">"Η Έξυπνη προώθηση έχει απενεργοποιηθεί"</string>
+ <string name="smart_forwarding_ongoing_title" msgid="962226849074401228">"Ρυθμίσεις κλήσης"</string>
+ <string name="smart_forwarding_ongoing_text" msgid="2189209372407117114">"Ενημέρωση ρυθμίσεων…"</string>
+ <string name="smart_forwarding_failed_title" msgid="1859891191023516080">"Σφάλμα ρυθμίσεων κλήσης"</string>
+ <string name="smart_forwarding_failed_text" msgid="5370431503707373653">"Σφάλμα δικτύου ή κάρτας SIM."</string>
+ <string name="smart_forwarding_failed_not_activated_text" msgid="997396203001257904">"Η SIM δεν είναι ενεργοποιημένη."</string>
+ <string name="smart_forwarding_input_mdn_title" msgid="5105463748849841763">"Εισαγωγή αριθμών τηλεφώνου"</string>
+ <string name="smart_forwarding_input_mdn_dialog_title" msgid="7542216086697868415">"Εισαγωγή αριθμού τηλεφώνου"</string>
+ <string name="smart_forwarding_missing_mdn_text" msgid="2907314684242542226">"Ο αριθμός τηλεφώνου απουσιάζει."</string>
+ <string name="smart_forwarding_missing_alert_dialog_text" msgid="7870419247987316112">"ΟΚ"</string>
</resources>
diff --git a/res/values-en-rAU/strings.xml b/res/values-en-rAU/strings.xml
index e9c901a..edb664c 100644
--- a/res/values-en-rAU/strings.xml
+++ b/res/values-en-rAU/strings.xml
@@ -2279,7 +2279,7 @@
<string name="daltonizer_mode_deuteranomaly_title" msgid="3811397143576433035">"Deuteranomaly"</string>
<string name="daltonizer_mode_protanomaly_title" msgid="6787594316700223938">"Protanomaly"</string>
<string name="daltonizer_mode_tritanomaly_title" msgid="1869867447813349033">"Tritanomaly"</string>
- <string name="daltonizer_mode_grayscale_title" msgid="152005391387952588">"Grayscale"</string>
+ <string name="daltonizer_mode_grayscale_title" msgid="152005391387952588">"Greyscale"</string>
<string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"Red-green"</string>
<string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"Red-green"</string>
<string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"Blue-yellow"</string>
@@ -2436,6 +2436,7 @@
<string name="bluetooth_on_time" msgid="8424625554628450028">"Wi‑Fi on time"</string>
<string name="advanced_battery_title" msgid="3005993394776555079">"Battery usage"</string>
<string name="history_details_title" msgid="8628584613889559355">"History details"</string>
+ <string name="advanced_battery_preference_title" msgid="6518802648205311326">"View battery usage"</string>
<string name="battery_details_title" msgid="4531369291819754178">"Battery usage"</string>
<string name="details_subtitle" msgid="2550872569652785527">"Use details"</string>
<string name="controls_subtitle" msgid="3759606830916441564">"Adjust power use"</string>
@@ -4097,6 +4098,7 @@
<string name="usb_use" msgid="6783183432648438528">"Use USB for"</string>
<string name="usb_default_label" msgid="3372838450371060750">"Default USB configuration"</string>
<string name="usb_default_info" msgid="167172599497085266">"When another device is connected and your phone is unlocked, these settings will be applied. Only connect to trusted devices."</string>
+ <string name="usb_power_title" msgid="5602112548385798646">"Power options"</string>
<string name="usb_pref" msgid="8521832005703261700">"USB"</string>
<string name="usb_preference" msgid="5084550082591493765">"USB Preferences"</string>
<string name="usb_control_title" msgid="1946791559052157693">"USB controlled by"</string>
@@ -4936,8 +4938,8 @@
<string name="mobile_data_ap_mode_disabled" msgid="6067959496888990983">"Unavailable during airplane mode"</string>
<string name="force_desktop_mode" msgid="1336913605091334238">"Force desktop mode"</string>
<string name="force_desktop_mode_summary" msgid="4587416867846930479">"Force experimental desktop mode on secondary displays"</string>
- <string name="enable_sizecompat_freeform" msgid="3799755160777404309">"Enable free-form sizecompat"</string>
- <string name="enable_sizecompat_freeform_summary" msgid="1484050174538201499">"Allows sizecompat apps to be in free form"</string>
+ <string name="enable_non_resizable_multi_window" msgid="6832903754625404477">"Enable non-resizable in Multi-window"</string>
+ <string name="enable_non_resizable_multi_window_summary" msgid="3275763753261901999">"Allows non-resizable apps to be in Multi-window"</string>
<string name="hwui_force_dark_title" msgid="4256904905631994219">"Override force-dark"</string>
<string name="hwui_force_dark_summary" msgid="6515748781487952769">"Overrides the force-dark feature to be always on"</string>
<string name="enable_blurs_on_windows_title" msgid="4218144213800778872">"Enable blurs"</string>
@@ -5059,8 +5061,8 @@
<string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"aeroplane, aeroplane-safe"</string>
<string name="calls_and_sms" msgid="1931855083959003306">"Calls and SMS"</string>
<string name="calls_and_sms_category" msgid="2021321997884906046">"Wi‑Fi calling"</string>
- <string name="calls_sms_wfc_summary" msgid="4930471357980272294">"Make and receive calls over non‑operator networks, like Wi‑Fi"</string>
- <string name="calls_sms_footnote" msgid="7002461875954024216">"Wi‑Fi calling allows you to make and receive calls over non‑operator networks, such as some Wi‑Fi networks."</string>
+ <string name="calls_sms_wfc_summary" msgid="3940529919408667336">"Make and receive calls over Wi‑Fi"</string>
+ <string name="calls_sms_footnote" msgid="8051604228144899434">"With Wi‑Fi calling, calls are made and received over non-operator Wi‑Fi networks."</string>
<string name="calls_preference_title" msgid="7536882032182563800">"Calls"</string>
<string name="sms_preference_title" msgid="8392745501754864395">"SMS"</string>
<string name="calls_sms_preferred" msgid="6016477652522583496">"preferred"</string>
@@ -5081,6 +5083,8 @@
<string name="fix_connectivity" msgid="2781433603228089501">"Fix connectivity"</string>
<string name="airplane_mode_network_available" msgid="1059499681300395240">"Aeroplane mode networks available"</string>
<string name="to_switch_networks_disconnect_ethernet" msgid="6615374552827587197">"To switch networks, disconnect Ethernet"</string>
+ <string name="cannot_switch_networks_while_connected" msgid="3867944849171754777">"Cannot switch networks while connected"</string>
+ <string name="airplane_mode_network_panel_title" msgid="6385046104863403604">"Aeroplane mode networks"</string>
<string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g>/<xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
<string name="mobile_data_connection_active" msgid="2422223108911581552">"Connected"</string>
<string name="mobile_data_off_summary" msgid="3841411571485837651">"Internet won\'t auto‑connect"</string>
@@ -5102,4 +5106,16 @@
<string name="category_name_others" msgid="2366006298768550310">"Others"</string>
<string name="category_name_general" msgid="7737273712848115886">"General"</string>
<string name="default_see_all_apps_title" msgid="7481113230662612178">"See all apps"</string>
+ <string name="smart_forwarding_title" msgid="8368634861971949799">"Smart forwarding"</string>
+ <string name="smart_forwarding_summary_enabled" msgid="3341062878373185604">"Smart forwarding enabled"</string>
+ <string name="smart_forwarding_summary_disabled" msgid="5033880700091914809">"Smart forwarding disabled"</string>
+ <string name="smart_forwarding_ongoing_title" msgid="962226849074401228">"Call settings"</string>
+ <string name="smart_forwarding_ongoing_text" msgid="2189209372407117114">"Updating settings…"</string>
+ <string name="smart_forwarding_failed_title" msgid="1859891191023516080">"Call settings error"</string>
+ <string name="smart_forwarding_failed_text" msgid="5370431503707373653">"Network or SIM card error."</string>
+ <string name="smart_forwarding_failed_not_activated_text" msgid="997396203001257904">"SIM is not activated."</string>
+ <string name="smart_forwarding_input_mdn_title" msgid="5105463748849841763">"Enter phone numbers"</string>
+ <string name="smart_forwarding_input_mdn_dialog_title" msgid="7542216086697868415">"Enter phone number"</string>
+ <string name="smart_forwarding_missing_mdn_text" msgid="2907314684242542226">"Phone number is missing."</string>
+ <string name="smart_forwarding_missing_alert_dialog_text" msgid="7870419247987316112">"OK"</string>
</resources>
diff --git a/res/values-en-rCA/strings.xml b/res/values-en-rCA/strings.xml
index b31dae7..a1054af 100644
--- a/res/values-en-rCA/strings.xml
+++ b/res/values-en-rCA/strings.xml
@@ -2279,7 +2279,7 @@
<string name="daltonizer_mode_deuteranomaly_title" msgid="3811397143576433035">"Deuteranomaly"</string>
<string name="daltonizer_mode_protanomaly_title" msgid="6787594316700223938">"Protanomaly"</string>
<string name="daltonizer_mode_tritanomaly_title" msgid="1869867447813349033">"Tritanomaly"</string>
- <string name="daltonizer_mode_grayscale_title" msgid="152005391387952588">"Grayscale"</string>
+ <string name="daltonizer_mode_grayscale_title" msgid="152005391387952588">"Greyscale"</string>
<string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"Red-green"</string>
<string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"Red-green"</string>
<string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"Blue-yellow"</string>
@@ -2436,6 +2436,7 @@
<string name="bluetooth_on_time" msgid="8424625554628450028">"Wi‑Fi on time"</string>
<string name="advanced_battery_title" msgid="3005993394776555079">"Battery usage"</string>
<string name="history_details_title" msgid="8628584613889559355">"History details"</string>
+ <string name="advanced_battery_preference_title" msgid="6518802648205311326">"View battery usage"</string>
<string name="battery_details_title" msgid="4531369291819754178">"Battery usage"</string>
<string name="details_subtitle" msgid="2550872569652785527">"Use details"</string>
<string name="controls_subtitle" msgid="3759606830916441564">"Adjust power use"</string>
@@ -4097,6 +4098,7 @@
<string name="usb_use" msgid="6783183432648438528">"Use USB for"</string>
<string name="usb_default_label" msgid="3372838450371060750">"Default USB configuration"</string>
<string name="usb_default_info" msgid="167172599497085266">"When another device is connected and your phone is unlocked, these settings will be applied. Only connect to trusted devices."</string>
+ <string name="usb_power_title" msgid="5602112548385798646">"Power options"</string>
<string name="usb_pref" msgid="8521832005703261700">"USB"</string>
<string name="usb_preference" msgid="5084550082591493765">"USB Preferences"</string>
<string name="usb_control_title" msgid="1946791559052157693">"USB controlled by"</string>
@@ -4936,8 +4938,8 @@
<string name="mobile_data_ap_mode_disabled" msgid="6067959496888990983">"Unavailable during airplane mode"</string>
<string name="force_desktop_mode" msgid="1336913605091334238">"Force desktop mode"</string>
<string name="force_desktop_mode_summary" msgid="4587416867846930479">"Force experimental desktop mode on secondary displays"</string>
- <string name="enable_sizecompat_freeform" msgid="3799755160777404309">"Enable free-form sizecompat"</string>
- <string name="enable_sizecompat_freeform_summary" msgid="1484050174538201499">"Allows sizecompat apps to be in free form"</string>
+ <string name="enable_non_resizable_multi_window" msgid="6832903754625404477">"Enable non-resizable in Multi-window"</string>
+ <string name="enable_non_resizable_multi_window_summary" msgid="3275763753261901999">"Allows non-resizable apps to be in Multi-window"</string>
<string name="hwui_force_dark_title" msgid="4256904905631994219">"Override force-dark"</string>
<string name="hwui_force_dark_summary" msgid="6515748781487952769">"Overrides the force-dark feature to be always on"</string>
<string name="enable_blurs_on_windows_title" msgid="4218144213800778872">"Enable blurs"</string>
@@ -5059,8 +5061,8 @@
<string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"aeroplane, aeroplane-safe"</string>
<string name="calls_and_sms" msgid="1931855083959003306">"Calls and SMS"</string>
<string name="calls_and_sms_category" msgid="2021321997884906046">"Wi‑Fi calling"</string>
- <string name="calls_sms_wfc_summary" msgid="4930471357980272294">"Make and receive calls over non‑operator networks, like Wi‑Fi"</string>
- <string name="calls_sms_footnote" msgid="7002461875954024216">"Wi‑Fi calling allows you to make and receive calls over non‑operator networks, such as some Wi‑Fi networks."</string>
+ <string name="calls_sms_wfc_summary" msgid="3940529919408667336">"Make and receive calls over Wi‑Fi"</string>
+ <string name="calls_sms_footnote" msgid="8051604228144899434">"With Wi‑Fi calling, calls are made and received over non-operator Wi‑Fi networks."</string>
<string name="calls_preference_title" msgid="7536882032182563800">"Calls"</string>
<string name="sms_preference_title" msgid="8392745501754864395">"SMS"</string>
<string name="calls_sms_preferred" msgid="6016477652522583496">"preferred"</string>
@@ -5081,6 +5083,8 @@
<string name="fix_connectivity" msgid="2781433603228089501">"Fix connectivity"</string>
<string name="airplane_mode_network_available" msgid="1059499681300395240">"Aeroplane mode networks available"</string>
<string name="to_switch_networks_disconnect_ethernet" msgid="6615374552827587197">"To switch networks, disconnect Ethernet"</string>
+ <string name="cannot_switch_networks_while_connected" msgid="3867944849171754777">"Cannot switch networks while connected"</string>
+ <string name="airplane_mode_network_panel_title" msgid="6385046104863403604">"Aeroplane mode networks"</string>
<string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g>/<xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
<string name="mobile_data_connection_active" msgid="2422223108911581552">"Connected"</string>
<string name="mobile_data_off_summary" msgid="3841411571485837651">"Internet won\'t auto‑connect"</string>
@@ -5102,4 +5106,16 @@
<string name="category_name_others" msgid="2366006298768550310">"Others"</string>
<string name="category_name_general" msgid="7737273712848115886">"General"</string>
<string name="default_see_all_apps_title" msgid="7481113230662612178">"See all apps"</string>
+ <string name="smart_forwarding_title" msgid="8368634861971949799">"Smart forwarding"</string>
+ <string name="smart_forwarding_summary_enabled" msgid="3341062878373185604">"Smart forwarding enabled"</string>
+ <string name="smart_forwarding_summary_disabled" msgid="5033880700091914809">"Smart forwarding disabled"</string>
+ <string name="smart_forwarding_ongoing_title" msgid="962226849074401228">"Call settings"</string>
+ <string name="smart_forwarding_ongoing_text" msgid="2189209372407117114">"Updating settings…"</string>
+ <string name="smart_forwarding_failed_title" msgid="1859891191023516080">"Call settings error"</string>
+ <string name="smart_forwarding_failed_text" msgid="5370431503707373653">"Network or SIM card error."</string>
+ <string name="smart_forwarding_failed_not_activated_text" msgid="997396203001257904">"SIM is not activated."</string>
+ <string name="smart_forwarding_input_mdn_title" msgid="5105463748849841763">"Enter phone numbers"</string>
+ <string name="smart_forwarding_input_mdn_dialog_title" msgid="7542216086697868415">"Enter phone number"</string>
+ <string name="smart_forwarding_missing_mdn_text" msgid="2907314684242542226">"Phone number is missing."</string>
+ <string name="smart_forwarding_missing_alert_dialog_text" msgid="7870419247987316112">"OK"</string>
</resources>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index cda49f9..7fb3e4e 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -2279,7 +2279,7 @@
<string name="daltonizer_mode_deuteranomaly_title" msgid="3811397143576433035">"Deuteranomaly"</string>
<string name="daltonizer_mode_protanomaly_title" msgid="6787594316700223938">"Protanomaly"</string>
<string name="daltonizer_mode_tritanomaly_title" msgid="1869867447813349033">"Tritanomaly"</string>
- <string name="daltonizer_mode_grayscale_title" msgid="152005391387952588">"Grayscale"</string>
+ <string name="daltonizer_mode_grayscale_title" msgid="152005391387952588">"Greyscale"</string>
<string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"Red-green"</string>
<string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"Red-green"</string>
<string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"Blue-yellow"</string>
@@ -2436,6 +2436,7 @@
<string name="bluetooth_on_time" msgid="8424625554628450028">"Wi‑Fi on time"</string>
<string name="advanced_battery_title" msgid="3005993394776555079">"Battery usage"</string>
<string name="history_details_title" msgid="8628584613889559355">"History details"</string>
+ <string name="advanced_battery_preference_title" msgid="6518802648205311326">"View battery usage"</string>
<string name="battery_details_title" msgid="4531369291819754178">"Battery usage"</string>
<string name="details_subtitle" msgid="2550872569652785527">"Use details"</string>
<string name="controls_subtitle" msgid="3759606830916441564">"Adjust power use"</string>
@@ -4097,6 +4098,7 @@
<string name="usb_use" msgid="6783183432648438528">"Use USB for"</string>
<string name="usb_default_label" msgid="3372838450371060750">"Default USB configuration"</string>
<string name="usb_default_info" msgid="167172599497085266">"When another device is connected and your phone is unlocked, these settings will be applied. Only connect to trusted devices."</string>
+ <string name="usb_power_title" msgid="5602112548385798646">"Power options"</string>
<string name="usb_pref" msgid="8521832005703261700">"USB"</string>
<string name="usb_preference" msgid="5084550082591493765">"USB Preferences"</string>
<string name="usb_control_title" msgid="1946791559052157693">"USB controlled by"</string>
@@ -4936,8 +4938,8 @@
<string name="mobile_data_ap_mode_disabled" msgid="6067959496888990983">"Unavailable during airplane mode"</string>
<string name="force_desktop_mode" msgid="1336913605091334238">"Force desktop mode"</string>
<string name="force_desktop_mode_summary" msgid="4587416867846930479">"Force experimental desktop mode on secondary displays"</string>
- <string name="enable_sizecompat_freeform" msgid="3799755160777404309">"Enable free-form sizecompat"</string>
- <string name="enable_sizecompat_freeform_summary" msgid="1484050174538201499">"Allows sizecompat apps to be in free form"</string>
+ <string name="enable_non_resizable_multi_window" msgid="6832903754625404477">"Enable non-resizable in Multi-window"</string>
+ <string name="enable_non_resizable_multi_window_summary" msgid="3275763753261901999">"Allows non-resizable apps to be in Multi-window"</string>
<string name="hwui_force_dark_title" msgid="4256904905631994219">"Override force-dark"</string>
<string name="hwui_force_dark_summary" msgid="6515748781487952769">"Overrides the force-dark feature to be always on"</string>
<string name="enable_blurs_on_windows_title" msgid="4218144213800778872">"Enable blurs"</string>
@@ -5059,8 +5061,8 @@
<string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"aeroplane, aeroplane-safe"</string>
<string name="calls_and_sms" msgid="1931855083959003306">"Calls and SMS"</string>
<string name="calls_and_sms_category" msgid="2021321997884906046">"Wi‑Fi calling"</string>
- <string name="calls_sms_wfc_summary" msgid="4930471357980272294">"Make and receive calls over non‑operator networks, like Wi‑Fi"</string>
- <string name="calls_sms_footnote" msgid="7002461875954024216">"Wi‑Fi calling allows you to make and receive calls over non‑operator networks, such as some Wi‑Fi networks."</string>
+ <string name="calls_sms_wfc_summary" msgid="3940529919408667336">"Make and receive calls over Wi‑Fi"</string>
+ <string name="calls_sms_footnote" msgid="8051604228144899434">"With Wi‑Fi calling, calls are made and received over non-operator Wi‑Fi networks."</string>
<string name="calls_preference_title" msgid="7536882032182563800">"Calls"</string>
<string name="sms_preference_title" msgid="8392745501754864395">"SMS"</string>
<string name="calls_sms_preferred" msgid="6016477652522583496">"preferred"</string>
@@ -5081,6 +5083,8 @@
<string name="fix_connectivity" msgid="2781433603228089501">"Fix connectivity"</string>
<string name="airplane_mode_network_available" msgid="1059499681300395240">"Aeroplane mode networks available"</string>
<string name="to_switch_networks_disconnect_ethernet" msgid="6615374552827587197">"To switch networks, disconnect Ethernet"</string>
+ <string name="cannot_switch_networks_while_connected" msgid="3867944849171754777">"Cannot switch networks while connected"</string>
+ <string name="airplane_mode_network_panel_title" msgid="6385046104863403604">"Aeroplane mode networks"</string>
<string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g>/<xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
<string name="mobile_data_connection_active" msgid="2422223108911581552">"Connected"</string>
<string name="mobile_data_off_summary" msgid="3841411571485837651">"Internet won\'t auto‑connect"</string>
@@ -5102,4 +5106,16 @@
<string name="category_name_others" msgid="2366006298768550310">"Others"</string>
<string name="category_name_general" msgid="7737273712848115886">"General"</string>
<string name="default_see_all_apps_title" msgid="7481113230662612178">"See all apps"</string>
+ <string name="smart_forwarding_title" msgid="8368634861971949799">"Smart forwarding"</string>
+ <string name="smart_forwarding_summary_enabled" msgid="3341062878373185604">"Smart forwarding enabled"</string>
+ <string name="smart_forwarding_summary_disabled" msgid="5033880700091914809">"Smart forwarding disabled"</string>
+ <string name="smart_forwarding_ongoing_title" msgid="962226849074401228">"Call settings"</string>
+ <string name="smart_forwarding_ongoing_text" msgid="2189209372407117114">"Updating settings…"</string>
+ <string name="smart_forwarding_failed_title" msgid="1859891191023516080">"Call settings error"</string>
+ <string name="smart_forwarding_failed_text" msgid="5370431503707373653">"Network or SIM card error."</string>
+ <string name="smart_forwarding_failed_not_activated_text" msgid="997396203001257904">"SIM is not activated."</string>
+ <string name="smart_forwarding_input_mdn_title" msgid="5105463748849841763">"Enter phone numbers"</string>
+ <string name="smart_forwarding_input_mdn_dialog_title" msgid="7542216086697868415">"Enter phone number"</string>
+ <string name="smart_forwarding_missing_mdn_text" msgid="2907314684242542226">"Phone number is missing."</string>
+ <string name="smart_forwarding_missing_alert_dialog_text" msgid="7870419247987316112">"OK"</string>
</resources>
diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml
index 7ebd372..fb7bb1f 100644
--- a/res/values-en-rIN/strings.xml
+++ b/res/values-en-rIN/strings.xml
@@ -2279,7 +2279,7 @@
<string name="daltonizer_mode_deuteranomaly_title" msgid="3811397143576433035">"Deuteranomaly"</string>
<string name="daltonizer_mode_protanomaly_title" msgid="6787594316700223938">"Protanomaly"</string>
<string name="daltonizer_mode_tritanomaly_title" msgid="1869867447813349033">"Tritanomaly"</string>
- <string name="daltonizer_mode_grayscale_title" msgid="152005391387952588">"Grayscale"</string>
+ <string name="daltonizer_mode_grayscale_title" msgid="152005391387952588">"Greyscale"</string>
<string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"Red-green"</string>
<string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"Red-green"</string>
<string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"Blue-yellow"</string>
@@ -2436,6 +2436,7 @@
<string name="bluetooth_on_time" msgid="8424625554628450028">"Wi‑Fi on time"</string>
<string name="advanced_battery_title" msgid="3005993394776555079">"Battery usage"</string>
<string name="history_details_title" msgid="8628584613889559355">"History details"</string>
+ <string name="advanced_battery_preference_title" msgid="6518802648205311326">"View battery usage"</string>
<string name="battery_details_title" msgid="4531369291819754178">"Battery usage"</string>
<string name="details_subtitle" msgid="2550872569652785527">"Use details"</string>
<string name="controls_subtitle" msgid="3759606830916441564">"Adjust power use"</string>
@@ -4097,6 +4098,7 @@
<string name="usb_use" msgid="6783183432648438528">"Use USB for"</string>
<string name="usb_default_label" msgid="3372838450371060750">"Default USB configuration"</string>
<string name="usb_default_info" msgid="167172599497085266">"When another device is connected and your phone is unlocked, these settings will be applied. Only connect to trusted devices."</string>
+ <string name="usb_power_title" msgid="5602112548385798646">"Power options"</string>
<string name="usb_pref" msgid="8521832005703261700">"USB"</string>
<string name="usb_preference" msgid="5084550082591493765">"USB Preferences"</string>
<string name="usb_control_title" msgid="1946791559052157693">"USB controlled by"</string>
@@ -4936,8 +4938,8 @@
<string name="mobile_data_ap_mode_disabled" msgid="6067959496888990983">"Unavailable during airplane mode"</string>
<string name="force_desktop_mode" msgid="1336913605091334238">"Force desktop mode"</string>
<string name="force_desktop_mode_summary" msgid="4587416867846930479">"Force experimental desktop mode on secondary displays"</string>
- <string name="enable_sizecompat_freeform" msgid="3799755160777404309">"Enable free-form sizecompat"</string>
- <string name="enable_sizecompat_freeform_summary" msgid="1484050174538201499">"Allows sizecompat apps to be in free form"</string>
+ <string name="enable_non_resizable_multi_window" msgid="6832903754625404477">"Enable non-resizable in Multi-window"</string>
+ <string name="enable_non_resizable_multi_window_summary" msgid="3275763753261901999">"Allows non-resizable apps to be in Multi-window"</string>
<string name="hwui_force_dark_title" msgid="4256904905631994219">"Override force-dark"</string>
<string name="hwui_force_dark_summary" msgid="6515748781487952769">"Overrides the force-dark feature to be always on"</string>
<string name="enable_blurs_on_windows_title" msgid="4218144213800778872">"Enable blurs"</string>
@@ -5059,8 +5061,8 @@
<string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"aeroplane, aeroplane-safe"</string>
<string name="calls_and_sms" msgid="1931855083959003306">"Calls and SMS"</string>
<string name="calls_and_sms_category" msgid="2021321997884906046">"Wi‑Fi calling"</string>
- <string name="calls_sms_wfc_summary" msgid="4930471357980272294">"Make and receive calls over non‑operator networks, like Wi‑Fi"</string>
- <string name="calls_sms_footnote" msgid="7002461875954024216">"Wi‑Fi calling allows you to make and receive calls over non‑operator networks, such as some Wi‑Fi networks."</string>
+ <string name="calls_sms_wfc_summary" msgid="3940529919408667336">"Make and receive calls over Wi‑Fi"</string>
+ <string name="calls_sms_footnote" msgid="8051604228144899434">"With Wi‑Fi calling, calls are made and received over non-operator Wi‑Fi networks."</string>
<string name="calls_preference_title" msgid="7536882032182563800">"Calls"</string>
<string name="sms_preference_title" msgid="8392745501754864395">"SMS"</string>
<string name="calls_sms_preferred" msgid="6016477652522583496">"preferred"</string>
@@ -5081,6 +5083,8 @@
<string name="fix_connectivity" msgid="2781433603228089501">"Fix connectivity"</string>
<string name="airplane_mode_network_available" msgid="1059499681300395240">"Aeroplane mode networks available"</string>
<string name="to_switch_networks_disconnect_ethernet" msgid="6615374552827587197">"To switch networks, disconnect Ethernet"</string>
+ <string name="cannot_switch_networks_while_connected" msgid="3867944849171754777">"Cannot switch networks while connected"</string>
+ <string name="airplane_mode_network_panel_title" msgid="6385046104863403604">"Aeroplane mode networks"</string>
<string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g>/<xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
<string name="mobile_data_connection_active" msgid="2422223108911581552">"Connected"</string>
<string name="mobile_data_off_summary" msgid="3841411571485837651">"Internet won\'t auto‑connect"</string>
@@ -5102,4 +5106,16 @@
<string name="category_name_others" msgid="2366006298768550310">"Others"</string>
<string name="category_name_general" msgid="7737273712848115886">"General"</string>
<string name="default_see_all_apps_title" msgid="7481113230662612178">"See all apps"</string>
+ <string name="smart_forwarding_title" msgid="8368634861971949799">"Smart forwarding"</string>
+ <string name="smart_forwarding_summary_enabled" msgid="3341062878373185604">"Smart forwarding enabled"</string>
+ <string name="smart_forwarding_summary_disabled" msgid="5033880700091914809">"Smart forwarding disabled"</string>
+ <string name="smart_forwarding_ongoing_title" msgid="962226849074401228">"Call settings"</string>
+ <string name="smart_forwarding_ongoing_text" msgid="2189209372407117114">"Updating settings…"</string>
+ <string name="smart_forwarding_failed_title" msgid="1859891191023516080">"Call settings error"</string>
+ <string name="smart_forwarding_failed_text" msgid="5370431503707373653">"Network or SIM card error."</string>
+ <string name="smart_forwarding_failed_not_activated_text" msgid="997396203001257904">"SIM is not activated."</string>
+ <string name="smart_forwarding_input_mdn_title" msgid="5105463748849841763">"Enter phone numbers"</string>
+ <string name="smart_forwarding_input_mdn_dialog_title" msgid="7542216086697868415">"Enter phone number"</string>
+ <string name="smart_forwarding_missing_mdn_text" msgid="2907314684242542226">"Phone number is missing."</string>
+ <string name="smart_forwarding_missing_alert_dialog_text" msgid="7870419247987316112">"OK"</string>
</resources>
diff --git a/res/values-en-rXC/strings.xml b/res/values-en-rXC/strings.xml
index 61bd813..5506c63 100644
--- a/res/values-en-rXC/strings.xml
+++ b/res/values-en-rXC/strings.xml
@@ -2436,6 +2436,7 @@
<string name="bluetooth_on_time" msgid="8424625554628450028">"Wi‑Fi on time"</string>
<string name="advanced_battery_title" msgid="3005993394776555079">"Battery usage"</string>
<string name="history_details_title" msgid="8628584613889559355">"History details"</string>
+ <string name="advanced_battery_preference_title" msgid="6518802648205311326">"View battery usage"</string>
<string name="battery_details_title" msgid="4531369291819754178">"Battery usage"</string>
<string name="details_subtitle" msgid="2550872569652785527">"Use details"</string>
<string name="controls_subtitle" msgid="3759606830916441564">"Adjust power use"</string>
@@ -4097,6 +4098,7 @@
<string name="usb_use" msgid="6783183432648438528">"Use USB for"</string>
<string name="usb_default_label" msgid="3372838450371060750">"Default USB configuration"</string>
<string name="usb_default_info" msgid="167172599497085266">"When another device is connected and your phone is unlocked, these settings will be applied. Only connect to trusted devices."</string>
+ <string name="usb_power_title" msgid="5602112548385798646">"Power options"</string>
<string name="usb_pref" msgid="8521832005703261700">"USB"</string>
<string name="usb_preference" msgid="5084550082591493765">"USB Preferences"</string>
<string name="usb_control_title" msgid="1946791559052157693">"USB controlled by"</string>
@@ -4936,8 +4938,8 @@
<string name="mobile_data_ap_mode_disabled" msgid="6067959496888990983">"Unavailable during airplane mode"</string>
<string name="force_desktop_mode" msgid="1336913605091334238">"Force desktop mode"</string>
<string name="force_desktop_mode_summary" msgid="4587416867846930479">"Force experimental desktop mode on secondary displays"</string>
- <string name="enable_sizecompat_freeform" msgid="3799755160777404309">"Enable freeform sizecompat"</string>
- <string name="enable_sizecompat_freeform_summary" msgid="1484050174538201499">"Allows sizecompat apps to be in freeform"</string>
+ <string name="enable_non_resizable_multi_window" msgid="6832903754625404477">"Enable non-resizable in multi window"</string>
+ <string name="enable_non_resizable_multi_window_summary" msgid="3275763753261901999">"Allows non-resizable apps to be in multi window"</string>
<string name="hwui_force_dark_title" msgid="4256904905631994219">"Override force-dark"</string>
<string name="hwui_force_dark_summary" msgid="6515748781487952769">"Overrides the force-dark feature to be always-on"</string>
<string name="enable_blurs_on_windows_title" msgid="4218144213800778872">"Enable blurs"</string>
@@ -5059,8 +5061,8 @@
<string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"airplane, airplane-safe"</string>
<string name="calls_and_sms" msgid="1931855083959003306">"Calls & SMS"</string>
<string name="calls_and_sms_category" msgid="2021321997884906046">"Wi‑Fi Calling"</string>
- <string name="calls_sms_wfc_summary" msgid="4930471357980272294">"Make and receive calls over non‑carrier networks like Wi‑Fi"</string>
- <string name="calls_sms_footnote" msgid="7002461875954024216">"Wi‑Fi calling allows you to make and receive calls over non‑carrier networks such as some Wi‑Fi networks."</string>
+ <string name="calls_sms_wfc_summary" msgid="3940529919408667336">"Make and receive calls over Wi‑Fi"</string>
+ <string name="calls_sms_footnote" msgid="8051604228144899434">"With Wi‑Fi calling, calls are made and received over non-carrier Wi‑Fi networks."</string>
<string name="calls_preference_title" msgid="7536882032182563800">"Calls"</string>
<string name="sms_preference_title" msgid="8392745501754864395">"SMS"</string>
<string name="calls_sms_preferred" msgid="6016477652522583496">"preferred"</string>
@@ -5081,6 +5083,8 @@
<string name="fix_connectivity" msgid="2781433603228089501">"Fix connectivity"</string>
<string name="airplane_mode_network_available" msgid="1059499681300395240">"Airplane mode networks available"</string>
<string name="to_switch_networks_disconnect_ethernet" msgid="6615374552827587197">"To switch networks, disconnect ethernet"</string>
+ <string name="cannot_switch_networks_while_connected" msgid="3867944849171754777">"Cannot switch networks while connected"</string>
+ <string name="airplane_mode_network_panel_title" msgid="6385046104863403604">"Airplane mode networks"</string>
<string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g> / <xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
<string name="mobile_data_connection_active" msgid="2422223108911581552">"Connected"</string>
<string name="mobile_data_off_summary" msgid="3841411571485837651">"Internet won\'t auto‑connect"</string>
@@ -5102,4 +5106,16 @@
<string name="category_name_others" msgid="2366006298768550310">"Others"</string>
<string name="category_name_general" msgid="7737273712848115886">"General"</string>
<string name="default_see_all_apps_title" msgid="7481113230662612178">"See all apps"</string>
+ <string name="smart_forwarding_title" msgid="8368634861971949799">"Smart Forwarding"</string>
+ <string name="smart_forwarding_summary_enabled" msgid="3341062878373185604">"Smart Forwarding Enabled"</string>
+ <string name="smart_forwarding_summary_disabled" msgid="5033880700091914809">"Smart Forwarding Disabled"</string>
+ <string name="smart_forwarding_ongoing_title" msgid="962226849074401228">"Call Settings"</string>
+ <string name="smart_forwarding_ongoing_text" msgid="2189209372407117114">"Updating Settings..."</string>
+ <string name="smart_forwarding_failed_title" msgid="1859891191023516080">"Call Settings error"</string>
+ <string name="smart_forwarding_failed_text" msgid="5370431503707373653">"Network or SIM card error."</string>
+ <string name="smart_forwarding_failed_not_activated_text" msgid="997396203001257904">"Sim is not activated."</string>
+ <string name="smart_forwarding_input_mdn_title" msgid="5105463748849841763">"Enter Phone numbers"</string>
+ <string name="smart_forwarding_input_mdn_dialog_title" msgid="7542216086697868415">"Enter Phone number"</string>
+ <string name="smart_forwarding_missing_mdn_text" msgid="2907314684242542226">"Phone number is missing."</string>
+ <string name="smart_forwarding_missing_alert_dialog_text" msgid="7870419247987316112">"OK"</string>
</resources>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 9802c68..4c64258 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -149,7 +149,7 @@
<string name="connected_device_call_device_title" msgid="88732390601723608">"Dispositivos para llamar"</string>
<string name="connected_device_other_device_title" msgid="4652120430615729193">"Otros dispositivos"</string>
<string name="connected_device_saved_title" msgid="5607274378851905959">"Dispositivos guardados"</string>
- <string name="connected_device_add_device_summary" msgid="8671009879957120802">"Se activará el Bluetooth para sincronizar"</string>
+ <string name="connected_device_add_device_summary" msgid="8671009879957120802">"Se activará el Bluetooth para vincular"</string>
<string name="connected_device_connections_title" msgid="4164120115341579170">"Preferencias de conexión"</string>
<string name="connected_device_previously_connected_title" msgid="605808252622814415">"Dispositivos conectados previamente"</string>
<string name="connected_device_previously_connected_screen_title" msgid="8823331744788100605">"Conectados anteriormente"</string>
@@ -709,9 +709,9 @@
<string name="bluetooth_pin_values_hint_16_digits" msgid="5603928271430883558">"Debe contener 16 dígitos"</string>
<string name="bluetooth_enter_pin_other_device" msgid="6737778699899780717">"Puede que también tengas que escribir este PIN en el otro dispositivo."</string>
<string name="bluetooth_enter_passkey_other_device" msgid="8270426446247344709">"Puede que también tengas que escribir esta clave de acceso en otro dispositivo."</string>
- <string name="bluetooth_confirm_passkey_msg" msgid="327192310468680072">"Para sincronizar con<br><b><xliff:g id="DEVICE_NAME">%1$s</xliff:g></b><br><br>asegúrate de que se muestre esta clave de acceso:<br><b><xliff:g id="PASSKEY">%2$s</xliff:g></b>."</string>
+ <string name="bluetooth_confirm_passkey_msg" msgid="327192310468680072">"Para vincular con<br><b><xliff:g id="DEVICE_NAME">%1$s</xliff:g></b><br><br>asegúrate de que se muestre esta clave de acceso:<br><b><xliff:g id="PASSKEY">%2$s</xliff:g></b>."</string>
<string name="bluetooth_incoming_pairing_msg" msgid="1068123527866596779">"¿Desde: <br><b><xliff:g id="DEVICE_NAME">%1$s</xliff:g></b><br><br>sincronizas con este dispositivo?"</string>
- <string name="bluetooth_display_passkey_pin_msg" msgid="8672803845151786521">"Para sincronizar con:<xliff:g id="BOLD1_0"><br><b></xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD1"></b><br><br></xliff:g>Escribe allí:<xliff:g id="BOLD2_1"><br><b></xliff:g><xliff:g id="PASSKEY">%2$s</xliff:g><xliff:g id="END_BOLD2"></b></xliff:g> y luego presiona Volver o Enter."</string>
+ <string name="bluetooth_display_passkey_pin_msg" msgid="8672803845151786521">"Para vincular con:<xliff:g id="BOLD1_0"><br><b></xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD1"></b><br><br></xliff:g>Escribe allí:<xliff:g id="BOLD2_1"><br><b></xliff:g><xliff:g id="PASSKEY">%2$s</xliff:g><xliff:g id="END_BOLD2"></b></xliff:g> y luego presiona Volver o Enter."</string>
<string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"Permitir el acceso a tus contactos y al historial de llamadas"</string>
<string name="bluetooth_error_title" msgid="2284738188253690278"></string>
<string name="bluetooth_connecting_error_message" msgid="3941893154784152112">"No se pudo establecer conexión con <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
@@ -2261,7 +2261,7 @@
<string name="accessibility_hearingaid_title" msgid="427173678199203191">"Audífonos"</string>
<string name="accessibility_hearingaid_not_connected_summary" msgid="3371427366765435743">"No hay audífonos conectados"</string>
<string name="accessibility_hearingaid_adding_summary" msgid="999051610528600783">"Agregar audífonos"</string>
- <string name="accessibility_hearingaid_pair_instructions_message" msgid="8913409742121315657">"Para sincronizar tus audífonos, busca y presiona tu dispositivo en la pantalla siguiente. Asegúrate de que tus audífonos estén en modo de sincronización."</string>
+ <string name="accessibility_hearingaid_pair_instructions_message" msgid="8913409742121315657">"Para vincular tus audífonos, busca y presiona tu dispositivo en la pantalla siguiente. Asegúrate de que tus audífonos estén en modo de vinculación."</string>
<string name="accessibility_hearingaid_active_device_summary" msgid="509703438222873967">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> activo"</string>
<plurals name="show_number_hearingaid_count" formatted="false" msgid="776000580683647556">
<item quantity="other"><xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> audífonos guardados</item>
@@ -2436,6 +2436,7 @@
<string name="bluetooth_on_time" msgid="8424625554628450028">"Wi-Fi a tiempo"</string>
<string name="advanced_battery_title" msgid="3005993394776555079">"Uso de la batería"</string>
<string name="history_details_title" msgid="8628584613889559355">"Detalles del historial"</string>
+ <string name="advanced_battery_preference_title" msgid="6518802648205311326">"Ver uso de la batería"</string>
<string name="battery_details_title" msgid="4531369291819754178">"Uso de la batería"</string>
<string name="details_subtitle" msgid="2550872569652785527">"Detalles de uso"</string>
<string name="controls_subtitle" msgid="3759606830916441564">"Ajustar el uso de energía"</string>
@@ -3317,7 +3318,7 @@
<string name="keywords_zen_mode_settings" msgid="7810203406522669584">"no interrumpir, programar, notificaciones, bloquear, silenciar, vibrar, suspender, trabajar, enfocar, sonido, silencio, día, día de la semana, fin de semana, noche de la semana, evento"</string>
<string name="keywords_screen_timeout" msgid="8921857020437540572">"pantalla, tiempo de bloqueo, tiempo de espera de la pantalla, bloqueo de pantalla"</string>
<string name="keywords_storage_settings" msgid="6018856193950281898">"memoria, caché, datos, eliminar, borrar, liberar, espacio"</string>
- <string name="keywords_bluetooth_settings" msgid="2588159530959868188">"conectado, dispositivo, audífonos, auriculares, bocina, inalámbrico, sincronizar, auricular, música, multimedia"</string>
+ <string name="keywords_bluetooth_settings" msgid="2588159530959868188">"conectado, dispositivo, audífonos, auriculares, bocina, inalámbrico, vincular, auricular, música, multimedia"</string>
<string name="keywords_wallpaper" msgid="6712776876474488023">"fondo, pantalla, pantalla bloqueada, tema"</string>
<string name="keywords_styles" msgid="6312134005271042434">"forma del ícono, color destacado, fuente"</string>
<string name="keywords_assist_input" msgid="3086289530227075593">"predeterminado, asistente"</string>
@@ -4097,6 +4098,7 @@
<string name="usb_use" msgid="6783183432648438528">"Utilizar USB para lo siguiente:"</string>
<string name="usb_default_label" msgid="3372838450371060750">"Configuración predeterminada de USB"</string>
<string name="usb_default_info" msgid="167172599497085266">"Si conectas otro dispositivo cuando tu teléfono está desbloqueado, se aplicará esta configuración. Solo debes conectar dispositivos de confianza."</string>
+ <string name="usb_power_title" msgid="5602112548385798646">"Opciones de encendido"</string>
<string name="usb_pref" msgid="8521832005703261700">"USB"</string>
<string name="usb_preference" msgid="5084550082591493765">"Preferencias de USB"</string>
<string name="usb_control_title" msgid="1946791559052157693">"USB controlado por"</string>
@@ -4936,8 +4938,8 @@
<string name="mobile_data_ap_mode_disabled" msgid="6067959496888990983">"No disponible en modo de avión"</string>
<string name="force_desktop_mode" msgid="1336913605091334238">"Forzar modo de escritorio"</string>
<string name="force_desktop_mode_summary" msgid="4587416867846930479">"Forzar el modo de escritorio experimental en pantallas secundarias"</string>
- <string name="enable_sizecompat_freeform" msgid="3799755160777404309">"Habilitar sizecompat para freeform"</string>
- <string name="enable_sizecompat_freeform_summary" msgid="1484050174538201499">"Permite que las apps sizecompat usen el formato freeform"</string>
+ <string name="enable_non_resizable_multi_window" msgid="6832903754625404477">"Habilitar apps que no cambian de tamaño en Multiventana"</string>
+ <string name="enable_non_resizable_multi_window_summary" msgid="3275763753261901999">"Permite que las apps que no cambian de tamaño aparezcan en Multiventana"</string>
<string name="hwui_force_dark_title" msgid="4256904905631994219">"Anular forzar el modo oscuro"</string>
<string name="hwui_force_dark_summary" msgid="6515748781487952769">"Anula la función forzar el modo oscuro para que esté siempre activo"</string>
<string name="enable_blurs_on_windows_title" msgid="4218144213800778872">"Habilitar difuminado"</string>
@@ -5059,8 +5061,8 @@
<string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"avión, segura para aviones"</string>
<string name="calls_and_sms" msgid="1931855083959003306">"Llamadas y SMS"</string>
<string name="calls_and_sms_category" msgid="2021321997884906046">"Llamada por Wi‑Fi"</string>
- <string name="calls_sms_wfc_summary" msgid="4930471357980272294">"Hacer y recibir llamadas a través de redes que no pertenecen a ningún proveedor, como Wi‑Fi"</string>
- <string name="calls_sms_footnote" msgid="7002461875954024216">"Con las Llamadas por Wi‑Fi, puedes llamar y recibir llamadas a través de redes que no son de proveedores, como algunas redes Wi‑Fi."</string>
+ <string name="calls_sms_wfc_summary" msgid="3940529919408667336">"Hacer y recibir llamadas a través de Wi-Fi"</string>
+ <string name="calls_sms_footnote" msgid="8051604228144899434">"Con las Llamadas por Wi-Fi, puedes hacer y recibir llamadas a través de redes que no son de proveedores de Wi-Fi."</string>
<string name="calls_preference_title" msgid="7536882032182563800">"Llamadas"</string>
<string name="sms_preference_title" msgid="8392745501754864395">"SMS"</string>
<string name="calls_sms_preferred" msgid="6016477652522583496">"preferencia"</string>
@@ -5079,10 +5081,10 @@
<string name="reset_internet_text" product="tablet" msgid="8797910368942544453">"Esta acción finalizará la llamada telefónica"</string>
<string name="resetting_internet_text" msgid="6696779371800051806">"Restableciendo conexión a Internet…"</string>
<string name="fix_connectivity" msgid="2781433603228089501">"Corregir conectividad"</string>
- <!-- no translation found for airplane_mode_network_available (1059499681300395240) -->
- <skip />
- <!-- no translation found for to_switch_networks_disconnect_ethernet (6615374552827587197) -->
- <skip />
+ <string name="airplane_mode_network_available" msgid="1059499681300395240">"Hay redes disponibles para el modo de avión"</string>
+ <string name="to_switch_networks_disconnect_ethernet" msgid="6615374552827587197">"Para cambiar de red, desconéctate de Ethernet"</string>
+ <string name="cannot_switch_networks_while_connected" msgid="3867944849171754777">"No puedes cambiar de red si te conectaste a Ethernet"</string>
+ <string name="airplane_mode_network_panel_title" msgid="6385046104863403604">"Redes del modo de avión"</string>
<string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g>/<xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
<string name="mobile_data_connection_active" msgid="2422223108911581552">"Conexión establecida"</string>
<string name="mobile_data_off_summary" msgid="3841411571485837651">"No se conectará automáticamente a Internet"</string>
@@ -5104,4 +5106,16 @@
<string name="category_name_others" msgid="2366006298768550310">"Otras opciones"</string>
<string name="category_name_general" msgid="7737273712848115886">"General"</string>
<string name="default_see_all_apps_title" msgid="7481113230662612178">"Ver todas las apps"</string>
+ <string name="smart_forwarding_title" msgid="8368634861971949799">"Desvío inteligente"</string>
+ <string name="smart_forwarding_summary_enabled" msgid="3341062878373185604">"Se habilitó el Desvío inteligente"</string>
+ <string name="smart_forwarding_summary_disabled" msgid="5033880700091914809">"Se inhabilitó el Desvío inteligente"</string>
+ <string name="smart_forwarding_ongoing_title" msgid="962226849074401228">"Configuración de llamada"</string>
+ <string name="smart_forwarding_ongoing_text" msgid="2189209372407117114">"Actualizando la configuración…"</string>
+ <string name="smart_forwarding_failed_title" msgid="1859891191023516080">"Error de configuración de llamadas"</string>
+ <string name="smart_forwarding_failed_text" msgid="5370431503707373653">"Error en la red o en la tarjeta SIM."</string>
+ <string name="smart_forwarding_failed_not_activated_text" msgid="997396203001257904">"No se activó la SIM."</string>
+ <string name="smart_forwarding_input_mdn_title" msgid="5105463748849841763">"Ingresa los números de teléfono"</string>
+ <string name="smart_forwarding_input_mdn_dialog_title" msgid="7542216086697868415">"Ingresa el número de teléfono"</string>
+ <string name="smart_forwarding_missing_mdn_text" msgid="2907314684242542226">"Falta el número de teléfono."</string>
+ <string name="smart_forwarding_missing_alert_dialog_text" msgid="7870419247987316112">"Aceptar"</string>
</resources>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 96d0f06..bfe61df 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -1212,14 +1212,14 @@
<string name="peak_refresh_rate_summary" msgid="1527087897198455042">"Aumenta automáticamente la frecuencia de actualización de 60 a 90 Hz en determinados tipos de contenido. Se usará más batería."</string>
<string name="force_high_refresh_rate_toggle" msgid="5861514655252832828">"Forzar frecuencia de actualización de 90 Hz"</string>
<string name="force_high_refresh_rate_desc" msgid="7794566420873814875">"Se utiliza la mayor frecuencia de actualización posible para mejorar la capacidad de respuesta a toques y la calidad de las animaciones. Aumenta el uso de batería."</string>
- <string name="adaptive_sleep_title" msgid="2987961991423539233">"Atención a la pantalla"</string>
+ <string name="adaptive_sleep_title" msgid="2987961991423539233">"Pantalla atenta"</string>
<string name="adaptive_sleep_summary_on" msgid="313187971631243800">"Activado / La pantalla no se apagará si estás mirándola"</string>
<string name="adaptive_sleep_summary_off" msgid="5272156339202897523">"Desactivado"</string>
<string name="adaptive_sleep_title_no_permission" msgid="1719759921214237016">"Se necesita acceso a la cámara"</string>
<string name="adaptive_sleep_summary_no_permission" msgid="5107880175176848307">"Toca para gestionar los permisos de Servicios de personalización del dispositivo"</string>
<string name="adaptive_sleep_description" msgid="1835321775327187860">"Evita que la pantalla se apague si estás mirándola"</string>
- <string name="adaptive_sleep_privacy" msgid="7664570136417980556">"La función de atención a la pantalla usa la cámara frontal para detectar si hay alguien mirando la pantalla. Funciona solo directamente en este dispositivo, y las imágenes no se almacenan ni se envían a Google."</string>
- <string name="adaptive_sleep_contextual_slice_title" msgid="7467588613212629758">"Activa la atención a la pantalla"</string>
+ <string name="adaptive_sleep_privacy" msgid="7664570136417980556">"La función Pantalla atenta usa la cámara frontal para detectar si hay alguien mirando la pantalla. Funciona solo en el dispositivo y las imágenes no se almacenan ni se envían a Google."</string>
+ <string name="adaptive_sleep_contextual_slice_title" msgid="7467588613212629758">"Activa Pantalla atenta"</string>
<string name="adaptive_sleep_contextual_slice_summary" msgid="2993867044745446094">"Mantiene la pantalla encendida al mirarla"</string>
<string name="night_display_title" msgid="8532432776487216581">"Luz nocturna"</string>
<string name="night_display_text" msgid="4789324042428095383">"La luz nocturna da un tono ámbar a la pantalla. De esta forma, es más fácil ver la pantalla con poca luz y conciliar el sueño."</string>
@@ -2267,8 +2267,7 @@
<item quantity="other">Se han guardado <xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> audífonos</item>
<item quantity="one">Se ha guardado <xliff:g id="NUMBER_DEVICE_COUNT_0">%1$d</xliff:g> audífono</item>
</plurals>
- <!-- no translation found for accessibility_audio_adjustment_title (1332113739136802997) -->
- <skip />
+ <string name="accessibility_audio_adjustment_title" msgid="1332113739136802997">"Ajuste de audio"</string>
<string name="accessibility_summary_shortcut_enabled" msgid="4030427268146752644">"Acceso directo activado"</string>
<string name="accessibility_summary_shortcut_disabled" msgid="564005462092499068">"Desactivada"</string>
<string name="accessibility_summary_state_enabled" msgid="1065431632216039369">"Activado"</string>
@@ -2437,6 +2436,7 @@
<string name="bluetooth_on_time" msgid="8424625554628450028">"Tiempo de conexión Wi-Fi"</string>
<string name="advanced_battery_title" msgid="3005993394776555079">"Uso de la batería"</string>
<string name="history_details_title" msgid="8628584613889559355">"Detalles del historial"</string>
+ <string name="advanced_battery_preference_title" msgid="6518802648205311326">"Ver el uso de batería"</string>
<string name="battery_details_title" msgid="4531369291819754178">"Uso de batería"</string>
<string name="details_subtitle" msgid="2550872569652785527">"Detalles de uso"</string>
<string name="controls_subtitle" msgid="3759606830916441564">"Cómo reducir el uso de la batería"</string>
@@ -4098,6 +4098,7 @@
<string name="usb_use" msgid="6783183432648438528">"Utilizar USB para"</string>
<string name="usb_default_label" msgid="3372838450371060750">"Configuración de USB predeterminada"</string>
<string name="usb_default_info" msgid="167172599497085266">"Estos ajustes se aplicarán cuando otro dispositivo esté conectado y tu teléfono esté desbloqueado. Conecta únicamente dispositivos de confianza."</string>
+ <string name="usb_power_title" msgid="5602112548385798646">"Opciones de encendido"</string>
<string name="usb_pref" msgid="8521832005703261700">"USB"</string>
<string name="usb_preference" msgid="5084550082591493765">"Preferencias de USB"</string>
<string name="usb_control_title" msgid="1946791559052157693">"USB controlado por"</string>
@@ -4937,8 +4938,8 @@
<string name="mobile_data_ap_mode_disabled" msgid="6067959496888990983">"No están disponibles en modo avión"</string>
<string name="force_desktop_mode" msgid="1336913605091334238">"Forzar modo de escritorio"</string>
<string name="force_desktop_mode_summary" msgid="4587416867846930479">"Forzar el modo de escritorio experimental en pantallas secundarias"</string>
- <string name="enable_sizecompat_freeform" msgid="3799755160777404309">"Activar formato libre de aplicaciones compatibles"</string>
- <string name="enable_sizecompat_freeform_summary" msgid="1484050174538201499">"Permitir que las aplicaciones con tamaño compatible tengan formato libre"</string>
+ <string name="enable_non_resizable_multi_window" msgid="6832903754625404477">"Habilitar tamaño no modificable en la función multiventana"</string>
+ <string name="enable_non_resizable_multi_window_summary" msgid="3275763753261901999">"Permite que las aplicaciones de tamaño no modificable se muestren en la función multiventana"</string>
<string name="hwui_force_dark_title" msgid="4256904905631994219">"Forzar el modo oscuro"</string>
<string name="hwui_force_dark_summary" msgid="6515748781487952769">"Forzar el modo oscuro para que esté siempre activo"</string>
<string name="enable_blurs_on_windows_title" msgid="4218144213800778872">"Habilitar difuminado"</string>
@@ -5060,8 +5061,8 @@
<string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"modo avión, seguro para modo avión"</string>
<string name="calls_and_sms" msgid="1931855083959003306">"Llamadas y SMS"</string>
<string name="calls_and_sms_category" msgid="2021321997884906046">"Llamada por Wi-Fi"</string>
- <string name="calls_sms_wfc_summary" msgid="4930471357980272294">"Llama o recibe llamadas por redes que no sean de ningún operador, como redes Wi-Fi"</string>
- <string name="calls_sms_footnote" msgid="7002461875954024216">"Con las llamadas por Wi‑Fi, puedes llamar y recibir llamadas por redes que no son de operadores, como ciertas redes Wi‑Fi."</string>
+ <string name="calls_sms_wfc_summary" msgid="3940529919408667336">"Llamar y recibir llamadas por Wi‐Fi"</string>
+ <string name="calls_sms_footnote" msgid="8051604228144899434">"Con las llamadas por Wi‐Fi, puedes llamar y recibir llamadas por redes Wi‐Fi que no son de operadores."</string>
<string name="calls_preference_title" msgid="7536882032182563800">"Llamadas"</string>
<string name="sms_preference_title" msgid="8392745501754864395">"SMS"</string>
<string name="calls_sms_preferred" msgid="6016477652522583496">"preferida"</string>
@@ -5080,10 +5081,10 @@
<string name="reset_internet_text" product="tablet" msgid="8797910368942544453">"Así finalizará la llamada"</string>
<string name="resetting_internet_text" msgid="6696779371800051806">"Restableciendo tu conexión a Internet…"</string>
<string name="fix_connectivity" msgid="2781433603228089501">"Arreglar conectividad"</string>
- <!-- no translation found for airplane_mode_network_available (1059499681300395240) -->
- <skip />
- <!-- no translation found for to_switch_networks_disconnect_ethernet (6615374552827587197) -->
- <skip />
+ <string name="airplane_mode_network_available" msgid="1059499681300395240">"Redes disponibles en el modo avión"</string>
+ <string name="to_switch_networks_disconnect_ethernet" msgid="6615374552827587197">"Para cambiar de red, desconecta el cable Ethernet"</string>
+ <string name="cannot_switch_networks_while_connected" msgid="3867944849171754777">"No se puede cambiar de red con el dispositivo conectado"</string>
+ <string name="airplane_mode_network_panel_title" msgid="6385046104863403604">"Redes para modo avión"</string>
<string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g>/<xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
<string name="mobile_data_connection_active" msgid="2422223108911581552">"Conectada"</string>
<string name="mobile_data_off_summary" msgid="3841411571485837651">"Internet no se conectará automáticamente"</string>
@@ -5105,4 +5106,16 @@
<string name="category_name_others" msgid="2366006298768550310">"Otros"</string>
<string name="category_name_general" msgid="7737273712848115886">"General"</string>
<string name="default_see_all_apps_title" msgid="7481113230662612178">"Ver todas las aplicaciones"</string>
+ <string name="smart_forwarding_title" msgid="8368634861971949799">"Desvío inteligente"</string>
+ <string name="smart_forwarding_summary_enabled" msgid="3341062878373185604">"Desvío inteligente habilitado"</string>
+ <string name="smart_forwarding_summary_disabled" msgid="5033880700091914809">"Desvío inteligente inhabilitado"</string>
+ <string name="smart_forwarding_ongoing_title" msgid="962226849074401228">"Ajustes de llamada"</string>
+ <string name="smart_forwarding_ongoing_text" msgid="2189209372407117114">"Actualizando ajustes..."</string>
+ <string name="smart_forwarding_failed_title" msgid="1859891191023516080">"Error en los ajustes de llamada"</string>
+ <string name="smart_forwarding_failed_text" msgid="5370431503707373653">"Error en la tarjeta SIM o en la red."</string>
+ <string name="smart_forwarding_failed_not_activated_text" msgid="997396203001257904">"La SIM no está activada."</string>
+ <string name="smart_forwarding_input_mdn_title" msgid="5105463748849841763">"Introducir números de teléfono"</string>
+ <string name="smart_forwarding_input_mdn_dialog_title" msgid="7542216086697868415">"Introducir número de teléfono"</string>
+ <string name="smart_forwarding_missing_mdn_text" msgid="2907314684242542226">"Falta el número de teléfono."</string>
+ <string name="smart_forwarding_missing_alert_dialog_text" msgid="7870419247987316112">"Aceptar"</string>
</resources>
diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml
index f75cfc6..5684809 100644
--- a/res/values-et/strings.xml
+++ b/res/values-et/strings.xml
@@ -2267,8 +2267,7 @@
<item quantity="other"><xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> salvestatud kuuldeaparaati</item>
<item quantity="one"><xliff:g id="NUMBER_DEVICE_COUNT_0">%1$d</xliff:g> salvestatud kuuldeaparaat</item>
</plurals>
- <!-- no translation found for accessibility_audio_adjustment_title (1332113739136802997) -->
- <skip />
+ <string name="accessibility_audio_adjustment_title" msgid="1332113739136802997">"Heli kohandamine"</string>
<string name="accessibility_summary_shortcut_enabled" msgid="4030427268146752644">"Otsetee on sees"</string>
<string name="accessibility_summary_shortcut_disabled" msgid="564005462092499068">"Väljas"</string>
<string name="accessibility_summary_state_enabled" msgid="1065431632216039369">"Sees"</string>
@@ -2437,6 +2436,7 @@
<string name="bluetooth_on_time" msgid="8424625554628450028">"WiFi õigel ajal"</string>
<string name="advanced_battery_title" msgid="3005993394776555079">"Akukasutus"</string>
<string name="history_details_title" msgid="8628584613889559355">"Ajaloo üksikasjad"</string>
+ <string name="advanced_battery_preference_title" msgid="6518802648205311326">"Akukasutuse vaatamine"</string>
<string name="battery_details_title" msgid="4531369291819754178">"Akukasutus"</string>
<string name="details_subtitle" msgid="2550872569652785527">"Kasuta detaile"</string>
<string name="controls_subtitle" msgid="3759606830916441564">"Reguleerige energiakasutust"</string>
@@ -4098,6 +4098,7 @@
<string name="usb_use" msgid="6783183432648438528">"USB kasutusviis"</string>
<string name="usb_default_label" msgid="3372838450371060750">"USB-vaikeseadistus"</string>
<string name="usb_default_info" msgid="167172599497085266">"Kui teine seade on ühendatud ja teie telefon avatakse, rakendatakse need seaded. Looge ühendus ainult usaldusväärsete seadmetega."</string>
+ <string name="usb_power_title" msgid="5602112548385798646">"Toitevalikud"</string>
<string name="usb_pref" msgid="8521832005703261700">"USB"</string>
<string name="usb_preference" msgid="5084550082591493765">"USB eelistused"</string>
<string name="usb_control_title" msgid="1946791559052157693">"USB-liidest juhib"</string>
@@ -4937,8 +4938,8 @@
<string name="mobile_data_ap_mode_disabled" msgid="6067959496888990983">"Ei ole lennukirežiimis saadaval"</string>
<string name="force_desktop_mode" msgid="1336913605091334238">"Töölauarežiimi jõustamine"</string>
<string name="force_desktop_mode_summary" msgid="4587416867846930479">"Katselise töölauarežiimi jõustamine teisestel ekraanidel"</string>
- <string name="enable_sizecompat_freeform" msgid="3799755160777404309">"Luba kohandumatu suurusega rakendustele vaba vorm"</string>
- <string name="enable_sizecompat_freeform_summary" msgid="1484050174538201499">"Võimaldab kohandumatu suurusega rakendustel kasutada vaba vormi"</string>
+ <string name="enable_non_resizable_multi_window" msgid="6832903754625404477">"Luba fikseeritud suurus mitmes aknas"</string>
+ <string name="enable_non_resizable_multi_window_summary" msgid="3275763753261901999">"Lubab fikseeritud suurusega rakenduste kuvamise mitmes aknas"</string>
<string name="hwui_force_dark_title" msgid="4256904905631994219">"Funktsiooni Sunnitud tume alistamine"</string>
<string name="hwui_force_dark_summary" msgid="6515748781487952769">"Alistab funktsiooni Sunnitud tume ja lülitab selle alaliselt sisse"</string>
<string name="enable_blurs_on_windows_title" msgid="4218144213800778872">"Luba hägustamine"</string>
@@ -5060,8 +5061,8 @@
<string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"lennuk, lennukikindel"</string>
<string name="calls_and_sms" msgid="1931855083959003306">"Kõned ja SMS-id"</string>
<string name="calls_and_sms_category" msgid="2021321997884906046">"WiFi-kõned"</string>
- <string name="calls_sms_wfc_summary" msgid="4930471357980272294">"Helistamine ja kõnede vastuvõtmine operaatoriväliste võrkude kaudu (nt WiFi-võrgud)"</string>
- <string name="calls_sms_footnote" msgid="7002461875954024216">"WiFi-kõned võimaldavad teil helistada ja kõnesid vastu võtta operaatoriväliste võrkude kaudu (nt mõned WiFi-võrgud)."</string>
+ <string name="calls_sms_wfc_summary" msgid="3940529919408667336">"Helistamine WiFi kaudu"</string>
+ <string name="calls_sms_footnote" msgid="8051604228144899434">"WiFi-kõnede puhul toimub helistamine operaatoriväliste WiFi-võrkude kaudu."</string>
<string name="calls_preference_title" msgid="7536882032182563800">"Kõned"</string>
<string name="sms_preference_title" msgid="8392745501754864395">"SMS"</string>
<string name="calls_sms_preferred" msgid="6016477652522583496">"eelistatud"</string>
@@ -5080,10 +5081,10 @@
<string name="reset_internet_text" product="tablet" msgid="8797910368942544453">"See lõpetab teie telefonikõne"</string>
<string name="resetting_internet_text" msgid="6696779371800051806">"Internetiühenduse lähtestamine …"</string>
<string name="fix_connectivity" msgid="2781433603228089501">"Ühenduvuse parandamine"</string>
- <!-- no translation found for airplane_mode_network_available (1059499681300395240) -->
- <skip />
- <!-- no translation found for to_switch_networks_disconnect_ethernet (6615374552827587197) -->
- <skip />
+ <string name="airplane_mode_network_available" msgid="1059499681300395240">"Saadaolevad lennukirežiimi võrgud"</string>
+ <string name="to_switch_networks_disconnect_ethernet" msgid="6615374552827587197">"Võrkude vahetamiseks katkestage Etherneti-ühendus"</string>
+ <string name="cannot_switch_networks_while_connected" msgid="3867944849171754777">"Ühenduse korral ei saa võrku vahetada"</string>
+ <string name="airplane_mode_network_panel_title" msgid="6385046104863403604">"Lennukirežiimi võrgud"</string>
<string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g>/<xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
<string name="mobile_data_connection_active" msgid="2422223108911581552">"Ühendatud"</string>
<string name="mobile_data_off_summary" msgid="3841411571485837651">"Internetiühendust ei looda automaatselt"</string>
@@ -5105,4 +5106,16 @@
<string name="category_name_others" msgid="2366006298768550310">"Muud"</string>
<string name="category_name_general" msgid="7737273712848115886">"Üldine"</string>
<string name="default_see_all_apps_title" msgid="7481113230662612178">"Kuva kõik rakendused"</string>
+ <string name="smart_forwarding_title" msgid="8368634861971949799">"Nutikas suunamine"</string>
+ <string name="smart_forwarding_summary_enabled" msgid="3341062878373185604">"Nutikas suunamine on lubatud"</string>
+ <string name="smart_forwarding_summary_disabled" msgid="5033880700091914809">"Nutikas suunamine on keelatud"</string>
+ <string name="smart_forwarding_ongoing_title" msgid="962226849074401228">"Kõne seaded"</string>
+ <string name="smart_forwarding_ongoing_text" msgid="2189209372407117114">"Seadete värskendamine …"</string>
+ <string name="smart_forwarding_failed_title" msgid="1859891191023516080">"Kõneseadete viga"</string>
+ <string name="smart_forwarding_failed_text" msgid="5370431503707373653">"Võrgu või SIM-kaardi viga."</string>
+ <string name="smart_forwarding_failed_not_activated_text" msgid="997396203001257904">"SIM-kaart pole aktiveeritud."</string>
+ <string name="smart_forwarding_input_mdn_title" msgid="5105463748849841763">"Sisestage telefoninumbrid"</string>
+ <string name="smart_forwarding_input_mdn_dialog_title" msgid="7542216086697868415">"Sisestage telefoninumber"</string>
+ <string name="smart_forwarding_missing_mdn_text" msgid="2907314684242542226">"Telefoninumber puudub."</string>
+ <string name="smart_forwarding_missing_alert_dialog_text" msgid="7870419247987316112">"OK"</string>
</resources>
diff --git a/res/values-eu/strings.xml b/res/values-eu/strings.xml
index 5d40675..a68d9b5 100644
--- a/res/values-eu/strings.xml
+++ b/res/values-eu/strings.xml
@@ -1087,9 +1087,9 @@
<string name="wifi_add_app_networks_summary" product="tablet" msgid="2088967184512169910">"<xliff:g id="APPNAME">%1$s</xliff:g> aplikazioak tabletan gorde nahi ditu sare hauek"</string>
<string name="wifi_add_app_networks_saving_summary" msgid="577680250954742033">"<xliff:g id="NUMBER">%d</xliff:g> sare gordetzen…"</string>
<string name="wifi_add_app_networks_saved_summary" msgid="1648417628665152905">"Gorde dira sareak"</string>
- <string name="wifi_calling_settings_title" msgid="264665264535884440">"Wi-Fi bidezko deiak"</string>
+ <string name="wifi_calling_settings_title" msgid="264665264535884440">"Wifi bidezko deiak"</string>
<string name="wifi_calling_suggestion_title" msgid="4791435106729906727">"Zabaldu deiak egiteko aukera Wi‑Fi konexioarekin"</string>
- <string name="wifi_calling_suggestion_summary" msgid="5413024679599742858">"Aktibatu Wi‑Fi bidezko deiak estaldura zabaltzeko"</string>
+ <string name="wifi_calling_suggestion_summary" msgid="5413024679599742858">"Aktibatu Wifi bidezko deiak estaldura zabaltzeko"</string>
<string name="wifi_calling_mode_title" msgid="5145896168360825619">"Deitzeko aukera lehenetsiak"</string>
<string name="wifi_calling_mode_dialog_title" msgid="944146521898592440">"Deitzeko aukera hobetsia"</string>
<string name="wifi_calling_roaming_mode_title" msgid="7703305991991520773">"Ibiltaritzako hobespena"</string>
@@ -1115,9 +1115,9 @@
<string name="private_dns_help_message" msgid="851221502063782306"><annotation id="url">"Lortu informazio gehiago"</annotation>" DNS pribatuaren eginbideei buruz"</string>
<string name="private_dns_mode_on" msgid="8878679071975375696">"Aktibatuta"</string>
<string name="wifi_calling_pref_managed_by_carrier" msgid="129524064888622179">"Operadoreak kudeatzen du ezarpen hau"</string>
- <string name="wifi_calling_settings_activation_instructions" msgid="3936067355828542266">"Aktibatu Wi-Fi bidezko deiak"</string>
- <string name="wifi_calling_turn_on" msgid="7687886259199428823">"Aktibatu Wi-Fi bidezko deiak"</string>
- <string name="wifi_calling_not_supported" msgid="3303917737849393175">"%1$s operadoreak ez ditu onartzen Wi‑Fi bidezko deiak"</string>
+ <string name="wifi_calling_settings_activation_instructions" msgid="3936067355828542266">"Aktibatu Wifi bidezko deiak"</string>
+ <string name="wifi_calling_turn_on" msgid="7687886259199428823">"Aktibatu Wifi bidezko deiak"</string>
+ <string name="wifi_calling_not_supported" msgid="3303917737849393175">"%1$s operadoreak ez ditu onartzen wifi bidezko deiak"</string>
<string name="wifi_disconnected_from" msgid="5249576734324159708">"<xliff:g id="SSID">%1$s</xliff:g> saretik deskonektatu zara"</string>
<string name="carrier" msgid="1755020806290963951">"Operadorea"</string>
<string name="display_settings_title" msgid="626835071804834218">"Pantaila"</string>
@@ -1885,7 +1885,7 @@
<string name="forgot_password_text" msgid="2583194470767613163">"PIN kodea, eredua edo pasahitza berrezartzen lagunduko dizu"</string>
<string name="install_all_warning" product="tablet" msgid="7010749217925069520">"Tabletak eta datu pertsonalek aplikazio ezezagunen erasoak jaso ditzakete. Iturburu honetako aplikazioak instalatzen badituzu, onartzen duzu haiek erabiltzeagatik tabletari gerta dakizkiokeen kalteen edo datu-galeren erantzulea zeu zarela."</string>
<string name="install_all_warning" product="default" msgid="652516435709047343">"Telefonoak eta datu pertsonalek aplikazio ezezagunen erasoak jaso ditzakete. Iturburu honetako aplikazioak instalatzen badituzu, onartzen duzu haiek erabiltzeagatik telefonoari gerta dakizkiokeen kalteen edo datu-galeren erantzulea zeu zarela."</string>
- <string name="install_all_warning" product="device" msgid="2348262609815354500">"Gailuak eta datu pertsonalek aplikazio ezezagunen erasoak jaso ditzakete. Iturburu honetako aplikazioak instalatzen badituzu, onartu egingo duzu haiek erabiltzeagatik gailuari agian gertatuko zaizkion kalteen edo datu-galeren erantzulea zeu izango zarela."</string>
+ <string name="install_all_warning" product="device" msgid="2348262609815354500">"Gailuak eta datu pertsonalek aplikazio ezezagunen erasoak jaso ditzakete. Iturburu honetako aplikazioak instalatzen badituzu, onartuko duzu haiek erabiltzeagatik gailuari agian gertatuko zaizkion kalteen edo datu-galeren erantzulea zeu izango zarela."</string>
<string name="advanced_settings" msgid="2368905204839169094">"Ezarpen aurreratuak"</string>
<string name="advanced_settings_summary" msgid="1823765348195530035">"Gaitu ezarpenen aukera gehiago"</string>
<string name="application_info_label" msgid="1015706497694165866">"Aplikazioen informazioa"</string>
@@ -2118,7 +2118,7 @@
<string name="widget_picker_title" msgid="7641298325488989676">"Aukeratu widgeta"</string>
<string name="allow_bind_app_widget_activity_allow_bind_title" msgid="3537968409832846255">"Widgeta sortu eta sartzeko baimena eman?"</string>
<string name="allow_bind_app_widget_activity_allow_bind" msgid="5694218981358874429">"Widgeta sortu ondoren, <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> ostalariak bistaratzen dituen datu guztiak atzitu ahal izango ditu."</string>
- <string name="allow_bind_app_widget_activity_always_allow_bind" msgid="7268758525344468364">"Eman baimena beti widgetak sortzeko eta haietako datuak atzitzeko <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> ostalariari"</string>
+ <string name="allow_bind_app_widget_activity_always_allow_bind" msgid="7268758525344468364">"Eman widgetak sortzeko eta haietako datuak atzitzeko baimena beti <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> ostalariari"</string>
<string name="usage_stats_label" msgid="6523644917803320085">"Erabilera-estatistikak"</string>
<string name="testing_usage_stats" msgid="4660643799010906365">"Erabilera-estatistikak"</string>
<string name="display_order_text" msgid="7120394778684605892">"Ordenatzeko irizpidea:"</string>
@@ -2267,8 +2267,7 @@
<item quantity="other"><xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> audifono gorde dira</item>
<item quantity="one"><xliff:g id="NUMBER_DEVICE_COUNT_0">%1$d</xliff:g> audifono gorde da</item>
</plurals>
- <!-- no translation found for accessibility_audio_adjustment_title (1332113739136802997) -->
- <skip />
+ <string name="accessibility_audio_adjustment_title" msgid="1332113739136802997">"Audio-doikuntza"</string>
<string name="accessibility_summary_shortcut_enabled" msgid="4030427268146752644">"Lasterbidea aktibatuta"</string>
<string name="accessibility_summary_shortcut_disabled" msgid="564005462092499068">"Desaktibatuta"</string>
<string name="accessibility_summary_state_enabled" msgid="1065431632216039369">"Aktibatuta"</string>
@@ -2437,6 +2436,7 @@
<string name="bluetooth_on_time" msgid="8424625554628450028">"Wi-Fi garaiz"</string>
<string name="advanced_battery_title" msgid="3005993394776555079">"Bateria-erabilera"</string>
<string name="history_details_title" msgid="8628584613889559355">"Historiaren xehetasunak"</string>
+ <string name="advanced_battery_preference_title" msgid="6518802648205311326">"Ikusi bateria-erabilera"</string>
<string name="battery_details_title" msgid="4531369291819754178">"Bateria-erabilera"</string>
<string name="details_subtitle" msgid="2550872569652785527">"Erabilera-xehetasunak"</string>
<string name="controls_subtitle" msgid="3759606830916441564">"Doitu energia-erabilera"</string>
@@ -4098,6 +4098,7 @@
<string name="usb_use" msgid="6783183432648438528">"Erabili USB bidezko konexioa honetarako:"</string>
<string name="usb_default_label" msgid="3372838450371060750">"USB konfigurazio lehenetsia"</string>
<string name="usb_default_info" msgid="167172599497085266">"Beste gailu bat konektatuta eta zure telefonoa desblokeatuta dagoenean aplikatuko dira ezarpen hauek. Konektatu gailu fidagarrietara bakarrik."</string>
+ <string name="usb_power_title" msgid="5602112548385798646">"Bateria kontrolatzeko aukerak"</string>
<string name="usb_pref" msgid="8521832005703261700">"USB"</string>
<string name="usb_preference" msgid="5084550082591493765">"USB bidezko konexioaren hobespenak"</string>
<string name="usb_control_title" msgid="1946791559052157693">"Honek kontrolatzen du USB bidezko konexioa:"</string>
@@ -4937,8 +4938,8 @@
<string name="mobile_data_ap_mode_disabled" msgid="6067959496888990983">"Ez dago erabilgarri hegaldi moduan"</string>
<string name="force_desktop_mode" msgid="1336913605091334238">"Behartu mahaigainerako modua erabiltzera"</string>
<string name="force_desktop_mode_summary" msgid="4587416867846930479">"Behartu mahaigainerako modu esperimentala erabiltzera bigarren mailako pantailetan"</string>
- <string name="enable_sizecompat_freeform" msgid="3799755160777404309">"Gaitu estilo librea tamaina-bateragarritasunetan"</string>
- <string name="enable_sizecompat_freeform_summary" msgid="1484050174538201499">"Estilo libreko leihoak erabiltzeko baimena ematen die tamaina-bateragarritasuna duten aplikazioei"</string>
+ <string name="enable_non_resizable_multi_window" msgid="6832903754625404477">"Gaitu tamaina aldagarria ez duten aplikazioak leiho anitzeko moduan"</string>
+ <string name="enable_non_resizable_multi_window_summary" msgid="3275763753261901999">"Tamaina aldagarria ez duten aplikazioak leiho anitzeko moduan izateko aukera ematen du"</string>
<string name="hwui_force_dark_title" msgid="4256904905631994219">"Ez aplikatu gai iluna"</string>
<string name="hwui_force_dark_summary" msgid="6515748781487952769">"Gai iluna beti aktibatuta egoteko eskakizuna gainidazten du"</string>
<string name="enable_blurs_on_windows_title" msgid="4218144213800778872">"Gaitu lausotzeak"</string>
@@ -5059,9 +5060,9 @@
<string name="airplane_safe_networks_summary" msgid="4879620804022818385">"Aurkitu hegaldi moduko sareak eta konektatu haietara."</string>
<string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"hegaldia, hegaldietarako segurua"</string>
<string name="calls_and_sms" msgid="1931855083959003306">"Deiak eta SMSak"</string>
- <string name="calls_and_sms_category" msgid="2021321997884906046">"Wi‑Fi bidezko deiak"</string>
- <string name="calls_sms_wfc_summary" msgid="4930471357980272294">"Egin eta jaso deiak wifia eta operadore batenak ez diren antzeko sareen bitartez"</string>
- <string name="calls_sms_footnote" msgid="7002461875954024216">"Wifi bidezko deiekin, deiak egin eta jaso ahalko dituzu operadore batenak ez diren sareen bitartez (adibidez, zenbait wifi-sare)."</string>
+ <string name="calls_and_sms_category" msgid="2021321997884906046">"Wifi bidezko deiak"</string>
+ <string name="calls_sms_wfc_summary" msgid="3940529919408667336">"Egin eta jaso deiak wifi bidez"</string>
+ <string name="calls_sms_footnote" msgid="8051604228144899434">"Wifi bidezko deietan, operadore batenak ez diren wifi-sareen bidez egin eta jasotzen dira deiak."</string>
<string name="calls_preference_title" msgid="7536882032182563800">"Deiak"</string>
<string name="sms_preference_title" msgid="8392745501754864395">"SMSa"</string>
<string name="calls_sms_preferred" msgid="6016477652522583496">"hobetsiak"</string>
@@ -5080,10 +5081,10 @@
<string name="reset_internet_text" product="tablet" msgid="8797910368942544453">"Telefono-deia amaitu egingo da"</string>
<string name="resetting_internet_text" msgid="6696779371800051806">"Interneteko konexioa berrezartzen…"</string>
<string name="fix_connectivity" msgid="2781433603228089501">"Konpondu konexioa"</string>
- <!-- no translation found for airplane_mode_network_available (1059499681300395240) -->
- <skip />
- <!-- no translation found for to_switch_networks_disconnect_ethernet (6615374552827587197) -->
- <skip />
+ <string name="airplane_mode_network_available" msgid="1059499681300395240">"Hegaldi moduko sareak erabilgarri daude"</string>
+ <string name="to_switch_networks_disconnect_ethernet" msgid="6615374552827587197">"Sarez aldatzeko, deskonektatu Ethernet"</string>
+ <string name="cannot_switch_networks_while_connected" msgid="3867944849171754777">"Ezin da aldatu sarea konektatuta zauden bitartean"</string>
+ <string name="airplane_mode_network_panel_title" msgid="6385046104863403604">"Hegaldi modurako sareak"</string>
<string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g> / <xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
<string name="mobile_data_connection_active" msgid="2422223108911581552">"Konektatuta"</string>
<string name="mobile_data_off_summary" msgid="3841411571485837651">"Ez da automatikoki konektatuko Internetera"</string>
@@ -5105,4 +5106,16 @@
<string name="category_name_others" msgid="2366006298768550310">"Beste batzuk"</string>
<string name="category_name_general" msgid="7737273712848115886">"Orokorrak"</string>
<string name="default_see_all_apps_title" msgid="7481113230662612178">"Ikusi aplikazio guztiak"</string>
+ <string name="smart_forwarding_title" msgid="8368634861971949799">"Desbideratze adimenduna"</string>
+ <string name="smart_forwarding_summary_enabled" msgid="3341062878373185604">"Gaitu da desbideratze adimenduna"</string>
+ <string name="smart_forwarding_summary_disabled" msgid="5033880700091914809">"Desgaitu da desbideratze adimenduna"</string>
+ <string name="smart_forwarding_ongoing_title" msgid="962226849074401228">"Deien ezarpenak"</string>
+ <string name="smart_forwarding_ongoing_text" msgid="2189209372407117114">"Ezarpenak eguneratzen…"</string>
+ <string name="smart_forwarding_failed_title" msgid="1859891191023516080">"Deien ezarpenen errorea"</string>
+ <string name="smart_forwarding_failed_text" msgid="5370431503707373653">"Sareko edo SIM txarteleko errorea."</string>
+ <string name="smart_forwarding_failed_not_activated_text" msgid="997396203001257904">"SIM txartela ez dago aktibatuta."</string>
+ <string name="smart_forwarding_input_mdn_title" msgid="5105463748849841763">"Idatzi telefono-zenbakiak"</string>
+ <string name="smart_forwarding_input_mdn_dialog_title" msgid="7542216086697868415">"Idatzi telefono-zenbakia"</string>
+ <string name="smart_forwarding_missing_mdn_text" msgid="2907314684242542226">"Telefono-zenbakia falta da."</string>
+ <string name="smart_forwarding_missing_alert_dialog_text" msgid="7870419247987316112">"Ados"</string>
</resources>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index e8a2011..6846411 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -832,14 +832,14 @@
<string name="wifi_wakeup_summary" msgid="5778059083790221465">"Wi-Fi درنزدیکی شبکههای با کیفیت بالای ذخیرهشده (ازجمله شبکه خانهتان) دوباره روشن میشود."</string>
<string name="wifi_wakeup_summary_no_location" msgid="681323616606485096">"در دسترس نیست چون «مکان» خاموش است. "<annotation id="link">"مکان"</annotation>" را روشن کنید."</string>
<string name="wifi_wakeup_summary_scanning_disabled" msgid="1771489741850119751">"در دسترس نیست چون «اسکن کردن Wi‑Fi» خاموش است"</string>
- <string name="wifi_wakeup_summary_scoring_disabled" msgid="3615120120960539780">"برای استفاده، یک ارائهدهنده رتبهبندی شبکه انتخاب کنید"</string>
+ <string name="wifi_wakeup_summary_scoring_disabled" msgid="3615120120960539780">"برای استفاده، یک ارائهدهنده ردهبندی شبکه انتخاب کنید"</string>
<string name="wifi_poor_network_detection" msgid="8210035875160288422">"اجتناب از اتصالات ضعیف"</string>
<string name="wifi_poor_network_detection_summary" msgid="383834617032605347">"از شبکه Wi-Fi استفاده نکنید مگر اینکه اتصال اینترنتی مناسب داشته باشد"</string>
<string name="wifi_avoid_poor_network_detection_summary" msgid="4993203473116721772">"فقط از شبکههایی استفاده میشود که اتصال اینترنتی خوبی دارند"</string>
<string name="use_open_wifi_automatically_title" msgid="7193846454986712009">"اتصال به شبکههای عمومی"</string>
<string name="use_open_wifi_automatically_summary" msgid="6663890845558591023">"اتصال خودکار به شبکههای عمومی با کیفیت بالا"</string>
- <string name="use_open_wifi_automatically_summary_scoring_disabled" msgid="2299284032301667622">"برای استفاده، یک ارائهدهنده رتبهبندی شبکه انتخاب کنید"</string>
- <string name="use_open_wifi_automatically_summary_scorer_unsupported_disabled" msgid="1780306481499369913">"برای استفاده، یک ارائهدهنده رتبهبندی شبکه سازگار انتخاب کنید"</string>
+ <string name="use_open_wifi_automatically_summary_scoring_disabled" msgid="2299284032301667622">"برای استفاده، یک ارائهدهنده ردهبندی شبکه انتخاب کنید"</string>
+ <string name="use_open_wifi_automatically_summary_scorer_unsupported_disabled" msgid="1780306481499369913">"برای استفاده، یک ارائهدهنده ردهبندی شبکه سازگار انتخاب کنید"</string>
<string name="wifi_install_credentials" msgid="5192903644606839972">"نصب مجوزها"</string>
<string name="wifi_scan_notify_text" msgid="2518097467707535013">"برای بهبود دقت مکان، برنامهها و سرویسها همچنان میتوانند در هرزمانی شبکههای Wi-Fi را اسکن کنند (حتی وقتی Wi-Fi خاموش است). این تنظیم میتواند برای مثال برای بهبود ویژگیها و سرویسهای مکانمبنا استفاده شود. میتوانید در <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>تنظیمات اسکن کردن<xliff:g id="LINK_END_1">LINK_END</xliff:g>، این تنظیم را تغییر دهید."</string>
<string name="wifi_scan_notify_text_scanning_off" msgid="6189528915806353667">"برای بهبود دقت مکان، «اسکن کردن Wi‑Fi» را در <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>تنظیمات اسکن<xliff:g id="LINK_END_1">LINK_END</xliff:g> روشن کنید."</string>
@@ -1701,7 +1701,7 @@
<string name="sms_change_default_dialog_title" msgid="2343439998715457307">"برنامه پیامک تغییر داده شود؟"</string>
<string name="sms_change_default_dialog_text" msgid="8777606240342982531">"از <xliff:g id="NEW_APP">%1$s</xliff:g> بهجای <xliff:g id="CURRENT_APP">%2$s</xliff:g> بهعنوان برنامه پیامکتان استفاده میکنید؟"</string>
<string name="sms_change_default_no_previous_dialog_text" msgid="6215622785087181275">"از <xliff:g id="NEW_APP">%s</xliff:g> بهجای برنامه پبامکتان استفاده میکنید؟"</string>
- <string name="network_scorer_picker_title" msgid="2022922801936206195">"ارائهدهنده رتبهبندی شبکه"</string>
+ <string name="network_scorer_picker_title" msgid="2022922801936206195">"ارائهدهنده ردهبندی شبکه"</string>
<string name="network_scorer_picker_none_preference" msgid="8894034333043177807">"خالی"</string>
<string name="network_scorer_change_active_dialog_title" msgid="7005220310238618141">"دستیار Wi‑Fi را تغییر میدهید؟"</string>
<string name="network_scorer_change_active_dialog_text" msgid="7006057749370850706">"از <xliff:g id="NEW_APP">%1$s</xliff:g> بهجای <xliff:g id="CURRENT_APP">%2$s</xliff:g> استفاده میکنید تا ارتباطات شبکهتان را مدیریت کنید؟"</string>
@@ -2397,8 +2397,8 @@
<string name="print_cancelling_state_title_template" msgid="9094795458159980190">"در حال لغو <xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g>"</string>
<string name="print_failed_state_title_template" msgid="4751695809935404505">"خطای چاپگر <xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g>"</string>
<string name="print_blocked_state_title_template" msgid="3134100215188411074">"چاپگر کار <xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g> را مسدود کرد"</string>
- <string name="print_search_box_shown_utterance" msgid="6215002365360341961">"کادر جستجو نمایان شد"</string>
- <string name="print_search_box_hidden_utterance" msgid="5355387966141712567">"کادر جستجو پنهان شد"</string>
+ <string name="print_search_box_shown_utterance" msgid="6215002365360341961">"چارگوش جستجو نمایان شد"</string>
+ <string name="print_search_box_hidden_utterance" msgid="5355387966141712567">"چارگوش جستجو پنهان شد"</string>
<string name="printer_info_desc" msgid="1206872325746154206">"اطلاعات بیشتر درباره این چاپگر"</string>
<string name="power_usage_summary_title" msgid="4198312848584882113">"باتری"</string>
<string name="power_usage_summary" msgid="6857382582534984531">"چه چیزی باتری را مصرف کرده است"</string>
@@ -2436,6 +2436,7 @@
<string name="bluetooth_on_time" msgid="8424625554628450028">"Wi-Fi به موقع"</string>
<string name="advanced_battery_title" msgid="3005993394776555079">"مصرف باتری"</string>
<string name="history_details_title" msgid="8628584613889559355">"جزئیات سابقه"</string>
+ <string name="advanced_battery_preference_title" msgid="6518802648205311326">"مشاهده مصرف باتری"</string>
<string name="battery_details_title" msgid="4531369291819754178">"مصرف باتری"</string>
<string name="details_subtitle" msgid="2550872569652785527">"جزئیات استفاده"</string>
<string name="controls_subtitle" msgid="3759606830916441564">"تنظیم استفاده از نیرو"</string>
@@ -3269,7 +3270,7 @@
<string name="keywords_battery" msgid="7040323668283600530">"مصرف نیرو، شارژ"</string>
<string name="keywords_spell_checker" msgid="5148906820603481657">"املا، واژهنامه، غلطگیر املا، تصحیح خودکار"</string>
<string name="keywords_voice_input" msgid="7534900094659358971">"تشخیصدهنده، ورودی، گفتار، بلند صحبت کردن، گفتن، صحبت کردن، زبان، هندزفری، هندز فری، تشخیص، توهینآمیز، کلمه، صوتی، سابقه، بلوتوث، هدست"</string>
- <string name="keywords_text_to_speech_output" msgid="6728080502619011668">"رتبهبندی، زبان، پیشفرض، بلند صحبت کردن، گفتن، صحبت کردن، صحبت، tts، دسترسپذیری، صفحهخوان، نابینا"</string>
+ <string name="keywords_text_to_speech_output" msgid="6728080502619011668">"ردهبندی، زبان، پیشفرض، بلند صحبت کردن، گفتن، صحبت کردن، صحبت، tts، دسترسپذیری، صفحهخوان، نابینا"</string>
<string name="keywords_date_and_time" msgid="4402136313104901312">"ساعت، نظامی"</string>
<string name="keywords_network_reset" msgid="4075670452112218042">"بازنشانی، بازیابی، کارخانه"</string>
<string name="keywords_factory_data_reset" msgid="4979623326958976773">"محو کردن، حذف، بازیابی، پاک کردن، برداشتن، بازنشانی کارخانهای"</string>
@@ -3488,8 +3489,8 @@
<string name="smart_notifications_title" msgid="8995288376897952015">"اعلانهای تطبیقی"</string>
<string name="asst_capability_prioritizer_title" msgid="1181272430009156556">"اولویت اعلان تطبیقی"</string>
<string name="asst_capability_prioritizer_summary" msgid="954988212366568737">"اعلانهای دارای اولویت پایینتر بهطور خودکار روی آرام تنظیم شود"</string>
- <string name="asst_capability_ranking_title" msgid="312998580233257581">"رتبهبندی اعلان تطبیقی"</string>
- <string name="asst_capability_ranking_summary" msgid="2293524677144599450">"رتبهبندی خودکار اعلانها براساس ارتباط"</string>
+ <string name="asst_capability_ranking_title" msgid="312998580233257581">"ردهبندی اعلان تطبیقی"</string>
+ <string name="asst_capability_ranking_summary" msgid="2293524677144599450">"ردهبندی خودکار اعلانها براساس ارتباط"</string>
<string name="asst_feedback_indicator_title" msgid="5169801869752395354">"بازخورد اعلان تطبیقی"</string>
<string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"تنظیمات انجامشده برای اعلانها را مشخص میکند و گزینه مربوط به ارائه بازخورد به سیستم را نمایش میدهد"</string>
<string name="asst_importance_reset_title" msgid="6191265591976440115">"بازنشاندن اهمیت اعلان"</string>
@@ -4097,6 +4098,7 @@
<string name="usb_use" msgid="6783183432648438528">"استفاده از USB برای"</string>
<string name="usb_default_label" msgid="3372838450371060750">"پیکربندی پیشفرض USB"</string>
<string name="usb_default_info" msgid="167172599497085266">"وقتی دستگاه دیگری متصل باشد و قفل تلفن شما باز باشد، این تنظیمات اعمال میشوند. فقط به دستگاههای مورداعتماد متصل شوید."</string>
+ <string name="usb_power_title" msgid="5602112548385798646">"گزینههای روشن/خاموش"</string>
<string name="usb_pref" msgid="8521832005703261700">"USB"</string>
<string name="usb_preference" msgid="5084550082591493765">"اولویتهای USB"</string>
<string name="usb_control_title" msgid="1946791559052157693">"USB تحت کنترل"</string>
@@ -4402,8 +4404,8 @@
<string name="notification_log_details_alerted" msgid="5285078967825048406">"اعلان هشدار"</string>
<string name="notification_log_channel" msgid="3406738695621767204">"کانال"</string>
<string name="notification_log_details_none" msgid="1090852853755089991">"خالی"</string>
- <string name="notification_log_details_ranking_null" msgid="6607596177723101524">"شیء رتبهبندی وجود ندارد."</string>
- <string name="notification_log_details_ranking_none" msgid="2484105338466675261">"شیء رتبهبندی حاوی این کلید نیست."</string>
+ <string name="notification_log_details_ranking_null" msgid="6607596177723101524">"شیء ردهبندی وجود ندارد."</string>
+ <string name="notification_log_details_ranking_none" msgid="2484105338466675261">"شیء ردهبندی حاوی این کلید نیست."</string>
<string name="theme_customization_device_default" msgid="7641813022590999286">"پیشفرض دستگاه"</string>
<string name="display_cutout_emulation" msgid="1421648375408281244">"برش نمایشگر"</string>
<string name="display_cutout_emulation_keywords" msgid="4506580703807358127">"بریدگی حاشیه نمایشگر، حاشیه بالای نمایشگر"</string>
@@ -4936,8 +4938,8 @@
<string name="mobile_data_ap_mode_disabled" msgid="6067959496888990983">"عدمدسترسی در حالت هواپیما"</string>
<string name="force_desktop_mode" msgid="1336913605091334238">"اجرای اجباری حالت دسکتاپ"</string>
<string name="force_desktop_mode_summary" msgid="4587416867846930479">"اجرای اجباری حالت دسکتاپ آزمایشی در نمایشگرهای ثانوی"</string>
- <string name="enable_sizecompat_freeform" msgid="3799755160777404309">"فعال کردن سازگاری اندازه در قالب آزاد"</string>
- <string name="enable_sizecompat_freeform_summary" msgid="1484050174538201499">"به برنامههایی با سازگاری اندازه اجازه میدهد قالب آزاد داشته باشند"</string>
+ <string name="enable_non_resizable_multi_window" msgid="6832903754625404477">"فعال کردن اندازه غیرقابلتغییر در چندپنجره"</string>
+ <string name="enable_non_resizable_multi_window_summary" msgid="3275763753261901999">"مجاز کردن برنامههای با اندازه غیرقابلتغییر برای قرارگیری در چندپنجره"</string>
<string name="hwui_force_dark_title" msgid="4256904905631994219">"لغو اجبار حالت تاریک"</string>
<string name="hwui_force_dark_summary" msgid="6515748781487952769">"ویژگی اجبار حالت تاریک را برای همیشه روشن بودن لغو میکند"</string>
<string name="enable_blurs_on_windows_title" msgid="4218144213800778872">"فعالسازی محو کردن"</string>
@@ -5059,8 +5061,8 @@
<string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"هواپیما، ایمن در هواپیما"</string>
<string name="calls_and_sms" msgid="1931855083959003306">"تماس و پیامک"</string>
<string name="calls_and_sms_category" msgid="2021321997884906046">"تماس ازطریق WiFi"</string>
- <string name="calls_sms_wfc_summary" msgid="4930471357980272294">"برقراری و دریافت تماس ازطریق شبکههای غیرمخابراتی مثل Wi-Fi"</string>
- <string name="calls_sms_footnote" msgid="7002461875954024216">"«تماس ازطریق Wi-Fi» امکان برقراری و دریافت تماس ازطریق شبکههای غیرمخابراتی را (برای مثل برخی از شبکههای Wi-Fi) به شما میدهد."</string>
+ <string name="calls_sms_wfc_summary" msgid="3940529919408667336">"برقراری و دریافت تماس ازطریق Wi-Fi"</string>
+ <string name="calls_sms_footnote" msgid="8051604228144899434">"با «تماس ازطریق Wi-Fi»، برقراری و دریافت تماس ازطریق شبکههای Wi-Fi غیرمخابراتی انجام میشود."</string>
<string name="calls_preference_title" msgid="7536882032182563800">"تماس"</string>
<string name="sms_preference_title" msgid="8392745501754864395">"پیامک"</string>
<string name="calls_sms_preferred" msgid="6016477652522583496">"دارای اولویت"</string>
@@ -5079,10 +5081,10 @@
<string name="reset_internet_text" product="tablet" msgid="8797910368942544453">"با این کار، تماس تلفنی بهپایان میرسد"</string>
<string name="resetting_internet_text" msgid="6696779371800051806">"درحال بازنشانی اینترنت…"</string>
<string name="fix_connectivity" msgid="2781433603228089501">"رفع مشکل اتصال"</string>
- <!-- no translation found for airplane_mode_network_available (1059499681300395240) -->
- <skip />
- <!-- no translation found for to_switch_networks_disconnect_ethernet (6615374552827587197) -->
- <skip />
+ <string name="airplane_mode_network_available" msgid="1059499681300395240">"شبکههای حالت هواپیما دردسترساند"</string>
+ <string name="to_switch_networks_disconnect_ethernet" msgid="6615374552827587197">"برای تغییر شبکه، اترنت را قطع کنید"</string>
+ <string name="cannot_switch_networks_while_connected" msgid="3867944849171754777">"هنگامی که اتصال برقرار است نمیتوان شبکهها را عوض کرد"</string>
+ <string name="airplane_mode_network_panel_title" msgid="6385046104863403604">"شبکههای «حالت هواپیما»"</string>
<string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g> / <xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
<string name="mobile_data_connection_active" msgid="2422223108911581552">"متصل است"</string>
<string name="mobile_data_off_summary" msgid="3841411571485837651">"اینترنت بهطور خودکار متصل نخواهد شد"</string>
@@ -5104,4 +5106,16 @@
<string name="category_name_others" msgid="2366006298768550310">"غیره"</string>
<string name="category_name_general" msgid="7737273712848115886">"کلی"</string>
<string name="default_see_all_apps_title" msgid="7481113230662612178">"مشاهده همه برنامهها"</string>
+ <string name="smart_forwarding_title" msgid="8368634861971949799">"بازارسال هوشمند"</string>
+ <string name="smart_forwarding_summary_enabled" msgid="3341062878373185604">"«بازارسال هوشمند» فعال شد"</string>
+ <string name="smart_forwarding_summary_disabled" msgid="5033880700091914809">"«بازارسال هوشمند» غیرفعال شد"</string>
+ <string name="smart_forwarding_ongoing_title" msgid="962226849074401228">"تنظیمات تماس"</string>
+ <string name="smart_forwarding_ongoing_text" msgid="2189209372407117114">"درحال بهروزرسانی «تنظیمات»…"</string>
+ <string name="smart_forwarding_failed_title" msgid="1859891191023516080">"خطای «تنظیمات تماس»"</string>
+ <string name="smart_forwarding_failed_text" msgid="5370431503707373653">"خطای شبکه یا سیمکارت."</string>
+ <string name="smart_forwarding_failed_not_activated_text" msgid="997396203001257904">"سیمکارت فعال نیست."</string>
+ <string name="smart_forwarding_input_mdn_title" msgid="5105463748849841763">"وارد کردن شمارههای تلفن"</string>
+ <string name="smart_forwarding_input_mdn_dialog_title" msgid="7542216086697868415">"وارد کردن شماره تلفن"</string>
+ <string name="smart_forwarding_missing_mdn_text" msgid="2907314684242542226">"شماره تلفن وارد نشده است."</string>
+ <string name="smart_forwarding_missing_alert_dialog_text" msgid="7870419247987316112">"تأیید"</string>
</resources>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index 93b6e7d..45c9762 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -2267,8 +2267,7 @@
<item quantity="other"><xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> tallennettua kuulolaitetta</item>
<item quantity="one"><xliff:g id="NUMBER_DEVICE_COUNT_0">%1$d</xliff:g> tallennettu kuulolaite</item>
</plurals>
- <!-- no translation found for accessibility_audio_adjustment_title (1332113739136802997) -->
- <skip />
+ <string name="accessibility_audio_adjustment_title" msgid="1332113739136802997">"Audion säätö"</string>
<string name="accessibility_summary_shortcut_enabled" msgid="4030427268146752644">"Pikakuvake päällä"</string>
<string name="accessibility_summary_shortcut_disabled" msgid="564005462092499068">"Pois päältä"</string>
<string name="accessibility_summary_state_enabled" msgid="1065431632216039369">"Päällä"</string>
@@ -2437,6 +2436,7 @@
<string name="bluetooth_on_time" msgid="8424625554628450028">"Wi-Fi-yhteyden käytössäoloaika"</string>
<string name="advanced_battery_title" msgid="3005993394776555079">"Akun käyttö"</string>
<string name="history_details_title" msgid="8628584613889559355">"Historiatiedot"</string>
+ <string name="advanced_battery_preference_title" msgid="6518802648205311326">"Näytä akun käyttö"</string>
<string name="battery_details_title" msgid="4531369291819754178">"Akun käyttö"</string>
<string name="details_subtitle" msgid="2550872569652785527">"Käyttötiedot"</string>
<string name="controls_subtitle" msgid="3759606830916441564">"Säädä virrankäyttöä"</string>
@@ -4098,6 +4098,7 @@
<string name="usb_use" msgid="6783183432648438528">"Käytä USB:tä"</string>
<string name="usb_default_label" msgid="3372838450371060750">"USB-oletusmääritys"</string>
<string name="usb_default_info" msgid="167172599497085266">"Nämä asetukset otetaan käyttöön, kun puhelimeesi yhdistetään toinen laite sen lukituksen ollessa avoinna. Yhdistä puhelimeesi vain luotettuja laitteita."</string>
+ <string name="usb_power_title" msgid="5602112548385798646">"Virta-asetukset"</string>
<string name="usb_pref" msgid="8521832005703261700">"USB"</string>
<string name="usb_preference" msgid="5084550082591493765">"USB-asetukset"</string>
<string name="usb_control_title" msgid="1946791559052157693">"USB-yhteyttä ohjaa"</string>
@@ -4937,8 +4938,8 @@
<string name="mobile_data_ap_mode_disabled" msgid="6067959496888990983">"Ei käytettävissä lentokonetilassa"</string>
<string name="force_desktop_mode" msgid="1336913605091334238">"Pakota työpöytätila"</string>
<string name="force_desktop_mode_summary" msgid="4587416867846930479">"Pakota kokeellinen työpöytätila toissijaisille näytöille."</string>
- <string name="enable_sizecompat_freeform" msgid="3799755160777404309">"Salli vapaamuotoinen sizecompat"</string>
- <string name="enable_sizecompat_freeform_summary" msgid="1484050174538201499">"Sallii vapaamuotoiset sizecompat-sovellukset"</string>
+ <string name="enable_non_resizable_multi_window" msgid="6832903754625404477">"Ota käyttöön kiinteän kokoiset usean ikkunan tilassa"</string>
+ <string name="enable_non_resizable_multi_window_summary" msgid="3275763753261901999">"Sallii kiinteän kokoiset sovellukset usean ikkunan tilassa"</string>
<string name="hwui_force_dark_title" msgid="4256904905631994219">"Ohita SmartDarkin pakottaminen päälle"</string>
<string name="hwui_force_dark_summary" msgid="6515748781487952769">"Ohittaa toiminnon, joka pakottaa SmartDark-ominaisuuden aina päälle"</string>
<string name="enable_blurs_on_windows_title" msgid="4218144213800778872">"Salli sumennus"</string>
@@ -5060,8 +5061,8 @@
<string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"lentokone, lentokoneturvallinen"</string>
<string name="calls_and_sms" msgid="1931855083959003306">"Puhelut ja tekstiviestit"</string>
<string name="calls_and_sms_category" msgid="2021321997884906046">"Wi‑Fi-puhelut"</string>
- <string name="calls_sms_wfc_summary" msgid="4930471357980272294">"Soita ja vastaanota puheluita muun kuin operaattorin verkon (esim. Wi-Fi-verkon) kautta"</string>
- <string name="calls_sms_footnote" msgid="7002461875954024216">"Wi-Fi-puheluilla voit soittaa ja vastaanottaa puheluita muun kuin operaattorin verkon (esim. joidenkin Wi-Fi-verkkojen) kautta."</string>
+ <string name="calls_sms_wfc_summary" msgid="3940529919408667336">"Soita ja vastaanota puheluita Wi-Fi-verkon kautta"</string>
+ <string name="calls_sms_footnote" msgid="8051604228144899434">"Wi‑Fi-puheluilla puheluita soitetaan ja vastaanotetaan muiden kuin operaattoreiden Wi-Fi-verkkojen kautta."</string>
<string name="calls_preference_title" msgid="7536882032182563800">"Puhelut"</string>
<string name="sms_preference_title" msgid="8392745501754864395">"Tekstiviestit"</string>
<string name="calls_sms_preferred" msgid="6016477652522583496">"ensisijainen"</string>
@@ -5080,10 +5081,10 @@
<string name="reset_internet_text" product="tablet" msgid="8797910368942544453">"Tämä lopettaa puhelusi"</string>
<string name="resetting_internet_text" msgid="6696779371800051806">"Internetyhteyttä nollataan…"</string>
<string name="fix_connectivity" msgid="2781433603228089501">"Korjaa yhteysongelmat"</string>
- <!-- no translation found for airplane_mode_network_available (1059499681300395240) -->
- <skip />
- <!-- no translation found for to_switch_networks_disconnect_ethernet (6615374552827587197) -->
- <skip />
+ <string name="airplane_mode_network_available" msgid="1059499681300395240">"Lentokonetilan verkkoja saatavilla"</string>
+ <string name="to_switch_networks_disconnect_ethernet" msgid="6615374552827587197">"Vaihda verkkoa irrottamalla Ethernet-johto"</string>
+ <string name="cannot_switch_networks_while_connected" msgid="3867944849171754777">"Verkkoa ei voi vaihtaa verkkoyhteyden ollessa päällä"</string>
+ <string name="airplane_mode_network_panel_title" msgid="6385046104863403604">"Lentokonetila verkot"</string>
<string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g> / <xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
<string name="mobile_data_connection_active" msgid="2422223108911581552">"Yhdistetty"</string>
<string name="mobile_data_off_summary" msgid="3841411571485837651">"Internetyhteyttä ei muodosteta automaattisesti"</string>
@@ -5105,4 +5106,16 @@
<string name="category_name_others" msgid="2366006298768550310">"Muu"</string>
<string name="category_name_general" msgid="7737273712848115886">"Yleiset"</string>
<string name="default_see_all_apps_title" msgid="7481113230662612178">"Näytä kaikki sovellukset"</string>
+ <string name="smart_forwarding_title" msgid="8368634861971949799">"Älykäs soitonsiirto"</string>
+ <string name="smart_forwarding_summary_enabled" msgid="3341062878373185604">"Älykäs soitonsiirto otettu käyttöön"</string>
+ <string name="smart_forwarding_summary_disabled" msgid="5033880700091914809">"Älykäs soitonsiirto poistettu käytöstä"</string>
+ <string name="smart_forwarding_ongoing_title" msgid="962226849074401228">"Puheluasetukset"</string>
+ <string name="smart_forwarding_ongoing_text" msgid="2189209372407117114">"Päivitetään asetuksia…"</string>
+ <string name="smart_forwarding_failed_title" msgid="1859891191023516080">"Virhe puheluasetuksissa"</string>
+ <string name="smart_forwarding_failed_text" msgid="5370431503707373653">"Verkko- tai SIM-korttivirhe."</string>
+ <string name="smart_forwarding_failed_not_activated_text" msgid="997396203001257904">"SIM-korttia ei ole aktivoitu."</string>
+ <string name="smart_forwarding_input_mdn_title" msgid="5105463748849841763">"Lisää puhelinnumeroita"</string>
+ <string name="smart_forwarding_input_mdn_dialog_title" msgid="7542216086697868415">"Lisää puhelinnumero"</string>
+ <string name="smart_forwarding_missing_mdn_text" msgid="2907314684242542226">"Puhelinnumero puuttuu."</string>
+ <string name="smart_forwarding_missing_alert_dialog_text" msgid="7870419247987316112">"OK"</string>
</resources>
diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
index 1f9fd95..e489703 100644
--- a/res/values-fr-rCA/strings.xml
+++ b/res/values-fr-rCA/strings.xml
@@ -2436,6 +2436,7 @@
<string name="bluetooth_on_time" msgid="8424625554628450028">"Wi-Fi/temps"</string>
<string name="advanced_battery_title" msgid="3005993394776555079">"Utilisation de la pile"</string>
<string name="history_details_title" msgid="8628584613889559355">"Détails de l\'historique"</string>
+ <string name="advanced_battery_preference_title" msgid="6518802648205311326">"Voir l\'utilisation de la pile"</string>
<string name="battery_details_title" msgid="4531369291819754178">"Utilisation de la pile"</string>
<string name="details_subtitle" msgid="2550872569652785527">"Détails d\'utilisation"</string>
<string name="controls_subtitle" msgid="3759606830916441564">"Ajuster la consommation"</string>
@@ -4097,6 +4098,7 @@
<string name="usb_use" msgid="6783183432648438528">"Utiliser la connexion USB pour"</string>
<string name="usb_default_label" msgid="3372838450371060750">"Configuration USB par défaut"</string>
<string name="usb_default_info" msgid="167172599497085266">"Lorsqu\'un autre appareil sera connecté et que votre téléphone sera déverrouillé, ces paramètres seront appliqués. Connectez-vous uniquement aux appareils de confiance."</string>
+ <string name="usb_power_title" msgid="5602112548385798646">"Options d\'alimentation"</string>
<string name="usb_pref" msgid="8521832005703261700">"USB"</string>
<string name="usb_preference" msgid="5084550082591493765">"Préférences USB"</string>
<string name="usb_control_title" msgid="1946791559052157693">"USB contrôlé par"</string>
@@ -4936,8 +4938,8 @@
<string name="mobile_data_ap_mode_disabled" msgid="6067959496888990983">"Données cellulaires non accessibles en mode Vol"</string>
<string name="force_desktop_mode" msgid="1336913605091334238">"Forcer le mode bureau"</string>
<string name="force_desktop_mode_summary" msgid="4587416867846930479">"Forcer le mode bureau expérimental sur les écrans secondaires"</string>
- <string name="enable_sizecompat_freeform" msgid="3799755160777404309">"Activer la forme libre pour les applis redimens."</string>
- <string name="enable_sizecompat_freeform_summary" msgid="1484050174538201499">"Autoriser les applications redimensionnables à utiliser la forme libre"</string>
+ <string name="enable_non_resizable_multi_window" msgid="6832903754625404477">"Activer éléments non redimensionnables en mode multi-fenêtre"</string>
+ <string name="enable_non_resizable_multi_window_summary" msgid="3275763753261901999">"Activer les applications non redimensionnables en mode multi-fenêtre"</string>
<string name="hwui_force_dark_title" msgid="4256904905631994219">"Forcer l\'activation de SmartDark"</string>
<string name="hwui_force_dark_summary" msgid="6515748781487952769">"Forcer la fonctionnalité SmartDark à rester active"</string>
<string name="enable_blurs_on_windows_title" msgid="4218144213800778872">"Activer le floutage"</string>
@@ -5059,8 +5061,8 @@
<string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"avion, sécuritaire pour les avions"</string>
<string name="calls_and_sms" msgid="1931855083959003306">"Appels et messages texte"</string>
<string name="calls_and_sms_category" msgid="2021321997884906046">"Appels Wi‑Fi"</string>
- <string name="calls_sms_wfc_summary" msgid="4930471357980272294">"Faites et recevez des appels sur des réseaux autres que des réseaux cellulaires, comme des réseaux Wi‑Fi"</string>
- <string name="calls_sms_footnote" msgid="7002461875954024216">"La fonctionnalité d\'appels Wi-Fi vous permet d\'effectuer des appels sur des réseaux autres que des réseaux cellulaires, comme des réseaux Wi‑Fi."</string>
+ <string name="calls_sms_wfc_summary" msgid="3940529919408667336">"Faire et recevoir des appels sur réseau Wi‑Fi"</string>
+ <string name="calls_sms_footnote" msgid="8051604228144899434">"La fonctionnalité Appels Wi-Fi permet de faire et de recevoir des appels sur des réseaux Wi-Fi n\'appartenant pas au fournisseur de services."</string>
<string name="calls_preference_title" msgid="7536882032182563800">"Appels"</string>
<string name="sms_preference_title" msgid="8392745501754864395">"Messages texte"</string>
<string name="calls_sms_preferred" msgid="6016477652522583496">"préféré"</string>
@@ -5079,10 +5081,10 @@
<string name="reset_internet_text" product="tablet" msgid="8797910368942544453">"Cette action mettra fin à votre appel téléphonique"</string>
<string name="resetting_internet_text" msgid="6696779371800051806">"Réinitialisation de votre connexion Internet en cours…"</string>
<string name="fix_connectivity" msgid="2781433603228089501">"Dépanner la connectivité"</string>
- <!-- no translation found for airplane_mode_network_available (1059499681300395240) -->
- <skip />
- <!-- no translation found for to_switch_networks_disconnect_ethernet (6615374552827587197) -->
- <skip />
+ <string name="airplane_mode_network_available" msgid="1059499681300395240">"Réseaux accessibles en mode Avion"</string>
+ <string name="to_switch_networks_disconnect_ethernet" msgid="6615374552827587197">"Pour changer de réseau, débranchez le câble Ethernet"</string>
+ <string name="cannot_switch_networks_while_connected" msgid="3867944849171754777">"Impossible de changer de réseau, alors que vous êtes connecté"</string>
+ <string name="airplane_mode_network_panel_title" msgid="6385046104863403604">"Réseaux compatibles avec le mode Avion"</string>
<string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g> : <xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
<string name="mobile_data_connection_active" msgid="2422223108911581552">"Connexion active"</string>
<string name="mobile_data_off_summary" msgid="3841411571485837651">"Imposs. de se connecter automatiquement à Internet"</string>
@@ -5104,4 +5106,16 @@
<string name="category_name_others" msgid="2366006298768550310">"Autres"</string>
<string name="category_name_general" msgid="7737273712848115886">"Général"</string>
<string name="default_see_all_apps_title" msgid="7481113230662612178">"Afficher toutes les applications"</string>
+ <string name="smart_forwarding_title" msgid="8368634861971949799">"Transfert d\'appels intelligent"</string>
+ <string name="smart_forwarding_summary_enabled" msgid="3341062878373185604">"Le transfert d\'appels intelligent est activé"</string>
+ <string name="smart_forwarding_summary_disabled" msgid="5033880700091914809">"Le transfert d\'appels intelligent est désactivé"</string>
+ <string name="smart_forwarding_ongoing_title" msgid="962226849074401228">"Paramètres d\'appel"</string>
+ <string name="smart_forwarding_ongoing_text" msgid="2189209372407117114">"Mise à jour des paramètres en cours…"</string>
+ <string name="smart_forwarding_failed_title" msgid="1859891191023516080">"Erreur des paramètres d\'appel"</string>
+ <string name="smart_forwarding_failed_text" msgid="5370431503707373653">"Erreur de réseau ou de carte SIM."</string>
+ <string name="smart_forwarding_failed_not_activated_text" msgid="997396203001257904">"La carte SIM n\'est pas activée."</string>
+ <string name="smart_forwarding_input_mdn_title" msgid="5105463748849841763">"Entrer les numéros de téléphone"</string>
+ <string name="smart_forwarding_input_mdn_dialog_title" msgid="7542216086697868415">"Entrer le numéro de téléphone"</string>
+ <string name="smart_forwarding_missing_mdn_text" msgid="2907314684242542226">"Le numéro de téléphone est manquant."</string>
+ <string name="smart_forwarding_missing_alert_dialog_text" msgid="7870419247987316112">"OK"</string>
</resources>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 41fbab7..843eede 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -2267,8 +2267,7 @@
<item quantity="one"><xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> appareil auditif enregistré</item>
<item quantity="other"><xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> appareils auditifs enregistrés</item>
</plurals>
- <!-- no translation found for accessibility_audio_adjustment_title (1332113739136802997) -->
- <skip />
+ <string name="accessibility_audio_adjustment_title" msgid="1332113739136802997">"Réglage du son"</string>
<string name="accessibility_summary_shortcut_enabled" msgid="4030427268146752644">"Raccourci activé"</string>
<string name="accessibility_summary_shortcut_disabled" msgid="564005462092499068">"Désactivé"</string>
<string name="accessibility_summary_state_enabled" msgid="1065431632216039369">"Activé"</string>
@@ -2437,6 +2436,7 @@
<string name="bluetooth_on_time" msgid="8424625554628450028">"Wi-Fi/temps"</string>
<string name="advanced_battery_title" msgid="3005993394776555079">"Utilisation de la batterie"</string>
<string name="history_details_title" msgid="8628584613889559355">"Historique"</string>
+ <string name="advanced_battery_preference_title" msgid="6518802648205311326">"Voir l\'utilisation de la batterie"</string>
<string name="battery_details_title" msgid="4531369291819754178">"Utilisation de la batterie"</string>
<string name="details_subtitle" msgid="2550872569652785527">"Détails d\'utilisation"</string>
<string name="controls_subtitle" msgid="3759606830916441564">"Ajuster la consommation"</string>
@@ -4098,6 +4098,7 @@
<string name="usb_use" msgid="6783183432648438528">"Utiliser la connexion USB pour"</string>
<string name="usb_default_label" msgid="3372838450371060750">"Configuration USB par défaut"</string>
<string name="usb_default_info" msgid="167172599497085266">"Ces paramètres sont appliqués lorsqu\'un autre appareil est connecté et que votre téléphone est déverrouillé. Connectez-vous uniquement à des appareils vérifiés."</string>
+ <string name="usb_power_title" msgid="5602112548385798646">"Options d\'alimentation"</string>
<string name="usb_pref" msgid="8521832005703261700">"USB"</string>
<string name="usb_preference" msgid="5084550082591493765">"Préférences USB"</string>
<string name="usb_control_title" msgid="1946791559052157693">"Connexion USB contrôlée par"</string>
@@ -4937,8 +4938,8 @@
<string name="mobile_data_ap_mode_disabled" msgid="6067959496888990983">"Non disponibles en mode Avion"</string>
<string name="force_desktop_mode" msgid="1336913605091334238">"Forcer l\'activation du mode bureau"</string>
<string name="force_desktop_mode_summary" msgid="4587416867846930479">"Forcer l\'activation du mode bureau expérimental sur les écrans secondaires"</string>
- <string name="enable_sizecompat_freeform" msgid="3799755160777404309">"Activer déplacement applis non redimensionnables"</string>
- <string name="enable_sizecompat_freeform_summary" msgid="1484050174538201499">"Autorise le déplacement des applications non redimensionnables"</string>
+ <string name="enable_non_resizable_multi_window" msgid="6832903754625404477">"Activer les applis non redimensionnables en mode multifenêtre"</string>
+ <string name="enable_non_resizable_multi_window_summary" msgid="3275763753261901999">"Permet d\'autoriser les applications non redimensionnables en mode multifenêtre"</string>
<string name="hwui_force_dark_title" msgid="4256904905631994219">"Forcer l\'activation de Smart Dark"</string>
<string name="hwui_force_dark_summary" msgid="6515748781487952769">"Force la fonctionnalité Smart Dark à être toujours activée"</string>
<string name="enable_blurs_on_windows_title" msgid="4218144213800778872">"Activer le floutage"</string>
@@ -5060,8 +5061,8 @@
<string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"avion, accepté dans les avions"</string>
<string name="calls_and_sms" msgid="1931855083959003306">"Appels et SMS"</string>
<string name="calls_and_sms_category" msgid="2021321997884906046">"Appels Wi‑Fi"</string>
- <string name="calls_sms_wfc_summary" msgid="4930471357980272294">"Passer et recevoir des appels sur des réseaux non gérés par des opérateurs, comme le Wi‑Fi"</string>
- <string name="calls_sms_footnote" msgid="7002461875954024216">"La fonctionnalité Appels Wi-Fi vous permet de passer et de recevoir des appels sur des réseaux non gérés par des opérateurs, comme certains réseaux Wi‑Fi."</string>
+ <string name="calls_sms_wfc_summary" msgid="3940529919408667336">"Passer et recevoir des appels via Wi-Fi"</string>
+ <string name="calls_sms_footnote" msgid="8051604228144899434">"Avec la fonctionnalité Appels Wi-Fi, vous passez et recevez des appels sur des réseaux Wi‑Fi non gérés par des opérateurs."</string>
<string name="calls_preference_title" msgid="7536882032182563800">"Appels"</string>
<string name="sms_preference_title" msgid="8392745501754864395">"SMS"</string>
<string name="calls_sms_preferred" msgid="6016477652522583496">"mode préféré"</string>
@@ -5080,10 +5081,10 @@
<string name="reset_internet_text" product="tablet" msgid="8797910368942544453">"Cette action mettra fin à votre appel téléphonique"</string>
<string name="resetting_internet_text" msgid="6696779371800051806">"Réinitialisation de votre connexion Internet…"</string>
<string name="fix_connectivity" msgid="2781433603228089501">"Corriger la connectivité"</string>
- <!-- no translation found for airplane_mode_network_available (1059499681300395240) -->
- <skip />
- <!-- no translation found for to_switch_networks_disconnect_ethernet (6615374552827587197) -->
- <skip />
+ <string name="airplane_mode_network_available" msgid="1059499681300395240">"Réseaux disponibles en mode Avion"</string>
+ <string name="to_switch_networks_disconnect_ethernet" msgid="6615374552827587197">"Pour changer de réseau, déconnectez l\'Ethernet"</string>
+ <string name="cannot_switch_networks_while_connected" msgid="3867944849171754777">"Impossible de changer de réseau en étant connecté"</string>
+ <string name="airplane_mode_network_panel_title" msgid="6385046104863403604">"Réseaux du mode Avion"</string>
<string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g>/<xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
<string name="mobile_data_connection_active" msgid="2422223108911581552">"Connecté"</string>
<string name="mobile_data_off_summary" msgid="3841411571485837651">"Connexion Internet automatique impossible"</string>
@@ -5105,4 +5106,16 @@
<string name="category_name_others" msgid="2366006298768550310">"Autres"</string>
<string name="category_name_general" msgid="7737273712848115886">"Général"</string>
<string name="default_see_all_apps_title" msgid="7481113230662612178">"Voir toutes les applis"</string>
+ <string name="smart_forwarding_title" msgid="8368634861971949799">"Transfert intelligent"</string>
+ <string name="smart_forwarding_summary_enabled" msgid="3341062878373185604">"Transfert intelligent activé"</string>
+ <string name="smart_forwarding_summary_disabled" msgid="5033880700091914809">"Transfert intelligent désactivé"</string>
+ <string name="smart_forwarding_ongoing_title" msgid="962226849074401228">"Paramètres d\'appel"</string>
+ <string name="smart_forwarding_ongoing_text" msgid="2189209372407117114">"Mise à jour des paramètres…"</string>
+ <string name="smart_forwarding_failed_title" msgid="1859891191023516080">"Erreur des paramètres d\'appel"</string>
+ <string name="smart_forwarding_failed_text" msgid="5370431503707373653">"Erreur de réseau ou de carte SIM."</string>
+ <string name="smart_forwarding_failed_not_activated_text" msgid="997396203001257904">"La carte SIM n\'est pas activée."</string>
+ <string name="smart_forwarding_input_mdn_title" msgid="5105463748849841763">"Saisir les numéros de téléphone"</string>
+ <string name="smart_forwarding_input_mdn_dialog_title" msgid="7542216086697868415">"Saisir le numéro de téléphone"</string>
+ <string name="smart_forwarding_missing_mdn_text" msgid="2907314684242542226">"Numéro de téléphone manquant."</string>
+ <string name="smart_forwarding_missing_alert_dialog_text" msgid="7870419247987316112">"OK"</string>
</resources>
diff --git a/res/values-gl/strings.xml b/res/values-gl/strings.xml
index 68e2fda..c644ae1 100644
--- a/res/values-gl/strings.xml
+++ b/res/values-gl/strings.xml
@@ -2267,8 +2267,7 @@
<item quantity="other"><xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> audiófonos gardados</item>
<item quantity="one"><xliff:g id="NUMBER_DEVICE_COUNT_0">%1$d</xliff:g> audiófono gardado</item>
</plurals>
- <!-- no translation found for accessibility_audio_adjustment_title (1332113739136802997) -->
- <skip />
+ <string name="accessibility_audio_adjustment_title" msgid="1332113739136802997">"Axuste de audio"</string>
<string name="accessibility_summary_shortcut_enabled" msgid="4030427268146752644">"Atallo activado"</string>
<string name="accessibility_summary_shortcut_disabled" msgid="564005462092499068">"Desactivado"</string>
<string name="accessibility_summary_state_enabled" msgid="1065431632216039369">"Activado"</string>
@@ -2437,6 +2436,7 @@
<string name="bluetooth_on_time" msgid="8424625554628450028">"Tempo de conexión wifi"</string>
<string name="advanced_battery_title" msgid="3005993394776555079">"Uso da batería"</string>
<string name="history_details_title" msgid="8628584613889559355">"Detalles do historial"</string>
+ <string name="advanced_battery_preference_title" msgid="6518802648205311326">"Ver uso da batería"</string>
<string name="battery_details_title" msgid="4531369291819754178">"Uso da batería"</string>
<string name="details_subtitle" msgid="2550872569652785527">"Detalles de uso"</string>
<string name="controls_subtitle" msgid="3759606830916441564">"Axustar uso de enerxía"</string>
@@ -4098,6 +4098,7 @@
<string name="usb_use" msgid="6783183432648438528">"Usar USB para"</string>
<string name="usb_default_label" msgid="3372838450371060750">"Configuración USB predeterminada"</string>
<string name="usb_default_info" msgid="167172599497085266">"Cando se conecte outro dispositivo e se desbloquee o teu teléfono, aplicarase esta configuración. Conéctate tan só a dispositivos de confianza."</string>
+ <string name="usb_power_title" msgid="5602112548385798646">"Opcións de acendido"</string>
<string name="usb_pref" msgid="8521832005703261700">"USB"</string>
<string name="usb_preference" msgid="5084550082591493765">"Preferencias de USB"</string>
<string name="usb_control_title" msgid="1946791559052157693">"USB controlado por"</string>
@@ -4937,8 +4938,8 @@
<string name="mobile_data_ap_mode_disabled" msgid="6067959496888990983">"Non dispoñibles no modo avión"</string>
<string name="force_desktop_mode" msgid="1336913605091334238">"Forzar modo de escritorio"</string>
<string name="force_desktop_mode_summary" msgid="4587416867846930479">"Forza o modo de escritorio experimental en pantallas secundarias"</string>
- <string name="enable_sizecompat_freeform" msgid="3799755160777404309">"Permitir formato libre nas aplicacións de tamaño compatible"</string>
- <string name="enable_sizecompat_freeform_summary" msgid="1484050174538201499">"Permite que as aplicacións de tamaño compatible teñan formato libre"</string>
+ <string name="enable_non_resizable_multi_window" msgid="6832903754625404477">"Activar aplicacións sen axuste de tamaño no modo multiventá"</string>
+ <string name="enable_non_resizable_multi_window_summary" msgid="3275763753261901999">"Permite utilizar as aplicacións sen axuste de tamaño no modo multiventá"</string>
<string name="hwui_force_dark_title" msgid="4256904905631994219">"Anular Forzar modo escuro"</string>
<string name="hwui_force_dark_summary" msgid="6515748781487952769">"Anula a función Forzar modo escuro para que estea sempre activo"</string>
<string name="enable_blurs_on_windows_title" msgid="4218144213800778872">"Activar desenfoque"</string>
@@ -5060,8 +5061,8 @@
<string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"avión, segura para os avións"</string>
<string name="calls_and_sms" msgid="1931855083959003306">"Chamadas e SMS"</string>
<string name="calls_and_sms_category" msgid="2021321997884906046">"Chamadas por wifi"</string>
- <string name="calls_sms_wfc_summary" msgid="4930471357980272294">"Fai e recibe chamadas a través de redes que non pertencen a ningún operador, como as redes wifi"</string>
- <string name="calls_sms_footnote" msgid="7002461875954024216">"Coa función Chamadas por wifi podes facer e recibir chamadas a través de redes que non pertencen a ningún operador, como algunhas redes wifi."</string>
+ <string name="calls_sms_wfc_summary" msgid="3940529919408667336">"Fai e recibe chamadas a través de redes wifi"</string>
+ <string name="calls_sms_footnote" msgid="8051604228144899434">"Coa función Chamadas por wifi, podes facer e recibir chamadas a través de redes wifi que non pertencen a ningún operador."</string>
<string name="calls_preference_title" msgid="7536882032182563800">"Chamadas"</string>
<string name="sms_preference_title" msgid="8392745501754864395">"SMS"</string>
<string name="calls_sms_preferred" msgid="6016477652522583496">"prefírense"</string>
@@ -5080,10 +5081,10 @@
<string name="reset_internet_text" product="tablet" msgid="8797910368942544453">"Ao realizar esta acción finalizará a chamada telefónica"</string>
<string name="resetting_internet_text" msgid="6696779371800051806">"Restablecendo conexión a Internet…"</string>
<string name="fix_connectivity" msgid="2781433603228089501">"Solucionar conectividade"</string>
- <!-- no translation found for airplane_mode_network_available (1059499681300395240) -->
- <skip />
- <!-- no translation found for to_switch_networks_disconnect_ethernet (6615374552827587197) -->
- <skip />
+ <string name="airplane_mode_network_available" msgid="1059499681300395240">"Hai redes dispoñibles no modo avión"</string>
+ <string name="to_switch_networks_disconnect_ethernet" msgid="6615374552827587197">"Para cambiar de rede, desconecta a Ethernet"</string>
+ <string name="cannot_switch_networks_while_connected" msgid="3867944849171754777">"Non se pode cambiar de rede se hai unha conexión establecida"</string>
+ <string name="airplane_mode_network_panel_title" msgid="6385046104863403604">"Redes do modo avión"</string>
<string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g>/<xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
<string name="mobile_data_connection_active" msgid="2422223108911581552">"Conectada"</string>
<string name="mobile_data_off_summary" msgid="3841411571485837651">"Internet non se conectará automaticamente"</string>
@@ -5105,4 +5106,16 @@
<string name="category_name_others" msgid="2366006298768550310">"Outras opcións de configuración"</string>
<string name="category_name_general" msgid="7737273712848115886">"Xeral"</string>
<string name="default_see_all_apps_title" msgid="7481113230662612178">"Ver todas as aplicacións"</string>
+ <string name="smart_forwarding_title" msgid="8368634861971949799">"Reenvío intelixente"</string>
+ <string name="smart_forwarding_summary_enabled" msgid="3341062878373185604">"O reenvío intelixente está activado"</string>
+ <string name="smart_forwarding_summary_disabled" msgid="5033880700091914809">"O reenvío intelixente está desactivado"</string>
+ <string name="smart_forwarding_ongoing_title" msgid="962226849074401228">"Configuración de chamada"</string>
+ <string name="smart_forwarding_ongoing_text" msgid="2189209372407117114">"Actualizando configuración…"</string>
+ <string name="smart_forwarding_failed_title" msgid="1859891191023516080">"Produciuse un erro na configuración das chamadas"</string>
+ <string name="smart_forwarding_failed_text" msgid="5370431503707373653">"Produciuse un erro na rede ou na tarxeta SIM."</string>
+ <string name="smart_forwarding_failed_not_activated_text" msgid="997396203001257904">"A SIM non está activada."</string>
+ <string name="smart_forwarding_input_mdn_title" msgid="5105463748849841763">"Escribir os números de teléfono"</string>
+ <string name="smart_forwarding_input_mdn_dialog_title" msgid="7542216086697868415">"Escribir o número de teléfono"</string>
+ <string name="smart_forwarding_missing_mdn_text" msgid="2907314684242542226">"Falta o número de teléfono."</string>
+ <string name="smart_forwarding_missing_alert_dialog_text" msgid="7870419247987316112">"Aceptar"</string>
</resources>
diff --git a/res/values-gu/strings.xml b/res/values-gu/strings.xml
index 713456f..a97de87 100644
--- a/res/values-gu/strings.xml
+++ b/res/values-gu/strings.xml
@@ -2267,8 +2267,7 @@
<item quantity="one"><xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> શ્રવણ યંત્રો સાચવ્યા</item>
<item quantity="other"><xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> શ્રવણ યંત્રો સાચવ્યા</item>
</plurals>
- <!-- no translation found for accessibility_audio_adjustment_title (1332113739136802997) -->
- <skip />
+ <string name="accessibility_audio_adjustment_title" msgid="1332113739136802997">"ઑડિયોની ગોઠવણી"</string>
<string name="accessibility_summary_shortcut_enabled" msgid="4030427268146752644">"શૉર્ટકટ ચાલુ"</string>
<string name="accessibility_summary_shortcut_disabled" msgid="564005462092499068">"બંધ"</string>
<string name="accessibility_summary_state_enabled" msgid="1065431632216039369">"ચાલુ"</string>
@@ -2437,6 +2436,7 @@
<string name="bluetooth_on_time" msgid="8424625554628450028">"વાઇ-ફાઇ ચાલુ સમય"</string>
<string name="advanced_battery_title" msgid="3005993394776555079">"બૅટરીનો વપરાશ"</string>
<string name="history_details_title" msgid="8628584613889559355">"ઇતિહાસ વિગતો"</string>
+ <string name="advanced_battery_preference_title" msgid="6518802648205311326">"બૅટરીનો વપરાશ જુઓ"</string>
<string name="battery_details_title" msgid="4531369291819754178">"બૅટરી વપરાશ"</string>
<string name="details_subtitle" msgid="2550872569652785527">"વિગતોનો ઉપયોગ કરો"</string>
<string name="controls_subtitle" msgid="3759606830916441564">"પાવર વપરાશ સમાયોજિત કરો"</string>
@@ -4098,6 +4098,7 @@
<string name="usb_use" msgid="6783183432648438528">"આ માટે USB નો ઉપયોગ કરો"</string>
<string name="usb_default_label" msgid="3372838450371060750">"USBની ડિફૉલ્ટ ગોઠવણી"</string>
<string name="usb_default_info" msgid="167172599497085266">"જ્યારે અન્ય ઉપકરણ કનેક્ટ કરેલ હોય અને તમારો ફોન અનલૉક હોય, તો આ સેટિંગ લાગુ થશે. માત્ર વિશ્વસનીય ઉપકરણો સાથે કનેક્ટ કરો."</string>
+ <string name="usb_power_title" msgid="5602112548385798646">"પાવરના વિકલ્પો"</string>
<string name="usb_pref" msgid="8521832005703261700">"USB"</string>
<string name="usb_preference" msgid="5084550082591493765">"USBની પસંદગીઓ"</string>
<string name="usb_control_title" msgid="1946791559052157693">"આના દ્વારા નિયંત્રિત USB"</string>
@@ -4937,8 +4938,8 @@
<string name="mobile_data_ap_mode_disabled" msgid="6067959496888990983">"એરપ્લેન મોડ દરમિયાન ઉપલબ્ધ નથી"</string>
<string name="force_desktop_mode" msgid="1336913605091334238">"ફરજિયાત ડેસ્કટૉપ મોડ ચાલુ કરો"</string>
<string name="force_desktop_mode_summary" msgid="4587416867846930479">"ગૌણ ડિસ્પ્લે પર ફરજિયાત પ્રયોગાત્મક ડેસ્કટૉપ મોડ ચાલુ કરો"</string>
- <string name="enable_sizecompat_freeform" msgid="3799755160777404309">"sizecompatને ફ્રીફોર્મમાં ચાલુ કરો"</string>
- <string name="enable_sizecompat_freeform_summary" msgid="1484050174538201499">"sizecompat ઍપને ફ્રીફોર્મમાં રહેવાની મંજૂરી આપે છે"</string>
+ <string name="enable_non_resizable_multi_window" msgid="6832903754625404477">"એકથી વધુ વિન્ડોમાં ફરીથી કદ ન બદલી શકવાનો વિકલ્પ ચાલુ કરો"</string>
+ <string name="enable_non_resizable_multi_window_summary" msgid="3275763753261901999">"ફરીથી કદ ન બદલી શકે તેવી ઍપને એકથી વધુ વિન્ડોમાં દેખાવાની મંજૂરી આપે છે"</string>
<string name="hwui_force_dark_title" msgid="4256904905631994219">"ફરજિયાત ઘેરા મોડની સુવિધાને ઓવરરાઇડ કરો"</string>
<string name="hwui_force_dark_summary" msgid="6515748781487952769">"હંમેશાં ચાલુ રાખવા માટે ફરજિયાત ઘેરા મોડની સુવિધાને ઓવરરાઇડ કરે છે"</string>
<string name="enable_blurs_on_windows_title" msgid="4218144213800778872">"ઝાંખી કરવાનું ચાલુ કરે છે"</string>
@@ -5060,8 +5061,8 @@
<string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"એરપ્લેન, એરપ્લેન મોડમાં ઉપયોગ માટે સુરક્ષિત"</string>
<string name="calls_and_sms" msgid="1931855083959003306">"કૉલ અને SMS"</string>
<string name="calls_and_sms_category" msgid="2021321997884906046">"વાઇ-ફાઇ કૉલિંગ"</string>
- <string name="calls_sms_wfc_summary" msgid="4930471357980272294">"વાઇ-ફાઇ જેવા મોબાઇલ ઑપરેટર વિનાના નેટવર્ક પરથી કૉલ કરો અને મેળવો"</string>
- <string name="calls_sms_footnote" msgid="7002461875954024216">"અમુક વાઇ-ફાઇ નેટવર્ક જેમ કે મોબાઇલ ઑપરેટર વિનાના નેટવર્ક પરથી વાઇ-ફાઇ કૉલિંગની સેવા તમને કૉલ કરવાની અને મેળવવાની સુવિધા આપે છે."</string>
+ <string name="calls_sms_wfc_summary" msgid="3940529919408667336">"વાઇ-ફાઇ પરથી કૉલ કરો અને મેળવો"</string>
+ <string name="calls_sms_footnote" msgid="8051604228144899434">"વાઇ-ફાઇ કૉલિંગની સેવા વડે, મોબાઇલ ઑપરેટર વિનાના વાઇ-ફાઇ નેટવર્ક પરથી કૉલ કરી તેમજ મેળવી શકાય છે."</string>
<string name="calls_preference_title" msgid="7536882032182563800">"કૉલ"</string>
<string name="sms_preference_title" msgid="8392745501754864395">"SMS"</string>
<string name="calls_sms_preferred" msgid="6016477652522583496">"પસંદ કરેલું"</string>
@@ -5080,10 +5081,10 @@
<string name="reset_internet_text" product="tablet" msgid="8797910368942544453">"આનાથી તમારો ફોન કૉલ સમાપ્ત થશે"</string>
<string name="resetting_internet_text" msgid="6696779371800051806">"તમારું ઇન્ટરનેટ રીસેટ કરી રહ્યાં છીએ…"</string>
<string name="fix_connectivity" msgid="2781433603228089501">"કનેક્ટિવિટી સુધારો"</string>
- <!-- no translation found for airplane_mode_network_available (1059499681300395240) -->
- <skip />
- <!-- no translation found for to_switch_networks_disconnect_ethernet (6615374552827587197) -->
- <skip />
+ <string name="airplane_mode_network_available" msgid="1059499681300395240">"એરપ્લેન મોડમાં નેટવર્ક ઉપલબ્ધ છે"</string>
+ <string name="to_switch_networks_disconnect_ethernet" msgid="6615374552827587197">"બીજા નેટવર્ક પર જવા માટે, ઇથરનેટ ડિસ્કનેક્ટ કરો"</string>
+ <string name="cannot_switch_networks_while_connected" msgid="3867944849171754777">"કનેક્ટેડ હો ત્યારે નેટવર્ક સ્વિચ કરી શકાતા નથી"</string>
+ <string name="airplane_mode_network_panel_title" msgid="6385046104863403604">"એરપ્લેન મોડના નેટવર્ક"</string>
<string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g> / <xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
<string name="mobile_data_connection_active" msgid="2422223108911581552">"કનેક્ટ કરેલું"</string>
<string name="mobile_data_off_summary" msgid="3841411571485837651">"ઇન્ટરનેટ ઑટોમૅટિક રીતે કનેક્ટ થશે નહીં"</string>
@@ -5105,4 +5106,16 @@
<string name="category_name_others" msgid="2366006298768550310">"અન્ય"</string>
<string name="category_name_general" msgid="7737273712848115886">"સામાન્ય"</string>
<string name="default_see_all_apps_title" msgid="7481113230662612178">"બધી ઍપ જુઓ"</string>
+ <string name="smart_forwarding_title" msgid="8368634861971949799">"સ્માર્ટ ફૉરવર્ડિંગ"</string>
+ <string name="smart_forwarding_summary_enabled" msgid="3341062878373185604">"સ્માર્ટ ફૉરવર્ડિંગની સુવિધા ચાલુ કરી છે"</string>
+ <string name="smart_forwarding_summary_disabled" msgid="5033880700091914809">"સ્માર્ટ ફૉરવર્ડિંગની સુવિધા બંધ કરી છે"</string>
+ <string name="smart_forwarding_ongoing_title" msgid="962226849074401228">"કૉલ સેટિંગ"</string>
+ <string name="smart_forwarding_ongoing_text" msgid="2189209372407117114">"સેટિંગ અપડેટ કરી રહ્યાં છીએ..."</string>
+ <string name="smart_forwarding_failed_title" msgid="1859891191023516080">"કૉલ સેટિંગની ભૂલ"</string>
+ <string name="smart_forwarding_failed_text" msgid="5370431503707373653">"નેટવર્ક અથવા SIM કાર્ડમાં ભૂલ."</string>
+ <string name="smart_forwarding_failed_not_activated_text" msgid="997396203001257904">"સિમ કાર્ડ સક્રિય થયું નથી."</string>
+ <string name="smart_forwarding_input_mdn_title" msgid="5105463748849841763">"ફોન નંબર દાખલ કરો"</string>
+ <string name="smart_forwarding_input_mdn_dialog_title" msgid="7542216086697868415">"ફોન નંબર દાખલ કરો"</string>
+ <string name="smart_forwarding_missing_mdn_text" msgid="2907314684242542226">"ફોન નંબર ખૂટે છે."</string>
+ <string name="smart_forwarding_missing_alert_dialog_text" msgid="7870419247987316112">"ઓકે"</string>
</resources>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index e269d1d..dc66fd8 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -2267,8 +2267,7 @@
<item quantity="one">सुनने में मददगार <xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> डिवाइस सेव किए गए</item>
<item quantity="other">सुनने में मददगार <xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> डिवाइस सेव किए गए</item>
</plurals>
- <!-- no translation found for accessibility_audio_adjustment_title (1332113739136802997) -->
- <skip />
+ <string name="accessibility_audio_adjustment_title" msgid="1332113739136802997">"ऑडियो में बदलाव करने की सेटिंग"</string>
<string name="accessibility_summary_shortcut_enabled" msgid="4030427268146752644">"शॉर्टकट चालू है"</string>
<string name="accessibility_summary_shortcut_disabled" msgid="564005462092499068">"बंद है"</string>
<string name="accessibility_summary_state_enabled" msgid="1065431632216039369">"चालू है"</string>
@@ -2437,6 +2436,7 @@
<string name="bluetooth_on_time" msgid="8424625554628450028">"वाई-फ़ाई चालू होने से अब तक का समय"</string>
<string name="advanced_battery_title" msgid="3005993394776555079">"बैटरी खर्च"</string>
<string name="history_details_title" msgid="8628584613889559355">"इतिहास विवरण"</string>
+ <string name="advanced_battery_preference_title" msgid="6518802648205311326">"बैटरी खर्च देखें"</string>
<string name="battery_details_title" msgid="4531369291819754178">"बैटरी खर्च"</string>
<string name="details_subtitle" msgid="2550872569652785527">"विवरणों का उपयोग करें"</string>
<string name="controls_subtitle" msgid="3759606830916441564">"पावर उपयोग एडजस्ट करें"</string>
@@ -3129,9 +3129,9 @@
<string name="amber_alerts_title" msgid="5238275758191804575">"AMBER अलर्ट"</string>
<string name="amber_alerts_summary" msgid="5755221775246075883">"बाल अपहरणों के बारे में बुलेटिन पाएं"</string>
<string name="repeat_title" msgid="8676570486899483606">"दोहराएं"</string>
- <string name="call_manager_enable_title" msgid="1214301265395158720">"कॉल प्रबंधक चालू करें"</string>
+ <string name="call_manager_enable_title" msgid="1214301265395158720">"कॉल मैनेजर चालू करें"</string>
<string name="call_manager_enable_summary" msgid="7362506369604163030">"इस सेवा को कॉल करने का आपका तरीका प्रबंधित करने दें."</string>
- <string name="call_manager_title" msgid="3397433159509629466">"कॉल प्रबंधक"</string>
+ <string name="call_manager_title" msgid="3397433159509629466">"कॉल मैनेजर"</string>
<!-- no translation found for call_manager_summary (2558839230880919191) -->
<skip />
<string name="cell_broadcast_settings" msgid="2416980110093867199">"वायरलेस इमरजेंसी अलर्ट"</string>
@@ -4098,6 +4098,7 @@
<string name="usb_use" msgid="6783183432648438528">"यूएसबी का उपयोग इसके लिए करें"</string>
<string name="usb_default_label" msgid="3372838450371060750">"यूएसबी का डिफ़ॉल्ट कॉन्फ़िगरेशन"</string>
<string name="usb_default_info" msgid="167172599497085266">"जब आपका फ़ोन किसी दूसरे डिवाइस से जुड़ा हो और वह अनलॉक हो तो, ये सेटिंग लागू होंगी. अपना फ़ोन सिर्फ़ भरोसेमंद डिवाइस से ही जोड़ें."</string>
+ <string name="usb_power_title" msgid="5602112548385798646">"पावर इस्तेमाल करने के विकल्प"</string>
<string name="usb_pref" msgid="8521832005703261700">"यूएसबी"</string>
<string name="usb_preference" msgid="5084550082591493765">"यूएसबी की सेटिंग"</string>
<string name="usb_control_title" msgid="1946791559052157693">"यूएसबी का कंट्रोल किस डिवाइस के पास है"</string>
@@ -4462,10 +4463,10 @@
<item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> सेकंड</item>
</plurals>
<string name="automatic_storage_manager_settings" msgid="519158151463974656">"जगह प्रबंधित करें"</string>
- <string name="automatic_storage_manager_text" msgid="6900593059927987273">"मेमोरी में जगह खाली करने में मदद करने के लिए, मेमोरी प्रबंधक आपके डिवाइस से बैकअप ली गई फ़ोटो और वीडियो निकाल देता है."</string>
+ <string name="automatic_storage_manager_text" msgid="6900593059927987273">"मेमोरी में जगह खाली करने में मदद करने के लिए, मेमोरी मैनेजर आपके डिवाइस से बैकअप ली गई फ़ोटो और वीडियो निकाल देता है."</string>
<string name="automatic_storage_manager_days_title" msgid="5077286114860539367">"फ़ोटो और वीडियो निकालें"</string>
- <string name="automatic_storage_manager_preference_title" msgid="3483357910142595444">"मेमोरी प्रबंधक"</string>
- <string name="automatic_storage_manager_primary_switch_title" msgid="9131959126462101994">"मेमोरी प्रबंधक टूल का इस्तेमाल करें"</string>
+ <string name="automatic_storage_manager_preference_title" msgid="3483357910142595444">"मेमोरी मैनेजर"</string>
+ <string name="automatic_storage_manager_primary_switch_title" msgid="9131959126462101994">"मेमोरी मैनेजर टूल का इस्तेमाल करें"</string>
<string name="deletion_helper_automatic_title" msgid="597196990024769472">"अपने-आप"</string>
<string name="deletion_helper_manual_title" msgid="1068812971600327101">"मैन्युअल"</string>
<string name="deletion_helper_preference_title" msgid="6364023246849161274">"अभी स्पेस खाली करें"</string>
@@ -4555,7 +4556,7 @@
<string name="web_action_section_title" msgid="994717569424234098">"झटपट ऐप्लिकेशन"</string>
<string name="instant_apps_settings" msgid="4280942494969957858">"झटपट ऐप्लिकेशन से जुड़ी पसंद की सेटिंग"</string>
<string name="domain_url_section_title" msgid="9028890472923474958">"इंस्टॉल किए गए ऐप्लिकेशन"</string>
- <string name="automatic_storage_manager_activation_warning" msgid="170508173207142665">"आपकी जगह का प्रबंधन अब जगह प्रबंधक द्वारा किया जा रहा है"</string>
+ <string name="automatic_storage_manager_activation_warning" msgid="170508173207142665">"आपकी जगह का प्रबंधन अब जगह मैनेजर द्वारा किया जा रहा है"</string>
<string name="account_for_section_header" msgid="7466759342105251096">"<xliff:g id="USER_NAME">%1$s</xliff:g> के खाते"</string>
<string name="configure_section_header" msgid="3126887329521705210">"कॉन्फ़िगर करें"</string>
<string name="auto_sync_account_title" msgid="1070908045600374254">"ऐप्लिकेशन का डेटा अपने-आप सिंक होने की सुविधा चालू करें"</string>
@@ -4670,11 +4671,11 @@
<string name="default_theme" msgid="4815428567082263639">"डिफ़ॉल्ट"</string>
<string name="show_operator_name_title" msgid="3355910331531144028">"नेटवर्क का नाम"</string>
<string name="show_operator_name_summary" msgid="5352696579216501773">"स्टेटस बार में नेटवर्क का नाम दिखाएं"</string>
- <string name="storage_manager_indicator" msgid="6187509172735927297">"जगह प्रबंधक: <xliff:g id="STATUS">^1</xliff:g>"</string>
+ <string name="storage_manager_indicator" msgid="6187509172735927297">"जगह मैनेजर: <xliff:g id="STATUS">^1</xliff:g>"</string>
<string name="storage_manager_indicator_off" msgid="2705959642617709265">"बंद"</string>
<string name="storage_manager_indicator_on" msgid="8380330763647785309">"चालू"</string>
<string name="install_type_instant" msgid="7685381859060486009">"झटपट ऐप"</string>
- <string name="automatic_storage_manager_deactivation_warning" msgid="4905106133215702099">"जगह प्रबंधक को बंद करना चाहते हैं?"</string>
+ <string name="automatic_storage_manager_deactivation_warning" msgid="4905106133215702099">"जगह मैनेजर को बंद करना चाहते हैं?"</string>
<string name="storage_movies_tv" msgid="7897612625450668593">"फ़िल्में और टीवी ऐप्लिकेशन"</string>
<string name="carrier_provisioning" msgid="7217868336140325816">"मोबाइल और इंटरनेट सेवा देने वाली कंपनी की नेटवर्क से जुड़ी जानकारी"</string>
<string name="trigger_carrier_provisioning" msgid="3288805742683538597">"मोबाइल और इंटरनेट सेवा देने वाली कंपनी का नेटवर्क ट्रिगर करें"</string>
@@ -4937,8 +4938,8 @@
<string name="mobile_data_ap_mode_disabled" msgid="6067959496888990983">"हवाई जहाज़ मोड के दौरान उपलब्ध नहीं"</string>
<string name="force_desktop_mode" msgid="1336913605091334238">"डेस्कटॉप मोड चालू करें"</string>
<string name="force_desktop_mode_summary" msgid="4587416867846930479">"दूसरी स्क्रीन पर प्रयोग के लिए डेस्कटॉप मोड चालू करें"</string>
- <string name="enable_sizecompat_freeform" msgid="3799755160777404309">"sizecompat को फ़्रीफ़ॉर्म मोड में चालू करें"</string>
- <string name="enable_sizecompat_freeform_summary" msgid="1484050174538201499">"sizecompat वाले ऐप्लिकेशन को फ़्रीफ़ॉर्म मोड में लाने की अनुमति देता है"</string>
+ <string name="enable_non_resizable_multi_window" msgid="6832903754625404477">"मल्टी-विंडो में विंडो का आकार न बदलने का विकल्प चालू करें"</string>
+ <string name="enable_non_resizable_multi_window_summary" msgid="3275763753261901999">"आकार न बदलने वाले ऐप्लिकेशन को मल्टी-विंडो (एक से ज़्यादा ऐप्लिकेशन, एक साथ) में दिखाने की अनुमति दें"</string>
<string name="hwui_force_dark_title" msgid="4256904905631994219">"फ़ोर्स-डार्क सुविधा को ओवरराइड करें"</string>
<string name="hwui_force_dark_summary" msgid="6515748781487952769">"फ़ोर्स-डार्क सुविधा को हमेशा चालू रहने के लिए ओवरराइड करती है"</string>
<string name="enable_blurs_on_windows_title" msgid="4218144213800778872">"धुंधला करने की सुविधा चालू करें"</string>
@@ -5060,8 +5061,8 @@
<string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"हवाई जहाज़, हवाई जहाज़ सुरक्षित नेटवर्क"</string>
<string name="calls_and_sms" msgid="1931855083959003306">"कॉल और मैसेज (एसएमएस)"</string>
<string name="calls_and_sms_category" msgid="2021321997884906046">"वाई-फ़ाई कॉलिंग"</string>
- <string name="calls_sms_wfc_summary" msgid="4930471357980272294">"ऐसे नेटवर्क से कॉल करें और उन पर कॉल पाएं जो सिम का इस्तेमाल नहीं करते, जैसे कि वाई-फ़ाई नेटवर्क"</string>
- <string name="calls_sms_footnote" msgid="7002461875954024216">"वाई-फ़ाई कॉलिंग आपको ऐसे नेटवर्क से कॉल करने और उन पर कॉल पाने की सुविधा देती है जो सिम का इस्तेमाल नहीं करते, जैसे कुछ वाई-फ़ाई नेटवर्क."</string>
+ <string name="calls_sms_wfc_summary" msgid="3940529919408667336">"वाई-फ़ाई की मदद से कॉल करें और कॉल रिसीव करें"</string>
+ <string name="calls_sms_footnote" msgid="8051604228144899434">"वाई-फ़ाई कॉलिंग, आपको ऐसे नेटवर्क से कॉल करने और रिसीव करने की सुविधा देती है जो सिम का इस्तेमाल नहीं करते, जैसे कुछ वाई-फ़ाई नेटवर्क."</string>
<string name="calls_preference_title" msgid="7536882032182563800">"कॉल"</string>
<string name="sms_preference_title" msgid="8392745501754864395">"मैसेज (एसएमएस)"</string>
<string name="calls_sms_preferred" msgid="6016477652522583496">"इस सिम का इस्तेमाल किया जाए"</string>
@@ -5080,10 +5081,10 @@
<string name="reset_internet_text" product="tablet" msgid="8797910368942544453">"ऐसा करने पर आपका कॉल कट जाएगा"</string>
<string name="resetting_internet_text" msgid="6696779371800051806">"इंटरनेट रीसेट हो रहा है…"</string>
<string name="fix_connectivity" msgid="2781433603228089501">"कनेक्टिविटी से जुड़ी समस्याएं ठीक करें"</string>
- <!-- no translation found for airplane_mode_network_available (1059499681300395240) -->
- <skip />
- <!-- no translation found for to_switch_networks_disconnect_ethernet (6615374552827587197) -->
- <skip />
+ <string name="airplane_mode_network_available" msgid="1059499681300395240">"हवाई जहाज़ मोड पर काम करने वाले नेटवर्क उपलब्ध हैं"</string>
+ <string name="to_switch_networks_disconnect_ethernet" msgid="6615374552827587197">"नेटवर्क बदलने के लिए, पहले ईथरनेट को डिसकनेक्ट करें"</string>
+ <string name="cannot_switch_networks_while_connected" msgid="3867944849171754777">"नेटवर्क बदलने के लिए, पहले ईथरनेट को डिसकनेक्ट करें"</string>
+ <string name="airplane_mode_network_panel_title" msgid="6385046104863403604">"हवाई जहाज़ मोड नेटवर्क"</string>
<string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g> / <xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
<string name="mobile_data_connection_active" msgid="2422223108911581552">"कनेक्ट हो गया"</string>
<string name="mobile_data_off_summary" msgid="3841411571485837651">"इंटरनेट अपने-आप कनेक्ट नहीं होगा"</string>
@@ -5105,4 +5106,16 @@
<string name="category_name_others" msgid="2366006298768550310">"अन्य"</string>
<string name="category_name_general" msgid="7737273712848115886">"सामान्य"</string>
<string name="default_see_all_apps_title" msgid="7481113230662612178">"सभी ऐप्लिकेशन देखें"</string>
+ <string name="smart_forwarding_title" msgid="8368634861971949799">"स्मार्ट फ़ॉरवर्डिंग"</string>
+ <string name="smart_forwarding_summary_enabled" msgid="3341062878373185604">"स्मार्ट फ़ॉरवर्डिंग की सुविधा चालू है"</string>
+ <string name="smart_forwarding_summary_disabled" msgid="5033880700091914809">"स्मार्ट फ़ॉरवर्डिंग की सुविधा बंद है"</string>
+ <string name="smart_forwarding_ongoing_title" msgid="962226849074401228">"कॉल सेटिंग"</string>
+ <string name="smart_forwarding_ongoing_text" msgid="2189209372407117114">"सेटिंग अपडेट की जा रही है..."</string>
+ <string name="smart_forwarding_failed_title" msgid="1859891191023516080">"कॉल सेटिंग में गड़बड़ी"</string>
+ <string name="smart_forwarding_failed_text" msgid="5370431503707373653">"नेटवर्क या सिम कार्ड में कोई गड़बड़ी हुई."</string>
+ <string name="smart_forwarding_failed_not_activated_text" msgid="997396203001257904">"सिम चालू नहीं किया गया है."</string>
+ <string name="smart_forwarding_input_mdn_title" msgid="5105463748849841763">"कॉल को दूसरे नंबर पर भेजने के लिए फ़ोन नंबर डालें"</string>
+ <string name="smart_forwarding_input_mdn_dialog_title" msgid="7542216086697868415">"फ़ोन नंबर डालें"</string>
+ <string name="smart_forwarding_missing_mdn_text" msgid="2907314684242542226">"फ़ोन नंबर नहीं डाला गया."</string>
+ <string name="smart_forwarding_missing_alert_dialog_text" msgid="7870419247987316112">"ठीक है"</string>
</resources>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index 953ad54..9e110c3 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -2292,8 +2292,7 @@
<item quantity="few">Spremljena su <xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> slušna aparata</item>
<item quantity="other">Spremljeno je <xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> slušnih aparata</item>
</plurals>
- <!-- no translation found for accessibility_audio_adjustment_title (1332113739136802997) -->
- <skip />
+ <string name="accessibility_audio_adjustment_title" msgid="1332113739136802997">"Prilagodba zvuka"</string>
<string name="accessibility_summary_shortcut_enabled" msgid="4030427268146752644">"Prečac je uključen"</string>
<string name="accessibility_summary_shortcut_disabled" msgid="564005462092499068">"Isključeno"</string>
<string name="accessibility_summary_state_enabled" msgid="1065431632216039369">"Uključeno"</string>
@@ -2468,6 +2467,7 @@
<string name="bluetooth_on_time" msgid="8424625554628450028">"Wi-Fi na vrijeme"</string>
<string name="advanced_battery_title" msgid="3005993394776555079">"Potrošnja baterije"</string>
<string name="history_details_title" msgid="8628584613889559355">"Detalji povijesti"</string>
+ <string name="advanced_battery_preference_title" msgid="6518802648205311326">"Prikaži potrošnju baterije"</string>
<string name="battery_details_title" msgid="4531369291819754178">"Potrošnja baterije"</string>
<string name="details_subtitle" msgid="2550872569652785527">"Detalji upotrebe"</string>
<string name="controls_subtitle" msgid="3759606830916441564">"Podesi potrošnju energije"</string>
@@ -4160,6 +4160,7 @@
<string name="usb_use" msgid="6783183432648438528">"Svrha upotrebe USB-a"</string>
<string name="usb_default_label" msgid="3372838450371060750">"Zadana konfiguracija USB-a"</string>
<string name="usb_default_info" msgid="167172599497085266">"Te će se postavke primjenjivati kada je povezan drugi uređaj, a vaš je telefon otključan. Povežite se samo s pouzdanim uređajima."</string>
+ <string name="usb_power_title" msgid="5602112548385798646">"Opcije napajanja"</string>
<string name="usb_pref" msgid="8521832005703261700">"USB"</string>
<string name="usb_preference" msgid="5084550082591493765">"Postavke USB-a"</string>
<string name="usb_control_title" msgid="1946791559052157693">"USB-om upravlja"</string>
@@ -5018,8 +5019,8 @@
<string name="mobile_data_ap_mode_disabled" msgid="6067959496888990983">"Nije dostupno u načinu rada u zrakoplovu"</string>
<string name="force_desktop_mode" msgid="1336913605091334238">"Nametni način rada na računalu"</string>
<string name="force_desktop_mode_summary" msgid="4587416867846930479">"Nametanje eksperimentalnog načina rada na računalu na sekundarnim zaslonima"</string>
- <string name="enable_sizecompat_freeform" msgid="3799755160777404309">"Omogući slobodni oblik apl. stalne veličine"</string>
- <string name="enable_sizecompat_freeform_summary" msgid="1484050174538201499">"Omogućuje da aplikacije stalne veličine budu u slobodnom obliku"</string>
+ <string name="enable_non_resizable_multi_window" msgid="6832903754625404477">"Omogući aplikacije nepromjenjive veličine u više prozora"</string>
+ <string name="enable_non_resizable_multi_window_summary" msgid="3275763753261901999">"Omogućuje prikaz aplikacija nepromjenjive veličine u više prozora"</string>
<string name="hwui_force_dark_title" msgid="4256904905631994219">"Nadjačaj nametanje tamne teme"</string>
<string name="hwui_force_dark_summary" msgid="6515748781487952769">"Nadjačava značajku nametanja tamne teme tako da je uvijek uključena"</string>
<string name="enable_blurs_on_windows_title" msgid="4218144213800778872">"Omogući zamućenja"</string>
@@ -5143,8 +5144,8 @@
<string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"zrakoplov, sigurno za rad u zrakoplovu"</string>
<string name="calls_and_sms" msgid="1931855083959003306">"Pozivi i SMS"</string>
<string name="calls_and_sms_category" msgid="2021321997884906046">"Wi‑Fi pozivi"</string>
- <string name="calls_sms_wfc_summary" msgid="4930471357980272294">"Upućujte i primajte pozive putem mreža koje ne pripadaju mobilnom operateru, kao što su Wi-Fi mreže"</string>
- <string name="calls_sms_footnote" msgid="7002461875954024216">"Wi‑Fi pozivi omogućuju vam da upućujete i odgovarate na pozive putem mreža koje ne pripadaju mobilnom operateru, kao što su neke Wi-Fi mreže."</string>
+ <string name="calls_sms_wfc_summary" msgid="3940529919408667336">"Upućujte i primajte pozive putem Wi‑Fija"</string>
+ <string name="calls_sms_footnote" msgid="8051604228144899434">"Wi‑Fi pozivi omogućuju upućivanje i primanje poziva putem Wi-Fi mreža koje ne pripadaju mobilnom operateru."</string>
<string name="calls_preference_title" msgid="7536882032182563800">"Pozivi"</string>
<string name="sms_preference_title" msgid="8392745501754864395">"SMS"</string>
<string name="calls_sms_preferred" msgid="6016477652522583496">"preferirano"</string>
@@ -5163,10 +5164,10 @@
<string name="reset_internet_text" product="tablet" msgid="8797910368942544453">"Time će se prekinuti vaš telefonski poziv"</string>
<string name="resetting_internet_text" msgid="6696779371800051806">"Vraćanje interneta na zadano…"</string>
<string name="fix_connectivity" msgid="2781433603228089501">"Rješavanje problema s povezivošću"</string>
- <!-- no translation found for airplane_mode_network_available (1059499681300395240) -->
- <skip />
- <!-- no translation found for to_switch_networks_disconnect_ethernet (6615374552827587197) -->
- <skip />
+ <string name="airplane_mode_network_available" msgid="1059499681300395240">"Dostupne su mreže za način rada u zrakoplovu"</string>
+ <string name="to_switch_networks_disconnect_ethernet" msgid="6615374552827587197">"Da biste se prebacili na drugu mrežu, odspojite ethernet"</string>
+ <string name="cannot_switch_networks_while_connected" msgid="3867944849171754777">"Ne možete promijeniti mrežu dok ste povezani"</string>
+ <string name="airplane_mode_network_panel_title" msgid="6385046104863403604">"Mreže u načinu rada u zrakoplovu"</string>
<string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g>/<xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
<string name="mobile_data_connection_active" msgid="2422223108911581552">"Povezano"</string>
<string name="mobile_data_off_summary" msgid="3841411571485837651">"Neće biti automatskog povezivanja s internetom"</string>
@@ -5188,4 +5189,16 @@
<string name="category_name_others" msgid="2366006298768550310">"Ostalo"</string>
<string name="category_name_general" msgid="7737273712848115886">"Općenito"</string>
<string name="default_see_all_apps_title" msgid="7481113230662612178">"Pogledajte sve aplikacije"</string>
+ <string name="smart_forwarding_title" msgid="8368634861971949799">"Pametno prosljeđivanje"</string>
+ <string name="smart_forwarding_summary_enabled" msgid="3341062878373185604">"Pametno prosljeđivanje omogućeno"</string>
+ <string name="smart_forwarding_summary_disabled" msgid="5033880700091914809">"Pametno prosljeđivanje onemogućeno"</string>
+ <string name="smart_forwarding_ongoing_title" msgid="962226849074401228">"Postavke poziva"</string>
+ <string name="smart_forwarding_ongoing_text" msgid="2189209372407117114">"Ažuriranje postavki…"</string>
+ <string name="smart_forwarding_failed_title" msgid="1859891191023516080">"Pogreška postavki poziva"</string>
+ <string name="smart_forwarding_failed_text" msgid="5370431503707373653">"Pogreška mreže ili SIM kartice."</string>
+ <string name="smart_forwarding_failed_not_activated_text" msgid="997396203001257904">"SIM nije aktiviran."</string>
+ <string name="smart_forwarding_input_mdn_title" msgid="5105463748849841763">"Unesite telefonske brojeve"</string>
+ <string name="smart_forwarding_input_mdn_dialog_title" msgid="7542216086697868415">"Unesite telefonski broj"</string>
+ <string name="smart_forwarding_missing_mdn_text" msgid="2907314684242542226">"Nedostaje telefonski broj."</string>
+ <string name="smart_forwarding_missing_alert_dialog_text" msgid="7870419247987316112">"U redu"</string>
</resources>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 7117dbd..68b807c 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -2267,8 +2267,7 @@
<item quantity="other"><xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> mentett hallókészülék</item>
<item quantity="one"><xliff:g id="NUMBER_DEVICE_COUNT_0">%1$d</xliff:g> mentett hallókészülék</item>
</plurals>
- <!-- no translation found for accessibility_audio_adjustment_title (1332113739136802997) -->
- <skip />
+ <string name="accessibility_audio_adjustment_title" msgid="1332113739136802997">"Hang korrigálása"</string>
<string name="accessibility_summary_shortcut_enabled" msgid="4030427268146752644">"Gyorsparancs bekapcsolva"</string>
<string name="accessibility_summary_shortcut_disabled" msgid="564005462092499068">"Ki"</string>
<string name="accessibility_summary_state_enabled" msgid="1065431632216039369">"Be"</string>
@@ -2437,6 +2436,7 @@
<string name="bluetooth_on_time" msgid="8424625554628450028">"Wi-Fi időben"</string>
<string name="advanced_battery_title" msgid="3005993394776555079">"Akkumulátorhasználat"</string>
<string name="history_details_title" msgid="8628584613889559355">"Előzmények részletei"</string>
+ <string name="advanced_battery_preference_title" msgid="6518802648205311326">"Akkumulátorhasználat megtekintése"</string>
<string name="battery_details_title" msgid="4531369291819754178">"Akkumulátorhasználat"</string>
<string name="details_subtitle" msgid="2550872569652785527">"Használat részletei"</string>
<string name="controls_subtitle" msgid="3759606830916441564">"Az energiafelhasználás beállítása"</string>
@@ -4098,6 +4098,7 @@
<string name="usb_use" msgid="6783183432648438528">"USB használata a következő célra:"</string>
<string name="usb_default_label" msgid="3372838450371060750">"Alapértelmezett USB-beállítás"</string>
<string name="usb_default_info" msgid="167172599497085266">"Ha egy másik eszközt csatlakoztatott, és a telefonja fel van oldva, akkor ezek a beállítások lesznek érvényesek. Csak megbízható eszközökhöz kapcsolódjon."</string>
+ <string name="usb_power_title" msgid="5602112548385798646">"Bekapcsológomb beállításai"</string>
<string name="usb_pref" msgid="8521832005703261700">"USB"</string>
<string name="usb_preference" msgid="5084550082591493765">"USB-beállítások"</string>
<string name="usb_control_title" msgid="1946791559052157693">"Az USB-t vezérli:"</string>
@@ -4937,8 +4938,8 @@
<string name="mobile_data_ap_mode_disabled" msgid="6067959496888990983">"Repülős üzemmódban nem áll rendelkezésre"</string>
<string name="force_desktop_mode" msgid="1336913605091334238">"Asztali mód kényszerítése"</string>
<string name="force_desktop_mode_summary" msgid="4587416867846930479">"Kísérleti asztali mód kényszerítése a másodlagos kijelzőkön"</string>
- <string name="enable_sizecompat_freeform" msgid="3799755160777404309">"Szabad formájú méretkompatibilitás engedélyezése"</string>
- <string name="enable_sizecompat_freeform_summary" msgid="1484050174538201499">"Engedélyezi a szabad formájú méretkompatibilis alkalmazásokat"</string>
+ <string name="enable_non_resizable_multi_window" msgid="6832903754625404477">"Nem átméretezhető appok engedélyezése többablakos nézetben"</string>
+ <string name="enable_non_resizable_multi_window_summary" msgid="3275763753261901999">"Engedélyezi a nem átméretezhető alkalmazásokat a többablakos nézetben"</string>
<string name="hwui_force_dark_title" msgid="4256904905631994219">"A kényszerített sötétítés felülírása"</string>
<string name="hwui_force_dark_summary" msgid="6515748781487952769">"A kényszerített sötétítés funkció felülírása mindig bekapcsolt állapotra"</string>
<string name="enable_blurs_on_windows_title" msgid="4218144213800778872">"Homályosítás engedélyezése"</string>
@@ -5060,8 +5061,8 @@
<string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"repülőgép, repülőgépen használható"</string>
<string name="calls_and_sms" msgid="1931855083959003306">"Hívások és SMS"</string>
<string name="calls_and_sms_category" msgid="2021321997884906046">"Wi‑Fi-hívás"</string>
- <string name="calls_sms_wfc_summary" msgid="4930471357980272294">"Hívások indítása és fogadása nem szolgáltatói hálózaton (pl. Wi-Fi)"</string>
- <string name="calls_sms_footnote" msgid="7002461875954024216">"A Wi-Fi-hívás funkció segítségével hívásokat indíthat és fogadhat nem szolgáltatói hálózatokon, így például bizonyos Wi-Fi-hálózatokon."</string>
+ <string name="calls_sms_wfc_summary" msgid="3940529919408667336">"Hívások indítása és fogadása Wi‑Fi-n keresztül"</string>
+ <string name="calls_sms_footnote" msgid="8051604228144899434">"Wi‑Fi-hívás esetén a kimenő és bejövő hívások nem szolgáltatói Wi‑Fi-hálózatokon keresztül zajlanak."</string>
<string name="calls_preference_title" msgid="7536882032182563800">"Hívások"</string>
<string name="sms_preference_title" msgid="8392745501754864395">"SMS"</string>
<string name="calls_sms_preferred" msgid="6016477652522583496">"előnyben részesített"</string>
@@ -5080,10 +5081,10 @@
<string name="reset_internet_text" product="tablet" msgid="8797910368942544453">"Ezzel befejezi a hívást"</string>
<string name="resetting_internet_text" msgid="6696779371800051806">"Internetkapcsolat visszaállítása…"</string>
<string name="fix_connectivity" msgid="2781433603228089501">"Csatlakozás javítása"</string>
- <!-- no translation found for airplane_mode_network_available (1059499681300395240) -->
- <skip />
- <!-- no translation found for to_switch_networks_disconnect_ethernet (6615374552827587197) -->
- <skip />
+ <string name="airplane_mode_network_available" msgid="1059499681300395240">"Hozzáférhetők repülős üzemmódban használható hálózatok"</string>
+ <string name="to_switch_networks_disconnect_ethernet" msgid="6615374552827587197">"Hálózatváltáshoz válassza le az ethernetet"</string>
+ <string name="cannot_switch_networks_while_connected" msgid="3867944849171754777">"Csatlakozott állapotban nem lehet hálózatot váltani"</string>
+ <string name="airplane_mode_network_panel_title" msgid="6385046104863403604">"Repülős üzemmód hálózatok"</string>
<string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g> (<xliff:g id="NETWORKMODE">%2$s</xliff:g>)"</string>
<string name="mobile_data_connection_active" msgid="2422223108911581552">"Csatlakozva"</string>
<string name="mobile_data_off_summary" msgid="3841411571485837651">"Az internetre történő csatlakozás nem automatikus"</string>
@@ -5105,4 +5106,16 @@
<string name="category_name_others" msgid="2366006298768550310">"Egyéb"</string>
<string name="category_name_general" msgid="7737273712848115886">"Általános"</string>
<string name="default_see_all_apps_title" msgid="7481113230662612178">"Összes alkalmazás megjelenítése"</string>
+ <string name="smart_forwarding_title" msgid="8368634861971949799">"Intelligens átirányítás"</string>
+ <string name="smart_forwarding_summary_enabled" msgid="3341062878373185604">"Intelligens átirányítás engedélyezve"</string>
+ <string name="smart_forwarding_summary_disabled" msgid="5033880700091914809">"Intelligens átirányítás letiltva"</string>
+ <string name="smart_forwarding_ongoing_title" msgid="962226849074401228">"Hívásbeállítások"</string>
+ <string name="smart_forwarding_ongoing_text" msgid="2189209372407117114">"Beállítások frissítése…"</string>
+ <string name="smart_forwarding_failed_title" msgid="1859891191023516080">"Hiba a hívásbeállításokban"</string>
+ <string name="smart_forwarding_failed_text" msgid="5370431503707373653">"Hiba a hálózatban vagy a SIM-kártyánál."</string>
+ <string name="smart_forwarding_failed_not_activated_text" msgid="997396203001257904">"A SIM nincs aktiválva."</string>
+ <string name="smart_forwarding_input_mdn_title" msgid="5105463748849841763">"Telefonszámok megadása"</string>
+ <string name="smart_forwarding_input_mdn_dialog_title" msgid="7542216086697868415">"Telefonszám megadása"</string>
+ <string name="smart_forwarding_missing_mdn_text" msgid="2907314684242542226">"Hiányzik a telefonszám."</string>
+ <string name="smart_forwarding_missing_alert_dialog_text" msgid="7870419247987316112">"OK"</string>
</resources>
diff --git a/res/values-hy/strings.xml b/res/values-hy/strings.xml
index e5de9f7..c5d8aa2 100644
--- a/res/values-hy/strings.xml
+++ b/res/values-hy/strings.xml
@@ -2267,8 +2267,7 @@
<item quantity="one"><xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> պահված լսողական ապարատ</item>
<item quantity="other"><xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> պահված լսողական ապարատներ</item>
</plurals>
- <!-- no translation found for accessibility_audio_adjustment_title (1332113739136802997) -->
- <skip />
+ <string name="accessibility_audio_adjustment_title" msgid="1332113739136802997">"Ձայնի կարգավորում"</string>
<string name="accessibility_summary_shortcut_enabled" msgid="4030427268146752644">"Դյուրանցումը միացված է"</string>
<string name="accessibility_summary_shortcut_disabled" msgid="564005462092499068">"Անջատված է"</string>
<string name="accessibility_summary_state_enabled" msgid="1065431632216039369">"Միացված է"</string>
@@ -2437,6 +2436,7 @@
<string name="bluetooth_on_time" msgid="8424625554628450028">"Wi‑Fi-ը ժամանակին"</string>
<string name="advanced_battery_title" msgid="3005993394776555079">"Մարտկոցի օգտագործում"</string>
<string name="history_details_title" msgid="8628584613889559355">"Պատմության մանրամասները"</string>
+ <string name="advanced_battery_preference_title" msgid="6518802648205311326">"Դիտել մարտկոցի օգտագործումը"</string>
<string name="battery_details_title" msgid="4531369291819754178">"Մարտկոցի օգտագործում"</string>
<string name="details_subtitle" msgid="2550872569652785527">"Օգտագործման մանրամասները"</string>
<string name="controls_subtitle" msgid="3759606830916441564">"Կարգավորել հոսանքի օգտագործումը"</string>
@@ -4098,6 +4098,7 @@
<string name="usb_use" msgid="6783183432648438528">"USB-ի աշխատանքի ռեժիմը"</string>
<string name="usb_default_label" msgid="3372838450371060750">"USB-ի կանխադրված կարգավորումներ"</string>
<string name="usb_default_info" msgid="167172599497085266">"Այս կարգավորումները կկիրառվեն, երբ դուք միանաք այլ սարքի և ապակողպեք ձեր հեռախոսը: Միացեք միայն վստահելի սարքերի:"</string>
+ <string name="usb_power_title" msgid="5602112548385798646">"Սնուցման ընտրանքներ"</string>
<string name="usb_pref" msgid="8521832005703261700">"USB"</string>
<string name="usb_preference" msgid="5084550082591493765">"USB-ի կարգավորումներ"</string>
<string name="usb_control_title" msgid="1946791559052157693">"USB-ն վերահսկող սարքը"</string>
@@ -4937,8 +4938,8 @@
<string name="mobile_data_ap_mode_disabled" msgid="6067959496888990983">"Անհասանելի է ավիառեժիմում"</string>
<string name="force_desktop_mode" msgid="1336913605091334238">"Աշխատասեղանի ռեժիմի հարկադրված միացում"</string>
<string name="force_desktop_mode_summary" msgid="4587416867846930479">"Աշխատասեղանի փորձնական ռեժիմի հարկադրված միացում լրացուցիչ էկրանների վրա"</string>
- <string name="enable_sizecompat_freeform" msgid="3799755160777404309">"Թույլատրել կամայական ձևի պատուհանների բացումը"</string>
- <string name="enable_sizecompat_freeform_summary" msgid="1484050174538201499">"Թույլ է տալիս հավելվածներին բացել կամայական ձևի պատուհաններ"</string>
+ <string name="enable_non_resizable_multi_window" msgid="6832903754625404477">"Միացնել չփոփոխվող մասշտաբը բազմապատուհան ռեժիմում"</string>
+ <string name="enable_non_resizable_multi_window_summary" msgid="3275763753261901999">"Թույլ է տալիս հավելվածները բացել չփոփոխվող մասշտաբով բազմապատուհան ռեժիմում"</string>
<string name="hwui_force_dark_title" msgid="4256904905631994219">"Չեղարկել մուգ ռեժիմի պարտադիր միացումը"</string>
<string name="hwui_force_dark_summary" msgid="6515748781487952769">"Չեղարկում է մուգ ռեժիմի պարտադիր միացման գործառույթը"</string>
<string name="enable_blurs_on_windows_title" msgid="4218144213800778872">"Միացնել շաղումը"</string>
@@ -5060,8 +5061,8 @@
<string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"ինքնաթիռ, ինքնաթիռում անվտանգ"</string>
<string name="calls_and_sms" msgid="1931855083959003306">"Զանգեր և SMS"</string>
<string name="calls_and_sms_category" msgid="2021321997884906046">"Զանգեր Wi-Fi-ով"</string>
- <string name="calls_sms_wfc_summary" msgid="4930471357980272294">"Կատարեք և ստացեք զանգեր ոչ բջջային ցանցերի (օրինակ՝ Wi-Fi-ի) միջոցով"</string>
- <string name="calls_sms_footnote" msgid="7002461875954024216">"«Զանգեր Wi-Fi-ով» գործառույթը թույլ է տալիս ստանալ և կատարել զանգերը ոչ բջջային ցանցերի (օրինակ՝ որոշ Wi‑Fi ցանցերի) միջոցով։"</string>
+ <string name="calls_sms_wfc_summary" msgid="3940529919408667336">"Կատարեք և ստացեք զանգեր Wi-Fi-ի միջոցով"</string>
+ <string name="calls_sms_footnote" msgid="8051604228144899434">"«Զանգեր Wi-Fi-ով» գործառույթը թույլ է տալիս ստանալ և կատարել զանգերը ոչ բջջային ցանցերի (օրինակ՝ Wi‑Fi ցանցերի) միջոցով։"</string>
<string name="calls_preference_title" msgid="7536882032182563800">"Զանգեր"</string>
<string name="sms_preference_title" msgid="8392745501754864395">"SMS"</string>
<string name="calls_sms_preferred" msgid="6016477652522583496">"նախընտրելի"</string>
@@ -5080,10 +5081,10 @@
<string name="reset_internet_text" product="tablet" msgid="8797910368942544453">"Զանգը կավարտվի"</string>
<string name="resetting_internet_text" msgid="6696779371800051806">"Ինտերնետ կապը վերակայվում է…"</string>
<string name="fix_connectivity" msgid="2781433603228089501">"Շտկել կապի խնդիրը"</string>
- <!-- no translation found for airplane_mode_network_available (1059499681300395240) -->
- <skip />
- <!-- no translation found for to_switch_networks_disconnect_ethernet (6615374552827587197) -->
- <skip />
+ <string name="airplane_mode_network_available" msgid="1059499681300395240">"Ավիառեժիմում հասանելի ցանցեր"</string>
+ <string name="to_switch_networks_disconnect_ethernet" msgid="6615374552827587197">"Այլ ցանցի անցնելու համար անջատեք Ethernet-ը"</string>
+ <string name="cannot_switch_networks_while_connected" msgid="3867944849171754777">"Հնարավոր չէ անցնել այլ ցանցի, երբ կապ է հաստատված"</string>
+ <string name="airplane_mode_network_panel_title" msgid="6385046104863403604">"Ցանցեր, որոնք անվտանգ են ինքնաթիռում"</string>
<string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g>/<xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
<string name="mobile_data_connection_active" msgid="2422223108911581552">"Միացած է"</string>
<string name="mobile_data_off_summary" msgid="3841411571485837651">"Չհաջողվեց ավտոմատ միանալ համացանցին"</string>
@@ -5105,4 +5106,16 @@
<string name="category_name_others" msgid="2366006298768550310">"Այլ"</string>
<string name="category_name_general" msgid="7737273712848115886">"Ընդհանուր"</string>
<string name="default_see_all_apps_title" msgid="7481113230662612178">"Դիտել բոլոր հավելվածները"</string>
+ <string name="smart_forwarding_title" msgid="8368634861971949799">"Խելացի վերահասցեավորում"</string>
+ <string name="smart_forwarding_summary_enabled" msgid="3341062878373185604">"Խելացի վերահասցեավորումը միացված է"</string>
+ <string name="smart_forwarding_summary_disabled" msgid="5033880700091914809">"Խելացի վերահասցեավորումն անջատված է"</string>
+ <string name="smart_forwarding_ongoing_title" msgid="962226849074401228">"Զանգերի կարգավորումներ"</string>
+ <string name="smart_forwarding_ongoing_text" msgid="2189209372407117114">"Կարգավորումները թարմացվում են…"</string>
+ <string name="smart_forwarding_failed_title" msgid="1859891191023516080">"Զանգի կարգավորումների սխալ"</string>
+ <string name="smart_forwarding_failed_text" msgid="5370431503707373653">"Ցանցի կամ SIM քարտի սխալ"</string>
+ <string name="smart_forwarding_failed_not_activated_text" msgid="997396203001257904">"SIM քարտն ակտիվացված չէ։"</string>
+ <string name="smart_forwarding_input_mdn_title" msgid="5105463748849841763">"Մուտքագրեք հեռախոսահամարներ"</string>
+ <string name="smart_forwarding_input_mdn_dialog_title" msgid="7542216086697868415">"Մուտքագրեք հեռախոսահամար"</string>
+ <string name="smart_forwarding_missing_mdn_text" msgid="2907314684242542226">"Հեռախոսահամարը նշված չէ։"</string>
+ <string name="smart_forwarding_missing_alert_dialog_text" msgid="7870419247987316112">"Եղավ"</string>
</resources>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index 87afa7a..5e88f02 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -2267,8 +2267,7 @@
<item quantity="other"><xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> alat bantu dengar yang tersimpan</item>
<item quantity="one"><xliff:g id="NUMBER_DEVICE_COUNT_0">%1$d</xliff:g> alat bantu dengar yang tersimpan</item>
</plurals>
- <!-- no translation found for accessibility_audio_adjustment_title (1332113739136802997) -->
- <skip />
+ <string name="accessibility_audio_adjustment_title" msgid="1332113739136802997">"Penyesuaian audio"</string>
<string name="accessibility_summary_shortcut_enabled" msgid="4030427268146752644">"Pintasan aktif"</string>
<string name="accessibility_summary_shortcut_disabled" msgid="564005462092499068">"Nonaktif"</string>
<string name="accessibility_summary_state_enabled" msgid="1065431632216039369">"Aktif"</string>
@@ -2437,6 +2436,7 @@
<string name="bluetooth_on_time" msgid="8424625554628450028">"Wi-Fi berdasarkan waktu"</string>
<string name="advanced_battery_title" msgid="3005993394776555079">"Penggunaan baterai"</string>
<string name="history_details_title" msgid="8628584613889559355">"Detail histori"</string>
+ <string name="advanced_battery_preference_title" msgid="6518802648205311326">"Tampilkan penggunaan baterai"</string>
<string name="battery_details_title" msgid="4531369291819754178">"Penggunaan baterai"</string>
<string name="details_subtitle" msgid="2550872569652785527">"Detail penggunaan"</string>
<string name="controls_subtitle" msgid="3759606830916441564">"Sesuaikan penggunaan daya"</string>
@@ -4098,6 +4098,7 @@
<string name="usb_use" msgid="6783183432648438528">"Gunakan USB untuk"</string>
<string name="usb_default_label" msgid="3372838450371060750">"Konfigurasi USB default"</string>
<string name="usb_default_info" msgid="167172599497085266">"Ketika perangkat lain terhubung dan ponsel Anda terbuka kuncinya, setelan ini akan berlaku. Hanya hubungkan ke perangkat yang dipercaya."</string>
+ <string name="usb_power_title" msgid="5602112548385798646">"Opsi daya"</string>
<string name="usb_pref" msgid="8521832005703261700">"USB"</string>
<string name="usb_preference" msgid="5084550082591493765">"Preferensi USB"</string>
<string name="usb_control_title" msgid="1946791559052157693">"USB dikontrol oleh"</string>
@@ -4937,8 +4938,8 @@
<string name="mobile_data_ap_mode_disabled" msgid="6067959496888990983">"Tidak tersedia selama mode pesawat"</string>
<string name="force_desktop_mode" msgid="1336913605091334238">"Paksa mode desktop"</string>
<string name="force_desktop_mode_summary" msgid="4587416867846930479">"Paksa mode desktop eksperimental di tampilan sekunder"</string>
- <string name="enable_sizecompat_freeform" msgid="3799755160777404309">"Aktifkan sizecompat format bebas"</string>
- <string name="enable_sizecompat_freeform_summary" msgid="1484050174538201499">"Mengizinkan aplikasi sizecompat dalam format bebas"</string>
+ <string name="enable_non_resizable_multi_window" msgid="6832903754625404477">"Aktifkan ukuran tidak dapat diubah di multi-aplikasi"</string>
+ <string name="enable_non_resizable_multi_window_summary" msgid="3275763753261901999">"Mengizinkan aplikasi yang ukurannya tidak dapat diubah di multi-aplikasi"</string>
<string name="hwui_force_dark_title" msgid="4256904905631994219">"Aktifkan paksa SmartDark"</string>
<string name="hwui_force_dark_summary" msgid="6515748781487952769">"Memaksa fitur SmartDark agar selalu aktif"</string>
<string name="enable_blurs_on_windows_title" msgid="4218144213800778872">"Aktifkan blur"</string>
@@ -5060,8 +5061,8 @@
<string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"pesawat, aman di pesawat"</string>
<string name="calls_and_sms" msgid="1931855083959003306">"Panggilan Telepon dan SMS"</string>
<string name="calls_and_sms_category" msgid="2021321997884906046">"Panggilan Wi-Fi"</string>
- <string name="calls_sms_wfc_summary" msgid="4930471357980272294">"Melakukan dan menerima panggilan melalui jaringan non-operator seperti Wi-Fi"</string>
- <string name="calls_sms_footnote" msgid="7002461875954024216">"Dengan Panggilan Wi-Fi, Anda dapat melakukan dan menerima panggilan melalui jaringan non-operator seperti jaringan Wi-Fi tertentu."</string>
+ <string name="calls_sms_wfc_summary" msgid="3940529919408667336">"Melakukan dan menerima panggilan melalui Wi‑Fi"</string>
+ <string name="calls_sms_footnote" msgid="8051604228144899434">"Dengan panggilan Wi-Fi, panggilan dilakukan dan diterima melalui jaringan Wi-Fi non-operator."</string>
<string name="calls_preference_title" msgid="7536882032182563800">"Panggilan Telepon"</string>
<string name="sms_preference_title" msgid="8392745501754864395">"SMS"</string>
<string name="calls_sms_preferred" msgid="6016477652522583496">"pilihan"</string>
@@ -5080,10 +5081,10 @@
<string name="reset_internet_text" product="tablet" msgid="8797910368942544453">"Tindakan ini akan mengakhiri panggilan telepon"</string>
<string name="resetting_internet_text" msgid="6696779371800051806">"Mereset internet …"</string>
<string name="fix_connectivity" msgid="2781433603228089501">"Perbaiki konektivitas"</string>
- <!-- no translation found for airplane_mode_network_available (1059499681300395240) -->
- <skip />
- <!-- no translation found for to_switch_networks_disconnect_ethernet (6615374552827587197) -->
- <skip />
+ <string name="airplane_mode_network_available" msgid="1059499681300395240">"Jaringan dalam mode pesawat tersedia"</string>
+ <string name="to_switch_networks_disconnect_ethernet" msgid="6615374552827587197">"Untuk beralih jaringan, lepaskan kabel ethernet"</string>
+ <string name="cannot_switch_networks_while_connected" msgid="3867944849171754777">"Tidak dapat beralih jaringan saat terhubung"</string>
+ <string name="airplane_mode_network_panel_title" msgid="6385046104863403604">"Jaringan dalam mode pesawat"</string>
<string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g>/<xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
<string name="mobile_data_connection_active" msgid="2422223108911581552">"Terhubung"</string>
<string name="mobile_data_off_summary" msgid="3841411571485837651">"Internet tidak akan terhubung secara otomatis"</string>
@@ -5105,4 +5106,16 @@
<string name="category_name_others" msgid="2366006298768550310">"Lainnya"</string>
<string name="category_name_general" msgid="7737273712848115886">"Umum"</string>
<string name="default_see_all_apps_title" msgid="7481113230662612178">"Lihat semua aplikasi"</string>
+ <string name="smart_forwarding_title" msgid="8368634861971949799">"Smart Forwarding"</string>
+ <string name="smart_forwarding_summary_enabled" msgid="3341062878373185604">"Smart Forwarding Diaktifkan"</string>
+ <string name="smart_forwarding_summary_disabled" msgid="5033880700091914809">"Smart Forwarding Dinonaktifkan"</string>
+ <string name="smart_forwarding_ongoing_title" msgid="962226849074401228">"Setelan Panggilan"</string>
+ <string name="smart_forwarding_ongoing_text" msgid="2189209372407117114">"Memperbarui Setelan ..."</string>
+ <string name="smart_forwarding_failed_title" msgid="1859891191023516080">"Error Setelan panggilan"</string>
+ <string name="smart_forwarding_failed_text" msgid="5370431503707373653">"Error jaringan atau kartu SIM."</string>
+ <string name="smart_forwarding_failed_not_activated_text" msgid="997396203001257904">"Sim tidak diaktifkan."</string>
+ <string name="smart_forwarding_input_mdn_title" msgid="5105463748849841763">"Masukkan Nomor telepon"</string>
+ <string name="smart_forwarding_input_mdn_dialog_title" msgid="7542216086697868415">"Masukkan Nomor telepon"</string>
+ <string name="smart_forwarding_missing_mdn_text" msgid="2907314684242542226">"Tidak ada nomor telepon."</string>
+ <string name="smart_forwarding_missing_alert_dialog_text" msgid="7870419247987316112">"Oke"</string>
</resources>
diff --git a/res/values-is/strings.xml b/res/values-is/strings.xml
index e5a8f3f..ab01d3f 100644
--- a/res/values-is/strings.xml
+++ b/res/values-is/strings.xml
@@ -427,7 +427,7 @@
<string name="cancel_lock_screen_dialog_button_label" msgid="1801132985957491690">"Hætta við"</string>
<string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="886085239313346000">"Snertu lesarann"</string>
<string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="6160543980992596286">"Hann er aftan á símanum. Notaðu vísifingurinn."</string>
- <string name="security_settings_udfps_enroll_find_sensor_message" msgid="1181700918690345832">"Það er á skjánum. Leitaðu að fingrafarinu með ljómandi hring."</string>
+ <string name="security_settings_udfps_enroll_find_sensor_message" msgid="1181700918690345832">"Skynjarinn er á skjánum. Leitaðu að fingrafarinu með ljómandi hring."</string>
<string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="3065850549419750523">"Teikning af tæki og staðsetningu fingrafaraskynjara"</string>
<string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7298812463228440333">"Heiti"</string>
<string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4074335979239208021">"Í lagi"</string>
@@ -2267,8 +2267,7 @@
<item quantity="one"><xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> vistað heyrnartæki</item>
<item quantity="other"><xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> vistuð heyrnartæki</item>
</plurals>
- <!-- no translation found for accessibility_audio_adjustment_title (1332113739136802997) -->
- <skip />
+ <string name="accessibility_audio_adjustment_title" msgid="1332113739136802997">"Hljóðstilling"</string>
<string name="accessibility_summary_shortcut_enabled" msgid="4030427268146752644">"Kveikt á flýtileið"</string>
<string name="accessibility_summary_shortcut_disabled" msgid="564005462092499068">"Slökkt"</string>
<string name="accessibility_summary_state_enabled" msgid="1065431632216039369">"Kveikt"</string>
@@ -2437,6 +2436,7 @@
<string name="bluetooth_on_time" msgid="8424625554628450028">"Wi-Fi tími"</string>
<string name="advanced_battery_title" msgid="3005993394776555079">"Rafhlöðunotkun"</string>
<string name="history_details_title" msgid="8628584613889559355">"Upplýsingar um notkun"</string>
+ <string name="advanced_battery_preference_title" msgid="6518802648205311326">"Skoða rafhlöðunotkun"</string>
<string name="battery_details_title" msgid="4531369291819754178">"Rafhlöðunotkun"</string>
<string name="details_subtitle" msgid="2550872569652785527">"Notkunarupplýsingar"</string>
<string name="controls_subtitle" msgid="3759606830916441564">"Stilla orkunotkun"</string>
@@ -4098,6 +4098,7 @@
<string name="usb_use" msgid="6783183432648438528">"Nota USB fyrir"</string>
<string name="usb_default_label" msgid="3372838450371060750">"Sjálfgefin USB-stilling"</string>
<string name="usb_default_info" msgid="167172599497085266">"Þegar annað tæki er tengt og síminn er ekki læstur verða þessar stillingar notaðar. Aðeins tengjast við traust tæki."</string>
+ <string name="usb_power_title" msgid="5602112548385798646">"Orkuvalkostir"</string>
<string name="usb_pref" msgid="8521832005703261700">"USB"</string>
<string name="usb_preference" msgid="5084550082591493765">"USB-kjörstillingar"</string>
<string name="usb_control_title" msgid="1946791559052157693">"USB stjórnað af"</string>
@@ -4937,8 +4938,8 @@
<string name="mobile_data_ap_mode_disabled" msgid="6067959496888990983">"Ekki tiltækt í flugstillingu"</string>
<string name="force_desktop_mode" msgid="1336913605091334238">"Þvinga skjáborðsstillingu"</string>
<string name="force_desktop_mode_summary" msgid="4587416867846930479">"Þvinga tilraunaskjáborðsstillingu á öðrum skjá"</string>
- <string name="enable_sizecompat_freeform" msgid="3799755160777404309">"Leyfa frjálst snið fyrir samhæfa stærð"</string>
- <string name="enable_sizecompat_freeform_summary" msgid="1484050174538201499">"Leyfir forritum í samhæfri stærð að vera með frjálsu sniði"</string>
+ <string name="enable_non_resizable_multi_window" msgid="6832903754625404477">"Kveikja á „Ekki hægt að breyta stærð“ í mörgum gluggum"</string>
+ <string name="enable_non_resizable_multi_window_summary" msgid="3275763753261901999">"Leyfir forritum sem ekki er hægt að breyta stærðinni á að opnast í mörgum gluggum"</string>
<string name="hwui_force_dark_title" msgid="4256904905631994219">"Hnekkja dökku"</string>
<string name="hwui_force_dark_summary" msgid="6515748781487952769">"Kemur í veg fyrir að alltaf sé kveikt á dökkum eiginleika"</string>
<string name="enable_blurs_on_windows_title" msgid="4218144213800778872">"Kveikja á óskýrleika"</string>
@@ -5060,8 +5061,8 @@
<string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"flugnetkerfi, öruggt flugnet"</string>
<string name="calls_and_sms" msgid="1931855083959003306">"Símtöl og SMS"</string>
<string name="calls_and_sms_category" msgid="2021321997884906046">"Wi-Fi símtöl"</string>
- <string name="calls_sms_wfc_summary" msgid="4930471357980272294">"Hringja og svara símtölum utan farsímakerfis, t.d. á Wi-Fi neti"</string>
- <string name="calls_sms_footnote" msgid="7002461875954024216">"Með Wi-Fi símtölum geturðu hringt og svarað símtölum utan farsímakerfis, t.d. á sumum Wi-Fi netum."</string>
+ <string name="calls_sms_wfc_summary" msgid="3940529919408667336">"Hringdu símtöl og svaraðu þeim með Wi‑Fi"</string>
+ <string name="calls_sms_footnote" msgid="8051604228144899434">"Með Wi-Fi símtölum eru símtöl hringd og þeim svarað á Wi-Fi netum utan farsímakerfis."</string>
<string name="calls_preference_title" msgid="7536882032182563800">"Símtöl"</string>
<string name="sms_preference_title" msgid="8392745501754864395">"SMS"</string>
<string name="calls_sms_preferred" msgid="6016477652522583496">"í forgangi"</string>
@@ -5080,10 +5081,10 @@
<string name="reset_internet_text" product="tablet" msgid="8797910368942544453">"Þetta mun ljúka símtalinu"</string>
<string name="resetting_internet_text" msgid="6696779371800051806">"Endurstillir internetið…"</string>
<string name="fix_connectivity" msgid="2781433603228089501">"Laga tengigetu"</string>
- <!-- no translation found for airplane_mode_network_available (1059499681300395240) -->
- <skip />
- <!-- no translation found for to_switch_networks_disconnect_ethernet (6615374552827587197) -->
- <skip />
+ <string name="airplane_mode_network_available" msgid="1059499681300395240">"Net fyrir flugstillingu í boði"</string>
+ <string name="to_switch_networks_disconnect_ethernet" msgid="6615374552827587197">"Aftengdu ethernet til að skipta um net"</string>
+ <string name="cannot_switch_networks_while_connected" msgid="3867944849171754777">"Ekki er hægt að skipta um net á meðan tenging er virk"</string>
+ <string name="airplane_mode_network_panel_title" msgid="6385046104863403604">"Flugnet"</string>
<string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g> / <xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
<string name="mobile_data_connection_active" msgid="2422223108911581552">"Tengt"</string>
<string name="mobile_data_off_summary" msgid="3841411571485837651">"Internetið tengist ekki sjálfkrafa"</string>
@@ -5105,4 +5106,16 @@
<string name="category_name_others" msgid="2366006298768550310">"Annað"</string>
<string name="category_name_general" msgid="7737273712848115886">"Almennt"</string>
<string name="default_see_all_apps_title" msgid="7481113230662612178">"Sjá öll forrit"</string>
+ <string name="smart_forwarding_title" msgid="8368634861971949799">"Snjöll framsending"</string>
+ <string name="smart_forwarding_summary_enabled" msgid="3341062878373185604">"Kveikt á snjallri framsendingu"</string>
+ <string name="smart_forwarding_summary_disabled" msgid="5033880700091914809">"Slökkt á snjallri framsendingu"</string>
+ <string name="smart_forwarding_ongoing_title" msgid="962226849074401228">"Símtalsstillingar"</string>
+ <string name="smart_forwarding_ongoing_text" msgid="2189209372407117114">"Uppfærir stillingar..."</string>
+ <string name="smart_forwarding_failed_title" msgid="1859891191023516080">"Villa í símtalsstillingum"</string>
+ <string name="smart_forwarding_failed_text" msgid="5370431503707373653">"Villa í netkerfi eða á SIM-korti."</string>
+ <string name="smart_forwarding_failed_not_activated_text" msgid="997396203001257904">"SIM-kort er ekki virkt."</string>
+ <string name="smart_forwarding_input_mdn_title" msgid="5105463748849841763">"Slá inn símanúmer"</string>
+ <string name="smart_forwarding_input_mdn_dialog_title" msgid="7542216086697868415">"Slá inn símanúmer"</string>
+ <string name="smart_forwarding_missing_mdn_text" msgid="2907314684242542226">"Símanúmer vantar."</string>
+ <string name="smart_forwarding_missing_alert_dialog_text" msgid="7870419247987316112">"Í lagi"</string>
</resources>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index fe28b2b..543b218 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -2267,8 +2267,7 @@
<item quantity="other"><xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> apparecchi acustici salvati</item>
<item quantity="one"><xliff:g id="NUMBER_DEVICE_COUNT_0">%1$d</xliff:g> apparecchio acustico salvato</item>
</plurals>
- <!-- no translation found for accessibility_audio_adjustment_title (1332113739136802997) -->
- <skip />
+ <string name="accessibility_audio_adjustment_title" msgid="1332113739136802997">"Regolazione dell\'audio"</string>
<string name="accessibility_summary_shortcut_enabled" msgid="4030427268146752644">"Scorciatoia attivata"</string>
<string name="accessibility_summary_shortcut_disabled" msgid="564005462092499068">"Off"</string>
<string name="accessibility_summary_state_enabled" msgid="1065431632216039369">"On"</string>
@@ -2437,6 +2436,7 @@
<string name="bluetooth_on_time" msgid="8424625554628450028">"Tempo accensione Wi‑Fi"</string>
<string name="advanced_battery_title" msgid="3005993394776555079">"Utilizzo batteria"</string>
<string name="history_details_title" msgid="8628584613889559355">"Dettagli cronologia"</string>
+ <string name="advanced_battery_preference_title" msgid="6518802648205311326">"Visualizza utilizzo della batteria"</string>
<string name="battery_details_title" msgid="4531369291819754178">"Utilizzo batteria"</string>
<string name="details_subtitle" msgid="2550872569652785527">"Dettagli di utilizzo"</string>
<string name="controls_subtitle" msgid="3759606830916441564">"Regola consumo alimentazione"</string>
@@ -4098,6 +4098,7 @@
<string name="usb_use" msgid="6783183432648438528">"Utilizza connessione USB per"</string>
<string name="usb_default_label" msgid="3372838450371060750">"Configurazione USB predefinita"</string>
<string name="usb_default_info" msgid="167172599497085266">"Quando è connesso un altro dispositivo e il telefono è sbloccato, verranno applicate queste impostazioni. Collegati solo a dispositivi attendibili."</string>
+ <string name="usb_power_title" msgid="5602112548385798646">"Opzioni di accensione"</string>
<string name="usb_pref" msgid="8521832005703261700">"USB"</string>
<string name="usb_preference" msgid="5084550082591493765">"Preferenze USB"</string>
<string name="usb_control_title" msgid="1946791559052157693">"USB controllata da"</string>
@@ -4937,8 +4938,8 @@
<string name="mobile_data_ap_mode_disabled" msgid="6067959496888990983">"Non disponibili in modalità aereo"</string>
<string name="force_desktop_mode" msgid="1336913605091334238">"Forza la modalità desktop"</string>
<string name="force_desktop_mode_summary" msgid="4587416867846930479">"Forza la modalità desktop sperimentale su display secondari"</string>
- <string name="enable_sizecompat_freeform" msgid="3799755160777404309">"Attiva non ridimensionabili a forma libera"</string>
- <string name="enable_sizecompat_freeform_summary" msgid="1484050174538201499">"Consente le app non ridimensionabili a forma libera"</string>
+ <string name="enable_non_resizable_multi_window" msgid="6832903754625404477">"Attiva app non ridimensionabili in multi-finestra"</string>
+ <string name="enable_non_resizable_multi_window_summary" msgid="3275763753261901999">"Consente la presenza di app non ridimensionabili nella multi-finestra"</string>
<string name="hwui_force_dark_title" msgid="4256904905631994219">"Esegui override modalità Buio forzata"</string>
<string name="hwui_force_dark_summary" msgid="6515748781487952769">"Esegue l\'override della funzionalità di modalità Buio forzata in modo che sia sempre attiva"</string>
<string name="enable_blurs_on_windows_title" msgid="4218144213800778872">"Attiva sfocature"</string>
@@ -5060,8 +5061,8 @@
<string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"aereo, utilizzabile in aereo"</string>
<string name="calls_and_sms" msgid="1931855083959003306">"Chiamate e SMS"</string>
<string name="calls_and_sms_category" msgid="2021321997884906046">"Chiamate Wi‑Fi"</string>
- <string name="calls_sms_wfc_summary" msgid="4930471357980272294">"Effettua e ricevi chiamate tramite reti non dell\'operatore, come le reti Wi‑Fi"</string>
- <string name="calls_sms_footnote" msgid="7002461875954024216">"La funzionalità Chiamate Wi-Fi consente di effettuare e ricevere chiamate tramite reti non dell\'operatore, come alcune reti Wi-Fi."</string>
+ <string name="calls_sms_wfc_summary" msgid="3940529919408667336">"Effettua e ricevi chiamate tramite Wi‑Fi"</string>
+ <string name="calls_sms_footnote" msgid="8051604228144899434">"La funzionalità Chiamate Wi-Fi consente di effettuare e ricevere chiamate tramite reti WI-Fi non dell\'operatore."</string>
<string name="calls_preference_title" msgid="7536882032182563800">"Chiamate"</string>
<string name="sms_preference_title" msgid="8392745501754864395">"SMS"</string>
<string name="calls_sms_preferred" msgid="6016477652522583496">"Preferiti"</string>
@@ -5080,10 +5081,10 @@
<string name="reset_internet_text" product="tablet" msgid="8797910368942544453">"La telefonata verrà terminata"</string>
<string name="resetting_internet_text" msgid="6696779371800051806">"Reimpostazione della connessione a Internet in corso…"</string>
<string name="fix_connectivity" msgid="2781433603228089501">"Risolvi problema di connettività"</string>
- <!-- no translation found for airplane_mode_network_available (1059499681300395240) -->
- <skip />
- <!-- no translation found for to_switch_networks_disconnect_ethernet (6615374552827587197) -->
- <skip />
+ <string name="airplane_mode_network_available" msgid="1059499681300395240">"Reti con modalità aereo disponibili"</string>
+ <string name="to_switch_networks_disconnect_ethernet" msgid="6615374552827587197">"Per cambiare rete, scollega il cavo Ethernet"</string>
+ <string name="cannot_switch_networks_while_connected" msgid="3867944849171754777">"Impossibile cambiare rete con la connessione attiva"</string>
+ <string name="airplane_mode_network_panel_title" msgid="6385046104863403604">"Reti con modalità aereo"</string>
<string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g>/<xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
<string name="mobile_data_connection_active" msgid="2422223108911581552">"Connessione attiva"</string>
<string name="mobile_data_off_summary" msgid="3841411571485837651">"La connessione a Internet non sarà automatica"</string>
@@ -5105,4 +5106,16 @@
<string name="category_name_others" msgid="2366006298768550310">"Altre"</string>
<string name="category_name_general" msgid="7737273712848115886">"Generali"</string>
<string name="default_see_all_apps_title" msgid="7481113230662612178">"Mostra tutte le app"</string>
+ <string name="smart_forwarding_title" msgid="8368634861971949799">"Deviazione intelligente"</string>
+ <string name="smart_forwarding_summary_enabled" msgid="3341062878373185604">"Funzionalità Deviazione intelligente attiva"</string>
+ <string name="smart_forwarding_summary_disabled" msgid="5033880700091914809">"Funzionalità Deviazione intelligente non attiva"</string>
+ <string name="smart_forwarding_ongoing_title" msgid="962226849074401228">"Impostazioni chiamate"</string>
+ <string name="smart_forwarding_ongoing_text" msgid="2189209372407117114">"Aggiornamento delle impostazioni in corso…"</string>
+ <string name="smart_forwarding_failed_title" msgid="1859891191023516080">"Errore Impostazioni chiamate"</string>
+ <string name="smart_forwarding_failed_text" msgid="5370431503707373653">"Errore di rete o della scheda SIM."</string>
+ <string name="smart_forwarding_failed_not_activated_text" msgid="997396203001257904">"SIM non attiva."</string>
+ <string name="smart_forwarding_input_mdn_title" msgid="5105463748849841763">"Inserisci numeri di telefono"</string>
+ <string name="smart_forwarding_input_mdn_dialog_title" msgid="7542216086697868415">"Inserisci numero di telefono"</string>
+ <string name="smart_forwarding_missing_mdn_text" msgid="2907314684242542226">"Manca il numero di telefono."</string>
+ <string name="smart_forwarding_missing_alert_dialog_text" msgid="7870419247987316112">"OK"</string>
</resources>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index 7fa4ff4..13d9e2f 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -2317,8 +2317,7 @@
<item quantity="other"><xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> מכשירי שמיעה נשמרו</item>
<item quantity="one">מכשיר שמיעה אחד (<xliff:g id="NUMBER_DEVICE_COUNT_0">%1$d</xliff:g>) נשמר</item>
</plurals>
- <!-- no translation found for accessibility_audio_adjustment_title (1332113739136802997) -->
- <skip />
+ <string name="accessibility_audio_adjustment_title" msgid="1332113739136802997">"כוונון אודיו"</string>
<string name="accessibility_summary_shortcut_enabled" msgid="4030427268146752644">"מקש הקיצור פועל"</string>
<string name="accessibility_summary_shortcut_disabled" msgid="564005462092499068">"כבוי"</string>
<string name="accessibility_summary_state_enabled" msgid="1065431632216039369">"פועל"</string>
@@ -2499,6 +2498,7 @@
<string name="bluetooth_on_time" msgid="8424625554628450028">"Wi-Fi בזמן"</string>
<string name="advanced_battery_title" msgid="3005993394776555079">"שימוש בסוללה"</string>
<string name="history_details_title" msgid="8628584613889559355">"פרטי היסטוריה"</string>
+ <string name="advanced_battery_preference_title" msgid="6518802648205311326">"הצגת השימוש בסוללה"</string>
<string name="battery_details_title" msgid="4531369291819754178">"שימוש בסוללה"</string>
<string name="details_subtitle" msgid="2550872569652785527">"פרטי שימוש"</string>
<string name="controls_subtitle" msgid="3759606830916441564">"התאמת צריכת סוללה"</string>
@@ -4222,6 +4222,7 @@
<string name="usb_use" msgid="6783183432648438528">"השתמש ב-USB בשביל"</string>
<string name="usb_default_label" msgid="3372838450371060750">"ברירת המחדל של תצורת USB"</string>
<string name="usb_default_info" msgid="167172599497085266">"כשמכשיר אחר מחובר והטלפון לא נעול, הגדרות אלה יחולו. יש לחבר רק למכשירים מהימנים."</string>
+ <string name="usb_power_title" msgid="5602112548385798646">"אפשרויות הפעלה"</string>
<string name="usb_pref" msgid="8521832005703261700">"USB"</string>
<string name="usb_preference" msgid="5084550082591493765">"העדפות USB"</string>
<string name="usb_control_title" msgid="1946791559052157693">"USB נשלט על ידי"</string>
@@ -5099,8 +5100,8 @@
<string name="mobile_data_ap_mode_disabled" msgid="6067959496888990983">"לא זמין במצב טיסה"</string>
<string name="force_desktop_mode" msgid="1336913605091334238">"אילוץ מצב שולחן עבודה"</string>
<string name="force_desktop_mode_summary" msgid="4587416867846930479">"אילוץ מצב שולחן עבודה ניסיוני במסכים משניים"</string>
- <string name="enable_sizecompat_freeform" msgid="3799755160777404309">"הפעלת התאמת גודל בפורמט חופשי"</string>
- <string name="enable_sizecompat_freeform_summary" msgid="1484050174538201499">"אפליקציות עם התאמת גודל יהיו בפורמט חופשי"</string>
+ <string name="enable_non_resizable_multi_window" msgid="6832903754625404477">"הפעלת אפליקציות שלא ניתן לקבוע את גודלן בריבוי חלונות"</string>
+ <string name="enable_non_resizable_multi_window_summary" msgid="3275763753261901999">"ההגדרה מאפשרת להפעיל בריבוי חלונות אפליקציות שלא ניתן לקבוע את גודלן"</string>
<string name="hwui_force_dark_title" msgid="4256904905631994219">"שינוי התכונה SmartDark"</string>
<string name="hwui_force_dark_summary" msgid="6515748781487952769">"התכונה SmartDark תפעל כל הזמן"</string>
<string name="enable_blurs_on_windows_title" msgid="4218144213800778872">"הפעלת טשטוש"</string>
@@ -5226,8 +5227,8 @@
<string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"טיסה, בטוח לטיסה"</string>
<string name="calls_and_sms" msgid="1931855083959003306">"שיחות והודעות SMS"</string>
<string name="calls_and_sms_category" msgid="2021321997884906046">"שיחות Wi-Fi"</string>
- <string name="calls_sms_wfc_summary" msgid="4930471357980272294">"התקשרות וקבלת שיחות באמצעות רשתות שאינן רשתות הספקים, כמו Wi‑Fi"</string>
- <string name="calls_sms_footnote" msgid="7002461875954024216">"התכונה שיחות Wi-Fi מאפשרת להתקשר ולקבל שיחות באמצעות רשתות שאינן רשתות הספקים, כמו רשתות Wi‑Fi מסוימות."</string>
+ <string name="calls_sms_wfc_summary" msgid="3940529919408667336">"התקשרות וקבלת שיחות באמצעות Wi‑Fi"</string>
+ <string name="calls_sms_footnote" msgid="8051604228144899434">"התכונה \'שיחות Wi-Fi\' מאפשרת להתקשר ולקבל שיחות באמצעות רשתות Wi-Fi שאינן רשתות הספקים."</string>
<string name="calls_preference_title" msgid="7536882032182563800">"שיחות"</string>
<string name="sms_preference_title" msgid="8392745501754864395">"SMS"</string>
<string name="calls_sms_preferred" msgid="6016477652522583496">"מועדפות"</string>
@@ -5246,9 +5247,10 @@
<string name="reset_internet_text" product="tablet" msgid="8797910368942544453">"הפעולה תגרום לסיום שיחת הטלפון"</string>
<string name="resetting_internet_text" msgid="6696779371800051806">"מתבצע איפוס של החיבור לאינטרנט…"</string>
<string name="fix_connectivity" msgid="2781433603228089501">"תיקון קישוריות"</string>
- <!-- no translation found for airplane_mode_network_available (1059499681300395240) -->
- <skip />
- <!-- no translation found for to_switch_networks_disconnect_ethernet (6615374552827587197) -->
+ <string name="airplane_mode_network_available" msgid="1059499681300395240">"רשתות מצב טיסה זמינות"</string>
+ <string name="to_switch_networks_disconnect_ethernet" msgid="6615374552827587197">"כדי לעבור בין רשתות, יש לנתק את האתרנט"</string>
+ <string name="cannot_switch_networks_while_connected" msgid="3867944849171754777">"לא ניתן להחליף רשתות כשיש חיבור לרשת אתרנט"</string>
+ <!-- no translation found for airplane_mode_network_panel_title (6385046104863403604) -->
<skip />
<string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g> / <xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
<string name="mobile_data_connection_active" msgid="2422223108911581552">"מחובר"</string>
@@ -5271,4 +5273,16 @@
<string name="category_name_others" msgid="2366006298768550310">"אחרות"</string>
<string name="category_name_general" msgid="7737273712848115886">"כללי"</string>
<string name="default_see_all_apps_title" msgid="7481113230662612178">"הצגת כל האפליקציות"</string>
+ <string name="smart_forwarding_title" msgid="8368634861971949799">"העברת שיחות חכמה"</string>
+ <string name="smart_forwarding_summary_enabled" msgid="3341062878373185604">"העברת השיחות החכמה פועלת"</string>
+ <string name="smart_forwarding_summary_disabled" msgid="5033880700091914809">"העברת השיחות החכמה מושבתת"</string>
+ <string name="smart_forwarding_ongoing_title" msgid="962226849074401228">"הגדרות שיחה"</string>
+ <string name="smart_forwarding_ongoing_text" msgid="2189209372407117114">"ההגדרות מתעדכנות…"</string>
+ <string name="smart_forwarding_failed_title" msgid="1859891191023516080">"שגיאה בהגדרות שיחה"</string>
+ <string name="smart_forwarding_failed_text" msgid="5370431503707373653">"שגיאת רשת או שגיאה של כרטיס SIM."</string>
+ <string name="smart_forwarding_failed_not_activated_text" msgid="997396203001257904">"כרטיס ה-SIM לא הופעל."</string>
+ <string name="smart_forwarding_input_mdn_title" msgid="5105463748849841763">"הזנת מספרי הטלפון"</string>
+ <string name="smart_forwarding_input_mdn_dialog_title" msgid="7542216086697868415">"הזנת מספר הטלפון"</string>
+ <string name="smart_forwarding_missing_mdn_text" msgid="2907314684242542226">"חסר מספר טלפון."</string>
+ <string name="smart_forwarding_missing_alert_dialog_text" msgid="7870419247987316112">"אישור"</string>
</resources>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index ef061a3..d548b99 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -2322,7 +2322,7 @@
<string name="captioning_window_color" msgid="1406167274530183119">"字幕ウィンドウの色"</string>
<string name="captioning_window_opacity" msgid="4031752812991199525">"字幕ウィンドウの透明度"</string>
<string name="captioning_foreground_color" msgid="9057327228286129232">"テキストの色"</string>
- <string name="captioning_foreground_opacity" msgid="1395843080697567189">"テキストの透明度"</string>
+ <string name="captioning_foreground_opacity" msgid="1395843080697567189">"テキストの不透明度"</string>
<string name="captioning_edge_color" msgid="6035818279902597518">"エッジの色"</string>
<string name="captioning_edge_type" msgid="5281259280060811506">"エッジの種類"</string>
<string name="captioning_typeface" msgid="285325623518361407">"フォントファミリー"</string>
@@ -2436,6 +2436,7 @@
<string name="bluetooth_on_time" msgid="8424625554628450028">"Wi-FiをONにしている時間"</string>
<string name="advanced_battery_title" msgid="3005993394776555079">"電池使用量"</string>
<string name="history_details_title" msgid="8628584613889559355">"履歴の詳細"</string>
+ <string name="advanced_battery_preference_title" msgid="6518802648205311326">"電池使用量の確認"</string>
<string name="battery_details_title" msgid="4531369291819754178">"電池の使用状況"</string>
<string name="details_subtitle" msgid="2550872569652785527">"使用状況の詳細"</string>
<string name="controls_subtitle" msgid="3759606830916441564">"消費電力の調整"</string>
@@ -4097,6 +4098,7 @@
<string name="usb_use" msgid="6783183432648438528">"USB の使用"</string>
<string name="usb_default_label" msgid="3372838450371060750">"デフォルトの USB 設定"</string>
<string name="usb_default_info" msgid="167172599497085266">"別のデバイスが接続されてスマートフォンのロックが解除されると、この設定が適用されます。信頼できるデバイスにのみ接続してください。"</string>
+ <string name="usb_power_title" msgid="5602112548385798646">"電源オプション"</string>
<string name="usb_pref" msgid="8521832005703261700">"USB"</string>
<string name="usb_preference" msgid="5084550082591493765">"USB の設定"</string>
<string name="usb_control_title" msgid="1946791559052157693">"USB の管理"</string>
@@ -4936,8 +4938,8 @@
<string name="mobile_data_ap_mode_disabled" msgid="6067959496888990983">"機内モードの間は使用できません"</string>
<string name="force_desktop_mode" msgid="1336913605091334238">"デスクトップ モードに強制的に切り替え"</string>
<string name="force_desktop_mode_summary" msgid="4587416867846930479">"セカンダリ ディスプレイで試験運用版デスクトップ モードに強制的に切り替えます"</string>
- <string name="enable_sizecompat_freeform" msgid="3799755160777404309">"サイズが小さいアプリのフリーフォームを有効にする"</string>
- <string name="enable_sizecompat_freeform_summary" msgid="1484050174538201499">"サイズが小さいアプリの表示をフリーフォームで許可"</string>
+ <string name="enable_non_resizable_multi_window" msgid="6832903754625404477">"マルチウィンドウでのサイズ変更不可を有効にする"</string>
+ <string name="enable_non_resizable_multi_window_summary" msgid="3275763753261901999">"サイズ変更できないアプリをマルチウィンドウで使用できるようにする"</string>
<string name="hwui_force_dark_title" msgid="4256904905631994219">"フォースダークのオーバーライド"</string>
<string name="hwui_force_dark_summary" msgid="6515748781487952769">"フォースダーク機能をオーバーライドして常に ON にする"</string>
<string name="enable_blurs_on_windows_title" msgid="4218144213800778872">"ぼかしを有効にする"</string>
@@ -5059,8 +5061,8 @@
<string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"機内、機内で利用できる"</string>
<string name="calls_and_sms" msgid="1931855083959003306">"通話と SMS"</string>
<string name="calls_and_sms_category" msgid="2021321997884906046">"Wi‑Fi 通話"</string>
- <string name="calls_sms_wfc_summary" msgid="4930471357980272294">"携帯通信会社以外のネットワーク（Wi-Fi など）を利用して通話の発信と着信を行います"</string>
- <string name="calls_sms_footnote" msgid="7002461875954024216">"Wi-Fi 通話では、携帯通信会社以外のネットワーク（一部の Wi-Fi ネットワークなど）を利用して通話の発信と着信を行えます。"</string>
+ <string name="calls_sms_wfc_summary" msgid="3940529919408667336">"Wi-Fi を利用して通話の発信と着信を行います"</string>
+ <string name="calls_sms_footnote" msgid="8051604228144899434">"Wi-Fi 通話では、携帯通信会社以外のネットワークを利用して通話の発信と着信を行います。"</string>
<string name="calls_preference_title" msgid="7536882032182563800">"通話"</string>
<string name="sms_preference_title" msgid="8392745501754864395">"SMS"</string>
<string name="calls_sms_preferred" msgid="6016477652522583496">"優先"</string>
@@ -5079,10 +5081,10 @@
<string name="reset_internet_text" product="tablet" msgid="8797910368942544453">"通話を終了します"</string>
<string name="resetting_internet_text" msgid="6696779371800051806">"インターネットを再設定しています…"</string>
<string name="fix_connectivity" msgid="2781433603228089501">"接続を修正"</string>
- <!-- no translation found for airplane_mode_network_available (1059499681300395240) -->
- <skip />
- <!-- no translation found for to_switch_networks_disconnect_ethernet (6615374552827587197) -->
- <skip />
+ <string name="airplane_mode_network_available" msgid="1059499681300395240">"機内モード ネットワークを利用できます"</string>
+ <string name="to_switch_networks_disconnect_ethernet" msgid="6615374552827587197">"ネットワークを切り替えるには、イーサネット接続を解除してください"</string>
+ <string name="cannot_switch_networks_while_connected" msgid="3867944849171754777">"接続中はネットワークを切り替えられません"</string>
+ <string name="airplane_mode_network_panel_title" msgid="6385046104863403604">"機内モード ネットワーク"</string>
<string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g> / <xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
<string name="mobile_data_connection_active" msgid="2422223108911581552">"接続済み"</string>
<string name="mobile_data_off_summary" msgid="3841411571485837651">"インターネットに自動的に接続されません"</string>
@@ -5104,4 +5106,16 @@
<string name="category_name_others" msgid="2366006298768550310">"その他"</string>
<string name="category_name_general" msgid="7737273712848115886">"全般"</string>
<string name="default_see_all_apps_title" msgid="7481113230662612178">"アプリをすべて表示"</string>
+ <string name="smart_forwarding_title" msgid="8368634861971949799">"スマート転送"</string>
+ <string name="smart_forwarding_summary_enabled" msgid="3341062878373185604">"スマート転送が有効です"</string>
+ <string name="smart_forwarding_summary_disabled" msgid="5033880700091914809">"スマート転送が無効です"</string>
+ <string name="smart_forwarding_ongoing_title" msgid="962226849074401228">"通話設定"</string>
+ <string name="smart_forwarding_ongoing_text" msgid="2189209372407117114">"設定を更新中…"</string>
+ <string name="smart_forwarding_failed_title" msgid="1859891191023516080">"通話設定エラー"</string>
+ <string name="smart_forwarding_failed_text" msgid="5370431503707373653">"ネットワークまたは SIM カードのエラーです。"</string>
+ <string name="smart_forwarding_failed_not_activated_text" msgid="997396203001257904">"SIM が無効です。"</string>
+ <string name="smart_forwarding_input_mdn_title" msgid="5105463748849841763">"電話番号を入力"</string>
+ <string name="smart_forwarding_input_mdn_dialog_title" msgid="7542216086697868415">"電話番号を入力"</string>
+ <string name="smart_forwarding_missing_mdn_text" msgid="2907314684242542226">"電話番号が指定されていません。"</string>
+ <string name="smart_forwarding_missing_alert_dialog_text" msgid="7870419247987316112">"OK"</string>
</resources>
diff --git a/res/values-ka/strings.xml b/res/values-ka/strings.xml
index 1ef8390..1def5a3 100644
--- a/res/values-ka/strings.xml
+++ b/res/values-ka/strings.xml
@@ -2267,8 +2267,7 @@
<item quantity="other"><xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> შენახული სმენის აპარატი</item>
<item quantity="one"><xliff:g id="NUMBER_DEVICE_COUNT_0">%1$d</xliff:g> შენახული სმენის აპარატი</item>
</plurals>
- <!-- no translation found for accessibility_audio_adjustment_title (1332113739136802997) -->
- <skip />
+ <string name="accessibility_audio_adjustment_title" msgid="1332113739136802997">"აუდიოს კორექტირება"</string>
<string name="accessibility_summary_shortcut_enabled" msgid="4030427268146752644">"მალსახმობი ჩართულია"</string>
<string name="accessibility_summary_shortcut_disabled" msgid="564005462092499068">"გამორთულია"</string>
<string name="accessibility_summary_state_enabled" msgid="1065431632216039369">"ჩართული"</string>
@@ -2437,6 +2436,7 @@
<string name="bluetooth_on_time" msgid="8424625554628450028">"Wi‑Fi მუშაობის დრო"</string>
<string name="advanced_battery_title" msgid="3005993394776555079">"ბატარეის მოხმარება"</string>
<string name="history_details_title" msgid="8628584613889559355">"ისტორიის დეტალები"</string>
+ <string name="advanced_battery_preference_title" msgid="6518802648205311326">"ბატარეის მოხმარების ნახვა"</string>
<string name="battery_details_title" msgid="4531369291819754178">"ბატარეის მოხმარება"</string>
<string name="details_subtitle" msgid="2550872569652785527">"გამოყენების დეტალები"</string>
<string name="controls_subtitle" msgid="3759606830916441564">"ენერგიის მოხმარების მორგება"</string>
@@ -4098,6 +4098,7 @@
<string name="usb_use" msgid="6783183432648438528">"USB-ს გამოყენება"</string>
<string name="usb_default_label" msgid="3372838450371060750">"ნაგულისხმევი USB კონფიგურაცია"</string>
<string name="usb_default_info" msgid="167172599497085266">"მოცემული პარამეტრები იმოქმედებს, როცა დაკავშირებულია სხვა მოწყობილობა, თქვენი ტელეფონი კი განბლოკილია. დაუკავშირდით მხოლოდ სანდო მოწყობილობებს."</string>
+ <string name="usb_power_title" msgid="5602112548385798646">"ელკვების ვარიანტები"</string>
<string name="usb_pref" msgid="8521832005703261700">"USB"</string>
<string name="usb_preference" msgid="5084550082591493765">"USB პარამეტრები"</string>
<string name="usb_control_title" msgid="1946791559052157693">"USB იმართება"</string>
@@ -4937,8 +4938,8 @@
<string name="mobile_data_ap_mode_disabled" msgid="6067959496888990983">"თვითმფრინავის რეჟიმში მიუწვდომელია"</string>
<string name="force_desktop_mode" msgid="1336913605091334238">"დესკტოპის რეჟიმის იძულებით გააქტიურება"</string>
<string name="force_desktop_mode_summary" msgid="4587416867846930479">"დესკტოპის ექსპერიმენტული რეჟიმის იძულებით გააქტიურება მეორეულ ეკრანებზე"</string>
- <string name="enable_sizecompat_freeform" msgid="3799755160777404309">"თავისუფალი ფორმის უცვლელი ზომის ჩართვა"</string>
- <string name="enable_sizecompat_freeform_summary" msgid="1484050174538201499">"უცვლელი ზომის აპებს თავისუფალ ფორმაში ყოფნის საშუალებას აძლევს"</string>
+ <string name="enable_non_resizable_multi_window" msgid="6832903754625404477">"ფიქსირებული ზომის აპის ჩართვა მრავალი ფანჯრის რეჟიმში"</string>
+ <string name="enable_non_resizable_multi_window_summary" msgid="3275763753261901999">"ეს პარამეტრი საშუალებას იძლევა, აპი ზომის შეუცვლელად გამოჩნდეს მრავალი ფანჯრის რეჟიმში"</string>
<string name="hwui_force_dark_title" msgid="4256904905631994219">"გამუქების იძულების უგულებელყოფა"</string>
<string name="hwui_force_dark_summary" msgid="6515748781487952769">"უგულებელყოფს გამუქების ყოველთვის იძულების ფუნქციას"</string>
<string name="enable_blurs_on_windows_title" msgid="4218144213800778872">"გაბუნდოვნების ჩართვა"</string>
@@ -5060,8 +5061,8 @@
<string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"თვითმფრინავი, თვითმფრინავისთვის უსაფრთხო"</string>
<string name="calls_and_sms" msgid="1931855083959003306">"ზარები და SMS-ები"</string>
<string name="calls_and_sms_category" msgid="2021321997884906046">"Wi-Fi დარეკვა"</string>
- <string name="calls_sms_wfc_summary" msgid="4930471357980272294">"დარეკეთ და მიიღეთ ზარები არაოპერატორის ქსელების, მაგალითად, Wi-Fi ქსელის მეშვეობით"</string>
- <string name="calls_sms_footnote" msgid="7002461875954024216">"Wi-Fi დარეკვა საშუალებას გაძლევთ, დარეკოთ და მიიღოთ ზარები არაოპერატორის ქსელების, მაგალითად, ზოგიერთი Wi-Fi ქსელის მეშვეობით."</string>
+ <string name="calls_sms_wfc_summary" msgid="3940529919408667336">"დარეკეთ ან მიიღეთ ზარები Wi‑Fi ქსელის მეშვეობით"</string>
+ <string name="calls_sms_footnote" msgid="8051604228144899434">"Wi‑Fi დარეკვა საშუალებას გაძლევთ, დარეკოთ ან მიიღოთ ზარები არაოპერატორი Wi‑Fi ქსელების მეშვეობით."</string>
<string name="calls_preference_title" msgid="7536882032182563800">"ზარები"</string>
<string name="sms_preference_title" msgid="8392745501754864395">"SMS"</string>
<string name="calls_sms_preferred" msgid="6016477652522583496">"უპირატესი"</string>
@@ -5080,10 +5081,10 @@
<string name="reset_internet_text" product="tablet" msgid="8797910368942544453">"ეს თქვენი ზარის შეწყვეტას გამოიწვევს"</string>
<string name="resetting_internet_text" msgid="6696779371800051806">"მიმდინარეობს ინტერნეტის გადაყენება…"</string>
<string name="fix_connectivity" msgid="2781433603228089501">"კავშირის გასწორება"</string>
- <!-- no translation found for airplane_mode_network_available (1059499681300395240) -->
- <skip />
- <!-- no translation found for to_switch_networks_disconnect_ethernet (6615374552827587197) -->
- <skip />
+ <string name="airplane_mode_network_available" msgid="1059499681300395240">"თვითმფრინავის რეჟიმის ქსელები ხელმისაწვდომია"</string>
+ <string name="to_switch_networks_disconnect_ethernet" msgid="6615374552827587197">"ქსელების გადასართავად, გაწყვიტეთ ethernet-თან კავშირი"</string>
+ <string name="cannot_switch_networks_while_connected" msgid="3867944849171754777">"აქტიური კავშირის დროს ქსელების გადართვა შეუძლებელია"</string>
+ <string name="airplane_mode_network_panel_title" msgid="6385046104863403604">"თვითმფრინავის რეჟიმის ქსელები"</string>
<string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g> / <xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
<string name="mobile_data_connection_active" msgid="2422223108911581552">"დაკავშირებული"</string>
<string name="mobile_data_off_summary" msgid="3841411571485837651">"ინტერნეტს ავტომატურად არ დაუკავშირდება"</string>
@@ -5105,4 +5106,16 @@
<string name="category_name_others" msgid="2366006298768550310">"სხვა"</string>
<string name="category_name_general" msgid="7737273712848115886">"ზოგადი"</string>
<string name="default_see_all_apps_title" msgid="7481113230662612178">"ყველა აპის ნახვა"</string>
+ <string name="smart_forwarding_title" msgid="8368634861971949799">"გონიერი გადამისამართება"</string>
+ <string name="smart_forwarding_summary_enabled" msgid="3341062878373185604">"გონიერი გადამისამართება ჩართულია"</string>
+ <string name="smart_forwarding_summary_disabled" msgid="5033880700091914809">"გონიერი გადამისამართება გათიშულია"</string>
+ <string name="smart_forwarding_ongoing_title" msgid="962226849074401228">"ზარის პარამეტრები"</string>
+ <string name="smart_forwarding_ongoing_text" msgid="2189209372407117114">"მიმდინარეობს პარამეტრების განახლება…"</string>
+ <string name="smart_forwarding_failed_title" msgid="1859891191023516080">"ზარის პარამეტრების შეცდომა"</string>
+ <string name="smart_forwarding_failed_text" msgid="5370431503707373653">"მოხდა ქსელის ან SIM ბარათის შეცდომა."</string>
+ <string name="smart_forwarding_failed_not_activated_text" msgid="997396203001257904">"SIM ბარათი გააქტიურებული არ არის."</string>
+ <string name="smart_forwarding_input_mdn_title" msgid="5105463748849841763">"შეიყვანეთ ტელეფონის ნომრები"</string>
+ <string name="smart_forwarding_input_mdn_dialog_title" msgid="7542216086697868415">"შეიყვანეთ ტელეფონის ნომერი"</string>
+ <string name="smart_forwarding_missing_mdn_text" msgid="2907314684242542226">"ტელეფონის ნომერი აკლია."</string>
+ <string name="smart_forwarding_missing_alert_dialog_text" msgid="7870419247987316112">"კარგი"</string>
</resources>
diff --git a/res/values-kk/strings.xml b/res/values-kk/strings.xml
index 73aa351..92d0ae5 100644
--- a/res/values-kk/strings.xml
+++ b/res/values-kk/strings.xml
@@ -1654,7 +1654,7 @@
<string name="tether_settings_summary_hotspot_on_tether_on" msgid="6110241048260139633">"Хотспот қосулы, тетеринг"</string>
<string name="tether_settings_summary_hotspot_on_tether_off" msgid="5057598961245943644">"Хотспот қосулы"</string>
<string name="tether_settings_summary_hotspot_off_tether_on" msgid="7181518138494995888">"Тетеринг"</string>
- <string name="tether_settings_disabled_on_data_saver" msgid="9054069463426952689">"Data Saver функциясы қосулы кезде, тетерингті немесе тасымалы хот-спотты пайдалану мүмкін емес"</string>
+ <string name="tether_settings_disabled_on_data_saver" msgid="9054069463426952689">"Трафикті үнемдеу функциясы қосулы кезде, тетерингті немесе тасымалы хот-спотты пайдалану мүмкін емес"</string>
<string name="tether_settings_summary_hotspot_only" msgid="8529008147731140279">"Тек хотспот"</string>
<string name="tether_settings_summary_usb_tethering_only" msgid="6351624505239356221">"Тек USB"</string>
<string name="tether_settings_summary_bluetooth_tethering_only" msgid="1451008625343274930">"Тек Bluetooth"</string>
@@ -2267,8 +2267,7 @@
<item quantity="other"><xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> есту аппараты сақталды</item>
<item quantity="one"><xliff:g id="NUMBER_DEVICE_COUNT_0">%1$d</xliff:g> есту аппараты сақталды</item>
</plurals>
- <!-- no translation found for accessibility_audio_adjustment_title (1332113739136802997) -->
- <skip />
+ <string name="accessibility_audio_adjustment_title" msgid="1332113739136802997">"Аудионы реттеу"</string>
<string name="accessibility_summary_shortcut_enabled" msgid="4030427268146752644">"Жылдам әрекет қосулы"</string>
<string name="accessibility_summary_shortcut_disabled" msgid="564005462092499068">"Өшірулі"</string>
<string name="accessibility_summary_state_enabled" msgid="1065431632216039369">"Қосулы"</string>
@@ -2437,6 +2436,7 @@
<string name="bluetooth_on_time" msgid="8424625554628450028">"Wi‑Fi уақытында"</string>
<string name="advanced_battery_title" msgid="3005993394776555079">"Батарея шығыны"</string>
<string name="history_details_title" msgid="8628584613889559355">"Тарих егжей-тегжейі"</string>
+ <string name="advanced_battery_preference_title" msgid="6518802648205311326">"Батарея шығынын көру"</string>
<string name="battery_details_title" msgid="4531369291819754178">"Батарея шығыны"</string>
<string name="details_subtitle" msgid="2550872569652785527">"Қолдану деректері"</string>
<string name="controls_subtitle" msgid="3759606830916441564">"Қуат қолданысын бейімдеу"</string>
@@ -4098,6 +4098,7 @@
<string name="usb_use" msgid="6783183432648438528">"USB пайдалану мақсаты"</string>
<string name="usb_default_label" msgid="3372838450371060750">"Әдепкі USB конфигурациясы"</string>
<string name="usb_default_info" msgid="167172599497085266">"Басқа құрылғымен байланыс орнатылып, телефоныңыздың құлпы ашық болса, осы параметрлер қолданылады. Тек сенімді құрылғылармен байланыс орнатқан жөн."</string>
+ <string name="usb_power_title" msgid="5602112548385798646">"Қуат түймесінің опциялары"</string>
<string name="usb_pref" msgid="8521832005703261700">"USB"</string>
<string name="usb_preference" msgid="5084550082591493765">"USB параметрлері"</string>
<string name="usb_control_title" msgid="1946791559052157693">"USB-ді басқаратын құрылғы"</string>
@@ -4258,7 +4259,7 @@
<string name="condition_battery_summary" msgid="8436806157833107886">"Мүмкіндіктер шектеулі"</string>
<string name="condition_cellular_title" msgid="155474690792125747">"Мобильдік деректер өшірулі"</string>
<string name="condition_cellular_summary" msgid="1678098728303268851">"Интернетке Wi‑Fi арқылы ғана жалғануға болады"</string>
- <string name="condition_bg_data_title" msgid="2719263664589753094">"Data Saver"</string>
+ <string name="condition_bg_data_title" msgid="2719263664589753094">"Трафикті үнемдеу"</string>
<string name="condition_bg_data_summary" msgid="1736255283216193834">"Мүмкіндіктер шектеулі"</string>
<string name="condition_work_title" msgid="174326145616998813">"Жұмыс профилі өшірулі"</string>
<string name="condition_work_summary" msgid="7113473121312772398">"Қолданбалар және хабарландырулар үшін"</string>
@@ -4327,8 +4328,8 @@
<string name="configure" msgid="1499586749829665889">"Конфигурациялау"</string>
<string name="data_usage_other_apps" msgid="5649047093607329537">"Басқа қолданбалар трафикке қосылды"</string>
<plurals name="data_saver_unrestricted_summary" formatted="false" msgid="3316296488378947221">
- <item quantity="other">Data Saver қосулы кезде, <xliff:g id="COUNT">%1$d</xliff:g> қолданбаға деректерді шексіз пайдалануға рұқсат етілген</item>
- <item quantity="one">Data Saver қосулы кезде, 1 қолданбаға деректерді шексіз пайдалануға рұқсат етілген</item>
+ <item quantity="other">Трафикті үнемдеу режимі қосулы кезде, <xliff:g id="COUNT">%1$d</xliff:g> қолданбаға деректерді шексіз пайдалануға рұқсат етілген</item>
+ <item quantity="one">Трафикті үнемдеу режимі қосулы кезде, 1 қолданбаға деректерді шексіз пайдалануға рұқсат етілген</item>
</plurals>
<string name="data_usage_title" msgid="4039024073687469094">"Негізгі деректер"</string>
<string name="data_usage_wifi_title" msgid="1060495519280456926">"Wi‑Fi деректері"</string>
@@ -4350,14 +4351,14 @@
<string name="no_carrier_update_now_text" msgid="7898004907837200752">"Жаңа ғана жаңартылды"</string>
<string name="launch_mdp_app_text" msgid="8791816789749304897">"Жоспарды көру"</string>
<string name="launch_wifi_text" msgid="976421974332512894">"Мәліметтерді көру"</string>
- <string name="data_saver_title" msgid="2593804270788863815">"Data Saver"</string>
+ <string name="data_saver_title" msgid="2593804270788863815">"Трафикті үнемдеу"</string>
<string name="unrestricted_data_saver" msgid="7922563266857367495">"Шектелмейтін деректер"</string>
<string name="restrict_background_blocklisted" msgid="2308345280442438232">"Фондық дерек өшірілген."</string>
<string name="data_saver_on" msgid="7848893946018448793">"Қосулы"</string>
<string name="data_saver_off" msgid="5891210864117269045">"Өшірулі"</string>
- <string name="data_saver_switch_title" msgid="7111538580123722959">"Data Saver функциясын қолдану"</string>
+ <string name="data_saver_switch_title" msgid="7111538580123722959">"Трафикті үнемдеу функциясын қолдану"</string>
<string name="unrestricted_app_title" msgid="7117585996574329284">"Деректерді шексіз пайдалану"</string>
- <string name="unrestricted_app_summary" msgid="282698963532000403">"Data Saver қосулы кезде, деректерді шексіз пайдалануға рұқсат ету"</string>
+ <string name="unrestricted_app_summary" msgid="282698963532000403">"Трафикті үнемдеу режимі қосулы кезде, деректерді шексіз пайдалануға рұқсат ету"</string>
<string name="home_app" msgid="6056850504746902747">"Негізгі экран қолданбасы"</string>
<string name="no_default_home" msgid="3588073707316139318">"Әдепкі негізгі бет жоқ"</string>
<string name="lockpattern_settings_require_cred_before_startup" msgid="4098653943835666086">"Қорғалған іске қосу"</string>
@@ -4937,8 +4938,8 @@
<string name="mobile_data_ap_mode_disabled" msgid="6067959496888990983">"Ұшақ режимінде қолжетімді емес."</string>
<string name="force_desktop_mode" msgid="1336913605091334238">"Жұмыс үстелінің режимін мәжбүрлі қосу"</string>
<string name="force_desktop_mode_summary" msgid="4587416867846930479">"Қосымша дисплейлерде эксперименттік жұмыс үстелі режимін мәжбүрлі қосу"</string>
- <string name="enable_sizecompat_freeform" msgid="3799755160777404309">"Тұрақты өлшемді қолданбаның тегін нұсқасын қосу"</string>
- <string name="enable_sizecompat_freeform_summary" msgid="1484050174538201499">"Тұрақты өлшемді қолданбалардың тегін нұсқада болуына мүмкіндік береді"</string>
+ <string name="enable_non_resizable_multi_window" msgid="6832903754625404477">"Өлшемі өзгермейтін қолданбаны \"Multi-window\" режимінде қосу"</string>
+ <string name="enable_non_resizable_multi_window_summary" msgid="3275763753261901999">"Өлшемі өзгермейтін қолданбаларды \"Multi-window\" режимінде пайдалануға мүмкіндік береді."</string>
<string name="hwui_force_dark_title" msgid="4256904905631994219">"Қараңғылауға жол бермеу"</string>
<string name="hwui_force_dark_summary" msgid="6515748781487952769">"Қараңғы тақырыпты мәжбүрлеп қойғанда, \"Әрдайым қосулы\" мәніне өзгертеді"</string>
<string name="enable_blurs_on_windows_title" msgid="4218144213800778872">"Бұлдырату функциясын қосу"</string>
@@ -5060,8 +5061,8 @@
<string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"ұшақ, ұшақта қолдануға болатын желі"</string>
<string name="calls_and_sms" msgid="1931855083959003306">"Қоңыраулар мен SMS хабарлары"</string>
<string name="calls_and_sms_category" msgid="2021321997884906046">"Wi-Fi қоңыраулары"</string>
- <string name="calls_sms_wfc_summary" msgid="4930471357980272294">"Оператордан өзге желілер арқылы (мысалы, Wi‑Fi желісі) қоңырау шалу не қабылдау"</string>
- <string name="calls_sms_footnote" msgid="7002461875954024216">"Wi-Fi қоңыраулары оператордан өзге желілер арқылы (мысалы, кейбір Wi‑Fi желілері) қоңырау шалуға не қабылдауға мүмкіндік береді."</string>
+ <string name="calls_sms_wfc_summary" msgid="3940529919408667336">"Wi‑Fi арқылы қоңырау шалу және қабылдау"</string>
+ <string name="calls_sms_footnote" msgid="8051604228144899434">"Wi-Fi қоңырауларын пайдаланған кезде, қоңыраулар оператордан тыс Wi-Fi желілерінен шалынады және қабылданады."</string>
<string name="calls_preference_title" msgid="7536882032182563800">"Қоңыраулар"</string>
<string name="sms_preference_title" msgid="8392745501754864395">"SMS"</string>
<string name="calls_sms_preferred" msgid="6016477652522583496">"таңдаулы"</string>
@@ -5080,10 +5081,10 @@
<string name="reset_internet_text" product="tablet" msgid="8797910368942544453">"Бұл әрекет қоңырауды тоқтатады."</string>
<string name="resetting_internet_text" msgid="6696779371800051806">"Интернет байланысы бастапқы күйге қайтарылуда…"</string>
<string name="fix_connectivity" msgid="2781433603228089501">"Қосылу мүмкіндігін түзету"</string>
- <!-- no translation found for airplane_mode_network_available (1059499681300395240) -->
- <skip />
- <!-- no translation found for to_switch_networks_disconnect_ethernet (6615374552827587197) -->
- <skip />
+ <string name="airplane_mode_network_available" msgid="1059499681300395240">"Ұшақ режиміндегі желілер қолжетімді."</string>
+ <string name="to_switch_networks_disconnect_ethernet" msgid="6615374552827587197">"Желілерді ауыстыру үшін ethernet кабелін ажыратыңыз."</string>
+ <string name="cannot_switch_networks_while_connected" msgid="3867944849171754777">"Қосулы болса, желілерді ауыстыру мүмкін емес."</string>
+ <string name="airplane_mode_network_panel_title" msgid="6385046104863403604">"Ұшақ режимі желілері"</string>
<string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g>/<xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
<string name="mobile_data_connection_active" msgid="2422223108911581552">"Қосылды"</string>
<string name="mobile_data_off_summary" msgid="3841411571485837651">"Интернет автоматты түрде қосылмайды"</string>
@@ -5105,4 +5106,16 @@
<string name="category_name_others" msgid="2366006298768550310">"Басқалар"</string>
<string name="category_name_general" msgid="7737273712848115886">"Жалпы"</string>
<string name="default_see_all_apps_title" msgid="7481113230662612178">"Барлық қолданбаны қарау"</string>
+ <string name="smart_forwarding_title" msgid="8368634861971949799">"Қоңырауды басқа нөмірге бағыттау"</string>
+ <string name="smart_forwarding_summary_enabled" msgid="3341062878373185604">"Қоңырауды басқа нөмірге бағыттау қосылды."</string>
+ <string name="smart_forwarding_summary_disabled" msgid="5033880700091914809">"Қоңырауды басқа нөмірге бағыттау өшірілді."</string>
+ <string name="smart_forwarding_ongoing_title" msgid="962226849074401228">"Қоңырау параметрлері"</string>
+ <string name="smart_forwarding_ongoing_text" msgid="2189209372407117114">"Параметрлер жаңартылуда…"</string>
+ <string name="smart_forwarding_failed_title" msgid="1859891191023516080">"Қоңырау параметрлері қатесі"</string>
+ <string name="smart_forwarding_failed_text" msgid="5370431503707373653">"Желі немесе SIM картасының қатесі."</string>
+ <string name="smart_forwarding_failed_not_activated_text" msgid="997396203001257904">"SIM картасы іске қосылмаған."</string>
+ <string name="smart_forwarding_input_mdn_title" msgid="5105463748849841763">"Телефон нөмірлерін енгізіңіз"</string>
+ <string name="smart_forwarding_input_mdn_dialog_title" msgid="7542216086697868415">"Телефон нөмірін енгізіңіз"</string>
+ <string name="smart_forwarding_missing_mdn_text" msgid="2907314684242542226">"Телефон нөмірі енгізілмеген."</string>
+ <string name="smart_forwarding_missing_alert_dialog_text" msgid="7870419247987316112">"Жарайды"</string>
</resources>
diff --git a/res/values-km/strings.xml b/res/values-km/strings.xml
index 52cc3b0..ba8f1ce 100644
--- a/res/values-km/strings.xml
+++ b/res/values-km/strings.xml
@@ -2267,8 +2267,7 @@
<item quantity="other">ឧបករណ៍ជំនួយការស្តាប់ <xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> ដែលបានរក្សាទុក</item>
<item quantity="one">ឧបករណ៍ជំនួយការស្តាប់ <xliff:g id="NUMBER_DEVICE_COUNT_0">%1$d</xliff:g> ដែលបានរក្សាទុក</item>
</plurals>
- <!-- no translation found for accessibility_audio_adjustment_title (1332113739136802997) -->
- <skip />
+ <string name="accessibility_audio_adjustment_title" msgid="1332113739136802997">"ការកែតម្រូវសំឡេង"</string>
<string name="accessibility_summary_shortcut_enabled" msgid="4030427268146752644">"ផ្លូវកាត់ត្រូវបានបើក"</string>
<string name="accessibility_summary_shortcut_disabled" msgid="564005462092499068">"បិទ"</string>
<string name="accessibility_summary_state_enabled" msgid="1065431632216039369">"បើក"</string>
@@ -2437,6 +2436,7 @@
<string name="bluetooth_on_time" msgid="8424625554628450028">"ពេលវេលាបើកវ៉ាយហ្វាយ"</string>
<string name="advanced_battery_title" msgid="3005993394776555079">"ការប្រើប្រាស់ថ្ម"</string>
<string name="history_details_title" msgid="8628584613889559355">"ព័ត៌មានលម្អិតប្រវត្តិ"</string>
+ <string name="advanced_battery_preference_title" msgid="6518802648205311326">"មើលការប្រើប្រាស់ថ្ម"</string>
<string name="battery_details_title" msgid="4531369291819754178">"ការប្រើប្រាស់ថ្ម"</string>
<string name="details_subtitle" msgid="2550872569652785527">"ព័ត៌មានលម្អិតនៃការប្រើ"</string>
<string name="controls_subtitle" msgid="3759606830916441564">"កែការប្រើថាមពល"</string>
@@ -4098,6 +4098,7 @@
<string name="usb_use" msgid="6783183432648438528">"ប្រើ USB ដើម្បី"</string>
<string name="usb_default_label" msgid="3372838450371060750">"ការកំណត់រចនាសម្ព័ន្ធ USB លំនាំដើម"</string>
<string name="usb_default_info" msgid="167172599497085266">"ការកំណត់ទាំងនេះនឹងអនុវត្ត នៅពេលដែលទូរសព្ទរបស់អ្នកដោះសោ ហើយឧបករណ៍ផ្សេងទៀតត្រូវបានភ្ជាប់។ សូមភ្ជាប់ជាមួយឧបករណ៍ដែលទុកចិត្តតែប៉ុណ្ណោះ។"</string>
+ <string name="usb_power_title" msgid="5602112548385798646">"ជម្រើសថាមពល"</string>
<string name="usb_pref" msgid="8521832005703261700">"USB"</string>
<string name="usb_preference" msgid="5084550082591493765">"ចំណូលចិត្ត USB"</string>
<string name="usb_control_title" msgid="1946791559052157693">"USB ត្រូវបានគ្រប់គ្រងដោយ"</string>
@@ -4937,8 +4938,8 @@
<string name="mobile_data_ap_mode_disabled" msgid="6067959496888990983">"មិនអាចប្រើបានទេ ពេលប្រើមុខងារពេលជិះយន្តហោះ"</string>
<string name="force_desktop_mode" msgid="1336913605091334238">"បង្ខំមុខងារអេក្រង់ដើម"</string>
<string name="force_desktop_mode_summary" msgid="4587416867846930479">"បង្ខំមុខងារអេក្រង់ដើមសាកល្បងនៅលើអេក្រង់ទីពីរ"</string>
- <string name="enable_sizecompat_freeform" msgid="3799755160777404309">"បើកកម្មវិធី sizecompat ទម្រង់សេវី"</string>
- <string name="enable_sizecompat_freeform_summary" msgid="1484050174538201499">"អនុញ្ញាតឱ្យកម្មវិធី sizecompat ស្ថិតនៅក្នុងទម្រង់សេរី"</string>
+ <string name="enable_non_resizable_multi_window" msgid="6832903754625404477">"បើកកម្មវិធីដែលមិនអាចប្ដូរទំហំបាននៅក្នុងពហុវិនដូ"</string>
+ <string name="enable_non_resizable_multi_window_summary" msgid="3275763753261901999">"អនុញ្ញាតឱ្យកម្មវិធីដែលមិនអាចប្ដូរទំហំបានស្ថិតនៅក្នុងពហុវិនដូ"</string>
<string name="hwui_force_dark_title" msgid="4256904905631994219">"លុបពីលើមុខងារបង្ខំឱ្យងងឹត"</string>
<string name="hwui_force_dark_summary" msgid="6515748781487952769">"លុបពីលើមុខងារបង្ខំឱ្យងងឹតឱ្យបើកជានិច្ច"</string>
<string name="enable_blurs_on_windows_title" msgid="4218144213800778872">"បើកឥទ្ធិពលព្រាល"</string>
@@ -5060,8 +5061,8 @@
<string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"យន្តហោះ មានសុវត្ថិភាពពេលជិះយន្តហោះ"</string>
<string name="calls_and_sms" msgid="1931855083959003306">"ការហៅទូរសព្ទ និង SMS"</string>
<string name="calls_and_sms_category" msgid="2021321997884906046">"ការហៅតាម Wi-Fi"</string>
- <string name="calls_sms_wfc_summary" msgid="4930471357980272294">"ហៅ និងទទួលទូរសព្ទតាមបណ្ដាញដែលមិនមានប្រភពមកពីក្រុមហ៊ុនសេវាទូរសព្ទដូចជា Wi‑Fi ជាដើម"</string>
- <string name="calls_sms_footnote" msgid="7002461875954024216">"ការហៅតាម Wi-Fi អនុញ្ញាតឱ្យអ្នកហៅ និងទទួលទូរសព្ទតាមបណ្ដាញដែលមិនមានប្រភពមកពីក្រុមហ៊ុនសេវាទូរសព្ទដូចជា បណ្ដាញ Wi‑Fi មួយចំនួនជាដើម។"</string>
+ <string name="calls_sms_wfc_summary" msgid="3940529919408667336">"ហៅ និងទទួលទូរសព្ទតាម Wi‑Fi"</string>
+ <string name="calls_sms_footnote" msgid="8051604228144899434">"តាមរយៈការហៅតាម Wi-Fi ការហៅ និងការទទួលទូរសព្ទត្រូវបានធ្វើឡើងតាមបណ្ដាញ Wi‑Fi ដែលមិនមានប្រភពមកពីក្រុមហ៊ុនសេវាទូរសព្ទ។"</string>
<string name="calls_preference_title" msgid="7536882032182563800">"ការហៅទូរសព្ទ"</string>
<string name="sms_preference_title" msgid="8392745501754864395">"សារ SMS"</string>
<string name="calls_sms_preferred" msgid="6016477652522583496">"ជាអាទិភាព"</string>
@@ -5080,10 +5081,10 @@
<string name="reset_internet_text" product="tablet" msgid="8797910368942544453">"ការធ្វើបែបនេះនឹងបញ្ចប់ការហៅទូរសព្ទរបស់អ្នក"</string>
<string name="resetting_internet_text" msgid="6696779371800051806">"កំពុងកំណត់អ៊ីនធឺណិតរបស់អ្នកឡើងវិញ…"</string>
<string name="fix_connectivity" msgid="2781433603228089501">"ដោះស្រាយការតភ្ជាប់"</string>
- <!-- no translation found for airplane_mode_network_available (1059499681300395240) -->
- <skip />
- <!-- no translation found for to_switch_networks_disconnect_ethernet (6615374552827587197) -->
- <skip />
+ <string name="airplane_mode_network_available" msgid="1059499681300395240">"មានបណ្ដាញនៃមុខងារពេលជិះយន្តហោះ"</string>
+ <string name="to_switch_networks_disconnect_ethernet" msgid="6615374552827587197">"ដើម្បីប្ដូរបណ្ដាញ សូមផ្ដាច់អ៊ីសឺរណិត"</string>
+ <string name="cannot_switch_networks_while_connected" msgid="3867944849171754777">"ខណៈពេលភ្ជាប់ មិនអាចប្ដូរបណ្ដាញបានទេ"</string>
+ <string name="airplane_mode_network_panel_title" msgid="6385046104863403604">"បណ្ដាញពេលជិះយន្តហោះ"</string>
<string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g> / <xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
<string name="mobile_data_connection_active" msgid="2422223108911581552">"បានភ្ជាប់"</string>
<string name="mobile_data_off_summary" msgid="3841411571485837651">"អ៊ីនធឺណិតនឹងមិនភ្ជាប់ដោយស្វ័យប្រវត្តិទេ"</string>
@@ -5105,4 +5106,16 @@
<string name="category_name_others" msgid="2366006298768550310">"ផ្សេងៗ"</string>
<string name="category_name_general" msgid="7737273712848115886">"ទូទៅ"</string>
<string name="default_see_all_apps_title" msgid="7481113230662612178">"មើលកម្មវិធីទាំងអស់"</string>
+ <string name="smart_forwarding_title" msgid="8368634861971949799">"ការបញ្ជូនបន្តឆ្លាតវៃ"</string>
+ <string name="smart_forwarding_summary_enabled" msgid="3341062878373185604">"បានបើកការបញ្ជូនបន្តឆ្លាតវៃ"</string>
+ <string name="smart_forwarding_summary_disabled" msgid="5033880700091914809">"បានបិទការបញ្ជូនបន្តឆ្លាតវៃ"</string>
+ <string name="smart_forwarding_ongoing_title" msgid="962226849074401228">"ការកំណត់ការហៅទូរសព្ទ"</string>
+ <string name="smart_forwarding_ongoing_text" msgid="2189209372407117114">"កំពុងធ្វើបច្ចុប្បន្នភាពការកំណត់..."</string>
+ <string name="smart_forwarding_failed_title" msgid="1859891191023516080">"មានបញ្ហានៃការកំណត់ការហៅទូរសព្ទ"</string>
+ <string name="smart_forwarding_failed_text" msgid="5370431503707373653">"មានបញ្ហាបណ្ដាញ ឬស៊ីមកាត។"</string>
+ <string name="smart_forwarding_failed_not_activated_text" msgid="997396203001257904">"ស៊ីមមិនត្រូវបានបើកដំណើរទេ។"</string>
+ <string name="smart_forwarding_input_mdn_title" msgid="5105463748849841763">"បញ្ចូលលេខទូរសព្ទ"</string>
+ <string name="smart_forwarding_input_mdn_dialog_title" msgid="7542216086697868415">"បញ្ចូលលេខទូរសព្ទ"</string>
+ <string name="smart_forwarding_missing_mdn_text" msgid="2907314684242542226">"មិនបានបញ្ចូលលេខទូរសព្ទទេ។"</string>
+ <string name="smart_forwarding_missing_alert_dialog_text" msgid="7870419247987316112">"យល់ព្រម"</string>
</resources>
diff --git a/res/values-kn/strings.xml b/res/values-kn/strings.xml
index 40f38fa..3e690df 100644
--- a/res/values-kn/strings.xml
+++ b/res/values-kn/strings.xml
@@ -2267,8 +2267,7 @@
<item quantity="one"><xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> ಶ್ರವಣ ಸಾಧನಗಳನ್ನು ಉಳಿಸಲಾಗಿದೆ</item>
<item quantity="other"><xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> ಶ್ರವಣ ಸಾಧನಗಳನ್ನು ಉಳಿಸಲಾಗಿದೆ</item>
</plurals>
- <!-- no translation found for accessibility_audio_adjustment_title (1332113739136802997) -->
- <skip />
+ <string name="accessibility_audio_adjustment_title" msgid="1332113739136802997">"ಆಡಿಯೋ ಹೊಂದಾಣಿಕೆ"</string>
<string name="accessibility_summary_shortcut_enabled" msgid="4030427268146752644">"ಶಾರ್ಟ್ಕಟ್ ಆನ್ ಆಗಿದೆ"</string>
<string name="accessibility_summary_shortcut_disabled" msgid="564005462092499068">"ಆಫ್"</string>
<string name="accessibility_summary_state_enabled" msgid="1065431632216039369">"ಆನ್ ಮಾಡಿ"</string>
@@ -2437,6 +2436,7 @@
<string name="bluetooth_on_time" msgid="8424625554628450028">"Wi‑Fi ಸಮಯದಲ್ಲಿ"</string>
<string name="advanced_battery_title" msgid="3005993394776555079">"ಬ್ಯಾಟರಿ ಬಳಕೆ"</string>
<string name="history_details_title" msgid="8628584613889559355">"ಇತಿಹಾಸದ ವಿವರಗಳು"</string>
+ <string name="advanced_battery_preference_title" msgid="6518802648205311326">"ಬ್ಯಾಟರಿ ಬಳಕೆಯನ್ನು ವೀಕ್ಷಿಸಿ"</string>
<string name="battery_details_title" msgid="4531369291819754178">"ಬ್ಯಾಟರಿ ಬಳಕೆ"</string>
<string name="details_subtitle" msgid="2550872569652785527">"ಬಳಕೆಯ ವಿವರಗಳು"</string>
<string name="controls_subtitle" msgid="3759606830916441564">"ವಿದ್ಯುತ್ ಬಳಕೆಯನ್ನು ಹೊಂದಿಸಿ"</string>
@@ -4098,6 +4098,7 @@
<string name="usb_use" msgid="6783183432648438528">"ಇದಕ್ಕಾಗಿ USB ಬಳಸಿ"</string>
<string name="usb_default_label" msgid="3372838450371060750">"ಡಿಫಾಲ್ಟ್ USB ಕಾನ್ಫಿಗರೇಶನ್"</string>
<string name="usb_default_info" msgid="167172599497085266">"ಮತ್ತೊಂದು ಸಾಧನವನ್ನು ಸಂಪರ್ಕಿಸಿದಾಗ ಮತ್ತು ನಿಮ್ಮ ಫೋನ್ ಅನ್ಲಾಕ್ ಆಗಿರುವಾಗ, ಈ ಸೆಟ್ಟಿಂಗ್ಗಳನ್ನು ಅನ್ವಯಿಸಲಾಗುತ್ತದೆ. ವಿಶ್ವಾಸಾರ್ಹ ಸಾಧನಗಳನ್ನು ಮಾತ್ರ ಸಂಪರ್ಕಿಸಿ."</string>
+ <string name="usb_power_title" msgid="5602112548385798646">"ಪವರ್ ಸಂಬಂಧಿತ ಆಯ್ಕೆಗಳು"</string>
<string name="usb_pref" msgid="8521832005703261700">"USB"</string>
<string name="usb_preference" msgid="5084550082591493765">"USB ಪ್ರಾಶಸ್ತ್ಯಗಳು"</string>
<string name="usb_control_title" msgid="1946791559052157693">"ಇದರ ಮೂಲಕ USB ಅನ್ನು ನಿಯಂತ್ರಿಸಲಾಗುತ್ತಿದೆ"</string>
@@ -4937,8 +4938,8 @@
<string name="mobile_data_ap_mode_disabled" msgid="6067959496888990983">"ಏರ್ಪ್ಲೇನ್ ಮೋಡ್ನಲ್ಲಿರುವಾಗ ಲಭ್ಯವಿರುವುದಿಲ್ಲ"</string>
<string name="force_desktop_mode" msgid="1336913605091334238">"ಡೆಸ್ಕ್ಟಾಪ್ ಮೋಡ್ ಅನ್ನು ಒತ್ತಾಯ ಮಾಡಿ"</string>
<string name="force_desktop_mode_summary" msgid="4587416867846930479">"ಸೆಕೆಂಡರಿ ಡಿಸ್ಪ್ಲೇಗಳಲ್ಲಿ ಪ್ರಾಯೋಗಿಕ ಡೆಸ್ಕ್ಟಾಪ್ ಮೋಡ್ ಅನ್ನು ಒತ್ತಾಯ ಮಾಡಿ"</string>
- <string name="enable_sizecompat_freeform" msgid="3799755160777404309">"ಉಚಿತ ಫಾರ್ಮ್ ಗಾತ್ರವನ್ನು ಸಕ್ರಿಯಗೊಳಿಸಿ"</string>
- <string name="enable_sizecompat_freeform_summary" msgid="1484050174538201499">"ಹೊಂದಾಣಿಕೆಯ ಗಾತ್ರದ ಆ್ಯಪ್ಗಳನ್ನು ಬೇಕಾದ ಫಾರ್ಮ್ಯಾಟ್ನಲ್ಲಿರುವುದಕ್ಕೆ ಅನುಮತಿಸಿ"</string>
+ <string name="enable_non_resizable_multi_window" msgid="6832903754625404477">"ಬಹು-ವಿಂಡೋದಲ್ಲಿ ಮರುಗಾತ್ರಗೊಳಿಸಲು ಆಗದಿರುವುದನ್ನು ಸಕ್ರಿಯಗೊಳಿಸಿ"</string>
+ <string name="enable_non_resizable_multi_window_summary" msgid="3275763753261901999">"ಮರುಗಾತ್ರಗೊಳಿಸಲು ಆಗದ ಆ್ಯಪ್ಗಳನ್ನು ಬಹು-ವಿಂಡೋದಲ್ಲಿ ಇರಲು ಅನುಮತಿಸುತ್ತದೆ"</string>
<string name="hwui_force_dark_title" msgid="4256904905631994219">"ಫೋರ್ಸ್-ಡಾರ್ಕ್ ವೈಶಿಷ್ಟ್ಯ ಬಲಗೊಳಿಸಲು ಸೆಟ್ಟಿಂಗ್ ಅತಿಕ್ರಮಿಸಿ"</string>
<string name="hwui_force_dark_summary" msgid="6515748781487952769">"ಫೋರ್ಸ್-ಡಾರ್ಕ್ ವೈಶಿಷ್ಟ್ಯವು ಆನ್ ಆಗಿರುವಂತೆ ಒತ್ತಾಯಿಸುತ್ತದೆ"</string>
<string name="enable_blurs_on_windows_title" msgid="4218144213800778872">"ಬ್ಲರ್ ಮಾಡುವಿಕೆ ಸಕ್ರಿಯಗೊಳಿಸಿ"</string>
@@ -5060,8 +5061,8 @@
<string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"ಏರ್ಪ್ಲೇನ್, ಏರ್ಪ್ಲೇನ್-ಸುರಕ್ಷತಾ"</string>
<string name="calls_and_sms" msgid="1931855083959003306">"ಕರೆಗಳು & SMS"</string>
<string name="calls_and_sms_category" msgid="2021321997884906046">"ವೈ-ಫೈ ಕರೆ ಮಾಡುವಿಕೆ"</string>
- <string name="calls_sms_wfc_summary" msgid="4930471357980272294">"ವೈ-ಫೈ ರೀತಿಯ ವಾಹಕ-ರಹಿತ ನೆಟ್ವರ್ಕ್ಗಳ ಮೂಲಕ ಕರೆಗಳನ್ನು ಮಾಡಿ ಮತ್ತು ಸ್ವೀಕರಿಸಿ"</string>
- <string name="calls_sms_footnote" msgid="7002461875954024216">"ವೈ-ಫೈ ಕರೆಮಾಡುವಿಕೆಯು, ಕೆಲವು ವೈ-ಫೈ ನೆಟ್ವರ್ಕ್ಗಳು ವಾಹಕ-ರಹಿತ ನೆಟ್ವರ್ಕ್ಗಳ ಮೂಲಕ ಕರೆಗಳನ್ನು ಮಾಡಲು ಮತ್ತು ಸ್ವೀಕರಿಸಲು ನಿಮಗೆ ಅನುಮತಿಸುತ್ತದೆ."</string>
+ <string name="calls_sms_wfc_summary" msgid="3940529919408667336">"ವೈ-ಫೈ ಮೇಲೆ ಕರೆಗಳನ್ನು ಮಾಡಿ ಮತ್ತು ಸ್ವೀಕರಿಸಿ"</string>
+ <string name="calls_sms_footnote" msgid="8051604228144899434">"ವೈ-ಫೈ ಕರೆ ಮಾಡುವಿಕೆಯ ಜೊತೆಗೆ, ವಾಹಕಗಳಲ್ಲದ ವೈ-ಫೈ ನೆಟ್ವರ್ಕ್ಗಳ ಮೇಲೆ ಕರೆಗಳನ್ನು ಮಾಡಲಾಗಿದೆ ಮತ್ತು ಸ್ವೀಕರಿಸಲಾಗಿದೆ."</string>
<string name="calls_preference_title" msgid="7536882032182563800">"ಕರೆಗಳು"</string>
<string name="sms_preference_title" msgid="8392745501754864395">"SMS"</string>
<string name="calls_sms_preferred" msgid="6016477652522583496">"ಆದ್ಯತೆ ನೀಡಲಾಗಿದೆ"</string>
@@ -5080,9 +5081,10 @@
<string name="reset_internet_text" product="tablet" msgid="8797910368942544453">"ಇದರಿಂದ ನಿಮ್ಮ ಫೋನ್ ಕರೆ ಕೊನೆಗೊಳ್ಳುತ್ತದೆ"</string>
<string name="resetting_internet_text" msgid="6696779371800051806">"ನಿಮ್ಮ ಇಂಟರ್ನೆಟ್ ಅನ್ನು ರೀಸೆಟ್ ಮಾಡಲಾಗುತ್ತಿದೆ…"</string>
<string name="fix_connectivity" msgid="2781433603228089501">"ಸಂಪರ್ಕ ಕಲ್ಪಿಸುವಿಕೆಯ ದೋಷವನ್ನು ಸರಿಪಡಿಸಿ"</string>
- <!-- no translation found for airplane_mode_network_available (1059499681300395240) -->
- <skip />
- <!-- no translation found for to_switch_networks_disconnect_ethernet (6615374552827587197) -->
+ <string name="airplane_mode_network_available" msgid="1059499681300395240">"ಏರ್ಪ್ಲೇನ್ ಮೋಡ್ ನೆಟ್ವರ್ಕ್ಗಳು ಲಭ್ಯವಿವೆ"</string>
+ <string name="to_switch_networks_disconnect_ethernet" msgid="6615374552827587197">"ನೆಟ್ವರ್ಕ್ಗಳನ್ನು ಬದಲಿಸಲು, ಇಥರ್ನೆಟ್ ಅನ್ನು ಡಿಸ್ಕನೆಕ್ಟ್ ಮಾಡಿ"</string>
+ <string name="cannot_switch_networks_while_connected" msgid="3867944849171754777">"ಕನೆಕ್ಟ್ ಆಗುವಾಗ ನೆಟ್ವರ್ಕ್ಗಳನ್ನು ಬದಲಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ"</string>
+ <!-- no translation found for airplane_mode_network_panel_title (6385046104863403604) -->
<skip />
<string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g> / <xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
<string name="mobile_data_connection_active" msgid="2422223108911581552">"ಕನೆಕ್ಟ್ ಆಗಿದೆ"</string>
@@ -5105,4 +5107,16 @@
<string name="category_name_others" msgid="2366006298768550310">"ಇತರೆ"</string>
<string name="category_name_general" msgid="7737273712848115886">"ಸಾಮಾನ್ಯ"</string>
<string name="default_see_all_apps_title" msgid="7481113230662612178">"ಎಲ್ಲಾ ಆ್ಯಪ್ಗಳನ್ನು ನೋಡಿ"</string>
+ <string name="smart_forwarding_title" msgid="8368634861971949799">"ಸ್ಮಾರ್ಟ್ ಫಾರ್ವರ್ಡ್ ಮಾಡುವಿಕೆ"</string>
+ <string name="smart_forwarding_summary_enabled" msgid="3341062878373185604">"ಸ್ಮಾರ್ಟ್ ಫಾರ್ವರ್ಡ್ ಮಾಡುವಿಕೆ ಸಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ"</string>
+ <string name="smart_forwarding_summary_disabled" msgid="5033880700091914809">"ಸ್ಮಾರ್ಟ್ ಫಾರ್ವರ್ಡ್ ಮಾಡುವಿಕೆ ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ"</string>
+ <string name="smart_forwarding_ongoing_title" msgid="962226849074401228">"ಕರೆ ಸೆಟ್ಟಿಂಗ್ಗಳು"</string>
+ <string name="smart_forwarding_ongoing_text" msgid="2189209372407117114">"ಸೆಟ್ಟಿಂಗ್ಗಳನ್ನು ನವೀಕರಿಸಲಾಗುತ್ತಿದೆ..."</string>
+ <string name="smart_forwarding_failed_title" msgid="1859891191023516080">"ಕರೆ ಸೆಟ್ಟಿಂಗ್ಗಳ ದೋಷ"</string>
+ <string name="smart_forwarding_failed_text" msgid="5370431503707373653">"ನೆಟ್ವರ್ಕ್ ಅಥವಾ ಸಿಮ್ ಕಾರ್ಡ್ ದೋಷ."</string>
+ <string name="smart_forwarding_failed_not_activated_text" msgid="997396203001257904">"ಸಿಮ್ ಸಕ್ರಿಯಗೊಂಡಿಲ್ಲ."</string>
+ <string name="smart_forwarding_input_mdn_title" msgid="5105463748849841763">"ಫೋನ್ ಸಂಖ್ಯೆಗಳನ್ನು ನಮೂದಿಸಿ"</string>
+ <string name="smart_forwarding_input_mdn_dialog_title" msgid="7542216086697868415">"ಫೋನ್ ಸಂಖ್ಯೆಯನ್ನು ನಮೂದಿಸಿ"</string>
+ <string name="smart_forwarding_missing_mdn_text" msgid="2907314684242542226">"ಫೋನ್ ಸಂಖ್ಯೆ ತಪ್ಪಿಹೋಗಿದೆ."</string>
+ <string name="smart_forwarding_missing_alert_dialog_text" msgid="7870419247987316112">"ಸರಿ"</string>
</resources>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 8ba66c0..273907f 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -2267,8 +2267,7 @@
<item quantity="other">보청기 <xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g>개가 저장되어 있습니다.</item>
<item quantity="one">보청기 <xliff:g id="NUMBER_DEVICE_COUNT_0">%1$d</xliff:g>개가 저장되어 있습니다.</item>
</plurals>
- <!-- no translation found for accessibility_audio_adjustment_title (1332113739136802997) -->
- <skip />
+ <string name="accessibility_audio_adjustment_title" msgid="1332113739136802997">"오디오 조정"</string>
<string name="accessibility_summary_shortcut_enabled" msgid="4030427268146752644">"단축키 사용"</string>
<string name="accessibility_summary_shortcut_disabled" msgid="564005462092499068">"사용 안함"</string>
<string name="accessibility_summary_state_enabled" msgid="1065431632216039369">"사용"</string>
@@ -2437,6 +2436,7 @@
<string name="bluetooth_on_time" msgid="8424625554628450028">"Wi-Fi 사용 시간"</string>
<string name="advanced_battery_title" msgid="3005993394776555079">"배터리 사용량"</string>
<string name="history_details_title" msgid="8628584613889559355">"기록 세부정보"</string>
+ <string name="advanced_battery_preference_title" msgid="6518802648205311326">"배터리 사용량 보기"</string>
<string name="battery_details_title" msgid="4531369291819754178">"배터리 사용량"</string>
<string name="details_subtitle" msgid="2550872569652785527">"사용 세부정보"</string>
<string name="controls_subtitle" msgid="3759606830916441564">"전원 사용 조절"</string>
@@ -4098,6 +4098,7 @@
<string name="usb_use" msgid="6783183432648438528">"USB 사용 용도"</string>
<string name="usb_default_label" msgid="3372838450371060750">"기본 USB 설정"</string>
<string name="usb_default_info" msgid="167172599497085266">"다른 기기가 연결되고 휴대전화가 잠금 해제되었을 때 이 설정이 적용됩니다. 신뢰할 수 있는 기기에만 연결하세요."</string>
+ <string name="usb_power_title" msgid="5602112548385798646">"전원 옵션"</string>
<string name="usb_pref" msgid="8521832005703261700">"USB"</string>
<string name="usb_preference" msgid="5084550082591493765">"USB 환경설정"</string>
<string name="usb_control_title" msgid="1946791559052157693">"USB 제어 기기"</string>
@@ -4937,8 +4938,8 @@
<string name="mobile_data_ap_mode_disabled" msgid="6067959496888990983">"비행기 모드에서는 사용할 수 없음"</string>
<string name="force_desktop_mode" msgid="1336913605091334238">"데스크톱 모드 강제 사용"</string>
<string name="force_desktop_mode_summary" msgid="4587416867846930479">"보조 디스플레이에서 실험적 데스크톱 모드 강제 사용"</string>
- <string name="enable_sizecompat_freeform" msgid="3799755160777404309">"자유 형식 sizecompat 사용"</string>
- <string name="enable_sizecompat_freeform_summary" msgid="1484050174538201499">"sizecompat 앱에 자유 형식 허용"</string>
+ <string name="enable_non_resizable_multi_window" msgid="6832903754625404477">"멀티 윈도우에서 크기 조정 불가 앱 사용"</string>
+ <string name="enable_non_resizable_multi_window_summary" msgid="3275763753261901999">"멀티 윈도우에서 크기 조정 불가 앱 허용"</string>
<string name="hwui_force_dark_title" msgid="4256904905631994219">"강제로 어둡게 재정의"</string>
<string name="hwui_force_dark_summary" msgid="6515748781487952769">"강제로 어둡게 기능을 항상 사용하도록 재정의"</string>
<string name="enable_blurs_on_windows_title" msgid="4218144213800778872">"흐리게 처리 사용"</string>
@@ -5060,8 +5061,8 @@
<string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"항공, 항공 안전"</string>
<string name="calls_and_sms" msgid="1931855083959003306">"통화 및 SMS"</string>
<string name="calls_and_sms_category" msgid="2021321997884906046">"Wi‑Fi 통화"</string>
- <string name="calls_sms_wfc_summary" msgid="4930471357980272294">"Wi‑Fi와 같은 비이동통신사 네트워크를 통해 전화를 주고받습니다."</string>
- <string name="calls_sms_footnote" msgid="7002461875954024216">"Wi-Fi 통화를 사용하면 Wi‑Fi 네트워크와 같은 비이동통신사 네트워크를 통해 전화를 주고받을 수 있습니다."</string>
+ <string name="calls_sms_wfc_summary" msgid="3940529919408667336">"Wi‑Fi로 통화"</string>
+ <string name="calls_sms_footnote" msgid="8051604228144899434">"Wi‑Fi 통화를 사용하면 비이동통신사 Wi‑Fi 네트워크를 통해 전화를 주고받을 수 있습니다."</string>
<string name="calls_preference_title" msgid="7536882032182563800">"통화"</string>
<string name="sms_preference_title" msgid="8392745501754864395">"SMS"</string>
<string name="calls_sms_preferred" msgid="6016477652522583496">"기본"</string>
@@ -5080,10 +5081,10 @@
<string name="reset_internet_text" product="tablet" msgid="8797910368942544453">"휴대전화 통화가 종료됩니다."</string>
<string name="resetting_internet_text" msgid="6696779371800051806">"인터넷 재설정 중…"</string>
<string name="fix_connectivity" msgid="2781433603228089501">"연결 문제 해결"</string>
- <!-- no translation found for airplane_mode_network_available (1059499681300395240) -->
- <skip />
- <!-- no translation found for to_switch_networks_disconnect_ethernet (6615374552827587197) -->
- <skip />
+ <string name="airplane_mode_network_available" msgid="1059499681300395240">"비행기 모드 네트워크 사용 가능"</string>
+ <string name="to_switch_networks_disconnect_ethernet" msgid="6615374552827587197">"네트워크를 전환하려면 이더넷을 연결 해제하세요."</string>
+ <string name="cannot_switch_networks_while_connected" msgid="3867944849171754777">"연결된 상태에서는 네트워크를 전환할 수 없음"</string>
+ <string name="airplane_mode_network_panel_title" msgid="6385046104863403604">"비행기 모드 네트워크"</string>
<string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g>/<xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
<string name="mobile_data_connection_active" msgid="2422223108911581552">"연결됨"</string>
<string name="mobile_data_off_summary" msgid="3841411571485837651">"인터넷에 자동으로 연결되지 않음"</string>
@@ -5105,4 +5106,16 @@
<string name="category_name_others" msgid="2366006298768550310">"기타"</string>
<string name="category_name_general" msgid="7737273712848115886">"일반"</string>
<string name="default_see_all_apps_title" msgid="7481113230662612178">"앱 모두 보기"</string>
+ <string name="smart_forwarding_title" msgid="8368634861971949799">"스마트 착신전환"</string>
+ <string name="smart_forwarding_summary_enabled" msgid="3341062878373185604">"스마트 착신전환 사용 설정됨"</string>
+ <string name="smart_forwarding_summary_disabled" msgid="5033880700091914809">"스마트 착신전환 사용 중지됨"</string>
+ <string name="smart_forwarding_ongoing_title" msgid="962226849074401228">"통화 설정"</string>
+ <string name="smart_forwarding_ongoing_text" msgid="2189209372407117114">"설정 업데이트 중..."</string>
+ <string name="smart_forwarding_failed_title" msgid="1859891191023516080">"통화 설정 오류"</string>
+ <string name="smart_forwarding_failed_text" msgid="5370431503707373653">"네트워크 또는 SIM 카드 오류입니다."</string>
+ <string name="smart_forwarding_failed_not_activated_text" msgid="997396203001257904">"SIM이 활성화되지 않았습니다."</string>
+ <string name="smart_forwarding_input_mdn_title" msgid="5105463748849841763">"전화번호 입력"</string>
+ <string name="smart_forwarding_input_mdn_dialog_title" msgid="7542216086697868415">"전화번호 입력"</string>
+ <string name="smart_forwarding_missing_mdn_text" msgid="2907314684242542226">"전화번호를 입력하세요."</string>
+ <string name="smart_forwarding_missing_alert_dialog_text" msgid="7870419247987316112">"확인"</string>
</resources>
diff --git a/res/values-ky/strings.xml b/res/values-ky/strings.xml
index b67e711..bbe1ade 100644
--- a/res/values-ky/strings.xml
+++ b/res/values-ky/strings.xml
@@ -2267,8 +2267,7 @@
<item quantity="other"><xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> угуу аппараты сакталган</item>
<item quantity="one"><xliff:g id="NUMBER_DEVICE_COUNT_0">%1$d</xliff:g> угуу аппараты сакталган</item>
</plurals>
- <!-- no translation found for accessibility_audio_adjustment_title (1332113739136802997) -->
- <skip />
+ <string name="accessibility_audio_adjustment_title" msgid="1332113739136802997">"Аудиону тууралоо"</string>
<string name="accessibility_summary_shortcut_enabled" msgid="4030427268146752644">"Кыска жол күйүк"</string>
<string name="accessibility_summary_shortcut_disabled" msgid="564005462092499068">"Өчүк"</string>
<string name="accessibility_summary_state_enabled" msgid="1065431632216039369">"Күйүк"</string>
@@ -2437,6 +2436,7 @@
<string name="bluetooth_on_time" msgid="8424625554628450028">"Өз убагындагы Wi‑Fi"</string>
<string name="advanced_battery_title" msgid="3005993394776555079">"Батареянын колдонулушу"</string>
<string name="history_details_title" msgid="8628584613889559355">"Таржымалдын чоо-жайы"</string>
+ <string name="advanced_battery_preference_title" msgid="6518802648205311326">"Батареянын колдонулушун көрүү"</string>
<string name="battery_details_title" msgid="4531369291819754178">"Батареянын керектелиши"</string>
<string name="details_subtitle" msgid="2550872569652785527">"Чоо-жайын колдонуу"</string>
<string name="controls_subtitle" msgid="3759606830916441564">"Кубат сарпталышын тууралоо"</string>
@@ -4098,6 +4098,7 @@
<string name="usb_use" msgid="6783183432648438528">"USB кайсы режимде колдонулат:"</string>
<string name="usb_default_label" msgid="3372838450371060750">"USB\'нин демейки конфигурациясы"</string>
<string name="usb_default_info" msgid="167172599497085266">"Телефонуңуз башка түзмөккө туташып, кулпуланбай турганда, ушул жөндөөлөр колдонулат. Телефонуңузду ишенимдүү түзмөктөргө гана туташтырыңыз."</string>
+ <string name="usb_power_title" msgid="5602112548385798646">"Кубат параметрлери"</string>
<string name="usb_pref" msgid="8521832005703261700">"USB"</string>
<string name="usb_preference" msgid="5084550082591493765">"USB\'нин жөндөөлөрү"</string>
<string name="usb_control_title" msgid="1946791559052157693">"USB\'ни көзөмөлдөгөн түзмөк:"</string>
@@ -4937,8 +4938,8 @@
<string name="mobile_data_ap_mode_disabled" msgid="6067959496888990983">"Учак режиминде жеткиликсиз"</string>
<string name="force_desktop_mode" msgid="1336913605091334238">"Иш такта режимин күйгүзүү"</string>
<string name="force_desktop_mode_summary" msgid="4587416867846930479">"Тажрыйбалык иш такта режимин көмөкчү экрандарда иштетүү"</string>
- <string name="enable_sizecompat_freeform" msgid="3799755160777404309">"Эркин формадагы шайкеш өлчөмдөрдү иштетүү"</string>
- <string name="enable_sizecompat_freeform_summary" msgid="1484050174538201499">"Өлчөмү шайкеш келген колдонмолорго эркин формадагы терезелерде ачылууга мүмкүнчүлүк берет"</string>
+ <string name="enable_non_resizable_multi_window" msgid="6832903754625404477">"Өлчөмү өзгөрбөгөн колдонмолорду бир нече терезеде иштетүү"</string>
+ <string name="enable_non_resizable_multi_window_summary" msgid="3275763753261901999">"Өлчөмү өзгөрбөгөн колдонмолорду бир нече терезеде көрсөтүүгө уруксат берүү"</string>
<string name="hwui_force_dark_title" msgid="4256904905631994219">"Түнкү режимди мажбурлап иштетүү функциясын өзгөртүп коюу"</string>
<string name="hwui_force_dark_summary" msgid="6515748781487952769">"Түнкү режимди мажбурлап иштетүү функциясы ар дайым күйүк болгондой кылып өзгөртүп коёт"</string>
<string name="enable_blurs_on_windows_title" msgid="4218144213800778872">"Бүдөмүктөтүүнү иштетүү"</string>
@@ -5060,8 +5061,8 @@
<string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"учак, учак режимине ылайыктуу"</string>
<string name="calls_and_sms" msgid="1931855083959003306">"Телефон чалуу жана SMS жөнөтүү"</string>
<string name="calls_and_sms_category" msgid="2021321997884906046">"Wi-Fi аркылуу чалуу"</string>
- <string name="calls_sms_wfc_summary" msgid="4930471357980272294">"Мобилдик байланыш эмес, Wi‑Fi тармагы сыяктуу байланыш аркылуу чалып, чалууларга жооп бериңиз"</string>
- <string name="calls_sms_footnote" msgid="7002461875954024216">"Wi-Fi аркылуу чалуу менен мобилдик байланыш оператору аркылуу эмес, айрым Wi‑Fi тармактарын колдонуп чала аласыз."</string>
+ <string name="calls_sms_wfc_summary" msgid="3940529919408667336">"Wi‑Fi аркылуу чалуу"</string>
+ <string name="calls_sms_footnote" msgid="8051604228144899434">"Wi‑Fi аркылуу чалганда чалууулар байланыш операторуна таандык болбогон Wi‑Fi тармактарда аткарылат."</string>
<string name="calls_preference_title" msgid="7536882032182563800">"Чалуулар"</string>
<string name="sms_preference_title" msgid="8392745501754864395">"SMS"</string>
<string name="calls_sms_preferred" msgid="6016477652522583496">"артыкчылыктуу"</string>
@@ -5080,10 +5081,10 @@
<string name="reset_internet_text" product="tablet" msgid="8797910368942544453">"Ушуну менен телефон чалууңуз бүтөт"</string>
<string name="resetting_internet_text" msgid="6696779371800051806">"Интернет баштапкы абалга келтирилүүдө…"</string>
<string name="fix_connectivity" msgid="2781433603228089501">"Байланышты оңдоо"</string>
- <!-- no translation found for airplane_mode_network_available (1059499681300395240) -->
- <skip />
- <!-- no translation found for to_switch_networks_disconnect_ethernet (6615374552827587197) -->
- <skip />
+ <string name="airplane_mode_network_available" msgid="1059499681300395240">"Учак режиминдеги тармактар жеткиликтүү"</string>
+ <string name="to_switch_networks_disconnect_ethernet" msgid="6615374552827587197">"Башка тармактарга которулуу үчүн Ethernet кабелин ажыратыңыз"</string>
+ <string name="cannot_switch_networks_while_connected" msgid="3867944849171754777">"Туташып турганда тармактарды которууга болбойт"</string>
+ <string name="airplane_mode_network_panel_title" msgid="6385046104863403604">"Учак режиминдеги тармактар"</string>
<string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g>/<xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
<string name="mobile_data_connection_active" msgid="2422223108911581552">"Туташты"</string>
<string name="mobile_data_off_summary" msgid="3841411571485837651">"Интернет автоматтык түрдө туташпайт"</string>
@@ -5105,4 +5106,16 @@
<string name="category_name_others" msgid="2366006298768550310">"Башкалар"</string>
<string name="category_name_general" msgid="7737273712848115886">"Жалпы"</string>
<string name="default_see_all_apps_title" msgid="7481113230662612178">"Бардык колдонмолорду көрүү"</string>
+ <string name="smart_forwarding_title" msgid="8368634861971949799">"Акылдуу багыттоо"</string>
+ <string name="smart_forwarding_summary_enabled" msgid="3341062878373185604">"Акылдуу багыттоо иштетилди"</string>
+ <string name="smart_forwarding_summary_disabled" msgid="5033880700091914809">"Акылдуу багыттоо өчүрүлдү"</string>
+ <string name="smart_forwarding_ongoing_title" msgid="962226849074401228">"Чалуу жөндөөлөрү"</string>
+ <string name="smart_forwarding_ongoing_text" msgid="2189209372407117114">"Жөндөөлөр жаңыртылууда…"</string>
+ <string name="smart_forwarding_failed_title" msgid="1859891191023516080">"Чалуу жөндөөлөрүндөгү ката"</string>
+ <string name="smart_forwarding_failed_text" msgid="5370431503707373653">"Тармак же SIM-карта катасы."</string>
+ <string name="smart_forwarding_failed_not_activated_text" msgid="997396203001257904">"SIM-карта иштетилген жок."</string>
+ <string name="smart_forwarding_input_mdn_title" msgid="5105463748849841763">"Телефон номерлерин киргизүү"</string>
+ <string name="smart_forwarding_input_mdn_dialog_title" msgid="7542216086697868415">"Телефон номерин киргизиңиз"</string>
+ <string name="smart_forwarding_missing_mdn_text" msgid="2907314684242542226">"Телефондун номери жетишпейт."</string>
+ <string name="smart_forwarding_missing_alert_dialog_text" msgid="7870419247987316112">"Макул"</string>
</resources>
diff --git a/res/values-lo/strings.xml b/res/values-lo/strings.xml
index ba17b36..52d07ad 100644
--- a/res/values-lo/strings.xml
+++ b/res/values-lo/strings.xml
@@ -2436,6 +2436,7 @@
<string name="bluetooth_on_time" msgid="8424625554628450028">"ໄລຍະເວລາການໃຊ້ Wi-Fi"</string>
<string name="advanced_battery_title" msgid="3005993394776555079">"ການໃຊ້ແບັດເຕີຣີ"</string>
<string name="history_details_title" msgid="8628584613889559355">"ລາຍລະອຽດປະຫວັດການນຳໃຊ້"</string>
+ <string name="advanced_battery_preference_title" msgid="6518802648205311326">"ເບິ່ງການໃຊ້ແບັດເຕີຣີ"</string>
<string name="battery_details_title" msgid="4531369291819754178">"ການໃຊ້ແບັດເຕີຣີ"</string>
<string name="details_subtitle" msgid="2550872569652785527">"ໃຊ້ລາຍລະອຽດ"</string>
<string name="controls_subtitle" msgid="3759606830916441564">"ປັບແຕ່ງການໃຊ້ພະລັງງານ"</string>
@@ -4097,6 +4098,7 @@
<string name="usb_use" msgid="6783183432648438528">"ໃຊ້ USB ສຳລັບ"</string>
<string name="usb_default_label" msgid="3372838450371060750">"ການຕັ້ງຄ່າ USB ເລີ່ມຕົ້ນ"</string>
<string name="usb_default_info" msgid="167172599497085266">"When another device is connected and your phone is unlocked, these settings will be applied. Only connect to trusted devices."</string>
+ <string name="usb_power_title" msgid="5602112548385798646">"ຕົວເລືອກພະລັງງານ"</string>
<string name="usb_pref" msgid="8521832005703261700">"USB"</string>
<string name="usb_preference" msgid="5084550082591493765">"ການຕັ້ງຄ່າ USB"</string>
<string name="usb_control_title" msgid="1946791559052157693">"USB ຖືກຄວບຄຸມໂດຍ"</string>
@@ -4936,8 +4938,8 @@
<string name="mobile_data_ap_mode_disabled" msgid="6067959496888990983">"ບໍ່ສາມາດໃຊ້ໄດ້ໃນໂໝດຢູ່ໃນຍົນ"</string>
<string name="force_desktop_mode" msgid="1336913605091334238">"ບັງຄັບໂໝດເດັສທັອບ"</string>
<string name="force_desktop_mode_summary" msgid="4587416867846930479">"ບັງຄັບໂໝດເດັສທັອບແບບທົດລອງໃຊ້ຢູ່ໜ້າຈໍທີສອງ"</string>
- <string name="enable_sizecompat_freeform" msgid="3799755160777404309">"ເປີດໃຊ້ freeform sizecompat"</string>
- <string name="enable_sizecompat_freeform_summary" msgid="1484050174538201499">"ອະນຸຍາດແອັບ sizecompat ໃຫ້ເປັນ freeform"</string>
+ <string name="enable_non_resizable_multi_window" msgid="6832903754625404477">"ເປີດການນຳໃຊ້ແບບບໍ່ສາມາດປັບຂະໜາດໃນການໃຊ້ຫຼາຍໜ້າຈໍ"</string>
+ <string name="enable_non_resizable_multi_window_summary" msgid="3275763753261901999">"ອະນຸຍາດໃຫ້ມີແອັບແບບບໍ່ສາມາດປັບຂະໜາດໄດ້ໃນການໃຊ້ຫຼາຍໜ້າຈໍ"</string>
<string name="hwui_force_dark_title" msgid="4256904905631994219">"ຍົກເລີກການບັງຄັບໃຫ້ໃຊ້ແບບມືດ"</string>
<string name="hwui_force_dark_summary" msgid="6515748781487952769">"ຍົກເລີກຄຸນສົມບັດການບັງຄັບໃຫ້ໃຊ້ແບບມືດຕະຫຼອດ"</string>
<string name="enable_blurs_on_windows_title" msgid="4218144213800778872">"ເປີດໃຊ້ການມົວ"</string>
@@ -5059,8 +5061,8 @@
<string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"ຍົນ, ປອດໄພກັບຍົນ"</string>
<string name="calls_and_sms" msgid="1931855083959003306">"ການໂທ ແລະ SMS"</string>
<string name="calls_and_sms_category" msgid="2021321997884906046">"ການໂທ Wi-Fi"</string>
- <string name="calls_sms_wfc_summary" msgid="4930471357980272294">"ໂທ ແລະ ຮັບສາຍຜ່ານເຄືອຂ່າຍທີ່ບໍ່ແມ່ນຂອງຜູ້ໃຫ້ບໍລິການ ເຊັ່ນ: Wi‑Fi"</string>
- <string name="calls_sms_footnote" msgid="7002461875954024216">"ການໂທ Wi‑Fi ຈະເຮັດໃຫ້ທ່ານສາມາດໂທ ແລະ ຮັບສາຍຜ່ານເຄືອຂ່າຍທີ່ບໍ່ແມ່ນຂອງຜູ້ໃຫ້ບໍລິການໄດ້ ເຊັ່ນ: ເຄືອຂ່າຍ Wi‑Fi ບາງບ່ອນ."</string>
+ <string name="calls_sms_wfc_summary" msgid="3940529919408667336">"ໂທ ແລະ ຮັບສາຍຜ່ານ Wi‑Fi"</string>
+ <string name="calls_sms_footnote" msgid="8051604228144899434">"ດ້ວຍການໂທ Wi‑Fi, ລະບົບຈະໂທອອກ ແລະ ຮັບສາຍຜ່ານເຄືອຂ່າຍ Wi‑Fi ທີ່ບໍ່ແມ່ນຂອງຜູ້ໃຫ້ບໍລິການ."</string>
<string name="calls_preference_title" msgid="7536882032182563800">"ການໂທ"</string>
<string name="sms_preference_title" msgid="8392745501754864395">"SMS"</string>
<string name="calls_sms_preferred" msgid="6016477652522583496">"ຕ້ອງການ"</string>
@@ -5081,6 +5083,8 @@
<string name="fix_connectivity" msgid="2781433603228089501">"ແກ້ໄຂການເຊື່ອມຕໍ່"</string>
<string name="airplane_mode_network_available" msgid="1059499681300395240">"ສາມາດໃຊ້ເຄືອຂ່າຍໂໝດຢູ່ໃນຍົນໄດ້"</string>
<string name="to_switch_networks_disconnect_ethernet" msgid="6615374552827587197">"ເພື່ອສະຫຼັບເຄືອຂ່າຍ, ໃຫ້ຕັດການເຊື່ອມຕໍ່ອີເທີເນັດກ່ອນ"</string>
+ <string name="cannot_switch_networks_while_connected" msgid="3867944849171754777">"ບໍ່ສາມາດສະຫຼັບເຄືອຂ່າຍໄດ້ໃນຂະນະທີ່ເຊື່ອມຕໍ່ແລ້ວ"</string>
+ <string name="airplane_mode_network_panel_title" msgid="6385046104863403604">"ເຄືອຂ່າຍໂໝດຢູ່ໃນຍົນ"</string>
<string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g> / <xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
<string name="mobile_data_connection_active" msgid="2422223108911581552">"ເຊື່ອມຕໍ່ແລ້ວ"</string>
<string name="mobile_data_off_summary" msgid="3841411571485837651">"ຈະບໍ່ເຊື່ອມຕໍ່ອິນເຕີເນັດ"</string>
@@ -5102,4 +5106,16 @@
<string name="category_name_others" msgid="2366006298768550310">"ອື່ນໆ"</string>
<string name="category_name_general" msgid="7737273712848115886">"ທົ່ວໄປ"</string>
<string name="default_see_all_apps_title" msgid="7481113230662612178">"ເບິ່ງແອັບທັງໝົດ"</string>
+ <string name="smart_forwarding_title" msgid="8368634861971949799">"ການໂອນສາຍອັດສະລິຍະ"</string>
+ <string name="smart_forwarding_summary_enabled" msgid="3341062878373185604">"ເປີດການນຳໃຊ້ການໂອນສາຍອັດສະລິຍະແລ້ວ"</string>
+ <string name="smart_forwarding_summary_disabled" msgid="5033880700091914809">"ປິດການນຳໃຊ້ການໂອນສາຍອັດສະລິຍະແລ້ວ"</string>
+ <string name="smart_forwarding_ongoing_title" msgid="962226849074401228">"ການຕັ້ງຄ່າການໂທ"</string>
+ <string name="smart_forwarding_ongoing_text" msgid="2189209372407117114">"ກຳລັງອັບເດດການຕັ້ງຄ່າ..."</string>
+ <string name="smart_forwarding_failed_title" msgid="1859891191023516080">"ການຕັ້ງຄ່າການໂທຜິດພາດ"</string>
+ <string name="smart_forwarding_failed_text" msgid="5370431503707373653">"ເຄືອຂ່າຍ ຫຼື ຊິມກາດຜິດພາດ."</string>
+ <string name="smart_forwarding_failed_not_activated_text" msgid="997396203001257904">"ບໍ່ໄດ້ເປີດນຳໃຊ້ຊິມ."</string>
+ <string name="smart_forwarding_input_mdn_title" msgid="5105463748849841763">"ໃສ່ເບີໂທລະສັບ"</string>
+ <string name="smart_forwarding_input_mdn_dialog_title" msgid="7542216086697868415">"ໃສ່ເບີໂທລະສັບ"</string>
+ <string name="smart_forwarding_missing_mdn_text" msgid="2907314684242542226">"ບໍ່ມີເບີໂທລະສັບ."</string>
+ <string name="smart_forwarding_missing_alert_dialog_text" msgid="7870419247987316112">"ຕົກລົງ"</string>
</resources>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index f3116a1..9cefa36 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -2317,8 +2317,7 @@
<item quantity="many"><xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> išsaugoto klausos aparato</item>
<item quantity="other"><xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> išsaugotų klausos aparatų</item>
</plurals>
- <!-- no translation found for accessibility_audio_adjustment_title (1332113739136802997) -->
- <skip />
+ <string name="accessibility_audio_adjustment_title" msgid="1332113739136802997">"Garso koregavimas"</string>
<string name="accessibility_summary_shortcut_enabled" msgid="4030427268146752644">"Spartusis klavišas įjungtas"</string>
<string name="accessibility_summary_shortcut_disabled" msgid="564005462092499068">"Išjungti"</string>
<string name="accessibility_summary_state_enabled" msgid="1065431632216039369">"Įjungta"</string>
@@ -2499,6 +2498,7 @@
<string name="bluetooth_on_time" msgid="8424625554628450028">"„Wi-Fi“ laiku"</string>
<string name="advanced_battery_title" msgid="3005993394776555079">"Akum. energ. vart."</string>
<string name="history_details_title" msgid="8628584613889559355">"Istorijos informacija"</string>
+ <string name="advanced_battery_preference_title" msgid="6518802648205311326">"Žr. akumuliatoriaus energijos vartojimą"</string>
<string name="battery_details_title" msgid="4531369291819754178">"Akumuliatoriaus energijos vartojimas"</string>
<string name="details_subtitle" msgid="2550872569652785527">"Išsami naudojimo informacija"</string>
<string name="controls_subtitle" msgid="3759606830916441564">"Reguliuoti maitinimo naudojimą"</string>
@@ -4222,6 +4222,7 @@
<string name="usb_use" msgid="6783183432648438528">"USB naudojimas"</string>
<string name="usb_default_label" msgid="3372838450371060750">"Numatytoji USB konfigūracija"</string>
<string name="usb_default_info" msgid="167172599497085266">"Kai prijungiamas kitas įrenginys ir jūsų telefonas yra atrakintas, taikomi šie nustatymai. Prisijunkite tik prie patikimų įrenginių."</string>
+ <string name="usb_power_title" msgid="5602112548385798646">"Maitinimo parinktys"</string>
<string name="usb_pref" msgid="8521832005703261700">"USB"</string>
<string name="usb_preference" msgid="5084550082591493765">"USB nuostatos"</string>
<string name="usb_control_title" msgid="1946791559052157693">"USB valdo"</string>
@@ -5099,8 +5100,8 @@
<string name="mobile_data_ap_mode_disabled" msgid="6067959496888990983">"Nepasiekiama lėktuvo režimu"</string>
<string name="force_desktop_mode" msgid="1336913605091334238">"Priverstinai įjungti darbalaukio režimą"</string>
<string name="force_desktop_mode_summary" msgid="4587416867846930479">"Priverstinai įjungti eksperimentinį darbalaukio režimą antriniuose ekranuose"</string>
- <string name="enable_sizecompat_freeform" msgid="3799755160777404309">"Įgalinti laisvos formos dydžių suderinimą"</string>
- <string name="enable_sizecompat_freeform_summary" msgid="1484050174538201499">"Leidžiama suderinamo dydžio programoms būti laisvos formos"</string>
+ <string name="enable_non_resizable_multi_window" msgid="6832903754625404477">"Įgalinti nekeičiamo dydžio progr. naud. kelių langų funkciją"</string>
+ <string name="enable_non_resizable_multi_window_summary" msgid="3275763753261901999">"Leidžiama naudoti nekeičiamo dydžio programas su kelių langų funkcija"</string>
<string name="hwui_force_dark_title" msgid="4256904905631994219">"Nepaisyti priverst. tamsaus rež. įgalin."</string>
<string name="hwui_force_dark_summary" msgid="6515748781487952769">"Nepaisoma priverstinio tamsaus režimo funkcijos įgalinimo, kad ji visada būtų įjungta"</string>
<string name="enable_blurs_on_windows_title" msgid="4218144213800778872">"Įgalinti suliejimą"</string>
@@ -5226,8 +5227,8 @@
<string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"lėktuvas, saugu naudoti lėktuvuose"</string>
<string name="calls_and_sms" msgid="1931855083959003306">"Skambučiai ir SMS"</string>
<string name="calls_and_sms_category" msgid="2021321997884906046">"„Wi‑Fi“ skambučiai"</string>
- <string name="calls_sms_wfc_summary" msgid="4930471357980272294">"Atlikite ir gaukite skambučius ne operatoriaus tinklais, pvz., „Wi‑Fi“"</string>
- <string name="calls_sms_footnote" msgid="7002461875954024216">"Naudodami „Wi-Fi“ skambinimą galite atlikti ir gauti skambučius ne operatoriaus tinklais, pvz., kai kuriais „Wi‑Fi“ tinklais."</string>
+ <string name="calls_sms_wfc_summary" msgid="3940529919408667336">"Atlikite ir gaukite skambučius naudodami „Wi‑Fi“"</string>
+ <string name="calls_sms_footnote" msgid="8051604228144899434">"Naudojant „Wi‑Fi“ skambinimą, skambučiai atliekami ir gaunami naudojant ne operatoriaus „Wi‑Fi“ tinklus."</string>
<string name="calls_preference_title" msgid="7536882032182563800">"Skambučiai"</string>
<string name="sms_preference_title" msgid="8392745501754864395">"SMS"</string>
<string name="calls_sms_preferred" msgid="6016477652522583496">"pageidaujama"</string>
@@ -5246,10 +5247,10 @@
<string name="reset_internet_text" product="tablet" msgid="8797910368942544453">"Tai atlikus bus nutrauktas telefono skambutis"</string>
<string name="resetting_internet_text" msgid="6696779371800051806">"Internetas nustatomas iš naujo…"</string>
<string name="fix_connectivity" msgid="2781433603228089501">"Tvarkyti ryšį"</string>
- <!-- no translation found for airplane_mode_network_available (1059499681300395240) -->
- <skip />
- <!-- no translation found for to_switch_networks_disconnect_ethernet (6615374552827587197) -->
- <skip />
+ <string name="airplane_mode_network_available" msgid="1059499681300395240">"Pasiekiami lėktuvo režimo tinklai"</string>
+ <string name="to_switch_networks_disconnect_ethernet" msgid="6615374552827587197">"Norėdami perjungti tinklus, atjunkite eternetą"</string>
+ <string name="cannot_switch_networks_while_connected" msgid="3867944849171754777">"Negalima perjungti tinklų prisijungus"</string>
+ <string name="airplane_mode_network_panel_title" msgid="6385046104863403604">"Lėktuvo režimo tinklai"</string>
<string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g> / <xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
<string name="mobile_data_connection_active" msgid="2422223108911581552">"Prisijungta"</string>
<string name="mobile_data_off_summary" msgid="3841411571485837651">"Prie interneto nebus jungiamasi automatiškai"</string>
@@ -5271,4 +5272,16 @@
<string name="category_name_others" msgid="2366006298768550310">"Kita"</string>
<string name="category_name_general" msgid="7737273712848115886">"Bendrieji"</string>
<string name="default_see_all_apps_title" msgid="7481113230662612178">"Žr. visas programas"</string>
+ <string name="smart_forwarding_title" msgid="8368634861971949799">"Išmanusis peradresavimas"</string>
+ <string name="smart_forwarding_summary_enabled" msgid="3341062878373185604">"Išmanusis peradresavimas įgalintas"</string>
+ <string name="smart_forwarding_summary_disabled" msgid="5033880700091914809">"Išmanusis peradresavimas išjungtas"</string>
+ <string name="smart_forwarding_ongoing_title" msgid="962226849074401228">"Skambučių nustatymai"</string>
+ <string name="smart_forwarding_ongoing_text" msgid="2189209372407117114">"Atnaujinami nustatymai..."</string>
+ <string name="smart_forwarding_failed_title" msgid="1859891191023516080">"Skambinimo nustatymų klaida"</string>
+ <string name="smart_forwarding_failed_text" msgid="5370431503707373653">"Tinklo ar SIM kortelės klaida."</string>
+ <string name="smart_forwarding_failed_not_activated_text" msgid="997396203001257904">"SIM kortelė nesuaktyvinta."</string>
+ <string name="smart_forwarding_input_mdn_title" msgid="5105463748849841763">"Įveskite telefono numerius"</string>
+ <string name="smart_forwarding_input_mdn_dialog_title" msgid="7542216086697868415">"Įveskite telefono numerį"</string>
+ <string name="smart_forwarding_missing_mdn_text" msgid="2907314684242542226">"Nėra telefono numerio."</string>
+ <string name="smart_forwarding_missing_alert_dialog_text" msgid="7870419247987316112">"Gerai"</string>
</resources>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index c98389d..5a4d4ce 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -2292,8 +2292,7 @@
<item quantity="one">Saglabāts <xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> dzirdes aparāts</item>
<item quantity="other">Saglabāti <xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> dzirdes aparāti</item>
</plurals>
- <!-- no translation found for accessibility_audio_adjustment_title (1332113739136802997) -->
- <skip />
+ <string name="accessibility_audio_adjustment_title" msgid="1332113739136802997">"Audio korekcija"</string>
<string name="accessibility_summary_shortcut_enabled" msgid="4030427268146752644">"Saīsne ieslēgta"</string>
<string name="accessibility_summary_shortcut_disabled" msgid="564005462092499068">"Izslēgta"</string>
<string name="accessibility_summary_state_enabled" msgid="1065431632216039369">"Ieslēgts"</string>
@@ -2468,6 +2467,7 @@
<string name="bluetooth_on_time" msgid="8424625554628450028">"Wi-Fi uz laiku"</string>
<string name="advanced_battery_title" msgid="3005993394776555079">"Akumulatora lietojums"</string>
<string name="history_details_title" msgid="8628584613889559355">"Vēstures dati"</string>
+ <string name="advanced_battery_preference_title" msgid="6518802648205311326">"Skatīt akumulatora lietojumu"</string>
<string name="battery_details_title" msgid="4531369291819754178">"Akumulatora lietojums"</string>
<string name="details_subtitle" msgid="2550872569652785527">"Izmantot detaļas"</string>
<string name="controls_subtitle" msgid="3759606830916441564">"Noregulēt strāvas patēriņu"</string>
@@ -4160,6 +4160,7 @@
<string name="usb_use" msgid="6783183432648438528">"USB savienojuma lietošana"</string>
<string name="usb_default_label" msgid="3372838450371060750">"Noklusējuma USB konfigurācija"</string>
<string name="usb_default_info" msgid="167172599497085266">"Šie iestatījumi tiks piemēroti, kad būs pievienota cita ierīce un jūsu tālrunis būs atbloķēts. Izveidojiet savienojumu tikai ar uzticamām ierīcēm."</string>
+ <string name="usb_power_title" msgid="5602112548385798646">"Barošanas iespējas"</string>
<string name="usb_pref" msgid="8521832005703261700">"USB"</string>
<string name="usb_preference" msgid="5084550082591493765">"USB preferences"</string>
<string name="usb_control_title" msgid="1946791559052157693">"USB, ko pārvalda:"</string>
@@ -5018,8 +5019,8 @@
<string name="mobile_data_ap_mode_disabled" msgid="6067959496888990983">"Nav pieejami lidojuma režīmā"</string>
<string name="force_desktop_mode" msgid="1336913605091334238">"Veikt piespiedu darbvirsmas režīma atvēršanu"</string>
<string name="force_desktop_mode_summary" msgid="4587416867846930479">"Veikt piespiedu eksperimentālā darbvirsmas režīma atvēršanu sekundārajos displejos"</string>
- <string name="enable_sizecompat_freeform" msgid="3799755160777404309">"Iespējot brīvu formu fiksētiem izmēriem"</string>
- <string name="enable_sizecompat_freeform_summary" msgid="1484050174538201499">"Ļauj fiksētu izmēru lietotnēm būt brīvā formā"</string>
+ <string name="enable_non_resizable_multi_window" msgid="6832903754625404477">"Vairāku logu režīmā iespējot nemainīga lieluma lietotnes"</string>
+ <string name="enable_non_resizable_multi_window_summary" msgid="3275763753261901999">"Šis iestatījums ļauj vairāku logu režīmā rādīt lietotnes, kuru lielums nav maināms"</string>
<string name="hwui_force_dark_title" msgid="4256904905631994219">"Tumšā režīma piespiedu ieslēgšanas ignorēšana"</string>
<string name="hwui_force_dark_summary" msgid="6515748781487952769">"Ignorē tumšā režīma iestatījumu Vienmēr ieslēgts"</string>
<string name="enable_blurs_on_windows_title" msgid="4218144213800778872">"Iespējot aizmiglošanu"</string>
@@ -5143,8 +5144,8 @@
<string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"lidojuma režīms, var izmantot lidojuma režīmu"</string>
<string name="calls_and_sms" msgid="1931855083959003306">"Zvani un īsziņas"</string>
<string name="calls_and_sms_category" msgid="2021321997884906046">"Wi‑Fi zvani"</string>
- <string name="calls_sms_wfc_summary" msgid="4930471357980272294">"Veiciet un saņemiet zvanus tīklos, ko nenodrošina mobilo sakaru operatori, piemēram, Wi-Fi tīklos."</string>
- <string name="calls_sms_footnote" msgid="7002461875954024216">"Izmantojot Wi-Fi zvanus, varat veikt un saņemt zvanus tīklos, ko nenodrošina mobilo sakaru operatori, piemēram, dažos Wi-Fi tīklos."</string>
+ <string name="calls_sms_wfc_summary" msgid="3940529919408667336">"Zvanu veikšana un saņemšana Wi-Fi tīklā"</string>
+ <string name="calls_sms_footnote" msgid="8051604228144899434">"Wi-Fi zvani tiek veikti un saņemti Wi-Fi tīklos, ko nenodrošina mobilo sakaru operatori."</string>
<string name="calls_preference_title" msgid="7536882032182563800">"Zvani"</string>
<string name="sms_preference_title" msgid="8392745501754864395">"Īsziņas"</string>
<string name="calls_sms_preferred" msgid="6016477652522583496">"vēlamie"</string>
@@ -5163,10 +5164,10 @@
<string name="reset_internet_text" product="tablet" msgid="8797910368942544453">"Tiks pārtraukts jūsu tālruņa zvans."</string>
<string name="resetting_internet_text" msgid="6696779371800051806">"Notiek interneta atiestatīšana…"</string>
<string name="fix_connectivity" msgid="2781433603228089501">"Novērst problēmu ar savienojamību"</string>
- <!-- no translation found for airplane_mode_network_available (1059499681300395240) -->
- <skip />
- <!-- no translation found for to_switch_networks_disconnect_ethernet (6615374552827587197) -->
- <skip />
+ <string name="airplane_mode_network_available" msgid="1059499681300395240">"Lidojuma režīmā pieejamie tīkli"</string>
+ <string name="to_switch_networks_disconnect_ethernet" msgid="6615374552827587197">"Lai pārslēgtu tīklus, atvienojiet tīkla Ethernet vadu."</string>
+ <string name="cannot_switch_networks_while_connected" msgid="3867944849171754777">"Nevar mainīt tīklu, kamēr savienojums ir aktīvs"</string>
+ <string name="airplane_mode_network_panel_title" msgid="6385046104863403604">"Lidojuma režīmā pieejamie tīkli"</string>
<string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g>/<xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
<string name="mobile_data_connection_active" msgid="2422223108911581552">"Ir izveidots savienojums"</string>
<string name="mobile_data_off_summary" msgid="3841411571485837651">"Interneta savienojums netiks izveidots automātiski"</string>
@@ -5188,4 +5189,16 @@
<string name="category_name_others" msgid="2366006298768550310">"Citi"</string>
<string name="category_name_general" msgid="7737273712848115886">"Vispārīgi"</string>
<string name="default_see_all_apps_title" msgid="7481113230662612178">"Skatīt visas lietotnes"</string>
+ <string name="smart_forwarding_title" msgid="8368634861971949799">"Viedā pāradresācija"</string>
+ <string name="smart_forwarding_summary_enabled" msgid="3341062878373185604">"Viedā pāradresācija ir iespējota"</string>
+ <string name="smart_forwarding_summary_disabled" msgid="5033880700091914809">"Viedā pāradresācija ir atspējota"</string>
+ <string name="smart_forwarding_ongoing_title" msgid="962226849074401228">"Zvanu iestatījumi"</string>
+ <string name="smart_forwarding_ongoing_text" msgid="2189209372407117114">"Notiek iestatījumu atjaunināšana…"</string>
+ <string name="smart_forwarding_failed_title" msgid="1859891191023516080">"Zvanu iestatījumu kļūda"</string>
+ <string name="smart_forwarding_failed_text" msgid="5370431503707373653">"Tīkla vai SIM kartes kļūda."</string>
+ <string name="smart_forwarding_failed_not_activated_text" msgid="997396203001257904">"SIM karte nav aktivizēta."</string>
+ <string name="smart_forwarding_input_mdn_title" msgid="5105463748849841763">"Ievadiet tālruņa numurus"</string>
+ <string name="smart_forwarding_input_mdn_dialog_title" msgid="7542216086697868415">"Ievadiet tālruņa numuru"</string>
+ <string name="smart_forwarding_missing_mdn_text" msgid="2907314684242542226">"Nav norādīts tālruņa numurs."</string>
+ <string name="smart_forwarding_missing_alert_dialog_text" msgid="7870419247987316112">"Labi"</string>
</resources>
diff --git a/res/values-mk/strings.xml b/res/values-mk/strings.xml
index 27ffc3e..aa86ee7 100644
--- a/res/values-mk/strings.xml
+++ b/res/values-mk/strings.xml
@@ -2436,6 +2436,7 @@
<string name="bluetooth_on_time" msgid="8424625554628450028">"Wi-Fi на време"</string>
<string name="advanced_battery_title" msgid="3005993394776555079">"Искористеност на батеријата"</string>
<string name="history_details_title" msgid="8628584613889559355">"Детали на историја"</string>
+ <string name="advanced_battery_preference_title" msgid="6518802648205311326">"Прикажи користење на батеријата"</string>
<string name="battery_details_title" msgid="4531369291819754178">"Искористеност на батеријата"</string>
<string name="details_subtitle" msgid="2550872569652785527">"Користи детали"</string>
<string name="controls_subtitle" msgid="3759606830916441564">"Приспособи употреба на струја"</string>
@@ -4097,6 +4098,7 @@
<string name="usb_use" msgid="6783183432648438528">"Користи USB за"</string>
<string name="usb_default_label" msgid="3372838450371060750">"Стандардна конфигурација за USB"</string>
<string name="usb_default_info" msgid="167172599497085266">"Поставкиве ќе се применуваат кога друг уред е поврзан, а телефонот е отклучен. Поврзувајте се само со доверливи уреди."</string>
+ <string name="usb_power_title" msgid="5602112548385798646">"Опции за напојување"</string>
<string name="usb_pref" msgid="8521832005703261700">"USB"</string>
<string name="usb_preference" msgid="5084550082591493765">"Поставки за USB"</string>
<string name="usb_control_title" msgid="1946791559052157693">"USB контролирано од"</string>
@@ -4936,8 +4938,8 @@
<string name="mobile_data_ap_mode_disabled" msgid="6067959496888990983">"Недостапен во авионски режим"</string>
<string name="force_desktop_mode" msgid="1336913605091334238">"Наметни режим на работна површина"</string>
<string name="force_desktop_mode_summary" msgid="4587416867846930479">"Наметнете го експерименталниот режим на работна површина на секундарните екрани"</string>
- <string name="enable_sizecompat_freeform" msgid="3799755160777404309">"Овозможете компатибилна големина во слободна форма"</string>
- <string name="enable_sizecompat_freeform_summary" msgid="1484050174538201499">"Дозволете апликациите со компатибилна големина да бидат во слободна форма"</string>
+ <string name="enable_non_resizable_multi_window" msgid="6832903754625404477">"Овозможи фиксна големина во повеќе прозорци"</string>
+ <string name="enable_non_resizable_multi_window_summary" msgid="3275763753261901999">"Овозможува апликации со фиксна големина да бидат во повеќе прозорци"</string>
<string name="hwui_force_dark_title" msgid="4256904905631994219">"Отфрли го наметнувањето темен режим"</string>
<string name="hwui_force_dark_summary" msgid="6515748781487952769">"Ја отфрла функцијата за наметнување темен режим за да биде постојано вклучена"</string>
<string name="enable_blurs_on_windows_title" msgid="4218144213800778872">"Овозможи замаглување"</string>
@@ -5059,8 +5061,8 @@
<string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"авион, безбедно за во авион"</string>
<string name="calls_and_sms" msgid="1931855083959003306">"Повици & SMS-пораки"</string>
<string name="calls_and_sms_category" msgid="2021321997884906046">"Повици преку Wi-Fi"</string>
- <string name="calls_sms_wfc_summary" msgid="4930471357980272294">"Упатувајте и примајте повици преку мрежи што не се на операторот, на пр., Wi‑Fi"</string>
- <string name="calls_sms_footnote" msgid="7002461875954024216">"Функцијата „Повици преку Wi-Fi“ ви овозможува да упатувате и примате повици преку мрежи што не се на операторот, на пр., некои Wi‑Fi мрежи."</string>
+ <string name="calls_sms_wfc_summary" msgid="3940529919408667336">"Упатувајте и примајте повици преку Wi‑Fi"</string>
+ <string name="calls_sms_footnote" msgid="8051604228144899434">"Со „Повици преку Wi-Fi“, повиците се упатуваат и примаат преку Wi‑Fi мрежи што не се на операторот."</string>
<string name="calls_preference_title" msgid="7536882032182563800">"Повици"</string>
<string name="sms_preference_title" msgid="8392745501754864395">"SMS"</string>
<string name="calls_sms_preferred" msgid="6016477652522583496">"претпочитано"</string>
@@ -5079,10 +5081,10 @@
<string name="reset_internet_text" product="tablet" msgid="8797910368942544453">"Ова ќе го заврши телефонскиот повик"</string>
<string name="resetting_internet_text" msgid="6696779371800051806">"Се ресетира интернетот…"</string>
<string name="fix_connectivity" msgid="2781433603228089501">"Поправи ја поврзливоста"</string>
- <!-- no translation found for airplane_mode_network_available (1059499681300395240) -->
- <skip />
- <!-- no translation found for to_switch_networks_disconnect_ethernet (6615374552827587197) -->
- <skip />
+ <string name="airplane_mode_network_available" msgid="1059499681300395240">"Достапни се мрежи во авионски режим"</string>
+ <string name="to_switch_networks_disconnect_ethernet" msgid="6615374552827587197">"За промена на мрежата, прекинете ја врската со етернетот"</string>
+ <string name="cannot_switch_networks_while_connected" msgid="3867944849171754777">"Не може да се промени мрежата додека е поврзано"</string>
+ <string name="airplane_mode_network_panel_title" msgid="6385046104863403604">"Мрежи за користење во авионски режим"</string>
<string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g>/<xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
<string name="mobile_data_connection_active" msgid="2422223108911581552">"Поврзано"</string>
<string name="mobile_data_off_summary" msgid="3841411571485837651">"Не може автоматски да се поврзе на интернет"</string>
@@ -5104,4 +5106,16 @@
<string name="category_name_others" msgid="2366006298768550310">"Други"</string>
<string name="category_name_general" msgid="7737273712848115886">"Општо"</string>
<string name="default_see_all_apps_title" msgid="7481113230662612178">"Покажи ги сите апликации"</string>
+ <string name="smart_forwarding_title" msgid="8368634861971949799">"Паметно проследување"</string>
+ <string name="smart_forwarding_summary_enabled" msgid="3341062878373185604">"Паметното проследување е овозможено"</string>
+ <string name="smart_forwarding_summary_disabled" msgid="5033880700091914809">"Паметното проследување е оневозможено"</string>
+ <string name="smart_forwarding_ongoing_title" msgid="962226849074401228">"Поставки за повици"</string>
+ <string name="smart_forwarding_ongoing_text" msgid="2189209372407117114">"Се ажурираат поставките…"</string>
+ <string name="smart_forwarding_failed_title" msgid="1859891191023516080">"Грешка со поставки за повици"</string>
+ <string name="smart_forwarding_failed_text" msgid="5370431503707373653">"Грешка со мрежа или SIM-картичка."</string>
+ <string name="smart_forwarding_failed_not_activated_text" msgid="997396203001257904">"SIM-картичката не е активирана."</string>
+ <string name="smart_forwarding_input_mdn_title" msgid="5105463748849841763">"Внесете телефонски броеви"</string>
+ <string name="smart_forwarding_input_mdn_dialog_title" msgid="7542216086697868415">"Внесете телефонски број"</string>
+ <string name="smart_forwarding_missing_mdn_text" msgid="2907314684242542226">"Телефонскиот број недостасува."</string>
+ <string name="smart_forwarding_missing_alert_dialog_text" msgid="7870419247987316112">"Во ред"</string>
</resources>
diff --git a/res/values-ml/strings.xml b/res/values-ml/strings.xml
index b4a494f..91196d8 100644
--- a/res/values-ml/strings.xml
+++ b/res/values-ml/strings.xml
@@ -2267,8 +2267,7 @@
<item quantity="other"><xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> ശ്രവണ സഹായികൾ സംരക്ഷിച്ചു</item>
<item quantity="one"><xliff:g id="NUMBER_DEVICE_COUNT_0">%1$d</xliff:g> ശ്രവണ സഹായി സംരക്ഷിച്ചു</item>
</plurals>
- <!-- no translation found for accessibility_audio_adjustment_title (1332113739136802997) -->
- <skip />
+ <string name="accessibility_audio_adjustment_title" msgid="1332113739136802997">"ഓഡിയോ ക്രമീകരണം"</string>
<string name="accessibility_summary_shortcut_enabled" msgid="4030427268146752644">"കുറുക്കുവഴി ഓണാണ്"</string>
<string name="accessibility_summary_shortcut_disabled" msgid="564005462092499068">"ഓഫാണ്"</string>
<string name="accessibility_summary_state_enabled" msgid="1065431632216039369">"ഓണാണ്"</string>
@@ -2437,6 +2436,7 @@
<string name="bluetooth_on_time" msgid="8424625554628450028">"വൈഫൈ ഓൺ ടൈം"</string>
<string name="advanced_battery_title" msgid="3005993394776555079">"ബാറ്ററി ഉപയോഗം"</string>
<string name="history_details_title" msgid="8628584613889559355">"ചരിത്ര വിശദാംശം"</string>
+ <string name="advanced_battery_preference_title" msgid="6518802648205311326">"ബാറ്ററി ഉപയോഗം കാണുക"</string>
<string name="battery_details_title" msgid="4531369291819754178">"ബാറ്ററി ഉപയോഗം"</string>
<string name="details_subtitle" msgid="2550872569652785527">"വിശദാംശം ഉപയോഗിക്കൂ"</string>
<string name="controls_subtitle" msgid="3759606830916441564">"പവർ ഉപയോഗം ക്രമീകരിക്കുക"</string>
@@ -4098,6 +4098,7 @@
<string name="usb_use" msgid="6783183432648438528">"ഇതിനായി USB ഉപയോഗിക്കുക"</string>
<string name="usb_default_label" msgid="3372838450371060750">"ഡിഫോൾട്ട് USB കോൺഫിഗറേഷൻ"</string>
<string name="usb_default_info" msgid="167172599497085266">"മറ്റൊരു ഉപകരണം കണക്റ്റ് ചെയ്തിരിക്കുകയും നിങ്ങളുടെ ഫോൺ അൺലോക്ക് ആവുകയും ചെയ്യുമ്പോൾ, ഈ ക്രമീകരണം ബാധകമാക്കപ്പെടും. വിശ്വസനീയ ഉപകരണങ്ങളിലേക്ക് മാത്രം കണക്റ്റ് ചെയ്യുക."</string>
+ <string name="usb_power_title" msgid="5602112548385798646">"പവർ ഓപ്ഷനുകൾ"</string>
<string name="usb_pref" msgid="8521832005703261700">"USB"</string>
<string name="usb_preference" msgid="5084550082591493765">"USB മുൻഗണനകൾ"</string>
<string name="usb_control_title" msgid="1946791559052157693">"USB നിയന്ത്രിക്കുന്നത്"</string>
@@ -4937,8 +4938,8 @@
<string name="mobile_data_ap_mode_disabled" msgid="6067959496888990983">"ഫ്ലൈറ്റ് മോഡിൽ ലഭ്യമല്ല"</string>
<string name="force_desktop_mode" msgid="1336913605091334238">"ഡെസ്ക്ടോപ്പ് മോഡിലേക്ക് നിർബന്ധിച്ച് വരുത്തുക"</string>
<string name="force_desktop_mode_summary" msgid="4587416867846930479">"ദ്വിതീയ ഡിസ്പ്ലേകളിൽ, പരീക്ഷണാത്മക ഡെസ്ക്ടോപ്പ് മോഡിലേക്ക് നിർബന്ധിച്ച് വരുത്തുക"</string>
- <string name="enable_sizecompat_freeform" msgid="3799755160777404309">"ഫ്രീഫോം സൈസ് കോമ്പാറ്റ് പ്രവർത്തനക്ഷമമാക്കുക"</string>
- <string name="enable_sizecompat_freeform_summary" msgid="1484050174538201499">"വലുപ്പം മാറ്റാൻ കഴിയാത്ത ആപ്പുകൾ ഫ്രീഫോമിൽ ആവാൻ അനുവദിക്കുക"</string>
+ <string name="enable_non_resizable_multi_window" msgid="6832903754625404477">"വലുപ്പം മാറ്റാനാകാത്തവ മൾട്ടി വിൻഡോയിൽ പ്രവർത്തനക്ഷമമാക്കൂ"</string>
+ <string name="enable_non_resizable_multi_window_summary" msgid="3275763753261901999">"വലുപ്പം മാറ്റാൻ കഴിയാത്ത ആപ്പുകൾ മൾട്ടി വിൻഡോയിൽ അനുവദിക്കുന്നു"</string>
<string name="hwui_force_dark_title" msgid="4256904905631994219">"നിർബന്ധിത ഇരുണ്ട മോഡ് അസാധുവാക്കുക"</string>
<string name="hwui_force_dark_summary" msgid="6515748781487952769">"എപ്പോഴും ഓണാക്കിയിരിക്കുന്ന നിർബന്ധിത ഇരുണ്ട മോഡ് ഫീച്ചർ അസാധുവാക്കുക"</string>
<string name="enable_blurs_on_windows_title" msgid="4218144213800778872">"മങ്ങിക്കൽ പ്രവർത്തനക്ഷമമാക്കുക"</string>
@@ -5060,8 +5061,8 @@
<string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"വിമാനം, വിമാന-സുരക്ഷിതം"</string>
<string name="calls_and_sms" msgid="1931855083959003306">"കോളുകളും & SMS-കളും"</string>
<string name="calls_and_sms_category" msgid="2021321997884906046">"വൈഫൈ കോളിംഗ്"</string>
- <string name="calls_sms_wfc_summary" msgid="4930471357980272294">"വൈഫൈ പോലുള്ള കാരിയർ ഇതര നെറ്റ്വർക്കുകളിലൂടെ കോളുകൾ ചെയ്യുക, സ്വീകരിക്കുക"</string>
- <string name="calls_sms_footnote" msgid="7002461875954024216">"ചില വൈ-ഫൈ നെറ്റ്വർക്കുകൾ പോലുള്ള കാരിയർ ഇതര നെറ്റ്വർക്കുകളിലൂടെ കോളുകൾ വിളിക്കാനും സ്വീകരിക്കാനും വൈഫൈ കോളിംഗ് നിങ്ങളെ അനുവദിക്കുന്നു."</string>
+ <string name="calls_sms_wfc_summary" msgid="3940529919408667336">"വൈഫൈയിലൂടെ കോളുകൾ വിളിക്കുകയും സ്വീകരിക്കുകയും ചെയ്യുക"</string>
+ <string name="calls_sms_footnote" msgid="8051604228144899434">"വൈഫൈ കോളിംഗ് ഉപയോഗിച്ച് കാരിയർ ഇതര വൈഫൈ നെറ്റ്വർക്കുകളിലൂടെ കോളുകൾ വിളിക്കുകയും സ്വീകരിക്കുകയും ചെയ്യുന്നു."</string>
<string name="calls_preference_title" msgid="7536882032182563800">"കോളുകൾ"</string>
<string name="sms_preference_title" msgid="8392745501754864395">"SMS"</string>
<string name="calls_sms_preferred" msgid="6016477652522583496">"തിരഞ്ഞെടുത്തത്"</string>
@@ -5080,9 +5081,10 @@
<string name="reset_internet_text" product="tablet" msgid="8797910368942544453">"ഇത് നിങ്ങളുടെ ഫോൺ കോൾ അവസാനിപ്പിക്കും"</string>
<string name="resetting_internet_text" msgid="6696779371800051806">"നിങ്ങളുടെ ഇന്റർനെറ്റ് റീസെറ്റ് ചെയ്യുന്നു…"</string>
<string name="fix_connectivity" msgid="2781433603228089501">"കണക്റ്റിവിറ്റി ശരിയാക്കുക"</string>
- <!-- no translation found for airplane_mode_network_available (1059499681300395240) -->
- <skip />
- <!-- no translation found for to_switch_networks_disconnect_ethernet (6615374552827587197) -->
+ <string name="airplane_mode_network_available" msgid="1059499681300395240">"ഫ്ലൈറ്റ് മോഡ് നെറ്റ്വർക്കുകൾ ലഭ്യമാണ്"</string>
+ <string name="to_switch_networks_disconnect_ethernet" msgid="6615374552827587197">"മറ്റ് നെറ്റ്വർക്കുകളിലേക്ക് മാറാൻ, ഇതർനെറ്റ് വിച്ഛേദിക്കുക"</string>
+ <string name="cannot_switch_networks_while_connected" msgid="3867944849171754777">"കണക്റ്റ് ചെയ്തിരിക്കുമ്പോൾ നെറ്റ്വർക്കുകൾ പരസ്പരം മാറാനാകില്ല"</string>
+ <!-- no translation found for airplane_mode_network_panel_title (6385046104863403604) -->
<skip />
<string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g> / <xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
<string name="mobile_data_connection_active" msgid="2422223108911581552">"കണക്റ്റ് ചെയ്തു"</string>
@@ -5105,4 +5107,16 @@
<string name="category_name_others" msgid="2366006298768550310">"മറ്റുള്ളവ"</string>
<string name="category_name_general" msgid="7737273712848115886">"പൊതുവായവ"</string>
<string name="default_see_all_apps_title" msgid="7481113230662612178">"എല്ലാ ആപ്പുകളും കാണുക"</string>
+ <string name="smart_forwarding_title" msgid="8368634861971949799">"സ്മാർട്ട് കൈമാറൽ"</string>
+ <string name="smart_forwarding_summary_enabled" msgid="3341062878373185604">"സ്മാർട്ട് കൈമാറൽ പ്രവർത്തനക്ഷമമാക്കി"</string>
+ <string name="smart_forwarding_summary_disabled" msgid="5033880700091914809">"സ്മാർട്ട് കൈമാറൽ പ്രവർത്തനരഹിതമാക്കി"</string>
+ <string name="smart_forwarding_ongoing_title" msgid="962226849074401228">"കോൾ ക്രമീകരണം"</string>
+ <string name="smart_forwarding_ongoing_text" msgid="2189209372407117114">"ക്രമീകരണം അപ്ഡേറ്റ് ചെയ്യുന്നു..."</string>
+ <string name="smart_forwarding_failed_title" msgid="1859891191023516080">"കോൾ ക്രമീകരണ പിശക്"</string>
+ <string name="smart_forwarding_failed_text" msgid="5370431503707373653">"നെറ്റ്വർക്ക് അല്ലെങ്കിൽ സിം കാർഡ് പിശക്."</string>
+ <string name="smart_forwarding_failed_not_activated_text" msgid="997396203001257904">"സിം സജീവമാക്കിയിട്ടില്ല."</string>
+ <string name="smart_forwarding_input_mdn_title" msgid="5105463748849841763">"ഫോൺ നമ്പറുകൾ നൽകുക"</string>
+ <string name="smart_forwarding_input_mdn_dialog_title" msgid="7542216086697868415">"ഫോൺ നമ്പർ നൽകുക"</string>
+ <string name="smart_forwarding_missing_mdn_text" msgid="2907314684242542226">"ഫോൺ നമ്പർ കാണുന്നില്ല."</string>
+ <string name="smart_forwarding_missing_alert_dialog_text" msgid="7870419247987316112">"ശരി"</string>
</resources>
diff --git a/res/values-mn/strings.xml b/res/values-mn/strings.xml
index 7ec1859..d2e18bd 100644
--- a/res/values-mn/strings.xml
+++ b/res/values-mn/strings.xml
@@ -2267,8 +2267,7 @@
<item quantity="other">Хадгалсан <xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> сонсголын төхөөрөмжүүд</item>
<item quantity="one">Хадгалсан <xliff:g id="NUMBER_DEVICE_COUNT_0">%1$d</xliff:g> сонсголын төхөөрөмж</item>
</plurals>
- <!-- no translation found for accessibility_audio_adjustment_title (1332113739136802997) -->
- <skip />
+ <string name="accessibility_audio_adjustment_title" msgid="1332113739136802997">"Аудио тохируулга"</string>
<string name="accessibility_summary_shortcut_enabled" msgid="4030427268146752644">"Товчлолыг асаасан"</string>
<string name="accessibility_summary_shortcut_disabled" msgid="564005462092499068">"Унтраах"</string>
<string name="accessibility_summary_state_enabled" msgid="1065431632216039369">"Асаалттай"</string>
@@ -2437,6 +2436,7 @@
<string name="bluetooth_on_time" msgid="8424625554628450028">"Wi-Fi цагтаа"</string>
<string name="advanced_battery_title" msgid="3005993394776555079">"Батарей ашиглалт"</string>
<string name="history_details_title" msgid="8628584613889559355">"Түүхийн мэдээлэл"</string>
+ <string name="advanced_battery_preference_title" msgid="6518802648205311326">"Батарей ашиглалтыг харах"</string>
<string name="battery_details_title" msgid="4531369291819754178">"Батарей ашиглалт"</string>
<string name="details_subtitle" msgid="2550872569652785527">"Ашиглалтын мэдээлэл"</string>
<string name="controls_subtitle" msgid="3759606830916441564">"Цэнэг ашиглалтыг тохируулах"</string>
@@ -3257,7 +3257,7 @@
<string name="keywords_time_zone" msgid="6402919157244589055">"цагийн бүс"</string>
<string name="keywords_draw_overlay" msgid="3170036145197260392">"Чатны толгой, систем, сэрэмжлүүлэг, цонх, харилцах цонх, дэлгэц, бусад хэрэглээний программ дээр, нээх"</string>
<string name="keywords_flashlight" msgid="2133079265697578183">"Гэрэлтүүлэгч, Гэрэл, Гар чийдэн"</string>
- <string name="keywords_change_wifi_state" msgid="7573039644328488165">"wifi, wi-fi, унтраах/асаах, хяналт"</string>
+ <string name="keywords_change_wifi_state" msgid="7573039644328488165">"wifi, wi-fi, асаах/унтраах, хяналт"</string>
<string name="keywords_more_mobile_networks" msgid="5041272719326831744">"үүрэн холбоо, үүрэн холбооны оператор, утасгүй интернэт, дата, 4g, 3g, 2g, lte"</string>
<string name="keywords_wifi_calling" msgid="4319184318421027136">"wifi, wi-fi, залгах, дуудлага"</string>
<string name="keywords_display" msgid="874738809280751745">"дэлгэц, мэдрэгчтэй дэлгэц"</string>
@@ -4098,6 +4098,7 @@
<string name="usb_use" msgid="6783183432648438528">"USB-г ашиглах"</string>
<string name="usb_default_label" msgid="3372838450371060750">"Өгөгдмөл USB тохируулга"</string>
<string name="usb_default_info" msgid="167172599497085266">"Эдгээр тохиргоо нь нөгөө төхөөрөмжийг холбосон бөгөөд таны утасны түгжээг тайлсан үед хэрэгжинэ. Зөвхөн итгэмжлэгдсэн төхөөрөмжид холбогдоно уу."</string>
+ <string name="usb_power_title" msgid="5602112548385798646">"Асаах/унтраах сонголт"</string>
<string name="usb_pref" msgid="8521832005703261700">"USB"</string>
<string name="usb_preference" msgid="5084550082591493765">"USB сонголт"</string>
<string name="usb_control_title" msgid="1946791559052157693">"USB-г дараахаар хянасан"</string>
@@ -4937,8 +4938,8 @@
<string name="mobile_data_ap_mode_disabled" msgid="6067959496888990983">"Нислэгийн горимд боломжгүй"</string>
<string name="force_desktop_mode" msgid="1336913605091334238">"Дэлгэцийн горимыг хүчлэх"</string>
<string name="force_desktop_mode_summary" msgid="4587416867846930479">"Дэлгэцийн туршилтын горимыг хоёрдогч дэлгэцэд хүчлэх"</string>
- <string name="enable_sizecompat_freeform" msgid="3799755160777404309">"Хэмжээ нь өөрчлөгддөггүй чөлөөт цонхыг идэвхжүүлэх"</string>
- <string name="enable_sizecompat_freeform_summary" msgid="1484050174538201499">"Хэмжээ нь өөрчлөгддөггүй аппад чөлөөтэй шилждэг цонхны хэлбэрт байхыг зөвшөөрөх"</string>
+ <string name="enable_non_resizable_multi_window" msgid="6832903754625404477">"Хэмжээг өөрчлөх боломжгүй аппуудыг олон цонхонд идэвхжүүлэх"</string>
+ <string name="enable_non_resizable_multi_window_summary" msgid="3275763753261901999">"Хэмжээг нь өөрчлөх боломжгүй аппуудыг олон цонхонд байхыг нь зөвшөөрнө"</string>
<string name="hwui_force_dark_title" msgid="4256904905631994219">"Хүчээр бүдгэрүүлэхийг дарах"</string>
<string name="hwui_force_dark_summary" msgid="6515748781487952769">"Хүчээр бүдэгрүүлэх онцлогийг байнга асаалттай байхаар дардаг"</string>
<string name="enable_blurs_on_windows_title" msgid="4218144213800778872">"Бүдгэрүүлэлтийг идэвхжүүлэх"</string>
@@ -5060,8 +5061,8 @@
<string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"нислэг, нислэг аюулгүй"</string>
<string name="calls_and_sms" msgid="1931855083959003306">"Дуудлага, SMS"</string>
<string name="calls_and_sms_category" msgid="2021321997884906046">"Wi-Fi дуудлага"</string>
- <string name="calls_sms_wfc_summary" msgid="4930471357980272294">"Wi-Fi зэрэг оператор компанийн бус сүлжээгээр дуудлага хийж, хүлээн аваарай"</string>
- <string name="calls_sms_footnote" msgid="7002461875954024216">"Wi-Fi дуудлага нь танд зарим Wi-Fi сүлжээ гэх мэт оператор компанийн бус сүлжээгээр дуудлага хийх болон хүлээн авах боломжийг олгодог."</string>
+ <string name="calls_sms_wfc_summary" msgid="3940529919408667336">"Wi-Fi-р дуудлага хийх болон хүлээн авах"</string>
+ <string name="calls_sms_footnote" msgid="8051604228144899434">"Wi-Fi дуудлагын тусламжтайгаар дуудлагыг оператор компанийн бус Wi-Fi сүлжээгээр хийж мөн хүлээн авдаг."</string>
<string name="calls_preference_title" msgid="7536882032182563800">"Дуудлага"</string>
<string name="sms_preference_title" msgid="8392745501754864395">"SMS"</string>
<string name="calls_sms_preferred" msgid="6016477652522583496">"сонгосон"</string>
@@ -5080,10 +5081,10 @@
<string name="reset_internet_text" product="tablet" msgid="8797910368942544453">"Энэ нь таны утасны дуудлагыг дуусгана"</string>
<string name="resetting_internet_text" msgid="6696779371800051806">"Таны интернэтийг шинэчилж байна…"</string>
<string name="fix_connectivity" msgid="2781433603228089501">"Холболтыг засах"</string>
- <!-- no translation found for airplane_mode_network_available (1059499681300395240) -->
- <skip />
- <!-- no translation found for to_switch_networks_disconnect_ethernet (6615374552827587197) -->
- <skip />
+ <string name="airplane_mode_network_available" msgid="1059499681300395240">"Нислэгийн горимын сүлжээ боломжтой"</string>
+ <string name="to_switch_networks_disconnect_ethernet" msgid="6615374552827587197">"Сүлжээг сэлгэхийн тулд этернэтийг салгана уу"</string>
+ <string name="cannot_switch_networks_while_connected" msgid="3867944849171754777">"Холбогдсон үед сүлжээ сэлгэх боломжгүй"</string>
+ <string name="airplane_mode_network_panel_title" msgid="6385046104863403604">"Нислэгийн горимын сүлжээ"</string>
<string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g> / <xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
<string name="mobile_data_connection_active" msgid="2422223108911581552">"Холбогдсон"</string>
<string name="mobile_data_off_summary" msgid="3841411571485837651">"Интернэт автоматаар холбогдохгүй"</string>
@@ -5105,4 +5106,16 @@
<string name="category_name_others" msgid="2366006298768550310">"Бусад"</string>
<string name="category_name_general" msgid="7737273712848115886">"Ерөнхий"</string>
<string name="default_see_all_apps_title" msgid="7481113230662612178">"Бүх аппыг харах"</string>
+ <string name="smart_forwarding_title" msgid="8368634861971949799">"Ухаалаг шилжүүлэлт"</string>
+ <string name="smart_forwarding_summary_enabled" msgid="3341062878373185604">"Ухаалаг шилжүүлэлтийг идэвхжүүлсэн"</string>
+ <string name="smart_forwarding_summary_disabled" msgid="5033880700091914809">"Ухаалаг шилжүүлэлтийг идэвхгүй болгосон"</string>
+ <string name="smart_forwarding_ongoing_title" msgid="962226849074401228">"Дуудлагын тохиргоо"</string>
+ <string name="smart_forwarding_ongoing_text" msgid="2189209372407117114">"Тохиргоог шинэчилж байна..."</string>
+ <string name="smart_forwarding_failed_title" msgid="1859891191023516080">"Дуудлагын тохиргооны алдаа гарлаа"</string>
+ <string name="smart_forwarding_failed_text" msgid="5370431503707373653">"Сүлжээ эсвэл SIM картын алдаа гарлаа."</string>
+ <string name="smart_forwarding_failed_not_activated_text" msgid="997396203001257904">"Sim-г идэвхжүүлээгүй байна."</string>
+ <string name="smart_forwarding_input_mdn_title" msgid="5105463748849841763">"Утасны дугаарууд оруулна уу"</string>
+ <string name="smart_forwarding_input_mdn_dialog_title" msgid="7542216086697868415">"Утасны дугаар оруулна уу"</string>
+ <string name="smart_forwarding_missing_mdn_text" msgid="2907314684242542226">"Утасны дугаар дутуу байна."</string>
+ <string name="smart_forwarding_missing_alert_dialog_text" msgid="7870419247987316112">"OK"</string>
</resources>
diff --git a/res/values-mr/strings.xml b/res/values-mr/strings.xml
index 12bb7d9..f4338aa 100644
--- a/res/values-mr/strings.xml
+++ b/res/values-mr/strings.xml
@@ -427,8 +427,7 @@
<string name="cancel_lock_screen_dialog_button_label" msgid="1801132985957491690">"रद्द करा"</string>
<string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="886085239313346000">"सेन्सरला स्पर्श करा"</string>
<string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="6160543980992596286">"ते तुमच्या फोनच्या मागील भागावर आहे. तुमची तर्जनी वापरा."</string>
- <!-- no translation found for security_settings_udfps_enroll_find_sensor_message (1181700918690345832) -->
- <skip />
+ <string name="security_settings_udfps_enroll_find_sensor_message" msgid="1181700918690345832">"तो स्क्रीनवर आहे. चमकणारे वर्तुळ असलेले फिंगरप्रिंट शोधा."</string>
<string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="3065850549419750523">"डिव्हाइस आणि फिंगरप्रिंट सेन्सर स्थानासह चित्रे"</string>
<string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7298812463228440333">"नाव"</string>
<string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4074335979239208021">"ठीक आहे"</string>
@@ -2269,8 +2268,7 @@
<item quantity="other"> सेव्ह केलेली <xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> श्रवणयंत्रे</item>
<item quantity="one"> सेव्ह केलेले <xliff:g id="NUMBER_DEVICE_COUNT_0">%1$d</xliff:g> श्रवणयंत्र</item>
</plurals>
- <!-- no translation found for accessibility_audio_adjustment_title (1332113739136802997) -->
- <skip />
+ <string name="accessibility_audio_adjustment_title" msgid="1332113739136802997">"ऑडिओ अॅडजस्टमेंट"</string>
<string name="accessibility_summary_shortcut_enabled" msgid="4030427268146752644">"शॉर्टकट सुरू आहे"</string>
<string name="accessibility_summary_shortcut_disabled" msgid="564005462092499068">"बंद आहे"</string>
<string name="accessibility_summary_state_enabled" msgid="1065431632216039369">"सुरू"</string>
@@ -2439,6 +2437,7 @@
<string name="bluetooth_on_time" msgid="8424625554628450028">"वाय-फाय सुरू केल्याची वेळ"</string>
<string name="advanced_battery_title" msgid="3005993394776555079">"बॅटरी वापर"</string>
<string name="history_details_title" msgid="8628584613889559355">"इतिहास तपशील"</string>
+ <string name="advanced_battery_preference_title" msgid="6518802648205311326">"बॅटरी वापर पाहा"</string>
<string name="battery_details_title" msgid="4531369291819754178">"बॅटरी वापर"</string>
<string name="details_subtitle" msgid="2550872569652785527">"तपशील वापरा"</string>
<string name="controls_subtitle" msgid="3759606830916441564">"पॉवर वापर समायोजित करा"</string>
@@ -4100,6 +4099,7 @@
<string name="usb_use" msgid="6783183432648438528">"यासाठी USB वापरा"</string>
<string name="usb_default_label" msgid="3372838450371060750">"डीफॉल्ट USB काँफिगरेशन"</string>
<string name="usb_default_info" msgid="167172599497085266">"दुसरे डिव्हाइस कनेक्ट केलेले असताना आणि तुमचा फोन अनलॉक केलेला असतना, या सेटिंग्ज लागू होतील. फक्त विश्वसनीय डिव्हाइसशी कनेक्ट करा."</string>
+ <string name="usb_power_title" msgid="5602112548385798646">"पॉवरशी संबंधित पर्याय"</string>
<string name="usb_pref" msgid="8521832005703261700">"USB"</string>
<string name="usb_preference" msgid="5084550082591493765">"USB प्राधान्ये"</string>
<string name="usb_control_title" msgid="1946791559052157693">"USB वर यांचे नियंत्रण आहे"</string>
@@ -4939,8 +4939,8 @@
<string name="mobile_data_ap_mode_disabled" msgid="6067959496888990983">"विमान मोड सुरू असताना उपलब्ध नाही"</string>
<string name="force_desktop_mode" msgid="1336913605091334238">"डेस्कटॉप मोडची सक्ती करा"</string>
<string name="force_desktop_mode_summary" msgid="4587416867846930479">"दुसऱ्या डिस्प्लेवर प्रायोगिक डेस्कटॉप मोडला सक्ती करा"</string>
- <string name="enable_sizecompat_freeform" msgid="3799755160777404309">"छोट्या आकाराचे फ्रीपॉर्म सुरू करा"</string>
- <string name="enable_sizecompat_freeform_summary" msgid="1484050174538201499">"छोट्या आकाराच्या ॲप्सना फ्रीफॉर्ममध्ये राहण्याची अनुमती देते"</string>
+ <string name="enable_non_resizable_multi_window" msgid="6832903754625404477">"मल्टि विंडोमध्ये आकार बदलू न शकणारे ॲप सुरू करा"</string>
+ <string name="enable_non_resizable_multi_window_summary" msgid="3275763753261901999">"आकार बदलू न शकणाऱ्या ॲप्सना मल्टि विंडोमध्ये राहण्याची परवानगी देते"</string>
<string name="hwui_force_dark_title" msgid="4256904905631994219">"फोर्स डार्क ओव्हरराइड करते"</string>
<string name="hwui_force_dark_summary" msgid="6515748781487952769">"फोर्स डार्क वैशिष्ट्य नेहमी सुरू ठेवण्यास ओव्हरराइड करते"</string>
<string name="enable_blurs_on_windows_title" msgid="4218144213800778872">"धूसर करणे सुरू करा"</string>
@@ -4991,12 +4991,9 @@
<string name="wfc_disclaimer_emergency_limitation_title_text" msgid="8276287227589397162">"आणीबाणी कॉल"</string>
<string name="wfc_disclaimer_emergency_limitation_desc_text" msgid="5503902001191552196">"तुमचा वाहक वाय-फाय कॉलिंगवर आणीबाणी कॉल करण्यासाठी सपोर्ट करत नाही.\nतुमचे डिव्हाइस आणीबाणी कॉल करण्यासाठी सेल्युलर नेटवर्कवर आपोआप स्विच होते.\n फक्त सेल्युलर नेटवर्कच्या परिसरात आणीबाणी कॉल करता येतात."</string>
<string name="wifi_calling_summary" msgid="8566648389959032967">"कॉलची गुणवत्ता वाढवण्यासाठी वाय-फाय वापरा"</string>
- <!-- no translation found for backup_calling_settings_title (519714752900364326) -->
- <skip />
- <!-- no translation found for backup_calling_setting_summary (451295393447465830) -->
- <skip />
- <!-- no translation found for keywords_backup_calling (8592800915478816800) -->
- <skip />
+ <string name="backup_calling_settings_title" msgid="519714752900364326">"बॅकअप कॉलिंग"</string>
+ <string name="backup_calling_setting_summary" msgid="451295393447465830">"<xliff:g id="BACKUP_CALLING_OPERATOR_TEXT">%1$s</xliff:g> उपलब्ध नसल्यास, <xliff:g id="BACKUP_CALLING_CARRIER_TEXT">%1$s</xliff:g> द्वारे कॉल करण्यासाठी किंवा घेण्यासाठी तुमचे मोबाइल डेटा सिम वापरा."</string>
+ <string name="keywords_backup_calling" msgid="8592800915478816800">"बॅकअप कॉलिंग"</string>
<string name="enable_receiving_mms_notification_title" msgid="6465218559386990248">"येणारा MMS मेसेज"</string>
<string name="enable_sending_mms_notification_title" msgid="7120641300854953375">"MMS मेसेज पाठवू शकत नाही"</string>
<string name="enable_mms_notification_summary" msgid="6432752438276672500">"मोबाइल डेटा बंद असताना MMS मेसेजिंगला अनुमती देण्यासाठी <xliff:g id="OPERATOR_NAME">%1$s</xliff:g> वर टॅप करा"</string>
@@ -5065,8 +5062,8 @@
<string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"विमान, विमान सुरक्षित"</string>
<string name="calls_and_sms" msgid="1931855083959003306">"कॉल आणि एसएमएस"</string>
<string name="calls_and_sms_category" msgid="2021321997884906046">"वाय-फाय कॉलिंग"</string>
- <string name="calls_sms_wfc_summary" msgid="4930471357980272294">"वाय-फाय यांसारख्या वाहक नसलेल्या नेटवर्कवरून कॉल करा आणि घ्या"</string>
- <string name="calls_sms_footnote" msgid="7002461875954024216">"वाय-फाय कॉलिंग तुम्हाला वाय-फाय यांसारख्या वाहक नसलेल्या नेटवर्कवरून कॉल करण्याची आणि घेण्याची अनुमती देते."</string>
+ <string name="calls_sms_wfc_summary" msgid="3940529919408667336">"वाय-फायवरून कॉल करा आणि घ्या"</string>
+ <string name="calls_sms_footnote" msgid="8051604228144899434">"वाय-फाय कॉलिंगसह, वाहक नसलेल्या वाय-फाय नेटवर्कवरून कॉल केले आणि घेतले जाऊ शकतात."</string>
<string name="calls_preference_title" msgid="7536882032182563800">"कॉल"</string>
<string name="sms_preference_title" msgid="8392745501754864395">"एसएमएस"</string>
<string name="calls_sms_preferred" msgid="6016477652522583496">"प्राधान्य दिलेले"</string>
@@ -5078,22 +5075,17 @@
<string name="network_and_internet_preferences_summary" msgid="613207494152304537">"सार्वजनिक नेटवर्कशी कनेक्ट करा"</string>
<string name="keywords_internet" msgid="7674082764898690310">"नेटवर्क कनेक्शन, इंटरनेट, वायरलेस, डेटा, वायफाय, वाय-फाय, वाय फाय, सेल्युलर, मोबाइल, सेल वाहक, 4g, 3g, 2g, LTE"</string>
<string name="view_airplane_safe_networks" msgid="9170023210981508906">"विमान मोड नेटवर्क पहा"</string>
- <!-- no translation found for viewing_airplane_mode_networks (4548508852659577531) -->
- <skip />
+ <string name="viewing_airplane_mode_networks" msgid="4548508852659577531">"विमान मोडमध्ये उपलब्ध असलेली नेटवर्क पाहत आहे"</string>
<string name="turn_off_airplane_mode" msgid="7141986366534514443">"विमान मोड बंद करा"</string>
- <!-- no translation found for reset_your_internet_title (4856899004343241310) -->
- <skip />
- <!-- no translation found for reset_internet_text (8797910368942544453) -->
- <skip />
- <!-- no translation found for reset_internet_text (8797910368942544453) -->
- <skip />
- <!-- no translation found for resetting_internet_text (6696779371800051806) -->
- <skip />
- <!-- no translation found for fix_connectivity (2781433603228089501) -->
- <skip />
- <!-- no translation found for airplane_mode_network_available (1059499681300395240) -->
- <skip />
- <!-- no translation found for to_switch_networks_disconnect_ethernet (6615374552827587197) -->
+ <string name="reset_your_internet_title" msgid="4856899004343241310">"तुमचे इंटरनेट रीसेट करायचे आहे का?"</string>
+ <string name="reset_internet_text" product="default" msgid="8797910368942544453">"यामुळे तुमचा फोन कॉल बंद होईल"</string>
+ <string name="reset_internet_text" product="tablet" msgid="8797910368942544453">"यामुळे तुमचा फोन कॉल बंद होईल"</string>
+ <string name="resetting_internet_text" msgid="6696779371800051806">"तुमचे इंटरनेट रीसेट करत आहे…"</string>
+ <string name="fix_connectivity" msgid="2781433603228089501">"कनेक्टिव्हिटीसंबंधित समस्यांचे निराकरण करा"</string>
+ <string name="airplane_mode_network_available" msgid="1059499681300395240">"विमान मोडमध्ये नेटवर्क उपलब्ध आहेत"</string>
+ <string name="to_switch_networks_disconnect_ethernet" msgid="6615374552827587197">"नेटवर्क स्विच करण्यासाठी, इथरनेट केबल डिस्कनेक्ट करा"</string>
+ <string name="cannot_switch_networks_while_connected" msgid="3867944849171754777">"कनेक्ट केलेले असताना नेटवर्क स्विच करू शकत नाही"</string>
+ <!-- no translation found for airplane_mode_network_panel_title (6385046104863403604) -->
<skip />
<string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g> / <xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
<string name="mobile_data_connection_active" msgid="2422223108911581552">"कनेक्ट केले आहे"</string>
@@ -5115,6 +5107,17 @@
<string name="category_name_color" msgid="937514550918977151">"रंग"</string>
<string name="category_name_others" msgid="2366006298768550310">"इतर"</string>
<string name="category_name_general" msgid="7737273712848115886">"साधारण"</string>
- <!-- no translation found for default_see_all_apps_title (7481113230662612178) -->
- <skip />
+ <string name="default_see_all_apps_title" msgid="7481113230662612178">"सर्व अॅप्स पाहा"</string>
+ <string name="smart_forwarding_title" msgid="8368634861971949799">"स्मार्ट फॉरवर्डिंग"</string>
+ <string name="smart_forwarding_summary_enabled" msgid="3341062878373185604">"स्मार्ट फॉरवर्डिंग सुरू केले"</string>
+ <string name="smart_forwarding_summary_disabled" msgid="5033880700091914809">"स्मार्ट फॉरवर्डिंग बंद केले"</string>
+ <string name="smart_forwarding_ongoing_title" msgid="962226849074401228">"कॉल सेटिंग्ज"</string>
+ <string name="smart_forwarding_ongoing_text" msgid="2189209372407117114">"सेटिंग्ज अपडेट करत आहे…"</string>
+ <string name="smart_forwarding_failed_title" msgid="1859891191023516080">"कॉल सेटिंग्जशी संबंधित एरर"</string>
+ <string name="smart_forwarding_failed_text" msgid="5370431503707373653">"नेटवर्क किंवा सिम कार्डशी संबंधित एरर."</string>
+ <string name="smart_forwarding_failed_not_activated_text" msgid="997396203001257904">"सिम अॅक्टिव्हेट केलेले नाही."</string>
+ <string name="smart_forwarding_input_mdn_title" msgid="5105463748849841763">"फोन नंबर एंटर करा"</string>
+ <string name="smart_forwarding_input_mdn_dialog_title" msgid="7542216086697868415">"फोन नंबर एंटर करा"</string>
+ <string name="smart_forwarding_missing_mdn_text" msgid="2907314684242542226">"फोन नंबर आढळला नाही."</string>
+ <string name="smart_forwarding_missing_alert_dialog_text" msgid="7870419247987316112">"ओके"</string>
</resources>
diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml
index 9f4dc13..ff238db 100644
--- a/res/values-ms/strings.xml
+++ b/res/values-ms/strings.xml
@@ -2267,8 +2267,7 @@
<item quantity="other"><xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> alat bantu pendengaran disimpan</item>
<item quantity="one"><xliff:g id="NUMBER_DEVICE_COUNT_0">%1$d</xliff:g> alat bantu pendengaran disimpan</item>
</plurals>
- <!-- no translation found for accessibility_audio_adjustment_title (1332113739136802997) -->
- <skip />
+ <string name="accessibility_audio_adjustment_title" msgid="1332113739136802997">"Pelarasan audio"</string>
<string name="accessibility_summary_shortcut_enabled" msgid="4030427268146752644">"Pintasan dihidupkan"</string>
<string name="accessibility_summary_shortcut_disabled" msgid="564005462092499068">"Mati"</string>
<string name="accessibility_summary_state_enabled" msgid="1065431632216039369">"Hidup"</string>
@@ -2437,6 +2436,7 @@
<string name="bluetooth_on_time" msgid="8424625554628450028">"Masa hidup Wi-Fi"</string>
<string name="advanced_battery_title" msgid="3005993394776555079">"Penggunaan bateri"</string>
<string name="history_details_title" msgid="8628584613889559355">"Butiran sejarah"</string>
+ <string name="advanced_battery_preference_title" msgid="6518802648205311326">"Lihat penggunaan bateri"</string>
<string name="battery_details_title" msgid="4531369291819754178">"Penggunaan bateri"</string>
<string name="details_subtitle" msgid="2550872569652785527">"Butiran penggunaan"</string>
<string name="controls_subtitle" msgid="3759606830916441564">"Laraskan penggunaan kuasa"</string>
@@ -4098,6 +4098,7 @@
<string name="usb_use" msgid="6783183432648438528">"Gunakan USB untuk"</string>
<string name="usb_default_label" msgid="3372838450371060750">"Kofigurasi USB lalai"</string>
<string name="usb_default_info" msgid="167172599497085266">"Tetapan ini akan digunakan apabila peranti lain disambungkan dan telefon anda tidak dikunci. Sambung ke peranti yang dipercayai sahaja."</string>
+ <string name="usb_power_title" msgid="5602112548385798646">"Pilihan kuasa"</string>
<string name="usb_pref" msgid="8521832005703261700">"USB"</string>
<string name="usb_preference" msgid="5084550082591493765">"Pilihan USB"</string>
<string name="usb_control_title" msgid="1946791559052157693">"USB dikawal oleh"</string>
@@ -4937,8 +4938,8 @@
<string name="mobile_data_ap_mode_disabled" msgid="6067959496888990983">"Tidak tersedia semasa dalam mod pesawat"</string>
<string name="force_desktop_mode" msgid="1336913605091334238">"Paksa mod desktop"</string>
<string name="force_desktop_mode_summary" msgid="4587416867846930479">"Paksa mod desktop percubaan pada paparan kedua"</string>
- <string name="enable_sizecompat_freeform" msgid="3799755160777404309">"Dayakan serasi saiz bentuk bebas"</string>
- <string name="enable_sizecompat_freeform_summary" msgid="1484050174538201499">"Benarkan apl serasi saiz dalam bentuk bebas"</string>
+ <string name="enable_non_resizable_multi_window" msgid="6832903754625404477">"Dayakan tidak boleh diubah saiz dalam berbilang tetingkap"</string>
+ <string name="enable_non_resizable_multi_window_summary" msgid="3275763753261901999">"Benarkan apl tidak boleh diubah saiz dalam berbilang tetingkap"</string>
<string name="hwui_force_dark_title" msgid="4256904905631994219">"Batalkan paksa gelap"</string>
<string name="hwui_force_dark_summary" msgid="6515748781487952769">"Membatalkan ciri paksa gelap supaya sentiasa hidup"</string>
<string name="enable_blurs_on_windows_title" msgid="4218144213800778872">"Dayakan kabur"</string>
@@ -5060,8 +5061,8 @@
<string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"pesawat, selamat pesawat"</string>
<string name="calls_and_sms" msgid="1931855083959003306">"Panggilan & SMS"</string>
<string name="calls_and_sms_category" msgid="2021321997884906046">"Panggilan Wi-Fi"</string>
- <string name="calls_sms_wfc_summary" msgid="4930471357980272294">"Buat dan terima panggilan melalui rangkaian bukan pembawa seperti Wi-Fi"</string>
- <string name="calls_sms_footnote" msgid="7002461875954024216">"Panggilan Wi-Fi membolehkan anda membuat dan menerima panggilan melalui rangkaian bukan pembawa seperti sesetengah rangkaian Wi-Fi."</string>
+ <string name="calls_sms_wfc_summary" msgid="3940529919408667336">"Buat dan terima panggilan melalui Wi‑Fi"</string>
+ <string name="calls_sms_footnote" msgid="8051604228144899434">"Dengan Panggilan Wi-Fi, panggilan dibuat dan diterima melalui rangkaian Wi-Fi bukan pembawa."</string>
<string name="calls_preference_title" msgid="7536882032182563800">"Panggilan"</string>
<string name="sms_preference_title" msgid="8392745501754864395">"SMS"</string>
<string name="calls_sms_preferred" msgid="6016477652522583496">"diutamakan"</string>
@@ -5080,10 +5081,10 @@
<string name="reset_internet_text" product="tablet" msgid="8797910368942544453">"Tindakan ini akan menamatkan panggilan telefon anda"</string>
<string name="resetting_internet_text" msgid="6696779371800051806">"Menetapkan semula Internet anda…"</string>
<string name="fix_connectivity" msgid="2781433603228089501">"Betulkan kesambungan"</string>
- <!-- no translation found for airplane_mode_network_available (1059499681300395240) -->
- <skip />
- <!-- no translation found for to_switch_networks_disconnect_ethernet (6615374552827587197) -->
- <skip />
+ <string name="airplane_mode_network_available" msgid="1059499681300395240">"Rangkaian mod pesawat tersedia"</string>
+ <string name="to_switch_networks_disconnect_ethernet" msgid="6615374552827587197">"Untuk menukar rangkaian, putuskan sambungan ethernet"</string>
+ <string name="cannot_switch_networks_while_connected" msgid="3867944849171754777">"Tidak boleh menukar rangkaian semasa bersambung"</string>
+ <string name="airplane_mode_network_panel_title" msgid="6385046104863403604">"Rangkaian mod pesawat"</string>
<string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g> / <xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
<string name="mobile_data_connection_active" msgid="2422223108911581552">"Disambungkan"</string>
<string name="mobile_data_off_summary" msgid="3841411571485837651">"Internet tidak akan bersambung secara automatik"</string>
@@ -5105,4 +5106,16 @@
<string name="category_name_others" msgid="2366006298768550310">"Lain-lain"</string>
<string name="category_name_general" msgid="7737273712848115886">"Umum"</string>
<string name="default_see_all_apps_title" msgid="7481113230662612178">"Lihat semua apl"</string>
+ <string name="smart_forwarding_title" msgid="8368634861971949799">"Pemajuan Pintar"</string>
+ <string name="smart_forwarding_summary_enabled" msgid="3341062878373185604">"Pemajuan Pintar Didayakan"</string>
+ <string name="smart_forwarding_summary_disabled" msgid="5033880700091914809">"Pemajuan Pintar Dilumpuhkan"</string>
+ <string name="smart_forwarding_ongoing_title" msgid="962226849074401228">"Tetapan Panggilan"</string>
+ <string name="smart_forwarding_ongoing_text" msgid="2189209372407117114">"Mengemas Kini Tetapan..."</string>
+ <string name="smart_forwarding_failed_title" msgid="1859891191023516080">"Ralat Tetapan Panggilan"</string>
+ <string name="smart_forwarding_failed_text" msgid="5370431503707373653">"Ralat Rangkaian atau kad SIM."</string>
+ <string name="smart_forwarding_failed_not_activated_text" msgid="997396203001257904">"Sim tidak diaktifkan."</string>
+ <string name="smart_forwarding_input_mdn_title" msgid="5105463748849841763">"Masukkan nombor Telefon"</string>
+ <string name="smart_forwarding_input_mdn_dialog_title" msgid="7542216086697868415">"Masukkan nombor Telefon"</string>
+ <string name="smart_forwarding_missing_mdn_text" msgid="2907314684242542226">"Tiada nombor telefon."</string>
+ <string name="smart_forwarding_missing_alert_dialog_text" msgid="7870419247987316112">"OK"</string>
</resources>
diff --git a/res/values-my/strings.xml b/res/values-my/strings.xml
index 64cd1a0..2edf267 100644
--- a/res/values-my/strings.xml
+++ b/res/values-my/strings.xml
@@ -2267,8 +2267,7 @@
<item quantity="other">သိမ်းဆည်းထားသည့် နားကြားကိရိယာ <xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> ခု</item>
<item quantity="one">သိမ်းဆည်းထားသည့် နားကြားကိရိယာ <xliff:g id="NUMBER_DEVICE_COUNT_0">%1$d</xliff:g> ခု</item>
</plurals>
- <!-- no translation found for accessibility_audio_adjustment_title (1332113739136802997) -->
- <skip />
+ <string name="accessibility_audio_adjustment_title" msgid="1332113739136802997">"အသံ ပြင်ဆင်ချက်"</string>
<string name="accessibility_summary_shortcut_enabled" msgid="4030427268146752644">"ဖြတ်လမ်းလင့်ခ်ကို ဖွင့်ထားသည်"</string>
<string name="accessibility_summary_shortcut_disabled" msgid="564005462092499068">"ပိတ်ထားသည်"</string>
<string name="accessibility_summary_state_enabled" msgid="1065431632216039369">"ဖွင့်ထားသည်"</string>
@@ -2437,6 +2436,7 @@
<string name="bluetooth_on_time" msgid="8424625554628450028">"အချိန်ကိုက်ဝိုင်ဖိုင်"</string>
<string name="advanced_battery_title" msgid="3005993394776555079">"ဘက်ထရီ အသုံးပြုမှု"</string>
<string name="history_details_title" msgid="8628584613889559355">"မှတ်တမ်းအသေးစိတ်များ"</string>
+ <string name="advanced_battery_preference_title" msgid="6518802648205311326">"ဘက်ထရီ အသုံးပြုမှု ကြည့်ခြင်း"</string>
<string name="battery_details_title" msgid="4531369291819754178">"ဘက်ထရီ အသုံးပြုမှု"</string>
<string name="details_subtitle" msgid="2550872569652785527">"အသေးစိတ် အသုံးပြုခြင်း"</string>
<string name="controls_subtitle" msgid="3759606830916441564">"ပါဝါအသုံးပြုမှုအား ချိန်တွယ်ခြင်း"</string>
@@ -4098,6 +4098,7 @@
<string name="usb_use" msgid="6783183432648438528">"USB သုံးပါ"</string>
<string name="usb_default_label" msgid="3372838450371060750">"မူရင်း USB စီစဉ်သတ်မှတ်မှု"</string>
<string name="usb_default_info" msgid="167172599497085266">"အခြားစက်ပစ္စည်းတစ်ခုကို ချိတ်ဆက်ထားပြီး သင့်ဖုန်းကို လော့ခ်ဖွင့်ထားသည့်အခါ ဤဆက်တင်များ အကျိုးသက်ရောက်မှု ရှိပါမည်။ ယုံကြည်စိတ်ချရသည့် စက်ပစ္စည်းများသို့သာ ချိတ်ဆက်ပါ။"</string>
+ <string name="usb_power_title" msgid="5602112548385798646">"ပါဝါ ရွေးစရာများ"</string>
<string name="usb_pref" msgid="8521832005703261700">"USB"</string>
<string name="usb_preference" msgid="5084550082591493765">"USB ရွေးချယ်မှုများ"</string>
<string name="usb_control_title" msgid="1946791559052157693">"USB ကို ထိန်းချုပ်သည့်စက်"</string>
@@ -4937,8 +4938,8 @@
<string name="mobile_data_ap_mode_disabled" msgid="6067959496888990983">"လေယာဉ်ပျံမုဒ် ပြုလုပ်ထားစဉ် သုံး၍မရပါ"</string>
<string name="force_desktop_mode" msgid="1336913605091334238">"ဒက်စ်တော့ပုံစံ မဖြစ်မနေ ပြောင်းခြင်း"</string>
<string name="force_desktop_mode_summary" msgid="4587416867846930479">"ဒုတိယ မျက်နှာပြင်ပြသမှုများတွင် ဒက်စ်တော့ပုံစံ မဖြစ်မနေ စမ်းသပ်ရန်"</string>
- <string name="enable_sizecompat_freeform" msgid="3799755160777404309">"အလွတ်ပုံစံ sizecompat ကိုဖွင့်ပါ"</string>
- <string name="enable_sizecompat_freeform_summary" msgid="1484050174538201499">"sizecompat အက်ပ်ကို အလွတ်ပုံစံတွင် ရှိခွင့်ပြုပါ"</string>
+ <string name="enable_non_resizable_multi_window" msgid="6832903754625404477">"အရွယ်အစားပြန်မပြုပြင်နိုင်သည်များကို ဝင်းဒိုးများစွာတွင် ဖွင့်ရန်"</string>
+ <string name="enable_non_resizable_multi_window_summary" msgid="3275763753261901999">"အရွယ်အစားပြန်မပြုပြင်နိုင်သည့် အက်ပ်များကို ဝင်းဒိုးများစွာတွင် ဖွင့်ရန်ခွင့်ပြုသည်"</string>
<string name="hwui_force_dark_title" msgid="4256904905631994219">"မဖြစ်မနေအမှောင်ချခြင်းကို အစားထိုးခြင်း"</string>
<string name="hwui_force_dark_summary" msgid="6515748781487952769">"မဖြစ်မနေအမှောင်ချခြင်း ဝန်ဆောင်မှု အမြဲဖွင့်ရန် အစားထိုးထားသည်"</string>
<string name="enable_blurs_on_windows_title" msgid="4218144213800778872">"မှုန်ဝါးရန်"</string>
@@ -5060,8 +5061,8 @@
<string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"လေယာဉ်ပျံ၊ လေယာဉ်ပျံမုဒ်တွင် လုံခြုံခြင်း"</string>
<string name="calls_and_sms" msgid="1931855083959003306">"ခေါ်ဆိုမှုများနှင့် SMS"</string>
<string name="calls_and_sms_category" msgid="2021321997884906046">"Wi-Fi ခေါ်ဆိုမှု"</string>
- <string name="calls_sms_wfc_summary" msgid="4930471357980272294">"Wi-Fi ကဲ့သို့သော ဖုန်းဝန်ဆောင်မှုပေးသူမဟုတ်သည့် ကွန်ရက်များတွင် ဖုန်းခေါ်ဆိုခြင်းနှင့် လက်ခံခြင်းများကို ပြုလုပ်ပါ"</string>
- <string name="calls_sms_footnote" msgid="7002461875954024216">"Wi‑Fi ခေါ်ဆိုမှုက Wi-Fi ကွန်ရက်အချို့ကဲ့သို့သော ဖုန်းဝန်ဆောင်မှုပေးသူမဟုတ်သည့် ကွန်ရက်များတွင် ဖုန်းခေါ်ဆိုရန်နှင့် လက်ခံရန် ခွင့်ပြုပေးသည်။"</string>
+ <string name="calls_sms_wfc_summary" msgid="3940529919408667336">"Wi-Fi မှတစ်ဆင့် ဖုန်းခေါ်ဆိုခြင်းနှင့် လက်ခံခြင်းတို့ကို ပြုလုပ်ပါ"</string>
+ <string name="calls_sms_footnote" msgid="8051604228144899434">"Wi-Fi ခေါ်ဆိုမှုဖြင့် ဖုန်းဝန်ဆောင်မှုပေးသူမဟုတ်သည့် Wi-Fi ကွန်ရက်များမှတစ်ဆင့် ဖုန်းခေါ်ဆိုနိုင်သလို လက်ခံနိုင်သည်။"</string>
<string name="calls_preference_title" msgid="7536882032182563800">"ခေါ်ဆိုမှုများ"</string>
<string name="sms_preference_title" msgid="8392745501754864395">"SMS"</string>
<string name="calls_sms_preferred" msgid="6016477652522583496">"ဦးစားပေး"</string>
@@ -5082,6 +5083,8 @@
<string name="fix_connectivity" msgid="2781433603228089501">"ပုံသေ ချိတ်ဆက်နိုင်မှု"</string>
<string name="airplane_mode_network_available" msgid="1059499681300395240">"လေယာဉ်ပျံမုဒ် ကွန်ရက်များ ရရှိနိုင်သည်"</string>
<string name="to_switch_networks_disconnect_ethernet" msgid="6615374552827587197">"ကွန်ရက်ပြောင်းရန် အီသာနက်ကို ချိတ်ဆက်မှုဖြုတ်ပါ"</string>
+ <string name="cannot_switch_networks_while_connected" msgid="3867944849171754777">"ချိတ်ဆက်ထားစဉ် ကွန်ရက် မပြောင်းနိုင်ပါ"</string>
+ <string name="airplane_mode_network_panel_title" msgid="6385046104863403604">"လေယာဉ်ပျံမုဒ် ကွန်ရက်များ"</string>
<string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g> / <xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
<string name="mobile_data_connection_active" msgid="2422223108911581552">"ချိတ်ဆက်ထားသည်"</string>
<string name="mobile_data_off_summary" msgid="3841411571485837651">"အင်တာနက်က အလိုအလျောက် ချိတ်ဆက်မည်မဟုတ်ပါ"</string>
@@ -5103,4 +5106,16 @@
<string name="category_name_others" msgid="2366006298768550310">"အခြား"</string>
<string name="category_name_general" msgid="7737273712848115886">"အထွေထွေ"</string>
<string name="default_see_all_apps_title" msgid="7481113230662612178">"အက်ပ်အားလုံးကို ပြခြင်း"</string>
+ <string name="smart_forwarding_title" msgid="8368634861971949799">"စမတ် ထပ်ဆင့်ပို့ခြင်း"</string>
+ <string name="smart_forwarding_summary_enabled" msgid="3341062878373185604">"စမတ် ထပ်ဆင့်ပို့ခြင်း ဖွင့်ထားသည်"</string>
+ <string name="smart_forwarding_summary_disabled" msgid="5033880700091914809">"စမတ် ထပ်ဆင့်ပို့ခြင်း ပိတ်ထားသည်"</string>
+ <string name="smart_forwarding_ongoing_title" msgid="962226849074401228">"ခေါ်ဆိုမှု ဆက်တင်များ"</string>
+ <string name="smart_forwarding_ongoing_text" msgid="2189209372407117114">"ဆက်တင်များကို အပ်ဒိတ်လုပ်နေသည်…"</string>
+ <string name="smart_forwarding_failed_title" msgid="1859891191023516080">"ခေါ်ဆိုမှု ဆက်တင်များတွင် အမှားအယွင်းရှိသည်"</string>
+ <string name="smart_forwarding_failed_text" msgid="5370431503707373653">"ကွန်ရက် သို့မဟုတ် ဆင်းမ်ကတ်တွင် အမှားအယွင်းရှိသည်။"</string>
+ <string name="smart_forwarding_failed_not_activated_text" msgid="997396203001257904">"ဆင်းမ်ကတ်ကို စဖွင့်အသုံးပြုခြင်း မရှိသေးပါ။"</string>
+ <string name="smart_forwarding_input_mdn_title" msgid="5105463748849841763">"ဖုန်းနံပါတ်များ ထည့်ပါ"</string>
+ <string name="smart_forwarding_input_mdn_dialog_title" msgid="7542216086697868415">"ဖုန်းနံပါတ် ထည့်ပါ"</string>
+ <string name="smart_forwarding_missing_mdn_text" msgid="2907314684242542226">"ဖုန်းနံပါတ် မထည့်ရသေးပါ။"</string>
+ <string name="smart_forwarding_missing_alert_dialog_text" msgid="7870419247987316112">"OK"</string>
</resources>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index d83a21d..a9cf23d 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -2267,8 +2267,7 @@
<item quantity="other"><xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> lagrede høreapparater</item>
<item quantity="one"><xliff:g id="NUMBER_DEVICE_COUNT_0">%1$d</xliff:g> lagret høreapparat</item>
</plurals>
- <!-- no translation found for accessibility_audio_adjustment_title (1332113739136802997) -->
- <skip />
+ <string name="accessibility_audio_adjustment_title" msgid="1332113739136802997">"Lydjustering"</string>
<string name="accessibility_summary_shortcut_enabled" msgid="4030427268146752644">"Snarveien er på"</string>
<string name="accessibility_summary_shortcut_disabled" msgid="564005462092499068">"Av"</string>
<string name="accessibility_summary_state_enabled" msgid="1065431632216039369">"På"</string>
@@ -2437,6 +2436,7 @@
<string name="bluetooth_on_time" msgid="8424625554628450028">"Wi-Fi – aktivt i"</string>
<string name="advanced_battery_title" msgid="3005993394776555079">"Batteribruk"</string>
<string name="history_details_title" msgid="8628584613889559355">"Loggdetaljer"</string>
+ <string name="advanced_battery_preference_title" msgid="6518802648205311326">"Se batteribruk"</string>
<string name="battery_details_title" msgid="4531369291819754178">"Batteribruk"</string>
<string name="details_subtitle" msgid="2550872569652785527">"Bruksdetaljer"</string>
<string name="controls_subtitle" msgid="3759606830916441564">"Juster strømforbruk"</string>
@@ -4098,6 +4098,7 @@
<string name="usb_use" msgid="6783183432648438528">"Bruk USB for"</string>
<string name="usb_default_label" msgid="3372838450371060750">"Standard USB-konfigurasjon"</string>
<string name="usb_default_info" msgid="167172599497085266">"Disse innstillingene gjelder når en annen enhet er koblet til og telefonen din er låst opp. Du bør bare koble til godkjente enheter."</string>
+ <string name="usb_power_title" msgid="5602112548385798646">"Strømalternativer"</string>
<string name="usb_pref" msgid="8521832005703261700">"USB"</string>
<string name="usb_preference" msgid="5084550082591493765">"USB-innstillinger"</string>
<string name="usb_control_title" msgid="1946791559052157693">"USB kontrolleres av"</string>
@@ -4937,8 +4938,8 @@
<string name="mobile_data_ap_mode_disabled" msgid="6067959496888990983">"Utilgjengelig i flymodus"</string>
<string name="force_desktop_mode" msgid="1336913605091334238">"Tvungen skrivebordsmodus"</string>
<string name="force_desktop_mode_summary" msgid="4587416867846930479">"Tvungen eksperimentell skrivebordsmodus på sekundære skjermer"</string>
- <string name="enable_sizecompat_freeform" msgid="3799755160777404309">"Slå på fritt format for sizecompat"</string>
- <string name="enable_sizecompat_freeform_summary" msgid="1484050174538201499">"Tillat at sizecompat-apper er i fritt format"</string>
+ <string name="enable_non_resizable_multi_window" msgid="6832903754625404477">"Slå på apper som ikke kan endre størrelse, i flervindusmodus"</string>
+ <string name="enable_non_resizable_multi_window_summary" msgid="3275763753261901999">"Tillater apper som ikke kan endre størrelse, i flervindusmodus"</string>
<string name="hwui_force_dark_title" msgid="4256904905631994219">"Overstyr tving mørk"</string>
<string name="hwui_force_dark_summary" msgid="6515748781487952769">"Overstyrer tving mørk-funksjonen til å være alltid på"</string>
<string name="enable_blurs_on_windows_title" msgid="4218144213800778872">"Slå på uskarpheter"</string>
@@ -5060,8 +5061,8 @@
<string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"fly, trygg på fly"</string>
<string name="calls_and_sms" msgid="1931855083959003306">"Anrop og SMS"</string>
<string name="calls_and_sms_category" msgid="2021321997884906046">"Wi‑Fi-anrop"</string>
- <string name="calls_sms_wfc_summary" msgid="4930471357980272294">"Ring og motta anrop via nettverk utenfor operatøren, for eksempel Wi‑Fi"</string>
- <string name="calls_sms_footnote" msgid="7002461875954024216">"Med Wi-Fi-anrop kan du ringe og motta anrop via nettverk utenfor operatøren, for eksempel noen Wi-Fi-nettverk."</string>
+ <string name="calls_sms_wfc_summary" msgid="3940529919408667336">"Ring og motta anrop via Wi‑Fi"</string>
+ <string name="calls_sms_footnote" msgid="8051604228144899434">"Med Wi‑Fi-anrop ringer og mottar du anrop via Wi-Fi-nettverk utenfor operatøren."</string>
<string name="calls_preference_title" msgid="7536882032182563800">"Anrop"</string>
<string name="sms_preference_title" msgid="8392745501754864395">"SMS"</string>
<string name="calls_sms_preferred" msgid="6016477652522583496">"foretrukket"</string>
@@ -5080,10 +5081,10 @@
<string name="reset_internet_text" product="tablet" msgid="8797910368942544453">"Dette avslutter anropet"</string>
<string name="resetting_internet_text" msgid="6696779371800051806">"Tilbakestiller internett …"</string>
<string name="fix_connectivity" msgid="2781433603228089501">"Fiks tilkobling"</string>
- <!-- no translation found for airplane_mode_network_available (1059499681300395240) -->
- <skip />
- <!-- no translation found for to_switch_networks_disconnect_ethernet (6615374552827587197) -->
- <skip />
+ <string name="airplane_mode_network_available" msgid="1059499681300395240">"Nettverk for flymodus er tilgjengelig"</string>
+ <string name="to_switch_networks_disconnect_ethernet" msgid="6615374552827587197">"For å bytte nettverk, koble fra Ethernet"</string>
+ <string name="cannot_switch_networks_while_connected" msgid="3867944849171754777">"Du kan ikke bytte nettverk når du er tilkoblet"</string>
+ <string name="airplane_mode_network_panel_title" msgid="6385046104863403604">"Nettverk for flymodus"</string>
<string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g>/<xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
<string name="mobile_data_connection_active" msgid="2422223108911581552">"Tilkoblet"</string>
<string name="mobile_data_off_summary" msgid="3841411571485837651">"Internett kobles ikke til automatisk"</string>
@@ -5105,4 +5106,16 @@
<string name="category_name_others" msgid="2366006298768550310">"Andre"</string>
<string name="category_name_general" msgid="7737273712848115886">"Generelt"</string>
<string name="default_see_all_apps_title" msgid="7481113230662612178">"Se alle appene"</string>
+ <string name="smart_forwarding_title" msgid="8368634861971949799">"Smart viderekobling"</string>
+ <string name="smart_forwarding_summary_enabled" msgid="3341062878373185604">"Smart viderekobling er slått på"</string>
+ <string name="smart_forwarding_summary_disabled" msgid="5033880700091914809">"Smart viderekobling er slått av"</string>
+ <string name="smart_forwarding_ongoing_title" msgid="962226849074401228">"Anropsinnstillinger"</string>
+ <string name="smart_forwarding_ongoing_text" msgid="2189209372407117114">"Oppdaterer innstillingene …"</string>
+ <string name="smart_forwarding_failed_title" msgid="1859891191023516080">"Feil med samtaleinnstillinger"</string>
+ <string name="smart_forwarding_failed_text" msgid="5370431503707373653">"Nettverks- eller SIM-kortfeil."</string>
+ <string name="smart_forwarding_failed_not_activated_text" msgid="997396203001257904">"SIM-kortet er ikke aktivert."</string>
+ <string name="smart_forwarding_input_mdn_title" msgid="5105463748849841763">"Skriv inn telefonnumrene"</string>
+ <string name="smart_forwarding_input_mdn_dialog_title" msgid="7542216086697868415">"Skriv inn telefonnummeret"</string>
+ <string name="smart_forwarding_missing_mdn_text" msgid="2907314684242542226">"Telefonnummeret mangler."</string>
+ <string name="smart_forwarding_missing_alert_dialog_text" msgid="7870419247987316112">"OK"</string>
</resources>
diff --git a/res/values-ne/strings.xml b/res/values-ne/strings.xml
index fd7894a..eff86e7 100644
--- a/res/values-ne/strings.xml
+++ b/res/values-ne/strings.xml
@@ -2267,8 +2267,7 @@
<item quantity="other">सुरक्षित गरिएका <xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> श्रवण यन्त्रहरू</item>
<item quantity="one">सुरक्षित गरिएका <xliff:g id="NUMBER_DEVICE_COUNT_0">%1$d</xliff:g> श्रवण यन्त्र</item>
</plurals>
- <!-- no translation found for accessibility_audio_adjustment_title (1332113739136802997) -->
- <skip />
+ <string name="accessibility_audio_adjustment_title" msgid="1332113739136802997">"अडियो समायोजन"</string>
<string name="accessibility_summary_shortcut_enabled" msgid="4030427268146752644">"सर्टकट सक्रिय छ"</string>
<string name="accessibility_summary_shortcut_disabled" msgid="564005462092499068">"निष्क्रिय"</string>
<string name="accessibility_summary_state_enabled" msgid="1065431632216039369">"सक्रिय"</string>
@@ -2437,6 +2436,7 @@
<string name="bluetooth_on_time" msgid="8424625554628450028">"समयमा Wi-Fi"</string>
<string name="advanced_battery_title" msgid="3005993394776555079">"ब्याट्रीको प्रयोग"</string>
<string name="history_details_title" msgid="8628584613889559355">"इतिहास विवरणहरू"</string>
+ <string name="advanced_battery_preference_title" msgid="6518802648205311326">"ब्याट्रीको उपयोगसम्बन्धी जानकारी हेर्नु…"</string>
<string name="battery_details_title" msgid="4531369291819754178">"ब्याट्रीको प्रयोग"</string>
<string name="details_subtitle" msgid="2550872569652785527">"विवरणहरू प्रयोग गर्नुहोस्"</string>
<string name="controls_subtitle" msgid="3759606830916441564">"उर्जा प्रयोग मिलाउनुहोस्"</string>
@@ -4098,6 +4098,7 @@
<string name="usb_use" msgid="6783183432648438528">"निम्नका लागि USB प्रयोग गर्नुहोस्"</string>
<string name="usb_default_label" msgid="3372838450371060750">"USB को पूर्वनिर्धारित कन्फिगरेसन"</string>
<string name="usb_default_info" msgid="167172599497085266">"अर्को यन्त्र जडान भएको र तपाईंको फोन अनलक भएको खण्डमा यी सेटिङहरू लागू हुने छन्। विश्वसनीय यन्त्रहरूमा मात्र जडान गर्नुहोस्।"</string>
+ <string name="usb_power_title" msgid="5602112548385798646">"पावर बटनसम्बन्धी विकल्पहरू"</string>
<string name="usb_pref" msgid="8521832005703261700">"USB"</string>
<string name="usb_preference" msgid="5084550082591493765">"USB का प्राथमिकताहरू"</string>
<string name="usb_control_title" msgid="1946791559052157693">"निम्नमध्ये USB नियन्त्रण गर्ने चिज"</string>
@@ -4937,8 +4938,8 @@
<string name="mobile_data_ap_mode_disabled" msgid="6067959496888990983">"हवाइजहाज मोडमा हुँदा मोबाइल डेटा उपलब्ध हुँदैन"</string>
<string name="force_desktop_mode" msgid="1336913605091334238">"डेस्कटप मोडमा बल गर्नुहोस्"</string>
<string name="force_desktop_mode_summary" msgid="4587416867846930479">"सहायक प्रदर्शनहरूमा प्रयोगात्मक डेस्कटप मोडमा जोड दिनुहोस्"</string>
- <string name="enable_sizecompat_freeform" msgid="3799755160777404309">"फ्रिफर्म sizecompat सक्षम पार्दछ"</string>
- <string name="enable_sizecompat_freeform_summary" msgid="1484050174538201499">"sizecompat एपहरूलाई फ्रिफर्ममा रहन अनुमति दिन्छ"</string>
+ <string name="enable_non_resizable_multi_window" msgid="6832903754625404477">"विन्डोको आकार मिलाउन नसकिने एपहरू एकभन्दा बढी विन्डोमा खोल्ने विकल्प अन गर्नुहोस्"</string>
+ <string name="enable_non_resizable_multi_window_summary" msgid="3275763753261901999">"विन्डोको आकार मिलाउन नसकिने एपहरू एकभन्दा बढी विन्डोमा खोल्न दिन्छ"</string>
<string name="hwui_force_dark_title" msgid="4256904905631994219">"force-dark ओभरराइड गर्नुहोस्"</string>
<string name="hwui_force_dark_summary" msgid="6515748781487952769">"force-dark सुविधा सधैँ सक्रिय हुन बल गर्छ"</string>
<string name="enable_blurs_on_windows_title" msgid="4218144213800778872">"अस्पष्ट पार्ने सुविधा सक्षम पार्नुहोस्"</string>
@@ -5060,8 +5061,8 @@
<string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"हवाइजहाज, हवाइजहाजका सुरक्षित नेटवर्क"</string>
<string name="calls_and_sms" msgid="1931855083959003306">"कल तथा SMS"</string>
<string name="calls_and_sms_category" msgid="2021321997884906046">"Wi-Fi कलिङ"</string>
- <string name="calls_sms_wfc_summary" msgid="4930471357980272294">"Wi-Fi नेटवर्क जस्ता SIM रहित नेटवर्कमार्फत कल गर्नुहोस् र कल प्राप्त गर्नुहोस्"</string>
- <string name="calls_sms_footnote" msgid="7002461875954024216">"तपाईं Wi-Fi कलिङ सुविधा प्रयोग गरी केही Wi-Fi नेटवर्क जस्ता SIM रहित नेटवर्कमार्फत कल गर्न र कल प्राप्त गर्न सक्नुहुन्छ।"</string>
+ <string name="calls_sms_wfc_summary" msgid="3940529919408667336">"Wi‑Fi मार्फत कल गर्नुहोस् र कल उठाउनुहोस्"</string>
+ <string name="calls_sms_footnote" msgid="8051604228144899434">"Wi-Fi कलिङको सहायताले टेलिफोन कम्पनीको सेवा प्रयोग नगरिकन Wi-Fi नेटवर्कमार्फत कल गर्न र कल उठाउन सकिन्छ।"</string>
<string name="calls_preference_title" msgid="7536882032182563800">"कलहरू"</string>
<string name="sms_preference_title" msgid="8392745501754864395">"SMS"</string>
<string name="calls_sms_preferred" msgid="6016477652522583496">"यो SIM कार्ड प्रयोग गरियोस्"</string>
@@ -5080,9 +5081,10 @@
<string name="reset_internet_text" product="tablet" msgid="8797910368942544453">"तपाईंले यसो गर्नुभयो भने तपाईंको फोन कल अन्त्य हुने छ"</string>
<string name="resetting_internet_text" msgid="6696779371800051806">"इन्टरनेट रिसेट गरिँदै छ…"</string>
<string name="fix_connectivity" msgid="2781433603228089501">"कनेक्टिभिटीसम्बन्धी समस्या समाधान गर्नुहोस्"</string>
- <!-- no translation found for airplane_mode_network_available (1059499681300395240) -->
- <skip />
- <!-- no translation found for to_switch_networks_disconnect_ethernet (6615374552827587197) -->
+ <string name="airplane_mode_network_available" msgid="1059499681300395240">"हवाइजहाज मोडमा काम गर्ने नेटवर्कहरू उपलब्ध छन्"</string>
+ <string name="to_switch_networks_disconnect_ethernet" msgid="6615374552827587197">"नेटवर्क बदल्न इथरनेट डिस्कनेक्ट गर्नुहोस्"</string>
+ <string name="cannot_switch_networks_while_connected" msgid="3867944849171754777">"इथरनेट नेटवर्कमा कनेक्ट भएका बेला नेटवर्क बदल्न सकिँदैन"</string>
+ <!-- no translation found for airplane_mode_network_panel_title (6385046104863403604) -->
<skip />
<string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g> / <xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
<string name="mobile_data_connection_active" msgid="2422223108911581552">"इन्टरनेटमा कनेक्ट गरिएको छ"</string>
@@ -5105,4 +5107,16 @@
<string name="category_name_others" msgid="2366006298768550310">"अन्य"</string>
<string name="category_name_general" msgid="7737273712848115886">"सामान्य"</string>
<string name="default_see_all_apps_title" msgid="7481113230662612178">"सबै एपहरू हेर्नुहोस्"</string>
+ <string name="smart_forwarding_title" msgid="8368634861971949799">"स्मार्ट फर्वार्डिङ"</string>
+ <string name="smart_forwarding_summary_enabled" msgid="3341062878373185604">"स्मार्ट फर्वार्डिङ अन गरियो"</string>
+ <string name="smart_forwarding_summary_disabled" msgid="5033880700091914809">"स्मार्ट फर्वार्डिङ अफ गरियो"</string>
+ <string name="smart_forwarding_ongoing_title" msgid="962226849074401228">"कलसम्बन्धी सेटिङ"</string>
+ <string name="smart_forwarding_ongoing_text" msgid="2189209372407117114">"सेटिङ अपडेट गरिँदै छ…"</string>
+ <string name="smart_forwarding_failed_title" msgid="1859891191023516080">"कलसम्बन्धी सेटिङमा त्रुटि भयो"</string>
+ <string name="smart_forwarding_failed_text" msgid="5370431503707373653">"नेटवर्क वा SIM कार्डसम्बन्धी त्रुटि भयो।"</string>
+ <string name="smart_forwarding_failed_not_activated_text" msgid="997396203001257904">"SIM सक्रिय गरिएको छैन।"</string>
+ <string name="smart_forwarding_input_mdn_title" msgid="5105463748849841763">"फोन नम्बरहरू हाल्नुहोस्"</string>
+ <string name="smart_forwarding_input_mdn_dialog_title" msgid="7542216086697868415">"फोन नम्बर हाल्नुहोस्"</string>
+ <string name="smart_forwarding_missing_mdn_text" msgid="2907314684242542226">"फोन नम्बर हालिएको छैन।"</string>
+ <string name="smart_forwarding_missing_alert_dialog_text" msgid="7870419247987316112">"ठिक छ"</string>
</resources>
diff --git a/res/values-night/themes_suw.xml b/res/values-night/themes_suw.xml
index 16aba76..dea7b1a 100644
--- a/res/values-night/themes_suw.xml
+++ b/res/values-night/themes_suw.xml
@@ -21,6 +21,7 @@
<style name="GlifTheme.DayNight" parent="GlifTheme" />
<style name="GlifV2Theme.DayNight" parent="GlifV2Theme" />
<style name="GlifV3Theme.DayNight" parent="GlifV3Theme" />
+ <style name="GlifV3Theme.DayNight.NoActionBar" parent="GlifV3Theme.NoActionBar" />
<style name="GlifV2Theme.DayNight.Transparent" parent="GlifV2Theme.Transparent" />
<style name="GlifV3Theme.DayNight.Transparent" parent="GlifV3Theme.Transparent" />
<style name="SetupWizardTheme.DayNight.Transparent" parent="SetupWizardTheme.Transparent" />
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 368e660..87fe9aa 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -502,8 +502,8 @@
<string name="crypt_keeper_failed_summary" product="tablet" msgid="5977961188966570342">"Het versleutelen is onderbroken en kan niet worden voltooid. Als gevolg hiervan zijn de gegevens op je telefoon niet meer toegankelijk. \n\nAls je je tablet weer wilt gebruiken, moet je de fabrieksinstellingen herstellen. Wanneer je de tablet instelt na het herstel, krijg je de mogelijkheid gegevens waarvan je een back-up hebt gemaakt in je Google-account, terug te zetten."</string>
<string name="crypt_keeper_failed_summary" product="default" msgid="1028716993071131029">"Het versleutelen is onderbroken en kan niet worden voltooid. Daardoor zijn de gegevens op je telefoon niet meer toegankelijk. \n\nAls je je telefoon weer wilt gebruiken, moet je de fabrieksinstellingen herstellen. Wanneer je de telefoon instelt na het herstel, krijg je de mogelijkheid gegevens terug te zetten waarvan je een back-up hebt gemaakt in je Google-account."</string>
<string name="crypt_keeper_data_corrupt_title" msgid="5920153462176846037">"Ontsleutelen mislukt"</string>
- <string name="crypt_keeper_data_corrupt_summary" product="tablet" msgid="4420666705959562753">"Het wachtwoord dat je hebt opgegeven, is correct, maar je gegevens zijn beschadigd. \n\nAls je je tablet weer wilt gebruiken, moet je deze terugzetten naar de fabrieksinstellingen. Wanneer je je tablet configureert na het terugzetten, heb je de mogelijkheid gegevens waarvan je een back-up in je Google-account hebt gemaakt, te herstellen."</string>
- <string name="crypt_keeper_data_corrupt_summary" product="default" msgid="3200498792238652367">"Het wachtwoord dat je hebt opgegeven, is correct, maar je gegevens zijn beschadigd. \n\nAls je je telefoon weer wilt gebruiken, moet je deze terugzetten naar de fabrieksinstellingen. Wanneer je je telefoon configureert na het terugzetten, heb je de mogelijkheid gegevens waarvan je een back-up in je Google-account hebt gemaakt, te herstellen."</string>
+ <string name="crypt_keeper_data_corrupt_summary" product="tablet" msgid="4420666705959562753">"Het wachtwoord dat je hebt opgegeven, is correct, maar je gegevens zijn beschadigd. \n\nAls je je tablet weer wilt gebruiken, moet je deze terugzetten naar de fabrieksinstellingen. Wanneer je je tablet instelt na het terugzetten, heb je de mogelijkheid gegevens waarvan je een back-up in je Google-account hebt gemaakt, te herstellen."</string>
+ <string name="crypt_keeper_data_corrupt_summary" product="default" msgid="3200498792238652367">"Het wachtwoord dat je hebt opgegeven, is correct, maar je gegevens zijn beschadigd. \n\nAls je je telefoon weer wilt gebruiken, moet je deze terugzetten naar de fabrieksinstellingen. Wanneer je je telefoon instelt na het terugzetten, heb je de mogelijkheid gegevens waarvan je een back-up in je Google-account hebt gemaakt, te herstellen."</string>
<string name="crypt_keeper_switch_input_method" msgid="7712732134989470573">"Invoermethode schakelen"</string>
<string name="suggested_lock_settings_title" msgid="7836065447159730217">"Beveilig je telefoon"</string>
<string name="suggested_lock_settings_summary" product="tablet" msgid="3213718550422761562">"Schermvergrendeling instellen om tablet te beschermen"</string>
@@ -863,7 +863,7 @@
<string name="wifi_menu_p2p" msgid="5234165837732940385">"Wifi Direct"</string>
<string name="wifi_menu_scan" msgid="3498653582115656526">"Scannen"</string>
<string name="wifi_menu_advanced" msgid="1940919392030994019">"Geavanceerd"</string>
- <string name="wifi_menu_configure" msgid="352423980467311427">"Configureren"</string>
+ <string name="wifi_menu_configure" msgid="352423980467311427">"Instellen"</string>
<string name="wifi_menu_connect" msgid="7824796427932811078">"Verbinding maken met netwerk"</string>
<string name="wifi_menu_remember" msgid="8639523871321603112">"Netwerk onthouden"</string>
<string name="wifi_menu_forget" msgid="6557142984528657361">"Netwerk vergeten"</string>
@@ -1478,8 +1478,8 @@
<string name="storage_format_failure" msgid="2042691589726261987">"Kan <xliff:g id="NAME">%1$s</xliff:g> niet formatteren"</string>
<string name="storage_rename_title" msgid="5911285992205282312">"Naam van opslag wijzigen"</string>
<string name="storage_dialog_unmounted" msgid="1187960789775910051">"Deze <xliff:g id="NAME_0">^1</xliff:g> is veilig uitgeworpen, maar is nog steeds beschikbaar. \n\nAls je de <xliff:g id="NAME_1">^1</xliff:g> wilt gebruiken, moet je deze eerst koppelen."</string>
- <string name="storage_dialog_unmountable" msgid="1761107904296941687">"Deze <xliff:g id="NAME_0">^1</xliff:g> is beschadigd. \n\nAls je de <xliff:g id="NAME_1">^1</xliff:g> wilt gebruiken, moet je deze eerst configureren."</string>
- <string name="storage_dialog_unsupported" msgid="7787241928013470089">"Dit apparaat biedt geen ondersteuning voor deze <xliff:g id="NAME_0">^1</xliff:g>. \n\nAls je de <xliff:g id="NAME_1">^1</xliff:g> wilt gebruiken met dit apparaat, moet je deze eerst configureren."</string>
+ <string name="storage_dialog_unmountable" msgid="1761107904296941687">"Deze <xliff:g id="NAME_0">^1</xliff:g> is beschadigd. \n\nAls je de <xliff:g id="NAME_1">^1</xliff:g> wilt gebruiken, moet je deze eerst instellen."</string>
+ <string name="storage_dialog_unsupported" msgid="7787241928013470089">"Dit apparaat biedt geen ondersteuning voor deze <xliff:g id="NAME_0">^1</xliff:g>. \n\nAls je de <xliff:g id="NAME_1">^1</xliff:g> wilt gebruiken met dit apparaat, moet je deze eerst instellen."</string>
<string name="storage_internal_format_details" msgid="8922023528848861812">"Na het formatteren kun je deze <xliff:g id="NAME_0">^1</xliff:g> gebruiken in andere apparaten. \n\nAlle gegevens op deze <xliff:g id="NAME_1">^1</xliff:g> worden gewist. Misschien wil je daarom eerst een back-up maken. \n\n"<b>"Maak back-ups van foto\'s en andere media"</b>" \nVerplaats je mediabestanden naar alternatieve opslagruimte op dit apparaat of zet ze over naar een computer via een USB-kabel. \n\n"<b>"Maak back-ups van apps"</b>" \nAlle apps die zijn opgeslagen op deze <xliff:g id="NAME_6">^1</xliff:g>, worden verwijderd en de bijbehorende gegevens worden gewist. Als je deze apps wilt behouden, verplaats je ze naar alternatieve opslagruimte op dit apparaat."</string>
<string name="storage_internal_unmount_details" msgid="487689543322907311"><b>"Wanneer je deze <xliff:g id="NAME_0">^1</xliff:g> uitwerpt, werken apps die erop zijn opgeslagen niet meer. Mediabestanden die hierop zijn opgeslagen, zijn pas weer beschikbaar als het opslagapparaat weer wordt geplaatst."</b>" \n\nDe <xliff:g id="NAME_1">^1</xliff:g> is geformatteerd voor gebruik in dit apparaat en werkt niet in andere apparaten."</string>
<string name="storage_internal_forget_details" msgid="5606507270046186691">"Als je de apps, foto\'s of gegevens op deze <xliff:g id="NAME">^1</xliff:g> wilt gebruiken, plaats je deze opnieuw. \n\nJe kunt er ook voor kiezen dit opslagapparaat te vergeten als het apparaat niet beschikbaar is. \n\nAls je ervoor kiest het apparaat te vergeten, gaat alle gegevens op het apparaat definitief verloren. \n\nJe kunt de apps later opnieuw installeren, maar de op het apparaat opgeslagen app-gegevens gaan verloren."</string>
@@ -1496,7 +1496,7 @@
<string name="storage_detail_dialog_other" msgid="3359851869961609901">"Overig omvat gedeelde bestanden die zijn opgeslagen door apps, bestanden die zijn gedownload van internet of via bluetooth, Android-bestanden, enzovoort. \n\nAls je de zichtbare content van deze <xliff:g id="NAME">^1</xliff:g> wilt bekijken, tik je op Verkennen."</string>
<string name="storage_detail_dialog_system" msgid="7461009051858709479">"Systeem omvat bestanden die worden gebruikt om Android-versie <xliff:g id="VERSION">%s</xliff:g> uit te voeren"</string>
<string name="storage_detail_dialog_user" msgid="1691219071007313226">"<xliff:g id="USER_0">^1</xliff:g> kan <xliff:g id="SIZE">^2</xliff:g> van de opslag hebben gebruikt voor foto\'s, muziek, apps of andere gegevens. \n\nSchakel over naar <xliff:g id="USER_1">^1</xliff:g> voor meer informatie."</string>
- <string name="storage_wizard_init_title" msgid="9036374223934708619">"Je <xliff:g id="NAME">^1</xliff:g> configureren"</string>
+ <string name="storage_wizard_init_title" msgid="9036374223934708619">"Je <xliff:g id="NAME">^1</xliff:g> instellen"</string>
<string name="storage_wizard_init_external_title" msgid="6540132491909241713">"Gebruiken als draagbare opslag"</string>
<string name="storage_wizard_init_external_summary" msgid="5807552934494462984">"Voor het verplaatsen van foto\'s en andere media tussen apparaten."</string>
<string name="storage_wizard_init_internal_title" msgid="3256355049992147270">"Gebruiken als interne opslag"</string>
@@ -2267,8 +2267,7 @@
<item quantity="other"><xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> opgeslagen hoortoestellen</item>
<item quantity="one"><xliff:g id="NUMBER_DEVICE_COUNT_0">%1$d</xliff:g> opgeslagen hoortoestel</item>
</plurals>
- <!-- no translation found for accessibility_audio_adjustment_title (1332113739136802997) -->
- <skip />
+ <string name="accessibility_audio_adjustment_title" msgid="1332113739136802997">"Audioaanpassing"</string>
<string name="accessibility_summary_shortcut_enabled" msgid="4030427268146752644">"Snelkoppeling aan"</string>
<string name="accessibility_summary_shortcut_disabled" msgid="564005462092499068">"Uit"</string>
<string name="accessibility_summary_state_enabled" msgid="1065431632216039369">"Aan"</string>
@@ -2393,7 +2392,7 @@
<string name="print_restart" msgid="4424096106141083945">"Opnieuw starten"</string>
<string name="print_cancel" msgid="7611266511967568501">"Annuleren"</string>
<string name="print_job_summary" msgid="277210060872032969">"<xliff:g id="PRINTER">%1$s</xliff:g>\n<xliff:g id="TIME">%2$s</xliff:g>"</string>
- <string name="print_configuring_state_title_template" msgid="2887013172492183045">"<xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g> configureren"</string>
+ <string name="print_configuring_state_title_template" msgid="2887013172492183045">"<xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g> instellen"</string>
<string name="print_printing_state_title_template" msgid="7367513245156603431">"<xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g> afdrukken"</string>
<string name="print_cancelling_state_title_template" msgid="9094795458159980190">"<xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g> annuleren"</string>
<string name="print_failed_state_title_template" msgid="4751695809935404505">"Printerfout <xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g>"</string>
@@ -2437,6 +2436,7 @@
<string name="bluetooth_on_time" msgid="8424625554628450028">"Wifi op tijd"</string>
<string name="advanced_battery_title" msgid="3005993394776555079">"Batterijgebruik"</string>
<string name="history_details_title" msgid="8628584613889559355">"Geschiedenisdetails"</string>
+ <string name="advanced_battery_preference_title" msgid="6518802648205311326">"Batterijgebruik bekijken"</string>
<string name="battery_details_title" msgid="4531369291819754178">"Batterijgebruik"</string>
<string name="details_subtitle" msgid="2550872569652785527">"Gebruiksdetails"</string>
<string name="controls_subtitle" msgid="3759606830916441564">"Energieverbruik aanpassen"</string>
@@ -3996,7 +3996,7 @@
<string name="filter_notif_blocked_channels" msgid="1131444963543380495">"Categorieën: uitgeschakeld"</string>
<string name="filter_notif_dnd_channels" msgid="13445325087914932">"Categorieën: \'Niet storen\' negeren"</string>
<string name="advanced_apps" msgid="7643010673326578815">"Geavanceerd"</string>
- <string name="configure_apps" msgid="5468359087126598115">"Apps configureren"</string>
+ <string name="configure_apps" msgid="5468359087126598115">"Apps instellen"</string>
<string name="unknown_app" msgid="2027248925719898714">"Onbekende app"</string>
<string name="app_permissions" msgid="8666537659217653626">"Rechtenbeheer"</string>
<string name="app_permissions_summary" msgid="2709819220672938860">"Apps die <xliff:g id="APPS">%1$s</xliff:g> gebruiken"</string>
@@ -4098,6 +4098,7 @@
<string name="usb_use" msgid="6783183432648438528">"USB gebruiken voor"</string>
<string name="usb_default_label" msgid="3372838450371060750">"Standaard USB-instellingen"</string>
<string name="usb_default_info" msgid="167172599497085266">"Wanneer er een ander apparaat is verbonden en je telefoon is ontgrendeld, worden deze instellingen toegepast. Maak alleen verbinding met vertrouwde apparaten."</string>
+ <string name="usb_power_title" msgid="5602112548385798646">"Voedingsopties"</string>
<string name="usb_pref" msgid="8521832005703261700">"USB"</string>
<string name="usb_preference" msgid="5084550082591493765">"USB-voorkeuren"</string>
<string name="usb_control_title" msgid="1946791559052157693">"USB beheerd door"</string>
@@ -4324,7 +4325,7 @@
<string name="set_data_limit" msgid="9010326815874642680">"Datalimiet instellen"</string>
<string name="data_limit" msgid="8731731657513652363">"Datalimiet"</string>
<string name="data_usage_template" msgid="3822452362629968010">"<xliff:g id="ID_1">%1$s</xliff:g> gebruikt in de periode <xliff:g id="ID_2">%2$s</xliff:g>"</string>
- <string name="configure" msgid="1499586749829665889">"Configureren"</string>
+ <string name="configure" msgid="1499586749829665889">"Instellen"</string>
<string name="data_usage_other_apps" msgid="5649047093607329537">"Andere apps opgenomen in gebruik"</string>
<plurals name="data_saver_unrestricted_summary" formatted="false" msgid="3316296488378947221">
<item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> apps mogen onbeperkt data gebruiken terwijl Databesparing is ingeschakeld</item>
@@ -4557,7 +4558,7 @@
<string name="domain_url_section_title" msgid="9028890472923474958">"Geïnstalleerde apps"</string>
<string name="automatic_storage_manager_activation_warning" msgid="170508173207142665">"Je opslag wordt nu beheerd door de opslagbeheerder"</string>
<string name="account_for_section_header" msgid="7466759342105251096">"Accounts voor <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
- <string name="configure_section_header" msgid="3126887329521705210">"Configureren"</string>
+ <string name="configure_section_header" msgid="3126887329521705210">"Instellen"</string>
<string name="auto_sync_account_title" msgid="1070908045600374254">"App-gegevens automatisch synchroniseren"</string>
<string name="auto_sync_personal_account_title" msgid="3544275021920818595">"Persoonsgegevens automatisch synchroniseren"</string>
<string name="auto_sync_work_account_title" msgid="6060310415978781885">"Werkgegevens automatisch synchroniseren"</string>
@@ -4937,8 +4938,8 @@
<string name="mobile_data_ap_mode_disabled" msgid="6067959496888990983">"Niet beschikbaar in de vliegtuigmodus"</string>
<string name="force_desktop_mode" msgid="1336913605091334238">"Desktopmodus afdwingen"</string>
<string name="force_desktop_mode_summary" msgid="4587416867846930479">"Experimentele desktopmodus afdwingen op secundaire displays"</string>
- <string name="enable_sizecompat_freeform" msgid="3799755160777404309">"Sizecompat in freeform toestaan"</string>
- <string name="enable_sizecompat_freeform_summary" msgid="1484050174538201499">"Hiermee kunnen sizecompat-apps ook freeform zijn"</string>
+ <string name="enable_non_resizable_multi_window" msgid="6832903754625404477">"Apps met niet-aanpasbaar formaat aanzetten in meerdere vensters"</string>
+ <string name="enable_non_resizable_multi_window_summary" msgid="3275763753261901999">"Hiermee worden apps met een niet-aanpasbaar formaat toegestaan in meerdere vensters"</string>
<string name="hwui_force_dark_title" msgid="4256904905631994219">"Gedwongen donker maken negeren"</string>
<string name="hwui_force_dark_summary" msgid="6515748781487952769">"Overschrijft de functie voor gedwongen donker maken zodat deze altijd aan is"</string>
<string name="enable_blurs_on_windows_title" msgid="4218144213800778872">"Vervaging inschakelen"</string>
@@ -5060,8 +5061,8 @@
<string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"vliegtuig, geschikt voor vliegtuigen"</string>
<string name="calls_and_sms" msgid="1931855083959003306">"Gesprekken en sms\'jes"</string>
<string name="calls_and_sms_category" msgid="2021321997884906046">"Bellen via wifi"</string>
- <string name="calls_sms_wfc_summary" msgid="4930471357980272294">"Bellen en gebeld worden via niet-providernetwerken zoals wifi"</string>
- <string name="calls_sms_footnote" msgid="7002461875954024216">"Met bellen via wifi kun je bellen en gebeld worden via niet-providernetwerken zoals bepaalde wifi-netwerken."</string>
+ <string name="calls_sms_wfc_summary" msgid="3940529919408667336">"Bellen en gebeld worden via wifi"</string>
+ <string name="calls_sms_footnote" msgid="8051604228144899434">"Met bellen via wifi kun je bellen en gebeld worden via wifi-netwerken die niet van je provider zijn."</string>
<string name="calls_preference_title" msgid="7536882032182563800">"Gesprekken"</string>
<string name="sms_preference_title" msgid="8392745501754864395">"Sms"</string>
<string name="calls_sms_preferred" msgid="6016477652522583496">"voorkeur"</string>
@@ -5080,10 +5081,10 @@
<string name="reset_internet_text" product="tablet" msgid="8797910368942544453">"Hiermee wordt je telefoongesprek beëindigd"</string>
<string name="resetting_internet_text" msgid="6696779371800051806">"Je internet resetten…"</string>
<string name="fix_connectivity" msgid="2781433603228089501">"Connectiviteitsproblemen oplossen"</string>
- <!-- no translation found for airplane_mode_network_available (1059499681300395240) -->
- <skip />
- <!-- no translation found for to_switch_networks_disconnect_ethernet (6615374552827587197) -->
- <skip />
+ <string name="airplane_mode_network_available" msgid="1059499681300395240">"Netwerken voor vliegtuigmodus beschikbaar"</string>
+ <string name="to_switch_networks_disconnect_ethernet" msgid="6615374552827587197">"Verbreek de ethernetverbinding om van netwerk te wisselen"</string>
+ <string name="cannot_switch_networks_while_connected" msgid="3867944849171754777">"Kan niet van netwerk wisselen als er verbinding is"</string>
+ <string name="airplane_mode_network_panel_title" msgid="6385046104863403604">"Netwerken voor vliegtuigmodus"</string>
<string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g>/<xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
<string name="mobile_data_connection_active" msgid="2422223108911581552">"Verbonden"</string>
<string name="mobile_data_off_summary" msgid="3841411571485837651">"Internet maakt niet automatisch verbinding"</string>
@@ -5105,4 +5106,16 @@
<string name="category_name_others" msgid="2366006298768550310">"Overig"</string>
<string name="category_name_general" msgid="7737273712848115886">"Algemeen"</string>
<string name="default_see_all_apps_title" msgid="7481113230662612178">"Alle apps bekijken"</string>
+ <string name="smart_forwarding_title" msgid="8368634861971949799">"Slim doorschakelen"</string>
+ <string name="smart_forwarding_summary_enabled" msgid="3341062878373185604">"Slim doorschakelen staat aan"</string>
+ <string name="smart_forwarding_summary_disabled" msgid="5033880700091914809">"Slim doorschakelen staat uit"</string>
+ <string name="smart_forwarding_ongoing_title" msgid="962226849074401228">"Gespreksinstellingen"</string>
+ <string name="smart_forwarding_ongoing_text" msgid="2189209372407117114">"Instellingen updaten..."</string>
+ <string name="smart_forwarding_failed_title" msgid="1859891191023516080">"Fout met gespreksinstellingen"</string>
+ <string name="smart_forwarding_failed_text" msgid="5370431503707373653">"Netwerk- of simkaartfout."</string>
+ <string name="smart_forwarding_failed_not_activated_text" msgid="997396203001257904">"Simkaart is niet geactiveerd."</string>
+ <string name="smart_forwarding_input_mdn_title" msgid="5105463748849841763">"Telefoonnummers opgeven"</string>
+ <string name="smart_forwarding_input_mdn_dialog_title" msgid="7542216086697868415">"Telefoonnummer opgeven"</string>
+ <string name="smart_forwarding_missing_mdn_text" msgid="2907314684242542226">"Telefoonnummer ontbreekt."</string>
+ <string name="smart_forwarding_missing_alert_dialog_text" msgid="7870419247987316112">"OK"</string>
</resources>
diff --git a/res/values-or/strings.xml b/res/values-or/strings.xml
index da30f40..e5247a9 100644
--- a/res/values-or/strings.xml
+++ b/res/values-or/strings.xml
@@ -2267,8 +2267,7 @@
<item quantity="other"><xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g>ଟି ସେଭ୍ ହୋଇଥିବା ଶ୍ରବଣ ଯନ୍ତ୍ର</item>
<item quantity="one"><xliff:g id="NUMBER_DEVICE_COUNT_0">%1$d</xliff:g>ଟି ସେଭ୍ ହୋଇଥିବା ଶ୍ରବଣ ଯନ୍ତ୍ର</item>
</plurals>
- <!-- no translation found for accessibility_audio_adjustment_title (1332113739136802997) -->
- <skip />
+ <string name="accessibility_audio_adjustment_title" msgid="1332113739136802997">"ଅଡିଓ ଆଡଜଷ୍ଟମେଣ୍ଟ"</string>
<string name="accessibility_summary_shortcut_enabled" msgid="4030427268146752644">"ସର୍ଟକଟ୍ ଚାଲୁ ଅଛି"</string>
<string name="accessibility_summary_shortcut_disabled" msgid="564005462092499068">"ବନ୍ଦ ଅଛି"</string>
<string name="accessibility_summary_state_enabled" msgid="1065431632216039369">"ଚାଲୁ"</string>
@@ -2437,6 +2436,7 @@
<string name="bluetooth_on_time" msgid="8424625554628450028">"ୱାଇ-ଫାଇ ଅନ୍ କରିବାର ସମୟ"</string>
<string name="advanced_battery_title" msgid="3005993394776555079">"ବ୍ୟାଟେରୀ ବ୍ୟବହାର"</string>
<string name="history_details_title" msgid="8628584613889559355">"ହିଷ୍ଟୋରୀ ବିବରଣୀ"</string>
+ <string name="advanced_battery_preference_title" msgid="6518802648205311326">"ବ୍ୟାଟେରୀ ବ୍ୟବହାର ଦେଖନ୍ତୁ"</string>
<string name="battery_details_title" msgid="4531369291819754178">"ବ୍ୟାଟେରୀର ବ୍ୟବହାର"</string>
<string name="details_subtitle" msgid="2550872569652785527">"ବିବରଣୀ ବ୍ୟବହାର କରନ୍ତୁ"</string>
<string name="controls_subtitle" msgid="3759606830916441564">"ପାୱାର୍ ବ୍ୟବହାର ଆଡ୍ଜଷ୍ଟ କରନ୍ତୁ"</string>
@@ -4098,6 +4098,7 @@
<string name="usb_use" msgid="6783183432648438528">"ଏହା ପାଇଁ USB ବ୍ୟବହାର କରନ୍ତୁ"</string>
<string name="usb_default_label" msgid="3372838450371060750">"ଡିଫଲ୍ଟ USB କନଫିଗରେସନ୍"</string>
<string name="usb_default_info" msgid="167172599497085266">"ଯେତେବେଳେ ଅନ୍ୟ ଡିଭାଇସ୍ କନେକ୍ଟ ହୋଇଥାଏ ଏବଂ ଆପଣଙ୍କର ଫୋନ୍ ଅନଲକ୍ ଥାଏ, ଏହି ସେଟିଙ୍ଗଗୁଡ଼ିକ ଲାଗୁ ହେବ। କେବଳ ବିଶ୍ୱସନୀୟ ଡିଭାଇସ୍ଗୁଡ଼ିକ ସହ କନେକ୍ଟ କରନ୍ତୁ।"</string>
+ <string name="usb_power_title" msgid="5602112548385798646">"ପାୱାର ବିକଳ୍ପଗୁଡ଼ିକ"</string>
<string name="usb_pref" msgid="8521832005703261700">"USB"</string>
<string name="usb_preference" msgid="5084550082591493765">"USB ପସନ୍ଦଗୁଡ଼ିକ"</string>
<string name="usb_control_title" msgid="1946791559052157693">"USB ଏହା ଦ୍ୱାରା ନିୟନ୍ତ୍ରିତ"</string>
@@ -4937,8 +4938,8 @@
<string name="mobile_data_ap_mode_disabled" msgid="6067959496888990983">"ଏୟାରପ୍ଲେନ୍ ମୋଡ୍ ସମୟରେ ଉପଲବ୍ଧ ନୁହେଁ"</string>
<string name="force_desktop_mode" msgid="1336913605091334238">"ଫୋର୍ସ ଡେସ୍କଟପ୍ ମୋଡ୍"</string>
<string name="force_desktop_mode_summary" msgid="4587416867846930479">"ଦ୍ବିତୀୟ ପ୍ରଦର୍ଶନରେ ଫୋର୍ସ ପରୀକ୍ଷାମୂଳକ ମୋଡ୍"</string>
- <string name="enable_sizecompat_freeform" msgid="3799755160777404309">"ଫ୍ରିଫର୍ମ ସାଇଜ୍କମ୍ପାଟ୍ ସକ୍ଷମ କରନ୍ତୁ"</string>
- <string name="enable_sizecompat_freeform_summary" msgid="1484050174538201499">"ଫ୍ରିଫର୍ମରେ ରଖିବା ପାଇଁ ସାଇଜ୍କମ୍ପାଟ୍ ଆପ୍ସ ଅନୁମତି କରିଥାଏ"</string>
+ <string name="enable_non_resizable_multi_window" msgid="6832903754625404477">"ମଲ୍ଟି ୱିଣ୍ଡୋରେ ରିସାଇଜ୍ କରାଯାଇପାରୁନଥିବାକୁ ସକ୍ଷମ କରନ୍ତୁ"</string>
+ <string name="enable_non_resizable_multi_window_summary" msgid="3275763753261901999">"ରିସାଇଜ୍ କରାଯାଇପାରୁନଥିବା ଆପଗୁଡ଼ିକୁ ମଲ୍ଟି ୱିଣ୍ଡୋରେ ରହିବା ପାଇଁ ଅନୁମତି ଦିଏ"</string>
<string name="hwui_force_dark_title" msgid="4256904905631994219">"ଫୋର୍ସ୍-ଡାର୍କ୍ ଓଭର୍ରାଇଡ୍ କରନ୍ତୁ"</string>
<string name="hwui_force_dark_summary" msgid="6515748781487952769">"ଫୋର୍ସ-ଡାର୍କ ଫିଚର୍ ସଦାବେଳେ ଚାଲୁ ରହିବା ଓଭର୍ରାଇଡ୍ କରିଥାଏ"</string>
<string name="enable_blurs_on_windows_title" msgid="4218144213800778872">"ବ୍ଲର୍ ସକ୍ଷମ କରନ୍ତୁ"</string>
@@ -5060,8 +5061,8 @@
<string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"ଏୟାରପ୍ଲେନ୍, ଏୟାରପ୍ଲେନ୍-ସେଫ୍"</string>
<string name="calls_and_sms" msgid="1931855083959003306">"କଲ୍ ଓ SMS"</string>
<string name="calls_and_sms_category" msgid="2021321997884906046">"ୱାଇ-ଫାଇ କଲିଂ"</string>
- <string name="calls_sms_wfc_summary" msgid="4930471357980272294">"ୱାଇ‑ଫାଇ ପରି ନନ୍‑କ୍ୟାରିଅର୍ ନେଟୱାର୍କରେ କଲ୍ କରନ୍ତୁ ଓ ପ୍ରାପ୍ତ କରନ୍ତୁ"</string>
- <string name="calls_sms_footnote" msgid="7002461875954024216">"ୱାଇ‑ଫାଇ କଲିଂ ଆପଣଙ୍କୁ କେତେକ ୱାଇ‑ଫାଇ ନେଟୱାର୍କ ପରି ନନ୍‑କ୍ୟାରିଅର୍ ନେଟୱାର୍କରେ କଲ୍ କରିବା ଓ ପ୍ରାପ୍ତ କରିବାକୁ ଅନୁମତି ଦେଇଥାଏ।"</string>
+ <string name="calls_sms_wfc_summary" msgid="3940529919408667336">"ୱାଇ-ଫାଇ ମାଧ୍ୟମରେ କଲ୍ କରନ୍ତୁ ଓ ପ୍ରାପ୍ତ କରନ୍ତୁ"</string>
+ <string name="calls_sms_footnote" msgid="8051604228144899434">"ୱାଇ-ଫାଇ କଲିଂ ଦ୍ୱାରା, କଲଗୁଡ଼ିକୁ ନନ୍-କ୍ୟାରିଅର୍ ନେଟୱାର୍କଗୁଡ଼ିକ ମାଧ୍ୟମରେ କରାଯାଏ ଓ ପ୍ରାପ୍ତ କରାଯାଏ।"</string>
<string name="calls_preference_title" msgid="7536882032182563800">"କଲଗୁଡ଼ିକ"</string>
<string name="sms_preference_title" msgid="8392745501754864395">"SMS"</string>
<string name="calls_sms_preferred" msgid="6016477652522583496">"ପସନ୍ଦ କରାଯାଇଛି"</string>
@@ -5080,10 +5081,10 @@
<string name="reset_internet_text" product="tablet" msgid="8797910368942544453">"ଏହା ଆପଣଙ୍କ ଫୋନ୍ କଲକୁ ସମାପ୍ତ କରିବ।"</string>
<string name="resetting_internet_text" msgid="6696779371800051806">"ଆପଣଙ୍କ ଇଣ୍ଟରନେଟ୍ ରିସେଟ୍ ହେଉଛି…"</string>
<string name="fix_connectivity" msgid="2781433603228089501">"ସଂଯୋଗ ଠିକ୍ କରନ୍ତୁ"</string>
- <!-- no translation found for airplane_mode_network_available (1059499681300395240) -->
- <skip />
- <!-- no translation found for to_switch_networks_disconnect_ethernet (6615374552827587197) -->
- <skip />
+ <string name="airplane_mode_network_available" msgid="1059499681300395240">"ଏୟାରପ୍ଲେନ୍ ମୋଡ୍ ନେଟୱାର୍କଗୁଡ଼ିକ ଉପଲବ୍ଧ ଅଛି"</string>
+ <string name="to_switch_networks_disconnect_ethernet" msgid="6615374552827587197">"ନେଟୱାର୍କ ସୁଇଚ୍ କରିବାକୁ, ଇଥରନେଟ୍ ବିଚ୍ଛିନ୍ନ କରନ୍ତୁ"</string>
+ <string name="cannot_switch_networks_while_connected" msgid="3867944849171754777">"ସଂଯୋଗ କରାଯାଇଥିବା ସମୟରେ ନେଟୱାର୍କ୍ ସ୍ୱିଚ୍ କରିପାରିବ ନାହିଁ"</string>
+ <string name="airplane_mode_network_panel_title" msgid="6385046104863403604">"ଏୟାରପ୍ଲେନ୍ ମୋଡ୍ ନେଟୱାର୍କଗୁଡ଼ିକ"</string>
<string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g> / <xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
<string name="mobile_data_connection_active" msgid="2422223108911581552">"ସଂଯୋଗ କରାଯାଇଛି"</string>
<string name="mobile_data_off_summary" msgid="3841411571485837651">"ଇଣ୍ଟରନେଟ୍ ସ୍ଵତଃ-ସଂଯୋଗ କରିବ ନାହିଁ"</string>
@@ -5105,4 +5106,16 @@
<string name="category_name_others" msgid="2366006298768550310">"ଅନ୍ୟ"</string>
<string name="category_name_general" msgid="7737273712848115886">"ସାଧାରଣ"</string>
<string name="default_see_all_apps_title" msgid="7481113230662612178">"ସମସ୍ତ ଆପ୍ ଦେଖନ୍ତୁ"</string>
+ <string name="smart_forwarding_title" msgid="8368634861971949799">"ସ୍ମାର୍ଟ ଫରୱାର୍ଡିଂ"</string>
+ <string name="smart_forwarding_summary_enabled" msgid="3341062878373185604">"ସ୍ମାର୍ଟ ଫରୱାର୍ଡିଂ ସକ୍ଷମ କରାଯାଇଛି"</string>
+ <string name="smart_forwarding_summary_disabled" msgid="5033880700091914809">"ସ୍ମାର୍ଟ ଫରୱାର୍ଡିଂ ଅକ୍ଷମ କରାଯାଇଛି"</string>
+ <string name="smart_forwarding_ongoing_title" msgid="962226849074401228">"କଲ୍ ସେଟିଂସ୍"</string>
+ <string name="smart_forwarding_ongoing_text" msgid="2189209372407117114">"ସେଟିଂସ୍ ଅପଡେଟ୍ ହେଉଛି…"</string>
+ <string name="smart_forwarding_failed_title" msgid="1859891191023516080">"କଲ୍ ସେଟିଂସ୍ ତ୍ରୁଟି"</string>
+ <string name="smart_forwarding_failed_text" msgid="5370431503707373653">"ନେଟୱାର୍କ କିମ୍ବା SIM କାର୍ଡ ତ୍ରୁଟି।"</string>
+ <string name="smart_forwarding_failed_not_activated_text" msgid="997396203001257904">"SIM ସକ୍ରିୟ କରାଯାଇନାହିଁ।"</string>
+ <string name="smart_forwarding_input_mdn_title" msgid="5105463748849841763">"ଫୋନ୍ ନମ୍ଵରଗୁଡ଼ିକ ଲେଖନ୍ତୁ"</string>
+ <string name="smart_forwarding_input_mdn_dialog_title" msgid="7542216086697868415">"ଫୋନ୍ ନମ୍ଵର୍ ଲେଖନ୍ତୁ"</string>
+ <string name="smart_forwarding_missing_mdn_text" msgid="2907314684242542226">"ଫୋନ୍ ନମ୍ଵର୍ ଉପଲବ୍ଧ ନାହିଁ।"</string>
+ <string name="smart_forwarding_missing_alert_dialog_text" msgid="7870419247987316112">"ଠିକ୍ ଅଛି"</string>
</resources>
diff --git a/res/values-pa/strings.xml b/res/values-pa/strings.xml
index 1729d80..9c35ce3 100644
--- a/res/values-pa/strings.xml
+++ b/res/values-pa/strings.xml
@@ -427,8 +427,7 @@
<string name="cancel_lock_screen_dialog_button_label" msgid="1801132985957491690">"ਰੱਦ ਕਰੋ"</string>
<string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="886085239313346000">"ਸੈਂਸਰ ਨੂੰ ਸਪਰਸ਼ ਕਰੋ"</string>
<string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="6160543980992596286">"ਇਹ ਤੁਹਾਡੇ ਫ਼ੋਨ ਦੇ ਪਿਛਲੇ ਪਾਸੇ ਹੈ। ਆਪਣੀ ਅੰਗੂਠੇ ਦੇ ਨਾਲ ਦੀ ਉਂਗਲ ਦੀ ਵਰਤੋਂ ਕਰੋ।"</string>
- <!-- no translation found for security_settings_udfps_enroll_find_sensor_message (1181700918690345832) -->
- <skip />
+ <string name="security_settings_udfps_enroll_find_sensor_message" msgid="1181700918690345832">"ਇਹ ਸਕ੍ਰੀਨ \'ਤੇ ਹੈ। ਚਮਕਦੇ ਚੱਕਰ ਵਾਲੇ ਫਿੰਗਰਪ੍ਰਿੰਟ ਸੈਂਸਰ ਨੂੰ ਲੱਭੋ।"</string>
<string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="3065850549419750523">"ਡੀਵਾਈਸ ਵਾਲੀ ਤਸਵੀਰ ਅਤੇ ਫਿੰਗਰਪ੍ਰਿੰਟ ਸੈਂਸਰ ਟਿਕਾਣਾ"</string>
<string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7298812463228440333">"ਨਾਮ"</string>
<string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4074335979239208021">"ਠੀਕ"</string>
@@ -2268,8 +2267,7 @@
<item quantity="one">ਰੱਖਿਅਤ ਕੀਤਾ <xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> ਸੁਣਨ ਦਾ ਸਾਧਨ</item>
<item quantity="other">ਰੱਖਿਅਤ ਕੀਤੇ <xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> ਸੁਣਨ ਦੇ ਸਾਧਨ</item>
</plurals>
- <!-- no translation found for accessibility_audio_adjustment_title (1332113739136802997) -->
- <skip />
+ <string name="accessibility_audio_adjustment_title" msgid="1332113739136802997">"ਆਡੀਓ ਵਾਧ-ਘਾਟ"</string>
<string name="accessibility_summary_shortcut_enabled" msgid="4030427268146752644">"ਸ਼ਾਰਟਕੱਟ ਚਾਲੂ ਹੈ"</string>
<string name="accessibility_summary_shortcut_disabled" msgid="564005462092499068">"ਬੰਦ"</string>
<string name="accessibility_summary_state_enabled" msgid="1065431632216039369">"ਚਾਲੂ"</string>
@@ -2438,6 +2436,7 @@
<string name="bluetooth_on_time" msgid="8424625554628450028">"ਵਾਈ‑ਫਾਈ ਚਾਲੂ ਹੋਣ ਦਾ ਸਮਾਂ"</string>
<string name="advanced_battery_title" msgid="3005993394776555079">"ਬੈਟਰੀ ਵਰਤੋਂ"</string>
<string name="history_details_title" msgid="8628584613889559355">"ਇਤਿਹਾਸ ਵੇਰਵੇ"</string>
+ <string name="advanced_battery_preference_title" msgid="6518802648205311326">"ਬੈਟਰੀ ਵਰਤੋਂ ਦੇਖੋ"</string>
<string name="battery_details_title" msgid="4531369291819754178">"ਬੈਟਰੀ ਵਰਤੋਂ"</string>
<string name="details_subtitle" msgid="2550872569652785527">"ਵਰਤੋਂ ਵੇਰਵੇ"</string>
<string name="controls_subtitle" msgid="3759606830916441564">"ਪਾਵਰ ਵਰਤੋਂ ਵਿਵਸਥਿਤ ਕਰੋ"</string>
@@ -4099,6 +4098,7 @@
<string name="usb_use" msgid="6783183432648438528">"ਇਸ ਲਈ USB ਵਰਤੋ"</string>
<string name="usb_default_label" msgid="3372838450371060750">"ਪੂਰਵ-ਨਿਰਧਾਰਤ USB ਸੰਰੂਪਣ"</string>
<string name="usb_default_info" msgid="167172599497085266">"ਜਦੋਂ ਕੋਈ ਹੋਰ ਡੀਵਾਈਸ ਕਨੈਕਟ ਕੀਤਾ ਜਾਂਦਾ ਹੈ ਅਤੇ ਤੁਹਾਡੇ ਫ਼ੋਨ ਨੂੰ ਅਣਲਾਕ ਕੀਤਾ ਜਾਂਦਾ ਹੈ, ਤਾਂ ਇਹ ਸੈਟਿੰਗਾਂ ਲਾਗੂ ਕੀਤੀਆਂ ਜਾਣਗੀਆਂ। ਸਿਰਫ਼ ਭਰੋਸੇਯੋਗ ਡੀਵਾਈਸਾਂ ਨਾਲ ਕਨੈਕਟ ਕਰੋ।"</string>
+ <string name="usb_power_title" msgid="5602112548385798646">"ਪਾਵਰ ਵਿਕਲਪ"</string>
<string name="usb_pref" msgid="8521832005703261700">"USB"</string>
<string name="usb_preference" msgid="5084550082591493765">"USB ਤਰਜੀਹਾਂ"</string>
<string name="usb_control_title" msgid="1946791559052157693">"ਇਸ ਵੱਲੋਂ USB ਨੂੰ ਕੰਟਰੋਲ ਕੀਤਾ ਜਾਂਦਾ ਹੈ"</string>
@@ -4938,8 +4938,8 @@
<string name="mobile_data_ap_mode_disabled" msgid="6067959496888990983">"ਹਵਾਈ-ਜਹਾਜ਼ ਮੋਡ ਚਾਲੂ ਹੋਣ ਵੇਲੇ ਉਪਲਬਧ ਨਹੀਂ ਹੈ"</string>
<string name="force_desktop_mode" msgid="1336913605091334238">"ਜ਼ਬਰਦਸਤੀ ਡੈਸਕਟਾਪ ਮੋਡ ਵਿੱਚ ਲਿਆਓ"</string>
<string name="force_desktop_mode_summary" msgid="4587416867846930479">"ਸੈਕੰਡਰੀ ਡਿਸਪਲੇਆਂ \'ਤੇ ਜ਼ਬਰਦਸਤੀ ਪ੍ਰਯੋਗਮਈ ਡੈਸਕਟਾਪ ਮੋਡ"</string>
- <string name="enable_sizecompat_freeform" msgid="3799755160777404309">"ਫ੍ਰੀਫਾਰਮ ਆਕਾਰ ਅਨੁਰੂਪਤਾ ਨੂੰ ਚਾਲੂ ਕਰੋ"</string>
- <string name="enable_sizecompat_freeform_summary" msgid="1484050174538201499">"ਆਕਾਰ ਅਨੁਰੂਪਤਾ ਵਾਲੀਆਂ ਐਪਾਂ ਨੂੰ ਫ੍ਰੀਫਾਰਮ ਵਿੱਚ ਰਹਿਣ ਦਿਓ"</string>
+ <string name="enable_non_resizable_multi_window" msgid="6832903754625404477">"ਮਲਟੀ-ਵਿੰਡੋ ਵਿੱਚ ਆਕਾਰ ਨਾ ਬਦਲਣਯੋਗ ਦੀ ਸੁਵਿਧਾ ਨੂੰ ਚਾਲੂ ਕਰੋ"</string>
+ <string name="enable_non_resizable_multi_window_summary" msgid="3275763753261901999">"ਮਲਟੀ-ਵਿੰਡੋ ਵਿੱਚ ਆਕਾਰ ਨਾ ਬਦਲਣਯੋਗ ਐਪਾਂ ਨੂੰ ਮਨਜ਼ੂਰੀ ਦਿੰਦੀ ਹੈ"</string>
<string name="hwui_force_dark_title" msgid="4256904905631994219">"ਜ਼ਬਰਦਸਤੀ ਗੂੜ੍ਹਾ ਮੋਡ ਓਵਰਰਾਈਡ ਕਰੋ"</string>
<string name="hwui_force_dark_summary" msgid="6515748781487952769">"ਜ਼ਬਰਦਸਤੀ ਨਾਲ ਗੂੜ੍ਹਾ ਮੋਡ ਲਾਗੂ ਕਰਨ ਵਾਲੀ ਵਿਸ਼ੇਸ਼ਤਾ ਨੂੰ ਹਮੇਸ਼ਾਂ-ਚਾਲੂ ਰੱਖਣ ਲਈ ਓਵਰਰਾਈਡ ਕਰਦੀ ਹੈ"</string>
<string name="enable_blurs_on_windows_title" msgid="4218144213800778872">"ਧੁੰਦਲਾਪਣ ਚਾਲੂ ਕਰੋ"</string>
@@ -4990,12 +4990,9 @@
<string name="wfc_disclaimer_emergency_limitation_title_text" msgid="8276287227589397162">"ਸੰਕਟਕਾਲੀਨ ਕਾਲਾਂ"</string>
<string name="wfc_disclaimer_emergency_limitation_desc_text" msgid="5503902001191552196">"ਵਾਈ-ਫਾਈ ਕਾਲਿੰਗ ਰਾਹੀਂ ਸੰਕਟਕਾਲੀਨ ਕਾਲਾਂ ਕਰਨ ਦੀ ਸੁਵਿਧਾ ਤੁਹਾਡੇ ਕੈਰੀਅਰ ਵਿੱਚ ਨਹੀਂ ਹੈ।\nਸੰਕਟਕਾਲੀਨ ਕਾਲ ਕਰਨ ਲਈ ਤੁਹਾਡਾ ਡੀਵਾਈਸ ਸਵੈਚਲਿਤ ਤੌਰ \'ਤੇ ਸੈਲਿਊਲਰ ਨੈੱਟਵਰਕ \'ਤੇ ਬਦਲ ਜਾਂਦਾ ਹੈ।\nਸੰਕਟਕਾਲੀਨ ਕਾਲਾਂ ਸਿਰਫ਼ ਸੈਲਿਊਲਰ ਕਵਰੇਜ ਵਾਲੇ ਖੇਤਰਾਂ ਵਿੱਚ ਸੰਭਵ ਹਨ।"</string>
<string name="wifi_calling_summary" msgid="8566648389959032967">"ਕੁਆਲਿਟੀ ਬਿਹਤਰ ਬਣਾਉਣ ਵਾਸਤੇ ਕਾਲਾਂ ਲਈ ਵਾਈ-ਫਾਈ ਵਰਤੋ"</string>
- <!-- no translation found for backup_calling_settings_title (519714752900364326) -->
- <skip />
- <!-- no translation found for backup_calling_setting_summary (451295393447465830) -->
- <skip />
- <!-- no translation found for keywords_backup_calling (8592800915478816800) -->
- <skip />
+ <string name="backup_calling_settings_title" msgid="519714752900364326">"ਬੈਕਅੱਪ ਕਾਲਿੰਗ"</string>
+ <string name="backup_calling_setting_summary" msgid="451295393447465830">"ਜੇ <xliff:g id="BACKUP_CALLING_OPERATOR_TEXT">%1$s</xliff:g> ਉਪਲਬਧ ਨਹੀਂ ਹੈ, ਤਾਂ <xliff:g id="BACKUP_CALLING_CARRIER_TEXT">%1$s</xliff:g> ਕਾਲਾਂ ਕਰਨ ਅਤੇ ਪ੍ਰਾਪਤ ਕਰਨ ਲਈ ਮੋਬਾਈਲ ਡਾਟਾ ਸਿਮ ਦੀ ਵਰਤੋਂ ਕਰੋ।"</string>
+ <string name="keywords_backup_calling" msgid="8592800915478816800">"ਬੈਕਅੱਪ ਕਾਲਿੰਗ"</string>
<string name="enable_receiving_mms_notification_title" msgid="6465218559386990248">"ਆਉਣ ਵਾਲਾ MMS ਸੁਨੇਹਾ"</string>
<string name="enable_sending_mms_notification_title" msgid="7120641300854953375">"MMS ਸੁਨੇਹਾ ਭੇਜਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ"</string>
<string name="enable_mms_notification_summary" msgid="6432752438276672500">"ਮੋਬਾਈਲ ਡਾਟਾ ਬੰਦ ਹੋਣ \'ਤੇ <xliff:g id="OPERATOR_NAME">%1$s</xliff:g> \'ਤੇ MMS ਸੁਨੇਹੇ ਭੇਜਣ ਅਤੇ ਪ੍ਰਾਪਤ ਕਰਨ ਦੇਣ ਲਈ ਟੈਪ ਕਰੋ"</string>
@@ -5064,8 +5061,8 @@
<string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"ਹਵਾਈ-ਜਹਾਜ਼ ਮੋਡ, ਹਵਾਈ-ਜਹਾਜ਼ ਸੁਰੱਖਿਅਤ ਮੋਡ"</string>
<string name="calls_and_sms" msgid="1931855083959003306">"ਕਾਲਾਂ ਅਤੇ SMS"</string>
<string name="calls_and_sms_category" msgid="2021321997884906046">"ਵਾਈ-ਫਾਈ ਕਾਲਿੰਗ"</string>
- <string name="calls_sms_wfc_summary" msgid="4930471357980272294">"ਵਾਈ-ਫਾਈ ਵਰਗੇ ਨਾਨ-ਕੈਰੀਅਰ ਨੈੱਟਵਰਕਾਂ \'ਤੇ ਕਾਲਾਂ ਕਰੋ ਅਤੇ ਪ੍ਰਾਪਤ ਕਰੋ"</string>
- <string name="calls_sms_footnote" msgid="7002461875954024216">"ਵਾਈ-ਫਾਈ ਕਾਲਿੰਗ ਤੁਹਾਨੂੰ ਨਾਨ-ਕੈਰੀਅਰ ਨੈੱਟਵਰਕਾਂ, ਜਿਵੇਂ ਕਿ ਕੁਝ ਵਾਈ-ਫਾਈ ਨੈੱਟਵਰਕਾਂ, \'ਤੇ ਕਾਲਾਂ ਕਰਨ ਅਤੇ ਪ੍ਰਾਪਤ ਕਰਨ ਦੀ ਇਜਾਜ਼ਤ ਦਿੰਦੀ ਹੈ।"</string>
+ <string name="calls_sms_wfc_summary" msgid="3940529919408667336">"ਵਾਈ-ਫਾਈ \'ਤੇ ਕਾਲਾਂ ਕਰੋ ਅਤੇ ਪ੍ਰਾਪਤ ਕਰੋ"</string>
+ <string name="calls_sms_footnote" msgid="8051604228144899434">"ਵਾਈ-ਫਾਈ ਕਾਲਿੰਗ ਨਾਲ, ਨਾਨ-ਕੈਰੀਅਰ ਵਾਈ-ਫਾਈ ਨੈੱਟਵਰਕਾਂ \'ਤੇ ਕਾਲਾਂ ਕੀਤੀਆਂ ਅਤੇ ਪ੍ਰਾਪਤ ਕੀਤੀਆਂ ਜਾਂਦੀਆਂ ਹਨ।"</string>
<string name="calls_preference_title" msgid="7536882032182563800">"ਕਾਲਾਂ"</string>
<string name="sms_preference_title" msgid="8392745501754864395">"SMS"</string>
<string name="calls_sms_preferred" msgid="6016477652522583496">"ਤਰਜੀਹੀ"</string>
@@ -5077,22 +5074,17 @@
<string name="network_and_internet_preferences_summary" msgid="613207494152304537">"ਜਨਤਕ ਨੈੱਟਵਰਕਾਂ ਨਾਲ ਕਨੈਕਟ ਕਰੋ"</string>
<string name="keywords_internet" msgid="7674082764898690310">"ਨੈੱਟਵਰਕ ਕਨੈਕਸ਼ਨ, ਇੰਟਰਨੈੱਟ, ਵਾਇਰਲੈੱਸ, ਡਾਟਾ, ਵਾਈ-ਫਾਈ, ਸੈਲਿਊਲਰ, ਮੋਬਾਈਲ, ਸੈੱਲ ਕੈਰੀਅਰ, 4G, 3G, 2G, LTE"</string>
<string name="view_airplane_safe_networks" msgid="9170023210981508906">"ਹਵਾਈ-ਜਹਾਜ਼ ਮੋਡ ਨੈੱਟਵਰਕ ਦੇਖੋ"</string>
- <!-- no translation found for viewing_airplane_mode_networks (4548508852659577531) -->
- <skip />
+ <string name="viewing_airplane_mode_networks" msgid="4548508852659577531">"ਹਵਾਈ-ਜਹਾਜ਼ ਮੋਡ ਵਿੱਚ ਨੈੱਟਵਰਕਾਂ ਨੂੰ ਦੇਖਣਾ"</string>
<string name="turn_off_airplane_mode" msgid="7141986366534514443">"ਹਵਾਈ-ਜਹਾਜ਼ ਮੋਡ ਬੰਦ ਕਰੋ"</string>
- <!-- no translation found for reset_your_internet_title (4856899004343241310) -->
- <skip />
- <!-- no translation found for reset_internet_text (8797910368942544453) -->
- <skip />
- <!-- no translation found for reset_internet_text (8797910368942544453) -->
- <skip />
- <!-- no translation found for resetting_internet_text (6696779371800051806) -->
- <skip />
- <!-- no translation found for fix_connectivity (2781433603228089501) -->
- <skip />
- <!-- no translation found for airplane_mode_network_available (1059499681300395240) -->
- <skip />
- <!-- no translation found for to_switch_networks_disconnect_ethernet (6615374552827587197) -->
+ <string name="reset_your_internet_title" msgid="4856899004343241310">"ਕੀ ਆਪਣਾ ਇੰਟਰਨੈੱਟ ਰੀਸੈੱਟ ਕਰਨਾ ਹੈ?"</string>
+ <string name="reset_internet_text" product="default" msgid="8797910368942544453">"ਇਸ ਨਾਲ ਤੁਹਾਡੀ ਫ਼ੋਨ ਕਾਲ ਸਮਾਪਤ ਹੋ ਜਾਵੇਗੀ"</string>
+ <string name="reset_internet_text" product="tablet" msgid="8797910368942544453">"ਇਸ ਨਾਲ ਤੁਹਾਡੀ ਫ਼ੋਨ ਕਾਲ ਸਮਾਪਤ ਹੋ ਜਾਵੇਗੀ"</string>
+ <string name="resetting_internet_text" msgid="6696779371800051806">"ਤੁਹਾਡੇ ਇੰਟਰਨੈੱਟ ਨੂੰ ਰੀਸੈੱਟ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ…"</string>
+ <string name="fix_connectivity" msgid="2781433603228089501">"ਕਨੈਕਟੀਵਿਟੀ ਠੀਕ ਕਰੋ"</string>
+ <string name="airplane_mode_network_available" msgid="1059499681300395240">"ਹਵਾਈ-ਜਹਾਜ਼ ਮੋਡ ਨੈੱਟਵਰਕ ਉਪਲਬਧ ਹਨ"</string>
+ <string name="to_switch_networks_disconnect_ethernet" msgid="6615374552827587197">"ਨੈੱਟਵਰਕ ਬਦਲਣ ਲਈ, ਈਥਰਨੈੱਟ ਨੂੰ ਡਿਸਕਨੈਕਟ ਕਰੋ"</string>
+ <string name="cannot_switch_networks_while_connected" msgid="3867944849171754777">"ਕਨੈਕਟ ਕੀਤੇ ਹੋਣ ਵੇਲੇ ਨੈੱਟਵਰਕਾਂ ਨੂੰ ਨਹੀਂ ਬਦਲ ਸਕਦੇ"</string>
+ <!-- no translation found for airplane_mode_network_panel_title (6385046104863403604) -->
<skip />
<string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g> / <xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
<string name="mobile_data_connection_active" msgid="2422223108911581552">"ਕਨੈਕਟ ਹੈ"</string>
@@ -5114,6 +5106,17 @@
<string name="category_name_color" msgid="937514550918977151">"ਰੰਗ"</string>
<string name="category_name_others" msgid="2366006298768550310">"ਹੋਰ"</string>
<string name="category_name_general" msgid="7737273712848115886">"ਸਧਾਰਨ"</string>
- <!-- no translation found for default_see_all_apps_title (7481113230662612178) -->
- <skip />
+ <string name="default_see_all_apps_title" msgid="7481113230662612178">"ਸਭ ਐਪਾਂ ਦੇਖੋ"</string>
+ <string name="smart_forwarding_title" msgid="8368634861971949799">"ਸਮਾਰਟ ਫਾਰਵਰਡਿੰਗ"</string>
+ <string name="smart_forwarding_summary_enabled" msgid="3341062878373185604">"ਸਮਾਰਟ ਫਾਰਵਰਡਿੰਗ ਦੀ ਸੁਵਿਧਾ ਚਾਲੂ ਹੈ"</string>
+ <string name="smart_forwarding_summary_disabled" msgid="5033880700091914809">"ਸਮਾਰਟ ਫਾਰਵਰਡਿੰਗ ਦੀ ਸੁਵਿਧਾ ਬੰਦ ਹੈ"</string>
+ <string name="smart_forwarding_ongoing_title" msgid="962226849074401228">"ਕਾਲ ਸੈਟਿੰਗਾਂ"</string>
+ <string name="smart_forwarding_ongoing_text" msgid="2189209372407117114">"ਸੈਟਿੰਗਾਂ ਨੂੰ ਅੱਪਡੇਟ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ…"</string>
+ <string name="smart_forwarding_failed_title" msgid="1859891191023516080">"ਕਾਲ ਸੈਟਿੰਗਾਂ ਵਿੱਚ ਗੜਬੜ"</string>
+ <string name="smart_forwarding_failed_text" msgid="5370431503707373653">"ਨੈੱਟਵਰਕ ਜਾਂ ਸਿਮ ਕਾਰਡ ਵਿੱਚ ਗੜਬੜ।"</string>
+ <string name="smart_forwarding_failed_not_activated_text" msgid="997396203001257904">"ਸਿਮ ਨੂੰ ਕਿਰਿਆਸ਼ੀਲ ਨਹੀਂ ਕੀਤਾ ਗਿਆ।"</string>
+ <string name="smart_forwarding_input_mdn_title" msgid="5105463748849841763">"ਫ਼ੋਨ ਨੰਬਰ ਦਾਖਲ ਕਰੋ"</string>
+ <string name="smart_forwarding_input_mdn_dialog_title" msgid="7542216086697868415">"ਫ਼ੋਨ ਨੰਬਰ ਦਾਖਲ ਕਰੋ"</string>
+ <string name="smart_forwarding_missing_mdn_text" msgid="2907314684242542226">"ਫ਼ੋਨ ਨੰਬਰ ਮੌਜੂਦ ਨਹੀਂ ਹੈ।"</string>
+ <string name="smart_forwarding_missing_alert_dialog_text" msgid="7870419247987316112">"ਠੀਕ ਹੈ"</string>
</resources>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index b27b649..8888125 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -2317,8 +2317,7 @@
<item quantity="other"><xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> zapisanego aparatu słuchowego</item>
<item quantity="one"><xliff:g id="NUMBER_DEVICE_COUNT_0">%1$d</xliff:g> zapisany aparat słuchowy</item>
</plurals>
- <!-- no translation found for accessibility_audio_adjustment_title (1332113739136802997) -->
- <skip />
+ <string name="accessibility_audio_adjustment_title" msgid="1332113739136802997">"Dostosowywanie dźwięku"</string>
<string name="accessibility_summary_shortcut_enabled" msgid="4030427268146752644">"Włączono skróty"</string>
<string name="accessibility_summary_shortcut_disabled" msgid="564005462092499068">"Wył."</string>
<string name="accessibility_summary_state_enabled" msgid="1065431632216039369">"Wł."</string>
@@ -2499,6 +2498,7 @@
<string name="bluetooth_on_time" msgid="8424625554628450028">"Czas z wł. Wi-Fi"</string>
<string name="advanced_battery_title" msgid="3005993394776555079">"Zużycie baterii"</string>
<string name="history_details_title" msgid="8628584613889559355">"Historia – szczegóły"</string>
+ <string name="advanced_battery_preference_title" msgid="6518802648205311326">"Wyświetl wykorzystanie baterii"</string>
<string name="battery_details_title" msgid="4531369291819754178">"Zużycie baterii"</string>
<string name="details_subtitle" msgid="2550872569652785527">"Szczegóły użycia"</string>
<string name="controls_subtitle" msgid="3759606830916441564">"Dostosuj wykorzystanie energii"</string>
@@ -4222,6 +4222,7 @@
<string name="usb_use" msgid="6783183432648438528">"Użyj USB do tych działań"</string>
<string name="usb_default_label" msgid="3372838450371060750">"Domyślna konfiguracja USB"</string>
<string name="usb_default_info" msgid="167172599497085266">"Te ustawienia będą obowiązywać, gdy zostanie połączone inne urządzenie, a Twój telefon będzie odblokowany. Łącz się tylko z zaufanymi urządzeniami."</string>
+ <string name="usb_power_title" msgid="5602112548385798646">"Opcje zasilania"</string>
<string name="usb_pref" msgid="8521832005703261700">"USB"</string>
<string name="usb_preference" msgid="5084550082591493765">"Ustawienia USB"</string>
<string name="usb_control_title" msgid="1946791559052157693">"USB sterowane przez"</string>
@@ -5099,8 +5100,8 @@
<string name="mobile_data_ap_mode_disabled" msgid="6067959496888990983">"Niedostępne w trybie samolotowym"</string>
<string name="force_desktop_mode" msgid="1336913605091334238">"Wymuś tryb pulpitu"</string>
<string name="force_desktop_mode_summary" msgid="4587416867846930479">"Wymuś eksperymentalny tryb pulpitu na dodatkowych ekranach"</string>
- <string name="enable_sizecompat_freeform" msgid="3799755160777404309">"Włącz dowolny rozmiar"</string>
- <string name="enable_sizecompat_freeform_summary" msgid="1484050174538201499">"Zezwól aplikacjom nieskalowanym na dowolny rozmiar"</string>
+ <string name="enable_non_resizable_multi_window" msgid="6832903754625404477">"Włącz brak możliwości zmiany rozmiaru w trybie wielu okien"</string>
+ <string name="enable_non_resizable_multi_window_summary" msgid="3275763753261901999">"Zezwala na wyświetlanie aplikacji bez możliwości zmiany rozmiaru w trybie wielu okien"</string>
<string name="hwui_force_dark_title" msgid="4256904905631994219">"Zastąp wymuszanie trybu ciemnego"</string>
<string name="hwui_force_dark_summary" msgid="6515748781487952769">"Zastępuje ustawienie zawsze włączonej funkcji wymuszania trybu ciemnego"</string>
<string name="enable_blurs_on_windows_title" msgid="4218144213800778872">"Włącz rozmycie"</string>
@@ -5226,8 +5227,8 @@
<string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"samolot, bezpieczny w trybie samolotowym"</string>
<string name="calls_and_sms" msgid="1931855083959003306">"Połączenia i SMS-y"</string>
<string name="calls_and_sms_category" msgid="2021321997884906046">"Połączenia przez Wi‑Fi"</string>
- <string name="calls_sms_wfc_summary" msgid="4930471357980272294">"Nawiązywanie i odbieranie połączeń w sieciach innych niż należące do operatorów, np. w sieciach Wi‑Fi"</string>
- <string name="calls_sms_footnote" msgid="7002461875954024216">"Połączenia przez Wi-Fi umożliwiają nawiązywanie i odbieranie połączeń w sieciach innych niż należące do operatorów, np. w niektórych sieciach Wi‑Fi."</string>
+ <string name="calls_sms_wfc_summary" msgid="3940529919408667336">"Nawiązuj i odbieraj połączenia w sieciach Wi‑Fi"</string>
+ <string name="calls_sms_footnote" msgid="8051604228144899434">"Połączenia przez Wi-Fi umożliwiają nawiązywanie i odbieranie połączeń w sieciach Wi-Fi nienależących do operatorów."</string>
<string name="calls_preference_title" msgid="7536882032182563800">"Połączenia"</string>
<string name="sms_preference_title" msgid="8392745501754864395">"SMS-y"</string>
<string name="calls_sms_preferred" msgid="6016477652522583496">"preferowane"</string>
@@ -5246,10 +5247,10 @@
<string name="reset_internet_text" product="tablet" msgid="8797910368942544453">"Połączenie telefoniczne zostanie zakończone"</string>
<string name="resetting_internet_text" msgid="6696779371800051806">"Resetuję połączenie z internetem…"</string>
<string name="fix_connectivity" msgid="2781433603228089501">"Rozwiąż problemy z połączeniami"</string>
- <!-- no translation found for airplane_mode_network_available (1059499681300395240) -->
- <skip />
- <!-- no translation found for to_switch_networks_disconnect_ethernet (6615374552827587197) -->
- <skip />
+ <string name="airplane_mode_network_available" msgid="1059499681300395240">"Dostępne sieci działające w trybie samolotowym"</string>
+ <string name="to_switch_networks_disconnect_ethernet" msgid="6615374552827587197">"Aby przełączać sieci, odłącz Ethernet"</string>
+ <string name="cannot_switch_networks_while_connected" msgid="3867944849171754777">"Nie można przełączyć sieci po połączeniu"</string>
+ <string name="airplane_mode_network_panel_title" msgid="6385046104863403604">"Sieci działające w trybie samolotowym"</string>
<string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g>/<xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
<string name="mobile_data_connection_active" msgid="2422223108911581552">"Połączono"</string>
<string name="mobile_data_off_summary" msgid="3841411571485837651">"Nie połączy z internetem automatycznie"</string>
@@ -5271,4 +5272,16 @@
<string name="category_name_others" msgid="2366006298768550310">"Inne"</string>
<string name="category_name_general" msgid="7737273712848115886">"Ogólne"</string>
<string name="default_see_all_apps_title" msgid="7481113230662612178">"Wyświetl wszystkie aplikacje"</string>
+ <string name="smart_forwarding_title" msgid="8368634861971949799">"Inteligentne przekierowywanie"</string>
+ <string name="smart_forwarding_summary_enabled" msgid="3341062878373185604">"Włączono inteligentne przekierowywanie"</string>
+ <string name="smart_forwarding_summary_disabled" msgid="5033880700091914809">"Wyłączono inteligentne przekierowywanie"</string>
+ <string name="smart_forwarding_ongoing_title" msgid="962226849074401228">"Ustawienia połączeń"</string>
+ <string name="smart_forwarding_ongoing_text" msgid="2189209372407117114">"Aktualizuję ustawienia…"</string>
+ <string name="smart_forwarding_failed_title" msgid="1859891191023516080">"Błąd w ustawieniach połączenia"</string>
+ <string name="smart_forwarding_failed_text" msgid="5370431503707373653">"Błąd sieci lub karty SIM."</string>
+ <string name="smart_forwarding_failed_not_activated_text" msgid="997396203001257904">"Karta SIM nie została uaktywniona."</string>
+ <string name="smart_forwarding_input_mdn_title" msgid="5105463748849841763">"Wpisz numery telefonów"</string>
+ <string name="smart_forwarding_input_mdn_dialog_title" msgid="7542216086697868415">"Wpisz numer telefonu"</string>
+ <string name="smart_forwarding_missing_mdn_text" msgid="2907314684242542226">"Brak numeru telefonu."</string>
+ <string name="smart_forwarding_missing_alert_dialog_text" msgid="7870419247987316112">"OK"</string>
</resources>
diff --git a/res/values-pt-rBR/strings.xml b/res/values-pt-rBR/strings.xml
index 76a5a2e..27dc2aa 100644
--- a/res/values-pt-rBR/strings.xml
+++ b/res/values-pt-rBR/strings.xml
@@ -2436,6 +2436,7 @@
<string name="bluetooth_on_time" msgid="8424625554628450028">"Tempo de ativação da rede Wi-Fi"</string>
<string name="advanced_battery_title" msgid="3005993394776555079">"Uso da bateria"</string>
<string name="history_details_title" msgid="8628584613889559355">"Detalhes do histórico"</string>
+ <string name="advanced_battery_preference_title" msgid="6518802648205311326">"Ver uso da bateria"</string>
<string name="battery_details_title" msgid="4531369291819754178">"Uso da bateria"</string>
<string name="details_subtitle" msgid="2550872569652785527">"Detalhes de uso"</string>
<string name="controls_subtitle" msgid="3759606830916441564">"Ajustar uso de energia"</string>
@@ -4097,6 +4098,7 @@
<string name="usb_use" msgid="6783183432648438528">"Usar USB para"</string>
<string name="usb_default_label" msgid="3372838450371060750">"Configuração USB padrão"</string>
<string name="usb_default_info" msgid="167172599497085266">"Quando outro dispositivo estiver conectado e seu smartphone estiver desbloqueado, essas configurações serão aplicadas. Conecte-se apenas a dispositivos confiáveis."</string>
+ <string name="usb_power_title" msgid="5602112548385798646">"Opções do botão liga/desliga"</string>
<string name="usb_pref" msgid="8521832005703261700">"USB"</string>
<string name="usb_preference" msgid="5084550082591493765">"Preferências de USB"</string>
<string name="usb_control_title" msgid="1946791559052157693">"USB controlado por"</string>
@@ -4936,8 +4938,8 @@
<string name="mobile_data_ap_mode_disabled" msgid="6067959496888990983">"Indisponível no modo avião"</string>
<string name="force_desktop_mode" msgid="1336913605091334238">"Forçar modo de área de trabalho"</string>
<string name="force_desktop_mode_summary" msgid="4587416867846930479">"Forçar o modo de área de trabalho experimental em telas secundárias"</string>
- <string name="enable_sizecompat_freeform" msgid="3799755160777404309">"Ativar sizecompat em forma livre"</string>
- <string name="enable_sizecompat_freeform_summary" msgid="1484050174538201499">"Permite que apps sizecompat fiquem em forma livre"</string>
+ <string name="enable_non_resizable_multi_window" msgid="6832903754625404477">"Ativar recursos não redimensionáveis em várias janelas"</string>
+ <string name="enable_non_resizable_multi_window_summary" msgid="3275763753261901999">"Permitir que apps não redimensionáveis sejam usados em várias janelas"</string>
<string name="hwui_force_dark_title" msgid="4256904905631994219">"Modificar o recurso forçar modo escuro"</string>
<string name="hwui_force_dark_summary" msgid="6515748781487952769">"Modificar o recurso de forçar modo escuro para que fique sempre ativado"</string>
<string name="enable_blurs_on_windows_title" msgid="4218144213800778872">"Permitir desfoques"</string>
@@ -5059,8 +5061,8 @@
<string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"avião, segura para aviões"</string>
<string name="calls_and_sms" msgid="1931855083959003306">"Chamadas e SMS"</string>
<string name="calls_and_sms_category" msgid="2021321997884906046">"Chamada no Wi-Fi"</string>
- <string name="calls_sms_wfc_summary" msgid="4930471357980272294">"Faça e receba chamadas por redes sem operadora, como Wi-Fi"</string>
- <string name="calls_sms_footnote" msgid="7002461875954024216">"A chamada no Wi-Fi permite que você faça e receba chamadas por redes sem operadora, como algumas redes Wi-Fi."</string>
+ <string name="calls_sms_wfc_summary" msgid="3940529919408667336">"Fazer e receber chamadas pelo Wi‑Fi"</string>
+ <string name="calls_sms_footnote" msgid="8051604228144899434">"As chamadas no Wi‑Fi são feitas e recebidas usando redes Wi-Fi que não são da operadora."</string>
<string name="calls_preference_title" msgid="7536882032182563800">"Chamadas"</string>
<string name="sms_preference_title" msgid="8392745501754864395">"SMS"</string>
<string name="calls_sms_preferred" msgid="6016477652522583496">"preferido"</string>
@@ -5079,10 +5081,10 @@
<string name="reset_internet_text" product="tablet" msgid="8797910368942544453">"Isso encerrará a chamada telefônica"</string>
<string name="resetting_internet_text" msgid="6696779371800051806">"Redefinindo sua Internet…"</string>
<string name="fix_connectivity" msgid="2781433603228089501">"Corrigir conectividade"</string>
- <!-- no translation found for airplane_mode_network_available (1059499681300395240) -->
- <skip />
- <!-- no translation found for to_switch_networks_disconnect_ethernet (6615374552827587197) -->
- <skip />
+ <string name="airplane_mode_network_available" msgid="1059499681300395240">"Redes do modo avião disponíveis"</string>
+ <string name="to_switch_networks_disconnect_ethernet" msgid="6615374552827587197">"Para mudar de rede, desconecte o cabo Ethernet"</string>
+ <string name="cannot_switch_networks_while_connected" msgid="3867944849171754777">"Não é possível mudar de rede enquanto estiver conectado"</string>
+ <string name="airplane_mode_network_panel_title" msgid="6385046104863403604">"Redes para o modo avião"</string>
<string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g> / <xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
<string name="mobile_data_connection_active" msgid="2422223108911581552">"Conectado"</string>
<string name="mobile_data_off_summary" msgid="3841411571485837651">"A Internet não será automaticamente conectada"</string>
@@ -5104,4 +5106,16 @@
<string name="category_name_others" msgid="2366006298768550310">"Outros"</string>
<string name="category_name_general" msgid="7737273712848115886">"Geral"</string>
<string name="default_see_all_apps_title" msgid="7481113230662612178">"Ver todos os apps"</string>
+ <string name="smart_forwarding_title" msgid="8368634861971949799">"Encaminhamento inteligente"</string>
+ <string name="smart_forwarding_summary_enabled" msgid="3341062878373185604">"Encaminhamento inteligente ativado"</string>
+ <string name="smart_forwarding_summary_disabled" msgid="5033880700091914809">"Encaminhamento inteligente desativado"</string>
+ <string name="smart_forwarding_ongoing_title" msgid="962226849074401228">"Configurações de chamada"</string>
+ <string name="smart_forwarding_ongoing_text" msgid="2189209372407117114">"Atualizando configurações…"</string>
+ <string name="smart_forwarding_failed_title" msgid="1859891191023516080">"Erro de configurações de chamada"</string>
+ <string name="smart_forwarding_failed_text" msgid="5370431503707373653">"Erro de rede ou do chip."</string>
+ <string name="smart_forwarding_failed_not_activated_text" msgid="997396203001257904">"O chip não está ativado."</string>
+ <string name="smart_forwarding_input_mdn_title" msgid="5105463748849841763">"Inserir números de telefone"</string>
+ <string name="smart_forwarding_input_mdn_dialog_title" msgid="7542216086697868415">"Inserir número de telefone"</string>
+ <string name="smart_forwarding_missing_mdn_text" msgid="2907314684242542226">"O número de telefone não foi informado."</string>
+ <string name="smart_forwarding_missing_alert_dialog_text" msgid="7870419247987316112">"OK"</string>
</resources>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 523c26f..26e7dcb 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -2436,6 +2436,7 @@
<string name="bluetooth_on_time" msgid="8424625554628450028">"Tempo de ligação Wi-Fi"</string>
<string name="advanced_battery_title" msgid="3005993394776555079">"Utilização da bateria"</string>
<string name="history_details_title" msgid="8628584613889559355">"Detalhes do histórico"</string>
+ <string name="advanced_battery_preference_title" msgid="6518802648205311326">"Ver utilização da bateria"</string>
<string name="battery_details_title" msgid="4531369291819754178">"Utilização da bateria"</string>
<string name="details_subtitle" msgid="2550872569652785527">"Utilizar detalhes"</string>
<string name="controls_subtitle" msgid="3759606830916441564">"Ajustar utilização de energia"</string>
@@ -4097,6 +4098,7 @@
<string name="usb_use" msgid="6783183432648438528">"Utilizar USB para"</string>
<string name="usb_default_label" msgid="3372838450371060750">"Configuração USB predefinida"</string>
<string name="usb_default_info" msgid="167172599497085266">"Quando outro dispositivo estiver ligado e o telemóvel estiver desbloqueado, estas definições serão aplicadas. Ligue-se apenas a dispositivos fidedignos."</string>
+ <string name="usb_power_title" msgid="5602112548385798646">"Opções para ligar/desligar"</string>
<string name="usb_pref" msgid="8521832005703261700">"USB"</string>
<string name="usb_preference" msgid="5084550082591493765">"Preferências de USB"</string>
<string name="usb_control_title" msgid="1946791559052157693">"USB controlado por"</string>
@@ -4936,8 +4938,8 @@
<string name="mobile_data_ap_mode_disabled" msgid="6067959496888990983">"Não disponível durante o modo de avião"</string>
<string name="force_desktop_mode" msgid="1336913605091334238">"Forçar modo de ambiente de trabalho"</string>
<string name="force_desktop_mode_summary" msgid="4587416867846930479">"Forçar modo de ambiente de trabalho experimental em ecrãs secundários"</string>
- <string name="enable_sizecompat_freeform" msgid="3799755160777404309">"Ativar compatibilidade de tamanho com forma livre"</string>
- <string name="enable_sizecompat_freeform_summary" msgid="1484050174538201499">"Permite que aplicações de tamanho compatível tenham forma livre."</string>
+ <string name="enable_non_resizable_multi_window" msgid="6832903754625404477">"Ativar apps não redimensionáveis em multijanelas"</string>
+ <string name="enable_non_resizable_multi_window_summary" msgid="3275763753261901999">"Permite que as apps não redimensionáveis estejam em multijanelas."</string>
<string name="hwui_force_dark_title" msgid="4256904905631994219">"Substituir forçar o modo escuro"</string>
<string name="hwui_force_dark_summary" msgid="6515748781487952769">"Substitui a funcionalidade de forçar a ativação permanente do modo escuro"</string>
<string name="enable_blurs_on_windows_title" msgid="4218144213800778872">"Permitir efeitos esbatidos"</string>
@@ -5059,8 +5061,8 @@
<string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"avião, seguro para aviões"</string>
<string name="calls_and_sms" msgid="1931855083959003306">"Chamadas e SMS"</string>
<string name="calls_and_sms_category" msgid="2021321997884906046">"Chamadas Wi-Fi"</string>
- <string name="calls_sms_wfc_summary" msgid="4930471357980272294">"Fazer e receber chamadas através de redes sem operador móvel como as redes Wi‑Fi"</string>
- <string name="calls_sms_footnote" msgid="7002461875954024216">"As Chamadas Wi-Fi permitem-lhe fazer e receber chamadas através de redes sem operador móvel, tais como algumas redes Wi‑Fi."</string>
+ <string name="calls_sms_wfc_summary" msgid="3940529919408667336">"Efetue e receba chamadas através de Wi-Fi."</string>
+ <string name="calls_sms_footnote" msgid="8051604228144899434">"Com as Chamadas Wi-Fi, as chamadas são efetuadas e recebidas através de redes Wi-Fi sem operador móvel."</string>
<string name="calls_preference_title" msgid="7536882032182563800">"Chamadas"</string>
<string name="sms_preference_title" msgid="8392745501754864395">"SMS"</string>
<string name="calls_sms_preferred" msgid="6016477652522583496">"preferidas"</string>
@@ -5079,10 +5081,10 @@
<string name="reset_internet_text" product="tablet" msgid="8797910368942544453">"Esta ação termina a chamada telefónica."</string>
<string name="resetting_internet_text" msgid="6696779371800051806">"A repor a Internet…"</string>
<string name="fix_connectivity" msgid="2781433603228089501">"Corrigir a conetividade"</string>
- <!-- no translation found for airplane_mode_network_available (1059499681300395240) -->
- <skip />
- <!-- no translation found for to_switch_networks_disconnect_ethernet (6615374552827587197) -->
- <skip />
+ <string name="airplane_mode_network_available" msgid="1059499681300395240">"Redes do modo de avião disponíveis."</string>
+ <string name="to_switch_networks_disconnect_ethernet" msgid="6615374552827587197">"Para mudar de rede, desligue a Ethernet."</string>
+ <string name="cannot_switch_networks_while_connected" msgid="3867944849171754777">"Não pode mudar de rede enquanto tiver ligação estabelecida."</string>
+ <string name="airplane_mode_network_panel_title" msgid="6385046104863403604">"Redes do modo de avião"</string>
<string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g>/<xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
<string name="mobile_data_connection_active" msgid="2422223108911581552">"Ligado"</string>
<string name="mobile_data_off_summary" msgid="3841411571485837651">"A Internet não estabelece ligação automaticamente"</string>
@@ -5104,4 +5106,16 @@
<string name="category_name_others" msgid="2366006298768550310">"Outros"</string>
<string name="category_name_general" msgid="7737273712848115886">"Geral"</string>
<string name="default_see_all_apps_title" msgid="7481113230662612178">"Ver todas as apps"</string>
+ <string name="smart_forwarding_title" msgid="8368634861971949799">"Encaminhamento inteligente"</string>
+ <string name="smart_forwarding_summary_enabled" msgid="3341062878373185604">"Encaminhamento inteligente ativado"</string>
+ <string name="smart_forwarding_summary_disabled" msgid="5033880700091914809">"Encaminhamento inteligente desativado"</string>
+ <string name="smart_forwarding_ongoing_title" msgid="962226849074401228">"Definições de chamadas"</string>
+ <string name="smart_forwarding_ongoing_text" msgid="2189209372407117114">"A atualizar as definições…"</string>
+ <string name="smart_forwarding_failed_title" msgid="1859891191023516080">"Erro nas definições de chamada"</string>
+ <string name="smart_forwarding_failed_text" msgid="5370431503707373653">"Erro do cartão SIM ou da rede."</string>
+ <string name="smart_forwarding_failed_not_activated_text" msgid="997396203001257904">"O SIM não está ativado."</string>
+ <string name="smart_forwarding_input_mdn_title" msgid="5105463748849841763">"Introduza os números de telefone"</string>
+ <string name="smart_forwarding_input_mdn_dialog_title" msgid="7542216086697868415">"Introduza o número de telefone"</string>
+ <string name="smart_forwarding_missing_mdn_text" msgid="2907314684242542226">"O número de telefone está em falta."</string>
+ <string name="smart_forwarding_missing_alert_dialog_text" msgid="7870419247987316112">"OK"</string>
</resources>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 76a5a2e..27dc2aa 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -2436,6 +2436,7 @@
<string name="bluetooth_on_time" msgid="8424625554628450028">"Tempo de ativação da rede Wi-Fi"</string>
<string name="advanced_battery_title" msgid="3005993394776555079">"Uso da bateria"</string>
<string name="history_details_title" msgid="8628584613889559355">"Detalhes do histórico"</string>
+ <string name="advanced_battery_preference_title" msgid="6518802648205311326">"Ver uso da bateria"</string>
<string name="battery_details_title" msgid="4531369291819754178">"Uso da bateria"</string>
<string name="details_subtitle" msgid="2550872569652785527">"Detalhes de uso"</string>
<string name="controls_subtitle" msgid="3759606830916441564">"Ajustar uso de energia"</string>
@@ -4097,6 +4098,7 @@
<string name="usb_use" msgid="6783183432648438528">"Usar USB para"</string>
<string name="usb_default_label" msgid="3372838450371060750">"Configuração USB padrão"</string>
<string name="usb_default_info" msgid="167172599497085266">"Quando outro dispositivo estiver conectado e seu smartphone estiver desbloqueado, essas configurações serão aplicadas. Conecte-se apenas a dispositivos confiáveis."</string>
+ <string name="usb_power_title" msgid="5602112548385798646">"Opções do botão liga/desliga"</string>
<string name="usb_pref" msgid="8521832005703261700">"USB"</string>
<string name="usb_preference" msgid="5084550082591493765">"Preferências de USB"</string>
<string name="usb_control_title" msgid="1946791559052157693">"USB controlado por"</string>
@@ -4936,8 +4938,8 @@
<string name="mobile_data_ap_mode_disabled" msgid="6067959496888990983">"Indisponível no modo avião"</string>
<string name="force_desktop_mode" msgid="1336913605091334238">"Forçar modo de área de trabalho"</string>
<string name="force_desktop_mode_summary" msgid="4587416867846930479">"Forçar o modo de área de trabalho experimental em telas secundárias"</string>
- <string name="enable_sizecompat_freeform" msgid="3799755160777404309">"Ativar sizecompat em forma livre"</string>
- <string name="enable_sizecompat_freeform_summary" msgid="1484050174538201499">"Permite que apps sizecompat fiquem em forma livre"</string>
+ <string name="enable_non_resizable_multi_window" msgid="6832903754625404477">"Ativar recursos não redimensionáveis em várias janelas"</string>
+ <string name="enable_non_resizable_multi_window_summary" msgid="3275763753261901999">"Permitir que apps não redimensionáveis sejam usados em várias janelas"</string>
<string name="hwui_force_dark_title" msgid="4256904905631994219">"Modificar o recurso forçar modo escuro"</string>
<string name="hwui_force_dark_summary" msgid="6515748781487952769">"Modificar o recurso de forçar modo escuro para que fique sempre ativado"</string>
<string name="enable_blurs_on_windows_title" msgid="4218144213800778872">"Permitir desfoques"</string>
@@ -5059,8 +5061,8 @@
<string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"avião, segura para aviões"</string>
<string name="calls_and_sms" msgid="1931855083959003306">"Chamadas e SMS"</string>
<string name="calls_and_sms_category" msgid="2021321997884906046">"Chamada no Wi-Fi"</string>
- <string name="calls_sms_wfc_summary" msgid="4930471357980272294">"Faça e receba chamadas por redes sem operadora, como Wi-Fi"</string>
- <string name="calls_sms_footnote" msgid="7002461875954024216">"A chamada no Wi-Fi permite que você faça e receba chamadas por redes sem operadora, como algumas redes Wi-Fi."</string>
+ <string name="calls_sms_wfc_summary" msgid="3940529919408667336">"Fazer e receber chamadas pelo Wi‑Fi"</string>
+ <string name="calls_sms_footnote" msgid="8051604228144899434">"As chamadas no Wi‑Fi são feitas e recebidas usando redes Wi-Fi que não são da operadora."</string>
<string name="calls_preference_title" msgid="7536882032182563800">"Chamadas"</string>
<string name="sms_preference_title" msgid="8392745501754864395">"SMS"</string>
<string name="calls_sms_preferred" msgid="6016477652522583496">"preferido"</string>
@@ -5079,10 +5081,10 @@
<string name="reset_internet_text" product="tablet" msgid="8797910368942544453">"Isso encerrará a chamada telefônica"</string>
<string name="resetting_internet_text" msgid="6696779371800051806">"Redefinindo sua Internet…"</string>
<string name="fix_connectivity" msgid="2781433603228089501">"Corrigir conectividade"</string>
- <!-- no translation found for airplane_mode_network_available (1059499681300395240) -->
- <skip />
- <!-- no translation found for to_switch_networks_disconnect_ethernet (6615374552827587197) -->
- <skip />
+ <string name="airplane_mode_network_available" msgid="1059499681300395240">"Redes do modo avião disponíveis"</string>
+ <string name="to_switch_networks_disconnect_ethernet" msgid="6615374552827587197">"Para mudar de rede, desconecte o cabo Ethernet"</string>
+ <string name="cannot_switch_networks_while_connected" msgid="3867944849171754777">"Não é possível mudar de rede enquanto estiver conectado"</string>
+ <string name="airplane_mode_network_panel_title" msgid="6385046104863403604">"Redes para o modo avião"</string>
<string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g> / <xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
<string name="mobile_data_connection_active" msgid="2422223108911581552">"Conectado"</string>
<string name="mobile_data_off_summary" msgid="3841411571485837651">"A Internet não será automaticamente conectada"</string>
@@ -5104,4 +5106,16 @@
<string name="category_name_others" msgid="2366006298768550310">"Outros"</string>
<string name="category_name_general" msgid="7737273712848115886">"Geral"</string>
<string name="default_see_all_apps_title" msgid="7481113230662612178">"Ver todos os apps"</string>
+ <string name="smart_forwarding_title" msgid="8368634861971949799">"Encaminhamento inteligente"</string>
+ <string name="smart_forwarding_summary_enabled" msgid="3341062878373185604">"Encaminhamento inteligente ativado"</string>
+ <string name="smart_forwarding_summary_disabled" msgid="5033880700091914809">"Encaminhamento inteligente desativado"</string>
+ <string name="smart_forwarding_ongoing_title" msgid="962226849074401228">"Configurações de chamada"</string>
+ <string name="smart_forwarding_ongoing_text" msgid="2189209372407117114">"Atualizando configurações…"</string>
+ <string name="smart_forwarding_failed_title" msgid="1859891191023516080">"Erro de configurações de chamada"</string>
+ <string name="smart_forwarding_failed_text" msgid="5370431503707373653">"Erro de rede ou do chip."</string>
+ <string name="smart_forwarding_failed_not_activated_text" msgid="997396203001257904">"O chip não está ativado."</string>
+ <string name="smart_forwarding_input_mdn_title" msgid="5105463748849841763">"Inserir números de telefone"</string>
+ <string name="smart_forwarding_input_mdn_dialog_title" msgid="7542216086697868415">"Inserir número de telefone"</string>
+ <string name="smart_forwarding_missing_mdn_text" msgid="2907314684242542226">"O número de telefone não foi informado."</string>
+ <string name="smart_forwarding_missing_alert_dialog_text" msgid="7870419247987316112">"OK"</string>
</resources>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 6a1a4b7..03383c2 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -2292,8 +2292,7 @@
<item quantity="other"><xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> de aparate auditive salvate</item>
<item quantity="one"><xliff:g id="NUMBER_DEVICE_COUNT_0">%1$d</xliff:g> aparat auditiv salvat</item>
</plurals>
- <!-- no translation found for accessibility_audio_adjustment_title (1332113739136802997) -->
- <skip />
+ <string name="accessibility_audio_adjustment_title" msgid="1332113739136802997">"Ajustarea setărilor audio"</string>
<string name="accessibility_summary_shortcut_enabled" msgid="4030427268146752644">"Comanda rapidă este activată"</string>
<string name="accessibility_summary_shortcut_disabled" msgid="564005462092499068">"Dezactivată"</string>
<string name="accessibility_summary_state_enabled" msgid="1065431632216039369">"Activat"</string>
@@ -2468,6 +2467,7 @@
<string name="bluetooth_on_time" msgid="8424625554628450028">"Timp de funcționare Wi-Fi"</string>
<string name="advanced_battery_title" msgid="3005993394776555079">"Utilizarea bateriei"</string>
<string name="history_details_title" msgid="8628584613889559355">"Detalii istoric"</string>
+ <string name="advanced_battery_preference_title" msgid="6518802648205311326">"Vedeți utilizarea bateriei"</string>
<string name="battery_details_title" msgid="4531369291819754178">"Utilizarea bateriei"</string>
<string name="details_subtitle" msgid="2550872569652785527">"Detalii despre utilizare"</string>
<string name="controls_subtitle" msgid="3759606830916441564">"Ajustați utilizarea de energie"</string>
@@ -4160,6 +4160,7 @@
<string name="usb_use" msgid="6783183432648438528">"Folosiți conexiunea USB pentru"</string>
<string name="usb_default_label" msgid="3372838450371060750">"Configurație USB prestabilită"</string>
<string name="usb_default_info" msgid="167172599497085266">"Aceste setări se vor aplica atunci când este conectat un alt dispozitiv și telefonul este deblocat. Conectați-vă numai la dispozitive de încredere."</string>
+ <string name="usb_power_title" msgid="5602112548385798646">"Opțiuni pentru alimentare"</string>
<string name="usb_pref" msgid="8521832005703261700">"USB"</string>
<string name="usb_preference" msgid="5084550082591493765">"Preferințe USB"</string>
<string name="usb_control_title" msgid="1946791559052157693">"USB controlat de"</string>
@@ -5018,8 +5019,8 @@
<string name="mobile_data_ap_mode_disabled" msgid="6067959496888990983">"Nu sunt disponibile în modul Avion"</string>
<string name="force_desktop_mode" msgid="1336913605091334238">"Forțați modul desktop"</string>
<string name="force_desktop_mode_summary" msgid="4587416867846930479">"Forțați modul desktop experimental pe ecrane secundare"</string>
- <string name="enable_sizecompat_freeform" msgid="3799755160777404309">"Activați mutarea aplicațiilor compatibile cu o mărime fixă"</string>
- <string name="enable_sizecompat_freeform_summary" msgid="1484050174538201499">"Permite mutarea aplicațiilor compatibile cu o mărime fixă"</string>
+ <string name="enable_non_resizable_multi_window" msgid="6832903754625404477">"Permiteți aplicații fără redimensionare în ferestre multiple"</string>
+ <string name="enable_non_resizable_multi_window_summary" msgid="3275763753261901999">"Permite aplicațiile fără redimensionare în ferestre multiple"</string>
<string name="hwui_force_dark_title" msgid="4256904905631994219">"Modificați funcția Force-Dark"</string>
<string name="hwui_force_dark_summary" msgid="6515748781487952769">"Modifică funcția Force-Dark să fie activată mereu"</string>
<string name="enable_blurs_on_windows_title" msgid="4218144213800778872">"Activați estomparea"</string>
@@ -5143,8 +5144,8 @@
<string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"avion, sigure pentru avion"</string>
<string name="calls_and_sms" msgid="1931855083959003306">"Apeluri și SMS"</string>
<string name="calls_and_sms_category" msgid="2021321997884906046">"Apelare prin Wi‑Fi"</string>
- <string name="calls_sms_wfc_summary" msgid="4930471357980272294">"Inițiați și primiți apeluri prin rețele diferite de cele de operator, cum ar rețelele Wi-Fi"</string>
- <string name="calls_sms_footnote" msgid="7002461875954024216">"Cu ajutorul apelării prin Wi-Fi, puteți să inițiați și să primiți apeluri prin rețele diferite de cele de operator, cum ar fi rețelele Wi‑Fi."</string>
+ <string name="calls_sms_wfc_summary" msgid="3940529919408667336">"Inițiați și primiți apeluri prin Wi-Fi"</string>
+ <string name="calls_sms_footnote" msgid="8051604228144899434">"Cu ajutorul apelării prin Wi-Fi, puteți să inițiați și să primiți apeluri prin rețele Wi-Fi diferite de cele de operator."</string>
<string name="calls_preference_title" msgid="7536882032182563800">"Apeluri"</string>
<string name="sms_preference_title" msgid="8392745501754864395">"SMS"</string>
<string name="calls_sms_preferred" msgid="6016477652522583496">"preferate"</string>
@@ -5163,10 +5164,10 @@
<string name="reset_internet_text" product="tablet" msgid="8797910368942544453">"Astfel, apelul telefonic se va încheia"</string>
<string name="resetting_internet_text" msgid="6696779371800051806">"Se resetează conexiunea la internet…"</string>
<string name="fix_connectivity" msgid="2781433603228089501">"Remediați problemele legate de conectivitate"</string>
- <!-- no translation found for airplane_mode_network_available (1059499681300395240) -->
- <skip />
- <!-- no translation found for to_switch_networks_disconnect_ethernet (6615374552827587197) -->
- <skip />
+ <string name="airplane_mode_network_available" msgid="1059499681300395240">"Sunt disponibile rețele în modul Avion"</string>
+ <string name="to_switch_networks_disconnect_ethernet" msgid="6615374552827587197">"Pentru a schimba rețeaua, deconectați ethernet"</string>
+ <string name="cannot_switch_networks_while_connected" msgid="3867944849171754777">"Nu puteți schimba rețeaua cât timp dispozitivul e conectat"</string>
+ <string name="airplane_mode_network_panel_title" msgid="6385046104863403604">"Rețele acceptate în modul Avion"</string>
<string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g> / <xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
<string name="mobile_data_connection_active" msgid="2422223108911581552">"Conectat"</string>
<string name="mobile_data_off_summary" msgid="3841411571485837651">"Nu se conectează automat la internet"</string>
@@ -5188,4 +5189,16 @@
<string name="category_name_others" msgid="2366006298768550310">"Altele"</string>
<string name="category_name_general" msgid="7737273712848115886">"General"</string>
<string name="default_see_all_apps_title" msgid="7481113230662612178">"Vedeți toate aplicațiile"</string>
+ <string name="smart_forwarding_title" msgid="8368634861971949799">"Redirecționare intuitivă"</string>
+ <string name="smart_forwarding_summary_enabled" msgid="3341062878373185604">"Redirecționarea intuitivă este activată"</string>
+ <string name="smart_forwarding_summary_disabled" msgid="5033880700091914809">"Redirecționarea intuitivă este dezactivată"</string>
+ <string name="smart_forwarding_ongoing_title" msgid="962226849074401228">"Setări pentru apeluri"</string>
+ <string name="smart_forwarding_ongoing_text" msgid="2189209372407117114">"Se actualizează setările…"</string>
+ <string name="smart_forwarding_failed_title" msgid="1859891191023516080">"Eroare în setările pentru apeluri"</string>
+ <string name="smart_forwarding_failed_text" msgid="5370431503707373653">"Eroare de rețea sau de card SIM."</string>
+ <string name="smart_forwarding_failed_not_activated_text" msgid="997396203001257904">"Cardul SIM nu este activat."</string>
+ <string name="smart_forwarding_input_mdn_title" msgid="5105463748849841763">"Introduceți numerele de telefon"</string>
+ <string name="smart_forwarding_input_mdn_dialog_title" msgid="7542216086697868415">"Introduceți numărul de telefon"</string>
+ <string name="smart_forwarding_missing_mdn_text" msgid="2907314684242542226">"Lipsește numărul de telefon."</string>
+ <string name="smart_forwarding_missing_alert_dialog_text" msgid="7870419247987316112">"OK"</string>
</resources>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 956c597..3dc0f1f 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -2317,8 +2317,7 @@
<item quantity="many"><xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> сохраненных слуховых аппаратов</item>
<item quantity="other"><xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> сохраненного слухового аппарата</item>
</plurals>
- <!-- no translation found for accessibility_audio_adjustment_title (1332113739136802997) -->
- <skip />
+ <string name="accessibility_audio_adjustment_title" msgid="1332113739136802997">"Корректировка аудио"</string>
<string name="accessibility_summary_shortcut_enabled" msgid="4030427268146752644">"Быстрое включение активно"</string>
<string name="accessibility_summary_shortcut_disabled" msgid="564005462092499068">"Отключено"</string>
<string name="accessibility_summary_state_enabled" msgid="1065431632216039369">"Включено"</string>
@@ -2499,6 +2498,7 @@
<string name="bluetooth_on_time" msgid="8424625554628450028">"Время работы Wi-Fi"</string>
<string name="advanced_battery_title" msgid="3005993394776555079">"Расход заряда"</string>
<string name="history_details_title" msgid="8628584613889559355">"Подробная история"</string>
+ <string name="advanced_battery_preference_title" msgid="6518802648205311326">"Расход заряда батареи"</string>
<string name="battery_details_title" msgid="4531369291819754178">"Расход заряда"</string>
<string name="details_subtitle" msgid="2550872569652785527">"Расход батареи"</string>
<string name="controls_subtitle" msgid="3759606830916441564">"Режим энергопотребления"</string>
@@ -4222,6 +4222,7 @@
<string name="usb_use" msgid="6783183432648438528">"Режим работы USB"</string>
<string name="usb_default_label" msgid="3372838450371060750">"Конфигурация USB по умолчанию"</string>
<string name="usb_default_info" msgid="167172599497085266">"Эти настройки будут применяться, когда ваш телефон разблокирован и к нему подключено другое устройство. Устанавливайте соединения только с надежными устройствами."</string>
+ <string name="usb_power_title" msgid="5602112548385798646">"Настройки питания"</string>
<string name="usb_pref" msgid="8521832005703261700">"USB"</string>
<string name="usb_preference" msgid="5084550082591493765">"Настройки USB"</string>
<string name="usb_control_title" msgid="1946791559052157693">"Устройство, управляющее USB"</string>
@@ -5099,8 +5100,8 @@
<string name="mobile_data_ap_mode_disabled" msgid="6067959496888990983">"Мобильный Интернет недоступен в режиме полета."</string>
<string name="force_desktop_mode" msgid="1336913605091334238">"Принудительное включение режима рабочего стола"</string>
<string name="force_desktop_mode_summary" msgid="4587416867846930479">"Принудительное включение экспериментального режима рабочего стола на дополнительных экранах"</string>
- <string name="enable_sizecompat_freeform" msgid="3799755160777404309">"Разрешить открытие окон произвольного размера"</string>
- <string name="enable_sizecompat_freeform_summary" msgid="1484050174538201499">"Позволяет приложениям открывать окна произвольного размера"</string>
+ <string name="enable_non_resizable_multi_window" msgid="6832903754625404477">"Включить неизменяемый масштаб в многооконном режиме"</string>
+ <string name="enable_non_resizable_multi_window_summary" msgid="3275763753261901999">"Открывать приложения с неизменяемым масштабом в многооконном режиме"</string>
<string name="hwui_force_dark_title" msgid="4256904905631994219">"Переопределение включения тёмной темы"</string>
<string name="hwui_force_dark_summary" msgid="6515748781487952769">"Изменение настройки принудительного включения тёмной темы на \"Всегда включено\""</string>
<string name="enable_blurs_on_windows_title" msgid="4218144213800778872">"Включить размытие"</string>
@@ -5226,8 +5227,8 @@
<string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"самолет, безопасность для самолета"</string>
<string name="calls_and_sms" msgid="1931855083959003306">"Звонки и SMS"</string>
<string name="calls_and_sms_category" msgid="2021321997884906046">"Звонки по Wi-Fi"</string>
- <string name="calls_sms_wfc_summary" msgid="4930471357980272294">"Совершать и принимать вызовы через такие сети, как Wi-Fi, а не операторов связи"</string>
- <string name="calls_sms_footnote" msgid="7002461875954024216">"Благодаря функции \"Звонки по Wi-Fi\" вы можете совершать и принимать вызовы через некоторые сети Wi-Fi, а не операторов связи."</string>
+ <string name="calls_sms_wfc_summary" msgid="3940529919408667336">"Совершать и принимать вызовы через Wi-Fi"</string>
+ <string name="calls_sms_footnote" msgid="8051604228144899434">"Функция \"Звонки по Wi-Fi\" позволяет совершать и принимать вызовы через сети Wi-Fi, а не операторов связи."</string>
<string name="calls_preference_title" msgid="7536882032182563800">"Звонки"</string>
<string name="sms_preference_title" msgid="8392745501754864395">"SMS"</string>
<string name="calls_sms_preferred" msgid="6016477652522583496">"Предпочтительно"</string>
@@ -5246,10 +5247,10 @@
<string name="reset_internet_text" product="tablet" msgid="8797910368942544453">"Звонок будет завершен."</string>
<string name="resetting_internet_text" msgid="6696779371800051806">"Подождите…"</string>
<string name="fix_connectivity" msgid="2781433603228089501">"Исправить проблемы с подключением"</string>
- <!-- no translation found for airplane_mode_network_available (1059499681300395240) -->
- <skip />
- <!-- no translation found for to_switch_networks_disconnect_ethernet (6615374552827587197) -->
- <skip />
+ <string name="airplane_mode_network_available" msgid="1059499681300395240">"Сети, доступные в режиме полета"</string>
+ <string name="to_switch_networks_disconnect_ethernet" msgid="6615374552827587197">"Чтобы переключиться между сетями, отключите кабель Ethernet"</string>
+ <string name="cannot_switch_networks_while_connected" msgid="3867944849171754777">"Невозможно переключить сеть, пока установлено подключение"</string>
+ <string name="airplane_mode_network_panel_title" msgid="6385046104863403604">"Сети, доступные в режиме полета"</string>
<string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g>/<xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
<string name="mobile_data_connection_active" msgid="2422223108911581552">"Подключено"</string>
<string name="mobile_data_off_summary" msgid="3841411571485837651">"Не удается автоматически подключиться к Интернету"</string>
@@ -5271,4 +5272,16 @@
<string name="category_name_others" msgid="2366006298768550310">"Другое"</string>
<string name="category_name_general" msgid="7737273712848115886">"Общие"</string>
<string name="default_see_all_apps_title" msgid="7481113230662612178">"Показать все приложения"</string>
+ <string name="smart_forwarding_title" msgid="8368634861971949799">"Умная переадресация"</string>
+ <string name="smart_forwarding_summary_enabled" msgid="3341062878373185604">"Умная переадресация включена"</string>
+ <string name="smart_forwarding_summary_disabled" msgid="5033880700091914809">"Умная переадресация отключена"</string>
+ <string name="smart_forwarding_ongoing_title" msgid="962226849074401228">"Настройки вызовов"</string>
+ <string name="smart_forwarding_ongoing_text" msgid="2189209372407117114">"Обновление настроек…"</string>
+ <string name="smart_forwarding_failed_title" msgid="1859891191023516080">"Ошибка настройки вызовов"</string>
+ <string name="smart_forwarding_failed_text" msgid="5370431503707373653">"Ошибка сети или SIM-карты."</string>
+ <string name="smart_forwarding_failed_not_activated_text" msgid="997396203001257904">"SIM-карта не активирована."</string>
+ <string name="smart_forwarding_input_mdn_title" msgid="5105463748849841763">"Введите номера телефонов"</string>
+ <string name="smart_forwarding_input_mdn_dialog_title" msgid="7542216086697868415">"Введите номер телефона"</string>
+ <string name="smart_forwarding_missing_mdn_text" msgid="2907314684242542226">"Номер телефона не указан."</string>
+ <string name="smart_forwarding_missing_alert_dialog_text" msgid="7870419247987316112">"ОК"</string>
</resources>
diff --git a/res/values-si/strings.xml b/res/values-si/strings.xml
index ef292cd..40c60b3 100644
--- a/res/values-si/strings.xml
+++ b/res/values-si/strings.xml
@@ -2436,6 +2436,7 @@
<string name="bluetooth_on_time" msgid="8424625554628450028">"ප්රමාද නොවී Wi-Fi"</string>
<string name="advanced_battery_title" msgid="3005993394776555079">"බැටරි භාවිතය"</string>
<string name="history_details_title" msgid="8628584613889559355">"ඉතිහාස විස්තර"</string>
+ <string name="advanced_battery_preference_title" msgid="6518802648205311326">"බැටරි භාවිතය බලන්න"</string>
<string name="battery_details_title" msgid="4531369291819754178">"බැටරි භාවිතය"</string>
<string name="details_subtitle" msgid="2550872569652785527">"විස්තර භාවිත කරන්න"</string>
<string name="controls_subtitle" msgid="3759606830916441564">"බල භාවිතය සීරුමාරු කරන්න"</string>
@@ -4097,6 +4098,7 @@
<string name="usb_use" msgid="6783183432648438528">"පහත සඳහා USB භාවිතා කරන්න"</string>
<string name="usb_default_label" msgid="3372838450371060750">"පෙරනිමි USB වින්යාසකරණය"</string>
<string name="usb_default_info" msgid="167172599497085266">"වෙනත් උපාංගයක් සම්බන්ධ කර ඇති විට සහ ඔබේ දුරකථනය අගුලු දමා ඇති විට, මෙම සැකසීම් අදාළ වනු ඇත. විශ්වාසදායි උපාංගවලට පමණක් සම්බන්ධ වන්න."</string>
+ <string name="usb_power_title" msgid="5602112548385798646">"බල විකල්ප"</string>
<string name="usb_pref" msgid="8521832005703261700">"USB"</string>
<string name="usb_preference" msgid="5084550082591493765">"USB මනාප"</string>
<string name="usb_control_title" msgid="1946791559052157693">"USB පාලනය වන්නේ"</string>
@@ -4936,8 +4938,8 @@
<string name="mobile_data_ap_mode_disabled" msgid="6067959496888990983">"ගුවන් යානා ප්රකාරයේදී නොලැබේ"</string>
<string name="force_desktop_mode" msgid="1336913605091334238">"වැඩතල ප්රකාරය බල කරන්න"</string>
<string name="force_desktop_mode_summary" msgid="4587416867846930479">"ද්විතීයික සංදර්ශන කෙරෙහි අත්හදා බැලීමේ වැඩතල ප්රකාරය බල කරන්න"</string>
- <string name="enable_sizecompat_freeform" msgid="3799755160777404309">"නිදහස් ආකෘති සංගත තරම සබල කරන්න"</string>
- <string name="enable_sizecompat_freeform_summary" msgid="1484050174538201499">"sizecompat යෙදුම්වලට නිදහස් ආකෘතියෙන් තිබීමට ඉඩ දෙන්න"</string>
+ <string name="enable_non_resizable_multi_window" msgid="6832903754625404477">"බහු කවුළුව තුළ ප්රතිප්රමාණ කළ නොහැකි සබල කරන්න"</string>
+ <string name="enable_non_resizable_multi_window_summary" msgid="3275763753261901999">"බහු කවුළුව තුළ ප්රතිප්රමාණ කළ නොහැකි යෙදුම් තිබීමට ඉඩ දෙයි"</string>
<string name="hwui_force_dark_title" msgid="4256904905631994219">"force-dark ප්රතික්ෂේප කරන්න"</string>
<string name="hwui_force_dark_summary" msgid="6515748781487952769">"force-dark විශේෂාංගය සැම විට ක්රියාත්මකව තිබීමට ප්රතික්ෂේප කරයි"</string>
<string name="enable_blurs_on_windows_title" msgid="4218144213800778872">"නොපැහැදිලි කිරීම් සබල කරන්න"</string>
@@ -5059,8 +5061,8 @@
<string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"ගුවන් යානා, ගුවන් යානා ආරක්ෂිත"</string>
<string name="calls_and_sms" msgid="1931855083959003306">"ඇමතුම් & SMS"</string>
<string name="calls_and_sms_category" msgid="2021321997884906046">"Wi-Fi ඇමතීම"</string>
- <string name="calls_sms_wfc_summary" msgid="4930471357980272294">"Wi‑Fi වැනි වාහක නොවන ජාල හරහා ඇමතුම් සිදු කරන්න සහ ලබන්න"</string>
- <string name="calls_sms_footnote" msgid="7002461875954024216">"සමහර Wi-Fi ජාල වැනි වාහක නොවන ජාල හරහා ඇමතුම් ලබා ගැනීමට සහ ලැබීමට Wi-Fi ඇමතීම ඔබට ඉඩ දෙයි."</string>
+ <string name="calls_sms_wfc_summary" msgid="3940529919408667336">"Wi‑Fi හරහා ඇමතුම් සිදු කරන්න සහ ලබා ගන්න"</string>
+ <string name="calls_sms_footnote" msgid="8051604228144899434">"Wi‑Fi ඇමතීම සමඟ, වාහක නොවන Wi-Fi ජාල හරහා ඇමතුම් සිදු කෙරේ."</string>
<string name="calls_preference_title" msgid="7536882032182563800">"ඇමතුම්"</string>
<string name="sms_preference_title" msgid="8392745501754864395">"SMS"</string>
<string name="calls_sms_preferred" msgid="6016477652522583496">"වඩා කැමති"</string>
@@ -5079,10 +5081,10 @@
<string name="reset_internet_text" product="tablet" msgid="8797910368942544453">"මෙය ඔබගේ දුරකථන ඇමතුම අවසන් කරනු ඇත"</string>
<string name="resetting_internet_text" msgid="6696779371800051806">"ඔබගේ අන්තර්ජාලය යළි සකසමින්…"</string>
<string name="fix_connectivity" msgid="2781433603228089501">"සබැඳුම් හැකියාව සකසන්න"</string>
- <!-- no translation found for airplane_mode_network_available (1059499681300395240) -->
- <skip />
- <!-- no translation found for to_switch_networks_disconnect_ethernet (6615374552827587197) -->
- <skip />
+ <string name="airplane_mode_network_available" msgid="1059499681300395240">"ගුවන් යානා ප්රකාර ජාල ලබා ගත හැකිය"</string>
+ <string name="to_switch_networks_disconnect_ethernet" msgid="6615374552827587197">"ජාල මාරු කිරීමට, ඊතර්නෙට් විසන්ධි කරන්න"</string>
+ <string name="cannot_switch_networks_while_connected" msgid="3867944849171754777">"සම්බන්ධිත අතරතුර ජාල මාරු කළ නොහැකිය"</string>
+ <string name="airplane_mode_network_panel_title" msgid="6385046104863403604">"ගුවන් යානා ප්රකාර ජාල"</string>
<string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g> / <xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
<string name="mobile_data_connection_active" msgid="2422223108911581552">"සම්බන්ධයි"</string>
<string name="mobile_data_off_summary" msgid="3841411571485837651">"අන්තර්ජාලය ස්වයංක්රියව සබඳින්නේ නැත"</string>
@@ -5104,4 +5106,16 @@
<string name="category_name_others" msgid="2366006298768550310">"වෙනත්"</string>
<string name="category_name_general" msgid="7737273712848115886">"සාමාන්ය"</string>
<string name="default_see_all_apps_title" msgid="7481113230662612178">"සියලු යෙදුම් බලන්න"</string>
+ <string name="smart_forwarding_title" msgid="8368634861971949799">"ස්මාර්ට් යොමු කිරීම"</string>
+ <string name="smart_forwarding_summary_enabled" msgid="3341062878373185604">"ස්මාර්ට් යොමු කිරීම සබලයි"</string>
+ <string name="smart_forwarding_summary_disabled" msgid="5033880700091914809">"ස්මාර්ට් යොමු කිරීම අබලයි"</string>
+ <string name="smart_forwarding_ongoing_title" msgid="962226849074401228">"ඇමතුම් සැකසීම්"</string>
+ <string name="smart_forwarding_ongoing_text" msgid="2189209372407117114">"සැකසීම් යාවත්කාලීන කරමින්…"</string>
+ <string name="smart_forwarding_failed_title" msgid="1859891191023516080">"ඇමතුම් සැකසීම් දෝෂයකි"</string>
+ <string name="smart_forwarding_failed_text" msgid="5370431503707373653">"ජාල හෝ SIM කාඩ්පත් දෝෂයකි."</string>
+ <string name="smart_forwarding_failed_not_activated_text" msgid="997396203001257904">"Sim සක්රිය කර නැත."</string>
+ <string name="smart_forwarding_input_mdn_title" msgid="5105463748849841763">"දුරකථන අංක ඇතුළත් කරන්න"</string>
+ <string name="smart_forwarding_input_mdn_dialog_title" msgid="7542216086697868415">"දුරකථන අංකය ඇතුළත් කරන්න"</string>
+ <string name="smart_forwarding_missing_mdn_text" msgid="2907314684242542226">"දුරකථන අංකය අස්ථානගතයි."</string>
+ <string name="smart_forwarding_missing_alert_dialog_text" msgid="7870419247987316112">"හරි"</string>
</resources>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index a682198..d1a6ef9 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -2317,8 +2317,7 @@
<item quantity="other"><xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> uložených načúvadiel</item>
<item quantity="one"><xliff:g id="NUMBER_DEVICE_COUNT_0">%1$d</xliff:g> uložené načúvadlo</item>
</plurals>
- <!-- no translation found for accessibility_audio_adjustment_title (1332113739136802997) -->
- <skip />
+ <string name="accessibility_audio_adjustment_title" msgid="1332113739136802997">"Úprava zvuku"</string>
<string name="accessibility_summary_shortcut_enabled" msgid="4030427268146752644">"Skratka je zapnutá"</string>
<string name="accessibility_summary_shortcut_disabled" msgid="564005462092499068">"Vypnuté"</string>
<string name="accessibility_summary_state_enabled" msgid="1065431632216039369">"Zapnuté"</string>
@@ -2499,6 +2498,7 @@
<string name="bluetooth_on_time" msgid="8424625554628450028">"Čas prevádzky siete Wi‑Fi"</string>
<string name="advanced_battery_title" msgid="3005993394776555079">"Spotreba batérie"</string>
<string name="history_details_title" msgid="8628584613889559355">"Podrobnosti histórie"</string>
+ <string name="advanced_battery_preference_title" msgid="6518802648205311326">"Zobraziť spotrebu batérie"</string>
<string name="battery_details_title" msgid="4531369291819754178">"Spotreba batérie"</string>
<string name="details_subtitle" msgid="2550872569652785527">"Využitie"</string>
<string name="controls_subtitle" msgid="3759606830916441564">"Upraviť spotrebu energie"</string>
@@ -4222,6 +4222,7 @@
<string name="usb_use" msgid="6783183432648438528">"Používať USB na"</string>
<string name="usb_default_label" msgid="3372838450371060750">"Predvolená konfigurácia USB"</string>
<string name="usb_default_info" msgid="167172599497085266">"Tieto nastavenia sa použijú, keď bude pripojené ďalšie zariadenie a telefón bude odomknutý. Pripájajte sa iba k dôveryhodným zariadeniam."</string>
+ <string name="usb_power_title" msgid="5602112548385798646">"Možnosti vypínača"</string>
<string name="usb_pref" msgid="8521832005703261700">"USB"</string>
<string name="usb_preference" msgid="5084550082591493765">"Nastavenia USB"</string>
<string name="usb_control_title" msgid="1946791559052157693">"USB ovláda"</string>
@@ -5099,8 +5100,8 @@
<string name="mobile_data_ap_mode_disabled" msgid="6067959496888990983">"Nedostupné v režime v lietadle"</string>
<string name="force_desktop_mode" msgid="1336913605091334238">"Vynútiť režim pracovnej plochy"</string>
<string name="force_desktop_mode_summary" msgid="4587416867846930479">"Vynútenie experimentálneho režimu pracovnej plochy na sekundárnych obrazovkách"</string>
- <string name="enable_sizecompat_freeform" msgid="3799755160777404309">"Povoliť prispôsobenie pri nemennej veľkosti"</string>
- <string name="enable_sizecompat_freeform_summary" msgid="1484050174538201499">"Povolí prispôsobenie aplikácií s nemennou veľkosťou"</string>
+ <string name="enable_non_resizable_multi_window" msgid="6832903754625404477">"Povoliť v režime viac. okien aplik. bez možn. zmeny veľkosti"</string>
+ <string name="enable_non_resizable_multi_window_summary" msgid="3275763753261901999">"Povoliť v režime viacerých okien aplikácie bez možnosti zmeny veľkosti"</string>
<string name="hwui_force_dark_title" msgid="4256904905631994219">"Presadiť tmavý režim"</string>
<string name="hwui_force_dark_summary" msgid="6515748781487952769">"Presadí, aby bol tmavý režim vždy zapnutý"</string>
<string name="enable_blurs_on_windows_title" msgid="4218144213800778872">"Aktivovať rozmazania"</string>
@@ -5226,8 +5227,8 @@
<string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"lietadlo, možné používať v lietadle"</string>
<string name="calls_and_sms" msgid="1931855083959003306">"Hovory a SMS"</string>
<string name="calls_and_sms_category" msgid="2021321997884906046">"Volanie cez Wi‑Fi"</string>
- <string name="calls_sms_wfc_summary" msgid="4930471357980272294">"Volajte a prijímajte hovory cez siete bez operátorov, ako je Wi‑Fi"</string>
- <string name="calls_sms_footnote" msgid="7002461875954024216">"Volanie cez Wi‑Fi vám umožňuje volať a prijímať hovory cez siete bez operátora, ako sú niektoré siete Wi-Fi."</string>
+ <string name="calls_sms_wfc_summary" msgid="3940529919408667336">"Volajte a prijímajte hovory cez sieť Wi‑Fi"</string>
+ <string name="calls_sms_footnote" msgid="8051604228144899434">"Volanie cez Wi‑Fi umožňuje volať a prijímať hovory cez siete Wi‑Fi, ktoré nepatria operátorovi"</string>
<string name="calls_preference_title" msgid="7536882032182563800">"Hovory"</string>
<string name="sms_preference_title" msgid="8392745501754864395">"SMS"</string>
<string name="calls_sms_preferred" msgid="6016477652522583496">"preferované"</string>
@@ -5246,10 +5247,10 @@
<string name="reset_internet_text" product="tablet" msgid="8797910368942544453">"Týmto ukončíte telefonický hovor"</string>
<string name="resetting_internet_text" msgid="6696779371800051806">"Internet sa resetuje…"</string>
<string name="fix_connectivity" msgid="2781433603228089501">"Odstrániť problém s pripojením"</string>
- <!-- no translation found for airplane_mode_network_available (1059499681300395240) -->
- <skip />
- <!-- no translation found for to_switch_networks_disconnect_ethernet (6615374552827587197) -->
- <skip />
+ <string name="airplane_mode_network_available" msgid="1059499681300395240">"Siete dostupné v režime v lietadle"</string>
+ <string name="to_switch_networks_disconnect_ethernet" msgid="6615374552827587197">"Ak chcete prepnúť siete, odpojte ethernet"</string>
+ <string name="cannot_switch_networks_while_connected" msgid="3867944849171754777">"Počas pripojenia nie je možné prepnúť siete"</string>
+ <string name="airplane_mode_network_panel_title" msgid="6385046104863403604">"Siete režimu v lietadle"</string>
<string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g> / <xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
<string name="mobile_data_connection_active" msgid="2422223108911581552">"Pripojené"</string>
<string name="mobile_data_off_summary" msgid="3841411571485837651">"Internet sa nepripojí automaticky"</string>
@@ -5271,4 +5272,16 @@
<string name="category_name_others" msgid="2366006298768550310">"Iné"</string>
<string name="category_name_general" msgid="7737273712848115886">"Všeobecné"</string>
<string name="default_see_all_apps_title" msgid="7481113230662612178">"Zobraziť všetky aplikácie"</string>
+ <string name="smart_forwarding_title" msgid="8368634861971949799">"Inteligentné presmerovanie"</string>
+ <string name="smart_forwarding_summary_enabled" msgid="3341062878373185604">"Inteligentné presmerovanie je aktivované"</string>
+ <string name="smart_forwarding_summary_disabled" msgid="5033880700091914809">"Inteligentné presmerovanie je deaktivované"</string>
+ <string name="smart_forwarding_ongoing_title" msgid="962226849074401228">"Nastavenia hovorov"</string>
+ <string name="smart_forwarding_ongoing_text" msgid="2189209372407117114">"Aktualizujú sa nastavenia…"</string>
+ <string name="smart_forwarding_failed_title" msgid="1859891191023516080">"Chyba nastavení hovorov"</string>
+ <string name="smart_forwarding_failed_text" msgid="5370431503707373653">"Došlo k chybe siete alebo SIM karty."</string>
+ <string name="smart_forwarding_failed_not_activated_text" msgid="997396203001257904">"SIM karta nie je aktivovaná."</string>
+ <string name="smart_forwarding_input_mdn_title" msgid="5105463748849841763">"Zadajte telefónne čísla"</string>
+ <string name="smart_forwarding_input_mdn_dialog_title" msgid="7542216086697868415">"Zadajte telefónne číslo"</string>
+ <string name="smart_forwarding_missing_mdn_text" msgid="2907314684242542226">"Chýba telefónne číslo."</string>
+ <string name="smart_forwarding_missing_alert_dialog_text" msgid="7870419247987316112">"OK"</string>
</resources>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index 986fcad..363bbf3 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -2317,8 +2317,7 @@
<item quantity="few"><xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> shranjeni slušni pripomočki</item>
<item quantity="other"><xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> shranjenih slušnih pripomočkov</item>
</plurals>
- <!-- no translation found for accessibility_audio_adjustment_title (1332113739136802997) -->
- <skip />
+ <string name="accessibility_audio_adjustment_title" msgid="1332113739136802997">"Prilagoditev zvoka"</string>
<string name="accessibility_summary_shortcut_enabled" msgid="4030427268146752644">"Bližnjica je vklopljena"</string>
<string name="accessibility_summary_shortcut_disabled" msgid="564005462092499068">"Izklopljeno"</string>
<string name="accessibility_summary_state_enabled" msgid="1065431632216039369">"Vklopljeno"</string>
@@ -2499,6 +2498,7 @@
<string name="bluetooth_on_time" msgid="8424625554628450028">"Čas z vklopljenim Wi-Fi-jem"</string>
<string name="advanced_battery_title" msgid="3005993394776555079">"Poraba baterije"</string>
<string name="history_details_title" msgid="8628584613889559355">"Podrobnosti zgodovine"</string>
+ <string name="advanced_battery_preference_title" msgid="6518802648205311326">"Ogled porabe baterije"</string>
<string name="battery_details_title" msgid="4531369291819754178">"Poraba baterije"</string>
<string name="details_subtitle" msgid="2550872569652785527">"Podrobnosti uporabe"</string>
<string name="controls_subtitle" msgid="3759606830916441564">"Prilagodi porabo energije"</string>
@@ -4222,6 +4222,7 @@
<string name="usb_use" msgid="6783183432648438528">"Uporaba povezave USB za"</string>
<string name="usb_default_label" msgid="3372838450371060750">"Privzeta konfiguracija povezave USB"</string>
<string name="usb_default_info" msgid="167172599497085266">"Te nastavitve bodo uporabljene, ko bo telefon odklenjen in povezan z drugo napravo. Telefon povežite samo z zaupanja vrednimi napravami."</string>
+ <string name="usb_power_title" msgid="5602112548385798646">"Možnosti napajanja"</string>
<string name="usb_pref" msgid="8521832005703261700">"USB"</string>
<string name="usb_preference" msgid="5084550082591493765">"Nastavitve USB-ja"</string>
<string name="usb_control_title" msgid="1946791559052157693">"Povezavo USB upravlja"</string>
@@ -5099,8 +5100,8 @@
<string name="mobile_data_ap_mode_disabled" msgid="6067959496888990983">"Ni na voljo v načinu za letalo"</string>
<string name="force_desktop_mode" msgid="1336913605091334238">"Vsili namizni način"</string>
<string name="force_desktop_mode_summary" msgid="4587416867846930479">"Vsili poskusni namizni način na sekundarnih zaslonih"</string>
- <string name="enable_sizecompat_freeform" msgid="3799755160777404309">"Omog. proste obl. apl., ki nimajo možn. spr. vel."</string>
- <string name="enable_sizecompat_freeform_summary" msgid="1484050174538201499">"Omogočanje proste oblike aplikacij, ki nimajo možnosti spremembe velikosti"</string>
+ <string name="enable_non_resizable_multi_window" msgid="6832903754625404477">"Omogoči okna nespremenljive velikosti v načinu z več okni"</string>
+ <string name="enable_non_resizable_multi_window_summary" msgid="3275763753261901999">"Omogoča uporabo aplikacij brez možnosti spreminjanja velikosti v načinu z več okni."</string>
<string name="hwui_force_dark_title" msgid="4256904905631994219">"Preglasi vsiljenje temnega načina"</string>
<string name="hwui_force_dark_summary" msgid="6515748781487952769">"Preglasi vsiljenje vedno vklopljenega temnega načina"</string>
<string name="enable_blurs_on_windows_title" msgid="4218144213800778872">"Omogoči zameglitve"</string>
@@ -5226,8 +5227,8 @@
<string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"letalo, varno za uporabo v letalu"</string>
<string name="calls_and_sms" msgid="1931855083959003306">"Klici in sporočila SMS"</string>
<string name="calls_and_sms_category" msgid="2021321997884906046">"Klicanje prek Wi‑Fi-ja"</string>
- <string name="calls_sms_wfc_summary" msgid="4930471357980272294">"Opravljanje in prejemanje klicev v omrežjih, ki niso operaterjeva, na primer v omrežjih Wi‑Fi"</string>
- <string name="calls_sms_footnote" msgid="7002461875954024216">"Klicanje prek Wi-Fi-ja omogoča opravljanje in prejemanje klicev v omrežjih, ki niso operaterjeva, na primer v nekaterih omrežjih Wi-Fi."</string>
+ <string name="calls_sms_wfc_summary" msgid="3940529919408667336">"Opravljanje in prejemanje klicev v omrežjih Wi‑Fi"</string>
+ <string name="calls_sms_footnote" msgid="8051604228144899434">"Klicanje prek Wi-Fi-ja omogoča opravljanje in prejemanje klicev v omrežjih Wi-Fi, ki niso operaterjeva."</string>
<string name="calls_preference_title" msgid="7536882032182563800">"Klici"</string>
<string name="sms_preference_title" msgid="8392745501754864395">"Sporočila SMS"</string>
<string name="calls_sms_preferred" msgid="6016477652522583496">"prednostno"</string>
@@ -5246,10 +5247,10 @@
<string name="reset_internet_text" product="tablet" msgid="8797910368942544453">"S tem boste končali telefonski klic."</string>
<string name="resetting_internet_text" msgid="6696779371800051806">"Ponastavljanje internetne povezave …"</string>
<string name="fix_connectivity" msgid="2781433603228089501">"Odpravljanje težav s povezavo"</string>
- <!-- no translation found for airplane_mode_network_available (1059499681300395240) -->
- <skip />
- <!-- no translation found for to_switch_networks_disconnect_ethernet (6615374552827587197) -->
- <skip />
+ <string name="airplane_mode_network_available" msgid="1059499681300395240">"Razpoložljiva omrežja v načinu za letalo"</string>
+ <string name="to_switch_networks_disconnect_ethernet" msgid="6615374552827587197">"Če želite preklopiti omrežje, prekinite ethernetno povezavo."</string>
+ <string name="cannot_switch_networks_while_connected" msgid="3867944849171754777">"Preklop med omrežji ni mogoč ob vzpostavljeni povezavi."</string>
+ <string name="airplane_mode_network_panel_title" msgid="6385046104863403604">"Omrežja v načinu za letalo"</string>
<string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g>/<xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
<string name="mobile_data_connection_active" msgid="2422223108911581552">"Povezano"</string>
<string name="mobile_data_off_summary" msgid="3841411571485837651">"Samodejna povezava z internetom ni mogoča"</string>
@@ -5271,4 +5272,16 @@
<string name="category_name_others" msgid="2366006298768550310">"Drugo"</string>
<string name="category_name_general" msgid="7737273712848115886">"Splošno"</string>
<string name="default_see_all_apps_title" msgid="7481113230662612178">"Prikaz vseh aplikacij"</string>
+ <string name="smart_forwarding_title" msgid="8368634861971949799">"Pametno posredovanje"</string>
+ <string name="smart_forwarding_summary_enabled" msgid="3341062878373185604">"Pametno posredovanje je omogočeno."</string>
+ <string name="smart_forwarding_summary_disabled" msgid="5033880700091914809">"Pametno posredovanje je onemogočeno."</string>
+ <string name="smart_forwarding_ongoing_title" msgid="962226849074401228">"Nastavitve klicanja"</string>
+ <string name="smart_forwarding_ongoing_text" msgid="2189209372407117114">"Posodabljanje nastavitev …"</string>
+ <string name="smart_forwarding_failed_title" msgid="1859891191023516080">"Napaka nastavitev klicev"</string>
+ <string name="smart_forwarding_failed_text" msgid="5370431503707373653">"Napaka omrežja ali kartice SIM"</string>
+ <string name="smart_forwarding_failed_not_activated_text" msgid="997396203001257904">"Kartica SIM ni aktivirana."</string>
+ <string name="smart_forwarding_input_mdn_title" msgid="5105463748849841763">"Vnesite telefonske številke"</string>
+ <string name="smart_forwarding_input_mdn_dialog_title" msgid="7542216086697868415">"Vnesite telefonsko številko"</string>
+ <string name="smart_forwarding_missing_mdn_text" msgid="2907314684242542226">"Manjka telefonska številka."</string>
+ <string name="smart_forwarding_missing_alert_dialog_text" msgid="7870419247987316112">"V redu"</string>
</resources>
diff --git a/res/values-sq/strings.xml b/res/values-sq/strings.xml
index 0897d94..b952fd1 100644
--- a/res/values-sq/strings.xml
+++ b/res/values-sq/strings.xml
@@ -732,8 +732,8 @@
<string name="bluetooth_device_context_connect" msgid="4913860372216815855">"Lidh"</string>
<string name="bluetooth_device_context_disconnect" msgid="4464167389972513232">"Shkëput"</string>
<string name="bluetooth_device_context_pair_connect" msgid="2406032703622371826">"Ҫifto dhe lidh"</string>
- <string name="bluetooth_device_context_unpair" msgid="7525735305244087162">"Hiq nga çiftimi"</string>
- <string name="bluetooth_device_context_disconnect_unpair" msgid="2001359431289794561">"Shkëput dhe hiq nga çiftimi"</string>
+ <string name="bluetooth_device_context_unpair" msgid="7525735305244087162">"Anulo çiftimin"</string>
+ <string name="bluetooth_device_context_disconnect_unpair" msgid="2001359431289794561">"Shkëput dhe anulo çiftimin"</string>
<string name="bluetooth_device_context_connect_advanced" msgid="934657460643490773">"Opsionet..."</string>
<string name="bluetooth_menu_advanced" msgid="7633682234855216066">"Të përparuara"</string>
<string name="bluetooth_advanced_titlebar" msgid="5369701494951467257">"Cilësimet e përparuara të Bluetooth-it"</string>
@@ -1219,7 +1219,7 @@
<string name="adaptive_sleep_summary_no_permission" msgid="5107880175176848307">"Trokit për të menaxhuar autorizimet për \"Shërbimet e personalizimit të pajisjes\""</string>
<string name="adaptive_sleep_description" msgid="1835321775327187860">"Parandalon fikjen e ekranit nëse shikon tek ai"</string>
<string name="adaptive_sleep_privacy" msgid="7664570136417980556">"Vëmendja ndaj ekranit përdor kamerën e përparme për të parë nëse dikush po shikon tek ekrani. Funksionon në pajisje dhe imazhet nuk dërgohen apo ruhen asnjëherë te Google."</string>
- <string name="adaptive_sleep_contextual_slice_title" msgid="7467588613212629758">"Aktivizo vëmendjen e ekranit"</string>
+ <string name="adaptive_sleep_contextual_slice_title" msgid="7467588613212629758">"Aktivizo vëmendjen ndaj ekranit"</string>
<string name="adaptive_sleep_contextual_slice_summary" msgid="2993867044745446094">"Mbaje ekranin aktiv kur e shikon"</string>
<string name="night_display_title" msgid="8532432776487216581">"Drita e natës"</string>
<string name="night_display_text" msgid="4789324042428095383">"Drita e natës e ngjyros ekranin në ngjyrë qelibari. Kjo e bën më të lehtë shikimin e ekranit ose leximin në dritë të zbehtë dhe mund të të ndihmojë të flesh gjumë më lehtë."</string>
@@ -2436,6 +2436,7 @@
<string name="bluetooth_on_time" msgid="8424625554628450028">"Koha e aktivizimit të Wi‑Fi"</string>
<string name="advanced_battery_title" msgid="3005993394776555079">"Përdorimi i baterisë"</string>
<string name="history_details_title" msgid="8628584613889559355">"Detajet e historikut"</string>
+ <string name="advanced_battery_preference_title" msgid="6518802648205311326">"Shiko përdorimin e baterisë"</string>
<string name="battery_details_title" msgid="4531369291819754178">"Përdorimi i baterisë"</string>
<string name="details_subtitle" msgid="2550872569652785527">"Përdor detajet"</string>
<string name="controls_subtitle" msgid="3759606830916441564">"Rregullo përdorimin e energjisë"</string>
@@ -4097,6 +4098,7 @@
<string name="usb_use" msgid="6783183432648438528">"Opsionet e përdorimit të USB-së:"</string>
<string name="usb_default_label" msgid="3372838450371060750">"Konfigurimi i parazgjedhur i USB-së"</string>
<string name="usb_default_info" msgid="167172599497085266">"Kur të lidhet një pajisje tjetër dhe telefoni yt të jetë i shkyçur, do të zbatohen këto cilësime. Lidhe vetëm me pajisje të besuara."</string>
+ <string name="usb_power_title" msgid="5602112548385798646">"Opsionet e energjisë"</string>
<string name="usb_pref" msgid="8521832005703261700">"USB"</string>
<string name="usb_preference" msgid="5084550082591493765">"Preferencat e USB-së"</string>
<string name="usb_control_title" msgid="1946791559052157693">"USB-ja kontrollohet nga"</string>
@@ -4936,8 +4938,8 @@
<string name="mobile_data_ap_mode_disabled" msgid="6067959496888990983">"Nuk ofrohen në modalitetin e aeroplanit"</string>
<string name="force_desktop_mode" msgid="1336913605091334238">"Detyro \"modalitetin e desktopit\""</string>
<string name="force_desktop_mode_summary" msgid="4587416867846930479">"Detyro \"modalitetin e desktopit\" eksperimental në ekrane dytësore"</string>
- <string name="enable_sizecompat_freeform" msgid="3799755160777404309">"Aktivizo sizecompat në formë të lirë"</string>
- <string name="enable_sizecompat_freeform_summary" msgid="1484050174538201499">"Lejo aplikacionet sizecompat që të jenë në formë të lirë"</string>
+ <string name="enable_non_resizable_multi_window" msgid="6832903754625404477">"Aktivizo aplikacionet me madhësi jo të ndryshueshme në modalitetin me shumë dritare"</string>
+ <string name="enable_non_resizable_multi_window_summary" msgid="3275763753261901999">"Lejon që aplikacionet me madhësi jo të ndryshueshme të shfaqen në modalitetin me shumë dritare"</string>
<string name="hwui_force_dark_title" msgid="4256904905631994219">"Anulo detyrimin e errësimit"</string>
<string name="hwui_force_dark_summary" msgid="6515748781487952769">"Anulon funksionin e detyrimit të errësimit që të jetë gjithmonë aktiv"</string>
<string name="enable_blurs_on_windows_title" msgid="4218144213800778872">"Aktivizo turbullirat"</string>
@@ -5059,8 +5061,8 @@
<string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"aeroplan, të sigurta për në aeroplan"</string>
<string name="calls_and_sms" msgid="1931855083959003306">"Telefonatat dhe SMS"</string>
<string name="calls_and_sms_category" msgid="2021321997884906046">"Telefonatë me Wi-Fi"</string>
- <string name="calls_sms_wfc_summary" msgid="4930471357980272294">"Kryej dhe merr telefonata përmes rrjeteve jo të operatorëve celularë, si p.sh. Wi‑Fi"</string>
- <string name="calls_sms_footnote" msgid="7002461875954024216">"Telefonata me Wi-Fi të lejon të bësh dhe të marrësh telefonata përmes rrjeteve jo të operatorëve celularë, si p.sh. disa rrjete Wi‑Fi."</string>
+ <string name="calls_sms_wfc_summary" msgid="3940529919408667336">"Kryej dhe merr telefonata përmes Wi‑Fi"</string>
+ <string name="calls_sms_footnote" msgid="8051604228144899434">"Me telefonatat me Wi‑Fi, telefonatat kryhen dhe merren përmes rrjeteve Wi-Fi jo të operatorëve celularë."</string>
<string name="calls_preference_title" msgid="7536882032182563800">"Telefonatat"</string>
<string name="sms_preference_title" msgid="8392745501754864395">"SMS"</string>
<string name="calls_sms_preferred" msgid="6016477652522583496">"preferohet"</string>
@@ -5079,10 +5081,10 @@
<string name="reset_internet_text" product="tablet" msgid="8797910368942544453">"Kjo do ta mbyllë telefonatën"</string>
<string name="resetting_internet_text" msgid="6696779371800051806">"Interneti po rivendoset…"</string>
<string name="fix_connectivity" msgid="2781433603228089501">"Rregullo problemin me lidhshmërinë"</string>
- <!-- no translation found for airplane_mode_network_available (1059499681300395240) -->
- <skip />
- <!-- no translation found for to_switch_networks_disconnect_ethernet (6615374552827587197) -->
- <skip />
+ <string name="airplane_mode_network_available" msgid="1059499681300395240">"Ofrohen rrjete të modalitetit të aeroplanit"</string>
+ <string name="to_switch_networks_disconnect_ethernet" msgid="6615374552827587197">"Për të ndërruar rrjetet, shkëput eternetin"</string>
+ <string name="cannot_switch_networks_while_connected" msgid="3867944849171754777">"Rrjetet nuk mund të ndërrohen kur je lidhur"</string>
+ <string name="airplane_mode_network_panel_title" msgid="6385046104863403604">"Rrjetet e \"Modalitetit të aeroplanit\""</string>
<string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g> / <xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
<string name="mobile_data_connection_active" msgid="2422223108911581552">"Lidhur"</string>
<string name="mobile_data_off_summary" msgid="3841411571485837651">"Interneti nuk do të lidhet automatikisht"</string>
@@ -5104,4 +5106,16 @@
<string name="category_name_others" msgid="2366006298768550310">"Të tjera"</string>
<string name="category_name_general" msgid="7737273712848115886">"E përgjithshme"</string>
<string name="default_see_all_apps_title" msgid="7481113230662612178">"Shiko të gjitha aplikacionet"</string>
+ <string name="smart_forwarding_title" msgid="8368634861971949799">"Transferimi inteligjent"</string>
+ <string name="smart_forwarding_summary_enabled" msgid="3341062878373185604">"Transferimi inteligjent është aktivizuar"</string>
+ <string name="smart_forwarding_summary_disabled" msgid="5033880700091914809">"Transferimi inteligjent është çaktivizuar"</string>
+ <string name="smart_forwarding_ongoing_title" msgid="962226849074401228">"Cilësimet e telefonatave"</string>
+ <string name="smart_forwarding_ongoing_text" msgid="2189209372407117114">"Po përditësohen cilësimet…"</string>
+ <string name="smart_forwarding_failed_title" msgid="1859891191023516080">"Gabim në cilësimet e telefonatave"</string>
+ <string name="smart_forwarding_failed_text" msgid="5370431503707373653">"Gabim në rrjet ose në kartën SIM."</string>
+ <string name="smart_forwarding_failed_not_activated_text" msgid="997396203001257904">"Karta SIM nuk është aktivizuar."</string>
+ <string name="smart_forwarding_input_mdn_title" msgid="5105463748849841763">"Fut numrat e telefonit"</string>
+ <string name="smart_forwarding_input_mdn_dialog_title" msgid="7542216086697868415">"Fut numrin e telefonit"</string>
+ <string name="smart_forwarding_missing_mdn_text" msgid="2907314684242542226">"Numri i telefonit mungon."</string>
+ <string name="smart_forwarding_missing_alert_dialog_text" msgid="7870419247987316112">"Në rregull"</string>
</resources>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index e47a826..4389a4a 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -2292,8 +2292,7 @@
<item quantity="few"><xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> сачувана слушна апарата</item>
<item quantity="other"><xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> сачуваних слушних апарата</item>
</plurals>
- <!-- no translation found for accessibility_audio_adjustment_title (1332113739136802997) -->
- <skip />
+ <string name="accessibility_audio_adjustment_title" msgid="1332113739136802997">"Прилагођавање звука"</string>
<string name="accessibility_summary_shortcut_enabled" msgid="4030427268146752644">"Пречица је укључена"</string>
<string name="accessibility_summary_shortcut_disabled" msgid="564005462092499068">"Искључено"</string>
<string name="accessibility_summary_state_enabled" msgid="1065431632216039369">"Укључено"</string>
@@ -2468,6 +2467,7 @@
<string name="bluetooth_on_time" msgid="8424625554628450028">"Време од укључивања WiFi мреже"</string>
<string name="advanced_battery_title" msgid="3005993394776555079">"Потрошња батерије"</string>
<string name="history_details_title" msgid="8628584613889559355">"Детаљи историје"</string>
+ <string name="advanced_battery_preference_title" msgid="6518802648205311326">"Прикажи потрошњу батерије"</string>
<string name="battery_details_title" msgid="4531369291819754178">"Потрошња батерије"</string>
<string name="details_subtitle" msgid="2550872569652785527">"Коришћење детаља"</string>
<string name="controls_subtitle" msgid="3759606830916441564">"Прилагођавање коришћења напајања"</string>
@@ -4160,6 +4160,7 @@
<string name="usb_use" msgid="6783183432648438528">"Користи USB за"</string>
<string name="usb_default_label" msgid="3372838450371060750">"Подразумевана USB конфигурација"</string>
<string name="usb_default_info" msgid="167172599497085266">"Кад се повеже други уређај, а телефон је откључан, примењују се ова подешавања. Повезујте се само са поузданим уређајима."</string>
+ <string name="usb_power_title" msgid="5602112548385798646">"Опције напајања"</string>
<string name="usb_pref" msgid="8521832005703261700">"USB"</string>
<string name="usb_preference" msgid="5084550082591493765">"Подешавања USB-а"</string>
<string name="usb_control_title" msgid="1946791559052157693">"USB контролише:"</string>
@@ -5018,8 +5019,8 @@
<string name="mobile_data_ap_mode_disabled" msgid="6067959496888990983">"Недоступно током режима рада у авиону"</string>
<string name="force_desktop_mode" msgid="1336913605091334238">"Наметни режим рачунара"</string>
<string name="force_desktop_mode_summary" msgid="4587416867846930479">"Наметни експериментални режим рачунара на секундарним екранима"</string>
- <string name="enable_sizecompat_freeform" msgid="3799755160777404309">"Омогући слободни облик апликација са непромењивом величином"</string>
- <string name="enable_sizecompat_freeform_summary" msgid="1484050174538201499">"Омогућава апликацијама са непромењивом величином да буду у слободном облику"</string>
+ <string name="enable_non_resizable_multi_window" msgid="6832903754625404477">"Омогући апликације непромењиве величине у више прозора"</string>
+ <string name="enable_non_resizable_multi_window_summary" msgid="3275763753261901999">"Омогућава да апликације непромењиве величине буду у више прозора"</string>
<string name="hwui_force_dark_title" msgid="4256904905631994219">"Замени функцију наметања тамне теме"</string>
<string name="hwui_force_dark_summary" msgid="6515748781487952769">"Мења функцију наметања тамне теме тако да буде увек укључена"</string>
<string name="enable_blurs_on_windows_title" msgid="4218144213800778872">"Омогући замагљивања"</string>
@@ -5143,8 +5144,8 @@
<string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"авион, безбедно по авион"</string>
<string name="calls_and_sms" msgid="1931855083959003306">"Позиви и SMS"</string>
<string name="calls_and_sms_category" msgid="2021321997884906046">"Позивање преко WiFi-а"</string>
- <string name="calls_sms_wfc_summary" msgid="4930471357980272294">"Упућујте и примајте позиве преко мрежа које не припадају мобилном оператеру, на пример, WiFi-ја"</string>
- <string name="calls_sms_footnote" msgid="7002461875954024216">"Позивање преко WiFi-ја вам омогућава да примате и упућујете позиве преко мрежа које не припадају мобилном оператеру, на пример, неких WiFi мрежа."</string>
+ <string name="calls_sms_wfc_summary" msgid="3940529919408667336">"Упућујте и примајте позиве преко WiFi-ја"</string>
+ <string name="calls_sms_footnote" msgid="8051604228144899434">"Када користите Позивање преко WiFi-ја, позиви се упућују и примају преко WiFi мрежа које не припадају мобилном оператеру."</string>
<string name="calls_preference_title" msgid="7536882032182563800">"Позиви"</string>
<string name="sms_preference_title" msgid="8392745501754864395">"SMS"</string>
<string name="calls_sms_preferred" msgid="6016477652522583496">"предност"</string>
@@ -5163,10 +5164,10 @@
<string name="reset_internet_text" product="tablet" msgid="8797910368942544453">"Овим завршавате телефонски позив"</string>
<string name="resetting_internet_text" msgid="6696779371800051806">"Ресетује се интернет…"</string>
<string name="fix_connectivity" msgid="2781433603228089501">"Реши проблем са повезивањем"</string>
- <!-- no translation found for airplane_mode_network_available (1059499681300395240) -->
- <skip />
- <!-- no translation found for to_switch_networks_disconnect_ethernet (6615374552827587197) -->
- <skip />
+ <string name="airplane_mode_network_available" msgid="1059499681300395240">"Доступне су мреже за режим рада у авиону"</string>
+ <string name="to_switch_networks_disconnect_ethernet" msgid="6615374552827587197">"Да бисте променили мрежу, прекините етернет везу"</string>
+ <string name="cannot_switch_networks_while_connected" msgid="3867944849171754777">"Не можете да промените мрежу док сте повезани"</string>
+ <string name="airplane_mode_network_panel_title" msgid="6385046104863403604">"Мреже у режиму рада у авиону"</string>
<string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g>/<xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
<string name="mobile_data_connection_active" msgid="2422223108911581552">"Повезано"</string>
<string name="mobile_data_off_summary" msgid="3841411571485837651">"Аутоматско повезивање на интернет није могуће"</string>
@@ -5188,4 +5189,16 @@
<string name="category_name_others" msgid="2366006298768550310">"Друго"</string>
<string name="category_name_general" msgid="7737273712848115886">"Опште"</string>
<string name="default_see_all_apps_title" msgid="7481113230662612178">"Прикажи све апликације"</string>
+ <string name="smart_forwarding_title" msgid="8368634861971949799">"Паметно прослеђивање"</string>
+ <string name="smart_forwarding_summary_enabled" msgid="3341062878373185604">"Паметно прослеђивање је омогућено"</string>
+ <string name="smart_forwarding_summary_disabled" msgid="5033880700091914809">"Паметно прослеђивање је онемогућено"</string>
+ <string name="smart_forwarding_ongoing_title" msgid="962226849074401228">"Подешавања позива"</string>
+ <string name="smart_forwarding_ongoing_text" msgid="2189209372407117114">"Ажурирају се подешавања…"</string>
+ <string name="smart_forwarding_failed_title" msgid="1859891191023516080">"Грешка у подешавањима позива"</string>
+ <string name="smart_forwarding_failed_text" msgid="5370431503707373653">"Грешка на мрежи или SIM картици."</string>
+ <string name="smart_forwarding_failed_not_activated_text" msgid="997396203001257904">"SIM картица није активирана."</string>
+ <string name="smart_forwarding_input_mdn_title" msgid="5105463748849841763">"Унесите бројеве телефона"</string>
+ <string name="smart_forwarding_input_mdn_dialog_title" msgid="7542216086697868415">"Унесите број телефона"</string>
+ <string name="smart_forwarding_missing_mdn_text" msgid="2907314684242542226">"Није наведен број телефона."</string>
+ <string name="smart_forwarding_missing_alert_dialog_text" msgid="7870419247987316112">"Потврди"</string>
</resources>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index 8e723c0..003aeea 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -1903,7 +1903,7 @@
</plurals>
<string name="clear_uri_btn_text" msgid="4828117421162495134">"Ta bort åtkomst"</string>
<string name="controls_label" msgid="8671492254263626383">"Kontroller"</string>
- <string name="force_stop" msgid="2681771622136916280">"Tvingad avslutning"</string>
+ <string name="force_stop" msgid="2681771622136916280">"Tvinga att avsluta"</string>
<string name="total_size_label" msgid="2052185048749658866">"Totalt"</string>
<string name="application_size_label" msgid="6407051020651716729">"Appstorlek"</string>
<string name="external_code_size_label" msgid="7375146402660973743">"Data på USB-lagringsenhet"</string>
@@ -2267,8 +2267,7 @@
<item quantity="other"><xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> hörapparater har sparats</item>
<item quantity="one"><xliff:g id="NUMBER_DEVICE_COUNT_0">%1$d</xliff:g> hörapparat har sparats</item>
</plurals>
- <!-- no translation found for accessibility_audio_adjustment_title (1332113739136802997) -->
- <skip />
+ <string name="accessibility_audio_adjustment_title" msgid="1332113739136802997">"Ljudjustering"</string>
<string name="accessibility_summary_shortcut_enabled" msgid="4030427268146752644">"Genväg på"</string>
<string name="accessibility_summary_shortcut_disabled" msgid="564005462092499068">"Av"</string>
<string name="accessibility_summary_state_enabled" msgid="1065431632216039369">"På"</string>
@@ -2323,7 +2322,7 @@
<string name="captioning_window_color" msgid="1406167274530183119">"Textningsfönstrets färg"</string>
<string name="captioning_window_opacity" msgid="4031752812991199525">"Textningsfönstrets genomskinlighet"</string>
<string name="captioning_foreground_color" msgid="9057327228286129232">"Textfärg"</string>
- <string name="captioning_foreground_opacity" msgid="1395843080697567189">"Textgenomskinlighet"</string>
+ <string name="captioning_foreground_opacity" msgid="1395843080697567189">"Textopacitet"</string>
<string name="captioning_edge_color" msgid="6035818279902597518">"Kantfärg"</string>
<string name="captioning_edge_type" msgid="5281259280060811506">"Typ av kant"</string>
<string name="captioning_typeface" msgid="285325623518361407">"Teckensnittsfamilj"</string>
@@ -2437,6 +2436,7 @@
<string name="bluetooth_on_time" msgid="8424625554628450028">"Wi-Fi i tid"</string>
<string name="advanced_battery_title" msgid="3005993394776555079">"Batteriförbrukning"</string>
<string name="history_details_title" msgid="8628584613889559355">"Detaljerad historik"</string>
+ <string name="advanced_battery_preference_title" msgid="6518802648205311326">"Visa batteriförbrukning"</string>
<string name="battery_details_title" msgid="4531369291819754178">"Batteriförbrukning"</string>
<string name="details_subtitle" msgid="2550872569652785527">"Information om användning"</string>
<string name="controls_subtitle" msgid="3759606830916441564">"Justera strömförbrukningen"</string>
@@ -2568,7 +2568,7 @@
<string name="usage_type_total_battery_capacity" msgid="3878234027503885998">"Total batterikapacitet"</string>
<string name="usage_type_computed_power" msgid="5191902025833668752">"Beräknad strömförbrukning"</string>
<string name="usage_type_actual_power" msgid="1221358930299037926">"Faktisk strömförbrukning"</string>
- <string name="battery_action_stop" msgid="6998228610098034316">"Tvingad avslutning"</string>
+ <string name="battery_action_stop" msgid="6998228610098034316">"Tvinga att avsluta"</string>
<string name="battery_action_app_details" msgid="7201369216798227707">"Appinformation"</string>
<string name="battery_action_app_settings" msgid="2437124469335488464">"Appinställningar"</string>
<string name="battery_action_display" msgid="6515712081248863749">"Skärminställningar"</string>
@@ -4098,6 +4098,7 @@
<string name="usb_use" msgid="6783183432648438528">"Använd USB för"</string>
<string name="usb_default_label" msgid="3372838450371060750">"Standardkonfiguration för USB"</string>
<string name="usb_default_info" msgid="167172599497085266">"När en annan enhet ansluts och mobilen låses upp används de här inställningarna. Anslut bara till betrodda enheter."</string>
+ <string name="usb_power_title" msgid="5602112548385798646">"Strömalternativ"</string>
<string name="usb_pref" msgid="8521832005703261700">"USB"</string>
<string name="usb_preference" msgid="5084550082591493765">"USB-inställningar"</string>
<string name="usb_control_title" msgid="1946791559052157693">"USB styrs av"</string>
@@ -4937,8 +4938,8 @@
<string name="mobile_data_ap_mode_disabled" msgid="6067959496888990983">"Ej tillgängligt i flygplansläge"</string>
<string name="force_desktop_mode" msgid="1336913605091334238">"Tvinga fram skrivbordsläge"</string>
<string name="force_desktop_mode_summary" msgid="4587416867846930479">"Tvinga fram experimentellt skrivbordsläge på sekundära skärmar"</string>
- <string name="enable_sizecompat_freeform" msgid="3799755160777404309">"Aktivera fritt format för kompatibla storlekar"</string>
- <string name="enable_sizecompat_freeform_summary" msgid="1484050174538201499">"Tillåter fritt format för appar i kompatibel storlek"</string>
+ <string name="enable_non_resizable_multi_window" msgid="6832903754625404477">"Aktivera appar vars storlek inte kan ändras i flerfönsterläge"</string>
+ <string name="enable_non_resizable_multi_window_summary" msgid="3275763753261901999">"Låter appar vars storlek inte kan ändras finnas i flerfönsterläge"</string>
<string name="hwui_force_dark_title" msgid="4256904905631994219">"Åsidosätter tvingat mörkt läge"</string>
<string name="hwui_force_dark_summary" msgid="6515748781487952769">"Åsidosätter funktionen som tvingar mörkt läge att alltid vara aktiverat"</string>
<string name="enable_blurs_on_windows_title" msgid="4218144213800778872">"Aktivera oskärpa"</string>
@@ -5060,8 +5061,8 @@
<string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"flygplan, flygplanssäker"</string>
<string name="calls_and_sms" msgid="1931855083959003306">"Samtal och sms"</string>
<string name="calls_and_sms_category" msgid="2021321997884906046">"Wi-Fi-samtal"</string>
- <string name="calls_sms_wfc_summary" msgid="4930471357980272294">"Ringa och ta emot samtal via nätverk som inte tillhör operatörer, till exempel Wi‑Fi-nätverk"</string>
- <string name="calls_sms_footnote" msgid="7002461875954024216">"Med Wi-Fi-samtal kan du ringa och ta emot samtal via nätverk som inte tillhör operatörer, till exempel vissa Wi‑Fi-nätverk."</string>
+ <string name="calls_sms_wfc_summary" msgid="3940529919408667336">"Ringa och ta emot samtal via Wi‑Fi"</string>
+ <string name="calls_sms_footnote" msgid="8051604228144899434">"Med Wi‑Fi-samtal kan du ringa och ta emot samtal via nätverk som inte tillhör operatörer."</string>
<string name="calls_preference_title" msgid="7536882032182563800">"Samtal"</string>
<string name="sms_preference_title" msgid="8392745501754864395">"Sms"</string>
<string name="calls_sms_preferred" msgid="6016477652522583496">"föredras"</string>
@@ -5080,10 +5081,10 @@
<string name="reset_internet_text" product="tablet" msgid="8797910368942544453">"Detta avslutar samtalet"</string>
<string name="resetting_internet_text" msgid="6696779371800051806">"Internetanslutningen återställs …"</string>
<string name="fix_connectivity" msgid="2781433603228089501">"Åtgärda anslutning"</string>
- <!-- no translation found for airplane_mode_network_available (1059499681300395240) -->
- <skip />
- <!-- no translation found for to_switch_networks_disconnect_ethernet (6615374552827587197) -->
- <skip />
+ <string name="airplane_mode_network_available" msgid="1059499681300395240">"Nätverk för flygplansläge är tillgängliga"</string>
+ <string name="to_switch_networks_disconnect_ethernet" msgid="6615374552827587197">"Koppla bort Ethernet för att byta nätverk"</string>
+ <string name="cannot_switch_networks_while_connected" msgid="3867944849171754777">"Det går inte att växla nätverk när du är ansluten"</string>
+ <string name="airplane_mode_network_panel_title" msgid="6385046104863403604">"Nätverk för flygplansläge"</string>
<string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g>/<xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
<string name="mobile_data_connection_active" msgid="2422223108911581552">"Ansluten"</string>
<string name="mobile_data_off_summary" msgid="3841411571485837651">"Du ansluts inte automatiskt till internet"</string>
@@ -5105,4 +5106,16 @@
<string name="category_name_others" msgid="2366006298768550310">"Annat"</string>
<string name="category_name_general" msgid="7737273712848115886">"Allmänt"</string>
<string name="default_see_all_apps_title" msgid="7481113230662612178">"Visa alla appar"</string>
+ <string name="smart_forwarding_title" msgid="8368634861971949799">"Smart vidarebefordran"</string>
+ <string name="smart_forwarding_summary_enabled" msgid="3341062878373185604">"Smart vidarebefordran har aktiverats"</string>
+ <string name="smart_forwarding_summary_disabled" msgid="5033880700091914809">"Smart vidarebefordran har inaktiverats"</string>
+ <string name="smart_forwarding_ongoing_title" msgid="962226849074401228">"Samtalsinställningar"</string>
+ <string name="smart_forwarding_ongoing_text" msgid="2189209372407117114">"Uppdaterar inställningar …"</string>
+ <string name="smart_forwarding_failed_title" msgid="1859891191023516080">"Felaktiga samtalsinställningar"</string>
+ <string name="smart_forwarding_failed_text" msgid="5370431503707373653">"Nätverks- eller SIM-kortsfel."</string>
+ <string name="smart_forwarding_failed_not_activated_text" msgid="997396203001257904">"SIM-kortet har inte aktiverats."</string>
+ <string name="smart_forwarding_input_mdn_title" msgid="5105463748849841763">"Ange telefonnummer"</string>
+ <string name="smart_forwarding_input_mdn_dialog_title" msgid="7542216086697868415">"Ange telefonnummer"</string>
+ <string name="smart_forwarding_missing_mdn_text" msgid="2907314684242542226">"Telefonnummer saknas."</string>
+ <string name="smart_forwarding_missing_alert_dialog_text" msgid="7870419247987316112">"OK"</string>
</resources>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index 6f3a20e..51f13df 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -427,7 +427,7 @@
<string name="cancel_lock_screen_dialog_button_label" msgid="1801132985957491690">"Ghairi"</string>
<string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="886085239313346000">"Gusa kitambua alama ya kidole"</string>
<string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="6160543980992596286">"Kinapatikana nyuma ya simu yako. Tumia kidole chako cha shahada."</string>
- <string name="security_settings_udfps_enroll_find_sensor_message" msgid="1181700918690345832">"Kiko kwenye skrini. Tafuta alama bainifu yenye mduara wenye mwanga."</string>
+ <string name="security_settings_udfps_enroll_find_sensor_message" msgid="1181700918690345832">"Kiko kwenye skrini. Tafuta alama ya kidole yenye mduara wenye mwanga."</string>
<string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="3065850549419750523">"Mchoro unaooyesha mahali kitambua alama ya kidole kilipo kwenye kifaa"</string>
<string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7298812463228440333">"Jina"</string>
<string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4074335979239208021">"SAWA"</string>
@@ -2267,8 +2267,7 @@
<item quantity="other">Imehifadhi vifaa <xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> vya kusaidia kusikia</item>
<item quantity="one">Imehifadhi kifaa <xliff:g id="NUMBER_DEVICE_COUNT_0">%1$d</xliff:g> cha kusaidia kusikia</item>
</plurals>
- <!-- no translation found for accessibility_audio_adjustment_title (1332113739136802997) -->
- <skip />
+ <string name="accessibility_audio_adjustment_title" msgid="1332113739136802997">"Marekebisho ya sauti"</string>
<string name="accessibility_summary_shortcut_enabled" msgid="4030427268146752644">"Kipengele cha njia ya mkato kimewashwa"</string>
<string name="accessibility_summary_shortcut_disabled" msgid="564005462092499068">"Imezimwa"</string>
<string name="accessibility_summary_state_enabled" msgid="1065431632216039369">"Imewashwa"</string>
@@ -2437,6 +2436,7 @@
<string name="bluetooth_on_time" msgid="8424625554628450028">"Wi-Fi wakati unaofaa"</string>
<string name="advanced_battery_title" msgid="3005993394776555079">"Matumizi ya betri"</string>
<string name="history_details_title" msgid="8628584613889559355">"Maelezo ya historia"</string>
+ <string name="advanced_battery_preference_title" msgid="6518802648205311326">"Angalia matumizi ya betri"</string>
<string name="battery_details_title" msgid="4531369291819754178">"Matumizi ya betri"</string>
<string name="details_subtitle" msgid="2550872569652785527">"Tumia maelezo"</string>
<string name="controls_subtitle" msgid="3759606830916441564">"Rekebisha utumiaji wa nishati"</string>
@@ -4098,6 +4098,7 @@
<string name="usb_use" msgid="6783183432648438528">"Tumia USB"</string>
<string name="usb_default_label" msgid="3372838450371060750">"Mipangilio chaguomsingi ya USB"</string>
<string name="usb_default_info" msgid="167172599497085266">"Wakati kifaa kingine kimeunganishwa na simu yako imefunguliwa, mipangilio hii itatumika. Unganisha kwenye vifaa unavyoamini pekee."</string>
+ <string name="usb_power_title" msgid="5602112548385798646">"Chaguo za kuwasha"</string>
<string name="usb_pref" msgid="8521832005703261700">"USB"</string>
<string name="usb_preference" msgid="5084550082591493765">"Mapendeleo ya USB"</string>
<string name="usb_control_title" msgid="1946791559052157693">"USB inadhibitiwa na"</string>
@@ -4938,8 +4939,8 @@
<string name="mobile_data_ap_mode_disabled" msgid="6067959496888990983">"Haipatikani ukitumia hali ya ndegeni"</string>
<string name="force_desktop_mode" msgid="1336913605091334238">"Lazimisha hali ya eneo-kazi"</string>
<string name="force_desktop_mode_summary" msgid="4587416867846930479">"Lazimisha hali ya jaribio la eneo-kazi kwenye maonyesho yasiyo ya msingi"</string>
- <string name="enable_sizecompat_freeform" msgid="3799755160777404309">"Ruhusu ukubwa usiobadilishwa katika muundo huru"</string>
- <string name="enable_sizecompat_freeform_summary" msgid="1484050174538201499">"Huruhusu programu zisizobadilishwa ukubwa kuwa katika muundo huru"</string>
+ <string name="enable_non_resizable_multi_window" msgid="6832903754625404477">"Ruhusu ukubwa usioweza kubadilishwa katika madirisha mengi"</string>
+ <string name="enable_non_resizable_multi_window_summary" msgid="3275763753261901999">"Huruhusu programu zenye ukubwa usioweza kubadilishwa ziwe katika madirisha mengi"</string>
<string name="hwui_force_dark_title" msgid="4256904905631994219">"Badilisha ulazimishaji wa mandhari meusi"</string>
<string name="hwui_force_dark_summary" msgid="6515748781487952769">"Hubatilisha mipangilio ya kipengele cha kulazimisha mandhari meusi ili kiwake kila wakati"</string>
<string name="enable_blurs_on_windows_title" msgid="4218144213800778872">"Ruhusu hali ya kutia ukungu"</string>
@@ -4991,7 +4992,7 @@
<string name="wfc_disclaimer_emergency_limitation_desc_text" msgid="5503902001191552196">"Mtoa huduma wako hakuruhusu kupiga simu za dharura kupitia Wi-Fi.\nKifaa hubadili kiotomatiki na kutumia mtandao wa simu ya mkononi ili kupiga simu ya dharura.\nUnaweza kupiga simu za dharura katika maeneo yaliyo na mtandao wa simu ya mkononi pekee."</string>
<string name="wifi_calling_summary" msgid="8566648389959032967">"Tumia Wi-Fi kupiga na kupokea simu ili kuboresha hali ya mawasiliano"</string>
<string name="backup_calling_settings_title" msgid="519714752900364326">"Kupiga simu kupitia mtandao mbadala"</string>
- <string name="backup_calling_setting_summary" msgid="451295393447465830">"Ikiwa <xliff:g id="BACKUP_CALLING_OPERATOR_TEXT">%1$s</xliff:g> haipatikani, tumia SIM yako ya data ya mtandao wa simu ili upige na kupokea simu za <xliff:g id="BACKUP_CALLING_CARRIER_TEXT">%1$s</xliff:g>."</string>
+ <string name="backup_calling_setting_summary" msgid="451295393447465830">"Ikiwa <xliff:g id="BACKUP_CALLING_OPERATOR_TEXT">%1$s</xliff:g> haipatikani, tumia SIM yako ya data ya mtandao wa simu ili upige na upokee simu za <xliff:g id="BACKUP_CALLING_CARRIER_TEXT">%1$s</xliff:g>."</string>
<string name="keywords_backup_calling" msgid="8592800915478816800">"kupiga simu kupitia mtandao mbadala"</string>
<string name="enable_receiving_mms_notification_title" msgid="6465218559386990248">"Ujumbe wa MMS unaoingia"</string>
<string name="enable_sending_mms_notification_title" msgid="7120641300854953375">"Huwezi kutuma ujumbe wa MMS"</string>
@@ -5061,8 +5062,8 @@
<string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"ndegeni, salama ya ndegeni"</string>
<string name="calls_and_sms" msgid="1931855083959003306">"Simu na SMS"</string>
<string name="calls_and_sms_category" msgid="2021321997884906046">"Kupiga simu kupitia Wi-Fi"</string>
- <string name="calls_sms_wfc_summary" msgid="4930471357980272294">"Piga na upokee simu kwa kutumia mitandao isiyo ya mtoa huduma kama vile Wi-Fi"</string>
- <string name="calls_sms_footnote" msgid="7002461875954024216">"Kipengele cha kupiga simu kupitia Wi-Fi kinakuruhusu upige na kupokea simu kupitia mitandao isiyo ya watoa huduma kama vile baadhi ya mitandao ya Wi-Fi."</string>
+ <string name="calls_sms_wfc_summary" msgid="3940529919408667336">"Piga na upokee simu kupitia Wi‑Fi"</string>
+ <string name="calls_sms_footnote" msgid="8051604228144899434">"Kwa kutumia kipengele cha kupiga simu kupitia Wi-Fi, simu zinapigwa na kupokewa kupitia mitandao ya Wi-Fi isiyo ya watoa huduma."</string>
<string name="calls_preference_title" msgid="7536882032182563800">"Simu"</string>
<string name="sms_preference_title" msgid="8392745501754864395">"SMS"</string>
<string name="calls_sms_preferred" msgid="6016477652522583496">"mtoa huduma unayempendelea"</string>
@@ -5081,10 +5082,10 @@
<string name="reset_internet_text" product="tablet" msgid="8797910368942544453">"Hatua hii itakata simu yako"</string>
<string name="resetting_internet_text" msgid="6696779371800051806">"Inabadilisha mipangilio yako ya intaneti…"</string>
<string name="fix_connectivity" msgid="2781433603228089501">"Rekebisha hitilafu ya muunganisho"</string>
- <!-- no translation found for airplane_mode_network_available (1059499681300395240) -->
- <skip />
- <!-- no translation found for to_switch_networks_disconnect_ethernet (6615374552827587197) -->
- <skip />
+ <string name="airplane_mode_network_available" msgid="1059499681300395240">"Mitandao inayotumika katika hali ya ndegeni inapatikana"</string>
+ <string name="to_switch_networks_disconnect_ethernet" msgid="6615374552827587197">"Ili kubadili mitandao, tenganisha ethaneti"</string>
+ <string name="cannot_switch_networks_while_connected" msgid="3867944849171754777">"Haiwezi kubadili mitandao wakati imeunganishwa"</string>
+ <string name="airplane_mode_network_panel_title" msgid="6385046104863403604">"Mitandao ya hali ya ndegeni"</string>
<string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g> / <xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
<string name="mobile_data_connection_active" msgid="2422223108911581552">"Imeunganishwa"</string>
<string name="mobile_data_off_summary" msgid="3841411571485837651">"Intaneti haitaunganishwa kiotomatiki"</string>
@@ -5106,4 +5107,16 @@
<string name="category_name_others" msgid="2366006298768550310">"Vingine"</string>
<string name="category_name_general" msgid="7737273712848115886">"Jumla"</string>
<string name="default_see_all_apps_title" msgid="7481113230662612178">"Angalia programu zote"</string>
+ <string name="smart_forwarding_title" msgid="8368634861971949799">"Usambazaji Mahiri"</string>
+ <string name="smart_forwarding_summary_enabled" msgid="3341062878373185604">"Umewasha kipengele cha Usambazaji Mahiri"</string>
+ <string name="smart_forwarding_summary_disabled" msgid="5033880700091914809">"Umezima kipengele cha Usambazaji Mahiri"</string>
+ <string name="smart_forwarding_ongoing_title" msgid="962226849074401228">"Mipangilio ya Simu"</string>
+ <string name="smart_forwarding_ongoing_text" msgid="2189209372407117114">"Inasasisha Mipangilio…"</string>
+ <string name="smart_forwarding_failed_title" msgid="1859891191023516080">"Hitilafu ya Mipangilio ya Simu"</string>
+ <string name="smart_forwarding_failed_text" msgid="5370431503707373653">"Hitilafu ya mtandao au ya SIM kadi."</string>
+ <string name="smart_forwarding_failed_not_activated_text" msgid="997396203001257904">"SIM haijaanza kutumika."</string>
+ <string name="smart_forwarding_input_mdn_title" msgid="5105463748849841763">"Weka Nambari za simu"</string>
+ <string name="smart_forwarding_input_mdn_dialog_title" msgid="7542216086697868415">"Weka Nambari ya simu"</string>
+ <string name="smart_forwarding_missing_mdn_text" msgid="2907314684242542226">"Nambari ya simu haipo."</string>
+ <string name="smart_forwarding_missing_alert_dialog_text" msgid="7870419247987316112">"Sawa"</string>
</resources>
diff --git a/res/values-ta/strings.xml b/res/values-ta/strings.xml
index 77edc38..9911b23 100644
--- a/res/values-ta/strings.xml
+++ b/res/values-ta/strings.xml
@@ -844,7 +844,7 @@
<string name="wifi_scan_notify_text" msgid="2518097467707535013">"இருப்பிடத் துல்லியத்தை மேம்படுத்த, வைஃபை ஆஃப் செய்யப்பட்டிருந்தாலும்கூட, எந்தநேரத்திலும் ஆப்ஸும் சேவைகளும் வைஃபை நெட்வொர்க்குகளைத் தேடலாம். உதாரணத்திற்கு, இருப்பிடம் சார்ந்த அம்சங்கள் மற்றும் சேவைகளை மேம்படுத்துவதற்கும் இதைப் பயன்படுத்தலாம். <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>தேடுதல் அமைப்புகளில்<xliff:g id="LINK_END_1">LINK_END</xliff:g> இதை மாற்றிக்கொள்ளலாம்."</string>
<string name="wifi_scan_notify_text_scanning_off" msgid="6189528915806353667">"இருப்பிடத்தின் துல்லியத்தன்மையை மேம்படுத்த, <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>ஸ்கேனிங் அமைப்புகளில்<xliff:g id="LINK_END_1">LINK_END</xliff:g> வைஃபை ஸ்கேனிங்கை இயக்கவும்."</string>
<string name="wifi_scan_notify_remember_choice" msgid="8436897497968907701">"மீண்டும் காட்டாதே"</string>
- <string name="wifi_setting_sleep_policy_title" msgid="6285374200292675649">"உறக்கநிலையில் Wi-Fi இயக்கு"</string>
+ <string name="wifi_setting_sleep_policy_title" msgid="6285374200292675649">"உறக்கநிலையில் வைஃபை இயக்கு"</string>
<string name="wifi_setting_on_during_sleep_title" msgid="8753852404141070878">"உறக்கத்தின் போது வைஃபையை இயக்குதல்"</string>
<string name="wifi_setting_sleep_policy_error" msgid="4512566787805720422">"அமைப்பை மாற்றுவதில் சிக்கல் ஏற்பட்டது"</string>
<string name="wifi_suspend_efficiency_title" msgid="3589291227092825754">"மேம்பட்ட செயல்திறன்"</string>
@@ -2267,8 +2267,7 @@
<item quantity="other">சேமித்த செவித்துணைக் கருவிகள்: <xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g></item>
<item quantity="one">சேமித்த செவித்துணைக் கருவி: <xliff:g id="NUMBER_DEVICE_COUNT_0">%1$d</xliff:g></item>
</plurals>
- <!-- no translation found for accessibility_audio_adjustment_title (1332113739136802997) -->
- <skip />
+ <string name="accessibility_audio_adjustment_title" msgid="1332113739136802997">"ஆடியோ சரிசெய்தல்"</string>
<string name="accessibility_summary_shortcut_enabled" msgid="4030427268146752644">"ஷார்ட்கட் ஆன் செய்யப்பட்டுள்ளது"</string>
<string name="accessibility_summary_shortcut_disabled" msgid="564005462092499068">"ஆஃப்"</string>
<string name="accessibility_summary_state_enabled" msgid="1065431632216039369">"ஆன்"</string>
@@ -2437,6 +2436,7 @@
<string name="bluetooth_on_time" msgid="8424625554628450028">"வைஃபை இயக்க நேரம்"</string>
<string name="advanced_battery_title" msgid="3005993394776555079">"பேட்டரி உபயோகம்"</string>
<string name="history_details_title" msgid="8628584613889559355">"வரலாறு விவரங்கள்"</string>
+ <string name="advanced_battery_preference_title" msgid="6518802648205311326">"பேட்டரி உபயோகத்தைக் காட்டு"</string>
<string name="battery_details_title" msgid="4531369291819754178">"பேட்டரி உபயோகம்"</string>
<string name="details_subtitle" msgid="2550872569652785527">"விவரங்களைப் பயன்படுத்து"</string>
<string name="controls_subtitle" msgid="3759606830916441564">"ஆற்றல் பயன்பாட்டைச் சரிசெய்க"</string>
@@ -3266,7 +3266,7 @@
<string name="keywords_display_wallpaper" msgid="8478137541939526564">"பின்னணி, தனிப்படுத்து, பிரத்தியேகமாக்கு திரை"</string>
<string name="keywords_display_font_size" msgid="3593317215149813183">"உரை அளவு"</string>
<string name="keywords_display_cast_screen" msgid="2572331770299149370">"திரையில் காட்டு, அலைபரப்பு, திரையை மிரரிங் செய், திரையைக் காட்டு, திரையைப் பகிர், திரைப் பகிர்தல், மிரரிங், திரையை அலைபரப்பு, திரை அலைபரப்புதல்"</string>
- <string name="keywords_storage" msgid="3004667910133021783">"இடம், டிஸ்க், வட்டு இயக்ககம், சாதனப் பயன்பாடு"</string>
+ <string name="keywords_storage" msgid="3004667910133021783">"இடம், டிஸ்க், ஹார்டு டிரைவ், சாதனப் பயன்பாடு"</string>
<string name="keywords_battery" msgid="7040323668283600530">"பவர் பயன்பாடு, சார்ஜ்"</string>
<string name="keywords_spell_checker" msgid="5148906820603481657">"எழுத்துக் கூட்டல், அகராதி, எழுத்துச்சரிபார்ப்பு, தன்னியக்கத் திருத்தம்"</string>
<string name="keywords_voice_input" msgid="7534900094659358971">"கண்டறிவான், உள்ளீடு, பேச்சு, பேசு, மொழி, ஹேண்ட்ஸ்-ஃப்ரீ, ஹேண்ட்ஃப்ரீ, அறிதல், வன்மொழி, சொல், ஆடியோ, வரலாறு, புளூடூத் ஹெட்செட்"</string>
@@ -4098,6 +4098,7 @@
<string name="usb_use" msgid="6783183432648438528">"இதற்காக USBஐப் பயன்படுத்து:"</string>
<string name="usb_default_label" msgid="3372838450371060750">"இயல்பு USB உள்ளமைவு"</string>
<string name="usb_default_info" msgid="167172599497085266">"மற்றொரு சாதனம் இணைக்கப்பட்டு, உங்கள் மொபைலின் பூட்டுத் திரை திறந்திருந்தால், இந்த அமைப்புகள் பயன்படுத்தப்படும். நம்பகமான சாதனங்களுடன் மட்டும் இணைக்கவும்."</string>
+ <string name="usb_power_title" msgid="5602112548385798646">"பவர் விருப்பங்கள்"</string>
<string name="usb_pref" msgid="8521832005703261700">"USB"</string>
<string name="usb_preference" msgid="5084550082591493765">"USB விருப்பத்தேர்வுகள்"</string>
<string name="usb_control_title" msgid="1946791559052157693">"USBயை இதன்மூலம் கட்டுப்படுத்து:"</string>
@@ -4937,8 +4938,8 @@
<string name="mobile_data_ap_mode_disabled" msgid="6067959496888990983">"விமானப் பயன்முறையின்போது கிடைக்காது"</string>
<string name="force_desktop_mode" msgid="1336913605091334238">"கட்டாய டெஸ்க்டாப் பயன்முறை"</string>
<string name="force_desktop_mode_summary" msgid="4587416867846930479">"இரண்டாம்நிலை திரைகளில் \'கட்டாயப் பரிசோதனை டெஸ்க்டாப்\' பயன்முறை"</string>
- <string name="enable_sizecompat_freeform" msgid="3799755160777404309">"குறிப்பிட்ட வடிவமற்ற sizecompat ஆப்ஸை இயக்கும்"</string>
- <string name="enable_sizecompat_freeform_summary" msgid="1484050174538201499">"sizecompat ஆப்ஸ் குறிப்பிட்ட வடிவமற்று இருப்பதை அனுமதிக்கும்"</string>
+ <string name="enable_non_resizable_multi_window" msgid="6832903754625404477">"அளவு மாற்ற இயலாதவற்றைப் பல சாளரத்தில் இயக்கு"</string>
+ <string name="enable_non_resizable_multi_window_summary" msgid="3275763753261901999">"அளவு மாற்ற இயலாத ஆப்ஸைப் பல சாளரத்தில் இயக்க அனுமதிக்கும்"</string>
<string name="hwui_force_dark_title" msgid="4256904905631994219">"force-dark அம்சத்தை மீறிச் செயல்படுதல்"</string>
<string name="hwui_force_dark_summary" msgid="6515748781487952769">"எப்போதும் இயக்கத்தில் இருக்குமாறு force-dark அம்சத்தை மேலெழுதுகிறது"</string>
<string name="enable_blurs_on_windows_title" msgid="4218144213800778872">"மங்கலாக்கும்"</string>
@@ -5060,8 +5061,8 @@
<string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"விமானம், விமானப்-பாதுகாப்பு"</string>
<string name="calls_and_sms" msgid="1931855083959003306">"அழைப்புகள் & மெசேஜ்"</string>
<string name="calls_and_sms_category" msgid="2021321997884906046">"வைஃபை அழைப்பு"</string>
- <string name="calls_sms_wfc_summary" msgid="4930471357980272294">"வைஃபை போன்ற மொபைல் நிறுவனம் அல்லாத நெட்வொர்க்குகளைப் பயன்படுத்தி அழைக்கலாம், அழைப்புகளைப் பெறலாம்"</string>
- <string name="calls_sms_footnote" msgid="7002461875954024216">"வைஃபை அழைப்பு அம்சம் மூலம் சில வைஃபை நெட்வொர்க்குகள் போன்ற மொபைல் நிறுவனம் அல்லாத நெட்வொர்க்குகளைப் பயன்படுத்தி அழைக்கலாம் அழைப்புகளைப் பெறலாம்."</string>
+ <string name="calls_sms_wfc_summary" msgid="3940529919408667336">"வைஃபை மூலம் அழைப்புகளைச் செய்யலாம் பெறலாம்"</string>
+ <string name="calls_sms_footnote" msgid="8051604228144899434">"வைஃபை அழைப்பு அம்சத்தின் மூலம் மொபைல் நிறுவனம் அல்லாத பிற வைஃபை நெட்வொர்க்குகளைப் பயன்படுத்தி அழைப்புகளைச் செய்யலாம் பெறலாம்."</string>
<string name="calls_preference_title" msgid="7536882032182563800">"அழைப்புகள்"</string>
<string name="sms_preference_title" msgid="8392745501754864395">"மெசேஜ்"</string>
<string name="calls_sms_preferred" msgid="6016477652522583496">"விருப்பம்"</string>
@@ -5080,10 +5081,10 @@
<string name="reset_internet_text" product="tablet" msgid="8797910368942544453">"இது உங்கள் அழைப்பைத் துண்டிக்கும்"</string>
<string name="resetting_internet_text" msgid="6696779371800051806">"இணையத்தை மீட்டமைக்கிறது…"</string>
<string name="fix_connectivity" msgid="2781433603228089501">"இணைப்புநிலையைச் சரிசெய்"</string>
- <!-- no translation found for airplane_mode_network_available (1059499681300395240) -->
- <skip />
- <!-- no translation found for to_switch_networks_disconnect_ethernet (6615374552827587197) -->
- <skip />
+ <string name="airplane_mode_network_available" msgid="1059499681300395240">"விமானப் பயன்முறை நெட்வொர்க்குகள் கிடைக்கின்றன"</string>
+ <string name="to_switch_networks_disconnect_ethernet" msgid="6615374552827587197">"நெட்வொர்க்குகளை மாற்ற ஈதர்நெட் இணைப்பைத் துண்டிக்கவும்"</string>
+ <string name="cannot_switch_networks_while_connected" msgid="3867944849171754777">"இணைப்பில் இருக்கும்போது நெட்வொர்க்குகளை மாற்ற முடியாது"</string>
+ <string name="airplane_mode_network_panel_title" msgid="6385046104863403604">"விமானப் பயன்முறை நெட்வொர்க்குகள்"</string>
<string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g> / <xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
<string name="mobile_data_connection_active" msgid="2422223108911581552">"இணைக்கப்பட்டது"</string>
<string name="mobile_data_off_summary" msgid="3841411571485837651">"இணையத்துடன் தானாகவே இணைக்காது"</string>
@@ -5105,4 +5106,16 @@
<string name="category_name_others" msgid="2366006298768550310">"மற்றவை"</string>
<string name="category_name_general" msgid="7737273712848115886">"பொதுவானவை"</string>
<string name="default_see_all_apps_title" msgid="7481113230662612178">"எல்லா ஆப்ஸையும் காட்டு"</string>
+ <string name="smart_forwarding_title" msgid="8368634861971949799">"ஸ்மார்ட் முன்னனுப்புதல்"</string>
+ <string name="smart_forwarding_summary_enabled" msgid="3341062878373185604">"ஸ்மார்ட் முன்னனுப்புதல் அம்சம் இயக்கப்பட்டது"</string>
+ <string name="smart_forwarding_summary_disabled" msgid="5033880700091914809">"ஸ்மார்ட் முன்னனுப்புதல் அம்சம் முடக்கப்பட்டது"</string>
+ <string name="smart_forwarding_ongoing_title" msgid="962226849074401228">"அழைப்பு அமைப்புகள்"</string>
+ <string name="smart_forwarding_ongoing_text" msgid="2189209372407117114">"அமைப்புகளைப் புதுப்பிக்கிறது..."</string>
+ <string name="smart_forwarding_failed_title" msgid="1859891191023516080">"அழைப்பு அமைப்புகளில் பிழை"</string>
+ <string name="smart_forwarding_failed_text" msgid="5370431503707373653">"நெட்வொர்க்கிலோ சிம் கார்டிலோ பிழை."</string>
+ <string name="smart_forwarding_failed_not_activated_text" msgid="997396203001257904">"சிம் இயக்கப்படவில்லை."</string>
+ <string name="smart_forwarding_input_mdn_title" msgid="5105463748849841763">"மொபைல் எண்களை உள்ளிடுக"</string>
+ <string name="smart_forwarding_input_mdn_dialog_title" msgid="7542216086697868415">"மொபைல் எண்ணை உள்ளிடுக"</string>
+ <string name="smart_forwarding_missing_mdn_text" msgid="2907314684242542226">"மொபைல் எண் உள்ளிடப்படவில்லை."</string>
+ <string name="smart_forwarding_missing_alert_dialog_text" msgid="7870419247987316112">"சரி"</string>
</resources>
diff --git a/res/values-te/strings.xml b/res/values-te/strings.xml
index a14d477..e2fd927 100644
--- a/res/values-te/strings.xml
+++ b/res/values-te/strings.xml
@@ -2267,8 +2267,7 @@
<item quantity="other"><xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> వినికిడి పరికరాలు సేవ్ చేయబడ్డాయి</item>
<item quantity="one"><xliff:g id="NUMBER_DEVICE_COUNT_0">%1$d</xliff:g> వినికిడి పరికరం సేవ్ చేయబడింది</item>
</plurals>
- <!-- no translation found for accessibility_audio_adjustment_title (1332113739136802997) -->
- <skip />
+ <string name="accessibility_audio_adjustment_title" msgid="1332113739136802997">"ఆడియో సర్దుబాటు"</string>
<string name="accessibility_summary_shortcut_enabled" msgid="4030427268146752644">"షార్ట్కట్ ఆన్"</string>
<string name="accessibility_summary_shortcut_disabled" msgid="564005462092499068">"ఆఫ్"</string>
<string name="accessibility_summary_state_enabled" msgid="1065431632216039369">"ఆన్"</string>
@@ -2437,6 +2436,7 @@
<string name="bluetooth_on_time" msgid="8424625554628450028">"Wi‑Fi ఆన్లో ఉండే సమయం"</string>
<string name="advanced_battery_title" msgid="3005993394776555079">"బ్యాటరీ వినియోగం"</string>
<string name="history_details_title" msgid="8628584613889559355">"చరిత్ర వివరాలు"</string>
+ <string name="advanced_battery_preference_title" msgid="6518802648205311326">"బ్యాటరీ వినియోగాన్ని చూడండి"</string>
<string name="battery_details_title" msgid="4531369291819754178">"బ్యాటరీ వినియోగం"</string>
<string name="details_subtitle" msgid="2550872569652785527">"వినియోగ వివరాలు"</string>
<string name="controls_subtitle" msgid="3759606830916441564">"శక్తి వినియోగాన్ని సర్దుబాటు చేయండి"</string>
@@ -4100,6 +4100,7 @@
<string name="usb_use" msgid="6783183432648438528">"దీని కోసం USBని ఉపయోగించండి"</string>
<string name="usb_default_label" msgid="3372838450371060750">"USB ఆటోమేటిక్ కాన్ఫిగరేషన్"</string>
<string name="usb_default_info" msgid="167172599497085266">"మరొక పరికరం కనెక్ట్ అయ్యి ఉన్నప్పుడు మరియు మీ ఫోన్ అన్లాక్ చేయబడి ఉన్నప్పుడు, ఈ సెట్టింగ్లు వర్తింపజేయబడతాయి. కేవలం విశ్వసనీయ పరికరాలకు మాత్రమే కనెక్ట్ చేయండి."</string>
+ <string name="usb_power_title" msgid="5602112548385798646">"పవర్ ఆప్షన్లు"</string>
<string name="usb_pref" msgid="8521832005703261700">"USB"</string>
<string name="usb_preference" msgid="5084550082591493765">"USB ప్రాధాన్యతలు"</string>
<string name="usb_control_title" msgid="1946791559052157693">"USBని ఏది నియంత్రించాలి"</string>
@@ -4939,8 +4940,8 @@
<string name="mobile_data_ap_mode_disabled" msgid="6067959496888990983">"విమానం మోడ్లో సేవ అందుబాటులో ఉండదు"</string>
<string name="force_desktop_mode" msgid="1336913605091334238">"ఫోర్స్ డెస్క్టాప్ మోడ్"</string>
<string name="force_desktop_mode_summary" msgid="4587416867846930479">"ద్వితీయ ప్రదర్శనల్లో ఫోర్స్ ప్రయోగాత్మక డెస్క్టాప్ మోడ్"</string>
- <string name="enable_sizecompat_freeform" msgid="3799755160777404309">"స్వతంత్ర రూప పరిమాణ అనుకూలతను ఎనేబుల్ చేయండి"</string>
- <string name="enable_sizecompat_freeform_summary" msgid="1484050174538201499">"పరిమాణ అనుకూలత గల యాప్లను స్వతంత్ర రూపంలో ఉండేందుకు అనుమతిస్తుంది"</string>
+ <string name="enable_non_resizable_multi_window" msgid="6832903754625404477">"మల్టీ-విండోలో పరిమాణం మార్చలేని వాటిని ఎనేబుల్ చేయండి"</string>
+ <string name="enable_non_resizable_multi_window_summary" msgid="3275763753261901999">"పరిమాణం మార్చలేని యాప్లను మల్టీ-విండోలో ఉండేందుకు అనుమతిస్తుంది"</string>
<string name="hwui_force_dark_title" msgid="4256904905631994219">"ఫోర్స్-డార్క్ను అధిగమించడం"</string>
<string name="hwui_force_dark_summary" msgid="6515748781487952769">"ఫోర్స్-డార్క్ ఫీచర్ను అధిగమించడం ఎల్లప్పుడూ ఆన్లో ఉండాలి"</string>
<string name="enable_blurs_on_windows_title" msgid="4218144213800778872">"బ్లర్లను ఎనేబుల్ చేస్తుంది"</string>
@@ -5062,8 +5063,8 @@
<string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"విమానం, విమానం-సురక్షిత"</string>
<string name="calls_and_sms" msgid="1931855083959003306">"కాల్స్ & SMS"</string>
<string name="calls_and_sms_category" msgid="2021321997884906046">"Wi‑Fi కాలింగ్"</string>
- <string name="calls_sms_wfc_summary" msgid="4930471357980272294">"Wi-Fi వంటి క్యారియర్ కాని నెట్వర్క్ల ద్వారా కాల్లను చేయండి, స్వీకరించండి"</string>
- <string name="calls_sms_footnote" msgid="7002461875954024216">"క్యారియర్ కాని కొన్ని Wi-Fi నెట్వర్క్ల వంటి వాటి ద్వారా కాల్లను చేయడానికి, స్వీకరించడానికి Wi-Fi కాలింగ్ మిమ్మల్ని అనుమతిస్తుంది."</string>
+ <string name="calls_sms_wfc_summary" msgid="3940529919408667336">"Wi-Fi ద్వారా కాల్స్ చేయండి, అందుకోండి"</string>
+ <string name="calls_sms_footnote" msgid="8051604228144899434">"Wi-Fi కాలింగ్తో, నాన్-క్యారియర్ Wi-Fi నెట్వర్క్ల ద్వారా కాల్స్ చేయబడతాయి, అందుకోబడతాయి."</string>
<string name="calls_preference_title" msgid="7536882032182563800">"కాల్స్"</string>
<string name="sms_preference_title" msgid="8392745501754864395">"SMS"</string>
<string name="calls_sms_preferred" msgid="6016477652522583496">"ప్రాధాన్యతనిస్తుంది"</string>
@@ -5082,10 +5083,10 @@
<string name="reset_internet_text" product="tablet" msgid="8797910368942544453">"ఇది మీ ఫోన్ కాల్ను ముగించింది"</string>
<string name="resetting_internet_text" msgid="6696779371800051806">"మీ ఇంటర్నెట్ను రీసెట్ చేస్తోంది…"</string>
<string name="fix_connectivity" msgid="2781433603228089501">"కనెక్టివిటీని సరిచేయి"</string>
- <!-- no translation found for airplane_mode_network_available (1059499681300395240) -->
- <skip />
- <!-- no translation found for to_switch_networks_disconnect_ethernet (6615374552827587197) -->
- <skip />
+ <string name="airplane_mode_network_available" msgid="1059499681300395240">"విమానం మోడ్ నెట్వర్క్లు అందుబాటులో ఉన్నాయి"</string>
+ <string name="to_switch_networks_disconnect_ethernet" msgid="6615374552827587197">"నెట్వర్క్లను మార్చడానికి, ఈథర్నెట్ను డిస్కనెక్ట్ చేయండి"</string>
+ <string name="cannot_switch_networks_while_connected" msgid="3867944849171754777">"కనెక్ట్ అయి ఉన్నప్పుడు నెట్వర్క్లను మార్చలేరు"</string>
+ <string name="airplane_mode_network_panel_title" msgid="6385046104863403604">"విమానం మోడ్ నెట్వర్క్లు"</string>
<string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g> / <xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
<string name="mobile_data_connection_active" msgid="2422223108911581552">"కనెక్ట్ చేయబడింది"</string>
<string name="mobile_data_off_summary" msgid="3841411571485837651">"ఇంటర్నెట్ ఆటోమెటిక్గా కనెక్ట్ అవ్వదు"</string>
@@ -5107,4 +5108,16 @@
<string name="category_name_others" msgid="2366006298768550310">"ఇతరాలు"</string>
<string name="category_name_general" msgid="7737273712848115886">"సాధారణం"</string>
<string name="default_see_all_apps_title" msgid="7481113230662612178">"అన్ని యాప్లను చూడండి"</string>
+ <string name="smart_forwarding_title" msgid="8368634861971949799">"స్మార్ట్ ఫార్వర్డింగ్"</string>
+ <string name="smart_forwarding_summary_enabled" msgid="3341062878373185604">"స్మార్ట్ ఫార్వర్డింగ్ ఎనేబుల్ చేయబడింది"</string>
+ <string name="smart_forwarding_summary_disabled" msgid="5033880700091914809">"స్మార్ట్ ఫార్వర్డింగ్ డిజేబుల్ చేయబడింది"</string>
+ <string name="smart_forwarding_ongoing_title" msgid="962226849074401228">"కాల్ సెట్టింగ్లు"</string>
+ <string name="smart_forwarding_ongoing_text" msgid="2189209372407117114">"సెట్టింగ్లను అప్డేట్ చేస్తోంది..."</string>
+ <string name="smart_forwarding_failed_title" msgid="1859891191023516080">"కాల్ సెట్టింగ్ల ఎర్రర్"</string>
+ <string name="smart_forwarding_failed_text" msgid="5370431503707373653">"నెట్వర్క్ లేదా SIM కార్డ్ ఎర్రర్."</string>
+ <string name="smart_forwarding_failed_not_activated_text" msgid="997396203001257904">"SIM యాక్టివేట్ చేయబడలేదు."</string>
+ <string name="smart_forwarding_input_mdn_title" msgid="5105463748849841763">"ఫోన్ నంబర్లను ఎంటర్ చేయండి"</string>
+ <string name="smart_forwarding_input_mdn_dialog_title" msgid="7542216086697868415">"ఫోన్ నంబర్ను ఎంటర్ చేయండి"</string>
+ <string name="smart_forwarding_missing_mdn_text" msgid="2907314684242542226">"ఫోన్ నంబర్ లేదు."</string>
+ <string name="smart_forwarding_missing_alert_dialog_text" msgid="7870419247987316112">"సరే"</string>
</resources>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index 973403f..5a35ba5 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -2267,8 +2267,7 @@
<item quantity="other">บันทึกเครื่องช่วยฟัง <xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> เครื่องแล้ว</item>
<item quantity="one">บันทึกเครื่องช่วยฟัง <xliff:g id="NUMBER_DEVICE_COUNT_0">%1$d</xliff:g> เครื่องแล้ว</item>
</plurals>
- <!-- no translation found for accessibility_audio_adjustment_title (1332113739136802997) -->
- <skip />
+ <string name="accessibility_audio_adjustment_title" msgid="1332113739136802997">"การปรับเสียง"</string>
<string name="accessibility_summary_shortcut_enabled" msgid="4030427268146752644">"ทางลัดเปิดอยู่"</string>
<string name="accessibility_summary_shortcut_disabled" msgid="564005462092499068">"ปิด"</string>
<string name="accessibility_summary_state_enabled" msgid="1065431632216039369">"เปิด"</string>
@@ -2437,6 +2436,7 @@
<string name="bluetooth_on_time" msgid="8424625554628450028">"เวลาเปิดใช้ WiFi"</string>
<string name="advanced_battery_title" msgid="3005993394776555079">"การใช้งานแบตเตอรี่"</string>
<string name="history_details_title" msgid="8628584613889559355">"รายละเอียดประวัติ"</string>
+ <string name="advanced_battery_preference_title" msgid="6518802648205311326">"ดูการใช้งานแบตเตอรี่"</string>
<string name="battery_details_title" msgid="4531369291819754178">"การใช้งานแบตเตอรี่"</string>
<string name="details_subtitle" msgid="2550872569652785527">"ใช้รายละเอียด"</string>
<string name="controls_subtitle" msgid="3759606830916441564">"ปรับการใช้พลังงาน"</string>
@@ -4098,6 +4098,7 @@
<string name="usb_use" msgid="6783183432648438528">"ใช้ USB สำหรับ"</string>
<string name="usb_default_label" msgid="3372838450371060750">"การกำหนดค่า USB เริ่มต้น"</string>
<string name="usb_default_info" msgid="167172599497085266">"ระบบจะนำการตั้งค่าเหล่านี้มาใช้เมื่อมีการเชื่อมต่ออุปกรณ์เครื่องอื่นและโทรศัพท์ไม่ได้ล็อกอยู่ โปรดเชื่อมต่อกับอุปกรณ์ที่เชื่อถือได้เท่านั้น"</string>
+ <string name="usb_power_title" msgid="5602112548385798646">"ตัวเลือกสำหรับการเปิด/ปิด"</string>
<string name="usb_pref" msgid="8521832005703261700">"USB"</string>
<string name="usb_preference" msgid="5084550082591493765">"ค่ากำหนด USB"</string>
<string name="usb_control_title" msgid="1946791559052157693">"ควบคุม USB โดย"</string>
@@ -4937,8 +4938,8 @@
<string name="mobile_data_ap_mode_disabled" msgid="6067959496888990983">"ใช้ขณะที่เปิดโหมดบนเครื่องบินไม่ได้"</string>
<string name="force_desktop_mode" msgid="1336913605091334238">"บังคับใช้โหมดเดสก์ท็อป"</string>
<string name="force_desktop_mode_summary" msgid="4587416867846930479">"บังคับใช้โหมดเดสก์ท็อปแบบทดลองในจอแสดงผลรอง"</string>
- <string name="enable_sizecompat_freeform" msgid="3799755160777404309">"เปิดใช้แอปที่มีขนาดเข้ากันได้ในรูปแบบอิสระ"</string>
- <string name="enable_sizecompat_freeform_summary" msgid="1484050174538201499">"อนุญาตให้แอปที่มีขนาดเข้ากันได้อยู่ในรูปแบบอิสระ"</string>
+ <string name="enable_non_resizable_multi_window" msgid="6832903754625404477">"เปิดใช้แอปแบบปรับขนาดไม่ได้ในหลายหน้าต่าง"</string>
+ <string name="enable_non_resizable_multi_window_summary" msgid="3275763753261901999">"อนุญาตให้แอปแบบปรับขนาดไม่ได้แสดงในหลายหน้าต่าง"</string>
<string name="hwui_force_dark_title" msgid="4256904905631994219">"ลบล้างฟีเจอร์บังคับใช้โหมดมืด"</string>
<string name="hwui_force_dark_summary" msgid="6515748781487952769">"ลบล้างฟีเจอร์บังคับใช้โหมดมืดให้เปิดตลอดเวลา"</string>
<string name="enable_blurs_on_windows_title" msgid="4218144213800778872">"เปิดใช้การเบลอ"</string>
@@ -5060,8 +5061,8 @@
<string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"เครื่องบิน, ใช้บนเครื่องบินได้อย่างปลอดภัย"</string>
<string name="calls_and_sms" msgid="1931855083959003306">"การโทรและ SMS"</string>
<string name="calls_and_sms_category" msgid="2021321997884906046">"การโทรผ่าน Wi‑Fi"</string>
- <string name="calls_sms_wfc_summary" msgid="4930471357980272294">"โทรออกและรับสายผ่านเครือข่ายที่ไม่ได้เป็นของผู้ให้บริการ เช่น Wi‑Fi"</string>
- <string name="calls_sms_footnote" msgid="7002461875954024216">"การโทรผ่าน Wi-Fi ให้คุณโทรออกและรับสายผ่านเครือข่ายที่ไม่ได้เป็นของผู้ให้บริการ เช่น เครือข่าย Wi-Fi บางเครือข่ายได้"</string>
+ <string name="calls_sms_wfc_summary" msgid="3940529919408667336">"โทรออกและรับสายผ่าน Wi‑Fi"</string>
+ <string name="calls_sms_footnote" msgid="8051604228144899434">"การโทรผ่าน Wi-Fi เป็นการโทรออกและรับสายผ่านเครือข่าย Wi‑Fi ที่ไม่ได้เป็นของผู้ให้บริการ"</string>
<string name="calls_preference_title" msgid="7536882032182563800">"การโทร"</string>
<string name="sms_preference_title" msgid="8392745501754864395">"SMS"</string>
<string name="calls_sms_preferred" msgid="6016477652522583496">"ต้องการ"</string>
@@ -5080,10 +5081,10 @@
<string name="reset_internet_text" product="tablet" msgid="8797910368942544453">"การดำเนินการนี้จะเป็นการสิ้นสุดการโทร"</string>
<string name="resetting_internet_text" msgid="6696779371800051806">"กำลังรีเซ็ตอินเทอร์เน็ต…"</string>
<string name="fix_connectivity" msgid="2781433603228089501">"แก้ไขการเชื่อมต่อ"</string>
- <!-- no translation found for airplane_mode_network_available (1059499681300395240) -->
- <skip />
- <!-- no translation found for to_switch_networks_disconnect_ethernet (6615374552827587197) -->
- <skip />
+ <string name="airplane_mode_network_available" msgid="1059499681300395240">"มีเครือข่ายที่ใช้งานได้ในโหมดบนเครื่องบิน"</string>
+ <string name="to_switch_networks_disconnect_ethernet" msgid="6615374552827587197">"ตัดการเชื่อมต่ออีเทอร์เน็ตเพื่อสลับเครือข่าย"</string>
+ <string name="cannot_switch_networks_while_connected" msgid="3867944849171754777">"สลับเครือข่ายขณะที่เชื่อมต่ออยู่ไม่ได้"</string>
+ <string name="airplane_mode_network_panel_title" msgid="6385046104863403604">"เครือข่ายสำหรับโหมดบนเครื่องบิน"</string>
<string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g>/<xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
<string name="mobile_data_connection_active" msgid="2422223108911581552">"เชื่อมต่อแล้ว"</string>
<string name="mobile_data_off_summary" msgid="3841411571485837651">"จะไม่มีการเชื่อมต่ออินเทอร์เน็ตโดยอัตโนมัติ"</string>
@@ -5105,4 +5106,16 @@
<string name="category_name_others" msgid="2366006298768550310">"อื่นๆ"</string>
<string name="category_name_general" msgid="7737273712848115886">"ทั่วไป"</string>
<string name="default_see_all_apps_title" msgid="7481113230662612178">"ดูแอปทั้งหมด"</string>
+ <string name="smart_forwarding_title" msgid="8368634861971949799">"การโอนสายอัจฉริยะ"</string>
+ <string name="smart_forwarding_summary_enabled" msgid="3341062878373185604">"การโอนสายอัจฉริยะเปิดอยู่"</string>
+ <string name="smart_forwarding_summary_disabled" msgid="5033880700091914809">"การโอนสายอัจฉริยะปิดอยู่"</string>
+ <string name="smart_forwarding_ongoing_title" msgid="962226849074401228">"การตั้งค่าการโทร"</string>
+ <string name="smart_forwarding_ongoing_text" msgid="2189209372407117114">"กำลังอัปเดตการตั้งค่า..."</string>
+ <string name="smart_forwarding_failed_title" msgid="1859891191023516080">"ข้อผิดพลาดในการตั้งค่าการโทร"</string>
+ <string name="smart_forwarding_failed_text" msgid="5370431503707373653">"ข้อผิดพลาดของเครือข่ายหรือซิมการ์ด"</string>
+ <string name="smart_forwarding_failed_not_activated_text" msgid="997396203001257904">"ไม่ได้เปิดใช้งานซิม"</string>
+ <string name="smart_forwarding_input_mdn_title" msgid="5105463748849841763">"ป้อนหมายเลขโทรศัพท์"</string>
+ <string name="smart_forwarding_input_mdn_dialog_title" msgid="7542216086697868415">"ป้อนหมายเลขโทรศัพท์"</string>
+ <string name="smart_forwarding_missing_mdn_text" msgid="2907314684242542226">"ไม่มีหมายเลขโทรศัพท์"</string>
+ <string name="smart_forwarding_missing_alert_dialog_text" msgid="7870419247987316112">"ตกลง"</string>
</resources>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index f5769cb..1430437 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -2267,8 +2267,7 @@
<item quantity="one"><xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> na-save na hearing aid</item>
<item quantity="other"><xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> na na-save na hearing aid</item>
</plurals>
- <!-- no translation found for accessibility_audio_adjustment_title (1332113739136802997) -->
- <skip />
+ <string name="accessibility_audio_adjustment_title" msgid="1332113739136802997">"Pag-adjust ng audio"</string>
<string name="accessibility_summary_shortcut_enabled" msgid="4030427268146752644">"Naka-on ang shortcut"</string>
<string name="accessibility_summary_shortcut_disabled" msgid="564005462092499068">"Naka-off"</string>
<string name="accessibility_summary_state_enabled" msgid="1065431632216039369">"Naka-on"</string>
@@ -2437,6 +2436,7 @@
<string name="bluetooth_on_time" msgid="8424625554628450028">"Wi-Fi na nasa oras"</string>
<string name="advanced_battery_title" msgid="3005993394776555079">"Paggamit ng baterya"</string>
<string name="history_details_title" msgid="8628584613889559355">"Detalye ng history"</string>
+ <string name="advanced_battery_preference_title" msgid="6518802648205311326">"Tingnan ang paggamit ng baterya"</string>
<string name="battery_details_title" msgid="4531369291819754178">"Paggamit ng baterya"</string>
<string name="details_subtitle" msgid="2550872569652785527">"Mga detalye ng paggamit"</string>
<string name="controls_subtitle" msgid="3759606830916441564">"Isaayos ang paggamit ng power"</string>
@@ -4098,6 +4098,7 @@
<string name="usb_use" msgid="6783183432648438528">"Gamitin ang USB para sa"</string>
<string name="usb_default_label" msgid="3372838450371060750">"Default na USB Configuration"</string>
<string name="usb_default_info" msgid="167172599497085266">"Kapag nakakonekta ang isa pang device at naka-unlock ang iyong telepono, malalapat ang mga setting na ito. Sa mga pinagkakatiwalaang device lang kumonekta."</string>
+ <string name="usb_power_title" msgid="5602112548385798646">"Mga opsyon sa power"</string>
<string name="usb_pref" msgid="8521832005703261700">"USB"</string>
<string name="usb_preference" msgid="5084550082591493765">"Mga Kagustuhan sa USB"</string>
<string name="usb_control_title" msgid="1946791559052157693">"Kinokontrol ang USB ng"</string>
@@ -4937,8 +4938,8 @@
<string name="mobile_data_ap_mode_disabled" msgid="6067959496888990983">"Hindi available sa airplane mode"</string>
<string name="force_desktop_mode" msgid="1336913605091334238">"Force desktop mode"</string>
<string name="force_desktop_mode_summary" msgid="4587416867846930479">"Force experimental desktop mode sa mga pangalawang display"</string>
- <string name="enable_sizecompat_freeform" msgid="3799755160777404309">"I-enable ang freeform sizecompat"</string>
- <string name="enable_sizecompat_freeform_summary" msgid="1484050174538201499">"Pinapayagan ang mga sizecompat app sa freeform"</string>
+ <string name="enable_non_resizable_multi_window" msgid="6832903754625404477">"I-enable ang hindi nare-resize sa multi-window"</string>
+ <string name="enable_non_resizable_multi_window_summary" msgid="3275763753261901999">"Nagpapahintulot sa mga hindi nare-resize na app na lumabas sa multi-window"</string>
<string name="hwui_force_dark_title" msgid="4256904905631994219">"I-override ang force-dark"</string>
<string name="hwui_force_dark_summary" msgid="6515748781487952769">"Ino-override ang force-dark feature para maging palaging naka-on"</string>
<string name="enable_blurs_on_windows_title" msgid="4218144213800778872">"I-enable ang mga pag-blur"</string>
@@ -5060,8 +5061,8 @@
<string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"eroplano, ligtas gamitin sa eroplano"</string>
<string name="calls_and_sms" msgid="1931855083959003306">"Mga Taawag at SMS"</string>
<string name="calls_and_sms_category" msgid="2021321997884906046">"Pagtawag sa Wi‑Fi"</string>
- <string name="calls_sms_wfc_summary" msgid="4930471357980272294">"Tumawag at makatanggap ng mga tawag sa mga non-carrier network tulad ng Wi‑Fi"</string>
- <string name="calls_sms_footnote" msgid="7002461875954024216">"Nagbibigay-daan sa iyo ang pagtawag gamit ang Wi-Fi na tumawag at makatanggap ng mga tawag sa mga non-carrier network gaya ng ilang Wi‑Fi network."</string>
+ <string name="calls_sms_wfc_summary" msgid="3940529919408667336">"Tumawag at makatanggap ng mga tawag sa Wi‑Fi"</string>
+ <string name="calls_sms_footnote" msgid="8051604228144899434">"Sa pamamagitan ng pagtawag gamit ang Wi‑Fi, tumatawag at nakakatanggap ng mga tawag sa mga non-carrier na Wi‑Fi network."</string>
<string name="calls_preference_title" msgid="7536882032182563800">"Mga Tawag"</string>
<string name="sms_preference_title" msgid="8392745501754864395">"SMS"</string>
<string name="calls_sms_preferred" msgid="6016477652522583496">"mas gusto"</string>
@@ -5080,10 +5081,10 @@
<string name="reset_internet_text" product="tablet" msgid="8797910368942544453">"Tatapusin nito ang iyong tawag sa telepono"</string>
<string name="resetting_internet_text" msgid="6696779371800051806">"Nire-reset ang iyong internet…"</string>
<string name="fix_connectivity" msgid="2781433603228089501">"Ayusin ang pagkakonekta"</string>
- <!-- no translation found for airplane_mode_network_available (1059499681300395240) -->
- <skip />
- <!-- no translation found for to_switch_networks_disconnect_ethernet (6615374552827587197) -->
- <skip />
+ <string name="airplane_mode_network_available" msgid="1059499681300395240">"May mga available na network sa airplane mode"</string>
+ <string name="to_switch_networks_disconnect_ethernet" msgid="6615374552827587197">"Para lumipat ng network, idiskonekta ang ethernet"</string>
+ <string name="cannot_switch_networks_while_connected" msgid="3867944849171754777">"Hindi makakalipat ng network habang nakakonekta"</string>
+ <string name="airplane_mode_network_panel_title" msgid="6385046104863403604">"Mga network sa airplane mode"</string>
<string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g> / <xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
<string name="mobile_data_connection_active" msgid="2422223108911581552">"Nakakonekta"</string>
<string name="mobile_data_off_summary" msgid="3841411571485837651">"Hindi awtomatikong kokonekta ang Internet"</string>
@@ -5105,4 +5106,16 @@
<string name="category_name_others" msgid="2366006298768550310">"Iba pa"</string>
<string name="category_name_general" msgid="7737273712848115886">"Pangkalahatan"</string>
<string name="default_see_all_apps_title" msgid="7481113230662612178">"Tingnan ang lahat ng app"</string>
+ <string name="smart_forwarding_title" msgid="8368634861971949799">"Smart na Pag-forward"</string>
+ <string name="smart_forwarding_summary_enabled" msgid="3341062878373185604">"Naka-enable ang Smart na Pag-forward"</string>
+ <string name="smart_forwarding_summary_disabled" msgid="5033880700091914809">"Naka-disable ang Smart na Pag-forward"</string>
+ <string name="smart_forwarding_ongoing_title" msgid="962226849074401228">"Mga Setting ng Tawag"</string>
+ <string name="smart_forwarding_ongoing_text" msgid="2189209372407117114">"Ina-update ang Mga Setting..."</string>
+ <string name="smart_forwarding_failed_title" msgid="1859891191023516080">"Error sa Mga Setting ng Tawag"</string>
+ <string name="smart_forwarding_failed_text" msgid="5370431503707373653">"Error sa Network o SIM card."</string>
+ <string name="smart_forwarding_failed_not_activated_text" msgid="997396203001257904">"Hindi naka-activate ang sim."</string>
+ <string name="smart_forwarding_input_mdn_title" msgid="5105463748849841763">"Ilagay ang Mga numero ng telepono"</string>
+ <string name="smart_forwarding_input_mdn_dialog_title" msgid="7542216086697868415">"Ilagay ang Numero ng telepono"</string>
+ <string name="smart_forwarding_missing_mdn_text" msgid="2907314684242542226">"Walang numero ng telepono."</string>
+ <string name="smart_forwarding_missing_alert_dialog_text" msgid="7870419247987316112">"OK"</string>
</resources>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 51ddb23..bc17630 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -2436,6 +2436,7 @@
<string name="bluetooth_on_time" msgid="8424625554628450028">"Zamanında Kablosuz"</string>
<string name="advanced_battery_title" msgid="3005993394776555079">"Pil kullanımı"</string>
<string name="history_details_title" msgid="8628584613889559355">"Geçmiş ayrıntıları"</string>
+ <string name="advanced_battery_preference_title" msgid="6518802648205311326">"Pil kullanımını göster"</string>
<string name="battery_details_title" msgid="4531369291819754178">"Pil kullanımı"</string>
<string name="details_subtitle" msgid="2550872569652785527">"Kullanım ayrıntıları"</string>
<string name="controls_subtitle" msgid="3759606830916441564">"Pil kullanımını ayarla"</string>
@@ -4097,6 +4098,7 @@
<string name="usb_use" msgid="6783183432648438528">"USB\'yi şunun için kullan:"</string>
<string name="usb_default_label" msgid="3372838450371060750">"Varsayılan USB yapılandırması"</string>
<string name="usb_default_info" msgid="167172599497085266">"Bu ayarlar yalnızca başka bir cihaz bağlandığında ve telefonunuzun kilidi açıkken uygulanır. Yalnızca güvenilen cihazlara bağlanın."</string>
+ <string name="usb_power_title" msgid="5602112548385798646">"Güç seçenekleri"</string>
<string name="usb_pref" msgid="8521832005703261700">"USB"</string>
<string name="usb_preference" msgid="5084550082591493765">"USB Tercihleri"</string>
<string name="usb_control_title" msgid="1946791559052157693">"USB\'yi kontrol eden:"</string>
@@ -4936,8 +4938,8 @@
<string name="mobile_data_ap_mode_disabled" msgid="6067959496888990983">"Uçak modunda kullanılamaz"</string>
<string name="force_desktop_mode" msgid="1336913605091334238">"Masaüstü modunu zorunlu kıl"</string>
<string name="force_desktop_mode_summary" msgid="4587416867846930479">"İkincil ekranlarda deneysel masaüstü modunu zorunlu kıl"</string>
- <string name="enable_sizecompat_freeform" msgid="3799755160777404309">"Serbest biçimli boyut uyumunu etkinleştir"</string>
- <string name="enable_sizecompat_freeform_summary" msgid="1484050174538201499">"Boyut uyumlu olmayan uygulamaların serbest biçimde olmasına izin verir"</string>
+ <string name="enable_non_resizable_multi_window" msgid="6832903754625404477">"Çoklu pencerede yeniden boyutlandıramamayı etkinleştir"</string>
+ <string name="enable_non_resizable_multi_window_summary" msgid="3275763753261901999">"Çoklu pencerede yeniden boyutlandırılamayan uygulamalara izin verir"</string>
<string name="hwui_force_dark_title" msgid="4256904905631994219">"Zorunlu koyu rengi geçersiz kıl"</string>
<string name="hwui_force_dark_summary" msgid="6515748781487952769">"Zorunlu koyu renk özelliğini geçersiz kılma her zaman açık"</string>
<string name="enable_blurs_on_windows_title" msgid="4218144213800778872">"Bulanıklaştırmaları etkinleştir"</string>
@@ -5059,8 +5061,8 @@
<string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"uçak, uçakta kullanımı güvenli"</string>
<string name="calls_and_sms" msgid="1931855083959003306">"Aramalar ve SMS"</string>
<string name="calls_and_sms_category" msgid="2021321997884906046">"Kablosuz Çağrı"</string>
- <string name="calls_sms_wfc_summary" msgid="4930471357980272294">"Bazı kablosuz ağlar gibi operatör olmayan ağlar üzerinden arama yapın ve gelen aramaları yanıtlayın"</string>
- <string name="calls_sms_footnote" msgid="7002461875954024216">"Kablosuz çağrı, bazı kablosuz ağlar gibi operatör olmayan ağlar üzerinden arama yapmanıza ve almanıza olanak tanır."</string>
+ <string name="calls_sms_wfc_summary" msgid="3940529919408667336">"Kablosuz ağ üzerinden telefon edin ve gelen aramaları yanıtlayın"</string>
+ <string name="calls_sms_footnote" msgid="8051604228144899434">"Kablosuz çağrı, bir operatör tarafından sunulmayan kablosuz ağlar üzerinden telefon edilmesine ve gelen aramaların yanıtlanmasına olanak tanır."</string>
<string name="calls_preference_title" msgid="7536882032182563800">"Çağrılar"</string>
<string name="sms_preference_title" msgid="8392745501754864395">"SMS"</string>
<string name="calls_sms_preferred" msgid="6016477652522583496">"tercih edilen"</string>
@@ -5079,10 +5081,10 @@
<string name="reset_internet_text" product="tablet" msgid="8797910368942544453">"Bu, telefon aramanızı sonlandırır"</string>
<string name="resetting_internet_text" msgid="6696779371800051806">"İnternet bağlantınız sıfırlanıyor…"</string>
<string name="fix_connectivity" msgid="2781433603228089501">"Sabit bağlantı"</string>
- <!-- no translation found for airplane_mode_network_available (1059499681300395240) -->
- <skip />
- <!-- no translation found for to_switch_networks_disconnect_ethernet (6615374552827587197) -->
- <skip />
+ <string name="airplane_mode_network_available" msgid="1059499681300395240">"Kullanılabilir uçak modu ağları"</string>
+ <string name="to_switch_networks_disconnect_ethernet" msgid="6615374552827587197">"Ağ değiştirmek için ethernet bağlantısını kesin"</string>
+ <string name="cannot_switch_networks_while_connected" msgid="3867944849171754777">"Bağlı durumdayken ağ değiştirilemez"</string>
+ <string name="airplane_mode_network_panel_title" msgid="6385046104863403604">"Uçak modu ağları"</string>
<string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g> / <xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
<string name="mobile_data_connection_active" msgid="2422223108911581552">"Bağlı"</string>
<string name="mobile_data_off_summary" msgid="3841411571485837651">"İnternet otomatik olarak bağlanmaz"</string>
@@ -5104,4 +5106,16 @@
<string name="category_name_others" msgid="2366006298768550310">"Diğer"</string>
<string name="category_name_general" msgid="7737273712848115886">"Genel"</string>
<string name="default_see_all_apps_title" msgid="7481113230662612178">"Tüm uygulamaları göster"</string>
+ <string name="smart_forwarding_title" msgid="8368634861971949799">"Akıllı Yönlendirme"</string>
+ <string name="smart_forwarding_summary_enabled" msgid="3341062878373185604">"Akıllı Yönlendirme Etkin"</string>
+ <string name="smart_forwarding_summary_disabled" msgid="5033880700091914809">"Akıllı Yönlendirme Devre Dışı"</string>
+ <string name="smart_forwarding_ongoing_title" msgid="962226849074401228">"Çağrı Ayarları"</string>
+ <string name="smart_forwarding_ongoing_text" msgid="2189209372407117114">"Ayarlar güncelleniyor…"</string>
+ <string name="smart_forwarding_failed_title" msgid="1859891191023516080">"Arama Ayarları hatası"</string>
+ <string name="smart_forwarding_failed_text" msgid="5370431503707373653">"Ağ veya SIM kart hatası."</string>
+ <string name="smart_forwarding_failed_not_activated_text" msgid="997396203001257904">"SIM etkinleştirilmedi."</string>
+ <string name="smart_forwarding_input_mdn_title" msgid="5105463748849841763">"Telefon numaraları girin"</string>
+ <string name="smart_forwarding_input_mdn_dialog_title" msgid="7542216086697868415">"Telefon numarası girin"</string>
+ <string name="smart_forwarding_missing_mdn_text" msgid="2907314684242542226">"Telefon numarası eksik."</string>
+ <string name="smart_forwarding_missing_alert_dialog_text" msgid="7870419247987316112">"Tamam"</string>
</resources>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index d5e9585..648e875 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -2317,8 +2317,7 @@
<item quantity="many">Збережено <xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> слухових апаратів</item>
<item quantity="other">Збережено <xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> слухового апарата</item>
</plurals>
- <!-- no translation found for accessibility_audio_adjustment_title (1332113739136802997) -->
- <skip />
+ <string name="accessibility_audio_adjustment_title" msgid="1332113739136802997">"Налаштування аудіо"</string>
<string name="accessibility_summary_shortcut_enabled" msgid="4030427268146752644">"Комбінацію клавіш увімкнено"</string>
<string name="accessibility_summary_shortcut_disabled" msgid="564005462092499068">"Вимкнено"</string>
<string name="accessibility_summary_state_enabled" msgid="1065431632216039369">"Увімкнено"</string>
@@ -2499,6 +2498,7 @@
<string name="bluetooth_on_time" msgid="8424625554628450028">"Час роботи Wi-Fi"</string>
<string name="advanced_battery_title" msgid="3005993394776555079">"Використання заряду"</string>
<string name="history_details_title" msgid="8628584613889559355">"Дані про використання"</string>
+ <string name="advanced_battery_preference_title" msgid="6518802648205311326">"Переглянути використання заряду"</string>
<string name="battery_details_title" msgid="4531369291819754178">"Використання заряду"</string>
<string name="details_subtitle" msgid="2550872569652785527">"Вжиток"</string>
<string name="controls_subtitle" msgid="3759606830916441564">"Режим енергоспоживання"</string>
@@ -4222,6 +4222,7 @@
<string name="usb_use" msgid="6783183432648438528">"Використання USB"</string>
<string name="usb_default_label" msgid="3372838450371060750">"Налаштування USB за умовчанням"</string>
<string name="usb_default_info" msgid="167172599497085266">"Ці налаштування буде застосовано, коли ви під’єднаєте інший пристрій і розблокуєте телефон. Під’єднуйтеся лише до надійних пристроїв."</string>
+ <string name="usb_power_title" msgid="5602112548385798646">"Опції живлення"</string>
<string name="usb_pref" msgid="8521832005703261700">"USB"</string>
<string name="usb_preference" msgid="5084550082591493765">"Параметри USB"</string>
<string name="usb_control_title" msgid="1946791559052157693">"USB керує"</string>
@@ -5099,8 +5100,8 @@
<string name="mobile_data_ap_mode_disabled" msgid="6067959496888990983">"Недоступно, коли ввімкнено режим польоту"</string>
<string name="force_desktop_mode" msgid="1336913605091334238">"Примусово застосувати режим робочого столу"</string>
<string name="force_desktop_mode_summary" msgid="4587416867846930479">"Примусово застосувати експериментальний режим робочого столу на додаткових екранах"</string>
- <string name="enable_sizecompat_freeform" msgid="3799755160777404309">"Увімкнути переміщення додатків фіксованого розміру"</string>
- <string name="enable_sizecompat_freeform_summary" msgid="1484050174538201499">"Дозволити довільно переміщати додатки фіксованого розміру"</string>
+ <string name="enable_non_resizable_multi_window" msgid="6832903754625404477">"Дозволити немасштабовані додатки в багатоекранному режимі"</string>
+ <string name="enable_non_resizable_multi_window_summary" msgid="3275763753261901999">"Дає змогу користуватися в багатоекранному режимі додатками, розмір яких не можна змінити"</string>
<string name="hwui_force_dark_title" msgid="4256904905631994219">"Замінити примусовий темний режим"</string>
<string name="hwui_force_dark_summary" msgid="6515748781487952769">"Не дозволяє постійний примусовий темний режим"</string>
<string name="enable_blurs_on_windows_title" msgid="4218144213800778872">"Увімкнути розмиття"</string>
@@ -5226,8 +5227,8 @@
<string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"літак, безпечний у літаку"</string>
<string name="calls_and_sms" msgid="1931855083959003306">"Дзвінки та SMS"</string>
<string name="calls_and_sms_category" msgid="2021321997884906046">"Дзвінки через Wi‑Fi"</string>
- <string name="calls_sms_wfc_summary" msgid="4930471357980272294">"Здійснюйте й отримуйте дзвінки через мережі Wi‑Fi, а не операторів мобільного зв\'язку"</string>
- <string name="calls_sms_footnote" msgid="7002461875954024216">"Завдяки функції \"Дзвінки через Wi-Fi\" ви можете здійснювати та отримувати дзвінки не лише через мережі операторів мобільного зв\'язку, а й через Wi‑Fi."</string>
+ <string name="calls_sms_wfc_summary" msgid="3940529919408667336">"Здійснюйте й отримуйте виклики через Wi‑Fi"</string>
+ <string name="calls_sms_footnote" msgid="8051604228144899434">"Завдяки функції \"Дзвінки через Wi-Fi\" виклики можна здійснювати й отримувати через мережі Wi‑Fi, які не обслуговують оператори мобільного зв\'язку."</string>
<string name="calls_preference_title" msgid="7536882032182563800">"Дзвінки"</string>
<string name="sms_preference_title" msgid="8392745501754864395">"SMS"</string>
<string name="calls_sms_preferred" msgid="6016477652522583496">"пріоритетні"</string>
@@ -5246,10 +5247,10 @@
<string name="reset_internet_text" product="tablet" msgid="8797910368942544453">"Ваш дзвінок буде завершено"</string>
<string name="resetting_internet_text" msgid="6696779371800051806">"Скидання інтернет-з\'єднання…"</string>
<string name="fix_connectivity" msgid="2781433603228089501">"Вирішити проблеми зі з\'єднанням"</string>
- <!-- no translation found for airplane_mode_network_available (1059499681300395240) -->
- <skip />
- <!-- no translation found for to_switch_networks_disconnect_ethernet (6615374552827587197) -->
- <skip />
+ <string name="airplane_mode_network_available" msgid="1059499681300395240">"Мережі, доступні в режимі польоту"</string>
+ <string name="to_switch_networks_disconnect_ethernet" msgid="6615374552827587197">"Щоб вибрати іншу мережу, від\'єднайте кабель Ethernet"</string>
+ <string name="cannot_switch_networks_while_connected" msgid="3867944849171754777">"Якщо встановлено з\'єднання, змінити мережу не можна"</string>
+ <string name="airplane_mode_network_panel_title" msgid="6385046104863403604">"Мережі в режимі польоту"</string>
<string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g>/<xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
<string name="mobile_data_connection_active" msgid="2422223108911581552">"Підключено"</string>
<string name="mobile_data_off_summary" msgid="3841411571485837651">"Автоматичне інтернет-з\'єднання вимкнено"</string>
@@ -5271,4 +5272,16 @@
<string name="category_name_others" msgid="2366006298768550310">"Інші"</string>
<string name="category_name_general" msgid="7737273712848115886">"Загальні"</string>
<string name="default_see_all_apps_title" msgid="7481113230662612178">"Показати всі додатки"</string>
+ <string name="smart_forwarding_title" msgid="8368634861971949799">"Розумна переадресація"</string>
+ <string name="smart_forwarding_summary_enabled" msgid="3341062878373185604">"Розумну переадресацію ввімкнено"</string>
+ <string name="smart_forwarding_summary_disabled" msgid="5033880700091914809">"Розумну переадресацію вимкнено"</string>
+ <string name="smart_forwarding_ongoing_title" msgid="962226849074401228">"Налаштування дзвінків"</string>
+ <string name="smart_forwarding_ongoing_text" msgid="2189209372407117114">"Оновлення налаштувань…"</string>
+ <string name="smart_forwarding_failed_title" msgid="1859891191023516080">"Помилка налаштування викликів"</string>
+ <string name="smart_forwarding_failed_text" msgid="5370431503707373653">"Помилка мережі чи SIM-карти."</string>
+ <string name="smart_forwarding_failed_not_activated_text" msgid="997396203001257904">"SIM-карту не активовано."</string>
+ <string name="smart_forwarding_input_mdn_title" msgid="5105463748849841763">"Ввести номери телефонів"</string>
+ <string name="smart_forwarding_input_mdn_dialog_title" msgid="7542216086697868415">"Ввести номер телефону"</string>
+ <string name="smart_forwarding_missing_mdn_text" msgid="2907314684242542226">"Номер телефону відсутній."</string>
+ <string name="smart_forwarding_missing_alert_dialog_text" msgid="7870419247987316112">"OK"</string>
</resources>
diff --git a/res/values-ur/strings.xml b/res/values-ur/strings.xml
index 14867d1..68eef97 100644
--- a/res/values-ur/strings.xml
+++ b/res/values-ur/strings.xml
@@ -2267,8 +2267,7 @@
<item quantity="other"><xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> محفوظ کردہ سماعتی آلات</item>
<item quantity="one"><xliff:g id="NUMBER_DEVICE_COUNT_0">%1$d</xliff:g> محفوظ کردہ سماعتی آلہ</item>
</plurals>
- <!-- no translation found for accessibility_audio_adjustment_title (1332113739136802997) -->
- <skip />
+ <string name="accessibility_audio_adjustment_title" msgid="1332113739136802997">"آڈیو ایڈجسٹمنٹ"</string>
<string name="accessibility_summary_shortcut_enabled" msgid="4030427268146752644">"شارٹ کٹ آن ہے"</string>
<string name="accessibility_summary_shortcut_disabled" msgid="564005462092499068">"آف"</string>
<string name="accessibility_summary_state_enabled" msgid="1065431632216039369">"آن"</string>
@@ -2437,6 +2436,7 @@
<string name="bluetooth_on_time" msgid="8424625554628450028">"وقت پر Wi‑Fi"</string>
<string name="advanced_battery_title" msgid="3005993394776555079">"بیٹری کا استعمال"</string>
<string name="history_details_title" msgid="8628584613889559355">"سرگزشت کی تفصیلات"</string>
+ <string name="advanced_battery_preference_title" msgid="6518802648205311326">"بیٹری کا استعمال دیکھیں"</string>
<string name="battery_details_title" msgid="4531369291819754178">"بیٹری کا استعمال"</string>
<string name="details_subtitle" msgid="2550872569652785527">"استعمال کی تفصیلات"</string>
<string name="controls_subtitle" msgid="3759606830916441564">"پاور کا استعمال ایڈجسٹ کریں"</string>
@@ -4098,6 +4098,7 @@
<string name="usb_use" msgid="6783183432648438528">"اس کیلئے USB استعمال کریں"</string>
<string name="usb_default_label" msgid="3372838450371060750">"ڈیفالٹ USB کنفیگریشن"</string>
<string name="usb_default_info" msgid="167172599497085266">"کسی اور آلہ کے منسلک ہونے اور آپ کے فون کے غیر مقفل ہونے پر، یہ ترتیبات لاگو ہوں گی۔ صرف قابل اعتماد آلات سے منسلک کریں۔"</string>
+ <string name="usb_power_title" msgid="5602112548385798646">"پاور کے اختیارات"</string>
<string name="usb_pref" msgid="8521832005703261700">"USB"</string>
<string name="usb_preference" msgid="5084550082591493765">"USB کی ترجیحات"</string>
<string name="usb_control_title" msgid="1946791559052157693">"USB کنٹرول کردہ بذریعہ"</string>
@@ -4937,8 +4938,8 @@
<string name="mobile_data_ap_mode_disabled" msgid="6067959496888990983">"ہوائی جہاز وضع کے دوران غیر دستیاب"</string>
<string name="force_desktop_mode" msgid="1336913605091334238">"ڈیسک ٹاپ موڈ فورس کریں"</string>
<string name="force_desktop_mode_summary" msgid="4587416867846930479">"ثانوی ڈسپلیز پر تجرباتی ڈیسک ٹاپ موڈ فورس کریں"</string>
- <string name="enable_sizecompat_freeform" msgid="3799755160777404309">"فری فارم sizecompat کو فعال کريں"</string>
- <string name="enable_sizecompat_freeform_summary" msgid="1484050174538201499">"sizecompat ایپس کو فری فارم میں رہنے کی اجازت دیتا ہے"</string>
+ <string name="enable_non_resizable_multi_window" msgid="6832903754625404477">"ملٹی ونڈو میں سائز کی ناقابل تبدیلی کو فعال کریں"</string>
+ <string name="enable_non_resizable_multi_window_summary" msgid="3275763753261901999">"ناقابل تبدیل سائز والی ایپس کو ملٹی ونڈو میں ہونے کی اجازت ہوتی ہے"</string>
<string name="hwui_force_dark_title" msgid="4256904905631994219">"force-dark کو اوور رائیڈ کریں"</string>
<string name="hwui_force_dark_summary" msgid="6515748781487952769">"force-dark کی خصوصیت کو ہمیشہ زبردستی آن رکھنے کے لیے اوور رائیڈ کرتی ہے"</string>
<string name="enable_blurs_on_windows_title" msgid="4218144213800778872">"دھندلے پن کو فعال کریں"</string>
@@ -5060,8 +5061,8 @@
<string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"ہوائی جہاز، ہوائی جہاز کیلئے محفوظ"</string>
<string name="calls_and_sms" msgid="1931855083959003306">"کالز اور SMS"</string>
<string name="calls_and_sms_category" msgid="2021321997884906046">"Wi‑Fi کالنگ"</string>
- <string name="calls_sms_wfc_summary" msgid="4930471357980272294">"Wi-Fi جیسے غیر کیریئر نیٹ ورکس پر کالز کریں اور موصول کریں"</string>
- <string name="calls_sms_footnote" msgid="7002461875954024216">"Wi-Fi کالنگ آپ کو کچھ Wi-Fi نیٹ ورک جیسے غیر کیریئر نیٹ ورکس پر کالز کرنے اور موصول کرنے کی اجازت دیتی ہے۔"</string>
+ <string name="calls_sms_wfc_summary" msgid="3940529919408667336">"Wi-Fi پر کالز کریں اور موصول کریں"</string>
+ <string name="calls_sms_footnote" msgid="8051604228144899434">"Wi-Fi کالنگ سے غیر کیریئر والے Wi-Fi نیٹ ورکس پر کالز کی اور موصول کی جاتی ہیں۔"</string>
<string name="calls_preference_title" msgid="7536882032182563800">"کالز"</string>
<string name="sms_preference_title" msgid="8392745501754864395">"SMS"</string>
<string name="calls_sms_preferred" msgid="6016477652522583496">"ترجیحی"</string>
@@ -5080,9 +5081,10 @@
<string name="reset_internet_text" product="tablet" msgid="8797910368942544453">"اس سے آپ کی فون کال ختم ہو جائے گی"</string>
<string name="resetting_internet_text" msgid="6696779371800051806">"آپ کا انٹرنیٹ ری سیٹ کیا جا رہا ہے…"</string>
<string name="fix_connectivity" msgid="2781433603228089501">"کنیکٹوٹی درست کریں"</string>
- <!-- no translation found for airplane_mode_network_available (1059499681300395240) -->
- <skip />
- <!-- no translation found for to_switch_networks_disconnect_ethernet (6615374552827587197) -->
+ <string name="airplane_mode_network_available" msgid="1059499681300395240">"ہوائی جہاز وضع کے نیٹ ورکس دستیاب ہیں"</string>
+ <string name="to_switch_networks_disconnect_ethernet" msgid="6615374552827587197">"نیٹ ورکس پر سوئچ کرنے کیلئے، ایتھرنیٹ غیر منسلک کریں"</string>
+ <string name="cannot_switch_networks_while_connected" msgid="3867944849171754777">"منسلک ہونے کے دوران نیٹ ورکس کو سوئچ نہیں کر سکتے"</string>
+ <!-- no translation found for airplane_mode_network_panel_title (6385046104863403604) -->
<skip />
<string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g> / <xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
<string name="mobile_data_connection_active" msgid="2422223108911581552">"منسلک ہے"</string>
@@ -5105,4 +5107,16 @@
<string name="category_name_others" msgid="2366006298768550310">"دیگر"</string>
<string name="category_name_general" msgid="7737273712848115886">"عام"</string>
<string name="default_see_all_apps_title" msgid="7481113230662612178">"سبھی ایپس دیکھیں"</string>
+ <string name="smart_forwarding_title" msgid="8368634861971949799">"اسمارٹ فارورڈنگ"</string>
+ <string name="smart_forwarding_summary_enabled" msgid="3341062878373185604">"اسمارٹ فارورڈنگ فعال ہے"</string>
+ <string name="smart_forwarding_summary_disabled" msgid="5033880700091914809">"اسمارٹ فارورڈنگ غیر فعال ہے"</string>
+ <string name="smart_forwarding_ongoing_title" msgid="962226849074401228">"کال کی ترتیبات"</string>
+ <string name="smart_forwarding_ongoing_text" msgid="2189209372407117114">"ترتیبات اپ ڈیٹ ہورہی ہیں…"</string>
+ <string name="smart_forwarding_failed_title" msgid="1859891191023516080">"کال کی ترتیبات کی خرابی"</string>
+ <string name="smart_forwarding_failed_text" msgid="5370431503707373653">"نیٹ ورک یا SIM کارڈ کی خرابی۔"</string>
+ <string name="smart_forwarding_failed_not_activated_text" msgid="997396203001257904">"Sim فعال نہیں ہے۔"</string>
+ <string name="smart_forwarding_input_mdn_title" msgid="5105463748849841763">"فون نمبرز درج کریں"</string>
+ <string name="smart_forwarding_input_mdn_dialog_title" msgid="7542216086697868415">"فون نمبر درج کریں"</string>
+ <string name="smart_forwarding_missing_mdn_text" msgid="2907314684242542226">"فون نمبر موجود نہیں ہے۔"</string>
+ <string name="smart_forwarding_missing_alert_dialog_text" msgid="7870419247987316112">"ٹھیک ہے"</string>
</resources>
diff --git a/res/values-uz/strings.xml b/res/values-uz/strings.xml
index 38b7c76..86b02f8 100644
--- a/res/values-uz/strings.xml
+++ b/res/values-uz/strings.xml
@@ -2267,8 +2267,7 @@
<item quantity="other"><xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> ta saqlangan eshitish apparati</item>
<item quantity="one"><xliff:g id="NUMBER_DEVICE_COUNT_0">%1$d</xliff:g> ta saqlangan eshitish apparati</item>
</plurals>
- <!-- no translation found for accessibility_audio_adjustment_title (1332113739136802997) -->
- <skip />
+ <string name="accessibility_audio_adjustment_title" msgid="1332113739136802997">"Audioni tuzatish"</string>
<string name="accessibility_summary_shortcut_enabled" msgid="4030427268146752644">"Tezkor ishga tushirish yoqilgan"</string>
<string name="accessibility_summary_shortcut_disabled" msgid="564005462092499068">"Yoqilmagan"</string>
<string name="accessibility_summary_state_enabled" msgid="1065431632216039369">"Yoniq"</string>
@@ -2437,6 +2436,7 @@
<string name="bluetooth_on_time" msgid="8424625554628450028">"Wi‑Fi o‘z vaqtida"</string>
<string name="advanced_battery_title" msgid="3005993394776555079">"Batareya sarfi"</string>
<string name="history_details_title" msgid="8628584613889559355">"Tafsilotlar"</string>
+ <string name="advanced_battery_preference_title" msgid="6518802648205311326">"Batareya sarfini koʻrish"</string>
<string name="battery_details_title" msgid="4531369291819754178">"Batareya sarfi"</string>
<string name="details_subtitle" msgid="2550872569652785527">"Batareya sarfi"</string>
<string name="controls_subtitle" msgid="3759606830916441564">"Quvvatdan foydalanishni moslash"</string>
@@ -2690,7 +2690,7 @@
<string name="tts_sliders_title" msgid="6901146958648426181">"Nutq tezligi va ohang"</string>
<string name="tts_engine_section_title" msgid="5115035218089228451">"Nutq sintezatori"</string>
<string name="tts_install_voice_title" msgid="5133545696447933812">"Ovozlar"</string>
- <string name="tts_spoken_language" msgid="4652894245474520872">"So‘zlashuv tili"</string>
+ <string name="tts_spoken_language" msgid="4652894245474520872">"Nutq tili"</string>
<string name="tts_install_voices_title" msgid="6505257816336165782">"Ovozlarni o‘rnatish"</string>
<string name="tts_install_voices_text" msgid="902408506519246362">"Ovozlarni o‘rnatish uchun <xliff:g id="TTS_APP_NAME">%s</xliff:g> ilovasiga o‘ting"</string>
<string name="tts_install_voices_open" msgid="919034855418197668">"Ilovani ochish"</string>
@@ -4098,6 +4098,7 @@
<string name="usb_use" msgid="6783183432648438528">"USB ishlatish rejimi"</string>
<string name="usb_default_label" msgid="3372838450371060750">"Asosiy USB konfiguratsiyasi"</string>
<string name="usb_default_info" msgid="167172599497085266">"Agar boshqa qurilma ulangan va telefoningiz qulfdan chiqarilgan bo‘lsa, mazkur sozlamalar qo‘llaniladi. Faqat ishonchli qurilmalarga ulaning."</string>
+ <string name="usb_power_title" msgid="5602112548385798646">"Quvvat parametrlari"</string>
<string name="usb_pref" msgid="8521832005703261700">"USB"</string>
<string name="usb_preference" msgid="5084550082591493765">"USB sozlamalari"</string>
<string name="usb_control_title" msgid="1946791559052157693">"USB nazoratchisi"</string>
@@ -4937,8 +4938,8 @@
<string name="mobile_data_ap_mode_disabled" msgid="6067959496888990983">"Parvoz rejimida ishlamaydi"</string>
<string name="force_desktop_mode" msgid="1336913605091334238">"Desktop rejimini majburiy ochish"</string>
<string name="force_desktop_mode_summary" msgid="4587416867846930479">"Ikkilamchi displeylarda tajribaviy desktop rejimini majburiy ochish"</string>
- <string name="enable_sizecompat_freeform" msgid="3799755160777404309">"Oʻzgarmas hajmli ilovalarning erkin shakl olishi"</string>
- <string name="enable_sizecompat_freeform_summary" msgid="1484050174538201499">"Oʻzgarmas hajmli ilovalarning erkin shaklda ochilishiga ruxsat beradi"</string>
+ <string name="enable_non_resizable_multi_window" msgid="6832903754625404477">"Koʻp oynali hajmi oʻzgarmas ilovalarni yoqish"</string>
+ <string name="enable_non_resizable_multi_window_summary" msgid="3275763753261901999">"Hajmi oʻzgarmas ilovalar koʻp oynali rejimda ochilishiga ruxsat beradi."</string>
<string name="hwui_force_dark_title" msgid="4256904905631994219">"Tungi mavzuni yoqish ustidan yozadi"</string>
<string name="hwui_force_dark_summary" msgid="6515748781487952769">"Tungi mavzuni majburiy yoqish sozlamasini “Doimo yoniq” sifatida sozlaydi."</string>
<string name="enable_blurs_on_windows_title" msgid="4218144213800778872">"Xiralashtirishni yoqish"</string>
@@ -5060,8 +5061,8 @@
<string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"samolyot, samolyot uchun xavfsiz"</string>
<string name="calls_and_sms" msgid="1931855083959003306">"Chaqiruvlar va SMS"</string>
<string name="calls_and_sms_category" msgid="2021321997884906046">"Wi-Fi chaqiruv"</string>
- <string name="calls_sms_wfc_summary" msgid="4930471357980272294">"Chaqiruvlarni mobil tarmoq orqali emas, Wi-Fi tarmoqlar orqali amalga oshirish va qabul qilish"</string>
- <string name="calls_sms_footnote" msgid="7002461875954024216">"Wi-Fi chaqiruv funksiyasi mobil tarmoq ishlatmasdan Wi‑Fi tarmoqlar orqali chaqiruv qilish va chaqiruvlarni qabul qilish imkonini beradi."</string>
+ <string name="calls_sms_wfc_summary" msgid="3940529919408667336">"Chaqiruvlarni Wi-Fi orqali bajarish va qabul qilish"</string>
+ <string name="calls_sms_footnote" msgid="8051604228144899434">"Wi-Fi chaqiruv funksiyasi chaqiruvlarni mobil tarmoqsiz Wi-Fi tarmoqlar orqali bajarish va qabul qilish imkonini beradi."</string>
<string name="calls_preference_title" msgid="7536882032182563800">"Chaqiruvlar"</string>
<string name="sms_preference_title" msgid="8392745501754864395">"SMS"</string>
<string name="calls_sms_preferred" msgid="6016477652522583496">"maqbul"</string>
@@ -5080,10 +5081,10 @@
<string name="reset_internet_text" product="tablet" msgid="8797910368942544453">"Bunda telefon chaqiruvingiz tugatiladi"</string>
<string name="resetting_internet_text" msgid="6696779371800051806">"Internet qayta tiklanmoqda…"</string>
<string name="fix_connectivity" msgid="2781433603228089501">"Aloqani tiklash"</string>
- <!-- no translation found for airplane_mode_network_available (1059499681300395240) -->
- <skip />
- <!-- no translation found for to_switch_networks_disconnect_ethernet (6615374552827587197) -->
- <skip />
+ <string name="airplane_mode_network_available" msgid="1059499681300395240">"Parvoz rejimi tarmoqlari mavjud"</string>
+ <string name="to_switch_networks_disconnect_ethernet" msgid="6615374552827587197">"Boshqa tarmoqqa almashish uchun Ethernet tarmogʻini uzing"</string>
+ <string name="cannot_switch_networks_while_connected" msgid="3867944849171754777">"Ulangan tarmoqlarni almashtirish imkonsiz"</string>
+ <string name="airplane_mode_network_panel_title" msgid="6385046104863403604">"Parvoz rejimi tarmoqlari"</string>
<string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g> / <xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
<string name="mobile_data_connection_active" msgid="2422223108911581552">"Ulandi"</string>
<string name="mobile_data_off_summary" msgid="3841411571485837651">"Internet avtomatik ravishda ulanmaydi"</string>
@@ -5105,4 +5106,16 @@
<string name="category_name_others" msgid="2366006298768550310">"Boshqalar"</string>
<string name="category_name_general" msgid="7737273712848115886">"Umumiy"</string>
<string name="default_see_all_apps_title" msgid="7481113230662612178">"Barcha ilovalar"</string>
+ <string name="smart_forwarding_title" msgid="8368634861971949799">"Smart uzatish"</string>
+ <string name="smart_forwarding_summary_enabled" msgid="3341062878373185604">"Smart uzatish yoniq"</string>
+ <string name="smart_forwarding_summary_disabled" msgid="5033880700091914809">"Smart uzatish yoqilmagan"</string>
+ <string name="smart_forwarding_ongoing_title" msgid="962226849074401228">"Chaqiruv sozlamalari"</string>
+ <string name="smart_forwarding_ongoing_text" msgid="2189209372407117114">"Sozlamalar yangilanmoqda..."</string>
+ <string name="smart_forwarding_failed_title" msgid="1859891191023516080">"Chaqiruv sozlamalarida xato"</string>
+ <string name="smart_forwarding_failed_text" msgid="5370431503707373653">"Tarmoq yoki SIM kartada xato."</string>
+ <string name="smart_forwarding_failed_not_activated_text" msgid="997396203001257904">"Sim karta faol emas."</string>
+ <string name="smart_forwarding_input_mdn_title" msgid="5105463748849841763">"Telefon raqamlarini kiriting"</string>
+ <string name="smart_forwarding_input_mdn_dialog_title" msgid="7542216086697868415">"Telefon raqamini kiriting"</string>
+ <string name="smart_forwarding_missing_mdn_text" msgid="2907314684242542226">"Telefon raqami kiritilmagan."</string>
+ <string name="smart_forwarding_missing_alert_dialog_text" msgid="7870419247987316112">"OK"</string>
</resources>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index d7a7606..96d78a7 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -2267,8 +2267,7 @@
<item quantity="other"><xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> thiết bị trợ thính đã lưu</item>
<item quantity="one"><xliff:g id="NUMBER_DEVICE_COUNT_0">%1$d</xliff:g> thiết bị trợ thính đã lưu</item>
</plurals>
- <!-- no translation found for accessibility_audio_adjustment_title (1332113739136802997) -->
- <skip />
+ <string name="accessibility_audio_adjustment_title" msgid="1332113739136802997">"Điều chỉnh âm thanh"</string>
<string name="accessibility_summary_shortcut_enabled" msgid="4030427268146752644">"Phím tắt đang bật"</string>
<string name="accessibility_summary_shortcut_disabled" msgid="564005462092499068">"Đang tắt"</string>
<string name="accessibility_summary_state_enabled" msgid="1065431632216039369">"Đang bật"</string>
@@ -2437,6 +2436,7 @@
<string name="bluetooth_on_time" msgid="8424625554628450028">"Thời gian bật Wi‑Fi"</string>
<string name="advanced_battery_title" msgid="3005993394776555079">"Mức sử dụng pin"</string>
<string name="history_details_title" msgid="8628584613889559355">"Chi tiết lịch sử"</string>
+ <string name="advanced_battery_preference_title" msgid="6518802648205311326">"Xem mức sử dụng pin"</string>
<string name="battery_details_title" msgid="4531369291819754178">"Mức sử dụng pin"</string>
<string name="details_subtitle" msgid="2550872569652785527">"Chi tiết sử dụng"</string>
<string name="controls_subtitle" msgid="3759606830916441564">"Điều chỉnh việc sử dụng nguồn"</string>
@@ -3525,9 +3525,9 @@
<string name="notifications_bubble_setting_on_summary" msgid="4641572377430901196">"Đang bật / Các cuộc trò chuyện có thể hiển thị ở dạng biểu tượng nổi"</string>
<string name="notifications_bubble_setting_title" msgid="8287649393774855268">"Cho phép các ứng dụng hiển thị bong bóng"</string>
<string name="notifications_bubble_setting_description" msgid="7336770088735025981">"Một số cuộc trò chuyện sẽ hiển thị dưới dạng biểu tượng nổi ở phía trên cùng của các ứng dụng khác"</string>
- <string name="bubble_app_setting_all" msgid="312524752846978277">"Mọi cuộc trò chuyện đều có thể tạo bong bóng"</string>
- <string name="bubble_app_setting_selected" msgid="4324386074198040675">"Những cuộc trò chuyện đã chọn có thể tạo bong bóng"</string>
- <string name="bubble_app_setting_none" msgid="8643594711863996418">"Không cuộc trò chuyện nào có thể tạo bong bóng"</string>
+ <string name="bubble_app_setting_all" msgid="312524752846978277">"Mọi cuộc trò chuyện đều có thể tạo bong bóng trò chuyện"</string>
+ <string name="bubble_app_setting_selected" msgid="4324386074198040675">"Những cuộc trò chuyện đã chọn có thể tạo bong bóng trò chuyện"</string>
+ <string name="bubble_app_setting_none" msgid="8643594711863996418">"Không cuộc trò chuyện nào có thể tạo bong bóng trò chuyện"</string>
<string name="bubble_app_setting_selected_conversation_title" msgid="3060958976857529933">"Cuộc trò chuyện"</string>
<string name="bubble_app_setting_excluded_conversation_title" msgid="324818960338773945">"Danh sách các cuộc trò chuyện không thể tạo bong bóng"</string>
<string name="bubble_app_setting_unbubble_conversation" msgid="1769789500566080427">"Tắt bong bóng cho cuộc trò chuyện này"</string>
@@ -4098,6 +4098,7 @@
<string name="usb_use" msgid="6783183432648438528">"Sử dụng USB cho"</string>
<string name="usb_default_label" msgid="3372838450371060750">"Cấu hình USB mặc định"</string>
<string name="usb_default_info" msgid="167172599497085266">"Sẽ áp dụng những cài đặt này khi có một thiết bị khác được kết nối và điện thoại của bạn được mở khóa. Bạn chỉ nên kết nối với các thiết bị đáng tin cậy."</string>
+ <string name="usb_power_title" msgid="5602112548385798646">"Tùy chọn chế độ Nguồn"</string>
<string name="usb_pref" msgid="8521832005703261700">"USB"</string>
<string name="usb_preference" msgid="5084550082591493765">"Tùy chọn USB"</string>
<string name="usb_control_title" msgid="1946791559052157693">"Thiết bị kiểm soát USB"</string>
@@ -4937,8 +4938,8 @@
<string name="mobile_data_ap_mode_disabled" msgid="6067959496888990983">"Không sử dụng được khi ở chế độ trên máy bay"</string>
<string name="force_desktop_mode" msgid="1336913605091334238">"Buộc chạy chế độ máy tính"</string>
<string name="force_desktop_mode_summary" msgid="4587416867846930479">"Buộc chạy chế độ máy tính thử nghiệm trên màn hình phụ"</string>
- <string name="enable_sizecompat_freeform" msgid="3799755160777404309">"Cho phép ở dạng tự do khi không thể đổi kích thước"</string>
- <string name="enable_sizecompat_freeform_summary" msgid="1484050174538201499">"Cho phép các ứng dụng ở dạng tự do khi không thể đổi kích thước"</string>
+ <string name="enable_non_resizable_multi_window" msgid="6832903754625404477">"Bật tùy chọn không thay đổi kích thước trong nhiều cửa sổ"</string>
+ <string name="enable_non_resizable_multi_window_summary" msgid="3275763753261901999">"Cho phép các ứng dụng không thể thay đổi kích thước xuất hiện trong nhiều cửa sổ"</string>
<string name="hwui_force_dark_title" msgid="4256904905631994219">"Ghi đè tính năng buộc tối"</string>
<string name="hwui_force_dark_summary" msgid="6515748781487952769">"Ghi đè tính năng buộc tối để luôn bật"</string>
<string name="enable_blurs_on_windows_title" msgid="4218144213800778872">"Bật tính năng làm mờ"</string>
@@ -5060,8 +5061,8 @@
<string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"máy bay, an toàn trên máy bay"</string>
<string name="calls_and_sms" msgid="1931855083959003306">"Cuộc gọi và tin nhắn SMS"</string>
<string name="calls_and_sms_category" msgid="2021321997884906046">"Gọi qua Wi-Fi"</string>
- <string name="calls_sms_wfc_summary" msgid="4930471357980272294">"Gọi và nhận cuộc gọi qua các mạng không phải do nhà mạng cung cấp, chẳng hạn như mạng Wi‑Fi"</string>
- <string name="calls_sms_footnote" msgid="7002461875954024216">"Với tính năng gọi qua Wi‑Fi, bạn có thể gọi và nhận cuộc gọi qua các mạng không phải do nhà mạng cung cấp, chẳng hạn như một số mạng Wi‑Fi."</string>
+ <string name="calls_sms_wfc_summary" msgid="3940529919408667336">"Gọi và nhận cuộc gọi qua mạng Wi‑Fi"</string>
+ <string name="calls_sms_footnote" msgid="8051604228144899434">"Với tính năng gọi qua Wi‑Fi, bạn có thể gọi và nhận cuộc gọi qua các mạng Wi‑Fi không phải do nhà mạng cung cấp."</string>
<string name="calls_preference_title" msgid="7536882032182563800">"Cuộc gọi"</string>
<string name="sms_preference_title" msgid="8392745501754864395">"Tin nhắn SMS"</string>
<string name="calls_sms_preferred" msgid="6016477652522583496">"ưu tiên"</string>
@@ -5080,10 +5081,10 @@
<string name="reset_internet_text" product="tablet" msgid="8797910368942544453">"Hành động này sẽ kết thúc cuộc gọi điện thoại của bạn"</string>
<string name="resetting_internet_text" msgid="6696779371800051806">"Đang đặt lại Internet của bạn…"</string>
<string name="fix_connectivity" msgid="2781433603228089501">"Khắc phục sự cố về kết nối"</string>
- <!-- no translation found for airplane_mode_network_available (1059499681300395240) -->
- <skip />
- <!-- no translation found for to_switch_networks_disconnect_ethernet (6615374552827587197) -->
- <skip />
+ <string name="airplane_mode_network_available" msgid="1059499681300395240">"Các mạng dùng được khi ở chế độ trên máy bay"</string>
+ <string name="to_switch_networks_disconnect_ethernet" msgid="6615374552827587197">"Để chuyển mạng, hãy rút cáp Ethernet"</string>
+ <string name="cannot_switch_networks_while_connected" msgid="3867944849171754777">"Bạn không thể chuyển đổi mạng khi đã kết nối"</string>
+ <string name="airplane_mode_network_panel_title" msgid="6385046104863403604">"Mạng ở chế độ trên máy bay"</string>
<string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g>/<xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
<string name="mobile_data_connection_active" msgid="2422223108911581552">"Đã kết nối"</string>
<string name="mobile_data_off_summary" msgid="3841411571485837651">"Sẽ không tự động kết nối Internet"</string>
@@ -5105,4 +5106,16 @@
<string name="category_name_others" msgid="2366006298768550310">"Khác"</string>
<string name="category_name_general" msgid="7737273712848115886">"Chung"</string>
<string name="default_see_all_apps_title" msgid="7481113230662612178">"Xem tất cả ứng dụng"</string>
+ <string name="smart_forwarding_title" msgid="8368634861971949799">"Chuyển tiếp thông minh"</string>
+ <string name="smart_forwarding_summary_enabled" msgid="3341062878373185604">"Đã bật tính năng chuyển tiếp thông minh"</string>
+ <string name="smart_forwarding_summary_disabled" msgid="5033880700091914809">"Đã tắt tính năng chuyển tiếp thông minh"</string>
+ <string name="smart_forwarding_ongoing_title" msgid="962226849074401228">"Cài đặt cuộc gọi"</string>
+ <string name="smart_forwarding_ongoing_text" msgid="2189209372407117114">"Đang cập nhật các tùy chọn cài đặt..."</string>
+ <string name="smart_forwarding_failed_title" msgid="1859891191023516080">"Lỗi với phần Cài đặt cuộc gọi"</string>
+ <string name="smart_forwarding_failed_text" msgid="5370431503707373653">"Lỗi mạng hoặc thẻ SIM."</string>
+ <string name="smart_forwarding_failed_not_activated_text" msgid="997396203001257904">"SIM chưa được kích hoạt."</string>
+ <string name="smart_forwarding_input_mdn_title" msgid="5105463748849841763">"Nhập các số điện thoại"</string>
+ <string name="smart_forwarding_input_mdn_dialog_title" msgid="7542216086697868415">"Nhập số điện thoại"</string>
+ <string name="smart_forwarding_missing_mdn_text" msgid="2907314684242542226">"Thiếu số điện thoại."</string>
+ <string name="smart_forwarding_missing_alert_dialog_text" msgid="7870419247987316112">"Đã hiểu"</string>
</resources>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 36a4281..766c0ec 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -2267,8 +2267,7 @@
<item quantity="other">已保存 <xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> 台助听器</item>
<item quantity="one">已保存 <xliff:g id="NUMBER_DEVICE_COUNT_0">%1$d</xliff:g> 台助听器</item>
</plurals>
- <!-- no translation found for accessibility_audio_adjustment_title (1332113739136802997) -->
- <skip />
+ <string name="accessibility_audio_adjustment_title" msgid="1332113739136802997">"音频调整"</string>
<string name="accessibility_summary_shortcut_enabled" msgid="4030427268146752644">"开启快捷方式"</string>
<string name="accessibility_summary_shortcut_disabled" msgid="564005462092499068">"关闭"</string>
<string name="accessibility_summary_state_enabled" msgid="1065431632216039369">"开启"</string>
@@ -2437,6 +2436,7 @@
<string name="bluetooth_on_time" msgid="8424625554628450028">"WLAN开启时间"</string>
<string name="advanced_battery_title" msgid="3005993394776555079">"电池用量"</string>
<string name="history_details_title" msgid="8628584613889559355">"详细电量使用记录"</string>
+ <string name="advanced_battery_preference_title" msgid="6518802648205311326">"查看电池用量"</string>
<string name="battery_details_title" msgid="4531369291819754178">"电池用量"</string>
<string name="details_subtitle" msgid="2550872569652785527">"详细使用情况"</string>
<string name="controls_subtitle" msgid="3759606830916441564">"省电提示"</string>
@@ -4098,6 +4098,7 @@
<string name="usb_use" msgid="6783183432648438528">"USB 的用途"</string>
<string name="usb_default_label" msgid="3372838450371060750">"默认 USB 配置"</string>
<string name="usb_default_info" msgid="167172599497085266">"连接到其他设备且您的手机处于解锁状态时，系统就会应用这些设置。请只连接到可信设备。"</string>
+ <string name="usb_power_title" msgid="5602112548385798646">"电源选项"</string>
<string name="usb_pref" msgid="8521832005703261700">"USB"</string>
<string name="usb_preference" msgid="5084550082591493765">"USB 偏好设置"</string>
<string name="usb_control_title" msgid="1946791559052157693">"USB 受控于："</string>
@@ -4937,8 +4938,8 @@
<string name="mobile_data_ap_mode_disabled" msgid="6067959496888990983">"在飞行模式下不可用"</string>
<string name="force_desktop_mode" msgid="1336913605091334238">"强制使用桌面模式"</string>
<string name="force_desktop_mode_summary" msgid="4587416867846930479">"在辅助显示屏上强制使用实验桌面模式"</string>
- <string name="enable_sizecompat_freeform" msgid="3799755160777404309">"启用自由形式大小"</string>
- <string name="enable_sizecompat_freeform_summary" msgid="1484050174538201499">"允许无法调整大小的应用采用自由形式"</string>
+ <string name="enable_non_resizable_multi_window" msgid="6832903754625404477">"允许以多窗口模式显示不可调整大小的应用"</string>
+ <string name="enable_non_resizable_multi_window_summary" msgid="3275763753261901999">"允许通过多窗口模式显示不可调整大小的应用"</string>
<string name="hwui_force_dark_title" msgid="4256904905631994219">"覆盖“强制启用 SmartDark 功能”的设置"</string>
<string name="hwui_force_dark_summary" msgid="6515748781487952769">"覆盖“强制 SmartDark 功能始终开启”的设置"</string>
<string name="enable_blurs_on_windows_title" msgid="4218144213800778872">"启用模糊效果"</string>
@@ -5060,8 +5061,8 @@
<string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"飞机，可在飞机上安全使用"</string>
<string name="calls_and_sms" msgid="1931855083959003306">"通话和短信"</string>
<string name="calls_and_sms_category" msgid="2021321997884906046">"WLAN 通话"</string>
- <string name="calls_sms_wfc_summary" msgid="4930471357980272294">"通过 WLAN 等非运营商网络接打电话"</string>
- <string name="calls_sms_footnote" msgid="7002461875954024216">"WLAN 通话功能支持您通过非运营商网络（例如某些 WLAN 网络）接打电话。"</string>
+ <string name="calls_sms_wfc_summary" msgid="3940529919408667336">"通过 WLAN 接打电话"</string>
+ <string name="calls_sms_footnote" msgid="8051604228144899434">"开启“WLAN 通话”功能后，可通过非运营商 WLAN 网络接打电话。"</string>
<string name="calls_preference_title" msgid="7536882032182563800">"通话"</string>
<string name="sms_preference_title" msgid="8392745501754864395">"短信"</string>
<string name="calls_sms_preferred" msgid="6016477652522583496">"首选"</string>
@@ -5080,10 +5081,10 @@
<string name="reset_internet_text" product="tablet" msgid="8797910368942544453">"通话将因此结束"</string>
<string name="resetting_internet_text" msgid="6696779371800051806">"正在重置互联网…"</string>
<string name="fix_connectivity" msgid="2781433603228089501">"修复连接"</string>
- <!-- no translation found for airplane_mode_network_available (1059499681300395240) -->
- <skip />
- <!-- no translation found for to_switch_networks_disconnect_ethernet (6615374552827587197) -->
- <skip />
+ <string name="airplane_mode_network_available" msgid="1059499681300395240">"有可用的飞行模式网络"</string>
+ <string name="to_switch_networks_disconnect_ethernet" msgid="6615374552827587197">"如要切换网络，请拔出以太网网线"</string>
+ <string name="cannot_switch_networks_while_connected" msgid="3867944849171754777">"连接到以太网时无法切换网络"</string>
+ <string name="airplane_mode_network_panel_title" msgid="6385046104863403604">"飞行模式网络"</string>
<string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g> / <xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
<string name="mobile_data_connection_active" msgid="2422223108911581552">"已连接"</string>
<string name="mobile_data_off_summary" msgid="3841411571485837651">"不会自动连接到互联网"</string>
@@ -5105,4 +5106,16 @@
<string name="category_name_others" msgid="2366006298768550310">"其他"</string>
<string name="category_name_general" msgid="7737273712848115886">"常规"</string>
<string name="default_see_all_apps_title" msgid="7481113230662612178">"查看所有应用"</string>
+ <string name="smart_forwarding_title" msgid="8368634861971949799">"智能转接"</string>
+ <string name="smart_forwarding_summary_enabled" msgid="3341062878373185604">"智能转接功能已启用"</string>
+ <string name="smart_forwarding_summary_disabled" msgid="5033880700091914809">"智能转接功能已停用"</string>
+ <string name="smart_forwarding_ongoing_title" msgid="962226849074401228">"通话设置"</string>
+ <string name="smart_forwarding_ongoing_text" msgid="2189209372407117114">"正在更新设置…"</string>
+ <string name="smart_forwarding_failed_title" msgid="1859891191023516080">"通话设置错误"</string>
+ <string name="smart_forwarding_failed_text" msgid="5370431503707373653">"网络或 SIM 卡错误。"</string>
+ <string name="smart_forwarding_failed_not_activated_text" msgid="997396203001257904">"SIM 卡未激活。"</string>
+ <string name="smart_forwarding_input_mdn_title" msgid="5105463748849841763">"输入电话号码"</string>
+ <string name="smart_forwarding_input_mdn_dialog_title" msgid="7542216086697868415">"输入电话号码"</string>
+ <string name="smart_forwarding_missing_mdn_text" msgid="2907314684242542226">"缺少电话号码。"</string>
+ <string name="smart_forwarding_missing_alert_dialog_text" msgid="7870419247987316112">"确定"</string>
</resources>
diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index 6422978..d762c65 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml
@@ -2268,8 +2268,7 @@
<item quantity="other">儲存咗 <xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> 個助聽器</item>
<item quantity="one">儲存咗 <xliff:g id="NUMBER_DEVICE_COUNT_0">%1$d</xliff:g> 個助聽器</item>
</plurals>
- <!-- no translation found for accessibility_audio_adjustment_title (1332113739136802997) -->
- <skip />
+ <string name="accessibility_audio_adjustment_title" msgid="1332113739136802997">"音訊調整"</string>
<string name="accessibility_summary_shortcut_enabled" msgid="4030427268146752644">"開啟快速鍵"</string>
<string name="accessibility_summary_shortcut_disabled" msgid="564005462092499068">"關閉"</string>
<string name="accessibility_summary_state_enabled" msgid="1065431632216039369">"開啟"</string>
@@ -2438,6 +2437,7 @@
<string name="bluetooth_on_time" msgid="8424625554628450028">"Wi-Fi 開啟時間"</string>
<string name="advanced_battery_title" msgid="3005993394776555079">"電池用量"</string>
<string name="history_details_title" msgid="8628584613889559355">"詳細記錄"</string>
+ <string name="advanced_battery_preference_title" msgid="6518802648205311326">"查看電池用量"</string>
<string name="battery_details_title" msgid="4531369291819754178">"電池用量"</string>
<string name="details_subtitle" msgid="2550872569652785527">"詳細使用狀況"</string>
<string name="controls_subtitle" msgid="3759606830916441564">"調整電力使用"</string>
@@ -4099,6 +4099,7 @@
<string name="usb_use" msgid="6783183432648438528">"USB 用途"</string>
<string name="usb_default_label" msgid="3372838450371060750">"預設 USB 設定"</string>
<string name="usb_default_info" msgid="167172599497085266">"連接至其他裝置且您的手機處於解鎖狀態時，系統便會套用這些設定。請務必只連接至信任的裝置。"</string>
+ <string name="usb_power_title" msgid="5602112548385798646">"電源選項"</string>
<string name="usb_pref" msgid="8521832005703261700">"USB"</string>
<string name="usb_preference" msgid="5084550082591493765">"USB 偏好設定"</string>
<string name="usb_control_title" msgid="1946791559052157693">"USB 由以下裝置控制"</string>
@@ -4938,8 +4939,8 @@
<string name="mobile_data_ap_mode_disabled" msgid="6067959496888990983">"飛行模式啟用期間無法使用"</string>
<string name="force_desktop_mode" msgid="1336913605091334238">"強制執行桌面模式"</string>
<string name="force_desktop_mode_summary" msgid="4587416867846930479">"在次要顯示屏強制執行實驗版桌面模式"</string>
- <string name="enable_sizecompat_freeform" msgid="3799755160777404309">"啟用可自由移動的尺寸兼容應用程式"</string>
- <string name="enable_sizecompat_freeform_summary" msgid="1484050174538201499">"允許尺寸兼容應用程式處於可自由移動狀態"</string>
+ <string name="enable_non_resizable_multi_window" msgid="6832903754625404477">"允許多重視窗模式顯示無法調整大小的應用程式"</string>
+ <string name="enable_non_resizable_multi_window_summary" msgid="3275763753261901999">"允許透過多重視窗模式顯示無法調整大小的應用程式"</string>
<string name="hwui_force_dark_title" msgid="4256904905631994219">"蓋過強制深色模式"</string>
<string name="hwui_force_dark_summary" msgid="6515748781487952769">"蓋過永遠啟用強制深色模式的設定"</string>
<string name="enable_blurs_on_windows_title" msgid="4218144213800778872">"啟用模糊效果"</string>
@@ -4990,9 +4991,9 @@
<string name="wfc_disclaimer_emergency_limitation_title_text" msgid="8276287227589397162">"緊急通話"</string>
<string name="wfc_disclaimer_emergency_limitation_desc_text" msgid="5503902001191552196">"您的電訊商目前不支援透過 Wi-Fi 通話撥打緊急電話。\n裝置會自動切換至流動網絡以撥打緊急電話。\n您只可在流動網絡覆蓋的區域撥打緊急電話。"</string>
<string name="wifi_calling_summary" msgid="8566648389959032967">"使用 Wi‑Fi 撥打電話，以提升通話質素"</string>
- <string name="backup_calling_settings_title" msgid="519714752900364326">"備份通話"</string>
+ <string name="backup_calling_settings_title" msgid="519714752900364326">"備用通話"</string>
<string name="backup_calling_setting_summary" msgid="451295393447465830">"如果「<xliff:g id="BACKUP_CALLING_OPERATOR_TEXT">%1$s</xliff:g>」無法使用，系統將透過流動數據 SIM 卡撥打和接聽「<xliff:g id="BACKUP_CALLING_CARRIER_TEXT">%1$s</xliff:g>」的電話。"</string>
- <string name="keywords_backup_calling" msgid="8592800915478816800">"備份通話"</string>
+ <string name="keywords_backup_calling" msgid="8592800915478816800">"備用通話"</string>
<string name="enable_receiving_mms_notification_title" msgid="6465218559386990248">"收到的 MMS 訊息"</string>
<string name="enable_sending_mms_notification_title" msgid="7120641300854953375">"無法傳送 MMS 訊息"</string>
<string name="enable_mms_notification_summary" msgid="6432752438276672500">"輕按即可在流動數據關閉的情況下透過<xliff:g id="OPERATOR_NAME">%1$s</xliff:g>傳送 MMS 訊息"</string>
@@ -5061,8 +5062,8 @@
<string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"飛行, 飛行安全"</string>
<string name="calls_and_sms" msgid="1931855083959003306">"通話和短訊"</string>
<string name="calls_and_sms_category" msgid="2021321997884906046">"Wi-Fi 通話"</string>
- <string name="calls_sms_wfc_summary" msgid="4930471357980272294">"透過非流動網絡供應商網絡 (例如 Wi-Fi) 撥打和接聽電話"</string>
- <string name="calls_sms_footnote" msgid="7002461875954024216">"Wi-Fi 通話可讓您透過非流動網絡供應商網絡 (例如 Wi-Fi 網絡) 撥打和接聽電話。"</string>
+ <string name="calls_sms_wfc_summary" msgid="3940529919408667336">"透過 Wi-Fi 撥打和接聽電話"</string>
+ <string name="calls_sms_footnote" msgid="8051604228144899434">"Wi-Fi 通話可讓您透過非流動網絡供應商 Wi-Fi 網絡撥打和接聽電話。"</string>
<string name="calls_preference_title" msgid="7536882032182563800">"通話"</string>
<string name="sms_preference_title" msgid="8392745501754864395">"短訊"</string>
<string name="calls_sms_preferred" msgid="6016477652522583496">"偏好"</string>
@@ -5081,10 +5082,10 @@
<string name="reset_internet_text" product="tablet" msgid="8797910368942544453">"通話將因此結束"</string>
<string name="resetting_internet_text" msgid="6696779371800051806">"正在重設互聯網…"</string>
<string name="fix_connectivity" msgid="2781433603228089501">"修正連線"</string>
- <!-- no translation found for airplane_mode_network_available (1059499681300395240) -->
- <skip />
- <!-- no translation found for to_switch_networks_disconnect_ethernet (6615374552827587197) -->
- <skip />
+ <string name="airplane_mode_network_available" msgid="1059499681300395240">"有可用的飛行模式網絡"</string>
+ <string name="to_switch_networks_disconnect_ethernet" msgid="6615374552827587197">"如要切換網絡，請中斷以太網連線"</string>
+ <string name="cannot_switch_networks_while_connected" msgid="3867944849171754777">"連接以太網絡後就無法切絡"</string>
+ <string name="airplane_mode_network_panel_title" msgid="6385046104863403604">"飛行模式網絡"</string>
<string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g>/<xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
<string name="mobile_data_connection_active" msgid="2422223108911581552">"已連線"</string>
<string name="mobile_data_off_summary" msgid="3841411571485837651">"不會自動連線至互聯網"</string>
@@ -5106,4 +5107,16 @@
<string name="category_name_others" msgid="2366006298768550310">"其他"</string>
<string name="category_name_general" msgid="7737273712848115886">"一般"</string>
<string name="default_see_all_apps_title" msgid="7481113230662612178">"查看所有應用程式"</string>
+ <string name="smart_forwarding_title" msgid="8368634861971949799">"智能轉駁"</string>
+ <string name="smart_forwarding_summary_enabled" msgid="3341062878373185604">"智能轉駁功能已啟用"</string>
+ <string name="smart_forwarding_summary_disabled" msgid="5033880700091914809">"智能轉駁功能已停用"</string>
+ <string name="smart_forwarding_ongoing_title" msgid="962226849074401228">"通話設定"</string>
+ <string name="smart_forwarding_ongoing_text" msgid="2189209372407117114">"正在更新設定…"</string>
+ <string name="smart_forwarding_failed_title" msgid="1859891191023516080">"通話設定錯誤"</string>
+ <string name="smart_forwarding_failed_text" msgid="5370431503707373653">"網絡或 SIM 卡錯誤。"</string>
+ <string name="smart_forwarding_failed_not_activated_text" msgid="997396203001257904">"SIM 卡未啟用。"</string>
+ <string name="smart_forwarding_input_mdn_title" msgid="5105463748849841763">"輸入電話號碼"</string>
+ <string name="smart_forwarding_input_mdn_dialog_title" msgid="7542216086697868415">"輸入電話號碼"</string>
+ <string name="smart_forwarding_missing_mdn_text" msgid="2907314684242542226">"缺少電話號碼。"</string>
+ <string name="smart_forwarding_missing_alert_dialog_text" msgid="7870419247987316112">"確定"</string>
</resources>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index dc92c4c..1871f86 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -2267,8 +2267,7 @@
<item quantity="other">已儲存 <xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> 個助聽器</item>
<item quantity="one">已儲存 <xliff:g id="NUMBER_DEVICE_COUNT_0">%1$d</xliff:g> 個助聽器</item>
</plurals>
- <!-- no translation found for accessibility_audio_adjustment_title (1332113739136802997) -->
- <skip />
+ <string name="accessibility_audio_adjustment_title" msgid="1332113739136802997">"音訊調整"</string>
<string name="accessibility_summary_shortcut_enabled" msgid="4030427268146752644">"捷徑功能已開啟"</string>
<string name="accessibility_summary_shortcut_disabled" msgid="564005462092499068">"關閉"</string>
<string name="accessibility_summary_state_enabled" msgid="1065431632216039369">"開啟"</string>
@@ -2437,6 +2436,7 @@
<string name="bluetooth_on_time" msgid="8424625554628450028">"開啟 Wi-Fi 的時間"</string>
<string name="advanced_battery_title" msgid="3005993394776555079">"電池用量"</string>
<string name="history_details_title" msgid="8628584613889559355">"詳細記錄"</string>
+ <string name="advanced_battery_preference_title" msgid="6518802648205311326">"查看電池用量"</string>
<string name="battery_details_title" msgid="4531369291819754178">"電池用量"</string>
<string name="details_subtitle" msgid="2550872569652785527">"使用狀況詳細資訊"</string>
<string name="controls_subtitle" msgid="3759606830916441564">"調整電力使用"</string>
@@ -4098,6 +4098,7 @@
<string name="usb_use" msgid="6783183432648438528">"USB 用途"</string>
<string name="usb_default_label" msgid="3372838450371060750">"預設 USB 設定"</string>
<string name="usb_default_info" msgid="167172599497085266">"當手機處於解鎖狀態且連接至其他裝置時，這些設定就會生效。請務必只連接至信任的裝置。"</string>
+ <string name="usb_power_title" msgid="5602112548385798646">"電源選項"</string>
<string name="usb_pref" msgid="8521832005703261700">"USB"</string>
<string name="usb_preference" msgid="5084550082591493765">"USB 偏好設定"</string>
<string name="usb_control_title" msgid="1946791559052157693">"USB 由以下模式控管"</string>
@@ -4937,8 +4938,8 @@
<string name="mobile_data_ap_mode_disabled" msgid="6067959496888990983">"飛航模式開啟時無法使用"</string>
<string name="force_desktop_mode" msgid="1336913605091334238">"強制使用桌面模式"</string>
<string name="force_desktop_mode_summary" msgid="4587416867846930479">"在次要顯示器上強制使用桌面模式實驗性功能"</string>
- <string name="enable_sizecompat_freeform" msgid="3799755160777404309">"啟用自由形式大小"</string>
- <string name="enable_sizecompat_freeform_summary" msgid="1484050174538201499">"允許無法調整大小的應用程式維持自由形式"</string>
+ <string name="enable_non_resizable_multi_window" msgid="6832903754625404477">"允許多視窗模式顯示無法調整大小的應用程式"</string>
+ <string name="enable_non_resizable_multi_window_summary" msgid="3275763753261901999">"允許透過多視窗模式顯示無法調整大小的應用程式"</string>
<string name="hwui_force_dark_title" msgid="4256904905631994219">"覆寫強制使用深色模式的功能"</string>
<string name="hwui_force_dark_summary" msgid="6515748781487952769">"覆寫強制使用深色模式的功能，讓系統一律開啟這個模式"</string>
<string name="enable_blurs_on_windows_title" msgid="4218144213800778872">"啟用模糊效果"</string>
@@ -5060,8 +5061,8 @@
<string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"飛航, 飛航安全"</string>
<string name="calls_and_sms" msgid="1931855083959003306">"通話和簡訊"</string>
<string name="calls_and_sms_category" msgid="2021321997884906046">"Wi‑Fi 通話"</string>
- <string name="calls_sms_wfc_summary" msgid="4930471357980272294">"透過諸如 Wi‑Fi 這類非電信業者提供的網路撥打電話及接聽來電"</string>
- <string name="calls_sms_footnote" msgid="7002461875954024216">"Wi-Fi 通話功能可讓你透過非電信業者網路 (例如某些 Wi-Fi 網路) 撥打電話及接聽來電。"</string>
+ <string name="calls_sms_wfc_summary" msgid="3940529919408667336">"透過 Wi‑Fi 撥打及接聽電話"</string>
+ <string name="calls_sms_footnote" msgid="8051604228144899434">"如果啟用 Wi-Fi 通話功能，你就能透過非電信業者的 Wi-Fi 網路撥打及接聽電話。"</string>
<string name="calls_preference_title" msgid="7536882032182563800">"通話"</string>
<string name="sms_preference_title" msgid="8392745501754864395">"簡訊"</string>
<string name="calls_sms_preferred" msgid="6016477652522583496">"偏好"</string>
@@ -5080,10 +5081,10 @@
<string name="reset_internet_text" product="tablet" msgid="8797910368942544453">"通話將因此結束"</string>
<string name="resetting_internet_text" msgid="6696779371800051806">"正在重設網際網路…"</string>
<string name="fix_connectivity" msgid="2781433603228089501">"修正連線"</string>
- <!-- no translation found for airplane_mode_network_available (1059499681300395240) -->
- <skip />
- <!-- no translation found for to_switch_networks_disconnect_ethernet (6615374552827587197) -->
- <skip />
+ <string name="airplane_mode_network_available" msgid="1059499681300395240">"目前可以使用飛航模式網路"</string>
+ <string name="to_switch_networks_disconnect_ethernet" msgid="6615374552827587197">"如要切換網路，請中斷乙太網路連線"</string>
+ <string name="cannot_switch_networks_while_connected" msgid="3867944849171754777">"連上乙太網路後就無法切換到其他網路"</string>
+ <string name="airplane_mode_network_panel_title" msgid="6385046104863403604">"飛航模式網路"</string>
<string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g>/<xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
<string name="mobile_data_connection_active" msgid="2422223108911581552">"已連線"</string>
<string name="mobile_data_off_summary" msgid="3841411571485837651">"不會自動連上網際網路"</string>
@@ -5105,4 +5106,16 @@
<string name="category_name_others" msgid="2366006298768550310">"其他"</string>
<string name="category_name_general" msgid="7737273712848115886">"一般"</string>
<string name="default_see_all_apps_title" msgid="7481113230662612178">"查看所有應用程式"</string>
+ <string name="smart_forwarding_title" msgid="8368634861971949799">"智慧轉接"</string>
+ <string name="smart_forwarding_summary_enabled" msgid="3341062878373185604">"智慧轉接功能已啟用"</string>
+ <string name="smart_forwarding_summary_disabled" msgid="5033880700091914809">"智慧轉接功能已停用"</string>
+ <string name="smart_forwarding_ongoing_title" msgid="962226849074401228">"通話設定"</string>
+ <string name="smart_forwarding_ongoing_text" msgid="2189209372407117114">"正在更新設定..."</string>
+ <string name="smart_forwarding_failed_title" msgid="1859891191023516080">"通話設定錯誤"</string>
+ <string name="smart_forwarding_failed_text" msgid="5370431503707373653">"網路或 SIM 卡錯誤。"</string>
+ <string name="smart_forwarding_failed_not_activated_text" msgid="997396203001257904">"SIM 卡未啟用。"</string>
+ <string name="smart_forwarding_input_mdn_title" msgid="5105463748849841763">"輸入手機號碼"</string>
+ <string name="smart_forwarding_input_mdn_dialog_title" msgid="7542216086697868415">"輸入手機號碼"</string>
+ <string name="smart_forwarding_missing_mdn_text" msgid="2907314684242542226">"缺少電話號碼。"</string>
+ <string name="smart_forwarding_missing_alert_dialog_text" msgid="7870419247987316112">"確定"</string>
</resources>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index c9fd3ab..3b9c542 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -2268,8 +2268,7 @@
<item quantity="one"><xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> kulondolozwe izinsiza zokuzwa</item>
<item quantity="other"><xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> kulondolozwe izinsiza zokuzwa</item>
</plurals>
- <!-- no translation found for accessibility_audio_adjustment_title (1332113739136802997) -->
- <skip />
+ <string name="accessibility_audio_adjustment_title" msgid="1332113739136802997">"Ukulungiswa komsindo"</string>
<string name="accessibility_summary_shortcut_enabled" msgid="4030427268146752644">"Isinqamuleli sivuliwe"</string>
<string name="accessibility_summary_shortcut_disabled" msgid="564005462092499068">"Valiwe"</string>
<string name="accessibility_summary_state_enabled" msgid="1065431632216039369">"Vuliwe"</string>
@@ -2438,6 +2437,7 @@
<string name="bluetooth_on_time" msgid="8424625554628450028">"I-Wi-Fi isesikhathini"</string>
<string name="advanced_battery_title" msgid="3005993394776555079">"Ukusetshenziswa kwebhethri"</string>
<string name="history_details_title" msgid="8628584613889559355">"Imininingwane yomlando"</string>
+ <string name="advanced_battery_preference_title" msgid="6518802648205311326">"Buka ukusetshenziswa kwebhethri"</string>
<string name="battery_details_title" msgid="4531369291819754178">"Ukusetshenziswa kwebhethri"</string>
<string name="details_subtitle" msgid="2550872569652785527">"Sebenzisa imininingwane"</string>
<string name="controls_subtitle" msgid="3759606830916441564">"Lungisa amandla okusebenza"</string>
@@ -4099,6 +4099,7 @@
<string name="usb_use" msgid="6783183432648438528">"Sebenzisela i-USB i-"</string>
<string name="usb_default_label" msgid="3372838450371060750">"Ukulungiselelwa kwe-USB okuzenzakalelayo"</string>
<string name="usb_default_info" msgid="167172599497085266">"Uma enye idivayisi ixhunyiwe futhi ifoni yakho ivulekile, lesi zilungiselelo zizosebenza. Kuxhumeke kuphela kumadivayisi athembekile."</string>
+ <string name="usb_power_title" msgid="5602112548385798646">"Izinketho zamandla"</string>
<string name="usb_pref" msgid="8521832005703261700">"I-USB"</string>
<string name="usb_preference" msgid="5084550082591493765">"Okuncanyelwayo kwe-USB"</string>
<string name="usb_control_title" msgid="1946791559052157693">"I-USB ilawulwa nge-"</string>
@@ -4938,8 +4939,8 @@
<string name="mobile_data_ap_mode_disabled" msgid="6067959496888990983">"Ayitholakali ngesikhathi semodi yendiza"</string>
<string name="force_desktop_mode" msgid="1336913605091334238">"Phoqelela imodi yedeskithophu"</string>
<string name="force_desktop_mode_summary" msgid="4587416867846930479">"Phoqelela imodi yedeskithophu yokuhlola esibukisweni sesibili"</string>
- <string name="enable_sizecompat_freeform" msgid="3799755160777404309">"Nika amandla i-freeform sizecompat"</string>
- <string name="enable_sizecompat_freeform_summary" msgid="1484050174538201499">"Vumela izinhlelo zokusebenza ze-sizecompat ukuze zikhululeke"</string>
+ <string name="enable_non_resizable_multi_window" msgid="6832903754625404477">"Nika amandla okungashintsheki usayizi emawindini amaningi"</string>
+ <string name="enable_non_resizable_multi_window_summary" msgid="3275763753261901999">"Ivumela izinhlelo zokusebenza ezingashintsheki usayizi ukuthi zibe emawindini amaningi"</string>
<string name="hwui_force_dark_title" msgid="4256904905631994219">"Bhala ngaphezulu isici sokuphoqelela okumnyama"</string>
<string name="hwui_force_dark_summary" msgid="6515748781487952769">"Ibhala ngaphezulu isici sokuphoqelela okumnyama ukuthi ihlale sivulekile"</string>
<string name="enable_blurs_on_windows_title" msgid="4218144213800778872">"Nika amandla ukufiphala"</string>
@@ -5061,8 +5062,8 @@
<string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"indiza, kuphephile kwindiza"</string>
<string name="calls_and_sms" msgid="1931855083959003306">"Amakholi ne-SMS"</string>
<string name="calls_and_sms_category" msgid="2021321997884906046">"Ukushaya kwe-Wi‑Fi"</string>
- <string name="calls_sms_wfc_summary" msgid="4930471357980272294">"Yenza futhi thola amakholi ngamanethiwekhi angewona awenkampani yenethiwekhi njenge-Wi‑Fi"</string>
- <string name="calls_sms_footnote" msgid="7002461875954024216">"Ukushaya kwe-Wi‑Fi kukuvumela ukuthi wenze futhi uthole amakholi ngamanethiwekhi angewona awenkampani yenethiwekhi njengamanye amanethiwekhi we-Wi-Fi."</string>
+ <string name="calls_sms_wfc_summary" msgid="3940529919408667336">"Yenza futhi yamukela amakholi nge-Wi‑Fi"</string>
+ <string name="calls_sms_footnote" msgid="8051604228144899434">"Ngokushaya kwe-Wi‑Fi, amakholi enziwa futhi amukelwa ngamanethiwekhi we-Wi-Fi angewona awenkampani yenethiwekhi."</string>
<string name="calls_preference_title" msgid="7536882032182563800">"Amakholi"</string>
<string name="sms_preference_title" msgid="8392745501754864395">"I-SMS"</string>
<string name="calls_sms_preferred" msgid="6016477652522583496">"okuncanyelwayo"</string>
@@ -5081,10 +5082,10 @@
<string name="reset_internet_text" product="tablet" msgid="8797910368942544453">"Lokhu kuzoqeda ikholi yakho yefoni"</string>
<string name="resetting_internet_text" msgid="6696779371800051806">"Isetha kabusha i-inthanethi yakho…"</string>
<string name="fix_connectivity" msgid="2781433603228089501">"Lungisa ukuxhumeka"</string>
- <!-- no translation found for airplane_mode_network_available (1059499681300395240) -->
- <skip />
- <!-- no translation found for to_switch_networks_disconnect_ethernet (6615374552827587197) -->
- <skip />
+ <string name="airplane_mode_network_available" msgid="1059499681300395240">"Amanethiwekhi wemodi yendiza ayatholakala"</string>
+ <string name="to_switch_networks_disconnect_ethernet" msgid="6615374552827587197">"Ukuze ushintshe amanethiwekhi, nqamula i-ethernet"</string>
+ <string name="cannot_switch_networks_while_connected" msgid="3867944849171754777">"Ayikwazi ukushintsha amanethiwekhi ngenkathi ixhunyiwe"</string>
+ <string name="airplane_mode_network_panel_title" msgid="6385046104863403604">"Amanethiwekhi wemodi yendiza"</string>
<string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g> / <xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
<string name="mobile_data_connection_active" msgid="2422223108911581552">"Ixhunyiwe"</string>
<string name="mobile_data_off_summary" msgid="3841411571485837651">"I-inthanethi ngeke ixhumeke ngokuzenzakalelayo"</string>
@@ -5106,4 +5107,16 @@
<string name="category_name_others" msgid="2366006298768550310">"Abanye"</string>
<string name="category_name_general" msgid="7737273712848115886">"Okuvamile"</string>
<string name="default_see_all_apps_title" msgid="7481113230662612178">"Bona zonke izinhlelo zokusebenza"</string>
+ <string name="smart_forwarding_title" msgid="8368634861971949799">"Ukudluliselwa phambili okuhlakaniphile"</string>
+ <string name="smart_forwarding_summary_enabled" msgid="3341062878373185604">"Ukudlulisela phambili okusmathi kunikwe amandla"</string>
+ <string name="smart_forwarding_summary_disabled" msgid="5033880700091914809">"Ukudlulisela phambili okusmathi kukhutshaziwe"</string>
+ <string name="smart_forwarding_ongoing_title" msgid="962226849074401228">"Izilungiselelo zekholi"</string>
+ <string name="smart_forwarding_ongoing_text" msgid="2189209372407117114">"Ibuyekeza amasethingi…"</string>
+ <string name="smart_forwarding_failed_title" msgid="1859891191023516080">"Iphutha lamasethingi wekholi"</string>
+ <string name="smart_forwarding_failed_text" msgid="5370431503707373653">"Iphutha lenethiwekhi noma lekhadi le-SIM."</string>
+ <string name="smart_forwarding_failed_not_activated_text" msgid="997396203001257904">"I-Sim ayenziwanga yasebenza."</string>
+ <string name="smart_forwarding_input_mdn_title" msgid="5105463748849841763">"Faka izinombolo zefoni"</string>
+ <string name="smart_forwarding_input_mdn_dialog_title" msgid="7542216086697868415">"Faka inombolo yefoni"</string>
+ <string name="smart_forwarding_missing_mdn_text" msgid="2907314684242542226">"Inombolo yefoni ayikho."</string>
+ <string name="smart_forwarding_missing_alert_dialog_text" msgid="7870419247987316112">"KULUNGILE"</string>
</resources>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 8f6be68..16db908 100755
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -141,10 +141,14 @@
<!-- Contextual suggestions -->
<dimen name="suggestion_height">232dp</dimen>
<dimen name="suggestion_padding_horizontal">24dp</dimen>
- <dimen name="suggestion_padding_bottom">8dp</dimen>
+ <dimen name="suggestion_padding_vertical">8dp</dimen>
<dimen name="suggestion_button_margin_top">16dp</dimen>
<dimen name="suggestion_button_padding_horizontal">24dp</dimen>
+ <!-- Tool bar text -->
+ <dimen name="tool_bar_max_text_size">36sp</dimen>
+ <dimen name="tool_bar_min_text_size">24sp</dimen>
+
<!-- Dimensions for Wifi Assistant Card -->
<dimen name="wifi_assistant_padding_top_bottom">16dp</dimen>
<dimen name="wifi_assistant_padding_start_end">16dp</dimen>
@@ -440,4 +444,7 @@
<!-- Text padding for EmptyTextSettings -->
<dimen name="empty_text_padding">24dp</dimen>
+
+ <!-- Choose SIM Activity dimens -->
+ <dimen name="subtitle_bottom_padding">24dp</dimen>
</resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index ce8edf0..6d373fb 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -97,6 +97,15 @@
<!-- Description for the button that makes interface elements larger. [CHAR_LIMIT=NONE] -->
<string name="font_size_make_larger_desc">Make larger</string>
+ <!-- Auto rotate switchbar title. [CHAR_LIMIT=NONE] -->
+ <string name="auto_rotate_settings_primary_switch_title">Use Auto-Rotate</string>
+
+ <!-- Disclaimer for camera based rotate [CHAR_LIMIT=NONE] -->
+ <string name="smart_rotate_text_headline">
+ Face based Autorotate uses the front camera to see if and how someone is looking at the screen. It allows
+ for reading while lying down and images are never stored or sent to Google.<br><br>
+ <a href="<xliff:g example="http://www.google.com" id="url">http://support.google.com/mobile?p=telephony_rtt</xliff:g>">Learn more</a>
+ </string>
<string name="font_size_preview_text_headline">Sample text</string>
<string name="font_size_preview_text_title"
translation_description="Title text in sample text used to illustrate how the currently selected font size will appear to the user. NOTE: Translate manually. No not adopt any copyrighted material for translation.">
@@ -2704,8 +2713,18 @@
<!-- Display settings --><skip/>
<!-- Sound & display settings screen, section header for settings related to display -->
<string name="display_settings">Display</string>
+ <!-- Sound & display settings screen, section header for settings related to display -->
+ <string name="rotate_settings_class" translatable="false">com.android.settings.DisplaySettings</string>
<!-- Sound & display settings screen, accelerometer-based rotation check box label -->
<string name="accelerometer_title">Auto-rotate screen</string>
+ <!-- Sound & display settings screen, locked rotation check box label [CHAR LIMIT=30] -->
+ <string name="auto_rotate_option_off">Off</string>
+ <!-- Sound & display settings screen, accelerometer-based rotation check box label [CHAR LIMIT=30] -->
+ <string name="auto_rotate_option_on">On</string>
+ <!-- Sound & display settings screen, face-based rotation check box label [CHAR LIMIT=30] -->
+ <string name="auto_rotate_option_face_based">On - Face-based</string>
+ <!-- SmartAutoRotatePreferenceFragment settings screen, face-based rotation switch label [CHAR LIMIT=30] -->
+ <string name="auto_rotate_switch_face_based">Enable Face Detection</string>
<!-- Display settings screen, Color mode settings title [CHAR LIMIT=30] -->
<string name="color_mode_title">Colors</string>
<!-- Display settings screen, Color mode option for "natural(sRGB) color" [CHAR LIMIT=45] -->
@@ -4950,6 +4969,8 @@
<string name="display_category_title">Display</string>
<!-- Title for the accessibility text options page. [CHAR LIMIT=50] -->
<string name="accessibility_text_and_display_title">Text and display</string>
+ <!-- Title for the accessibility text options page. [CHAR LIMIT=50] -->
+ <string name="accessibility_turn_screen_darker_title">Turn screen darker</string>
<!-- Title for the accessibility preference category of interaction control services and settings. [CHAR LIMIT=50] -->
<string name="interaction_control_category_title">Interaction controls</string>
<!-- Title for the accessibility tap assistance page. [CHAR LIMIT=50] -->
@@ -5254,6 +5275,8 @@
<string name="accessibility_summary_state_stopped">Not working. Tap for info.</string>
<!-- Accessibility service's description when enabled but not running (like maybe it crashed). -->
<string name="accessibility_description_state_stopped">This service is malfunctioning.</string>
+ <!-- Title for the accessibility shortcuts settings page. [CHAR LIMIT=50] -->
+ <string name="accessibility_shortcuts_settings_title">Accessibility shortcuts</string>
<!-- Title for the preference to show a tile for a particular feature in the Quick Settings pane. [CHAR LIMIT=NONE] -->
<string name="enable_quick_setting">Show in Quick Settings</string>
@@ -5274,17 +5297,40 @@
<!-- Summary shown for tritanomaly (blue-yellow color blindness) [CHAR LIMIT=45] -->
<string name="daltonizer_mode_tritanomaly_summary">Blue-yellow</string>
- <!-- TODO(b/170970602): remove translatable=false when RBC has official name and strings -->
- <!-- Title for the accessibility preference to configure Reduce Bright Colors feature. [CHAR LIMIT=NONE] -->
- <string name="reduce_bright_colors_preference_title" translatable="false">Reduce Bright Colors</string>
- <!-- Used in the accessibility service settings to control switching Reduce Bright Colors on/off. [CHAR LIMIT=NONE] -->
- <string name="reduce_bright_colors_switch_title" translatable="false">Use Reduce Bright Colors</string>
- <!-- Subtitle that describes Reduce Bright Colors. [CHAR LIMIT=NONE] -->
- <string name="reduce_bright_colors_preference_subtitle" translatable="false">Reduce Bright Colors reduces screen brightness.</string>
- <!-- Title for setting the brightness intensity of the display using Reduce Bright Colors. [CHAR LIMIT=NONE] -->
- <string name="reduce_bright_colors_intensity_preference_title" translatable="false">Intensity</string>
- <!-- Title for setting whether the Reduce Bright Colors activation state persists across reboots. [CHAR LIMIT=NONE] -->
- <string name="reduce_bright_colors_persist_preference_title" translatable="false">Keeps feature on after a restart</string>
+ <!-- Title for the accessibility preference and switch of the Reduce Brightness feature. [CHAR LIMIT=NONE] -->
+ <string name="reduce_bright_colors_preference_title">Reduce Brightness</string>
+ <!-- Summary for the accessibility preference to configure Reduce Brightness feature. [CHAR LIMIT=NONE] -->
+ <string name="reduce_bright_colors_preference_summary" product="default">Make screen darker than your phone\u2019s minimum brightness</string>
+ <!-- Summary for the accessibility preference to configure Reduce Brightness feature. [CHAR LIMIT=NONE] -->
+ <string name="reduce_bright_colors_preference_summary" product="tablet">Make screen darker than your tablet\u2019s minimum brightness</string>
+ <!-- Subtitle that describes Reduce Brightness. [CHAR LIMIT=NONE] -->
+ <string name="reduce_bright_colors_preference_subtitle" product="default">
+ <![CDATA[Make your screen darker so it\u2019s more comfortable to read.<br/><br/>
+ This can be helpful when:
+ <ol>
+ <li>\u00a0Your phone\u2019s default minimum brightness is still too bright</li>
+ <li>\u00a0You\u2019re using your phone in dark situations, like at night or in a dark room before bed</li>
+ </ol>
+ ]]>
+ </string>
+ <!-- Subtitle that describes Reduce Brightness. [CHAR LIMIT=NONE] -->
+ <string name="reduce_bright_colors_preference_subtitle" product="tablet">
+ <![CDATA[Make your screen darker so it\u2019s more comfortable to read.<br/><br/>
+ This can be helpful when:
+ <ol>
+ <li>\u00a0Your tablet\u2019s default minimum brightness is still too bright</li>
+ <li>\u00a0You\u2019re using your tablet in dark situations, like at night or in a dark room before bed</li>
+ </ol>
+ ]]>
+ </string>
+ <!-- Title for setting the brightness intensity of the display using Reduce Brightness. [CHAR LIMIT=NONE] -->
+ <string name="reduce_bright_colors_intensity_preference_title">Intensity</string>
+ <!-- Start label for setting the brightness intensity of the display using Reduce Brightness. [CHAR LIMIT=50] -->
+ <string name="reduce_bright_colors_intensity_preference_start_label">Slightly darker</string>
+ <!-- End label for setting the brightness intensity of the display using Reduce Brightness. [CHAR LIMIT=NONE] -->
+ <string name="reduce_bright_colors_intensity_preference_end_label">Darkest</string>
+ <!-- Title for setting whether the Reduce Brightness activation state persists across reboots. [CHAR LIMIT=NONE] -->
+ <string name="reduce_bright_colors_persist_preference_title">Keep on after device restarts</string>
<!-- Subtitle for the accessibility preference to configure feature that performs click action soon after mouse/trackpad pointer stops moving, in case delay before click is extremely short. Placeholder will be set to the number of milliseconds to which the delay amounts. [CHAR LIMIT=NONE] -->
<plurals name="accessibilty_autoclick_preference_subtitle_short_delay">
@@ -9974,6 +10020,10 @@
select what the USB connection for this device should be used for. This choice
is for transferring photos via PTP. -->
<string name="usb_use_photo_transfers">PTP</string>
+ <!-- Title of one of the choices in a dialog (with title defined in usb_use) that lets the user
+ select what the USB connection for this device should be used for. This choice
+ is for transcoding the files that are transferred via MTP. -->
+ <string name="usb_transcode_files">Transcode exported media</string>
<!-- Description of one of the choices in a dialog (with title defined in usb_use) that lets the user
select what the USB connection for this device should be used for. This choice
is for transferring photos via PTP. -->
@@ -10002,6 +10052,9 @@
<!-- The title used in USB Preferences which provides the user with the control over this
device's power role. -->
<string name="usb_power_title">Power options</string>
+ <!-- The title used in USB Preferences which lets the user control the options for the file
+ transfer mode. -->
+ <string name="usb_file_transfer_title">File transfer options</string>
<!-- Settings item title for USB preference [CHAR LIMIT=35] -->
<string name="usb_pref">USB</string>
@@ -12145,6 +12198,38 @@
<string name="post_dsds_reboot_notification_title_with_carrier"><xliff:g id="carrier_name" example="Google Fi">%1$s</xliff:g> is active</string>
<!-- The body text of post DSDS reboot notification. [CHAR LIMIT=NONE] -->
<string name="post_dsds_reboot_notification_text">Tap to update SIM settings</string>
+ <!-- Title on a push notification indicating that the user's device switched to a new mobile network. [CHAR LIMIT=NONE] -->
+ <string name="switch_to_removable_notification">Switched to <xliff:g id="carrier_name" example="Google Fi">%1$s</xliff:g></string>
+ <!-- Title on a push notification indicating that the user's device switched to a new mobile network. [CHAR LIMIT=NONE] -->
+ <string name="switch_to_removable_notification_no_carrier_name">Switched to another carrier</string>
+ <!-- Message in a push notification indicating that the user's phone has connected to a different mobile network. [CHAR LIMIT=NONE] -->
+ <string name="network_changed_notification_text">Your mobile network has changed</string>
+ <!-- Title on a push notification indicating that the user's device is capable of DSDS. [CHAR LIMIT=NONE] -->
+ <string name="dsds_notification_after_suw_title">Set up your other SIM</string>
+ <!-- Message in a push notification indicating that the user's device is capable of DSDS. [CHAR LIMIT=NONE] -->
+ <string name="dsds_notification_after_suw_text">Choose your active SIM or use 2 SIMs at once</string>
+
+ <!-- Strings for choose SIM activity -->
+ <!-- The title text of choose SIM activity. [CHAR LIMIT=NONE] -->
+ <string name="choose_sim_title">Choose a number to use</string>
+ <!-- The body text of choose SIM activity. [CHAR LIMIT=NONE] -->
+ <string name="choose_sim_text"><xliff:g id="number" example="2">%1$d</xliff:g> numbers are available on this device, but only one can be used at a time</string>
+ <!-- String indicating that we are activating the profile [CHAR LIMIT=NONE] -->
+ <string name="choose_sim_activating">Activating<xliff:g id="ellipsis" example="...">…</xliff:g></string>
+ <!-- String indicating that we failed to activate the selected profile [CHAR LIMIT=NONE] -->
+ <string name="choose_sim_could_not_activate">Couldn\u2019t be activated right now</string>
+ <!-- String indicating that the number for the specified profile is unknown [CHAR LIMIT=NONE] -->
+ <string name="choose_sim_item_summary_unknown">Unknown number</string>
+
+ <!-- Strings for switch SIM confirmation dialog. -->
+ <!-- The title text of switch SIM confirmation dialog. [CHAR LIMIT=NONE] -->
+ <string name="switch_sim_dialog_title">Use <xliff:g id="carrier_name" example="Google Fi">%1$s</xliff:g>?</string>
+ <!-- The body text of switch SIM confirmation dialog. [CHAR LIMIT=NONE] -->
+ <string name="switch_sim_dialog_text"><xliff:g id="carrier_name" example="Google Fi">%1$s</xliff:g> will be used for mobile data, calls, and SMS.</string>
+ <!-- The title text of skip sim switch dialog. [CHAR LIMIT=NONE] -->
+ <string name="switch_sim_dialog_no_switch_title">No active SIMs available</string>
+ <!-- The body text of skip sim switch dialog. [CHAR LIMIT=NONE] -->
+ <string name="switch_sim_dialog_no_switch_text">To use mobile data, call features, and SMS at a later time, go to your network settings</string>
<!-- Button label of the removable sim card. [CHAR LIMIT=NONE] -->
<string name="sim_card_label">SIM card</string>
@@ -12339,7 +12424,7 @@
<string name="backup_calling_settings_title">Backup calling</string>
<!-- Backup calling summary. [CHAR LIMIT=100] -->
- <string name="backup_calling_setting_summary">If <xliff:g id="backup_calling_operator_text" example="Google Fi">%1$s</xliff:g> is unavailable, use your mobile data SIM to make and receive <xliff:g id="backup_calling_carrier_text" example="Google Fi">%1$s</xliff:g> calls.</string>
+ <string name="backup_calling_setting_summary">If <xliff:g id="backup_calling_operator_text" example="Google Fi">%1$s</xliff:g> is unavailable or roaming, use your mobile data SIM for <xliff:g id="backup_calling_carrier_text" example="Google Fi">%1$s</xliff:g> calls.</string>
<!-- List of synonyms for the cross SIM calling titles, used to match in settings search [CHAR LIMIT=NONE] -->
<string name="keywords_backup_calling">backup calling</string>
@@ -12533,9 +12618,10 @@
<!-- Provider Model: Name for call settings category [CHAR LIMIT=NONE] -->
<string name="calls_and_sms_category">Wi\u2011Fi Calling</string>
<!-- Provider Model: Summary for calling preference -->
- <string name="calls_sms_wfc_summary">Make and receive calls over non\u2011carrier networks like Wi\u2011Fi</string>
+ <string name="calls_sms_wfc_summary">Make and receive calls over Wi\u2011Fi</string>
<!-- Provider Model: Label for footnote on calling preference -->
- <string name="calls_sms_footnote">Wi\u2011Fi calling allows you to make and receive calls over non\u2011carrier networks such as some Wi\u2011Fi networks.</string>
+ <string name="calls_sms_footnote">With Wi\u2011Fi calling, calls are made and received over non\u2011carrier Wi\u2011Fi networks.
+ <annotation id="url">Learn more</annotation></string>
<!-- Provider Model: Calls preference title -->
<string name="calls_preference_title">Calls</string>
<!-- Provider Model: SMS preference title -->
@@ -12543,11 +12629,13 @@
<!-- Provider Model: Preferred status in summary for Calls & SMS -->
<string name="calls_sms_preferred">preferred</string>
<!-- Provider Model: Calls Preferred status in summary for Calls & SMS -->
- <string name="calls_sms_calls_preferred">calls preferred</string>
+ <string name="calls_sms_calls_preferred">preferred for calls</string>
<!-- Provider Model: SMS Preferred status in summary for Calls & SMS -->
- <string name="calls_sms_sms_preferred">SMS preferred</string>
+ <string name="calls_sms_sms_preferred">preferred for SMS</string>
<!-- Provider Model: Unavailable status in summary for Calls & SMS -->
<string name="calls_sms_unavailable">unavailable</string>
+ <!-- Provider Model: Temporarily unavailable status in summary for Calls & SMS -->
+ <string name="calls_sms_temp_unavailable">Temporarily unavailable</string>
<!-- Provider Model: No SIM status in summary for Calls & SMS -->
<string name="calls_sms_no_sim">No SIM</string>
<!-- Network & internet preferences title [CHAR LIMIT=NONE] -->
@@ -12560,8 +12648,10 @@
<string name="view_airplane_safe_networks">View airplane mode networks</string>
<!-- Text of message for viewing the networks that are available in airplane mode. [CHAR LIMIT=60] -->
<string name="viewing_airplane_mode_networks">Viewing airplane mode networks</string>
- <!-- Label text to turn off airplane mode. [CHAR LIMIT=40] -->
- <string name="turn_off_airplane_mode">Turn off airplane mode</string>
+ <!-- Slice title text for turning on networks (e.g. Wi-Fi). [CHAR LIMIT=40] -->
+ <string name="turn_on_networks">Turn on networks</string>
+ <!-- Slice title text for turning off networks (e.g. Wi-Fi). [CHAR LIMIT=40] -->
+ <string name="turn_off_networks">Turn off networks</string>
<!-- Title for interrupting the voice call alert. [CHAR_LIMIT=NONE] -->
<string name="reset_your_internet_title">Reset your internet?</string>
<!-- Description for interrupting the voice call alert. [CHAR_LIMIT=NONE] -->
@@ -12578,6 +12668,8 @@
<string name="to_switch_networks_disconnect_ethernet">To switch networks, disconnect ethernet</string>
<!-- Summary for cannot switch networks to Wi-Fi nor mobile data networks while connected to an ethernet network. [CHAR LIMIT=60] -->
<string name="cannot_switch_networks_while_connected">Cannot switch networks while connected</string>
+ <!-- Title for airplane mode network panel. [CHAR LIMIT=60] -->
+ <string name="airplane_mode_network_panel_title">Airplane mode networks</string>
<!-- Summary text separator for preferences including a short description
(eg. "Connected / 5G"). [CHAR LIMIT=50] -->
@@ -12648,6 +12740,18 @@
<string name="graphics_driver_main_switch_title" translatable="false">Use graphics driver preferences</string>
<!-- Do not translate. Title for battery saver main switch preferences. [CHAR LIMIT=50] -->
<string name="battery_saver_main_switch_title" translatable="false">Use battery saver</string>
+ <!-- Do not translate. Title for Do Not Disturb main switch preferences. [CHAR LIMIT=50] -->
+ <string name="do_not_disturb_main_switch_title" translatable="false">Use Do Not Disturb</string>
+ <!-- Do not translate. Title for Dark theme main switch preferences. [CHAR LIMIT=50] -->
+ <string name="dark_theme_main_switch_title" translatable="false">Use Dark Theme</string>
+ <!-- Do not translate. Title for Night Light main switch preferences. [CHAR LIMIT=50] -->
+ <string name="night_light_main_switch_title" translatable="false">Use Night Light</string>
+ <!-- Do not translate. Title for NFC main switch preferences. [CHAR LIMIT=50] -->
+ <string name="nfc_main_switch_title" translatable="false">Use NFC</string>
+ <!-- Do not translate. Title for Adaptive Battery main switch preferences. [CHAR LIMIT=50] -->
+ <string name="adaptive_battery_main_switch_title" translatable="false">Use adaptive battery</string>
+ <!-- Do not translate. Title for adaptive brightness main switch preferences. [CHAR LIMIT=50] -->
+ <string name="adaptive_brightness_main_switch_title" translatable="false">Use adaptive brightness</string>
<!-- Default preference title for showing all apps on device [CHAR_LIMIT=50]-->
<string name="default_see_all_apps_title">See all apps</string>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index b54028e..993417a 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -789,12 +789,13 @@
<item name="android:fontFamily">@*android:string/config_headlineFontFamily</item>
</style>
- <style name="ContextualSuggestionText" parent="@android:style/TextAppearance.DeviceDefault">
- <item name="android:layout_width">match_parent</item>
- <item name="android:layout_height">wrap_content</item>
- <item name="android:textSize">36sp</item>
- <item name="android:textColor">?android:attr/textColorPrimary</item>
- <item name="android:fontFamily">@*android:string/config_headlineFontFamilyMedium</item>
+ <style name="ContextualSuggestionText"
+ parent="@android:style/TextAppearance.DeviceDefault.Widget.ActionBar.Title">
+ <item name="android:autoSizeTextType">uniform</item>
+ <item name="android:autoSizeMaxTextSize">@dimen/tool_bar_max_text_size</item>
+ <item name="android:autoSizeMinTextSize">@dimen/tool_bar_min_text_size</item>
+ <item name="android:maxLines">3</item>
+ <item name="android:gravity">bottom</item>
</style>
<style name="RequestManageCredentialsButtonPanel">
@@ -887,11 +888,11 @@
</style>
<style name="ToolbarText"
- parent="@android:style/TextAppearance.DeviceDefault.Widget.ActionBar.Title" >
- <item name="android:textSize">36sp</item>
+ parent="@android:style/TextAppearance.DeviceDefault.Widget.ActionBar.Title">
+ <item name="android:textSize">@dimen/tool_bar_max_text_size</item>
</style>
<style name="ToolbarText.MoreThanTwoLines">
- <item name="android:textSize">24sp</item>
+ <item name="android:textSize">@dimen/tool_bar_min_text_size</item>
</style>
</resources>
diff --git a/res/values/themes.xml b/res/values/themes.xml
index fc69246..bed02c8 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -221,8 +221,6 @@
<item name="colorPrimaryDark">@*android:color/primary_dark_device_default_settings_light</item>
<item name="android:windowLightStatusBar">true</item>
<item name="android:navigationBarDividerColor">@*android:color/ripple_material_light</item>
- <item name="android:navigationBarColor">@android:color/transparent</item>
- <item name="android:windowBackground">@android:color/white</item>
</style>
<style name="Theme.Settings.ContextualCard" parent="Theme.Settings.Home">
diff --git a/res/values/themes_suw.xml b/res/values/themes_suw.xml
index 959ffb3..b286a51 100644
--- a/res/values/themes_suw.xml
+++ b/res/values/themes_suw.xml
@@ -133,6 +133,14 @@
<item name="*android:lockPatternStyle">@style/LockPatternStyle.Setup</item>
</style>
+ <style name="GlifV3Theme.Light.NoActionBar" parent="GlifV3Theme.Light">
+ <item name="android:windowActionBar">false</item>
+ </style>
+
+ <style name="GlifV3Theme.NoActionBar" parent="GlifV3Theme">
+ <item name="android:windowActionBar">false</item>
+ </style>
+
<style name="GlifV2Theme.Transparent">
<item name="android:windowBackground">@android:color/transparent</item>
<item name="android:windowNoTitle">true</item>
@@ -216,6 +224,7 @@
<style name="GlifTheme.DayNight" parent="GlifTheme.Light" />
<style name="GlifV2Theme.DayNight" parent="GlifV2Theme.Light" />
<style name="GlifV3Theme.DayNight" parent="GlifV3Theme.Light" />
+ <style name="GlifV3Theme.DayNight.NoActionBar" parent="GlifV3Theme.Light.NoActionBar" />
<style name="GlifV2Theme.DayNight.Transparent" parent="GlifV2Theme.Light.Transparent" />
<style name="GlifV3Theme.DayNight.Transparent" parent="GlifV3Theme.Light.Transparent" />
<style name="SetupWizardTheme.DayNight.Transparent" parent="SetupWizardTheme.Light.Transparent" />
diff --git a/res/xml/accessibility_settings.xml b/res/xml/accessibility_settings.xml
index 36125b3..eff9e1d 100644
--- a/res/xml/accessibility_settings.xml
+++ b/res/xml/accessibility_settings.xml
@@ -29,15 +29,7 @@
<PreferenceCategory
android:key="screen_reader_category"
android:persistent="false"
- android:title="@string/screen_reader_category_title">
-
- <Preference
- android:fragment="com.android.settings.tts.TextToSpeechSettings"
- android:key="tts_settings_preference"
- android:persistent="false"
- android:title="@string/tts_settings_title"
- settings:controller="com.android.settings.language.TtsPreferenceController"/>
- </PreferenceCategory>
+ android:title="@string/screen_reader_category_title"/>
<PreferenceCategory
android:key="display_category"
@@ -129,6 +121,25 @@
</PreferenceCategory>
+ <!-- TODO(b/174829936): Add title for shortcuts settings category. -->
+ <PreferenceCategory android:persistent="false">
+
+ <Preference
+ android:fragment="com.android.settings.accessibility.ShortcutsSettingsFragment"
+ android:key="accessibility_shortcuts_preference_screen"
+ android:persistent="false"
+ android:title="@string/accessibility_shortcuts_settings_title"
+ settings:searchable="true"/>
+
+ <Preference
+ android:fragment="com.android.settings.tts.TextToSpeechSettings"
+ android:key="tts_settings_preference"
+ android:persistent="false"
+ android:title="@string/tts_settings_title"
+ settings:controller="com.android.settings.language.TtsPreferenceController"/>
+
+ </PreferenceCategory>
+
<PreferenceCategory
android:key="experimental_category"
android:persistent="false"
diff --git a/res/xml/accessibility_shortcuts_settings.xml b/res/xml/accessibility_shortcuts_settings.xml
new file mode 100644
index 0000000..35314e7
--- /dev/null
+++ b/res/xml/accessibility_shortcuts_settings.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2021 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<PreferenceScreen
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:settings="http://schemas.android.com/apk/res-auto"
+ android:key="accessibility_shortcuts_settings"
+ android:persistent="false"
+ android:title="@string/accessibility_shortcuts_settings_title">
+
+ <SwitchPreference
+ android:key="accessibility_shortcut_preference"
+ android:persistent="false"
+ android:title="@string/accessibility_shortcut_service_on_lock_screen_title"
+ android:summary="@string/accessibility_shortcut_description"
+ settings:controller="com.android.settings.accessibility.AccessibilityShortcutPreferenceController"/>
+</PreferenceScreen>
diff --git a/res/xml/accessibility_text_and_display.xml b/res/xml/accessibility_text_and_display.xml
index 7dce826..bd30e61 100644
--- a/res/xml/accessibility_text_and_display.xml
+++ b/res/xml/accessibility_text_and_display.xml
@@ -21,18 +21,33 @@
android:persistent="false"
android:title="@string/accessibility_text_and_display_title">
- <SwitchPreference
- android:key="toggle_high_text_contrast_preference"
+ <Preference
+ android:fragment="com.android.settings.display.ToggleFontSizePreferenceFragment"
+ android:key="font_size_preference_screen"
android:persistent="false"
- android:title="@string/accessibility_toggle_high_text_contrast_preference_title"
- settings:controller="com.android.settings.accessibility.HighTextContrastPreferenceController"/>
+ android:title="@string/title_font_size"
+ settings:controller="com.android.settings.display.FontSizePreferenceController"
+ settings:searchable="false"/>
+
+ <com.android.settings.display.ScreenZoomPreference
+ android:fragment="com.android.settings.display.ScreenZoomSettings"
+ android:key="accessibility_settings_screen_zoom"
+ android:persistent="false"
+ android:title="@string/screen_zoom_title"
+ settings:searchable="false"/>
<SwitchPreference
- android:key="dark_ui_mode_accessibility"
+ android:key="toggle_force_bold_text"
android:persistent="false"
- android:title="@string/dark_ui_mode"
- settings:controller="com.android.settings.display.DarkUIPreferenceController"
- settings:searchable="false"/>
+ android:title="@string/force_bold_text"
+ settings:controller="com.android.settings.accessibility.FontWeightAdjustmentPreferenceController"/>
+
+ <Preference
+ android:fragment="com.android.settings.accessibility.TurnScreenDarkerFragment"
+ android:key="turn_screen_darker_preference_screen"
+ android:persistent="false"
+ android:title="@string/accessibility_turn_screen_darker_title"
+ settings:searchable="true"/>
<Preference
android:fragment="com.android.settings.accessibility.ToggleDaltonizerPreferenceFragment"
@@ -42,21 +57,11 @@
android:title="@string/accessibility_display_daltonizer_preference_title"
settings:controller="com.android.settings.accessibility.DaltonizerPreferenceController"/>
- <Preference
- android:fragment="com.android.settings.accessibility.ToggleColorInversionPreferenceFragment"
- android:icon="@drawable/ic_color_inversion"
- android:key="toggle_inversion_preference"
+ <SwitchPreference
+ android:key="toggle_high_text_contrast_preference"
android:persistent="false"
- android:title="@string/accessibility_display_inversion_preference_title"
- settings:controller="com.android.settings.accessibility.ColorInversionPreferenceController"/>
-
- <!--TODO(b/170973645): Get icon-->
- <Preference
- android:fragment="com.android.settings.accessibility.ToggleReduceBrightColorsPreferenceFragment"
- android:key="reduce_bright_colors_preference"
- android:persistent="false"
- android:title="@string/reduce_bright_colors_preference_title"
- settings:controller="com.android.settings.accessibility.ReduceBrightColorsPreferenceController"/>
+ android:title="@string/accessibility_toggle_high_text_contrast_preference_title"
+ settings:controller="com.android.settings.accessibility.HighTextContrastPreferenceController"/>
<SwitchPreference
android:key="toggle_disable_animations"
@@ -64,27 +69,6 @@
android:title="@string/accessibility_disable_animations"
settings:controller="com.android.settings.accessibility.DisableAnimationsPreferenceController"/>
- <com.android.settings.display.ScreenZoomPreference
- android:fragment="com.android.settings.display.ScreenZoomSettings"
- android:key="accessibility_settings_screen_zoom"
- android:persistent="false"
- android:title="@string/screen_zoom_title"
- settings:searchable="false"/>
-
- <Preference
- android:fragment="com.android.settings.display.ToggleFontSizePreferenceFragment"
- android:key="font_size_preference_screen"
- android:persistent="false"
- android:title="@string/title_font_size"
- settings:controller="com.android.settings.display.FontSizePreferenceController"
- settings:searchable="false"/>
-
- <SwitchPreference
- android:key="toggle_force_bold_text"
- android:persistent="false"
- android:title="@string/force_bold_text"
- settings:controller="com.android.settings.accessibility.FontWeightAdjustmentPreferenceController"/>
-
<SwitchPreference
android:key="toggle_large_pointer_icon"
android:persistent="false"
@@ -94,7 +78,6 @@
<PreferenceCategory
android:key="experimental_category"
android:persistent="false"
- android:title="@string/experimental_category_title"
- settings:initialExpandedChildrenCount="1">
+ android:title="@string/experimental_category_title">
</PreferenceCategory>
</PreferenceScreen>
\ No newline at end of file
diff --git a/res/xml/accessibility_turn_screen_darker.xml b/res/xml/accessibility_turn_screen_darker.xml
new file mode 100644
index 0000000..d87f23b
--- /dev/null
+++ b/res/xml/accessibility_turn_screen_darker.xml
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2021 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<PreferenceScreen
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:settings="http://schemas.android.com/apk/res-auto"
+ android:key="accessibility_turn_screen_darker"
+ android:persistent="false"
+ android:title="@string/accessibility_turn_screen_darker_title">
+
+ <SwitchPreference
+ android:key="dark_ui_mode_accessibility"
+ android:persistent="false"
+ android:title="@string/dark_ui_mode"
+ settings:controller="com.android.settings.display.DarkUIPreferenceController"
+ settings:searchable="false"/>
+
+ <Preference
+ android:fragment="com.android.settings.accessibility.ToggleColorInversionPreferenceFragment"
+ android:icon="@drawable/ic_color_inversion"
+ android:key="toggle_inversion_preference"
+ android:persistent="false"
+ android:title="@string/accessibility_display_inversion_preference_title"
+ settings:controller="com.android.settings.accessibility.ColorInversionPreferenceController"/>
+
+ <!--TODO(b/170973645): Get icon-->
+ <Preference
+ android:fragment="com.android.settings.accessibility.ToggleReduceBrightColorsPreferenceFragment"
+ android:key="reduce_bright_colors_preference"
+ android:persistent="false"
+ android:title="@string/reduce_bright_colors_preference_title"
+ settings:controller="com.android.settings.accessibility.ReduceBrightColorsPreferenceController"/>
+
+ <Preference
+ android:key="auto_brightness_entry"
+ android:title="@string/auto_brightness_title"
+ android:summary="@string/summary_placeholder"
+ android:fragment="com.android.settings.display.AutoBrightnessSettings"
+ settings:controller="com.android.settings.display.AutoBrightnessPreferenceController"/>
+
+ <com.android.settings.widget.PrimarySwitchPreference
+ android:key="night_display"
+ android:title="@string/night_display_title"
+ android:fragment="com.android.settings.display.NightDisplaySettings"
+ settings:controller="com.android.settings.display.NightDisplayPreferenceController"
+ settings:keywords="@string/keywords_display_night_display"/>
+
+ <PreferenceCategory
+ android:key="experimental_category"
+ android:persistent="false"
+ android:title="@string/experimental_category_title">
+ </PreferenceCategory>
+</PreferenceScreen>
\ No newline at end of file
diff --git a/res/xml/app_info_settings_v2.xml b/res/xml/app_info_settings_v2.xml
new file mode 100644
index 0000000..805df59
--- /dev/null
+++ b/res/xml/app_info_settings_v2.xml
@@ -0,0 +1,191 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2021 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<PreferenceScreen
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:settings="http://schemas.android.com/apk/res-auto"
+ android:key="installed_app_detail_settings_screen">
+
+ <com.android.settingslib.widget.LayoutPreference
+ android:key="header_view"
+ android:layout="@layout/settings_entity_header"
+ android:selectable="false"
+ android:order="-10000"
+ settings:allowDividerBelow="true"/>
+
+ <com.android.settingslib.widget.LayoutPreference
+ android:key="instant_app_buttons"
+ android:layout="@layout/instant_app_buttons"
+ android:selectable="false"
+ android:order="-9999"
+ settings:allowDividerAbove="true"
+ settings:allowDividerBelow="true"/>
+
+ <com.android.settingslib.widget.ActionButtonsPreference
+ android:key="action_buttons"
+ android:order="-9998" />
+
+ <!-- Add SpacePreference to draw divider -->
+ <com.android.settings.applications.SpacePreference
+ android:layout_height="0dp"
+ android:order="-9997"
+ settings:allowDividerAbove="true" />
+
+ <Preference
+ android:key="app_settings_link"
+ android:title="@string/app_settings_link"
+ settings:controller="com.android.settings.applications.appinfo.AppSettingPreferenceController" />
+
+ <Preference
+ android:key="notification_settings"
+ android:title="@string/notifications_label"
+ settings:controller="com.android.settings.applications.appinfo.AppNotificationPreferenceController" />
+
+ <com.android.settings.widget.FixedLineSummaryPreference
+ android:key="permission_settings"
+ android:title="@string/permissions_label"
+ android:summary="@string/summary_placeholder"
+ settings:summaryLineCount="1"
+ settings:controller="com.android.settings.applications.appinfo.AppPermissionPreferenceController" />
+
+ <Preference
+ android:key="storage_settings"
+ android:title="@string/storage_settings_for_app"
+ android:summary="@string/summary_placeholder"
+ settings:controller="com.android.settings.applications.appinfo.AppStoragePreferenceController" />
+
+ <com.android.settings.applications.AppDomainsPreference
+ android:key="instant_app_launch_supported_domain_urls"
+ android:title="@string/app_launch_supported_domain_urls_title"
+ android:selectable="true"
+ settings:controller="com.android.settings.applications.appinfo.InstantAppDomainsPreferenceController" />
+
+ <Preference
+ android:key="data_settings"
+ android:title="@string/data_usage_app_summary_title"
+ android:summary="@string/summary_placeholder"
+ settings:controller="com.android.settings.applications.appinfo.AppDataUsagePreferenceController" />
+
+ <Preference
+ android:key="time_spent_in_app"
+ android:title="@string/time_spent_in_app_pref_title"
+ settings:controller="com.android.settings.applications.appinfo.TimeSpentInAppPreferenceController" />
+
+ <Preference
+ android:key="battery"
+ android:title="@string/power_usage_summary_title"
+ android:summary="@string/summary_placeholder" />
+
+ <Preference
+ android:key="preferred_settings"
+ android:title="@string/launch_by_default"
+ android:summary="@string/summary_placeholder"
+ android:selectable="true"
+ settings:controller="com.android.settings.applications.appinfo.AppOpenByDefaultPreferenceController" />
+
+ <Preference
+ android:key="memory"
+ android:title="@string/memory_settings_title"
+ android:summary="@string/summary_placeholder"
+ android:enabled="false" />
+
+ <!-- Default apps shortcuts -->
+ <Preference
+ android:key="default_home"
+ android:title="@string/home_app"
+ android:summary="@string/summary_placeholder" />
+
+ <Preference
+ android:key="default_browser"
+ android:title="@string/default_browser_title"
+ android:summary="@string/summary_placeholder" />
+
+ <Preference
+ android:key="default_phone_app"
+ android:title="@string/default_phone_title"
+ android:summary="@string/default_phone_title" />
+
+ <Preference
+ android:key="default_emergency_app"
+ android:title="@string/default_emergency_app"
+ android:summary="@string/summary_placeholder" />
+
+ <Preference
+ android:key="default_sms_app"
+ android:title="@string/sms_application_title"
+ android:summary="@string/summary_placeholder" />
+
+ <!-- Advanced apps settings -->
+ <PreferenceCategory
+ android:key="advanced_app_info"
+ android:title="@string/advanced_apps"
+ settings:controller="com.android.settings.applications.appinfo.AdvancedAppInfoPreferenceCategoryController">
+
+ <Preference
+ android:key="system_alert_window"
+ android:title="@string/draw_overlay"
+ android:summary="@string/summary_placeholder"
+ settings:controller="com.android.settings.applications.appinfo.DrawOverlayDetailPreferenceController" />
+
+ <Preference
+ android:key="write_settings_apps"
+ android:title="@string/write_settings"
+ android:summary="@string/summary_placeholder"
+ settings:controller="com.android.settings.applications.appinfo.WriteSystemSettingsPreferenceController" />
+
+ <Preference
+ android:key="picture_in_picture"
+ android:title="@string/picture_in_picture_app_detail_title"
+ android:summary="@string/summary_placeholder"
+ settings:controller="com.android.settings.applications.specialaccess.pictureinpicture.PictureInPictureDetailPreferenceController" />
+
+ <Preference
+ android:key="install_other_apps"
+ android:title="@string/install_other_apps"
+ android:summary="@string/summary_placeholder"
+ settings:controller="com.android.settings.applications.appinfo.ExternalSourceDetailPreferenceController" />
+
+ <Preference
+ android:key="interact_across_profiles"
+ android:title="@string/interact_across_profiles_title"
+ android:summary="@string/summary_placeholder"
+ settings:controller="com.android.settings.applications.specialaccess.interactacrossprofiles.InteractAcrossProfilesDetailsPreferenceController" />
+
+ </PreferenceCategory>
+
+ <!-- App installer info -->
+ <PreferenceCategory
+ android:key="app_installer"
+ android:title="@string/app_install_details_group_title"
+ settings:controller="com.android.settings.applications.appinfo.AppInstallerPreferenceCategoryController">
+
+ <Preference
+ android:key="app_info_store"
+ android:title="@string/app_install_details_title"
+ settings:controller="com.android.settings.applications.appinfo.AppInstallerInfoPreferenceController" />
+
+ </PreferenceCategory>
+
+ <Preference
+ android:key="app_version"
+ android:selectable="false"
+ android:order="9999"
+ settings:controller="com.android.settings.applications.appinfo.AppVersionPreferenceController"
+ settings:allowDividerAbove="true"
+ settings:enableCopying="true"/>
+
+</PreferenceScreen>
diff --git a/res/xml/app_ops_permissions_details.xml b/res/xml/app_ops_permissions_details.xml
index cbf3e12..eb8188b 100644
--- a/res/xml/app_ops_permissions_details.xml
+++ b/res/xml/app_ops_permissions_details.xml
@@ -20,7 +20,7 @@
<com.android.settings.widget.FilterTouchesSwitchPreference
android:key="app_ops_settings_switch" />
- <Preference
+ <com.android.settingslib.widget.FooterPreference
android:key="app_ops_settings_description"
android:selectable="false" />
diff --git a/res/xml/app_storage_settings.xml b/res/xml/app_storage_settings.xml
index 376f09e..6092dbb 100644
--- a/res/xml/app_storage_settings.xml
+++ b/res/xml/app_storage_settings.xml
@@ -42,7 +42,7 @@
<PreferenceCategory
android:key="storage_category"
android:title="@string/app_info_storage_title"
- settings:allowDividerBelow="false">
+ settings:allowDividerAbove="true">
<Preference
android:key="app_size"
diff --git a/res/xml/auto_brightness_detail.xml b/res/xml/auto_brightness_detail.xml
index 6b304ef..ebcf174 100644
--- a/res/xml/auto_brightness_detail.xml
+++ b/res/xml/auto_brightness_detail.xml
@@ -20,6 +20,12 @@
xmlns:settings="http://schemas.android.com/apk/res-auto"
android:title="@string/auto_brightness_title">
+ <com.android.settingslib.widget.MainSwitchPreference
+ android:key="auto_brightness"
+ android:title="@string/adaptive_brightness_main_switch_title"
+ settings:keywords="@string/keywords_display_auto_brightness"
+ settings:controller="com.android.settings.display.AutoBrightnessDetailPreferenceController"/>
+
<com.android.settings.widget.VideoPreference
android:key="auto_brightness_video"
android:title="@string/summary_placeholder"
@@ -27,17 +33,6 @@
settings:preview="@drawable/aab_brightness"
settings:controller="com.android.settings.widget.VideoPreferenceController"/>
- <!-- Cross-listed item, if you change this, also change it in power_usage_summary.xml -->
- <com.android.settingslib.RestrictedSwitchPreference
- android:key="auto_brightness"
- android:title="@string/auto_brightness_title"
- android:summary="@string/auto_brightness_summary"
- settings:keywords="@string/keywords_display_auto_brightness"
- settings:controller="com.android.settings.display.AutoBrightnessDetailPreferenceController"
- settings:useAdminDisabledSummary="true"
- settings:userRestriction="no_config_brightness"
- settings:allowDividerAbove="true" />
-
<com.android.settingslib.widget.FooterPreference
android:key="auto_brightness_footer"
android:title="@string/auto_brightness_description"
diff --git a/res/xml/auto_rotate_settings.xml b/res/xml/auto_rotate_settings.xml
new file mode 100644
index 0000000..dfa31f7
--- /dev/null
+++ b/res/xml/auto_rotate_settings.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2021 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
+<PreferenceScreen
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:settings="http://schemas.android.com/apk/res-auto"
+ android:title="@string/accelerometer_title" >
+
+ <SwitchPreference
+ android:key="face_based_rotate"
+ android:title="@string/auto_rotate_switch_face_based"
+ settings:controller="com.android.settings.display.SmartAutoRotateController" />
+
+ <com.android.settingslib.widget.FooterPreference
+ android:icon="@drawable/ic_privacy_shield_24dp"
+ android:selectable="false"
+ settings:searchable="false" />
+
+</PreferenceScreen>
diff --git a/res/xml/automatic_storage_management_settings.xml b/res/xml/automatic_storage_management_settings.xml
index 1428741..0c9e9b5 100644
--- a/res/xml/automatic_storage_management_settings.xml
+++ b/res/xml/automatic_storage_management_settings.xml
@@ -23,13 +23,12 @@
android:summary="%s"
android:title="@string/automatic_storage_manager_days_title"
android:entries="@array/automatic_storage_management_days"
- android:entryValues="@array/automatic_storage_management_days_values"
- settings:allowDividerBelow="true" />
+ android:entryValues="@array/automatic_storage_management_days_values" />
- <Preference
+ <com.android.settingslib.widget.FooterPreference
android:key="freed_bytes"
android:persistent="false"
android:selectable="false"
- settings:allowDividerAbove="true" />
+ settings:searchable="false"/>
</PreferenceScreen>
\ No newline at end of file
diff --git a/res/xml/change_wifi_state_details.xml b/res/xml/change_wifi_state_details.xml
index e3b6755..e0aa6df 100644
--- a/res/xml/change_wifi_state_details.xml
+++ b/res/xml/change_wifi_state_details.xml
@@ -22,9 +22,9 @@
android:key="app_ops_settings_switch"
android:title="@string/change_wifi_state_app_detail_switch"/>
- <Preference
+ <com.android.settingslib.widget.FooterPreference
android:key="app_ops_settings_preference"
- android:summary="@string/change_wifi_state_app_detail_summary"
+ android:title="@string/change_wifi_state_app_detail_summary"
android:selectable="false"/>
</PreferenceScreen>
diff --git a/res/xml/configure_notification_settings.xml b/res/xml/configure_notification_settings.xml
index 95c7f56..c7925fb 100644
--- a/res/xml/configure_notification_settings.xml
+++ b/res/xml/configure_notification_settings.xml
@@ -115,12 +115,6 @@
android:title="@string/snooze_options_title"
settings:controller="com.android.settings.notification.SnoozeNotificationPreferenceController" />
- <SwitchPreference
- android:key="asst_capabilities_actions_replies"
- android:title="@string/asst_capabilities_actions_replies_title"
- android:summary="@string/asst_capabilities_actions_replies_summary"
- settings:controller="com.android.settings.notification.AssistantCapabilityPreferenceController" />
-
<!-- Notification badging -->
<SwitchPreference
android:key="notification_badging"
diff --git a/res/xml/configure_notification_settings_v2.xml b/res/xml/configure_notification_settings_v2.xml
index 9498d28..562e193 100644
--- a/res/xml/configure_notification_settings_v2.xml
+++ b/res/xml/configure_notification_settings_v2.xml
@@ -134,12 +134,6 @@
android:title="@string/snooze_options_title"
settings:controller="com.android.settings.notification.SnoozeNotificationPreferenceController" />
- <SwitchPreference
- android:key="asst_capabilities_actions_replies"
- android:title="@string/asst_capabilities_actions_replies_title"
- android:summary="@string/asst_capabilities_actions_replies_summary"
- settings:controller="com.android.settings.notification.AssistantCapabilityPreferenceController" />
-
<!-- Notification badging -->
<SwitchPreference
android:key="notification_badging"
diff --git a/res/xml/credential_management_app_fragment.xml b/res/xml/credential_management_app_fragment.xml
index 9392414..41007a2 100644
--- a/res/xml/credential_management_app_fragment.xml
+++ b/res/xml/credential_management_app_fragment.xml
@@ -25,14 +25,18 @@
android:layout="@layout/settings_entity_header"
android:selectable="false"
android:order="-10000"
- settings:allowDividerBelow="true"
settings:controller="com.android.settings.security.CredentialManagementAppHeaderController"/>
+ <com.android.settingslib.widget.TopIntroPreference
+ android:key="top_intro_request_manage_credentials"
+ android:order="-9999"
+ android:title="@string/request_manage_credentials_description"/>
+
<!-- Buttons -->
<com.android.settingslib.widget.ActionButtonsPreference
android:key="buttons"
android:selectable="true"
- android:order="-9999"
+ android:order="-9998"
settings:allowDividerAbove="true"
settings:allowDividerBelow="true"
settings:controller="com.android.settings.security.CredentialManagementAppButtonsController"/>
@@ -42,6 +46,7 @@
android:key="authentication_policy"
android:layout="@layout/preference_category_no_label"
android:title="@string/summary_placeholder"
+ settings:allowDividerAbove="true"
settings:controller="com.android.settings.security.CredentialManagementAppPolicyController"/>
</PreferenceScreen>
diff --git a/res/xml/dark_mode_settings.xml b/res/xml/dark_mode_settings.xml
index 19279e0..5ac9e26 100644
--- a/res/xml/dark_mode_settings.xml
+++ b/res/xml/dark_mode_settings.xml
@@ -20,6 +20,11 @@
android:title="@string/dark_ui_mode"
settings:keywords="@string/keywords_dark_ui_mode">
+ <com.android.settingslib.widget.MainSwitchPreference
+ android:key="dark_ui_activated"
+ android:title="@string/dark_theme_main_switch_title"
+ settings:controller="com.android.settings.display.darkmode.DarkModeActivationPreferenceController"/>
+
<com.android.settingslib.widget.BannerMessagePreference
android:key="dark_ui_location_off"
android:title="@string/twilight_mode_location_off_dialog_message"
@@ -50,12 +55,4 @@
android:title="@string/night_display_end_time_title"
settings:searchable="false"/>
- <com.android.settingslib.widget.LayoutPreference
- android:key="dark_ui_activated"
- android:title="@string/dark_ui_title"
- android:selectable="false"
- android:layout="@layout/dark_ui_activation_button"
- settings:allowDividerBelow="true"
- settings:controller="com.android.settings.display.darkmode.DarkModeActivationPreferenceController"/>
-
</PreferenceScreen>
diff --git a/res/xml/development_settings.xml b/res/xml/development_settings.xml
index faf1cfd..398fa4d 100644
--- a/res/xml/development_settings.xml
+++ b/res/xml/development_settings.xml
@@ -593,16 +593,6 @@
android:summary="@string/show_notification_channel_warnings_summary" />
<SwitchPreference
- android:key="asst_capability_prioritizer"
- android:title="@string/asst_capability_prioritizer_title"
- settings:controller="com.android.settings.notification.AssistantCapabilityPreferenceController" />
-
- <SwitchPreference
- android:key="asst_capability_ranking"
- android:title="@string/asst_capability_ranking_title"
- settings:controller="com.android.settings.notification.AssistantCapabilityPreferenceController" />
-
- <SwitchPreference
android:key="asst_feedback_indicator"
android:title="@string/asst_feedback_indicator_title"
settings:controller="com.android.settings.notification.AssistantFeedbackPreferenceController" />
diff --git a/res/xml/draw_overlay_permissions_details.xml b/res/xml/draw_overlay_permissions_details.xml
index d3397a7..603d540 100644
--- a/res/xml/draw_overlay_permissions_details.xml
+++ b/res/xml/draw_overlay_permissions_details.xml
@@ -22,8 +22,8 @@
android:key="app_ops_settings_switch"
android:title="@string/permit_draw_overlay"/>
- <Preference
- android:summary="@string/allow_overlay_description"
+ <com.android.settingslib.widget.FooterPreference
+ android:title="@string/allow_overlay_description"
android:selectable="false"/>
</PreferenceScreen>
diff --git a/res/xml/external_sources_details.xml b/res/xml/external_sources_details.xml
index 57d5587..7b67871 100644
--- a/res/xml/external_sources_details.xml
+++ b/res/xml/external_sources_details.xml
@@ -21,9 +21,9 @@
android:key="external_sources_settings_switch"
android:title="@string/external_source_switch_title" />
- <Preference
+ <com.android.settingslib.widget.FooterPreference
android:key="external_sources_settings_description"
- android:summary="@string/install_all_warning"
+ android:title="@string/install_all_warning"
android:selectable="false" />
</PreferenceScreen>
diff --git a/res/xml/items_multiple_carrier.xml b/res/xml/items_multiple_carrier.xml
new file mode 100644
index 0000000..b65e0cb
--- /dev/null
+++ b/res/xml/items_multiple_carrier.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2021 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<ItemGroup xmlns:android="http://schemas.android.com/apk/res/android" />
diff --git a/res/xml/network_provider_calls_sms.xml b/res/xml/network_provider_calls_sms.xml
index a677d1b..0b390b5 100644
--- a/res/xml/network_provider_calls_sms.xml
+++ b/res/xml/network_provider_calls_sms.xml
@@ -56,6 +56,7 @@
android:key="provider_model_calls_sms_footer"
android:title="@string/calls_sms_footnote"
android:selectable="false"
+ settings:allowDividerAbove="true"
settings:searchable="false"
- />
+ settings:controller="com.android.settings.network.telephony.NetworkProviderWfcFooterPreferenceController"/>
</PreferenceScreen>
diff --git a/res/xml/nfc_and_payment_settings.xml b/res/xml/nfc_and_payment_settings.xml
index 8ff4983..09ce277 100644
--- a/res/xml/nfc_and_payment_settings.xml
+++ b/res/xml/nfc_and_payment_settings.xml
@@ -19,6 +19,11 @@
xmlns:settings="http://schemas.android.com/apk/res-auto"
android:title="@string/nfc_quick_toggle_title">
+ <com.android.settingslib.widget.MainSwitchPreference
+ android:key="toggle_nfc"
+ android:title="@string/nfc_main_switch_title"
+ settings:controller="com.android.settings.nfc.NfcPreferenceController"/>
+
<com.android.settingslib.widget.LayoutPreference
android:key="nfc_detection_point"
android:selectable="false"
@@ -26,12 +31,6 @@
settings:controller="com.android.settings.nfc.NfcDetectionPointController"/>
<SwitchPreference
- android:key="toggle_nfc"
- android:title="@string/nfc_quick_toggle_title"
- android:summary="@string/nfc_quick_toggle_summary"
- settings:controller="com.android.settings.nfc.NfcPreferenceController"/>
-
- <SwitchPreference
android:key="nfc_secure_settings"
android:title="@string/nfc_secure_settings_title"
settings:controller="com.android.settings.nfc.SecureNfcPreferenceController"
diff --git a/res/xml/night_display_settings.xml b/res/xml/night_display_settings.xml
index 97f5dd2..23afccf 100644
--- a/res/xml/night_display_settings.xml
+++ b/res/xml/night_display_settings.xml
@@ -20,6 +20,11 @@
android:title="@string/night_display_title"
settings:keywords="@string/keywords_display_night_display">
+ <com.android.settingslib.widget.MainSwitchPreference
+ android:key="night_display_activated"
+ android:title="@string/night_light_main_switch_title"
+ settings:controller="com.android.settings.display.NightDisplayActivationPreferenceController"/>
+
<com.android.settingslib.widget.BannerMessagePreference
android:key="dark_ui_location_off"
android:title="@string/twilight_mode_location_off_dialog_message"
@@ -54,13 +59,4 @@
settings:controller="com.android.settings.display.NightDisplayIntensityPreferenceController"
settings:unavailableSliceSubtitle="@string/night_display_not_currently_on"/>
- <com.android.settingslib.widget.LayoutPreference
- android:key="night_display_activated"
- android:title="@string/night_display_title"
- android:selectable="false"
- android:layout="@layout/night_display_activation_button"
- settings:allowDividerBelow="true"
- settings:keywords="@string/keywords_display_night_display"
- settings:controller="com.android.settings.display.NightDisplayActivationPreferenceController"/>
-
</PreferenceScreen>
diff --git a/res/xml/picture_in_picture_permissions_details.xml b/res/xml/picture_in_picture_permissions_details.xml
index 5f2a45a..ba23e2a 100644
--- a/res/xml/picture_in_picture_permissions_details.xml
+++ b/res/xml/picture_in_picture_permissions_details.xml
@@ -22,8 +22,8 @@
android:key="app_ops_settings_switch"
android:title="@string/picture_in_picture_app_detail_switch"/>
- <Preference
- android:summary="@string/picture_in_picture_app_detail_summary"
+ <com.android.settingslib.widget.FooterPreference
+ android:title="@string/picture_in_picture_app_detail_summary"
android:selectable="false"/>
</PreferenceScreen>
diff --git a/res/xml/power_usage_detail.xml b/res/xml/power_usage_detail.xml
index 945ceed..95c1038 100644
--- a/res/xml/power_usage_detail.xml
+++ b/res/xml/power_usage_detail.xml
@@ -31,7 +31,8 @@
android:order="-9999"/>
<PreferenceCategory
- android:title="@string/battery_detail_manage_title">
+ android:title="@string/battery_detail_manage_title"
+ settings:allowDividerAbove="true">
<com.android.settingslib.RestrictedPreference
android:key="background_activity"
diff --git a/res/xml/power_usage_summary.xml b/res/xml/power_usage_summary.xml
index a9819fd..f683f3c 100644
--- a/res/xml/power_usage_summary.xml
+++ b/res/xml/power_usage_summary.xml
@@ -32,7 +32,6 @@
android:fragment="com.android.settings.fuelgauge.PowerUsageAdvanced"
android:key="battery_usage_summary"
android:title="@string/advanced_battery_preference_title"
- android:icon="@drawable/ic_chevron_right_24dp"
settings:searchable="false" />
<com.android.settings.widget.CardPreference
@@ -40,7 +39,7 @@
android:title="@string/summary_placeholder"
settings:controller="com.android.settings.fuelgauge.batterytip.BatteryTipPreferenceController" />
- <Preference
+ <com.android.settings.widget.PrimarySwitchPreference
android:fragment="com.android.settings.fuelgauge.batterysaver.BatterySaverSettings"
android:key="battery_saver_summary"
android:title="@string/battery_saver"
diff --git a/res/xml/smart_battery_detail.xml b/res/xml/smart_battery_detail.xml
index 87eeb86..2d36119 100644
--- a/res/xml/smart_battery_detail.xml
+++ b/res/xml/smart_battery_detail.xml
@@ -22,6 +22,11 @@
android:title="@string/smart_battery_manager_title"
settings:searchable="false">
+ <com.android.settingslib.widget.MainSwitchPreference
+ android:key="smart_battery"
+ android:title="@string/adaptive_battery_main_switch_title"
+ settings:controller="com.android.settings.fuelgauge.SmartBatteryPreferenceController"/>
+
<com.android.settings.widget.VideoPreference
android:key="auto_awesome_battery"
android:title="@string/summary_placeholder"
@@ -30,13 +35,6 @@
settings:controller="com.android.settings.widget.VideoPreferenceController"/>
<SwitchPreference
- android:key="smart_battery"
- android:title="@string/smart_battery_title"
- android:summary="@string/smart_battery_summary"
- settings:controller="com.android.settings.fuelgauge.SmartBatteryPreferenceController"
- settings:allowDividerAbove="true"/>
-
- <SwitchPreference
android:key="auto_restriction"
android:title="@string/battery_auto_restriction_title"
android:summary="@string/battery_auto_restriction_summary"
@@ -51,4 +49,4 @@
android:title="@string/smart_battery_footer"
android:selectable="false"
settings:searchable="false"/>
-</PreferenceScreen>
\ No newline at end of file
+</PreferenceScreen>
diff --git a/res/xml/system_dashboard_fragment_v2.xml b/res/xml/system_dashboard_fragment_v2.xml
new file mode 100644
index 0000000..57174e9
--- /dev/null
+++ b/res/xml/system_dashboard_fragment_v2.xml
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2021 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<PreferenceScreen
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:settings="http://schemas.android.com/apk/res-auto"
+ android:key="system_dashboard_screen"
+ android:title="@string/header_category_system">
+
+ <Preference
+ android:key="language_input_settings"
+ android:title="@string/language_settings"
+ android:icon="@drawable/ic_settings_language"
+ android:order="-260"
+ android:fragment="com.android.settings.language.LanguageAndInputSettings"/>
+
+ <Preference
+ android:key="gesture_settings"
+ android:title="@string/gesture_preference_title"
+ android:icon="@drawable/ic_settings_gestures"
+ android:order="-250"
+ android:fragment="com.android.settings.gestures.GestureSettings"
+ settings:controller="com.android.settings.gestures.GesturesSettingPreferenceController"/>
+
+ <Preference
+ android:key="date_time_settings"
+ android:title="@string/date_and_time"
+ android:icon="@drawable/ic_settings_date_time"
+ android:order="-240"
+ android:fragment="com.android.settings.datetime.DateTimeSettings"
+ settings:controller="com.android.settings.datetime.DateTimePreferenceController"/>
+
+ <!-- System updates -->
+ <Preference
+ android:key="system_update_settings"
+ android:title="@string/system_update_settings_list_item_title"
+ android:summary="@string/summary_placeholder"
+ android:icon="@drawable/ic_system_update"
+ android:order="-58"
+ settings:keywords="@string/keywords_system_update_settings"
+ settings:controller="com.android.settings.system.SystemUpdatePreferenceController">
+ <intent android:action="android.settings.SYSTEM_UPDATE_SETTINGS"/>
+ </Preference>
+
+ <Preference
+ android:key="additional_system_update_settings"
+ android:title="@string/additional_system_update_settings_list_item_title"
+ android:order="-59"
+ settings:controller="com.android.settings.system.AdditionalSystemUpdatePreferenceController">
+ <intent android:action="android.intent.action.MAIN"
+ android:targetPackage="@string/additional_system_update"
+ android:targetClass="@string/additional_system_update_menu"/>
+ </Preference>
+
+ <Preference
+ android:key="reset_dashboard"
+ android:title="@string/reset_dashboard_title"
+ android:icon="@drawable/ic_restore"
+ android:order="-30"
+ android:fragment="com.android.settings.system.ResetDashboardFragment"
+ settings:controller="com.android.settings.system.ResetPreferenceController"/>
+</PreferenceScreen>
\ No newline at end of file
diff --git a/res/xml/usb_details_fragment.xml b/res/xml/usb_details_fragment.xml
index 62ccf08..96a449b 100644
--- a/res/xml/usb_details_fragment.xml
+++ b/res/xml/usb_details_fragment.xml
@@ -34,7 +34,10 @@
android:title="@string/usb_use"/>
<PreferenceCategory
+ android:key="usb_transcode_mtp"
+ android:title="@string/usb_file_transfer_title"/>
+
+ <PreferenceCategory
android:key="usb_details_power_role"
android:title="@string/usb_power_title"/>
-
</PreferenceScreen>
diff --git a/res/xml/write_system_settings_permissions_details.xml b/res/xml/write_system_settings_permissions_details.xml
index 21ea706..a2f9cbd 100644
--- a/res/xml/write_system_settings_permissions_details.xml
+++ b/res/xml/write_system_settings_permissions_details.xml
@@ -22,8 +22,8 @@
android:key="app_ops_settings_switch"
android:title="@string/permit_write_settings"/>
- <Preference
- android:summary="@string/write_settings_description"
+ <com.android.settingslib.widget.FooterPreference
+ android:title="@string/write_settings_description"
android:selectable="false"/>
</PreferenceScreen>
diff --git a/res/xml/zen_mode_settings.xml b/res/xml/zen_mode_settings.xml
index 6764e28..78dee02 100644
--- a/res/xml/zen_mode_settings.xml
+++ b/res/xml/zen_mode_settings.xml
@@ -21,12 +21,9 @@
android:title="@string/zen_mode_settings_title">
<!-- Turn on DND button -->
- <com.android.settingslib.widget.LayoutPreference
+ <com.android.settingslib.widget.MainSwitchPreference
android:key="zen_mode_toggle"
- android:title="@string/zen_mode_settings_title"
- android:selectable="false"
- android:layout="@layout/zen_mode_settings_button"
- settings:allowDividerBelow="true"
+ android:title="@string/do_not_disturb_main_switch_title"
settings:keywords="@string/keywords_zen_mode_settings"/>
<PreferenceCategory
diff --git a/src/com/android/settings/ProxySelector.java b/src/com/android/settings/ProxySelector.java
index 625369e..a685841 100644
--- a/src/com/android/settings/ProxySelector.java
+++ b/src/com/android/settings/ProxySelector.java
@@ -23,7 +23,6 @@
import android.content.Context;
import android.content.Intent;
import android.net.ConnectivityManager;
-import android.net.Proxy;
import android.net.ProxyInfo;
import android.os.Bundle;
import android.text.Selection;
@@ -41,6 +40,7 @@
import androidx.appcompat.app.AlertDialog;
+import com.android.net.module.util.ProxyUtils;
import com.android.settings.SettingsPreferenceFragment.SettingsDialogFragment;
import com.android.settings.core.InstrumentedFragment;
@@ -151,7 +151,7 @@
if (proxy != null) {
hostname = proxy.getHost();
port = proxy.getPort();
- exclList = proxy.getExclusionListAsString();
+ exclList = ProxyUtils.exclusionListAsString(proxy.getExclusionList());
}
if (hostname == null) {
@@ -185,18 +185,18 @@
* @return 0 on success, string resource ID on failure
*/
public static int validate(String hostname, String port, String exclList) {
- switch (Proxy.validate(hostname, port, exclList)) {
- case Proxy.PROXY_VALID:
+ switch (ProxyUtils.validate(hostname, port, exclList)) {
+ case ProxyUtils.PROXY_VALID:
return 0;
- case Proxy.PROXY_HOSTNAME_EMPTY:
+ case ProxyUtils.PROXY_HOSTNAME_EMPTY:
return R.string.proxy_error_empty_host_set_port;
- case Proxy.PROXY_HOSTNAME_INVALID:
+ case ProxyUtils.PROXY_HOSTNAME_INVALID:
return R.string.proxy_error_invalid_host;
- case Proxy.PROXY_PORT_EMPTY:
+ case ProxyUtils.PROXY_PORT_EMPTY:
return R.string.proxy_error_empty_port;
- case Proxy.PROXY_PORT_INVALID:
+ case ProxyUtils.PROXY_PORT_INVALID:
return R.string.proxy_error_invalid_port;
- case Proxy.PROXY_EXCLLIST_INVALID:
+ case ProxyUtils.PROXY_EXCLLIST_INVALID:
return R.string.proxy_error_invalid_exclusion_list;
default:
// should neven happen
diff --git a/src/com/android/settings/SettingsActivity.java b/src/com/android/settings/SettingsActivity.java
index bb20c4c..d22a381 100644
--- a/src/com/android/settings/SettingsActivity.java
+++ b/src/com/android/settings/SettingsActivity.java
@@ -238,12 +238,10 @@
getWindow().requestFeature(Window.FEATURE_ACTIVITY_TRANSITIONS);
final MaterialSharedAxis enterTransition = new MaterialSharedAxis(
MaterialSharedAxis.X, /* forward */true);
- enterTransition.addTarget(R.id.content_parent);
getWindow().setEnterTransition(enterTransition);
final MaterialSharedAxis returnTransition = new MaterialSharedAxis(
MaterialSharedAxis.X, /* forward */false);
- returnTransition.addTarget(R.id.content_parent);
getWindow().setReturnTransition(returnTransition);
}
diff --git a/src/com/android/settings/accessibility/AccessibilitySettings.java b/src/com/android/settings/accessibility/AccessibilitySettings.java
index 4709c66..582111f 100644
--- a/src/com/android/settings/accessibility/AccessibilitySettings.java
+++ b/src/com/android/settings/accessibility/AccessibilitySettings.java
@@ -372,6 +372,9 @@
} else {
getPreferenceScreen().addPreference(downloadedServicesCategory);
}
+
+ // Hide screen reader category if it is empty.
+ updatePreferenceCategoryVisibility(CATEGORY_SCREEN_READER);
}
private List<RestrictedPreference> getInstalledAccessibilityList(Context context) {
@@ -453,6 +456,16 @@
}
/**
+ * Updates the visibility of a category according to its child preference count.
+ *
+ * @param categoryKey The key of the category which needs to check
+ */
+ private void updatePreferenceCategoryVisibility(String categoryKey) {
+ final PreferenceCategory category = mCategoryToPrefCategoryMap.get(categoryKey);
+ category.setVisible(category.getPreferenceCount() != 0);
+ }
+
+ /**
* Updates preferences related to system configurations.
*/
protected void updateSystemPreferences() {
diff --git a/src/com/android/settings/accessibility/ShortcutsSettingsFragment.java b/src/com/android/settings/accessibility/ShortcutsSettingsFragment.java
new file mode 100644
index 0000000..91e16f6
--- /dev/null
+++ b/src/com/android/settings/accessibility/ShortcutsSettingsFragment.java
@@ -0,0 +1,48 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.accessibility;
+
+import android.app.settings.SettingsEnums;
+
+import com.android.settings.R;
+import com.android.settings.dashboard.DashboardFragment;
+import com.android.settings.search.BaseSearchIndexProvider;
+
+/** Accessibility settings for accessibility shortcuts. */
+public class ShortcutsSettingsFragment extends DashboardFragment {
+
+ private static final String TAG = "ShortcutsSettingsFragment";
+
+ @Override
+ public int getMetricsCategory() {
+ return SettingsEnums.ACCESSIBILITY_SHORTCUTS_SETTINGS;
+ }
+
+ @Override
+ protected int getPreferenceScreenResId() {
+ return R.xml.accessibility_shortcuts_settings;
+ }
+
+ @Override
+ protected String getLogTag() {
+ return TAG;
+ }
+
+ public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
+ new BaseSearchIndexProvider(R.xml.accessibility_shortcuts_settings);
+
+}
diff --git a/src/com/android/settings/accessibility/TextAndDisplayFragment.java b/src/com/android/settings/accessibility/TextAndDisplayFragment.java
index b496e3d..e81dded 100644
--- a/src/com/android/settings/accessibility/TextAndDisplayFragment.java
+++ b/src/com/android/settings/accessibility/TextAndDisplayFragment.java
@@ -17,7 +17,6 @@
package com.android.settings.accessibility;
import android.app.settings.SettingsEnums;
-import android.content.Context;
import android.hardware.display.ColorDisplayManager;
import android.os.Bundle;
import android.provider.Settings;
@@ -28,7 +27,6 @@
import com.android.settings.R;
import com.android.settings.dashboard.DashboardFragment;
-import com.android.settings.display.DarkUIPreferenceController;
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settingslib.search.SearchIndexable;
@@ -42,15 +40,10 @@
// Preferences
private static final String DISPLAY_DALTONIZER_PREFERENCE_SCREEN = "daltonizer_preference";
- private static final String TOGGLE_INVERSION_PREFERENCE = "toggle_inversion_preference";
- private static final String DISPLAY_REDUCE_BRIGHT_COLORS_PREFERENCE_SCREEN =
- "reduce_bright_colors_preference";
private static final String TOGGLE_DISABLE_ANIMATIONS = "toggle_disable_animations";
private static final String TOGGLE_LARGE_POINTER_ICON = "toggle_large_pointer_icon";
private Preference mDisplayDaltonizerPreferenceScreen;
- private Preference mToggleInversionPreference;
- private Preference mReduceBrightColorsPreference;
private SwitchPreference mToggleDisableAnimationsPreference;
private SwitchPreference mToggleLargePointerIconPreference;
@@ -68,12 +61,6 @@
}
@Override
- public void onAttach(Context context) {
- super.onAttach(context);
- use(DarkUIPreferenceController.class).setParentFragment(this);
- }
-
- @Override
protected int getPreferenceScreenResId() {
return R.xml.accessibility_text_and_display;
}
@@ -87,13 +74,6 @@
// Display color adjustments.
mDisplayDaltonizerPreferenceScreen = findPreference(DISPLAY_DALTONIZER_PREFERENCE_SCREEN);
- // Display inversion.
- mToggleInversionPreference = findPreference(TOGGLE_INVERSION_PREFERENCE);
-
- // Reduce brightness.
- mReduceBrightColorsPreference =
- findPreference(DISPLAY_REDUCE_BRIGHT_COLORS_PREFERENCE_SCREEN);
-
// Disable animation.
mToggleDisableAnimationsPreference = findPreference(TOGGLE_DISABLE_ANIMATIONS);
@@ -110,22 +90,14 @@
if (ColorDisplayManager.isColorTransformAccelerated(getContext())) {
mDisplayDaltonizerPreferenceScreen.setSummary(AccessibilityUtil.getSummary(
getContext(), Settings.Secure.ACCESSIBILITY_DISPLAY_DALTONIZER_ENABLED));
- mToggleInversionPreference.setSummary(AccessibilityUtil.getSummary(
- getContext(), Settings.Secure.ACCESSIBILITY_DISPLAY_INVERSION_ENABLED));
- mReduceBrightColorsPreference.setSummary(AccessibilityUtil.getSummary(
- getContext(), Settings.Secure.REDUCE_BRIGHT_COLORS_ACTIVATED));
getPreferenceScreen().removePreference(experimentalCategory);
} else {
// Move following preferences to experimental category if device don't supports HWC
// hardware-accelerated color transform.
getPreferenceScreen().removePreference(mDisplayDaltonizerPreferenceScreen);
- getPreferenceScreen().removePreference(mToggleInversionPreference);
- getPreferenceScreen().removePreference(mReduceBrightColorsPreference);
getPreferenceScreen().removePreference(mToggleDisableAnimationsPreference);
getPreferenceScreen().removePreference(mToggleLargePointerIconPreference);
experimentalCategory.addPreference(mDisplayDaltonizerPreferenceScreen);
- experimentalCategory.addPreference(mToggleInversionPreference);
- experimentalCategory.addPreference(mReduceBrightColorsPreference);
experimentalCategory.addPreference(mToggleDisableAnimationsPreference);
experimentalCategory.addPreference(mToggleLargePointerIconPreference);
}
diff --git a/src/com/android/settings/accessibility/ToggleReduceBrightColorsPreferenceFragment.java b/src/com/android/settings/accessibility/ToggleReduceBrightColorsPreferenceFragment.java
index 5562795..ca19681 100644
--- a/src/com/android/settings/accessibility/ToggleReduceBrightColorsPreferenceFragment.java
+++ b/src/com/android/settings/accessibility/ToggleReduceBrightColorsPreferenceFragment.java
@@ -157,7 +157,7 @@
@Override
protected void updateToggleServiceTitle(SwitchPreference switchPreference) {
- switchPreference.setTitle(R.string.reduce_bright_colors_switch_title);
+ switchPreference.setTitle(R.string.reduce_bright_colors_preference_title);
}
@Override
diff --git a/src/com/android/settings/accessibility/TurnScreenDarkerFragment.java b/src/com/android/settings/accessibility/TurnScreenDarkerFragment.java
new file mode 100644
index 0000000..ad4bd56
--- /dev/null
+++ b/src/com/android/settings/accessibility/TurnScreenDarkerFragment.java
@@ -0,0 +1,112 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.accessibility;
+
+import android.app.settings.SettingsEnums;
+import android.content.Context;
+import android.hardware.display.ColorDisplayManager;
+import android.os.Bundle;
+import android.provider.Settings;
+
+import androidx.preference.Preference;
+import androidx.preference.PreferenceCategory;
+
+import com.android.settings.R;
+import com.android.settings.dashboard.DashboardFragment;
+import com.android.settings.display.DarkUIPreferenceController;
+import com.android.settings.search.BaseSearchIndexProvider;
+import com.android.settingslib.search.SearchIndexable;
+
+/** Accessibility settings for turning screen darker. */
+@SearchIndexable(forTarget = SearchIndexable.ALL & ~SearchIndexable.ARC)
+public class TurnScreenDarkerFragment extends DashboardFragment {
+
+ private static final String TAG = "TurnDarkerFragment";
+
+ private static final String CATEGORY_EXPERIMENTAL = "experimental_category";
+
+ // Preferences
+ private static final String TOGGLE_INVERSION_PREFERENCE = "toggle_inversion_preference";
+ private static final String DISPLAY_REDUCE_BRIGHT_COLORS_PREFERENCE_SCREEN =
+ "reduce_bright_colors_preference";
+
+ private Preference mToggleInversionPreference;
+ private Preference mReduceBrightColorsPreference;
+
+ @Override
+ public int getMetricsCategory() {
+ return SettingsEnums.ACCESSIBILITY_TURN_SCREEN_DARKER;
+ }
+
+
+ @Override
+ public void onCreate(Bundle icicle) {
+ super.onCreate(icicle);
+ initializeAllPreferences();
+ updateSystemPreferences();
+ }
+
+ @Override
+ public void onAttach(Context context) {
+ super.onAttach(context);
+ use(DarkUIPreferenceController.class).setParentFragment(this);
+ }
+
+ @Override
+ protected int getPreferenceScreenResId() {
+ return R.xml.accessibility_turn_screen_darker;
+ }
+
+ @Override
+ protected String getLogTag() {
+ return TAG;
+ }
+
+ private void initializeAllPreferences() {
+ // Display inversion.
+ mToggleInversionPreference = findPreference(TOGGLE_INVERSION_PREFERENCE);
+
+ // Reduce brightness.
+ mReduceBrightColorsPreference =
+ findPreference(DISPLAY_REDUCE_BRIGHT_COLORS_PREFERENCE_SCREEN);
+ }
+
+ /**
+ * Updates preferences related to system configurations.
+ */
+ private void updateSystemPreferences() {
+ final PreferenceCategory experimentalCategory = getPreferenceScreen().findPreference(
+ CATEGORY_EXPERIMENTAL);
+ if (ColorDisplayManager.isColorTransformAccelerated(getContext())) {
+ mToggleInversionPreference.setSummary(AccessibilityUtil.getSummary(
+ getContext(), Settings.Secure.ACCESSIBILITY_DISPLAY_INVERSION_ENABLED));
+ mReduceBrightColorsPreference.setSummary(AccessibilityUtil.getSummary(
+ getContext(), Settings.Secure.REDUCE_BRIGHT_COLORS_ACTIVATED));
+ getPreferenceScreen().removePreference(experimentalCategory);
+ } else {
+ // Move following preferences to experimental category if device don't supports HWC
+ // hardware-accelerated color transform.
+ getPreferenceScreen().removePreference(mToggleInversionPreference);
+ getPreferenceScreen().removePreference(mReduceBrightColorsPreference);
+ experimentalCategory.addPreference(mToggleInversionPreference);
+ experimentalCategory.addPreference(mReduceBrightColorsPreference);
+ }
+ }
+
+ public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
+ new BaseSearchIndexProvider(R.xml.accessibility_turn_screen_darker);
+}
diff --git a/src/com/android/settings/applications/UsageAccessDetails.java b/src/com/android/settings/applications/UsageAccessDetails.java
index cddacb3..4681fd8 100644
--- a/src/com/android/settings/applications/UsageAccessDetails.java
+++ b/src/com/android/settings/applications/UsageAccessDetails.java
@@ -74,7 +74,7 @@
getPreferenceScreen().setTitle(R.string.usage_access);
mSwitchPref.setTitle(R.string.permit_usage_access);
- mUsageDesc.setSummary(R.string.usage_access_description);
+ mUsageDesc.setTitle(R.string.usage_access_description);
mSwitchPref.setOnPreferenceChangeListener(this);
diff --git a/src/com/android/settings/applications/appinfo/AppInfoDashboardFragment.java b/src/com/android/settings/applications/appinfo/AppInfoDashboardFragment.java
index 6817bd6..f584408 100755
--- a/src/com/android/settings/applications/appinfo/AppInfoDashboardFragment.java
+++ b/src/com/android/settings/applications/appinfo/AppInfoDashboardFragment.java
@@ -35,6 +35,7 @@
import android.os.UserHandle;
import android.os.UserManager;
import android.text.TextUtils;
+import android.util.FeatureFlagUtils;
import android.util.Log;
import android.view.Menu;
import android.view.MenuInflater;
@@ -48,6 +49,7 @@
import com.android.settings.applications.manageapplications.ManageApplications;
import com.android.settings.applications.specialaccess.interactacrossprofiles.InteractAcrossProfilesDetailsPreferenceController;
import com.android.settings.applications.specialaccess.pictureinpicture.PictureInPictureDetailPreferenceController;
+import com.android.settings.core.FeatureFlags;
import com.android.settings.core.SubSettingLauncher;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settingslib.RestrictedLockUtilsInternal;
@@ -245,6 +247,9 @@
@Override
protected int getPreferenceScreenResId() {
+ if (FeatureFlagUtils.isEnabled(getContext(), FeatureFlags.SILKY_HOME)) {
+ return R.xml.app_info_settings_v2;
+ }
return R.xml.app_info_settings;
}
diff --git a/src/com/android/settings/backup/BackupSettingsHelper.java b/src/com/android/settings/backup/BackupSettingsHelper.java
index 1483714..cc010f0 100644
--- a/src/com/android/settings/backup/BackupSettingsHelper.java
+++ b/src/com/android/settings/backup/BackupSettingsHelper.java
@@ -26,12 +26,14 @@
import android.os.UserHandle;
import android.os.UserManager;
import android.text.TextUtils;
+import android.util.FeatureFlagUtils;
import android.util.Log;
import androidx.annotation.VisibleForTesting;
import com.android.settings.R;
import com.android.settings.Settings.PrivacySettingsActivity;
+import com.android.settings.core.FeatureFlags;
import java.net.URISyntaxException;
@@ -55,6 +57,9 @@
* Otherwise, show nothing.
*/
public String getSummary() {
+ if (FeatureFlagUtils.isEnabled(mContext, FeatureFlags.SILKY_HOME)) {
+ return null;
+ }
UserManager userManager = (UserManager) mContext.getSystemService(Context.USER_SERVICE);
if (userManager.getUserProfiles().size() == 1) {
try {
diff --git a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrolling.java b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrolling.java
index 3015b94..78abb58 100644
--- a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrolling.java
+++ b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrolling.java
@@ -93,7 +93,7 @@
.build();
private boolean mCanAssumeUdfps;
- private ProgressBar mProgressBar;
+ @Nullable private ProgressBar mProgressBar;
private ObjectAnimator mProgressAnim;
private TextView mStartMessage;
private TextView mRepeatMessage;
@@ -162,10 +162,6 @@
mProgressBar = findViewById(R.id.fingerprint_progress_bar);
mVibrator = getSystemService(Vibrator.class);
- if (mCanAssumeUdfps) {
- mProgressBar.setVisibility(View.INVISIBLE);
- }
-
if (getLayout().shouldApplyPartnerHeavyThemeResource()) {
DescriptionStyler.applyPartnerCustomizationHeavyStyle(mRepeatMessage);
} else if (getLayout().shouldApplyPartnerResource()) {
@@ -181,7 +177,8 @@
.build()
);
- final LayerDrawable fingerprintDrawable = (LayerDrawable) mProgressBar.getBackground();
+ final LayerDrawable fingerprintDrawable = mProgressBar != null
+ ? (LayerDrawable) mProgressBar.getBackground() : null;
if (fingerprintDrawable != null) {
mIconAnimationDrawable = (AnimatedVectorDrawable)
fingerprintDrawable.findDrawableByLayerId(R.id.fingerprint_animation);
@@ -196,27 +193,31 @@
this, android.R.interpolator.linear_out_slow_in);
mFastOutLinearInInterpolator = AnimationUtils.loadInterpolator(
this, android.R.interpolator.fast_out_linear_in);
- mProgressBar.setOnTouchListener((v, event) -> {
- if (event.getActionMasked() == MotionEvent.ACTION_DOWN) {
- mIconTouchCount++;
- if (mIconTouchCount == ICON_TOUCH_COUNT_SHOW_UNTIL_DIALOG_SHOWN) {
- showIconTouchDialog();
- } else {
- mProgressBar.postDelayed(mShowDialogRunnable,
- ICON_TOUCH_DURATION_UNTIL_DIALOG_SHOWN);
+ if (mProgressBar != null) {
+ mProgressBar.setOnTouchListener((v, event) -> {
+ if (event.getActionMasked() == MotionEvent.ACTION_DOWN) {
+ mIconTouchCount++;
+ if (mIconTouchCount == ICON_TOUCH_COUNT_SHOW_UNTIL_DIALOG_SHOWN) {
+ showIconTouchDialog();
+ } else {
+ mProgressBar.postDelayed(mShowDialogRunnable,
+ ICON_TOUCH_DURATION_UNTIL_DIALOG_SHOWN);
+ }
+ } else if (event.getActionMasked() == MotionEvent.ACTION_CANCEL
+ || event.getActionMasked() == MotionEvent.ACTION_UP) {
+ mProgressBar.removeCallbacks(mShowDialogRunnable);
}
- } else if (event.getActionMasked() == MotionEvent.ACTION_CANCEL
- || event.getActionMasked() == MotionEvent.ACTION_UP) {
- mProgressBar.removeCallbacks(mShowDialogRunnable);
- }
- return true;
- });
+ return true;
+ });
+ }
mRestoring = savedInstanceState != null;
}
@Override
protected BiometricEnrollSidecar getSidecar() {
- return new FingerprintEnrollSidecar();
+ final FingerprintEnrollSidecar sidecar = new FingerprintEnrollSidecar();
+ sidecar.setEnrollReason(FingerprintManager.ENROLL_ENROLL);
+ return sidecar;
}
@Override
@@ -236,9 +237,6 @@
updateDescription();
if (mRestoring) {
startIconAnimation();
- if (mCanAssumeUdfps) {
- mProgressBar.setVisibility(View.VISIBLE);
- }
}
}
@@ -248,8 +246,6 @@
if (mCanAssumeUdfps) {
startEnrollment();
- updateProgress(false /* animate */);
- mProgressBar.setVisibility(View.VISIBLE);
}
mAnimationCancelled = false;
@@ -276,6 +272,14 @@
}
private void animateProgress(int progress) {
+ if (mCanAssumeUdfps) {
+ // UDFPS animations are owned by SystemUI
+ if (progress >= PROGRESS_BAR_MAX) {
+ // Wait for any animations in SysUI to finish, then proceed to next page
+ getMainThreadHandler().postDelayed(mDelayedFinishRunnable, FINISH_DELAY);
+ }
+ return;
+ }
if (mProgressAnim != null) {
mProgressAnim.cancel();
}
@@ -356,7 +360,9 @@
if (animate) {
animateProgress(progress);
} else {
- mProgressBar.setProgress(progress);
+ if (mProgressBar != null) {
+ mProgressBar.setProgress(progress);
+ }
if (progress >= PROGRESS_BAR_MAX) {
mDelayedFinishRunnable.run();
}
diff --git a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFindSensor.java b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFindSensor.java
index 351c828..89cd442 100644
--- a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFindSensor.java
+++ b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFindSensor.java
@@ -122,7 +122,7 @@
FingerprintEnrollEnrolling.TAG_SIDECAR);
if (mSidecar == null) {
mSidecar = new FingerprintEnrollSidecar();
- mSidecar.logMetrics(false);
+ mSidecar.setEnrollReason(FingerprintManager.ENROLL_FIND_SENSOR);
getSupportFragmentManager().beginTransaction()
.add(mSidecar, FingerprintEnrollEnrolling.TAG_SIDECAR)
.commitAllowingStateLoss();
diff --git a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollSidecar.java b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollSidecar.java
index 73540c9..b6c3516 100644
--- a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollSidecar.java
+++ b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollSidecar.java
@@ -29,7 +29,7 @@
public class FingerprintEnrollSidecar extends BiometricEnrollSidecar {
private FingerprintManager mFingerprintManager;
- private boolean mShouldLogMetrics = true;
+ private @FingerprintManager.EnrollReason int mEnrollReason;
@Override
public void onAttach(Activity activity) {
@@ -41,17 +41,11 @@
protected void startEnrollment() {
super.startEnrollment();
mFingerprintManager.enroll(mToken, mEnrollmentCancel, mUserId, mEnrollmentCallback,
- mShouldLogMetrics);
+ mEnrollReason);
}
- /**
- * Sets the flag mShouldLogMetrics which controls whether or not
- * logging of enrollment successes/failures will be recorded for
- * this particular instance of enrollment. This is primarily used by
- * the find sensor activity so that false negatives are not reported.
- */
- public void logMetrics(boolean shouldLogMetrics) {
- mShouldLogMetrics = shouldLogMetrics;
+ public void setEnrollReason(@FingerprintManager.EnrollReason int enrollReason) {
+ mEnrollReason = enrollReason;
}
private FingerprintManager.EnrollmentCallback mEnrollmentCallback
diff --git a/src/com/android/settings/biometrics/fingerprint/UdfpsEnrollLayout.java b/src/com/android/settings/biometrics/fingerprint/UdfpsEnrollLayout.java
index 19079d8..7923d27 100644
--- a/src/com/android/settings/biometrics/fingerprint/UdfpsEnrollLayout.java
+++ b/src/com/android/settings/biometrics/fingerprint/UdfpsEnrollLayout.java
@@ -31,45 +31,12 @@
private static final String TAG = "UdfpsEnrollLayout";
- private final FingerprintSensorPropertiesInternal mSensorProps;
- private final int mSensorDiameter;
- private final int mAnimationDiameter;
-
public UdfpsEnrollLayout(Context context, AttributeSet attrs) {
super(context, attrs);
- mSensorProps = context.getSystemService(FingerprintManager.class)
- .getSensorPropertiesInternal().get(0);
- mSensorDiameter = mSensorProps.sensorRadius * 2;
- // Multiply the progress bar size slightly so that the progress bar is outside the UDFPS
- // affordance, which is shown by SystemUI
- mAnimationDiameter = (int) (mSensorDiameter * 2);
- }
-
- @Override
- public void onLayout(boolean changed, int left, int top, int right, int bottom) {
- super.onLayout(changed, left, top, right, bottom);
-
- final View animation = findViewById(R.id.fingerprint_progress_bar);
- final WindowManager wm = getContext().getSystemService(WindowManager.class);
- final int statusbarHeight = Math.abs(wm.getCurrentWindowMetrics().getWindowInsets()
- .getInsets(WindowInsets.Type.statusBars()).toRect().height());
-
- // Calculate the amount of translation required. This is just re-arranged from
- // animation.setY(mSensorProps.sensorLocationY-statusbarHeight-mSensorProps.sensorRadius)
- // The translationY is the amount of extra height that should be added to the spacer
- // above the animation
- final int spaceHeight = mSensorProps.sensorLocationY - statusbarHeight
- - (mAnimationDiameter / 2) - animation.getTop();
- animation.setTranslationY(spaceHeight);
}
@Override
public void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
super.onMeasure(widthMeasureSpec, heightMeasureSpec);
-
- final View animation = findViewById(R.id.fingerprint_progress_bar);
-
- animation.measure(MeasureSpec.makeMeasureSpec(mAnimationDiameter, MeasureSpec.EXACTLY),
- MeasureSpec.makeMeasureSpec(mAnimationDiameter, MeasureSpec.EXACTLY));
}
}
diff --git a/src/com/android/settings/connecteddevice/usb/UsbDetailsFragment.java b/src/com/android/settings/connecteddevice/usb/UsbDetailsFragment.java
index 4b83b06..bc76568 100644
--- a/src/com/android/settings/connecteddevice/usb/UsbDetailsFragment.java
+++ b/src/com/android/settings/connecteddevice/usb/UsbDetailsFragment.java
@@ -92,6 +92,7 @@
ret.add(new UsbDetailsDataRoleController(context, fragment, usbBackend));
ret.add(new UsbDetailsFunctionsController(context, fragment, usbBackend));
ret.add(new UsbDetailsPowerRoleController(context, fragment, usbBackend));
+ ret.add(new UsbDetailsTranscodeMtpController(context, fragment, usbBackend));
return ret;
}
diff --git a/src/com/android/settings/connecteddevice/usb/UsbDetailsTranscodeMtpController.java b/src/com/android/settings/connecteddevice/usb/UsbDetailsTranscodeMtpController.java
new file mode 100644
index 0000000..7ce8470
--- /dev/null
+++ b/src/com/android/settings/connecteddevice/usb/UsbDetailsTranscodeMtpController.java
@@ -0,0 +1,96 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.connecteddevice.usb;
+
+import static android.hardware.usb.UsbPortStatus.DATA_ROLE_DEVICE;
+
+import android.content.Context;
+import android.hardware.usb.UsbManager;
+import android.os.SystemProperties;
+
+import androidx.preference.Preference;
+import androidx.preference.PreferenceCategory;
+import androidx.preference.PreferenceScreen;
+import androidx.preference.SwitchPreference;
+
+import com.android.settings.R;
+import com.android.settings.Utils;
+
+/**
+ * This class controls the switch for setting if we should transcode files transferred via MTP over
+ * USB.
+ */
+public class UsbDetailsTranscodeMtpController extends UsbDetailsController
+ implements Preference.OnPreferenceClickListener {
+ private static final String TRANSCODE_MTP_SYS_PROP_KEY = "sys.fuse.transcode_mtp";
+ private static final String PREFERENCE_KEY = "usb_transcode_mtp";
+
+ private PreferenceCategory mPreferenceCategory;
+ private SwitchPreference mSwitchPreference;
+
+ public UsbDetailsTranscodeMtpController(Context context, UsbDetailsFragment fragment,
+ UsbBackend backend) {
+ super(context, fragment, backend);
+ }
+
+
+ @Override
+ public void displayPreference(PreferenceScreen screen) {
+ super.displayPreference(screen);
+ mPreferenceCategory = screen.findPreference(getPreferenceKey());
+ mSwitchPreference = new SwitchPreference(mPreferenceCategory.getContext());
+ mSwitchPreference.setTitle(R.string.usb_transcode_files);
+ mSwitchPreference.setOnPreferenceClickListener(this);
+ mPreferenceCategory.addPreference(mSwitchPreference);
+ }
+
+ @Override
+ protected void refresh(boolean connected, long functions, int powerRole, int dataRole) {
+ if (mUsbBackend.areFunctionsSupported(UsbManager.FUNCTION_MTP | UsbManager.FUNCTION_PTP)) {
+ mFragment.getPreferenceScreen().addPreference(mPreferenceCategory);
+ } else {
+ mFragment.getPreferenceScreen().removePreference(mPreferenceCategory);
+ }
+
+ mSwitchPreference.setChecked(
+ SystemProperties.getBoolean(TRANSCODE_MTP_SYS_PROP_KEY, false));
+ mPreferenceCategory.setEnabled(
+ connected && isDeviceInFileTransferMode(functions, dataRole));
+ }
+
+ @Override
+ public boolean onPreferenceClick(Preference preference) {
+ SystemProperties.set(TRANSCODE_MTP_SYS_PROP_KEY,
+ Boolean.toString(mSwitchPreference.isChecked()));
+ return true;
+ }
+
+ @Override
+ public boolean isAvailable() {
+ return !Utils.isMonkeyRunning();
+ }
+
+ @Override
+ public String getPreferenceKey() {
+ return PREFERENCE_KEY;
+ }
+
+ private static boolean isDeviceInFileTransferMode(long functions, int dataRole) {
+ return dataRole == DATA_ROLE_DEVICE && ((functions & UsbManager.FUNCTION_MTP) != 0
+ || (functions & UsbManager.FUNCTION_PTP) != 0);
+ }
+}
diff --git a/src/com/android/settings/core/SettingsBaseActivity.java b/src/com/android/settings/core/SettingsBaseActivity.java
index 4704702..85484af 100644
--- a/src/com/android/settings/core/SettingsBaseActivity.java
+++ b/src/com/android/settings/core/SettingsBaseActivity.java
@@ -32,11 +32,13 @@
import android.util.FeatureFlagUtils;
import android.util.Log;
import android.view.LayoutInflater;
+import android.view.MenuItem;
import android.view.View;
import android.view.ViewGroup;
import android.view.Window;
import android.widget.Toolbar;
+import androidx.annotation.NonNull;
import androidx.fragment.app.FragmentActivity;
import com.android.settings.R;
@@ -168,6 +170,17 @@
}
@Override
+ public boolean onOptionsItemSelected(@NonNull MenuItem item) {
+ final int id = item.getItemId();
+ if (id == android.R.id.home) {
+ // Make the up button behave the same as the back button.
+ onBackPressed();
+ return true;
+ }
+ return super.onOptionsItemSelected(item);
+ }
+
+ @Override
public void setTitle(CharSequence title) {
if (mCollapsingToolbarLayout != null) {
mCollapsingToolbarLayout.setTitle(title);
diff --git a/src/com/android/settings/core/gateway/SettingsGateway.java b/src/com/android/settings/core/gateway/SettingsGateway.java
index 0e0d3eb..245389e 100644
--- a/src/com/android/settings/core/gateway/SettingsGateway.java
+++ b/src/com/android/settings/core/gateway/SettingsGateway.java
@@ -83,6 +83,7 @@
import com.android.settings.deviceinfo.firmwareversion.FirmwareVersionSettings;
import com.android.settings.deviceinfo.legal.ModuleLicensesDashboard;
import com.android.settings.display.NightDisplaySettings;
+import com.android.settings.display.SmartAutoRotatePreferenceFragment;
import com.android.settings.display.darkmode.DarkModeSettingsFragment;
import com.android.settings.dream.DreamSettings;
import com.android.settings.enterprise.EnterprisePrivacySettings;
@@ -176,6 +177,7 @@
SavedAccessPointsWifiSettings2.class.getName(),
AllInOneTetherSettings.class.getName(),
TetherSettings.class.getName(),
+ SmartAutoRotatePreferenceFragment.class.getName(),
WifiP2pSettings.class.getName(),
WifiTetherSettings.class.getName(),
BackgroundCheckSummary.class.getName(),
diff --git a/src/com/android/settings/deletionhelper/AutomaticStorageManagerDescriptionPreferenceController.java b/src/com/android/settings/deletionhelper/AutomaticStorageManagerDescriptionPreferenceController.java
index d11e68b..4cd7949 100644
--- a/src/com/android/settings/deletionhelper/AutomaticStorageManagerDescriptionPreferenceController.java
+++ b/src/com/android/settings/deletionhelper/AutomaticStorageManagerDescriptionPreferenceController.java
@@ -19,13 +19,13 @@
import android.text.format.DateUtils;
import android.text.format.Formatter;
-import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
import com.android.settings.R;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.Utils;
import com.android.settingslib.core.AbstractPreferenceController;
+import com.android.settingslib.widget.FooterPreference;
/**
* Handles the wall of text which appears below the options in the Storage Management settings drill
@@ -51,7 +51,7 @@
@Override
public void displayPreference(PreferenceScreen screen) {
- Preference preference = screen.findPreference(getPreferenceKey());
+ final FooterPreference preference = screen.findPreference(getPreferenceKey());
final Context context = preference.getContext();
ContentResolver cr = context.getContentResolver();
long freedBytes =
diff --git a/src/com/android/settings/development/qstile/DevelopmentTiles.java b/src/com/android/settings/development/qstile/DevelopmentTiles.java
index 203a688..16084c0 100644
--- a/src/com/android/settings/development/qstile/DevelopmentTiles.java
+++ b/src/com/android/settings/development/qstile/DevelopmentTiles.java
@@ -265,6 +265,7 @@
@VisibleForTesting
boolean isImeTraceEnabled() {
try {
+ // TODO(b/175742251): Get rid of dependency on IInputMethodManager
final Completable.Boolean value = Completable.createBoolean();
mInputMethodManager.isImeTraceEnabled(ResultCallbacks.of(value));
return Completable.getResult(value);
@@ -327,13 +328,16 @@
}
}
- private void setImeTraceEnabled(boolean isEnabled) {
+ protected void setImeTraceEnabled(boolean isEnabled) {
try {
+ // TODO(b/175742251): Get rid of dependency on IInputMethodManager
+ final Completable.Void value = Completable.createVoid();
if (isEnabled) {
- mInputMethodManager.startImeTrace();
+ mInputMethodManager.startImeTrace(ResultCallbacks.of(value));
} else {
- mInputMethodManager.stopImeTrace();
+ mInputMethodManager.stopImeTrace(ResultCallbacks.of(value));
}
+ Completable.getResult(value);
} catch (RemoteException e) {
Log.e(TAG, "Could not set ime trace status." + e.toString());
}
diff --git a/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogController.java b/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogController.java
index 414039b..a6a211e 100644
--- a/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogController.java
+++ b/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogController.java
@@ -233,7 +233,8 @@
if (mSubscriptionInfo == null) {
return;
}
-
+ mTelephonyManager =
+ mTelephonyManager.createForSubscriptionId(mSubscriptionInfo.getSubscriptionId());
mPhoneStateListener = getPhoneStateListener();
updateLatestAreaInfo();
updateSubscriptionStatus();
@@ -549,8 +550,11 @@
voiceNetworkTypeName = getNetworkTypeName(actualVoiceNetworkType);
}
- if (overrideNetworkType == TelephonyDisplayInfo.OVERRIDE_NETWORK_TYPE_NR_NSA_MMWAVE
- || overrideNetworkType == TelephonyDisplayInfo.OVERRIDE_NETWORK_TYPE_NR_NSA) {
+ final boolean isOverrideNwTypeNrAdvancedOrNsa =
+ overrideNetworkType == TelephonyDisplayInfo.OVERRIDE_NETWORK_TYPE_NR_ADVANCED
+ || overrideNetworkType == TelephonyDisplayInfo.OVERRIDE_NETWORK_TYPE_NR_NSA;
+ if (actualDataNetworkType == TelephonyManager.NETWORK_TYPE_LTE
+ && isOverrideNwTypeNrAdvancedOrNsa) {
dataNetworkTypeName = "NR NSA";
}
diff --git a/src/com/android/settings/display/AutoBrightnessDetailPreferenceController.java b/src/com/android/settings/display/AutoBrightnessDetailPreferenceController.java
index 030c5b9..3138ae0 100644
--- a/src/com/android/settings/display/AutoBrightnessDetailPreferenceController.java
+++ b/src/com/android/settings/display/AutoBrightnessDetailPreferenceController.java
@@ -17,8 +17,18 @@
package com.android.settings.display;
import android.content.Context;
+import android.widget.Switch;
-public class AutoBrightnessDetailPreferenceController extends AutoBrightnessPreferenceController {
+import androidx.preference.PreferenceScreen;
+
+import com.android.settingslib.widget.MainSwitchPreference;
+import com.android.settingslib.widget.OnMainSwitchChangeListener;
+
+/**
+ * Controller that updates the adaptive brightness.
+ */
+public class AutoBrightnessDetailPreferenceController extends
+ AutoBrightnessPreferenceController implements OnMainSwitchChangeListener {
public AutoBrightnessDetailPreferenceController(Context context, String key) {
super(context, key);
@@ -36,4 +46,21 @@
public boolean isPublicSlice() {
return true;
}
+
+ @Override
+ public void displayPreference(PreferenceScreen screen) {
+ super.displayPreference(screen);
+
+ MainSwitchPreference pref = (MainSwitchPreference) screen.findPreference(
+ getPreferenceKey());
+ pref.addOnSwitchChangeListener(this);
+ pref.updateStatus(isChecked());
+ }
+
+ @Override
+ public void onSwitchChanged(Switch switchView, boolean isChecked) {
+ if (isChecked != isChecked()) {
+ setChecked(isChecked);
+ }
+ }
}
diff --git a/src/com/android/settings/display/AutoRotateSwitchBarController.java b/src/com/android/settings/display/AutoRotateSwitchBarController.java
new file mode 100644
index 0000000..0931a10
--- /dev/null
+++ b/src/com/android/settings/display/AutoRotateSwitchBarController.java
@@ -0,0 +1,102 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.display;
+
+import android.app.settings.SettingsEnums;
+import android.content.Context;
+import android.widget.Switch;
+
+import com.android.internal.view.RotationPolicy;
+import com.android.settings.overlay.FeatureFactory;
+import com.android.settings.widget.SettingsMainSwitchBar;
+import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
+import com.android.settingslib.core.lifecycle.Lifecycle;
+import com.android.settingslib.core.lifecycle.LifecycleObserver;
+import com.android.settingslib.core.lifecycle.events.OnStart;
+import com.android.settingslib.core.lifecycle.events.OnStop;
+import com.android.settingslib.widget.OnMainSwitchChangeListener;
+
+/**
+ * The switch controller for the location.
+ */
+public class AutoRotateSwitchBarController implements OnMainSwitchChangeListener,
+ LifecycleObserver, OnStart, OnStop {
+
+ private final SettingsMainSwitchBar mSwitchBar;
+ private final Context mContext;
+ private boolean mValidListener;
+ private final MetricsFeatureProvider mMetricsFeatureProvider;
+
+ public AutoRotateSwitchBarController(Context context, SettingsMainSwitchBar switchBar,
+ Lifecycle lifecycle) {
+ mSwitchBar = switchBar;
+ mContext = context;
+ mMetricsFeatureProvider = FeatureFactory.getFactory(context).getMetricsFeatureProvider();
+ if (lifecycle != null) {
+ lifecycle.addObserver(this);
+ }
+ }
+
+ @Override
+ public void onStart() {
+ if (!mValidListener) {
+ mSwitchBar.addOnSwitchChangeListener(this);
+ mValidListener = true;
+ }
+ onChange();
+ }
+
+ @Override
+ public void onStop() {
+ if (mValidListener) {
+ mSwitchBar.removeOnSwitchChangeListener(this);
+ mValidListener = false;
+ }
+ }
+
+ /**
+ * Listens to the state change of the rotation primary switch.
+ */
+ @Override
+ public void onSwitchChanged(Switch switchView, boolean isChecked) {
+ setRotationLock(isChecked);
+ }
+
+
+ protected void onChange() {
+ final boolean isEnabled = !RotationPolicy.isRotationLocked(mContext);
+ if (isEnabled != mSwitchBar.isChecked()) {
+ // set listener to null so that that code below doesn't trigger onCheckedChanged()
+ if (mValidListener) {
+ mSwitchBar.removeOnSwitchChangeListener(this);
+ }
+ mSwitchBar.setChecked(isEnabled);
+ if (mValidListener) {
+ mSwitchBar.addOnSwitchChangeListener(this);
+ }
+ }
+ }
+
+ private boolean setRotationLock(boolean isChecked) {
+ final boolean isLocked = !isChecked;
+ mMetricsFeatureProvider.action(mContext, SettingsEnums.ACTION_ROTATION_LOCK, isLocked);
+ RotationPolicy.setRotationLock(mContext, isLocked);
+ return true;
+ }
+
+}
+
diff --git a/src/com/android/settings/display/NightDisplayActivationPreferenceController.java b/src/com/android/settings/display/NightDisplayActivationPreferenceController.java
index cf9332b..e6217ff 100644
--- a/src/com/android/settings/display/NightDisplayActivationPreferenceController.java
+++ b/src/com/android/settings/display/NightDisplayActivationPreferenceController.java
@@ -16,43 +16,30 @@
package com.android.settings.display;
-import static android.view.accessibility.AccessibilityEvent.TYPE_VIEW_FOCUSED;
-
import android.content.Context;
import android.hardware.display.ColorDisplayManager;
import android.text.TextUtils;
-import android.view.View;
-import android.view.View.OnClickListener;
-import android.widget.Button;
+import android.widget.Switch;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
import com.android.settings.core.TogglePreferenceController;
import com.android.settings.overlay.FeatureFactory;
import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
-import com.android.settingslib.widget.LayoutPreference;
+import com.android.settingslib.widget.MainSwitchPreference;
+import com.android.settingslib.widget.OnMainSwitchChangeListener;
-public class NightDisplayActivationPreferenceController extends TogglePreferenceController {
+/**
+ * Controller that updates the night display.
+ */
+public class NightDisplayActivationPreferenceController extends
+ TogglePreferenceController implements OnMainSwitchChangeListener {
private final MetricsFeatureProvider mMetricsFeatureProvider;
private ColorDisplayManager mColorDisplayManager;
private NightDisplayTimeFormatter mTimeFormatter;
- private LayoutPreference mPreference;
-
- private Button mTurnOffButton;
- private Button mTurnOnButton;
-
- private final OnClickListener mListener = new OnClickListener() {
- @Override
- public void onClick(View v) {
- mMetricsFeatureProvider.logClickedPreference(mPreference, getMetricsCategory());
- mColorDisplayManager.setNightDisplayActivated(
- !mColorDisplayManager.isNightDisplayActivated());
- updateStateInternal(true);
- }
- };
+ private MainSwitchPreference mPreference;
public NightDisplayActivationPreferenceController(Context context, String key) {
super(context, key);
@@ -64,7 +51,7 @@
@Override
public int getAvailabilityStatus() {
- return ColorDisplayManager.isNightDisplayAvailable(mContext) ? AVAILABLE
+ return ColorDisplayManager.isNightDisplayAvailable(mContext) ? AVAILABLE_UNSEARCHABLE
: UNSUPPORTED_ON_DEVICE;
}
@@ -82,16 +69,24 @@
public void displayPreference(PreferenceScreen screen) {
super.displayPreference(screen);
- mPreference = screen.findPreference(getPreferenceKey());
- mTurnOnButton = mPreference.findViewById(R.id.night_display_turn_on_button);
- mTurnOnButton.setOnClickListener(mListener);
- mTurnOffButton = mPreference.findViewById(R.id.night_display_turn_off_button);
- mTurnOffButton.setOnClickListener(mListener);
+ mPreference = (MainSwitchPreference) screen.findPreference(getPreferenceKey());
+ mPreference.addOnSwitchChangeListener(this);
+ mPreference.updateStatus(mColorDisplayManager.isNightDisplayActivated());
+ }
+
+ @Override
+ public void onSwitchChanged(Switch switchView, boolean isChecked) {
+ final boolean activated = mColorDisplayManager.isNightDisplayActivated();
+ if (isChecked != activated) {
+ // TODO(b/179017365): Create a controller which extends TogglePreferenceController to
+ // control the toggle preference.
+ setChecked(isChecked);
+ }
}
@Override
public final void updateState(Preference preference) {
- updateStateInternal(false);
+ updateStateInternal();
}
/** FOR SLICES */
@@ -111,46 +106,14 @@
return mTimeFormatter.getAutoModeSummary(mContext, mColorDisplayManager);
}
- private void updateStateInternal(boolean selfChanged) {
- if (mTurnOnButton == null || mTurnOffButton == null) {
- return;
- }
-
+ private void updateStateInternal() {
final boolean isActivated = mColorDisplayManager.isNightDisplayActivated();
final int autoMode = mColorDisplayManager.getNightDisplayAutoMode();
- String buttonText;
if (autoMode == ColorDisplayManager.AUTO_MODE_CUSTOM_TIME) {
- buttonText = mContext.getString(isActivated
- ? R.string.night_display_activation_off_custom
- : R.string.night_display_activation_on_custom,
- mTimeFormatter.getFormattedTimeString(isActivated
- ? mColorDisplayManager.getNightDisplayCustomStartTime()
- : mColorDisplayManager.getNightDisplayCustomEndTime()));
- } else if (autoMode == ColorDisplayManager.AUTO_MODE_TWILIGHT) {
- buttonText = mContext.getString(isActivated
- ? R.string.night_display_activation_off_twilight
- : R.string.night_display_activation_on_twilight);
- } else {
- buttonText = mContext.getString(isActivated
- ? R.string.night_display_activation_off_manual
- : R.string.night_display_activation_on_manual);
- }
-
- if (isActivated) {
- mTurnOnButton.setVisibility(View.GONE);
- mTurnOffButton.setVisibility(View.VISIBLE);
- mTurnOffButton.setText(buttonText);
- if (selfChanged) {
- mTurnOffButton.sendAccessibilityEvent(TYPE_VIEW_FOCUSED);
- }
- } else {
- mTurnOnButton.setVisibility(View.VISIBLE);
- mTurnOffButton.setVisibility(View.GONE);
- mTurnOnButton.setText(buttonText);
- if (selfChanged) {
- mTurnOnButton.sendAccessibilityEvent(TYPE_VIEW_FOCUSED);
- }
+ mTimeFormatter.getFormattedTimeString(isActivated
+ ? mColorDisplayManager.getNightDisplayCustomStartTime()
+ : mColorDisplayManager.getNightDisplayCustomEndTime());
}
}
}
diff --git a/src/com/android/settings/display/ScreenTimeoutSettings.java b/src/com/android/settings/display/ScreenTimeoutSettings.java
index a90c886..b518646 100644
--- a/src/com/android/settings/display/ScreenTimeoutSettings.java
+++ b/src/com/android/settings/display/ScreenTimeoutSettings.java
@@ -158,7 +158,7 @@
screen.addPreference(pref);
}
- if (isScreenAttentionAvailable()) {
+ if (isScreenAttentionAvailable(getContext())) {
mAdaptiveSleepPermissionController.addToScreen(screen);
mAdaptiveSleepController.addToScreen(screen);
screen.addPreference(mPrivacyPreference);
@@ -199,11 +199,6 @@
return R.string.help_url_adaptive_sleep;
}
- private boolean isScreenAttentionAvailable() {
- return getResources().getBoolean(
- com.android.internal.R.bool.config_adaptive_sleep_available);
- }
-
private Long getMaxScreenTimeout(Context context) {
if (context == null) {
return Long.MAX_VALUE;
@@ -239,6 +234,11 @@
}
}
+ private static boolean isScreenAttentionAvailable(Context context) {
+ return context.getResources().getBoolean(
+ com.android.internal.R.bool.config_adaptive_sleep_available);
+ }
+
private static class TimeoutCandidateInfo extends CandidateInfo {
private final CharSequence mLabel;
private final String mKey;
@@ -269,11 +269,13 @@
new BaseSearchIndexProvider(R.xml.screen_timeout_settings) {
public List<SearchIndexableRaw> getRawDataToIndex(Context context,
boolean enabled) {
+ if (!isScreenAttentionAvailable(context)) {
+ return null;
+ }
final Resources res = context.getResources();
final SearchIndexableRaw data = new SearchIndexableRaw(context);
data.title = res.getString(R.string.adaptive_sleep_title);
data.key = AdaptiveSleepPreferenceController.PREFERENCE_KEY;
- data.screenTitle = res.getString(R.string.screen_timeout_title);
data.keywords = res.getString(R.string.adaptive_sleep_title);
final List<SearchIndexableRaw> result = new ArrayList<>(1);
diff --git a/src/com/android/settings/display/SmartAutoRotateController.java b/src/com/android/settings/display/SmartAutoRotateController.java
new file mode 100644
index 0000000..228d0c7
--- /dev/null
+++ b/src/com/android/settings/display/SmartAutoRotateController.java
@@ -0,0 +1,65 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.settings.display;
+
+import static android.provider.Settings.Secure.CAMERA_AUTOROTATE;
+
+import android.app.settings.SettingsEnums;
+import android.content.Context;
+import android.provider.Settings;
+
+import androidx.preference.Preference;
+
+import com.android.internal.view.RotationPolicy;
+import com.android.settings.core.TogglePreferenceController;
+import com.android.settings.overlay.FeatureFactory;
+import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
+
+/**
+ * SmartAutoRotateController controls whether auto rotation is enabled
+ */
+public class SmartAutoRotateController extends TogglePreferenceController implements
+ Preference.OnPreferenceChangeListener {
+
+ private final MetricsFeatureProvider mMetricsFeatureProvider;
+
+ public SmartAutoRotateController(Context context, String preferenceKey) {
+ super(context, preferenceKey);
+ mMetricsFeatureProvider = FeatureFactory.getFactory(context).getMetricsFeatureProvider();
+ }
+
+ @Override
+ public int getAvailabilityStatus() {
+ return !RotationPolicy.isRotationLocked(mContext)
+ ? AVAILABLE : DISABLED_DEPENDENT_SETTING;
+ }
+
+ @Override
+ public boolean isChecked() {
+ return Settings.Secure.getInt(mContext.getContentResolver(),
+ CAMERA_AUTOROTATE, 0) == 1;
+ }
+
+ @Override
+ public boolean setChecked(boolean isChecked) {
+ mMetricsFeatureProvider.action(mContext, SettingsEnums.ACTION_CAMERA_ROTATE_TOGGLE,
+ isChecked);
+ Settings.Secure.putInt(mContext.getContentResolver(),
+ CAMERA_AUTOROTATE,
+ isChecked ? 1 : 0);
+ return true;
+ }
+}
diff --git a/src/com/android/settings/display/SmartAutoRotatePreferenceController.java b/src/com/android/settings/display/SmartAutoRotatePreferenceController.java
new file mode 100644
index 0000000..01c8379
--- /dev/null
+++ b/src/com/android/settings/display/SmartAutoRotatePreferenceController.java
@@ -0,0 +1,70 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.display;
+
+import static android.provider.Settings.Secure.CAMERA_AUTOROTATE;
+
+import android.content.Context;
+import android.os.UserHandle;
+import android.provider.Settings;
+import android.util.Log;
+
+import androidx.preference.Preference;
+
+import com.android.internal.view.RotationPolicy;
+import com.android.settings.R;
+import com.android.settings.core.BasePreferenceController;
+
+/**
+ * SmartAutoRotatePreferenceController provides auto rotate summary in display settings
+ */
+public class SmartAutoRotatePreferenceController extends BasePreferenceController {
+
+ private static final String TAG = "SmartAutoRotatePreferenceController";
+
+ public SmartAutoRotatePreferenceController(Context context, String preferenceKey) {
+ super(context, preferenceKey);
+ }
+
+ @Override
+ public int getAvailabilityStatus() {
+ return RotationPolicy.isRotationLockToggleVisible(mContext)
+ ? AVAILABLE : UNSUPPORTED_ON_DEVICE;
+ }
+
+ protected void update(Preference preference) {
+ refreshSummary(preference);
+ }
+
+ @Override
+ public CharSequence getSummary() {
+ int activeStringId = R.string.auto_rotate_option_off;
+ if (!RotationPolicy.isRotationLocked(mContext)) {
+ try {
+ final int cameraRotate = Settings.Secure.getIntForUser(
+ mContext.getContentResolver(),
+ CAMERA_AUTOROTATE,
+ UserHandle.USER_CURRENT);
+ activeStringId = cameraRotate == 1 ? R.string.auto_rotate_option_face_based
+ : R.string.auto_rotate_option_on;
+ } catch (Settings.SettingNotFoundException e) {
+ Log.w(TAG, "CAMERA_AUTOROTATE setting not found", e);
+ }
+ }
+ return mContext.getString(activeStringId);
+ }
+}
diff --git a/src/com/android/settings/display/SmartAutoRotatePreferenceFragment.java b/src/com/android/settings/display/SmartAutoRotatePreferenceFragment.java
new file mode 100644
index 0000000..205317d
--- /dev/null
+++ b/src/com/android/settings/display/SmartAutoRotatePreferenceFragment.java
@@ -0,0 +1,147 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.settings.display;
+
+import android.app.settings.SettingsEnums;
+import android.content.Context;
+import android.os.Bundle;
+import android.text.Html;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import androidx.preference.Preference;
+
+import com.android.internal.view.RotationPolicy;
+import com.android.settings.R;
+import com.android.settings.SettingsActivity;
+import com.android.settings.dashboard.DashboardFragment;
+import com.android.settings.search.BaseSearchIndexProvider;
+import com.android.settings.widget.SettingsMainSwitchBar;
+import com.android.settingslib.core.AbstractPreferenceController;
+import com.android.settingslib.search.Indexable;
+import com.android.settingslib.widget.FooterPreference;
+import com.android.settingslib.search.SearchIndexable;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Preference fragment used to auto rotation
+ */
+@SuppressWarnings("WeakerAccess")
+@SearchIndexable
+public class SmartAutoRotatePreferenceFragment extends DashboardFragment {
+
+ private static final String TAG = "SmartAutoRotatePreferenceFragment";
+
+ private RotationPolicy.RotationPolicyListener mRotationPolicyListener;
+ private AutoRotateSwitchBarController mSwitchBarController;
+ private static final String FACE_SWITCH_PREFERENCE_ID = "face_based_rotate";
+ private static final String SMART_AUTO_ROTATE_CONTROLLER_KEY = "auto_rotate";
+
+ @Override
+ protected int getPreferenceScreenResId() {
+ return R.xml.auto_rotate_settings;
+ }
+
+ @Override
+ public View onCreateView(LayoutInflater inflater, ViewGroup container,
+ Bundle savedInstanceState) {
+ final View view = super.onCreateView(inflater, container, savedInstanceState);
+ final SettingsActivity activity = (SettingsActivity) getActivity();
+ final SettingsMainSwitchBar switchBar = activity.getSwitchBar();
+ switchBar.setTitle(
+ getContext().getString(R.string.auto_rotate_settings_primary_switch_title));
+ switchBar.show();
+ mSwitchBarController = new AutoRotateSwitchBarController(activity, switchBar,
+ getSettingsLifecycle());
+ return view;
+ }
+
+ @Override
+ public void onResume() {
+ super.onResume();
+ if (mRotationPolicyListener == null) {
+ mRotationPolicyListener = new RotationPolicy.RotationPolicyListener() {
+ @Override
+ public void onChange() {
+ mSwitchBarController.onChange();
+ final boolean isLocked = RotationPolicy.isRotationLocked(getContext());
+ final Preference preference = findPreference(FACE_SWITCH_PREFERENCE_ID);
+ if (preference != null) {
+ preference.setEnabled(!isLocked);
+ }
+ }
+ };
+ }
+ RotationPolicy.registerRotationPolicyListener(getPrefContext(),
+ mRotationPolicyListener);
+
+ findPreference(FooterPreference.KEY_FOOTER).setTitle(
+ Html.fromHtml(getString(R.string.smart_rotate_text_headline),
+ Html.FROM_HTML_MODE_COMPACT));
+ }
+
+
+ @Override
+ public void onPause() {
+ super.onPause();
+
+ if (mRotationPolicyListener != null) {
+ RotationPolicy.unregisterRotationPolicyListener(getPrefContext(),
+ mRotationPolicyListener);
+ }
+ }
+
+ @Override
+ public int getMetricsCategory() {
+ return SettingsEnums.DISPLAY_AUTO_ROTATE_SETTINGS;
+ }
+
+ @Override
+ protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
+ return buildPreferenceControllers(context);
+ }
+
+ private static List<AbstractPreferenceController> buildPreferenceControllers(
+ Context context) {
+ final List<AbstractPreferenceController> controllers = new ArrayList<>();
+ controllers.add(
+ new SmartAutoRotatePreferenceController(context, SMART_AUTO_ROTATE_CONTROLLER_KEY));
+ return controllers;
+ }
+
+ @Override
+ protected String getLogTag() {
+ return TAG;
+ }
+
+ public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
+ new BaseSearchIndexProvider(R.xml.auto_rotate_settings) {
+
+ @Override
+ public List<AbstractPreferenceController> createPreferenceControllers(
+ Context context) {
+ return buildPreferenceControllers(context);
+ }
+
+ @Override
+ protected boolean isPageSearchEnabled(Context context) {
+ return false;
+ }
+ };
+}
diff --git a/src/com/android/settings/display/darkmode/DarkModeActivationPreferenceController.java b/src/com/android/settings/display/darkmode/DarkModeActivationPreferenceController.java
index 1027dac..800e7e5 100644
--- a/src/com/android/settings/display/darkmode/DarkModeActivationPreferenceController.java
+++ b/src/com/android/settings/display/darkmode/DarkModeActivationPreferenceController.java
@@ -19,8 +19,7 @@
import android.content.Context;
import android.content.res.Configuration;
import android.os.PowerManager;
-import android.view.View;
-import android.widget.Button;
+import android.widget.Switch;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
@@ -29,22 +28,22 @@
import com.android.settings.core.BasePreferenceController;
import com.android.settings.overlay.FeatureFactory;
import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
-import com.android.settingslib.widget.LayoutPreference;
+import com.android.settingslib.widget.MainSwitchPreference;
+import com.android.settingslib.widget.OnMainSwitchChangeListener;
import java.time.LocalTime;
/**
* Controller for activate/deactivate night mode button
*/
-public class DarkModeActivationPreferenceController extends BasePreferenceController {
+public class DarkModeActivationPreferenceController extends BasePreferenceController implements
+ OnMainSwitchChangeListener {
private final UiModeManager mUiModeManager;
private final MetricsFeatureProvider mMetricsFeatureProvider;
private PowerManager mPowerManager;
- private Button mTurnOffButton;
- private Button mTurnOnButton;
private TimeFormatter mFormat;
- private LayoutPreference mPreference;
+ private MainSwitchPreference mPreference;
public DarkModeActivationPreferenceController(Context context, String preferenceKey) {
super(context, preferenceKey);
@@ -62,49 +61,9 @@
@Override
public final void updateState(Preference preference) {
-
- final boolean batterySaver = mPowerManager.isPowerSaveMode();
- if (batterySaver) {
- mTurnOnButton.setVisibility(View.GONE);
- mTurnOffButton.setVisibility(View.GONE);
- return;
- }
-
final boolean active = (mContext.getResources().getConfiguration().uiMode
& Configuration.UI_MODE_NIGHT_YES) != 0;
- updateNightMode(active);
- }
-
- private void updateNightMode(boolean active) {
- final int mode = mUiModeManager.getNightMode();
- String buttonText;
-
- if (mode == UiModeManager.MODE_NIGHT_AUTO) {
- buttonText = mContext.getString(active
- ? R.string.dark_ui_activation_off_auto
- : R.string.dark_ui_activation_on_auto);
- } else if (mode == UiModeManager.MODE_NIGHT_CUSTOM) {
- final LocalTime time = active
- ? mUiModeManager.getCustomNightModeStart()
- : mUiModeManager.getCustomNightModeEnd();
- final String timeStr = mFormat.of(time);
- buttonText = mContext.getString(active
- ? R.string.dark_ui_activation_off_custom
- : R.string.dark_ui_activation_on_custom, timeStr);
- } else {
- buttonText = mContext.getString(active
- ? R.string.dark_ui_activation_off_manual
- : R.string.dark_ui_activation_on_manual);
- }
- if (active) {
- mTurnOnButton.setVisibility(View.GONE);
- mTurnOffButton.setVisibility(View.VISIBLE);
- mTurnOffButton.setText(buttonText);
- } else {
- mTurnOnButton.setVisibility(View.VISIBLE);
- mTurnOffButton.setVisibility(View.GONE);
- mTurnOnButton.setText(buttonText);
- }
+ mPreference.updateStatus(active);
}
@Override
@@ -132,26 +91,19 @@
}
}
- private final View.OnClickListener mListener = new View.OnClickListener() {
- @Override
- public void onClick(View v) {
- mMetricsFeatureProvider.logClickedPreference(mPreference, getMetricsCategory());
- final boolean active = (mContext.getResources().getConfiguration().uiMode
- & Configuration.UI_MODE_NIGHT_YES) != 0;
- mUiModeManager.setNightModeActivated(!active);
- updateNightMode(!active);
- }
- };
+ @Override
+ public void onSwitchChanged(Switch switchView, boolean isChecked) {
+ mMetricsFeatureProvider.logClickedPreference(mPreference, getMetricsCategory());
+ final boolean active = (mContext.getResources().getConfiguration().uiMode
+ & Configuration.UI_MODE_NIGHT_YES) != 0;
+ mUiModeManager.setNightModeActivated(!active);
+ }
@Override
public void displayPreference(PreferenceScreen screen) {
super.displayPreference(screen);
-
- mPreference = screen.findPreference(getPreferenceKey());
- mTurnOnButton = mPreference.findViewById(R.id.dark_ui_turn_on_button);
- mTurnOnButton.setOnClickListener(mListener);
- mTurnOffButton = mPreference.findViewById(R.id.dark_ui_turn_off_button);
- mTurnOffButton.setOnClickListener(mListener);
+ mPreference = (MainSwitchPreference) screen.findPreference(getPreferenceKey());
+ mPreference.addOnSwitchChangeListener(this);
}
@Override
diff --git a/src/com/android/settings/emergency/EmergencyGestureEntrypointPreferenceController.java b/src/com/android/settings/emergency/EmergencyGestureEntrypointPreferenceController.java
index fa0b032..43ff215 100644
--- a/src/com/android/settings/emergency/EmergencyGestureEntrypointPreferenceController.java
+++ b/src/com/android/settings/emergency/EmergencyGestureEntrypointPreferenceController.java
@@ -62,7 +62,7 @@
@Override
public void updateState(Preference preference) {
super.updateState(preference);
- final boolean canHandleClicks = !mUseCustomIntent || mIntent != null;
+ final boolean canHandleClicks = canHandleClicks();
if (preference != null) {
preference.setEnabled(canHandleClicks);
}
@@ -86,6 +86,9 @@
if (!isConfigEnabled) {
return UNSUPPORTED_ON_DEVICE;
}
+ if (!canHandleClicks()) {
+ return UNSUPPORTED_ON_DEVICE;
+ }
return AVAILABLE;
}
@@ -117,6 +120,13 @@
return mUseCustomIntent;
}
+ /**
+ * Whether or not this setting can react to user click
+ */
+ private boolean canHandleClicks() {
+ return !mUseCustomIntent || mIntent != null;
+ }
+
private boolean canResolveIntent(Intent intent) {
final ResolveInfo resolveActivity = mContext.getPackageManager()
.resolveActivity(intent, 0);
diff --git a/src/com/android/settings/fuelgauge/BatterySaverController.java b/src/com/android/settings/fuelgauge/BatterySaverController.java
index acb5e32..a91f85c 100644
--- a/src/com/android/settings/fuelgauge/BatterySaverController.java
+++ b/src/com/android/settings/fuelgauge/BatterySaverController.java
@@ -15,37 +15,35 @@
*/
package com.android.settings.fuelgauge;
-import android.content.ContentResolver;
import android.content.Context;
-import android.database.ContentObserver;
-import android.os.Handler;
-import android.os.Looper;
import android.os.PowerManager;
-import android.provider.Settings;
-import android.provider.Settings.Global;
-import androidx.preference.Preference;
+import androidx.annotation.VisibleForTesting;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
-import com.android.settings.Utils;
-import com.android.settings.core.BasePreferenceController;
+import com.android.settings.core.TogglePreferenceController;
+import com.android.settings.widget.PrimarySwitchPreference;
import com.android.settingslib.core.lifecycle.LifecycleObserver;
import com.android.settingslib.core.lifecycle.events.OnStart;
import com.android.settingslib.core.lifecycle.events.OnStop;
import com.android.settingslib.fuelgauge.BatterySaverUtils;
-public class BatterySaverController extends BasePreferenceController
+/**
+ * Controller to update the battery saver entry preference.
+ */
+public class BatterySaverController extends TogglePreferenceController
implements LifecycleObserver, OnStart, OnStop, BatterySaverReceiver.BatterySaverListener {
private static final String KEY_BATTERY_SAVER = "battery_saver_summary";
private final BatterySaverReceiver mBatteryStateChangeReceiver;
private final PowerManager mPowerManager;
- private Preference mBatterySaverPref;
+
+ @VisibleForTesting
+ PrimarySwitchPreference mBatterySaverPref;
public BatterySaverController(Context context) {
super(context, KEY_BATTERY_SAVER);
- mPowerManager = (PowerManager) mContext.getSystemService(Context.POWER_SERVICE);
+ mPowerManager = mContext.getSystemService(PowerManager.class);
mBatteryStateChangeReceiver = new BatterySaverReceiver(context);
mBatteryStateChangeReceiver.setBatterySaverListener(this);
BatterySaverUtils.revertScheduleToNoneIfNeeded(context);
@@ -69,60 +67,38 @@
@Override
public void onStart() {
- mContext.getContentResolver().registerContentObserver(
- Settings.Global.getUriFor(Settings.Global.LOW_POWER_MODE_TRIGGER_LEVEL)
- , true, mObserver);
mBatteryStateChangeReceiver.setListening(true);
- updateSummary();
}
@Override
public void onStop() {
- mContext.getContentResolver().unregisterContentObserver(mObserver);
mBatteryStateChangeReceiver.setListening(false);
}
@Override
- public CharSequence getSummary() {
- final ContentResolver resolver = mContext.getContentResolver();
- final boolean isPowerSaveOn = mPowerManager.isPowerSaveMode();
- final int percent = Settings.Global.getInt(resolver,
- Settings.Global.LOW_POWER_MODE_TRIGGER_LEVEL, 0);
- final int mode = Settings.Global.getInt(resolver,
- Global.AUTOMATIC_POWER_SAVE_MODE, PowerManager.POWER_SAVE_MODE_TRIGGER_PERCENTAGE);
- if (isPowerSaveOn) {
- return mContext.getString(R.string.battery_saver_on_summary);
- } else if (mode == PowerManager.POWER_SAVE_MODE_TRIGGER_PERCENTAGE) {
- if (percent != 0) {
- return mContext.getString(R.string.battery_saver_off_scheduled_summary,
- Utils.formatPercentage(percent));
- } else {
- return mContext.getString(R.string.battery_saver_off_summary);
- }
- } else {
- return mContext.getString(R.string.battery_saver_auto_routine);
- }
- }
-
- private void updateSummary() {
- mBatterySaverPref.setSummary(getSummary());
- }
-
- private final ContentObserver mObserver = new ContentObserver(
- new Handler(Looper.getMainLooper())) {
- @Override
- public void onChange(boolean selfChange) {
- updateSummary();
- }
- };
-
- @Override
public void onPowerSaveModeChanged() {
- updateSummary();
+ final boolean isChecked = isChecked();
+ if (mBatterySaverPref != null && mBatterySaverPref.isChecked() != isChecked) {
+ mBatterySaverPref.setChecked(isChecked);
+ }
}
@Override
public void onBatteryChanged(boolean pluggedIn) {
+ if (mBatterySaverPref != null) {
+ mBatterySaverPref.setSwitchEnabled(!pluggedIn);
+ }
+ }
+
+ @Override
+ public boolean isChecked() {
+ return mPowerManager.isPowerSaveMode();
+ }
+
+ @Override
+ public boolean setChecked(boolean stateOn) {
+ return BatterySaverUtils.setPowerSaveMode(mContext, stateOn,
+ false /* needFirstTimeWarning */);
}
}
diff --git a/src/com/android/settings/fuelgauge/FakeUid.java b/src/com/android/settings/fuelgauge/FakeUid.java
index 309f259..db35e73 100644
--- a/src/com/android/settings/fuelgauge/FakeUid.java
+++ b/src/com/android/settings/fuelgauge/FakeUid.java
@@ -361,6 +361,11 @@
}
@Override
+ public long[] getCustomMeasuredEnergiesMicroJoules() {
+ return null;
+ }
+
+ @Override
public long getMobileRadioApWakeupCount(int which) {
return 0;
}
diff --git a/src/com/android/settings/fuelgauge/SmartBatteryPreferenceController.java b/src/com/android/settings/fuelgauge/SmartBatteryPreferenceController.java
index 040af9f..ea277a1 100644
--- a/src/com/android/settings/fuelgauge/SmartBatteryPreferenceController.java
+++ b/src/com/android/settings/fuelgauge/SmartBatteryPreferenceController.java
@@ -20,22 +20,27 @@
import android.content.Context;
import android.provider.Settings;
import android.text.TextUtils;
+import android.widget.Switch;
import androidx.preference.Preference;
-import androidx.preference.SwitchPreference;
+import androidx.preference.PreferenceScreen;
import com.android.settings.core.BasePreferenceController;
import com.android.settings.overlay.FeatureFactory;
+import com.android.settingslib.widget.MainSwitchPreference;
+import com.android.settingslib.widget.OnMainSwitchChangeListener;
/**
* Controller to change and update the smart battery toggle
*/
public class SmartBatteryPreferenceController extends BasePreferenceController implements
- Preference.OnPreferenceChangeListener {
+ OnMainSwitchChangeListener {
+
private static final String KEY_SMART_BATTERY = "smart_battery";
private static final int ON = 1;
private static final int OFF = 0;
private PowerUsageFeatureProvider mPowerUsageFeatureProvider;
+ private MainSwitchPreference mPreference;
public SmartBatteryPreferenceController(Context context) {
super(context, KEY_SMART_BATTERY);
@@ -65,14 +70,19 @@
super.updateState(preference);
final boolean smartBatteryOn = Settings.Global.getInt(mContext.getContentResolver(),
Settings.Global.ADAPTIVE_BATTERY_MANAGEMENT_ENABLED, ON) == ON;
- ((SwitchPreference) preference).setChecked(smartBatteryOn);
+ ((MainSwitchPreference) preference).updateStatus(smartBatteryOn);
}
@Override
- public boolean onPreferenceChange(Preference preference, Object newValue) {
- final boolean smartBatteryOn = (Boolean) newValue;
+ public void displayPreference(PreferenceScreen screen) {
+ super.displayPreference(screen);
+ mPreference = (MainSwitchPreference) screen.findPreference(getPreferenceKey());
+ mPreference.addOnSwitchChangeListener(this);
+ }
+
+ @Override
+ public void onSwitchChanged(Switch switchView, boolean isChecked) {
Settings.Global.putInt(mContext.getContentResolver(),
- Settings.Global.ADAPTIVE_BATTERY_MANAGEMENT_ENABLED, smartBatteryOn ? ON : OFF);
- return true;
+ Settings.Global.ADAPTIVE_BATTERY_MANAGEMENT_ENABLED, isChecked ? ON : OFF);
}
}
diff --git a/src/com/android/settings/gestures/GesturesSettingPreferenceController.java b/src/com/android/settings/gestures/GesturesSettingPreferenceController.java
index 9d4d538..e01bc88 100644
--- a/src/com/android/settings/gestures/GesturesSettingPreferenceController.java
+++ b/src/com/android/settings/gestures/GesturesSettingPreferenceController.java
@@ -21,12 +21,14 @@
import android.hardware.display.AmbientDisplayConfiguration;
import android.provider.Settings;
import android.text.TextUtils;
+import android.util.FeatureFlagUtils;
import androidx.annotation.NonNull;
import com.android.settings.R;
import com.android.settings.aware.AwareFeatureProvider;
import com.android.settings.core.BasePreferenceController;
+import com.android.settings.core.FeatureFlags;
import com.android.settings.overlay.FeatureFactory;
import com.android.settingslib.core.AbstractPreferenceController;
@@ -86,6 +88,10 @@
@Override
public CharSequence getSummary() {
+ if (FeatureFlagUtils.isEnabled(mContext, FeatureFlags.SILKY_HOME)) {
+ return null;
+ }
+
if (!mFeatureProvider.isSensorAvailable(mContext)) {
return "";
}
diff --git a/src/com/android/settings/homepage/SettingsHomepageActivity.java b/src/com/android/settings/homepage/SettingsHomepageActivity.java
index 2259441..aa7b2d1 100644
--- a/src/com/android/settings/homepage/SettingsHomepageActivity.java
+++ b/src/com/android/settings/homepage/SettingsHomepageActivity.java
@@ -46,11 +46,7 @@
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
-
setContentView(R.layout.settings_homepage_container);
- final View root = findViewById(R.id.settings_homepage_container);
- root.setSystemUiVisibility(
- View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION | View.SYSTEM_UI_FLAG_LAYOUT_STABLE);
final View appBar = findViewById(R.id.app_bar_container);
appBar.setMinimumHeight(getSearchBoxHeight());
diff --git a/src/com/android/settings/network/AirplaneSafeNetworksSlice.java b/src/com/android/settings/network/AirplaneSafeNetworksSlice.java
index fbef282..763e0c7 100644
--- a/src/com/android/settings/network/AirplaneSafeNetworksSlice.java
+++ b/src/com/android/settings/network/AirplaneSafeNetworksSlice.java
@@ -23,6 +23,7 @@
import android.content.IntentFilter;
import android.graphics.Color;
import android.graphics.drawable.ColorDrawable;
+import android.graphics.drawable.Drawable;
import android.net.Uri;
import android.net.wifi.WifiManager;
import android.util.Log;
@@ -33,6 +34,7 @@
import androidx.slice.builders.ListBuilder;
import androidx.slice.builders.ListBuilder.RowBuilder;
import androidx.slice.builders.SliceAction;
+import androidx.slice.core.SliceHints;
import com.android.settings.AirplaneModeEnabler;
import com.android.settings.R;
@@ -41,7 +43,6 @@
import com.android.settings.slices.CustomSliceable;
import com.android.settings.slices.SliceBackgroundWorker;
import com.android.settings.slices.SliceBroadcastReceiver;
-import com.android.settingslib.WirelessUtils;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
@@ -49,7 +50,6 @@
/**
* {@link CustomSliceable} for airplane-safe networks, used by generic clients.
*/
-// TODO(b/173413889): Need to update the slice to Button style.
public class AirplaneSafeNetworksSlice implements CustomSliceable,
AirplaneModeEnabler.OnAirplaneModeChangedListener {
@@ -60,26 +60,29 @@
/**
* Annotation for different action of the slice.
*
- * {@code VIEW_AIRPLANE_SAFE_NETWORKS} for action of turning on Wi-Fi.
- * {@code TURN_OFF_AIRPLANE_MODE} for action of turning off Airplane Mode.
+ * {@code TURN_ON_NETWORKS} for action of turning on Wi-Fi networks.
+ * {@code TURN_OFF_NETWORKS} for action of turning off Wi-Fi networks.
*/
@Retention(RetentionPolicy.SOURCE)
@IntDef(value = {
- Action.VIEW_AIRPLANE_SAFE_NETWORKS,
- Action.TURN_OFF_AIRPLANE_MODE,
+ Action.TURN_ON_NETWORKS,
+ Action.TURN_OFF_NETWORKS,
})
public @interface Action {
- int VIEW_AIRPLANE_SAFE_NETWORKS = 1;
- int TURN_OFF_AIRPLANE_MODE = 2;
+ int TURN_ON_NETWORKS = 1;
+ int TURN_OFF_NETWORKS = 2;
}
private final Context mContext;
private final AirplaneModeEnabler mAirplaneModeEnabler;
private final WifiManager mWifiManager;
+ private boolean mIsAirplaneModeOn;
+
public AirplaneSafeNetworksSlice(Context context) {
mContext = context;
mAirplaneModeEnabler = new AirplaneModeEnabler(context, this);
+ mIsAirplaneModeOn = mAirplaneModeEnabler.isAirplaneModeOn();
mWifiManager = mContext.getSystemService(WifiManager.class);
}
@@ -89,15 +92,14 @@
@Override
public Slice getSlice() {
- if (!WirelessUtils.isAirplaneModeOn(mContext)) {
- return null;
+ final ListBuilder listBuilder = new ListBuilder(mContext, getUri(), ListBuilder.INFINITY);
+ if (mIsAirplaneModeOn) {
+ listBuilder.addRow(new RowBuilder()
+ .setTitle(getTitle())
+ .addEndItem(getEndIcon(), SliceHints.ICON_IMAGE)
+ .setPrimaryAction(getSliceAction()));
}
-
- return new ListBuilder(mContext, getUri(), ListBuilder.INFINITY)
- .addRow(new RowBuilder()
- .setTitle(getTitle())
- .setPrimaryAction(getSliceAction()))
- .build();
+ return listBuilder.build();
}
@Override
@@ -108,21 +110,22 @@
@Override
public void onNotifyChange(Intent intent) {
final int action = intent.getIntExtra(ACTION_INTENT_EXTRA, 0);
- if (action == Action.VIEW_AIRPLANE_SAFE_NETWORKS) {
+ if (action == Action.TURN_ON_NETWORKS) {
if (!mWifiManager.isWifiEnabled()) {
- logd("Action: turn on WiFi");
+ logd("Action: turn on Wi-Fi networks");
mWifiManager.setWifiEnabled(true);
}
- } else if (action == Action.TURN_OFF_AIRPLANE_MODE) {
- if (WirelessUtils.isAirplaneModeOn(mContext)) {
- logd("Action: turn off Airplane mode");
- mAirplaneModeEnabler.setAirplaneMode(false);
+ } else if (action == Action.TURN_OFF_NETWORKS) {
+ if (mWifiManager.isWifiEnabled()) {
+ logd("Action: turn off Wi-Fi networks");
+ mWifiManager.setWifiEnabled(false);
}
}
}
@Override
public void onAirplaneModeChanged(boolean isAirplaneModeOn) {
+ mIsAirplaneModeOn = isAirplaneModeOn;
final AirplaneSafeNetworksWorker worker = SliceBackgroundWorker.getInstance(getUri());
if (worker != null) {
worker.updateSlice();
@@ -140,15 +143,26 @@
@Action
private int getAction() {
return mWifiManager.isWifiEnabled()
- ? Action.TURN_OFF_AIRPLANE_MODE
- : Action.VIEW_AIRPLANE_SAFE_NETWORKS;
+ ? Action.TURN_OFF_NETWORKS
+ : Action.TURN_ON_NETWORKS;
}
private String getTitle() {
return mContext.getText(
- (getAction() == Action.VIEW_AIRPLANE_SAFE_NETWORKS)
- ? R.string.view_airplane_safe_networks
- : R.string.turn_off_airplane_mode).toString();
+ (getAction() == Action.TURN_ON_NETWORKS)
+ ? R.string.turn_on_networks
+ : R.string.turn_off_networks).toString();
+ }
+
+ private IconCompat getEndIcon() {
+ final Drawable drawable = mContext.getDrawable(
+ (getAction() == Action.TURN_ON_NETWORKS) ? R.drawable.ic_airplane_safe_networks_24dp
+ : R.drawable.ic_airplanemode_active);
+ if (drawable == null) {
+ return Utils.createIconWithDrawable(new ColorDrawable(Color.TRANSPARENT));
+ }
+ drawable.setTintList(Utils.getColorAttr(mContext, android.R.attr.colorAccent));
+ return Utils.createIconWithDrawable(drawable);
}
private SliceAction getSliceAction() {
@@ -156,8 +170,7 @@
0 /* requestCode */, getIntent(),
PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE);
final IconCompat icon = Utils.createIconWithDrawable(new ColorDrawable(Color.TRANSPARENT));
- return SliceAction.createDeeplink(pendingIntent, icon, ListBuilder.ACTION_WITH_LABEL,
- getTitle());
+ return SliceAction.create(pendingIntent, icon, ListBuilder.ACTION_WITH_LABEL, getTitle());
}
@Override
diff --git a/src/com/android/settings/network/EnableMultiSimSidecar.java b/src/com/android/settings/network/EnableMultiSimSidecar.java
index c47e61a..4a32433 100644
--- a/src/com/android/settings/network/EnableMultiSimSidecar.java
+++ b/src/com/android/settings/network/EnableMultiSimSidecar.java
@@ -21,6 +21,7 @@
import android.content.Context;
import android.content.Intent;
import android.content.IntentFilter;
+import android.provider.Settings;
import android.telephony.CarrierConfigManager;
import android.telephony.TelephonyManager;
import android.telephony.UiccSlotInfo;
@@ -46,8 +47,7 @@
// Tags
private static final String TAG = "EnableMultiSimSidecar";
- // TODO(b/171846124): Pass timeout value from LPA to Settings
- private static final long ENABLE_MULTI_SIM_TIMEOUT_MILLS = 40 * 1000L;
+ private static final long DEFAULT_ENABLE_MULTI_SIM_TIMEOUT_MILLS = 40 * 1000L;
public static EnableMultiSimSidecar get(FragmentManager fm) {
return SidecarFragment.get(fm, TAG, EnableMultiSimSidecar.class, null /* args */);
@@ -77,7 +77,7 @@
TAG,
String.format(
"%d slots are active and %d SIMs are ready. Keep waiting until"
- + " timeout.",
+ + " timeout.",
activeSlotsCount, readySimsCount));
}
};
@@ -123,8 +123,12 @@
mCarrierConfigChangeReceiver,
new IntentFilter(CarrierConfigManager.ACTION_CARRIER_CONFIG_CHANGED));
mTelephonyManager.switchMultiSimConfig(mNumOfActiveSim);
- if (mSimCardStateChangedLatch.await(
- ENABLE_MULTI_SIM_TIMEOUT_MILLS, TimeUnit.MILLISECONDS)) {
+ long waitingTimeMillis =
+ Settings.Global.getLong(
+ getContext().getContentResolver(),
+ Settings.Global.ENABLE_MULTI_SLOT_TIMEOUT_MILLIS,
+ DEFAULT_ENABLE_MULTI_SIM_TIMEOUT_MILLS);
+ if (mSimCardStateChangedLatch.await(waitingTimeMillis, TimeUnit.MILLISECONDS)) {
Log.i(TAG, "Multi SIM were successfully enabled.");
return true;
} else {
diff --git a/src/com/android/settings/network/InternetPreferenceController.java b/src/com/android/settings/network/InternetPreferenceController.java
index 790ca00..24fe284 100644
--- a/src/com/android/settings/network/InternetPreferenceController.java
+++ b/src/com/android/settings/network/InternetPreferenceController.java
@@ -31,6 +31,7 @@
import android.telephony.SubscriptionManager;
import androidx.annotation.IdRes;
+import androidx.annotation.VisibleForTesting;
import androidx.lifecycle.Lifecycle;
import androidx.lifecycle.LifecycleObserver;
import androidx.lifecycle.OnLifecycleEvent;
@@ -42,6 +43,7 @@
import com.android.settings.wifi.WifiSummaryUpdater;
import com.android.settingslib.Utils;
import com.android.settingslib.core.AbstractPreferenceController;
+import com.android.settingslib.utils.ThreadUtils;
import java.util.HashMap;
import java.util.Map;
@@ -60,7 +62,8 @@
private InternetUpdater mInternetUpdater;
private @InternetUpdater.InternetType int mInternetType;
- private static Map<Integer, Integer> sIconMap = new HashMap<>();
+ @VisibleForTesting
+ static Map<Integer, Integer> sIconMap = new HashMap<>();
static {
sIconMap.put(INTERNET_APM, R.drawable.ic_airplanemode_active);
sIconMap.put(INTERNET_APM_NETWORKS, R.drawable.ic_airplane_safe_networks_24dp);
@@ -100,6 +103,7 @@
if (mPreference == null) {
return;
}
+
final @IdRes int icon = sIconMap.get(mInternetType);
if (icon != 0) {
final Drawable drawable = mContext.getDrawable(icon);
@@ -109,10 +113,17 @@
mPreference.setIcon(drawable);
}
}
+
+ if (mustUseWiFiHelperSummary(mSummaryHelper.isWifiConnected(),
+ mSummaryHelper.getSummary())) {
+ return;
+ }
+
if (mInternetType == INTERNET_CELLULAR) {
updateCellularSummary();
return;
}
+
final @IdRes int summary = sSummaryMap.get(mInternetType);
if (summary != 0) {
mPreference.setSummary(summary);
@@ -147,24 +158,42 @@
* @param internetType the internet type
*/
public void onInternetTypeChanged(@InternetUpdater.InternetType int internetType) {
+ final boolean needUpdate = (internetType != mInternetType);
mInternetType = internetType;
- updateState(mPreference);
+ if (needUpdate) {
+ ThreadUtils.postOnMainThread(() -> {
+ updateState(mPreference);
+ });
+ }
}
@Override
public void onSummaryChanged(String summary) {
- if (mPreference != null && mInternetType == INTERNET_WIFI) {
- mPreference.setSummary(summary);
- }
+ mustUseWiFiHelperSummary(mSummaryHelper.isWifiConnected(), summary);
}
- private void updateCellularSummary() {
+ @VisibleForTesting
+ boolean mustUseWiFiHelperSummary(boolean isWifiConnected, String summary) {
+ final boolean needUpdate = (mInternetType == INTERNET_WIFI)
+ || (mInternetType == INTERNET_APM_NETWORKS && isWifiConnected);
+ if (needUpdate && mPreference != null) {
+ mPreference.setSummary(summary);
+ }
+ return needUpdate;
+ }
+
+ @VisibleForTesting
+ void updateCellularSummary() {
final SubscriptionManager subscriptionManager =
mContext.getSystemService(SubscriptionManager.class);
if (subscriptionManager == null) {
return;
}
SubscriptionInfo subInfo = subscriptionManager.getDefaultDataSubscriptionInfo();
- mPreference.setSummary(subInfo.getDisplayName());
+ if (subInfo == null) {
+ return;
+ }
+ mPreference.setSummary(SubscriptionUtil.getUniqueSubscriptionDisplayName(
+ subInfo, mContext));
}
}
diff --git a/src/com/android/settings/network/InternetUpdater.java b/src/com/android/settings/network/InternetUpdater.java
index 1eafb60..d415b10 100644
--- a/src/com/android/settings/network/InternetUpdater.java
+++ b/src/com/android/settings/network/InternetUpdater.java
@@ -149,16 +149,15 @@
public InternetUpdater(Context context, Lifecycle lifecycle,
OnInternetTypeChangedListener listener) {
- if (lifecycle == null) {
- throw new IllegalArgumentException("Lifecycle must be set");
- }
mContext = context;
mAirplaneModeEnabler = new AirplaneModeEnabler(mContext, this);
mConnectivityManager = mContext.getSystemService(ConnectivityManager.class);
mWifiManager = mContext.getSystemService(WifiManager.class);
mWifiStateFilter = new IntentFilter(WifiManager.WIFI_STATE_CHANGED_ACTION);
mOnInternetTypeChangedListener = listener;
- lifecycle.addObserver(this);
+ if (lifecycle != null) {
+ lifecycle.addObserver(this);
+ }
}
/** @OnLifecycleEvent(ON_RESUME) */
diff --git a/src/com/android/settings/network/NetworkProviderCallsSmsController.java b/src/com/android/settings/network/NetworkProviderCallsSmsController.java
index 417c4a9..f83418b 100644
--- a/src/com/android/settings/network/NetworkProviderCallsSmsController.java
+++ b/src/com/android/settings/network/NetworkProviderCallsSmsController.java
@@ -20,8 +20,10 @@
import android.content.Context;
import android.os.UserManager;
+import android.telephony.ServiceState;
import android.telephony.SubscriptionInfo;
import android.telephony.SubscriptionManager;
+import android.telephony.TelephonyManager;
import androidx.annotation.VisibleForTesting;
import androidx.lifecycle.LifecycleObserver;
@@ -31,6 +33,7 @@
import com.android.settings.R;
import com.android.settingslib.RestrictedPreference;
+import com.android.settingslib.Utils;
import com.android.settingslib.core.AbstractPreferenceController;
import com.android.settingslib.core.lifecycle.Lifecycle;
@@ -45,7 +48,7 @@
private UserManager mUserManager;
private SubscriptionManager mSubscriptionManager;
private SubscriptionsChangeListener mSubscriptionsChangeListener;
-
+ private TelephonyManager mTelephonyManager;
private RestrictedPreference mPreference;
/**
@@ -57,6 +60,7 @@
mUserManager = context.getSystemService(UserManager.class);
mSubscriptionManager = context.getSystemService(SubscriptionManager.class);
+ mTelephonyManager = mContext.getSystemService(TelephonyManager.class);
if (lifecycle != null) {
mSubscriptionsChangeListener = new SubscriptionsChangeListener(context, this);
lifecycle.addObserver(this);
@@ -91,16 +95,18 @@
final StringBuilder summary = new StringBuilder();
for (SubscriptionInfo subInfo : subs) {
int subsSize = subs.size();
+ int subId = subInfo.getSubscriptionId();
final CharSequence displayName = SubscriptionUtil.getUniqueSubscriptionDisplayName(
subInfo, mContext);
// Set displayName as summary if there is only one valid SIM.
if (subsSize == 1
- && SubscriptionManager.isValidSubscriptionId(subInfo.getSubscriptionId())) {
+ && SubscriptionManager.isValidSubscriptionId(subId)
+ && isInService(subId)) {
return displayName;
}
- CharSequence status = getPreferredStatus(subInfo);
+ CharSequence status = getPreferredStatus(subsSize, subId);
if (status.toString().isEmpty()) {
// If there are 2 or more SIMs and one of these has no preferred status,
// set only its displayName as summary.
@@ -121,14 +127,14 @@
}
@VisibleForTesting
- protected CharSequence getPreferredStatus(SubscriptionInfo subInfo) {
- final int subId = subInfo.getSubscriptionId();
+ protected CharSequence getPreferredStatus(int subsSize, int subId) {
String status = "";
boolean isDataPreferred = subId == getDefaultVoiceSubscriptionId();
boolean isSmsPreferred = subId == getDefaultSmsSubscriptionId();
- if (!SubscriptionManager.isValidSubscriptionId(subId)) {
- status = setSummaryResId(R.string.calls_sms_unavailable);
+ if (!SubscriptionManager.isValidSubscriptionId(subId) || !isInService(subId)) {
+ status = setSummaryResId(subsSize > 1 ? R.string.calls_sms_unavailable :
+ R.string.calls_sms_temp_unavailable);
} else {
if (isDataPreferred && isSmsPreferred) {
status = setSummaryResId(R.string.calls_sms_preferred);
@@ -203,4 +209,11 @@
refreshSummary(mPreference);
update();
}
+
+ @VisibleForTesting
+ protected boolean isInService(int subId) {
+ ServiceState serviceState =
+ mTelephonyManager.createForSubscriptionId(subId).getServiceState();
+ return Utils.isInService(serviceState);
+ }
}
diff --git a/src/com/android/settings/network/NetworkProviderCallsSmsFragment.java b/src/com/android/settings/network/NetworkProviderCallsSmsFragment.java
index c6e17c5..a811978 100644
--- a/src/com/android/settings/network/NetworkProviderCallsSmsFragment.java
+++ b/src/com/android/settings/network/NetworkProviderCallsSmsFragment.java
@@ -27,6 +27,7 @@
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.network.telephony.CallsDefaultSubscriptionController;
import com.android.settings.network.telephony.NetworkProviderBackupCallingPreferenceController;
+import com.android.settings.network.telephony.NetworkProviderWfcFooterPreferenceController;
import com.android.settings.network.telephony.NetworkProviderWifiCallingPreferenceController;
import com.android.settings.network.telephony.SmsDefaultSubscriptionController;
import com.android.settings.search.BaseSearchIndexProvider;
@@ -45,6 +46,9 @@
@VisibleForTesting
static final String KEY_PREFERENCE_CATEGORY_BACKUP_CALLING =
"provider_model_backup_calling_category";
+ static final String KEY_PREFERENCE_CATEGORY_WFC_FOOTER =
+ "provider_model_calls_sms_footer";
+
@VisibleForTesting
static final String KEY_PREFERENCE_CALLS= "provider_model_calls_preference";
@VisibleForTesting
@@ -70,6 +74,12 @@
backupCallingPrefCtrl.init(getSettingsLifecycle());
controllers.add(backupCallingPrefCtrl);
+ NetworkProviderWfcFooterPreferenceController wfcFooterPreferenceController =
+ new NetworkProviderWfcFooterPreferenceController(context,
+ KEY_PREFERENCE_CATEGORY_WFC_FOOTER);
+ wfcFooterPreferenceController.init(getSettingsLifecycle());
+ controllers.add(wfcFooterPreferenceController);
+
return controllers;
}
diff --git a/src/com/android/settings/network/OWNERS b/src/com/android/settings/network/OWNERS
index 991ad43..4f17e3f 100644
--- a/src/com/android/settings/network/OWNERS
+++ b/src/com/android/settings/network/OWNERS
@@ -6,5 +6,6 @@
leechou@google.com
songferngwang@google.com
tomhsu@google.com
+zoeychen@google.com
# Emergency approvers in case the above are not available
diff --git a/src/com/android/settings/network/ProviderModelSlice.java b/src/com/android/settings/network/ProviderModelSlice.java
index 7e71fef..24077dd 100644
--- a/src/com/android/settings/network/ProviderModelSlice.java
+++ b/src/com/android/settings/network/ProviderModelSlice.java
@@ -26,7 +26,6 @@
import android.content.Intent;
import android.graphics.drawable.Drawable;
import android.net.Uri;
-import android.provider.Settings;
import android.telephony.SubscriptionManager;
import android.util.Log;
@@ -87,9 +86,6 @@
final ListBuilder listBuilder = mHelper.createListBuilder(getUri());
if (mHelper.isAirplaneModeEnabled() && !mWifiManager.isWifiEnabled()) {
log("Airplane mode is enabled.");
- listBuilder.setHeader(mHelper.createHeader(Settings.ACTION_AIRPLANE_MODE_SETTINGS));
- listBuilder.addGridRow(mHelper.createMessageGridRow(R.string.condition_airplane_title,
- Settings.ACTION_AIRPLANE_MODE_SETTINGS));
return listBuilder.build();
}
@@ -131,8 +127,9 @@
}
// Third section: Add the Wi-Fi items which are not connected.
- if (wifiList != null) {
- log("get Wi-Fi items which are not connected");
+ if (wifiList != null && wifiList.size() > 0) {
+ log("get Wi-Fi items which are not connected. Wi-Fi items : " + wifiList.size());
+
final List<WifiSliceItem> disconnectedWifiList = wifiList.stream()
.filter(wifiSliceItem -> wifiSliceItem.getConnectedState()
!= WifiEntry.CONNECTED_STATE_CONNECTED)
@@ -149,8 +146,8 @@
// 2) show all_network_unavailable:
// - while no wifi item + no carrier
// - while no wifi item + no data capability
- if (worker == null || wifiList == null) {
- log("wifiList is null");
+ if (worker == null || wifiList == null || wifiList.size() == 0) {
+ log("no wifi item");
int resId = R.string.non_carrier_network_unavailable;
if (!hasCarrier || !mHelper.isDataSimActive()) {
log("No carrier item or no carrier data.");
@@ -181,8 +178,9 @@
}
final int defaultSubId = subscriptionManager.getDefaultDataSubscriptionId();
log("defaultSubId:" + defaultSubId);
- if (!SubscriptionManager.isUsableSubscriptionId(defaultSubId)) {
- return; // No subscription - do nothing.
+
+ if (!defaultSubscriptionIsUsable(defaultSubId)) {
+ return;
}
boolean isToggleAction = intent.hasExtra(EXTRA_TOGGLE_STATE);
@@ -193,10 +191,14 @@
MobileNetworkUtils.setMobileDataEnabled(mContext, defaultSubId, newState,
false /* disableOtherSubscriptions */);
}
- doCarrierNetworkAction(isToggleAction, newState);
+
+ final boolean isDataEnabled =
+ isToggleAction ? newState : MobileNetworkUtils.isMobileDataEnabled(mContext);
+ doCarrierNetworkAction(isToggleAction, isDataEnabled);
}
- private void doCarrierNetworkAction(boolean isToggleAction, boolean isDataEnabled) {
+ @VisibleForTesting
+ void doCarrierNetworkAction(boolean isToggleAction, boolean isDataEnabled) {
final NetworkProviderWorker worker = getWorker();
if (worker == null) {
return;
@@ -207,7 +209,7 @@
return;
}
- if (MobileNetworkUtils.isMobileDataEnabled(mContext)) {
+ if (isDataEnabled) {
worker.connectCarrierNetwork();
}
}
@@ -257,4 +259,12 @@
.setTitle(mContext.getText(R.string.ethernet))
.setSubtitle(mContext.getText(R.string.cannot_switch_networks_while_connected));
}
+
+ /**
+ * Wrap the subscriptionManager call for test mocking.
+ */
+ @VisibleForTesting
+ protected boolean defaultSubscriptionIsUsable(int defaultSubId) {
+ return SubscriptionManager.isUsableSubscriptionId(defaultSubId);
+ }
}
diff --git a/src/com/android/settings/network/ProviderModelSliceHelper.java b/src/com/android/settings/network/ProviderModelSliceHelper.java
index 6c678ec..c7a7ad4 100644
--- a/src/com/android/settings/network/ProviderModelSliceHelper.java
+++ b/src/com/android/settings/network/ProviderModelSliceHelper.java
@@ -175,7 +175,7 @@
}
protected boolean isDataSimActive() {
- return MobileNetworkUtils.activeNetworkIsCellular(mContext);
+ return isNoCarrierData() ? false : MobileNetworkUtils.activeNetworkIsCellular(mContext);
}
protected boolean isNoCarrierData() {
diff --git a/src/com/android/settings/network/SubscriptionUtil.java b/src/com/android/settings/network/SubscriptionUtil.java
index ff5de3e..aa70459 100644
--- a/src/com/android/settings/network/SubscriptionUtil.java
+++ b/src/com/android/settings/network/SubscriptionUtil.java
@@ -24,15 +24,18 @@
import android.annotation.Nullable;
import android.content.Context;
import android.os.ParcelUuid;
+import android.telephony.PhoneNumberUtils;
import android.telephony.SubscriptionInfo;
import android.telephony.SubscriptionManager;
import android.telephony.TelephonyManager;
+import android.telephony.UiccCardInfo;
import android.telephony.UiccSlotInfo;
import android.text.TextUtils;
import android.util.Log;
import androidx.annotation.VisibleForTesting;
+import com.android.internal.telephony.MccTable;
import com.android.settings.network.telephony.DeleteEuiccSubscriptionDialogActivity;
import com.android.settings.network.telephony.ToggleSubscriptionDialogActivity;
import com.android.settingslib.DeviceInfoUtils;
@@ -239,12 +242,14 @@
public CharSequence uniqueName;
}
- final SubscriptionManager subscriptionManager =
- context.getSystemService(SubscriptionManager.class);
// Map of SubscriptionId to DisplayName
final Supplier<Stream<DisplayInfo>> originalInfos =
- () -> getActiveSubscriptions(subscriptionManager)
+ () -> getAvailableSubscriptions(context)
.stream()
+ .filter(i -> {
+ // Filter out null values.
+ return (i != null && i.getDisplayName() != null);
+ })
.map(i -> {
DisplayInfo info = new DisplayInfo();
info.subscriptionInfo = i;
@@ -338,6 +343,9 @@
@VisibleForTesting
public static CharSequence getUniqueSubscriptionDisplayName(
SubscriptionInfo info, Context context) {
+ if (info == null) {
+ return "";
+ }
return getUniqueSubscriptionDisplayName(info.getSubscriptionId(), context);
}
@@ -514,4 +522,64 @@
.filter(sub -> sub.isEmbedded() && groupUuid.equals(sub.getGroupUuid()))
.collect(Collectors.toList());
}
+
+ /** Returns the formatted phone number of a subscription. */
+ @Nullable
+ public static String getFormattedPhoneNumber(
+ Context context, SubscriptionInfo subscriptionInfo) {
+ if (subscriptionInfo == null) {
+ Log.e(TAG, "Invalid subscription.");
+ return null;
+ }
+
+ TelephonyManager telephonyManager = context.getSystemService(TelephonyManager.class);
+ String rawPhoneNumber =
+ telephonyManager.getLine1Number(subscriptionInfo.getSubscriptionId());
+ String countryIso = MccTable.countryCodeForMcc(subscriptionInfo.getMccString());
+ if (TextUtils.isEmpty(rawPhoneNumber)) {
+ return null;
+ }
+ return PhoneNumberUtils.formatNumber(rawPhoneNumber, countryIso);
+ }
+
+ /**
+ * Returns the subscription on a removable sim card. The device does not need to be on removable
+ * slot.
+ */
+ @Nullable
+ public static SubscriptionInfo getFirstRemovableSubscription(Context context) {
+ TelephonyManager telephonyManager = context.getSystemService(TelephonyManager.class);
+ SubscriptionManager subscriptionManager =
+ context.getSystemService(SubscriptionManager.class);
+ List<UiccCardInfo> cardInfos = telephonyManager.getUiccCardsInfo();
+ if (cardInfos == null) {
+ Log.w(TAG, "UICC cards info list is empty.");
+ return null;
+ }
+ List<SubscriptionInfo> allSubscriptions = subscriptionManager.getAllSubscriptionInfoList();
+ if (allSubscriptions == null) {
+ Log.w(TAG, "All subscription info list is empty.");
+ return null;
+ }
+ for (UiccCardInfo cardInfo : cardInfos) {
+ if (cardInfo == null) {
+ Log.w(TAG, "Got null card.");
+ continue;
+ }
+ if (!cardInfo.isRemovable()
+ || cardInfo.getCardId() == TelephonyManager.UNSUPPORTED_CARD_ID) {
+ Log.i(TAG, "Skip embedded card or invalid cardId on slot: "
+ + cardInfo.getSlotIndex());
+ continue;
+ }
+ Log.i(TAG, "Target removable cardId :" + cardInfo.getCardId());
+ for (SubscriptionInfo subInfo : allSubscriptions) {
+ // Match the removable card id with subscription card id.
+ if (cardInfo.getCardId() == subInfo.getCardId()) {
+ return subInfo;
+ }
+ }
+ }
+ return null;
+ }
}
diff --git a/src/com/android/settings/network/UiccSlotUtil.java b/src/com/android/settings/network/UiccSlotUtil.java
index 792f02a..6113f5a 100644
--- a/src/com/android/settings/network/UiccSlotUtil.java
+++ b/src/com/android/settings/network/UiccSlotUtil.java
@@ -18,6 +18,7 @@
import android.annotation.IntDef;
import android.content.Context;
+import android.provider.Settings;
import android.telephony.TelephonyManager;
import android.telephony.UiccSlotInfo;
import android.util.Log;
@@ -35,8 +36,8 @@
private static final String TAG = "UiccSlotUtil";
- // TODO(b/171846124): Pass timeout value from LPA to Settings
- private static final long WAIT_AFTER_SWITCH_TIMEOUT_MILLIS = 25000;
+ private static final long DEFAULT_WAIT_AFTER_SWITCH_TIMEOUT_MILLIS = 25 * 1000L;
+ ;
public static final int INVALID_PHYSICAL_SLOT_ID = -1;
@@ -115,12 +116,17 @@
private static void performSwitchToRemovableSlot(int slotId, Context context)
throws UiccSlotsException {
CarrierConfigChangedReceiver receiver = null;
+ long waitingTimeMillis =
+ Settings.Global.getLong(
+ context.getContentResolver(),
+ Settings.Global.EUICC_SWITCH_SLOT_TIMEOUT_MILLIS,
+ DEFAULT_WAIT_AFTER_SWITCH_TIMEOUT_MILLIS);
try {
CountDownLatch latch = new CountDownLatch(1);
receiver = new CarrierConfigChangedReceiver(latch);
receiver.registerOn(context);
switchSlots(context, slotId);
- latch.await(WAIT_AFTER_SWITCH_TIMEOUT_MILLIS, TimeUnit.MILLISECONDS);
+ latch.await(waitingTimeMillis, TimeUnit.MILLISECONDS);
} catch (InterruptedException e) {
Thread.currentThread().interrupt();
Log.e(TAG, "Failed switching to physical slot.", e);
diff --git a/src/com/android/settings/network/VpnPreferenceController.java b/src/com/android/settings/network/VpnPreferenceController.java
index 62589d5..9295414 100644
--- a/src/com/android/settings/network/VpnPreferenceController.java
+++ b/src/com/android/settings/network/VpnPreferenceController.java
@@ -19,12 +19,10 @@
import android.content.pm.PackageManager;
import android.content.pm.UserInfo;
import android.net.ConnectivityManager;
-import android.net.IConnectivityManager;
import android.net.Network;
import android.net.NetworkCapabilities;
import android.net.NetworkRequest;
-import android.os.RemoteException;
-import android.os.ServiceManager;
+import android.net.VpnManager;
import android.os.UserHandle;
import android.os.UserManager;
import android.provider.Settings;
@@ -64,7 +62,7 @@
private final String mToggleable;
private final UserManager mUserManager;
private final ConnectivityManager mConnectivityManager;
- private final IConnectivityManager mConnectivityManagerService;
+ private final VpnManager mVpnManager;
private Preference mPreference;
public VpnPreferenceController(Context context) {
@@ -74,8 +72,7 @@
mUserManager = (UserManager) context.getSystemService(Context.USER_SERVICE);
mConnectivityManager =
(ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE);
- mConnectivityManagerService = IConnectivityManager.Stub.asInterface(
- ServiceManager.getService(Context.CONNECTIVITY_SERVICE));
+ mVpnManager = context.getSystemService(VpnManager.class);
}
@Override
@@ -122,27 +119,20 @@
}
// Copied from SystemUI::SecurityControllerImpl
SparseArray<VpnConfig> vpns = new SparseArray<>();
- try {
- final List<UserInfo> users = mUserManager.getUsers();
- for (UserInfo user : users) {
- VpnConfig cfg = mConnectivityManagerService.getVpnConfig(user.id);
- if (cfg == null) {
+ final List<UserInfo> users = mUserManager.getUsers();
+ for (UserInfo user : users) {
+ VpnConfig cfg = mVpnManager.getVpnConfig(user.id);
+ if (cfg == null) {
+ continue;
+ } else if (cfg.legacy) {
+ // Legacy VPNs should do nothing if the network is disconnected. Third-party
+ // VPN warnings need to continue as traffic can still go to the app.
+ final LegacyVpnInfo legacyVpn = mVpnManager.getLegacyVpnInfo(user.id);
+ if (legacyVpn == null || legacyVpn.state != LegacyVpnInfo.STATE_CONNECTED) {
continue;
- } else if (cfg.legacy) {
- // Legacy VPNs should do nothing if the network is disconnected. Third-party
- // VPN warnings need to continue as traffic can still go to the app.
- final LegacyVpnInfo legacyVpn =
- mConnectivityManagerService.getLegacyVpnInfo(user.id);
- if (legacyVpn == null || legacyVpn.state != LegacyVpnInfo.STATE_CONNECTED) {
- continue;
- }
}
- vpns.put(user.id, cfg);
}
- } catch (RemoteException rme) {
- // Roll back to previous state
- Log.e(TAG, "Unable to list active VPNs", rme);
- return;
+ vpns.put(user.id, cfg);
}
final UserInfo userInfo = mUserManager.getUserInfo(UserHandle.myUserId());
final int uid;
diff --git a/src/com/android/settings/network/telephony/BackupCallingPreferenceController.java b/src/com/android/settings/network/telephony/BackupCallingPreferenceController.java
index daa4670..2c6c963 100644
--- a/src/com/android/settings/network/telephony/BackupCallingPreferenceController.java
+++ b/src/com/android/settings/network/telephony/BackupCallingPreferenceController.java
@@ -30,6 +30,7 @@
import androidx.preference.SwitchPreference;
import com.android.settings.R;
+import com.android.settings.network.SubscriptionUtil;
import java.util.Objects;
@@ -119,7 +120,8 @@
private String getLatestSummary() {
SubscriptionInfo subInfo = getSubscriptionInfo();
- return Objects.toString((subInfo == null) ? null : subInfo.getDisplayName(), "");
+ return Objects.toString((subInfo == null) ? null
+ : SubscriptionUtil.getUniqueSubscriptionDisplayName(subInfo, mContext), "");
}
private void updateSummary(String displayName) {
diff --git a/src/com/android/settings/network/telephony/CallsDefaultSubscriptionController.java b/src/com/android/settings/network/telephony/CallsDefaultSubscriptionController.java
index 99009c9..36b19ba 100644
--- a/src/com/android/settings/network/telephony/CallsDefaultSubscriptionController.java
+++ b/src/com/android/settings/network/telephony/CallsDefaultSubscriptionController.java
@@ -20,6 +20,8 @@
import android.telephony.SubscriptionInfo;
import android.telephony.SubscriptionManager;
+import com.android.settings.Utils;
+
public class CallsDefaultSubscriptionController extends DefaultSubscriptionController {
public CallsDefaultSubscriptionController(Context context, String preferenceKey) {
@@ -40,4 +42,13 @@
protected void setDefaultSubscription(int subscriptionId) {
mManager.setDefaultVoiceSubscriptionId(subscriptionId);
}
+
+ @Override
+ public CharSequence getSummary() {
+ if (Utils.isProviderModelEnabled(mContext)) {
+ return MobileNetworkUtils.getPreferredStatus(mContext, mManager, true);
+ } else {
+ return super.getSummary();
+ }
+ }
}
diff --git a/src/com/android/settings/network/telephony/DataDuringCallsPreferenceController.java b/src/com/android/settings/network/telephony/DataDuringCallsPreferenceController.java
index 1cd0e8e..110c582 100644
--- a/src/com/android/settings/network/telephony/DataDuringCallsPreferenceController.java
+++ b/src/com/android/settings/network/telephony/DataDuringCallsPreferenceController.java
@@ -96,7 +96,7 @@
@Override
public boolean setChecked(boolean isChecked) {
- mManager.setMobileDataPolicyEnabledStatus(
+ mManager.setMobileDataPolicyEnabled(
TelephonyManager.MOBILE_DATA_POLICY_DATA_ON_NON_DEFAULT_DURING_VOICE_CALL,
isChecked);
return true;
diff --git a/src/com/android/settings/network/telephony/MmsMessagePreferenceController.java b/src/com/android/settings/network/telephony/MmsMessagePreferenceController.java
index e3db5eb..85d6e73 100644
--- a/src/com/android/settings/network/telephony/MmsMessagePreferenceController.java
+++ b/src/com/android/settings/network/telephony/MmsMessagePreferenceController.java
@@ -88,7 +88,7 @@
@Override
public boolean setChecked(boolean isChecked) {
- mTelephonyManager.setMobileDataPolicyEnabledStatus(
+ mTelephonyManager.setMobileDataPolicyEnabled(
TelephonyManager.MOBILE_DATA_POLICY_MMS_ALWAYS_ALLOWED, isChecked);
return isChecked == mTelephonyManager.isMobileDataPolicyEnabled(
TelephonyManager.MOBILE_DATA_POLICY_MMS_ALWAYS_ALLOWED);
diff --git a/src/com/android/settings/network/telephony/MobileNetworkUtils.java b/src/com/android/settings/network/telephony/MobileNetworkUtils.java
index e8f9770..0834632 100644
--- a/src/com/android/settings/network/telephony/MobileNetworkUtils.java
+++ b/src/com/android/settings/network/telephony/MobileNetworkUtils.java
@@ -73,6 +73,7 @@
import com.android.settings.R;
import com.android.settings.Utils;
import com.android.settings.core.BasePreferenceController;
+import com.android.settings.network.SubscriptionUtil;
import com.android.settings.network.ims.WifiCallingQueryImsState;
import com.android.settings.network.telephony.TelephonyConstants.TelephonyManagerConstants;
import com.android.settingslib.development.DevelopmentSettingsEnabler;
@@ -600,8 +601,7 @@
final Drawable networkDrawable =
iconType == NO_CELL_DATA_TYPE_ICON
? EMPTY_DRAWABLE
- : context
- .getResources().getDrawable(iconType, context.getTheme());
+ : context.getResources().getDrawable(iconType, context.getTheme());
// Overlay the two drawables
final Drawable[] layers = {networkDrawable, signalDrawable};
@@ -920,4 +920,78 @@
}
return isWifiCallingEnabled;
}
+
+
+ /**
+ * Returns preferred status of Calls & SMS separately when Provider Model is enabled.
+ */
+ public static CharSequence getPreferredStatus(Context context,
+ SubscriptionManager subscriptionManager, boolean isPreferredCallStatus) {
+ final List<SubscriptionInfo> subs = SubscriptionUtil.getActiveSubscriptions(
+ subscriptionManager);
+ if (!subs.isEmpty()) {
+ final StringBuilder summary = new StringBuilder();
+ for (SubscriptionInfo subInfo : subs) {
+ int subsSize = subs.size();
+ final CharSequence displayName = SubscriptionUtil.getUniqueSubscriptionDisplayName(
+ subInfo, context);
+
+ // Set displayName as summary if there is only one valid SIM.
+ if (subsSize == 1
+ && SubscriptionManager.isValidSubscriptionId(subInfo.getSubscriptionId())) {
+ return displayName;
+ }
+
+ CharSequence status = isPreferredCallStatus
+ ? getPreferredCallStatus(context, subInfo)
+ : getPreferredSmsStatus(context, subInfo);
+ if (status.toString().isEmpty()) {
+ // If there are 2 or more SIMs and one of these has no preferred status,
+ // set only its displayName as summary.
+ summary.append(displayName);
+ } else {
+ summary.append(displayName)
+ .append(" (")
+ .append(status)
+ .append(")");
+ }
+ // Do not add ", " for the last subscription.
+ if (subInfo != subs.get(subs.size() - 1)) {
+ summary.append(", ");
+ }
+ }
+ return summary;
+ } else {
+ return "";
+ }
+ }
+
+ private static CharSequence getPreferredCallStatus(Context context, SubscriptionInfo subInfo) {
+ final int subId = subInfo.getSubscriptionId();
+ String status = "";
+ boolean isDataPreferred = subId == SubscriptionManager.getDefaultVoiceSubscriptionId();
+
+ if (isDataPreferred) {
+ status = setSummaryResId(context, R.string.calls_sms_preferred);
+ }
+
+ return status;
+ }
+
+ private static CharSequence getPreferredSmsStatus(Context context, SubscriptionInfo subInfo) {
+ final int subId = subInfo.getSubscriptionId();
+ String status = "";
+ boolean isSmsPreferred = subId == SubscriptionManager.getDefaultSmsSubscriptionId();
+
+ if (isSmsPreferred) {
+ status = setSummaryResId(context, R.string.calls_sms_preferred);
+ }
+
+ return status;
+ }
+
+ private static String setSummaryResId(Context context, int resId) {
+ return context.getResources().getString(resId);
+ }
+
}
diff --git a/src/com/android/settings/network/telephony/NetworkProviderBackupCallingPreferenceController.java b/src/com/android/settings/network/telephony/NetworkProviderBackupCallingPreferenceController.java
index f6a7d93..b66cea6 100644
--- a/src/com/android/settings/network/telephony/NetworkProviderBackupCallingPreferenceController.java
+++ b/src/com/android/settings/network/telephony/NetworkProviderBackupCallingPreferenceController.java
@@ -104,7 +104,7 @@
}
SwitchPreference pref = new SwitchPreference(mContext);
prefCtrl.updateState(pref);
- pref.setTitle(subInfo.getDisplayName());
+ pref.setTitle(SubscriptionUtil.getUniqueSubscriptionDisplayName(subInfo, mContext));
return pref;
}
diff --git a/src/com/android/settings/network/telephony/NetworkProviderWfcFooterPreferenceController.java b/src/com/android/settings/network/telephony/NetworkProviderWfcFooterPreferenceController.java
new file mode 100644
index 0000000..166094d
--- /dev/null
+++ b/src/com/android/settings/network/telephony/NetworkProviderWfcFooterPreferenceController.java
@@ -0,0 +1,77 @@
+package com.android.settings.network.telephony;
+
+import android.content.Context;
+import android.content.Intent;
+import android.telephony.SubscriptionInfo;
+import android.telephony.SubscriptionManager;
+
+import androidx.preference.Preference;
+
+import com.android.settings.R;
+import com.android.settings.core.BasePreferenceController;
+import com.android.settings.network.SubscriptionUtil;
+import com.android.settings.utils.AnnotationSpan;
+import com.android.settingslib.HelpUtils;
+import com.android.settingslib.core.lifecycle.Lifecycle;
+import com.android.settingslib.core.lifecycle.LifecycleObserver;
+
+import java.util.List;
+
+public class NetworkProviderWfcFooterPreferenceController extends BasePreferenceController
+ implements LifecycleObserver {
+
+ /**
+ * Constructor.
+ */
+ public NetworkProviderWfcFooterPreferenceController(Context context, String preferenceKey) {
+ super(context, preferenceKey);
+ }
+
+ /**
+ * Initialize the binding with Lifecycle
+ *
+ * @param lifecycle Lifecycle of UI which owns this Preference
+ */
+ public void init(Lifecycle lifecycle) {
+ lifecycle.addObserver(this);
+ }
+
+ @Override
+ public void updateState(Preference preference) {
+ super.updateState(preference);
+
+ if (preference != null) {
+ // This is necessary to ensure that setting the title to the spannable string returned
+ // by getFooterText will be accepted. Internally, setTitle does an equality check on
+ // the spannable string being set to the text already set on the preference. That
+ // equality check apparently only takes into account the raw text and not and spannables
+ // that are part of the text. So we clear the title before applying the spannable
+ // footer to ensure it is accepted.
+ preference.setTitle("");
+ preference.setTitle(getFooterText());
+ }
+ }
+
+ private CharSequence getFooterText() {
+ final Intent helpIntent = HelpUtils.getHelpIntent(mContext,
+ mContext.getString(R.string.help_uri_wifi_calling),
+ mContext.getClass().getName());
+ final AnnotationSpan.LinkInfo linkInfo = new AnnotationSpan.LinkInfo(mContext,
+ "url", helpIntent);
+
+ return AnnotationSpan.linkify(mContext.getText(R.string.calls_sms_footnote), linkInfo);
+ }
+
+ @Override
+ public int getAvailabilityStatus() {
+ final SubscriptionManager subscriptionManager =
+ mContext.getSystemService(SubscriptionManager.class);
+ final List<SubscriptionInfo> subscriptions = SubscriptionUtil.getActiveSubscriptions(
+ subscriptionManager);
+ if (subscriptions.size() >= 1) {
+ return AVAILABLE;
+ } else {
+ return CONDITIONALLY_UNAVAILABLE;
+ }
+ }
+}
diff --git a/src/com/android/settings/network/telephony/NetworkProviderWifiCallingPreferenceController.java b/src/com/android/settings/network/telephony/NetworkProviderWifiCallingPreferenceController.java
index f49a322..7a0ac14 100644
--- a/src/com/android/settings/network/telephony/NetworkProviderWifiCallingPreferenceController.java
+++ b/src/com/android/settings/network/telephony/NetworkProviderWifiCallingPreferenceController.java
@@ -17,7 +17,6 @@
package com.android.settings.network.telephony;
import android.content.Context;
-import android.telephony.CarrierConfigManager;
import androidx.annotation.VisibleForTesting;
import androidx.preference.Preference;
diff --git a/src/com/android/settings/network/telephony/NetworkProviderWorker.java b/src/com/android/settings/network/telephony/NetworkProviderWorker.java
index e2e0264..50c56cf 100644
--- a/src/com/android/settings/network/telephony/NetworkProviderWorker.java
+++ b/src/com/android/settings/network/telephony/NetworkProviderWorker.java
@@ -43,8 +43,6 @@
import com.android.settingslib.mobile.MobileMappings.Config;
import java.util.Collections;
-import java.util.concurrent.Executor;
-
/**
* BackgroundWorker for Provider Model slice.
@@ -63,6 +61,7 @@
private DataConnectivityListener mConnectivityListener;
private int mDefaultDataSubid = SubscriptionManager.INVALID_SUBSCRIPTION_ID;
private final Context mContext;
+ final Handler mHandler;
@VisibleForTesting
final PhoneStateListener mPhoneStateListener;
private TelephonyManager mTelephonyManager;
@@ -76,15 +75,15 @@
public NetworkProviderWorker(Context context, Uri uri) {
super(context, uri);
// Mobile data worker
- final Handler handler = new Handler(Looper.getMainLooper());
- mMobileDataObserver = new DataContentObserver(handler, this);
+ mHandler = new Handler(Looper.getMainLooper());
+ mMobileDataObserver = new DataContentObserver(mHandler, this);
mContext = context;
mDefaultDataSubid = getDefaultDataSubscriptionId();
mTelephonyManager = mContext.getSystemService(
TelephonyManager.class).createForSubscriptionId(mDefaultDataSubid);
- mPhoneStateListener = new NetworkProviderPhoneStateListener(handler::post);
+ mPhoneStateListener = new NetworkProviderPhoneStateListener();
mSubscriptionsListener = new SubscriptionsChangeListener(context, this);
mDataEnabledListener = new MobileDataEnabledListener(context, this);
mConnectivityListener = new DataConnectivityListener(context, this);
@@ -102,9 +101,7 @@
mDataEnabledListener.start(mDefaultDataSubid);
mConnectivityListener.start();
mSignalStrengthListener.resume();
- mTelephonyManager.listen(mPhoneStateListener, PhoneStateListener.LISTEN_SERVICE_STATE
- | PhoneStateListener.LISTEN_DISPLAY_INFO_CHANGED);
-
+ mTelephonyManager.registerPhoneStateListener(mHandler::post, mPhoneStateListener);
super.onSlicePinned();
}
@@ -115,7 +112,7 @@
mDataEnabledListener.stop();
mConnectivityListener.stop();
mSignalStrengthListener.pause();
- mTelephonyManager.listen(mPhoneStateListener, PhoneStateListener.LISTEN_NONE);
+ mTelephonyManager.unregisterPhoneStateListener(mPhoneStateListener);
super.onSliceUnpinned();
}
@@ -145,13 +142,12 @@
return;
}
if (SubscriptionManager.isUsableSubscriptionId(defaultDataSubId)) {
- mTelephonyManager.listen(mPhoneStateListener, PhoneStateListener.LISTEN_NONE);
+ mTelephonyManager.unregisterPhoneStateListener(mPhoneStateListener);
mMobileDataObserver.unregister(mContext);
mSignalStrengthListener.updateSubscriptionIds(Collections.singleton(defaultDataSubId));
mTelephonyManager = mTelephonyManager.createForSubscriptionId(defaultDataSubId);
- mTelephonyManager.listen(mPhoneStateListener, PhoneStateListener.LISTEN_SERVICE_STATE
- | PhoneStateListener.LISTEN_DISPLAY_INFO_CHANGED);
+ mTelephonyManager.registerPhoneStateListener(mHandler::post, mPhoneStateListener);
mMobileDataObserver.register(mContext, mDefaultDataSubid);
mConfig = getConfig(mContext);
} else {
@@ -221,11 +217,10 @@
}
}
- class NetworkProviderPhoneStateListener extends PhoneStateListener {
- NetworkProviderPhoneStateListener(Executor executor) {
- super(executor);
- }
-
+ class NetworkProviderPhoneStateListener extends PhoneStateListener implements
+ PhoneStateListener.DataConnectionStateChangedListener,
+ PhoneStateListener.DisplayInfoChangedListener,
+ PhoneStateListener.ServiceStateChangedListener {
@Override
public void onServiceStateChanged(ServiceState state) {
Log.d(TAG, "onServiceStateChanged voiceState=" + state.getState()
@@ -239,6 +234,13 @@
mTelephonyDisplayInfo = telephonyDisplayInfo;
updateSlice();
}
+
+ @Override
+ public void onDataConnectionStateChanged(int state, int networkType) {
+ Log.d(TAG,
+ "onDataConnectionStateChanged: networkType=" + networkType + " state=" + state);
+ updateSlice();
+ }
}
@VisibleForTesting
diff --git a/src/com/android/settings/network/telephony/SmsDefaultSubscriptionController.java b/src/com/android/settings/network/telephony/SmsDefaultSubscriptionController.java
index fadddd5..ca8c0f6 100644
--- a/src/com/android/settings/network/telephony/SmsDefaultSubscriptionController.java
+++ b/src/com/android/settings/network/telephony/SmsDefaultSubscriptionController.java
@@ -21,6 +21,8 @@
import android.telephony.SubscriptionInfo;
import android.telephony.SubscriptionManager;
+import com.android.settings.Utils;
+
public class SmsDefaultSubscriptionController extends DefaultSubscriptionController {
private final boolean mIsAskEverytimeSupported;
@@ -56,4 +58,13 @@
// Not supporting calling account override by VoIP
return null;
}
+
+ @Override
+ public CharSequence getSummary() {
+ if (Utils.isProviderModelEnabled(mContext)) {
+ return MobileNetworkUtils.getPreferredStatus(mContext, mManager, false);
+ } else {
+ return super.getSummary();
+ }
+ }
}
diff --git a/src/com/android/settings/network/telephony/ToggleSubscriptionDialogActivity.java b/src/com/android/settings/network/telephony/ToggleSubscriptionDialogActivity.java
index c1be63c..d3b2af6 100644
--- a/src/com/android/settings/network/telephony/ToggleSubscriptionDialogActivity.java
+++ b/src/com/android/settings/network/telephony/ToggleSubscriptionDialogActivity.java
@@ -177,10 +177,7 @@
showRebootConfirmDialog();
return;
}
- Log.i(
- TAG,
- "Enabling DSDS without rebooting. "
- + getString(R.string.sim_action_enabling_sim_without_carrier_name));
+ Log.i(TAG, "Enabling DSDS without rebooting.");
showProgressDialog(
getString(R.string.sim_action_enabling_sim_without_carrier_name));
mEnableMultiSimSidecar.run(NUM_OF_SIMS_FOR_DSDS);
@@ -272,7 +269,7 @@
case SidecarFragment.State.ERROR:
mEnableMultiSimSidecar.reset();
Log.i(TAG, "Failed to switch to DSDS without rebooting.");
- ProgressDialogFragment.dismiss(getFragmentManager());
+ dismissProgressDialog();
showErrorDialog(
getString(R.string.dsds_activation_failure_title),
getString(R.string.dsds_activation_failure_body_msg2));
@@ -290,7 +287,7 @@
Log.i(TAG, "DSDS enabled, start to enable pSIM profile.");
handleTogglePsimAction();
- ProgressDialogFragment.dismiss(getFragmentManager());
+ dismissProgressDialog();
finish();
}
diff --git a/src/com/android/settings/nfc/NfcEnabler.java b/src/com/android/settings/nfc/NfcEnabler.java
index 777e7d1..88482d5 100644
--- a/src/com/android/settings/nfc/NfcEnabler.java
+++ b/src/com/android/settings/nfc/NfcEnabler.java
@@ -21,16 +21,17 @@
import android.provider.Settings;
import androidx.annotation.VisibleForTesting;
-import androidx.preference.SwitchPreference;
+
+import com.android.settingslib.widget.MainSwitchPreference;
/**
* NfcEnabler is a helper to manage the Nfc on/off checkbox preference. It turns on/off Nfc
* and ensures the summary of the preference reflects the current state.
*/
public class NfcEnabler extends BaseNfcEnabler {
- private final SwitchPreference mPreference;
+ private final MainSwitchPreference mPreference;
- public NfcEnabler(Context context, SwitchPreference preference) {
+ public NfcEnabler(Context context, MainSwitchPreference preference) {
super(context);
mPreference = preference;
}
@@ -39,19 +40,19 @@
protected void handleNfcStateChanged(int newState) {
switch (newState) {
case NfcAdapter.STATE_OFF:
- mPreference.setChecked(false);
+ mPreference.updateStatus(false);
mPreference.setEnabled(isToggleable());
break;
case NfcAdapter.STATE_ON:
- mPreference.setChecked(true);
+ mPreference.updateStatus(true);
mPreference.setEnabled(true);
break;
case NfcAdapter.STATE_TURNING_ON:
- mPreference.setChecked(true);
+ mPreference.updateStatus(true);
mPreference.setEnabled(false);
break;
case NfcAdapter.STATE_TURNING_OFF:
- mPreference.setChecked(false);
+ mPreference.updateStatus(false);
mPreference.setEnabled(false);
break;
}
diff --git a/src/com/android/settings/nfc/NfcPreferenceController.java b/src/com/android/settings/nfc/NfcPreferenceController.java
index 9bf013c..b30e7c3f 100644
--- a/src/com/android/settings/nfc/NfcPreferenceController.java
+++ b/src/com/android/settings/nfc/NfcPreferenceController.java
@@ -23,24 +23,27 @@
import android.nfc.NfcAdapter;
import android.provider.Settings;
import android.util.Log;
+import android.widget.Switch;
import androidx.preference.PreferenceScreen;
-import androidx.preference.SwitchPreference;
import com.android.settings.core.TogglePreferenceController;
import com.android.settings.slices.SliceBackgroundWorker;
import com.android.settingslib.core.lifecycle.LifecycleObserver;
import com.android.settingslib.core.lifecycle.events.OnPause;
import com.android.settingslib.core.lifecycle.events.OnResume;
+import com.android.settingslib.widget.MainSwitchPreference;
+import com.android.settingslib.widget.OnMainSwitchChangeListener;
import java.io.IOException;
public class NfcPreferenceController extends TogglePreferenceController
- implements LifecycleObserver, OnResume, OnPause {
+ implements LifecycleObserver, OnResume, OnPause, OnMainSwitchChangeListener {
public static final String KEY_TOGGLE_NFC = "toggle_nfc";
private final NfcAdapter mNfcAdapter;
private NfcEnabler mNfcEnabler;
+ private MainSwitchPreference mPreference;
public NfcPreferenceController(Context context, String key) {
super(context, key);
@@ -55,10 +58,16 @@
return;
}
- final SwitchPreference switchPreference = screen.findPreference(getPreferenceKey());
+ mPreference = (MainSwitchPreference) screen.findPreference(getPreferenceKey());
+ mPreference.addOnSwitchChangeListener(this);
+ mNfcEnabler = new NfcEnabler(mContext, mPreference);
+ }
- mNfcEnabler = new NfcEnabler(mContext, switchPreference);
-
+ @Override
+ public void onSwitchChanged(Switch switchView, boolean isChecked) {
+ if (isChecked != mNfcAdapter.isEnabled()) {
+ setChecked(isChecked);
+ }
}
@Override
@@ -129,12 +138,12 @@
* Listener for background changes to NFC.
*
* <p>
- * Listen to broadcasts from {@link NfcAdapter}. The worker will call notify changed on the
- * NFC Slice only when the following extras are present in the broadcast:
- * <ul>
- * <li>{@link NfcAdapter#STATE_ON}</li>
- * <li>{@link NfcAdapter#STATE_OFF}</li>
- * </ul>
+ * Listen to broadcasts from {@link NfcAdapter}. The worker will call notify changed on the
+ * NFC Slice only when the following extras are present in the broadcast:
+ * <ul>
+ * <li>{@link NfcAdapter#STATE_ON}</li>
+ * <li>{@link NfcAdapter#STATE_OFF}</li>
+ * </ul>
*/
public static class NfcSliceWorker extends SliceBackgroundWorker<Void> {
@@ -185,7 +194,7 @@
NO_EXTRA);
// Do nothing if state change is empty, or an intermediate step.
- if ( (nfcStateExtra == NO_EXTRA)
+ if ((nfcStateExtra == NO_EXTRA)
|| (nfcStateExtra == NfcAdapter.STATE_TURNING_ON)
|| (nfcStateExtra == NfcAdapter.STATE_TURNING_OFF)) {
Log.d(TAG, "Transitional update, dropping broadcast");
diff --git a/src/com/android/settings/notification/AssistantCapabilityPreferenceController.java b/src/com/android/settings/notification/AssistantCapabilityPreferenceController.java
deleted file mode 100644
index 3c6f17f..0000000
--- a/src/com/android/settings/notification/AssistantCapabilityPreferenceController.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * Copyright (C) 2019 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.notification;
-
-import android.content.Context;
-import android.service.notification.Adjustment;
-
-import com.android.settings.core.TogglePreferenceController;
-
-import com.google.common.annotations.VisibleForTesting;
-
-import java.util.List;
-
-public class AssistantCapabilityPreferenceController extends TogglePreferenceController {
-
- static final String PRIORITIZER_KEY = "asst_capability_prioritizer";
- static final String RANKING_KEY = "asst_capability_ranking";
- static final String SMART_KEY = "asst_capabilities_actions_replies";
- private NotificationBackend mBackend;
-
- public AssistantCapabilityPreferenceController(Context context, String key) {
- super(context, key);
- mBackend = new NotificationBackend();
- }
-
- @VisibleForTesting
- void setBackend(NotificationBackend backend) {
- mBackend = backend;
- }
-
- @Override
- public boolean isChecked() {
- List<String> capabilities = mBackend.getAssistantAdjustments(mContext.getPackageName());
- if (PRIORITIZER_KEY.equals(getPreferenceKey())) {
- return capabilities.contains(Adjustment.KEY_IMPORTANCE);
- } else if (RANKING_KEY.equals(getPreferenceKey())) {
- return capabilities.contains(Adjustment.KEY_RANKING_SCORE);
- } else if (SMART_KEY.equals(getPreferenceKey())) {
- return capabilities.contains(Adjustment.KEY_CONTEXTUAL_ACTIONS)
- && capabilities.contains(Adjustment.KEY_TEXT_REPLIES);
- }
- return false;
- }
-
- @Override
- public boolean setChecked(boolean isChecked) {
- if (PRIORITIZER_KEY.equals(getPreferenceKey())) {
- mBackend.allowAssistantAdjustment(Adjustment.KEY_IMPORTANCE, isChecked);
- } else if (RANKING_KEY.equals(getPreferenceKey())) {
- mBackend.allowAssistantAdjustment(Adjustment.KEY_RANKING_SCORE, isChecked);
- } else if (SMART_KEY.equals(getPreferenceKey())) {
- mBackend.allowAssistantAdjustment(Adjustment.KEY_CONTEXTUAL_ACTIONS, isChecked);
- mBackend.allowAssistantAdjustment(Adjustment.KEY_TEXT_REPLIES, isChecked);
- }
- return true;
- }
-
- @Override
- public int getAvailabilityStatus() {
- return mBackend.getAllowedNotificationAssistant() != null
- ? AVAILABLE : DISABLED_DEPENDENT_SETTING;
- }
-}
-
-
diff --git a/src/com/android/settings/notification/app/BlockPreferenceController.java b/src/com/android/settings/notification/app/BlockPreferenceController.java
index e5a7e98..4df3e28 100644
--- a/src/com/android/settings/notification/app/BlockPreferenceController.java
+++ b/src/com/android/settings/notification/app/BlockPreferenceController.java
@@ -72,16 +72,16 @@
bar.setDisabledByAdmin(mAdmin);
if (mChannel != null && !isChannelBlockable()) {
- bar.setEnabled(false);
+ bar.setSwitchBarEnabled(false);
}
if (mChannelGroup != null && !isChannelGroupBlockable()) {
- bar.setEnabled(false);
+ bar.setSwitchBarEnabled(false);
}
if (mChannel == null && mAppRow.systemApp
&& (!mAppRow.banned || mAppRow.lockedImportance)) {
- bar.setEnabled(false);
+ bar.setSwitchBarEnabled(false);
}
if (mChannel != null) {
diff --git a/src/com/android/settings/notification/zen/ZenModeButtonPreferenceController.java b/src/com/android/settings/notification/zen/ZenModeButtonPreferenceController.java
index dc338bd..a431883 100644
--- a/src/com/android/settings/notification/zen/ZenModeButtonPreferenceController.java
+++ b/src/com/android/settings/notification/zen/ZenModeButtonPreferenceController.java
@@ -16,37 +16,33 @@
package com.android.settings.notification.zen;
-import static android.view.accessibility.AccessibilityEvent.TYPE_VIEW_FOCUSED;
-
import android.app.settings.SettingsEnums;
import android.content.Context;
import android.provider.Settings;
-import android.view.View;
-import android.widget.Button;
+import android.widget.Switch;
import androidx.fragment.app.FragmentManager;
import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.notification.SettingsEnableZenModeDialog;
import com.android.settingslib.core.lifecycle.Lifecycle;
-import com.android.settingslib.widget.LayoutPreference;
+import com.android.settingslib.widget.MainSwitchPreference;
+import com.android.settingslib.widget.OnMainSwitchChangeListener;
public class ZenModeButtonPreferenceController extends AbstractZenModePreferenceController
- implements PreferenceControllerMixin {
+ implements PreferenceControllerMixin, OnMainSwitchChangeListener {
+
+ private static final String TAG = "EnableZenModeButton";
public static final String KEY = "zen_mode_toggle";
- private static final String TAG = "EnableZenModeButton";
private final FragmentManager mFragment;
- // DND can also be toggled from QS. If DND wasn't toggled by this preference, don't
- // reroute focus.
- private boolean mRefocusButton = false;
- private Button mZenButtonOn;
- private Button mZenButtonOff;
+ // DND can also be toggled from QS.
+ private MainSwitchPreference mPreference;
public ZenModeButtonPreferenceController(Context context, Lifecycle lifecycle, FragmentManager
fragment) {
@@ -65,25 +61,26 @@
}
@Override
+ public void displayPreference(PreferenceScreen screen) {
+ super.displayPreference(screen);
+ mPreference = (MainSwitchPreference) screen.findPreference(getPreferenceKey());
+ mPreference.addOnSwitchChangeListener(this);
+ }
+
+ @Override
+ public void onSwitchChanged(Switch switchView, boolean isChecked) {
+ if (isChecked) {
+ updateZenModeState(mPreference);
+ } else {
+ writeMetrics(mPreference, false);
+ mBackend.setZenMode(Settings.Global.ZEN_MODE_OFF);
+ }
+ }
+
+ @Override
public void updateState(Preference preference) {
super.updateState(preference);
- if (null == mZenButtonOn) {
- mZenButtonOn = ((LayoutPreference) preference)
- .findViewById(R.id.zen_mode_settings_turn_on_button);
- updateZenButtonOnClickListener(preference);
- }
-
- if (null == mZenButtonOff) {
- mZenButtonOff = ((LayoutPreference) preference)
- .findViewById(R.id.zen_mode_settings_turn_off_button);
- mZenButtonOff.setOnClickListener(v -> {
- mRefocusButton = true;
- writeMetrics(preference, false);
- mBackend.setZenMode(Settings.Global.ZEN_MODE_OFF);
- });
- }
-
updatePreference(preference);
}
@@ -92,41 +89,27 @@
case Settings.Global.ZEN_MODE_ALARMS:
case Settings.Global.ZEN_MODE_IMPORTANT_INTERRUPTIONS:
case Settings.Global.ZEN_MODE_NO_INTERRUPTIONS:
- mZenButtonOff.setVisibility(View.VISIBLE);
- mZenButtonOn.setVisibility(View.GONE);
- if (mRefocusButton) {
- mRefocusButton = false;
- mZenButtonOff.sendAccessibilityEvent(TYPE_VIEW_FOCUSED);
- }
+ mPreference.updateStatus(true);
break;
case Settings.Global.ZEN_MODE_OFF:
default:
- mZenButtonOff.setVisibility(View.GONE);
- updateZenButtonOnClickListener(preference);
- mZenButtonOn.setVisibility(View.VISIBLE);
- if (mRefocusButton) {
- mRefocusButton = false;
- mZenButtonOn.sendAccessibilityEvent(TYPE_VIEW_FOCUSED);
- }
+ mPreference.updateStatus(false);
}
}
- private void updateZenButtonOnClickListener(Preference preference) {
- mZenButtonOn.setOnClickListener(v -> {
- mRefocusButton = true;
- writeMetrics(preference, true);
- int zenDuration = getZenDuration();
- switch (zenDuration) {
- case Settings.Secure.ZEN_DURATION_PROMPT:
- new SettingsEnableZenModeDialog().show(mFragment, TAG);
- break;
- case Settings.Secure.ZEN_DURATION_FOREVER:
- mBackend.setZenMode(Settings.Global.ZEN_MODE_IMPORTANT_INTERRUPTIONS);
- break;
- default:
- mBackend.setZenModeForDuration(zenDuration);
- }
- });
+ private void updateZenModeState(Preference preference) {
+ writeMetrics(preference, true);
+ int zenDuration = getZenDuration();
+ switch (zenDuration) {
+ case Settings.Secure.ZEN_DURATION_PROMPT:
+ new SettingsEnableZenModeDialog().show(mFragment, TAG);
+ break;
+ case Settings.Secure.ZEN_DURATION_FOREVER:
+ mBackend.setZenMode(Settings.Global.ZEN_MODE_IMPORTANT_INTERRUPTIONS);
+ break;
+ default:
+ mBackend.setZenModeForDuration(zenDuration);
+ }
}
private void writeMetrics(Preference preference, boolean buttonOn) {
@@ -135,4 +118,4 @@
mMetricsFeatureProvider.action(mContext, SettingsEnums.ACTION_ZEN_TOGGLE_DND_BUTTON,
buttonOn);
}
-}
\ No newline at end of file
+}
diff --git a/src/com/android/settings/panel/InternetConnectivityPanel.java b/src/com/android/settings/panel/InternetConnectivityPanel.java
index 64a4699..c90d22b 100644
--- a/src/com/android/settings/panel/InternetConnectivityPanel.java
+++ b/src/com/android/settings/panel/InternetConnectivityPanel.java
@@ -16,6 +16,11 @@
package com.android.settings.panel;
+import static androidx.lifecycle.Lifecycle.Event.ON_PAUSE;
+import static androidx.lifecycle.Lifecycle.Event.ON_RESUME;
+
+import static com.android.settings.network.InternetUpdater.INTERNET_APM;
+import static com.android.settings.network.InternetUpdater.INTERNET_APM_NETWORKS;
import static com.android.settings.network.NetworkProviderSettings.ACTION_NETWORK_PROVIDER_SETTINGS;
import android.app.settings.SettingsEnums;
@@ -24,9 +29,14 @@
import android.net.Uri;
import android.provider.Settings;
+import androidx.annotation.VisibleForTesting;
+import androidx.lifecycle.LifecycleObserver;
+import androidx.lifecycle.OnLifecycleEvent;
+
import com.android.settings.R;
import com.android.settings.Utils;
import com.android.settings.network.AirplaneModePreferenceController;
+import com.android.settings.network.InternetUpdater;
import com.android.settings.slices.CustomSliceRegistry;
import java.util.ArrayList;
@@ -35,9 +45,15 @@
/**
* Represents the Internet Connectivity Panel.
*/
-public class InternetConnectivityPanel implements PanelContent {
+public class InternetConnectivityPanel implements PanelContent, LifecycleObserver,
+ InternetUpdater.OnInternetTypeChangedListener {
private final Context mContext;
+ @VisibleForTesting
+ boolean mIsProviderModelEnabled;
+ private PanelContentCallback mCallback;
+ private InternetUpdater mInternetUpdater;
+ private @InternetUpdater.InternetType int mInternetType;
public static InternetConnectivityPanel create(Context context) {
return new InternetConnectivityPanel(context);
@@ -45,18 +61,57 @@
private InternetConnectivityPanel(Context context) {
mContext = context.getApplicationContext();
+ mIsProviderModelEnabled = Utils.isProviderModelEnabled(mContext);
+ mInternetUpdater = new InternetUpdater(context, null /* Lifecycle */, this);
+ mInternetType = mInternetUpdater.getInternetType();
}
+ /** @OnLifecycleEvent(ON_RESUME) */
+ @OnLifecycleEvent(ON_RESUME)
+ public void onResume() {
+ if (!mIsProviderModelEnabled) {
+ return;
+ }
+ mInternetUpdater.onResume();
+ }
+
+ /** @OnLifecycleEvent(ON_PAUSE) */
+ @OnLifecycleEvent(ON_PAUSE)
+ public void onPause() {
+ if (!mIsProviderModelEnabled) {
+ return;
+ }
+ mInternetUpdater.onPause();
+ }
+
+ /**
+ * @return a string for the title of the Panel.
+ */
@Override
public CharSequence getTitle() {
- return mContext.getText(Utils.isProviderModelEnabled(mContext)
- ? R.string.provider_internet_settings : R.string.internet_connectivity_panel_title);
+ if (mIsProviderModelEnabled) {
+ return mContext.getText(mInternetType == INTERNET_APM_NETWORKS
+ ? R.string.airplane_mode_network_panel_title
+ : R.string.provider_internet_settings);
+ }
+ return mContext.getText(R.string.internet_connectivity_panel_title);
+ }
+
+ /**
+ * @return a string for the subtitle of the Panel.
+ */
+ @Override
+ public CharSequence getSubTitle() {
+ if (mIsProviderModelEnabled && mInternetType == INTERNET_APM) {
+ return mContext.getText(R.string.condition_airplane_title);
+ }
+ return null;
}
@Override
public List<Uri> getSlices() {
final List<Uri> uris = new ArrayList<>();
- if (Utils.isProviderModelEnabled(mContext)) {
+ if (mIsProviderModelEnabled) {
uris.add(CustomSliceRegistry.PROVIDER_MODEL_SLICE_URI);
uris.add(CustomSliceRegistry.AIRPLANE_SAFE_NETWORKS_SLICE_URI);
} else {
@@ -69,18 +124,21 @@
@Override
public Intent getSeeMoreIntent() {
- return new Intent(Utils.isProviderModelEnabled(mContext)
+ return new Intent(mIsProviderModelEnabled
? ACTION_NETWORK_PROVIDER_SETTINGS : Settings.ACTION_WIRELESS_SETTINGS)
.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
}
@Override
public boolean isCustomizedButtonUsed() {
- return Utils.isProviderModelEnabled(mContext);
+ return mIsProviderModelEnabled;
}
@Override
public CharSequence getCustomizedButtonTitle() {
+ if (mInternetType == INTERNET_APM) {
+ return null;
+ }
return mContext.getText(R.string.settings_button);
}
@@ -93,4 +151,47 @@
public int getMetricsCategory() {
return SettingsEnums.PANEL_INTERNET_CONNECTIVITY;
}
+
+ @Override
+ public void registerCallback(PanelContentCallback callback) {
+ mCallback = callback;
+ }
+
+ /**
+ * Called when internet type is changed.
+ *
+ * @param internetType the internet type
+ */
+ public void onInternetTypeChanged(@InternetUpdater.InternetType int internetType) {
+ if (internetType == mInternetType) {
+ return;
+ }
+
+ final boolean changeToApm = (internetType == INTERNET_APM);
+ final boolean changeFromApm = (mInternetType == INTERNET_APM);
+ final boolean changeWithApmNetworks =
+ (internetType == INTERNET_APM_NETWORKS || mInternetType == INTERNET_APM_NETWORKS);
+ mInternetType = internetType;
+
+ if (mCallback != null) {
+ if (changeToApm) {
+ // The internet type is changed to the airplane mode.
+ // Title: Internet
+ // Sub-Title: Airplane mode is on
+ // Settings button: Hide
+ mCallback.onHeaderChanged();
+ mCallback.onCustomizedButtonStateChanged();
+ } else if (changeFromApm) {
+ // The internet type is changed from the airplane mode.
+ // Title: Internet
+ // Settings button: Show
+ mCallback.onTitleChanged();
+ mCallback.onCustomizedButtonStateChanged();
+ } else if (changeWithApmNetworks) {
+ // The internet type is changed with the airplane mode networks.
+ // Title: Airplane mode networks / Internet
+ mCallback.onTitleChanged();
+ }
+ }
+ }
}
diff --git a/src/com/android/settings/panel/PanelContentCallback.java b/src/com/android/settings/panel/PanelContentCallback.java
index 63c2c55..f0e68a3 100644
--- a/src/com/android/settings/panel/PanelContentCallback.java
+++ b/src/com/android/settings/panel/PanelContentCallback.java
@@ -37,4 +37,9 @@
* It will be called when panel requests to close itself.
*/
void forceClose();
+
+ /**
+ * It will be called when panel requests to change the title.
+ */
+ void onTitleChanged();
}
diff --git a/src/com/android/settings/panel/PanelFragment.java b/src/com/android/settings/panel/PanelFragment.java
index 8eec24f..e7c1bef 100644
--- a/src/com/android/settings/panel/PanelFragment.java
+++ b/src/com/android/settings/panel/PanelFragment.java
@@ -26,6 +26,7 @@
import android.os.Bundle;
import android.os.Handler;
import android.text.TextUtils;
+import android.view.Gravity;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
@@ -94,6 +95,7 @@
private LinearLayout mPanelHeader;
private ImageView mTitleIcon;
private LinearLayout mTitleGroup;
+ private LinearLayout mHeaderLayout;
private TextView mHeaderTitle;
private TextView mHeaderSubtitle;
private int mMaxHeight;
@@ -202,6 +204,7 @@
mPanelHeader = mLayoutView.findViewById(R.id.panel_header);
mTitleIcon = mLayoutView.findViewById(R.id.title_icon);
mTitleGroup = mLayoutView.findViewById(R.id.title_group);
+ mHeaderLayout = mLayoutView.findViewById(R.id.header_layout);
mHeaderTitle = mLayoutView.findViewById(R.id.header_title);
mHeaderSubtitle = mLayoutView.findViewById(R.id.header_subtitle);
mFooterDivider = mLayoutView.findViewById(R.id.footer_divider);
@@ -239,13 +242,12 @@
final IconCompat icon = mPanel.getIcon();
final CharSequence title = mPanel.getTitle();
+ final CharSequence subtitle = mPanel.getSubTitle();
- if (icon != null) {
- enablePanelHeader(icon, title);
+ if (icon != null || (subtitle != null && subtitle.length() > 0)) {
+ enablePanelHeader(icon, title, subtitle);
} else {
- mTitleView.setVisibility(View.VISIBLE);
- mPanelHeader.setVisibility(View.GONE);
- mTitleView.setText(title);
+ enableTitle(title);
}
mFooterDivider.setVisibility(View.GONE);
@@ -254,13 +256,7 @@
mDoneButton.setOnClickListener(getCloseListener());
if (mPanel.isCustomizedButtonUsed()) {
- final CharSequence customTitle = mPanel.getCustomizedButtonTitle();
- if (TextUtils.isEmpty(customTitle)) {
- mSeeMoreButton.setVisibility(View.GONE);
- } else {
- mSeeMoreButton.setVisibility(View.VISIBLE);
- mSeeMoreButton.setText(customTitle);
- }
+ enableCustomizedButton();
} else if (mPanel.getSeeMoreIntent() == null) {
// If getSeeMoreIntent() is null hide the mSeeMoreButton.
mSeeMoreButton.setVisibility(View.GONE);
@@ -275,14 +271,16 @@
0 /* value */);
}
- private void enablePanelHeader(IconCompat icon, CharSequence title) {
+ private void enablePanelHeader(IconCompat icon, CharSequence title, CharSequence subtitle) {
mTitleView.setVisibility(View.GONE);
mPanelHeader.setVisibility(View.VISIBLE);
mPanelHeader.setAccessibilityPaneTitle(title);
mHeaderTitle.setText(title);
- mHeaderSubtitle.setText(mPanel.getSubTitle());
+ mHeaderSubtitle.setText(subtitle);
+ mHeaderSubtitle.setAccessibilityPaneTitle(subtitle);
if (icon != null) {
mTitleGroup.setVisibility(View.VISIBLE);
+ mHeaderLayout.setGravity(Gravity.LEFT);
mTitleIcon.setImageIcon(icon.toIcon(getContext()));
if (mPanel.getHeaderIconIntent() != null) {
mTitleIcon.setOnClickListener(getHeaderIconListener());
@@ -295,6 +293,24 @@
}
} else {
mTitleGroup.setVisibility(View.GONE);
+ mHeaderLayout.setGravity(Gravity.CENTER_HORIZONTAL);
+ }
+ }
+
+ private void enableTitle(CharSequence title) {
+ mPanelHeader.setVisibility(View.GONE);
+ mTitleView.setVisibility(View.VISIBLE);
+ mTitleView.setAccessibilityPaneTitle(title);
+ mTitleView.setText(title);
+ }
+
+ private void enableCustomizedButton() {
+ final CharSequence customTitle = mPanel.getCustomizedButtonTitle();
+ if (TextUtils.isEmpty(customTitle)) {
+ mSeeMoreButton.setVisibility(View.GONE);
+ } else {
+ mSeeMoreButton.setVisibility(View.VISIBLE);
+ mSeeMoreButton.setText(customTitle);
}
}
@@ -487,24 +503,14 @@
@Override
public void onCustomizedButtonStateChanged() {
ThreadUtils.postOnMainThread(() -> {
- mSeeMoreButton.setVisibility(
- mPanel.isCustomizedButtonUsed() ? View.VISIBLE : View.GONE);
- mSeeMoreButton.setText(mPanel.getCustomizedButtonTitle());
+ enableCustomizedButton();
});
}
@Override
public void onHeaderChanged() {
ThreadUtils.postOnMainThread(() -> {
- final IconCompat icon = mPanel.getIcon();
- if (icon != null) {
- mTitleIcon.setImageIcon(icon.toIcon(getContext()));
- mTitleGroup.setVisibility(View.VISIBLE);
- } else {
- mTitleGroup.setVisibility(View.GONE);
- }
- mHeaderTitle.setText(mPanel.getTitle());
- mHeaderSubtitle.setText(mPanel.getSubTitle());
+ enablePanelHeader(mPanel.getIcon(), mPanel.getTitle(), mPanel.getSubTitle());
});
}
@@ -514,6 +520,13 @@
getFragmentActivity().finish();
}
+ @Override
+ public void onTitleChanged() {
+ ThreadUtils.postOnMainThread(() -> {
+ enableTitle(mPanel.getTitle());
+ });
+ }
+
@VisibleForTesting
FragmentActivity getFragmentActivity() {
return getActivity();
diff --git a/src/com/android/settings/password/ChooseLockSettingsHelper.java b/src/com/android/settings/password/ChooseLockSettingsHelper.java
index 13d3912..29330f5 100644
--- a/src/com/android/settings/password/ChooseLockSettingsHelper.java
+++ b/src/com/android/settings/password/ChooseLockSettingsHelper.java
@@ -312,7 +312,7 @@
switch (mLockPatternUtils.getKeyguardStoredPasswordQuality(effectiveUserId)) {
case DevicePolicyManager.PASSWORD_QUALITY_SOMETHING:
launched = launchConfirmationActivity(request, title, header, description,
- returnCredentials
+ returnCredentials || forceVerifyPath
? ConfirmLockPattern.InternalActivity.class
: ConfirmLockPattern.class, returnCredentials, external,
forceVerifyPath, userId, alternateButton, allowAnyUser,
@@ -325,7 +325,7 @@
case DevicePolicyManager.PASSWORD_QUALITY_COMPLEX:
case DevicePolicyManager.PASSWORD_QUALITY_MANAGED:
launched = launchConfirmationActivity(request, title, header, description,
- returnCredentials
+ returnCredentials || forceVerifyPath
? ConfirmLockPassword.InternalActivity.class
: ConfirmLockPassword.class, returnCredentials, external,
forceVerifyPath, userId, alternateButton, allowAnyUser,
diff --git a/src/com/android/settings/security/CredentialManagementAppHeaderController.java b/src/com/android/settings/security/CredentialManagementAppHeaderController.java
index 975c49d..7b5ffb2 100644
--- a/src/com/android/settings/security/CredentialManagementAppHeaderController.java
+++ b/src/com/android/settings/security/CredentialManagementAppHeaderController.java
@@ -25,6 +25,7 @@
import android.security.IKeyChainService;
import android.security.KeyChain;
import android.util.Log;
+import android.view.View;
import android.widget.ImageView;
import android.widget.TextView;
@@ -54,7 +55,6 @@
}
private final PackageManager mPackageManager;
- private boolean mHasCredentialManagerPackage;
private String mCredentialManagerPackageName;
@Override
@@ -69,7 +69,6 @@
mExecutor.execute(() -> {
try {
IKeyChainService service = KeyChain.bind(mContext).getService();
- mHasCredentialManagerPackage = service.hasCredentialManagementApp();
mCredentialManagerPackageName = service.getCredentialManagementAppPackageName();
} catch (InterruptedException | RemoteException e) {
Log.e(TAG, "Unable to display credential management app header");
@@ -80,23 +79,21 @@
private void displayHeader(PreferenceScreen screen) {
LayoutPreference headerPref = screen.findPreference(getPreferenceKey());
- ImageView mAppIconView = headerPref.findViewById(R.id.entity_header_icon);
- TextView mTitleView = headerPref.findViewById(R.id.entity_header_title);
- TextView mDescriptionView = headerPref.findViewById(R.id.entity_header_summary);
+ ImageView appIconView = headerPref.findViewById(R.id.entity_header_icon);
+ TextView titleView = headerPref.findViewById(R.id.entity_header_title);
+ TextView summary1 = headerPref.findViewById(R.id.entity_header_summary);
+ TextView summary2 = headerPref.findViewById(R.id.entity_header_second_summary);
+ summary1.setVisibility(View.GONE);
+ summary2.setVisibility(View.GONE);
try {
ApplicationInfo applicationInfo =
mPackageManager.getApplicationInfo(mCredentialManagerPackageName, 0);
- mAppIconView.setImageDrawable(mPackageManager.getApplicationIcon(applicationInfo));
- mTitleView.setText(applicationInfo.loadLabel(mPackageManager));
+ appIconView.setImageDrawable(mPackageManager.getApplicationIcon(applicationInfo));
+ titleView.setText(applicationInfo.loadLabel(mPackageManager));
} catch (PackageManager.NameNotFoundException e) {
- mAppIconView.setImageDrawable(null);
- mTitleView.setText(mCredentialManagerPackageName);
+ appIconView.setImageDrawable(null);
+ titleView.setText(mCredentialManagerPackageName);
}
- // TODO (b/165641221): The description should be multi-lined, which is currently a
- // limitation of using Settings entity header. However, the Settings entity header
- // should be used to be consistent with the rest of Settings.
- mDescriptionView.setText(
- mContext.getString(R.string.request_manage_credentials_description));
}
}
diff --git a/src/com/android/settings/security/CredentialStorage.java b/src/com/android/settings/security/CredentialStorage.java
index 2e3e2ed..53a1a59 100644
--- a/src/com/android/settings/security/CredentialStorage.java
+++ b/src/com/android/settings/security/CredentialStorage.java
@@ -44,6 +44,7 @@
import com.android.internal.widget.LockPatternUtils;
import com.android.settings.R;
+import com.android.settings.core.HideNonSystemOverlayMixin;
import com.android.settings.password.ChooseLockSettingsHelper;
import com.android.settings.vpn2.VpnUtils;
@@ -75,6 +76,7 @@
protected void onCreate(Bundle savedState) {
super.onCreate(savedState);
mUtils = new LockPatternUtils(this);
+ getLifecycle().addObserver(new HideNonSystemOverlayMixin(this));
}
@Override
diff --git a/src/com/android/settings/sim/ChooseSimActivity.java b/src/com/android/settings/sim/ChooseSimActivity.java
new file mode 100644
index 0000000..f8bdc30
--- /dev/null
+++ b/src/com/android/settings/sim/ChooseSimActivity.java
@@ -0,0 +1,321 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.sim;
+
+import android.app.Activity;
+import android.content.Context;
+import android.content.Intent;
+import android.os.Bundle;
+import android.telephony.SubscriptionInfo;
+import android.telephony.SubscriptionManager;
+import android.text.TextUtils;
+import android.util.Log;
+import android.view.View;
+import android.widget.TextView;
+
+import com.android.settings.R;
+import com.android.settings.SidecarFragment;
+import com.android.settings.network.SubscriptionUtil;
+import com.android.settings.network.SwitchToEuiccSubscriptionSidecar;
+import com.android.settings.network.SwitchToRemovableSlotSidecar;
+import com.android.settings.network.UiccSlotUtil;
+
+import com.google.android.setupdesign.GlifLayout;
+import com.google.android.setupdesign.GlifRecyclerLayout;
+import com.google.android.setupdesign.items.Dividable;
+import com.google.android.setupdesign.items.IItem;
+import com.google.android.setupdesign.items.Item;
+import com.google.android.setupdesign.items.ItemGroup;
+import com.google.android.setupdesign.items.RecyclerItemAdapter;
+import com.google.android.setupdesign.view.HeaderRecyclerView;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/** Activity to show a list of profiles for user to choose. */
+public class ChooseSimActivity extends Activity
+ implements RecyclerItemAdapter.OnItemSelectedListener, SidecarFragment.Listener {
+ // Whether there is a pSIM profile in the selection list.
+ public static final String KEY_HAS_PSIM = "has_psim";
+ // After the user selects eSIM profile, whether continue to show Mobile Network Settings screen
+ // to select other preferences.
+ // Note: KEY_NO_PSIM_CONTINUE_TO_SETTINGS and mNoPsimContinueToSettings are not used for now
+ // for UI changes. We may use them in the future.
+ public static final String KEY_NO_PSIM_CONTINUE_TO_SETTINGS = "no_psim_continue_to_settings";
+
+ private static final String TAG = "ChooseSimActivity";
+ private static final int INDEX_PSIM = -1;
+ private static final String STATE_SELECTED_INDEX = "selected_index";
+ private static final String STATE_IS_SWITCHING = "is_switching";
+
+ private boolean mHasPsim;
+ private boolean mNoPsimContinueToSettings;
+ private ArrayList<SubscriptionInfo> mEmbeddedSubscriptions = new ArrayList<>();
+ private SubscriptionInfo mRemovableSubscription = null;
+
+ private ItemGroup mItemGroup;
+ private SwitchToEuiccSubscriptionSidecar mSwitchToEuiccSubscriptionSidecar;
+ private SwitchToRemovableSlotSidecar mSwitchToRemovableSlotSidecar;
+
+ // Variables have states.
+ private int mSelectedItemIndex;
+ private boolean mIsSwitching;
+
+ /** Returns an intent of {@code ChooseSimActivity} */
+ public static Intent getIntent(Context context) {
+ return new Intent(context, ChooseSimActivity.class);
+ }
+
+ @Override
+ protected void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+
+ setContentView(R.layout.choose_sim_activity);
+
+ Intent intent = getIntent();
+ mHasPsim = intent.getBooleanExtra(KEY_HAS_PSIM, false);
+ mNoPsimContinueToSettings = intent.getBooleanExtra(KEY_NO_PSIM_CONTINUE_TO_SETTINGS, false);
+
+ updateSubscriptions();
+
+ if (mEmbeddedSubscriptions.size() == 0) {
+ Log.e(TAG, "Unable to find available eSIM subscriptions.");
+ finish();
+ return;
+ }
+
+ if (savedInstanceState != null) {
+ mSelectedItemIndex = savedInstanceState.getInt(STATE_SELECTED_INDEX);
+ mIsSwitching = savedInstanceState.getBoolean(STATE_IS_SWITCHING);
+ }
+
+ GlifLayout layout = findViewById(R.id.glif_layout);
+ TextView textView = findViewById(R.id.subtitle);
+ int subscriptionCount = mEmbeddedSubscriptions.size();
+ if (mHasPsim) { // Choose a number to use
+ subscriptionCount++;
+ }
+ layout.setHeaderText(getString(R.string.choose_sim_title));
+ textView.setText(getString(R.string.choose_sim_text, subscriptionCount));
+
+ displaySubscriptions();
+
+ mSwitchToRemovableSlotSidecar = SwitchToRemovableSlotSidecar.get(getFragmentManager());
+ mSwitchToEuiccSubscriptionSidecar =
+ SwitchToEuiccSubscriptionSidecar.get(getFragmentManager());
+ }
+
+ @Override
+ public void onResume() {
+ super.onResume();
+ mSwitchToRemovableSlotSidecar.addListener(this);
+ mSwitchToEuiccSubscriptionSidecar.addListener(this);
+ }
+
+ @Override
+ public void onPause() {
+ mSwitchToEuiccSubscriptionSidecar.removeListener(this);
+ mSwitchToRemovableSlotSidecar.removeListener(this);
+ super.onPause();
+ }
+
+ @Override
+ protected void onSaveInstanceState(Bundle outState) {
+ outState.putInt(STATE_SELECTED_INDEX, mSelectedItemIndex);
+ outState.putBoolean(STATE_IS_SWITCHING, mIsSwitching);
+ super.onSaveInstanceState(outState);
+ }
+
+ @Override
+ public void onItemSelected(IItem item) {
+ if (mIsSwitching) {
+ // If we already selected an item, do not try to switch to another one.
+ return;
+ }
+ mIsSwitching = true;
+ Item subItem = (Item) item;
+ subItem.setSummary(getString(R.string.choose_sim_activating));
+ mSelectedItemIndex = subItem.getId();
+ if (mSelectedItemIndex == INDEX_PSIM) {
+ Log.i(TAG, "Ready to switch to pSIM slot.");
+ mSwitchToRemovableSlotSidecar.run(UiccSlotUtil.INVALID_PHYSICAL_SLOT_ID);
+ } else {
+ Log.i(TAG, "Ready to switch to eSIM subscription with index: " + mSelectedItemIndex);
+ mSwitchToEuiccSubscriptionSidecar.run(
+ mEmbeddedSubscriptions.get(mSelectedItemIndex).getSubscriptionId());
+ }
+ }
+
+ @Override
+ public void onStateChange(SidecarFragment fragment) {
+ if (fragment == mSwitchToRemovableSlotSidecar) {
+ switch (mSwitchToRemovableSlotSidecar.getState()) {
+ case SidecarFragment.State.SUCCESS:
+ mSwitchToRemovableSlotSidecar.reset();
+ Log.i(TAG, "Switch slot successfully.");
+ SubscriptionManager subMgr = getSystemService(SubscriptionManager.class);
+ if (subMgr.canDisablePhysicalSubscription()) {
+ SubscriptionInfo removableSub =
+ SubscriptionUtil.getFirstRemovableSubscription(this);
+ if (removableSub != null) {
+ subMgr.setUiccApplicationsEnabled(
+ removableSub.getSubscriptionId(), true);
+ }
+ }
+ finish();
+ break;
+ case SidecarFragment.State.ERROR:
+ mSwitchToRemovableSlotSidecar.reset();
+ Log.e(TAG, "Failed to switch slot in ChooseSubscriptionsActivity.");
+ handleEnableRemovableSimError();
+ // We don't call finish() and just stay on this page.
+ break;
+ }
+ } else if (fragment == mSwitchToEuiccSubscriptionSidecar) {
+ switch (mSwitchToEuiccSubscriptionSidecar.getState()) {
+ case SidecarFragment.State.SUCCESS:
+ mSwitchToEuiccSubscriptionSidecar.reset();
+ if (mNoPsimContinueToSettings) {
+ // Currently, there shouldn't be a case that mNoPsimContinueToSettings is
+ // true. If this can be true in the future, we should finish() this page
+ // and direct to Settings page here.
+ Log.e(
+ TAG,
+ "mNoPsimContinueToSettings is true which is not supported for"
+ + " now.");
+ } else {
+ Log.i(TAG, "User finished selecting eSIM profile.");
+ finish();
+ }
+ break;
+ case SidecarFragment.State.ERROR:
+ mSwitchToEuiccSubscriptionSidecar.reset();
+ Log.e(TAG, "Failed to switch subscription in ChooseSubscriptionsActivity.");
+ Item item = (Item) mItemGroup.getItemAt(mSelectedItemIndex);
+ item.setEnabled(false);
+ item.setSummary(getString(R.string.choose_sim_could_not_activate));
+ mIsSwitching = false;
+ // We don't call finish() and just stay on this page.
+ break;
+ }
+ }
+ }
+
+ private void displaySubscriptions() {
+ View rootView = findViewById(android.R.id.content);
+ GlifRecyclerLayout layout = rootView.findViewById(R.id.recycler_list);
+ RecyclerItemAdapter adapter = (RecyclerItemAdapter) layout.getAdapter();
+ adapter.setOnItemSelectedListener(this);
+ mItemGroup = (ItemGroup) adapter.getRootItemHierarchy();
+
+ // Display pSIM profile.
+ if (mHasPsim) {
+ Item item = new DisableableItem();
+ // Title
+ CharSequence title = null;
+ if (mRemovableSubscription != null) {
+ title =
+ SubscriptionUtil.getUniqueSubscriptionDisplayName(
+ mRemovableSubscription.getSubscriptionId(), this);
+ }
+ item.setTitle(TextUtils.isEmpty(title) ? getString(R.string.sim_card_label) : title);
+
+ if (mIsSwitching && mSelectedItemIndex == INDEX_PSIM) {
+ item.setSummary(getString(R.string.choose_sim_activating));
+ } else {
+ // Phone number
+ String phoneNumber =
+ SubscriptionUtil.getFormattedPhoneNumber(this, mRemovableSubscription);
+ item.setSummary(TextUtils.isEmpty(phoneNumber) ? "" : phoneNumber);
+ }
+
+ // pSIM profile has index -1.
+ item.setId(INDEX_PSIM);
+ mItemGroup.addChild(item);
+ }
+
+ // Display all eSIM profiles.
+ int index = 0;
+ for (SubscriptionInfo sub : mEmbeddedSubscriptions) {
+ Item item = new DisableableItem();
+ CharSequence title =
+ SubscriptionUtil.getUniqueSubscriptionDisplayName(
+ sub.getSubscriptionId(), this);
+ item.setTitle(TextUtils.isEmpty(title) ? sub.getDisplayName() : title);
+ if (mIsSwitching && mSelectedItemIndex == index) {
+ item.setSummary(getString(R.string.choose_sim_activating));
+ } else {
+ String phoneNumber = SubscriptionUtil.getFormattedPhoneNumber(this, sub);
+ item.setSummary(TextUtils.isEmpty(phoneNumber) ? "" : phoneNumber);
+ }
+ item.setId(index++);
+ mItemGroup.addChild(item);
+ }
+
+ // This removes the unused header artifact from GlifRecyclerLayout.
+ HeaderRecyclerView rv = (HeaderRecyclerView) layout.getRecyclerView();
+ rv.getHeader().setVisibility(View.GONE);
+ }
+
+ private void updateSubscriptions() {
+ List<SubscriptionInfo> subscriptions =
+ SubscriptionUtil.getSelectableSubscriptionInfoList(this);
+ if (subscriptions != null) {
+ for (SubscriptionInfo sub : subscriptions) {
+ if (sub == null) {
+ continue;
+ }
+ if (sub.isEmbedded()) {
+ mEmbeddedSubscriptions.add(sub);
+ } else {
+ mRemovableSubscription = sub;
+ }
+ }
+ }
+ }
+
+ private void handleEnableRemovableSimError() {
+ // mSelectedItemIndex will be -1 if pSIM is selected. Since pSIM is always be
+ // listed at index 0, we change the itemIndex to 0 if pSIM is selected.
+ int itemIndex = mSelectedItemIndex == INDEX_PSIM ? 0 : mSelectedItemIndex;
+ Item item = (Item) mItemGroup.getItemAt(itemIndex);
+ item.setEnabled(false);
+ item.setSummary(getString(R.string.choose_sim_could_not_activate));
+ mIsSwitching = false;
+ }
+
+ class DisableableItem extends Item implements Dividable {
+ @Override
+ public boolean isDividerAllowedAbove() {
+ return true;
+ }
+
+ @Override
+ public boolean isDividerAllowedBelow() {
+ return true;
+ }
+
+ @Override
+ public void onBindView(View view) {
+ super.onBindView(view);
+ TextView title = view.findViewById(R.id.sud_items_title);
+ TextView summary = view.findViewById(R.id.sud_items_summary);
+ title.setEnabled(isEnabled());
+ summary.setEnabled(isEnabled());
+ }
+ }
+}
diff --git a/src/com/android/settings/sim/DsdsDialogActivity.java b/src/com/android/settings/sim/DsdsDialogActivity.java
new file mode 100644
index 0000000..1390c81
--- /dev/null
+++ b/src/com/android/settings/sim/DsdsDialogActivity.java
@@ -0,0 +1,147 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.sim;
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.telephony.TelephonyManager;
+import android.util.Log;
+
+import com.android.settings.R;
+import com.android.settings.SidecarFragment;
+import com.android.settings.network.EnableMultiSimSidecar;
+import com.android.settings.network.telephony.ConfirmDialogFragment;
+import com.android.settings.network.telephony.SubscriptionActionDialogActivity;
+
+/** Activity to show the enabling DSDS dialog. */
+public class DsdsDialogActivity extends SubscriptionActionDialogActivity
+ implements SidecarFragment.Listener, ConfirmDialogFragment.OnConfirmListener {
+
+ private static final String TAG = "DsdsDialogActivity";
+ // Dialog tags
+ private static final int DIALOG_TAG_ENABLE_DSDS_CONFIRMATION = 1;
+ private static final int DIALOG_TAG_ENABLE_DSDS_REBOOT_CONFIRMATION = 2;
+ // Number of SIMs for DSDS
+ private static final int NUM_OF_SIMS_FOR_DSDS = 2;
+
+ private EnableMultiSimSidecar mEnableMultiSimSidecar;
+
+ @Override
+ protected void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+
+ mEnableMultiSimSidecar = EnableMultiSimSidecar.get(getFragmentManager());
+ if (savedInstanceState == null) {
+ showEnableDsdsConfirmDialog();
+ }
+ }
+
+ @Override
+ protected void onResume() {
+ super.onResume();
+ mEnableMultiSimSidecar.addListener(this);
+ }
+
+ @Override
+ protected void onPause() {
+ mEnableMultiSimSidecar.removeListener(this);
+ super.onPause();
+ }
+
+ @Override
+ public void onStateChange(SidecarFragment fragment) {
+ if (fragment == mEnableMultiSimSidecar) {
+ switch (fragment.getState()) {
+ case SidecarFragment.State.SUCCESS:
+ mEnableMultiSimSidecar.reset();
+ Log.i(TAG, "Enabled DSDS successfully");
+ dismissProgressDialog();
+ finish();
+ break;
+ case SidecarFragment.State.ERROR:
+ mEnableMultiSimSidecar.reset();
+ Log.e(TAG, "Failed to enable DSDS");
+ dismissProgressDialog();
+ showErrorDialog(
+ getString(R.string.dsds_activation_failure_title),
+ getString(R.string.dsds_activation_failure_body_msg2));
+ break;
+ }
+ }
+ }
+
+ @Override
+ public void onConfirm(int tag, boolean confirmed) {
+ if (!confirmed) {
+ Log.i(TAG, "User cancel the dialog to enable DSDS.");
+ startChooseSimActivity();
+ return;
+ }
+
+ TelephonyManager telephonyManager = getSystemService(TelephonyManager.class);
+ switch (tag) {
+ case DIALOG_TAG_ENABLE_DSDS_CONFIRMATION:
+ if (telephonyManager.doesSwitchMultiSimConfigTriggerReboot()) {
+ Log.i(TAG, "Device does not support reboot free DSDS.");
+ showRebootConfirmDialog();
+ return;
+ }
+ Log.i(TAG, "Enabling DSDS without rebooting.");
+ showProgressDialog(
+ getString(R.string.sim_action_enabling_sim_without_carrier_name));
+ mEnableMultiSimSidecar.run(NUM_OF_SIMS_FOR_DSDS);
+ break;
+ case DIALOG_TAG_ENABLE_DSDS_REBOOT_CONFIRMATION:
+ Log.i(TAG, "User confirmed reboot to enable DSDS.");
+ SimActivationNotifier.setShowSimSettingsNotification(this, true);
+ telephonyManager.switchMultiSimConfig(NUM_OF_SIMS_FOR_DSDS);
+ break;
+ default:
+ Log.e(TAG, "Unrecognized confirmation dialog tag: " + tag);
+ break;
+ }
+ }
+
+ private void showEnableDsdsConfirmDialog() {
+ ConfirmDialogFragment.show(
+ this,
+ ConfirmDialogFragment.OnConfirmListener.class,
+ DIALOG_TAG_ENABLE_DSDS_CONFIRMATION,
+ getString(R.string.sim_action_enable_dsds_title),
+ getString(R.string.sim_action_enable_dsds_text),
+ getString(R.string.sim_action_continue),
+ getString(R.string.sim_action_no_thanks));
+ }
+
+ private void showRebootConfirmDialog() {
+ ConfirmDialogFragment.show(
+ this,
+ ConfirmDialogFragment.OnConfirmListener.class,
+ DIALOG_TAG_ENABLE_DSDS_REBOOT_CONFIRMATION,
+ getString(R.string.sim_action_restart_title),
+ getString(R.string.sim_action_enable_dsds_text),
+ getString(R.string.sim_action_reboot),
+ getString(R.string.cancel));
+ }
+
+ private void startChooseSimActivity() {
+ Intent intent = ChooseSimActivity.getIntent(this);
+ intent.putExtra(ChooseSimActivity.KEY_HAS_PSIM, true);
+ startActivity(intent);
+ finish();
+ }
+}
diff --git a/src/com/android/settings/sim/SimActivationNotifier.java b/src/com/android/settings/sim/SimActivationNotifier.java
index 4a4edef..735cb46 100644
--- a/src/com/android/settings/sim/SimActivationNotifier.java
+++ b/src/com/android/settings/sim/SimActivationNotifier.java
@@ -26,8 +26,10 @@
import android.content.Context;
import android.content.Intent;
import android.content.SharedPreferences;
+import android.telephony.CarrierConfigManager;
import android.telephony.SubscriptionInfo;
import android.telephony.SubscriptionManager;
+import android.telephony.TelephonyManager;
import android.text.TextUtils;
import android.util.Log;
@@ -40,6 +42,8 @@
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
+import javax.annotation.Nullable;
+
/**
* This class manages the notification of SIM activation notification including creating and
* canceling the notifications.
@@ -48,21 +52,29 @@
private static final String TAG = "SimActivationNotifier";
private static final String SIM_SETUP_CHANNEL_ID = "sim_setup";
+ private static final String SWITCH_SLOT_CHANNEL_ID = "carrier_switching";
private static final String SIM_PREFS = "sim_prefs";
private static final String KEY_SHOW_SIM_SETTINGS_NOTIFICATION =
"show_sim_settings_notification";
public static final int SIM_ACTIVATION_NOTIFICATION_ID = 1;
+ public static final int SWITCH_TO_REMOVABLE_SLOT_NOTIFICATION_ID = 2;
/** Notification types */
@Retention(RetentionPolicy.SOURCE)
@IntDef(
value = {
NotificationType.NETWORK_CONFIG,
+ NotificationType.SWITCH_TO_REMOVABLE_SLOT,
+ NotificationType.ENABLE_DSDS,
})
public @interface NotificationType {
// The notification to remind users to config network Settings.
int NETWORK_CONFIG = 1;
+ // The notification to notify users that the device is switched to the removable slot.
+ int SWITCH_TO_REMOVABLE_SLOT = 2;
+ // The notification to notify users that the device is capable of DSDS.
+ int ENABLE_DSDS = 3;
}
private final Context mContext;
@@ -104,21 +116,15 @@
/** Sends a push notification for the SIM activation. It should be called after DSDS reboot. */
public void sendNetworkConfigNotification() {
- SubscriptionManager subscriptionManager =
- mContext.getSystemService(SubscriptionManager.class);
- SubscriptionInfo activeRemovableSub =
- SubscriptionUtil.getActiveSubscriptions(subscriptionManager).stream()
- .filter(sub -> !sub.isEmbedded())
- .findFirst()
- .orElse(null);
+ SubscriptionInfo activeRemovableSub = getActiveRemovableSub();
if (activeRemovableSub == null) {
Log.e(TAG, "No removable subscriptions found. Do not show notification.");
return;
}
- CharSequence displayName = SubscriptionUtil.getUniqueSubscriptionDisplayName(
- activeRemovableSub, mContext);
+ CharSequence displayName =
+ SubscriptionUtil.getUniqueSubscriptionDisplayName(activeRemovableSub, mContext);
String carrierName =
TextUtils.isEmpty(displayName)
? mContext.getString(R.string.sim_card_label)
@@ -132,7 +138,8 @@
TaskStackBuilder.create(mContext).addNextIntent(clickIntent);
PendingIntent contentIntent =
stackBuilder.getPendingIntent(
- 0 /* requestCode */, PendingIntent.FLAG_UPDATE_CURRENT);
+ 0 /* requestCode */,
+ PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE);
Notification.Builder builder =
new Notification.Builder(mContext, SIM_SETUP_CHANNEL_ID)
@@ -143,4 +150,93 @@
.setAutoCancel(true);
mNotificationManager.notify(SIM_ACTIVATION_NOTIFICATION_ID, builder.build());
}
+
+ /** Sends a push notification for switching to the removable slot. */
+ public void sendSwitchedToRemovableSlotNotification() {
+ String carrierName = getActiveCarrierName();
+ Intent clickIntent = new Intent(mContext, Settings.MobileNetworkListActivity.class);
+ TaskStackBuilder stackBuilder =
+ TaskStackBuilder.create(mContext).addNextIntent(clickIntent);
+ PendingIntent contentIntent =
+ stackBuilder.getPendingIntent(
+ 0 /* requestCode */,
+ PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE);
+ String titleText =
+ TextUtils.isEmpty(carrierName)
+ ? mContext.getString(
+ R.string.switch_to_removable_notification_no_carrier_name)
+ : mContext.getString(
+ R.string.switch_to_removable_notification, carrierName);
+ Notification.Builder builder =
+ new Notification.Builder(mContext, SWITCH_SLOT_CHANNEL_ID)
+ .setContentTitle(titleText)
+ .setContentText(
+ mContext.getString(R.string.network_changed_notification_text))
+ .setContentIntent(contentIntent)
+ .setSmallIcon(R.drawable.ic_sim_alert)
+ .setColor(
+ mContext.getResources()
+ .getColor(
+ R.color.homepage_generic_icon_background,
+ null /* theme */))
+ .setAutoCancel(true);
+ mNotificationManager.notify(SWITCH_TO_REMOVABLE_SLOT_NOTIFICATION_ID, builder.build());
+ }
+
+ /** Sends a push notification for enabling DSDS. */
+ public void sendEnableDsdsNotification() {
+ Intent parentIntent = new Intent(mContext, Settings.MobileNetworkListActivity.class);
+
+ Intent clickIntent = new Intent(mContext, DsdsDialogActivity.class);
+
+ TaskStackBuilder stackBuilder =
+ TaskStackBuilder.create(mContext)
+ .addNextIntentWithParentStack(parentIntent)
+ .addNextIntent(clickIntent);
+ PendingIntent contentIntent =
+ stackBuilder.getPendingIntent(
+ 0 /* requestCode */,
+ PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE);
+
+ Notification.Builder builder =
+ new Notification.Builder(mContext, SIM_SETUP_CHANNEL_ID)
+ .setContentTitle(
+ mContext.getString(R.string.dsds_notification_after_suw_title))
+ .setContentText(
+ mContext.getString(R.string.dsds_notification_after_suw_text))
+ .setContentIntent(contentIntent)
+ .setSmallIcon(R.drawable.ic_sim_alert)
+ .setAutoCancel(true);
+ mNotificationManager.notify(SIM_ACTIVATION_NOTIFICATION_ID, builder.build());
+ }
+
+ @Nullable
+ private SubscriptionInfo getActiveRemovableSub() {
+ SubscriptionManager subscriptionManager =
+ mContext.getSystemService(SubscriptionManager.class);
+ return SubscriptionUtil.getActiveSubscriptions(subscriptionManager).stream()
+ .filter(sub -> !sub.isEmbedded())
+ .findFirst()
+ .orElse(null);
+ }
+
+ @Nullable
+ private String getActiveCarrierName() {
+ CarrierConfigManager configManager = mContext.getSystemService(CarrierConfigManager.class);
+ TelephonyManager telManager = mContext.getSystemService(TelephonyManager.class);
+ String telName = telManager.getSimOperatorName();
+ if (configManager != null && configManager.getConfig() != null) {
+ boolean override =
+ configManager
+ .getConfig()
+ .getBoolean(CarrierConfigManager.KEY_CARRIER_NAME_OVERRIDE_BOOL);
+ String configName =
+ configManager
+ .getConfig()
+ .getString(CarrierConfigManager.KEY_CARRIER_NAME_STRING);
+
+ return override || TextUtils.isEmpty(telName) ? configName : telName;
+ }
+ return telName;
+ }
}
diff --git a/src/com/android/settings/sim/SimNotificationService.java b/src/com/android/settings/sim/SimNotificationService.java
index 303c21d..42b5e58 100644
--- a/src/com/android/settings/sim/SimNotificationService.java
+++ b/src/com/android/settings/sim/SimNotificationService.java
@@ -35,6 +35,7 @@
/**
* Schedules a service to send SIM push notifications.
+ *
* @param context
* @param notificationType indicates which SIM notification to send.
*/
@@ -67,6 +68,12 @@
SimActivationNotifier.setShowSimSettingsNotification(this, false);
new SimActivationNotifier(this).sendNetworkConfigNotification();
break;
+ case SimActivationNotifier.NotificationType.SWITCH_TO_REMOVABLE_SLOT:
+ new SimActivationNotifier(this).sendSwitchedToRemovableSlotNotification();
+ break;
+ case SimActivationNotifier.NotificationType.ENABLE_DSDS:
+ new SimActivationNotifier(this).sendEnableDsdsNotification();
+ break;
default:
Log.e(TAG, "Invalid notification type: " + notificationType);
break;
diff --git a/src/com/android/settings/sim/SwitchToEsimConfirmDialogActivity.java b/src/com/android/settings/sim/SwitchToEsimConfirmDialogActivity.java
new file mode 100644
index 0000000..385deff
--- /dev/null
+++ b/src/com/android/settings/sim/SwitchToEsimConfirmDialogActivity.java
@@ -0,0 +1,119 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.sim;
+
+import android.os.Bundle;
+import android.telephony.SubscriptionInfo;
+import android.util.Log;
+
+import com.android.settings.R;
+import com.android.settings.SidecarFragment;
+import com.android.settings.network.SwitchToEuiccSubscriptionSidecar;
+import com.android.settings.network.telephony.AlertDialogFragment;
+import com.android.settings.network.telephony.ConfirmDialogFragment;
+import com.android.settings.network.telephony.SubscriptionActionDialogActivity;
+
+/**
+ * Starts a confirm dialog asking the user to switch to the eSIM slot/subscription. The caller needs
+ * to pass in the current enabled eSIM subscription, which is also the subscription to switch to.
+ */
+public class SwitchToEsimConfirmDialogActivity extends SubscriptionActionDialogActivity
+ implements SidecarFragment.Listener, ConfirmDialogFragment.OnConfirmListener {
+
+ public static final String KEY_SUB_TO_ENABLE = "sub_to_enable";
+
+ private static final String TAG = "SwitchToEsimConfirmDialogActivity";
+ private static final int TAG_CONFIRM = 1;
+
+ private SubscriptionInfo mSubToEnabled = null;
+ private SwitchToEuiccSubscriptionSidecar mSwitchToEuiccSubscriptionSidecar;
+
+ @Override
+ protected void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+
+ mSubToEnabled = getIntent().getParcelableExtra(KEY_SUB_TO_ENABLE);
+ mSwitchToEuiccSubscriptionSidecar =
+ SwitchToEuiccSubscriptionSidecar.get(getFragmentManager());
+
+ if (mSubToEnabled == null) {
+ Log.e(TAG, "Cannot find SIM to enable.");
+ finish();
+ return;
+ }
+
+ if (savedInstanceState == null) {
+ ConfirmDialogFragment.show(
+ this,
+ ConfirmDialogFragment.OnConfirmListener.class,
+ TAG_CONFIRM,
+ getString(R.string.switch_sim_dialog_title, mSubToEnabled.getDisplayName()),
+ getString(R.string.switch_sim_dialog_text, mSubToEnabled.getDisplayName()),
+ getString(R.string.okay),
+ getString(R.string.cancel));
+ }
+ }
+
+ @Override
+ public void onResume() {
+ super.onResume();
+ mSwitchToEuiccSubscriptionSidecar.addListener(this);
+ }
+
+ @Override
+ public void onPause() {
+ mSwitchToEuiccSubscriptionSidecar.removeListener(this);
+ super.onPause();
+ }
+
+ @Override
+ public void onStateChange(SidecarFragment fragment) {
+ if (fragment == mSwitchToEuiccSubscriptionSidecar) {
+ switch (mSwitchToEuiccSubscriptionSidecar.getState()) {
+ case SidecarFragment.State.SUCCESS:
+ mSwitchToEuiccSubscriptionSidecar.reset();
+ Log.i(TAG, "Successfully switched to eSIM slot.");
+ dismissProgressDialog();
+ finish();
+ break;
+ case SidecarFragment.State.ERROR:
+ mSwitchToEuiccSubscriptionSidecar.reset();
+ Log.e(TAG, "Failed switching to eSIM slot.");
+ dismissProgressDialog();
+ finish();
+ break;
+ }
+ }
+ }
+
+ @Override
+ public void onConfirm(int tag, boolean confirmed) {
+ if (!confirmed) {
+ AlertDialogFragment.show(
+ this,
+ getString(R.string.switch_sim_dialog_no_switch_title),
+ getString(R.string.switch_sim_dialog_no_switch_text));
+ return;
+ }
+ Log.i(TAG, "User confirmed to switch to embedded slot.");
+ mSwitchToEuiccSubscriptionSidecar.run(mSubToEnabled.getSubscriptionId());
+ showProgressDialog(
+ getString(
+ R.string.sim_action_switch_sub_dialog_progress,
+ mSubToEnabled.getDisplayName()));
+ }
+}
diff --git a/src/com/android/settings/sim/receivers/SimSlotChangeHandler.java b/src/com/android/settings/sim/receivers/SimSlotChangeHandler.java
index 814f1a4..fe44389 100644
--- a/src/com/android/settings/sim/receivers/SimSlotChangeHandler.java
+++ b/src/com/android/settings/sim/receivers/SimSlotChangeHandler.java
@@ -19,6 +19,7 @@
import static android.content.Context.MODE_PRIVATE;
import android.content.Context;
+import android.content.Intent;
import android.content.SharedPreferences;
import android.os.Looper;
import android.provider.Settings;
@@ -29,6 +30,13 @@
import android.util.Log;
import com.android.settings.network.SubscriptionUtil;
+import com.android.settings.network.UiccSlotUtil;
+import com.android.settings.network.UiccSlotsException;
+import com.android.settings.sim.ChooseSimActivity;
+import com.android.settings.sim.DsdsDialogActivity;
+import com.android.settings.sim.SimActivationNotifier;
+import com.android.settings.sim.SimNotificationService;
+import com.android.settings.sim.SwitchToEsimConfirmDialogActivity;
import com.google.common.collect.ImmutableList;
@@ -42,7 +50,13 @@
private static final String TAG = "SimSlotChangeHandler";
private static final String EUICC_PREFS = "euicc_prefs";
+ // Shared preference keys
private static final String KEY_REMOVABLE_SLOT_STATE = "removable_slot_state";
+ private static final String KEY_SUW_PSIM_ACTION = "suw_psim_action";
+ // User's last removable SIM insertion / removal action during SUW.
+ private static final int LAST_USER_ACTION_IN_SUW_NONE = 0;
+ private static final int LAST_USER_ACTION_IN_SUW_INSERT = 1;
+ private static final int LAST_USER_ACTION_IN_SUW_REMOVE = 2;
private static volatile SimSlotChangeHandler sSlotChangeHandler;
@@ -99,6 +113,47 @@
Log.i(TAG, "Do nothing on slot status changes.");
}
+ void onSuwFinish(Context context) {
+ init(context);
+
+ if (Looper.myLooper() == Looper.getMainLooper()) {
+ throw new IllegalStateException("Cannot be called from main thread.");
+ }
+
+ if (mTelMgr.getActiveModemCount() > 1) {
+ Log.i(TAG, "The device is already in DSDS mode. Do nothing.");
+ return;
+ }
+
+ UiccSlotInfo removableSlotInfo = getRemovableUiccSlotInfo();
+ if (removableSlotInfo == null) {
+ Log.e(TAG, "Unable to find the removable slot. Do nothing.");
+ return;
+ }
+
+ boolean embeddedSimExist = getGroupedEmbeddedSubscriptions().size() != 0;
+ int removableSlotAction = getSuwRemovableSlotAction(mContext);
+ setSuwRemovableSlotAction(mContext, LAST_USER_ACTION_IN_SUW_NONE);
+
+ if (embeddedSimExist
+ && removableSlotInfo.getCardStateInfo() == UiccSlotInfo.CARD_STATE_INFO_PRESENT) {
+ if (mTelMgr.isMultiSimSupported() == TelephonyManager.MULTISIM_ALLOWED) {
+ Log.i(TAG, "DSDS condition satisfied. Show notification.");
+ SimNotificationService.scheduleSimNotification(
+ mContext, SimActivationNotifier.NotificationType.ENABLE_DSDS);
+ } else if (removableSlotAction == LAST_USER_ACTION_IN_SUW_INSERT) {
+ Log.i(
+ TAG,
+ "Both removable SIM and eSIM are present. DSDS condition doesn't"
+ + " satisfied. User inserted pSIM during SUW. Show choose SIM"
+ + " screen.");
+ startChooseSimActivity(true);
+ }
+ } else if (removableSlotAction == LAST_USER_ACTION_IN_SUW_REMOVE) {
+ handleSimRemove(removableSlotInfo);
+ }
+ }
+
private void init(Context context) {
mSubMgr =
(SubscriptionManager)
@@ -108,11 +163,11 @@
}
private void handleSimInsert(UiccSlotInfo removableSlotInfo) {
- Log.i(TAG, "Detect SIM inserted.");
+ Log.i(TAG, "Handle SIM inserted.");
if (!isSuwFinished(mContext)) {
- // TODO(b/170508680): Store the action and handle it after SUW is finished.
Log.i(TAG, "Still in SUW. Handle SIM insertion after SUW is finished");
+ setSuwRemovableSlotAction(mContext, LAST_USER_ACTION_IN_SUW_INSERT);
return;
}
@@ -121,14 +176,13 @@
return;
}
- if (!hasActiveEsimSubscription()) {
- if (mTelMgr.isMultiSimEnabled()) {
+ if (hasActiveEsimSubscription()) {
+ if (mTelMgr.isMultiSimSupported() == TelephonyManager.MULTISIM_ALLOWED) {
Log.i(TAG, "Enabled profile exists. DSDS condition satisfied.");
- // TODO(b/170508680): Display DSDS dialog to ask users whether to enable DSDS.
+ startDsdsDialogActivity();
} else {
Log.i(TAG, "Enabled profile exists. DSDS condition not satisfied.");
- // TODO(b/170508680): Display Choose a number to use screen for subscription
- // selection.
+ startChooseSimActivity(true);
}
return;
}
@@ -137,15 +191,23 @@
TAG,
"No enabled eSIM profile. Ready to switch to removable slot and show"
+ " notification.");
- // TODO(b/170508680): Switch the slot to the removebale slot and show the notification.
+ try {
+ UiccSlotUtil.switchToRemovableSlot(
+ UiccSlotUtil.INVALID_PHYSICAL_SLOT_ID, mContext.getApplicationContext());
+ } catch (UiccSlotsException e) {
+ Log.e(TAG, "Failed to switch to removable slot.");
+ return;
+ }
+ SimNotificationService.scheduleSimNotification(
+ mContext, SimActivationNotifier.NotificationType.SWITCH_TO_REMOVABLE_SLOT);
}
private void handleSimRemove(UiccSlotInfo removableSlotInfo) {
- Log.i(TAG, "Detect SIM removed.");
+ Log.i(TAG, "Handle SIM removed.");
if (!isSuwFinished(mContext)) {
- // TODO(b/170508680): Store the action and handle it after SUW is finished.
Log.i(TAG, "Still in SUW. Handle SIM removal after SUW is finished");
+ setSuwRemovableSlotAction(mContext, LAST_USER_ACTION_IN_SUW_REMOVE);
return;
}
@@ -160,14 +222,14 @@
// profile.
if (groupedEmbeddedSubscriptions.size() == 1) {
Log.i(TAG, "Only 1 eSIM profile found. Ask user's consent to switch.");
- // TODO(b/170508680): Display a dialog to ask users to switch.
+ startSwitchSlotConfirmDialogActivity(groupedEmbeddedSubscriptions.get(0));
return;
}
// If there are more than 1 eSIM profiles installed, we show a screen to let users to choose
// the number they want to use.
Log.i(TAG, "Multiple eSIM profiles found. Ask user which subscription to use.");
- // TODO(b/170508680): Display a dialog to ask user which SIM to switch.
+ startChooseSimActivity(false);
}
private int getLastRemovableSimSlotState(Context context) {
@@ -180,6 +242,16 @@
prefs.edit().putInt(KEY_REMOVABLE_SLOT_STATE, state).apply();
}
+ private int getSuwRemovableSlotAction(Context context) {
+ final SharedPreferences prefs = context.getSharedPreferences(EUICC_PREFS, MODE_PRIVATE);
+ return prefs.getInt(KEY_SUW_PSIM_ACTION, LAST_USER_ACTION_IN_SUW_NONE);
+ }
+
+ private void setSuwRemovableSlotAction(Context context, int action) {
+ final SharedPreferences prefs = context.getSharedPreferences(EUICC_PREFS, MODE_PRIVATE);
+ prefs.edit().putInt(KEY_SUW_PSIM_ACTION, action).apply();
+ }
+
@Nullable
private UiccSlotInfo getRemovableUiccSlotInfo() {
UiccSlotInfo[] slotInfos = mTelMgr.getUiccSlotsInfo();
@@ -225,5 +297,25 @@
.collect(Collectors.toList()));
}
+ private void startChooseSimActivity(boolean psimInserted) {
+ Intent intent = ChooseSimActivity.getIntent(mContext);
+ intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+ intent.putExtra(ChooseSimActivity.KEY_HAS_PSIM, psimInserted);
+ mContext.startActivity(intent);
+ }
+
+ private void startSwitchSlotConfirmDialogActivity(SubscriptionInfo subscriptionInfo) {
+ Intent intent = new Intent(mContext, SwitchToEsimConfirmDialogActivity.class);
+ intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+ intent.putExtra(SwitchToEsimConfirmDialogActivity.KEY_SUB_TO_ENABLE, subscriptionInfo);
+ mContext.startActivity(intent);
+ }
+
+ private void startDsdsDialogActivity() {
+ Intent intent = new Intent(mContext, DsdsDialogActivity.class);
+ intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+ mContext.startActivity(intent);
+ }
+
private SimSlotChangeHandler() {}
}
diff --git a/src/com/android/settings/sim/receivers/SimSlotChangeReceiver.java b/src/com/android/settings/sim/receivers/SimSlotChangeReceiver.java
index a730dd1..f2c7c65 100644
--- a/src/com/android/settings/sim/receivers/SimSlotChangeReceiver.java
+++ b/src/com/android/settings/sim/receivers/SimSlotChangeReceiver.java
@@ -48,14 +48,15 @@
return;
}
+ final PendingResult pendingResult = goAsync();
ThreadUtils.postOnBackgroundThread(
() -> {
synchronized (mLock) {
- if (!shouldHandleSlotChange(context)) {
- return;
+ if (shouldHandleSlotChange(context)) {
+ mSlotChangeHandler.onSlotsStatusChange(context.getApplicationContext());
}
- mSlotChangeHandler.onSlotsStatusChange(context);
}
+ ThreadUtils.postOnMainThread(pendingResult::finish);
});
}
diff --git a/src/com/android/settings/sim/receivers/SuwFinishReceiver.java b/src/com/android/settings/sim/receivers/SuwFinishReceiver.java
new file mode 100644
index 0000000..7facbe2
--- /dev/null
+++ b/src/com/android/settings/sim/receivers/SuwFinishReceiver.java
@@ -0,0 +1,51 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.sim.receivers;
+
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.util.Log;
+
+import com.android.settings.R;
+import com.android.settingslib.utils.ThreadUtils;
+
+/** The receiver when SUW is finished. */
+public class SuwFinishReceiver extends BroadcastReceiver {
+ private static final String TAG = "SuwFinishReceiver";
+
+ private final SimSlotChangeHandler mSlotChangeHandler = SimSlotChangeHandler.get();
+ private final Object mLock = new Object();
+
+ @Override
+ public void onReceive(Context context, Intent intent) {
+ if (!context.getResources().getBoolean(R.bool.config_handle_sim_slot_change)) {
+ Log.i(TAG, "The flag is off. Ignore SUW finish event.");
+ return;
+ }
+
+ final BroadcastReceiver.PendingResult pendingResult = goAsync();
+ ThreadUtils.postOnBackgroundThread(
+ () -> {
+ synchronized (mLock) {
+ Log.i(TAG, "Detected SUW finished. Checking slot events.");
+ mSlotChangeHandler.onSuwFinish(context.getApplicationContext());
+ }
+ ThreadUtils.postOnMainThread(pendingResult::finish);
+ });
+ }
+}
diff --git a/src/com/android/settings/system/ResetPreferenceController.java b/src/com/android/settings/system/ResetPreferenceController.java
index 09db32f..ad33d30 100644
--- a/src/com/android/settings/system/ResetPreferenceController.java
+++ b/src/com/android/settings/system/ResetPreferenceController.java
@@ -17,9 +17,11 @@
import android.content.Context;
import android.os.UserManager;
+import android.util.FeatureFlagUtils;
import com.android.settings.R;
import com.android.settings.core.BasePreferenceController;
+import com.android.settings.core.FeatureFlags;
import com.android.settings.network.NetworkResetPreferenceController;
public class ResetPreferenceController extends BasePreferenceController {
@@ -43,6 +45,10 @@
@Override
public CharSequence getSummary() {
+ if (FeatureFlagUtils.isEnabled(mContext, FeatureFlags.SILKY_HOME)) {
+ return null;
+ }
+
if (!mNetworkReset.isAvailable() && !mFactpruReset.isAvailable()) {
return mContext.getText(R.string.reset_dashboard_summary_onlyApps);
}
diff --git a/src/com/android/settings/system/SystemDashboardFragment.java b/src/com/android/settings/system/SystemDashboardFragment.java
index a766fec..997678b 100644
--- a/src/com/android/settings/system/SystemDashboardFragment.java
+++ b/src/com/android/settings/system/SystemDashboardFragment.java
@@ -19,6 +19,7 @@
import android.content.Context;
import android.os.Bundle;
import android.provider.SearchIndexableResource;
+import android.util.FeatureFlagUtils;
import androidx.annotation.VisibleForTesting;
import androidx.preference.Preference;
@@ -26,10 +27,10 @@
import androidx.preference.PreferenceScreen;
import com.android.settings.R;
+import com.android.settings.core.FeatureFlags;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.overlay.FeatureFactory;
import com.android.settings.search.BaseSearchIndexProvider;
-import com.android.settingslib.search.Indexable;
import com.android.settingslib.search.SearchIndexable;
import java.util.Arrays;
@@ -40,8 +41,6 @@
private static final String TAG = "SystemDashboardFrag";
- private static final String KEY_RESET = "reset_dashboard";
-
public static final String EXTRA_SHOW_AWARE_DISABLED = "show_aware_dialog_disabled";
@Override
@@ -78,6 +77,9 @@
@Override
protected int getPreferenceScreenResId() {
+ if (FeatureFlagUtils.isEnabled(getContext(), FeatureFlags.SILKY_HOME)) {
+ return R.xml.system_dashboard_fragment_v2;
+ }
return R.xml.system_dashboard_fragment;
}
@@ -108,7 +110,8 @@
public List<SearchIndexableResource> getXmlResourcesToIndex(
Context context, boolean enabled) {
final SearchIndexableResource sir = new SearchIndexableResource(context);
- sir.xmlResId = R.xml.system_dashboard_fragment;
+ sir.xmlResId = FeatureFlagUtils.isEnabled(context, FeatureFlags.SILKY_HOME)
+ ? R.xml.system_dashboard_fragment_v2 : R.xml.system_dashboard_fragment;
return Arrays.asList(sir);
}
};
diff --git a/src/com/android/settings/users/AddUserWhenLockedPreferenceController.java b/src/com/android/settings/users/AddUserWhenLockedPreferenceController.java
index df2f54e..f931fa4 100644
--- a/src/com/android/settings/users/AddUserWhenLockedPreferenceController.java
+++ b/src/com/android/settings/users/AddUserWhenLockedPreferenceController.java
@@ -16,24 +16,20 @@
package com.android.settings.users;
import android.content.Context;
-import android.os.UserHandle;
import android.provider.Settings;
import androidx.preference.Preference;
-import com.android.internal.widget.LockPatternUtils;
import com.android.settings.core.TogglePreferenceController;
import com.android.settingslib.RestrictedSwitchPreference;
public class AddUserWhenLockedPreferenceController extends TogglePreferenceController {
private final UserCapabilities mUserCaps;
- private final LockPatternUtils mLockPatternUtils;
public AddUserWhenLockedPreferenceController(Context context, String key) {
super(context, key);
mUserCaps = UserCapabilities.create(context);
- mLockPatternUtils = new LockPatternUtils(context);
}
@Override
@@ -57,8 +53,6 @@
return DISABLED_FOR_USER;
} else if (mUserCaps.disallowAddUser() || mUserCaps.disallowAddUserSetByAdmin()) {
return DISABLED_FOR_USER;
- } else if (!mLockPatternUtils.isSecure(UserHandle.myUserId())) {
- return CONDITIONALLY_UNAVAILABLE;
} else {
return mUserCaps.mUserSwitcherEnabled ? AVAILABLE : CONDITIONALLY_UNAVAILABLE;
}
diff --git a/src/com/android/settings/vpn2/AppDialogFragment.java b/src/com/android/settings/vpn2/AppDialogFragment.java
index 9c73784..45fb9bd 100644
--- a/src/com/android/settings/vpn2/AppDialogFragment.java
+++ b/src/com/android/settings/vpn2/AppDialogFragment.java
@@ -18,17 +18,13 @@
import android.app.Dialog;
import android.app.settings.SettingsEnums;
-import android.content.Context;
import android.content.DialogInterface;
import android.content.pm.PackageInfo;
-import android.net.IConnectivityManager;
+import android.net.ConnectivityManager;
import android.net.VpnManager;
import android.os.Bundle;
-import android.os.RemoteException;
-import android.os.ServiceManager;
import android.os.UserHandle;
import android.os.UserManager;
-import android.util.Log;
import androidx.appcompat.app.AlertDialog;
import androidx.fragment.app.Fragment;
@@ -52,9 +48,9 @@
private PackageInfo mPackageInfo;
private Listener mListener;
+ private ConnectivityManager mConnectivityManager;
private UserManager mUserManager;
- private final IConnectivityManager mService = IConnectivityManager.Stub.asInterface(
- ServiceManager.getService(Context.CONNECTIVITY_SERVICE));
+ private VpnManager mVpnManager;
@Override
public int getMetricsCategory() {
@@ -97,7 +93,9 @@
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
+ mConnectivityManager = getContext().getSystemService(ConnectivityManager.class);
mUserManager = UserManager.get(getContext());
+ mVpnManager = getContext().getSystemService(VpnManager.class);
}
@Override
@@ -145,14 +143,9 @@
return;
}
final int userId = getUserId();
- try {
- mService.setVpnPackageAuthorization(
- mPackageInfo.packageName, userId, VpnManager.TYPE_VPN_NONE);
- onDisconnect(dialog);
- } catch (RemoteException e) {
- Log.e(TAG, "Failed to forget authorization of " + mPackageInfo.packageName +
- " for user " + userId, e);
- }
+ mVpnManager.setVpnPackageAuthorization(
+ mPackageInfo.packageName, userId, VpnManager.TYPE_VPN_NONE);
+ onDisconnect(dialog);
if (mListener != null) {
mListener.onForget();
@@ -164,15 +157,10 @@
return;
}
final int userId = getUserId();
- try {
- if (mPackageInfo.packageName.equals(VpnUtils.getConnectedPackage(mService, userId))) {
- mService.setAlwaysOnVpnPackage(userId, null, /* lockdownEnabled */ false,
- /* lockdownAllowlist */ null);
- mService.prepareVpn(mPackageInfo.packageName, VpnConfig.LEGACY_VPN, userId);
- }
- } catch (RemoteException e) {
- Log.e(TAG, "Failed to disconnect package " + mPackageInfo.packageName +
- " for user " + userId, e);
+ if (mPackageInfo.packageName.equals(VpnUtils.getConnectedPackage(mVpnManager, userId))) {
+ mConnectivityManager.setAlwaysOnVpnPackageForUser(userId, null,
+ /* lockdownEnabled */ false, /* lockdownAllowlist */ null);
+ mVpnManager.prepareVpn(mPackageInfo.packageName, VpnConfig.LEGACY_VPN, userId);
}
}
diff --git a/src/com/android/settings/vpn2/AppManagementFragment.java b/src/com/android/settings/vpn2/AppManagementFragment.java
index d2cbcd5..9422010 100644
--- a/src/com/android/settings/vpn2/AppManagementFragment.java
+++ b/src/com/android/settings/vpn2/AppManagementFragment.java
@@ -29,10 +29,8 @@
import android.content.pm.PackageManager;
import android.content.pm.PackageManager.NameNotFoundException;
import android.net.ConnectivityManager;
-import android.net.IConnectivityManager;
+import android.net.VpnManager;
import android.os.Bundle;
-import android.os.RemoteException;
-import android.os.ServiceManager;
import android.os.UserHandle;
import android.os.UserManager;
import android.text.TextUtils;
@@ -72,7 +70,7 @@
private PackageManager mPackageManager;
private DevicePolicyManager mDevicePolicyManager;
private ConnectivityManager mConnectivityManager;
- private IConnectivityManager mConnectivityService;
+ private VpnManager mVpnManager;
// VPN app info
private final int mUserId = UserHandle.myUserId();
@@ -125,8 +123,7 @@
mPackageManager = getContext().getPackageManager();
mDevicePolicyManager = getContext().getSystemService(DevicePolicyManager.class);
mConnectivityManager = getContext().getSystemService(ConnectivityManager.class);
- mConnectivityService = IConnectivityManager.Stub
- .asInterface(ServiceManager.getService(Context.CONNECTIVITY_SERVICE));
+ mVpnManager = getContext().getSystemService(VpnManager.class);
mPreferenceVersion = findPreference(KEY_VERSION);
mPreferenceAlwaysOn = (RestrictedSwitchPreference) findPreference(KEY_ALWAYS_ON_VPN);
@@ -335,13 +332,8 @@
* @return {@code true} if another VPN (VpnService or legacy) is connected or set as always-on.
*/
private boolean isAnotherVpnActive() {
- try {
- final VpnConfig config = mConnectivityService.getVpnConfig(mUserId);
- return config != null && !TextUtils.equals(config.user, mPackageName);
- } catch (RemoteException e) {
- Log.w(TAG, "Failure to look up active VPN", e);
- return false;
- }
+ final VpnConfig config = mVpnManager.getVpnConfig(mUserId);
+ return config != null && !TextUtils.equals(config.user, mPackageName);
}
public static class CannotConnectFragment extends InstrumentedDialogFragment {
diff --git a/src/com/android/settings/vpn2/ConfigDialog.java b/src/com/android/settings/vpn2/ConfigDialog.java
index 26c1565..a0c7a1e 100644
--- a/src/com/android/settings/vpn2/ConfigDialog.java
+++ b/src/com/android/settings/vpn2/ConfigDialog.java
@@ -21,7 +21,6 @@
import android.content.Context;
import android.content.DialogInterface;
import android.content.pm.PackageManager;
-import android.net.Proxy;
import android.net.ProxyInfo;
import android.os.Bundle;
import android.os.SystemProperties;
@@ -41,6 +40,7 @@
import androidx.appcompat.app.AlertDialog;
import com.android.internal.net.VpnProfile;
+import com.android.net.module.util.ProxyUtils;
import com.android.settings.R;
import java.net.InetAddress;
@@ -637,7 +637,7 @@
final String host = mProxyHost.getText().toString().trim();
final String port = mProxyPort.getText().toString().trim();
- return Proxy.validate(host, port, "") == Proxy.PROXY_VALID;
+ return ProxyUtils.validate(host, port, "") == ProxyUtils.PROXY_VALID;
}
}
diff --git a/src/com/android/settings/vpn2/ConfigDialogFragment.java b/src/com/android/settings/vpn2/ConfigDialogFragment.java
index d6b92d7..e88e4ef 100644
--- a/src/com/android/settings/vpn2/ConfigDialogFragment.java
+++ b/src/com/android/settings/vpn2/ConfigDialogFragment.java
@@ -21,10 +21,9 @@
import android.content.Context;
import android.content.DialogInterface;
import android.net.ConnectivityManager;
-import android.net.IConnectivityManager;
+import android.net.VpnManager;
import android.os.Bundle;
import android.os.RemoteException;
-import android.os.ServiceManager;
import android.os.UserHandle;
import android.security.Credentials;
import android.security.KeyStore;
@@ -52,9 +51,8 @@
private static final String ARG_EDITING = "editing";
private static final String ARG_EXISTS = "exists";
- private final IConnectivityManager mService = IConnectivityManager.Stub.asInterface(
- ServiceManager.getService(Context.CONNECTIVITY_SERVICE));
private Context mContext;
+ private VpnManager mService;
@Override
@@ -80,6 +78,7 @@
public void onAttach(final Context context) {
super.onAttach(context);
mContext = context;
+ mService = context.getSystemService(VpnManager.class);
}
@Override
@@ -212,8 +211,6 @@
mService.startLegacyVpn(profile);
} catch (IllegalStateException e) {
Toast.makeText(mContext, R.string.vpn_no_network, Toast.LENGTH_LONG).show();
- } catch (RemoteException e) {
- Log.e(TAG, "Failed to connect", e);
}
}
}
diff --git a/src/com/android/settings/vpn2/VpnSettings.java b/src/com/android/settings/vpn2/VpnSettings.java
index 8a2b465..79f6be3 100644
--- a/src/com/android/settings/vpn2/VpnSettings.java
+++ b/src/com/android/settings/vpn2/VpnSettings.java
@@ -30,16 +30,14 @@
import android.content.pm.PackageManager;
import android.net.ConnectivityManager;
import android.net.ConnectivityManager.NetworkCallback;
-import android.net.IConnectivityManager;
import android.net.Network;
import android.net.NetworkCapabilities;
import android.net.NetworkRequest;
+import android.net.VpnManager;
import android.os.Bundle;
import android.os.Handler;
import android.os.HandlerThread;
import android.os.Message;
-import android.os.RemoteException;
-import android.os.ServiceManager;
import android.os.UserHandle;
import android.os.UserManager;
import android.security.Credentials;
@@ -92,10 +90,9 @@
.removeCapability(NetworkCapabilities.NET_CAPABILITY_TRUSTED)
.build();
- private final IConnectivityManager mConnectivityService = IConnectivityManager.Stub
- .asInterface(ServiceManager.getService(Context.CONNECTIVITY_SERVICE));
private ConnectivityManager mConnectivityManager;
private UserManager mUserManager;
+ private VpnManager mVpnManager;
private final KeyStore mKeyStore = KeyStore.getInstance();
@@ -124,6 +121,7 @@
mUserManager = (UserManager) getSystemService(Context.USER_SERVICE);
mConnectivityManager = (ConnectivityManager) getSystemService(Context.CONNECTIVITY_SERVICE);
+ mVpnManager = (VpnManager) getSystemService(Context.VPN_MANAGEMENT_SERVICE);
mUnavailable = isUiRestricted();
setHasOptionsMenu(!mUnavailable);
@@ -467,13 +465,9 @@
@WorkerThread
private Map<String, LegacyVpnInfo> getConnectedLegacyVpns() {
- try {
- mConnectedLegacyVpn = mConnectivityService.getLegacyVpnInfo(UserHandle.myUserId());
- if (mConnectedLegacyVpn != null) {
- return Collections.singletonMap(mConnectedLegacyVpn.key, mConnectedLegacyVpn);
- }
- } catch (RemoteException e) {
- Log.e(LOG_TAG, "Failure updating VPN list with connected legacy VPNs", e);
+ mConnectedLegacyVpn = mVpnManager.getLegacyVpnInfo(UserHandle.myUserId());
+ if (mConnectedLegacyVpn != null) {
+ return Collections.singletonMap(mConnectedLegacyVpn.key, mConnectedLegacyVpn);
}
return Collections.emptyMap();
}
@@ -482,15 +476,11 @@
private Set<AppVpnInfo> getConnectedAppVpns() {
// Mark connected third-party services
Set<AppVpnInfo> connections = new ArraySet<>();
- try {
- for (UserHandle profile : mUserManager.getUserProfiles()) {
- VpnConfig config = mConnectivityService.getVpnConfig(profile.getIdentifier());
- if (config != null && !config.legacy) {
- connections.add(new AppVpnInfo(profile.getIdentifier(), config.user));
- }
+ for (UserHandle profile : mUserManager.getUserProfiles()) {
+ VpnConfig config = mVpnManager.getVpnConfig(profile.getIdentifier());
+ if (config != null && !config.legacy) {
+ connections.add(new AppVpnInfo(profile.getIdentifier(), config.user));
}
- } catch (RemoteException e) {
- Log.e(LOG_TAG, "Failure updating VPN list with connected app VPNs", e);
}
return connections;
}
diff --git a/src/com/android/settings/vpn2/VpnUtils.java b/src/com/android/settings/vpn2/VpnUtils.java
index 38c56c5..c6b79b4 100644
--- a/src/com/android/settings/vpn2/VpnUtils.java
+++ b/src/com/android/settings/vpn2/VpnUtils.java
@@ -17,13 +17,11 @@
import android.content.Context;
import android.net.ConnectivityManager;
-import android.net.IConnectivityManager;
+import android.net.VpnManager;
import android.os.RemoteException;
-import android.os.ServiceManager;
import android.provider.Settings;
import android.security.Credentials;
import android.security.KeyStore;
-import android.util.Log;
import com.android.internal.net.LegacyVpnInfo;
import com.android.internal.net.VpnConfig;
@@ -71,12 +69,11 @@
}
public static boolean isVpnActive(Context context) throws RemoteException {
- return getIConnectivityManager().getVpnConfig(context.getUserId()) != null;
+ return getVpnManager(context).getVpnConfig(context.getUserId()) != null;
}
- public static String getConnectedPackage(IConnectivityManager service, final int userId)
- throws RemoteException {
- final VpnConfig config = service.getVpnConfig(userId);
+ public static String getConnectedPackage(VpnManager vpnManager, final int userId) {
+ final VpnConfig config = vpnManager.getVpnConfig(userId);
return config != null ? config.user : null;
}
@@ -84,9 +81,8 @@
return context.getSystemService(ConnectivityManager.class);
}
- private static IConnectivityManager getIConnectivityManager() {
- return IConnectivityManager.Stub.asInterface(
- ServiceManager.getService(Context.CONNECTIVITY_SERVICE));
+ private static VpnManager getVpnManager(Context context) {
+ return context.getSystemService(VpnManager.class);
}
public static boolean isAlwaysOnVpnSet(ConnectivityManager cm, final int userId) {
@@ -94,17 +90,12 @@
}
public static boolean disconnectLegacyVpn(Context context) {
- try {
- int userId = context.getUserId();
- IConnectivityManager connectivityService = getIConnectivityManager();
- LegacyVpnInfo currentLegacyVpn = connectivityService.getLegacyVpnInfo(userId);
- if (currentLegacyVpn != null) {
- clearLockdownVpn(context);
- connectivityService.prepareVpn(null, VpnConfig.LEGACY_VPN, userId);
- return true;
- }
- } catch (RemoteException e) {
- Log.e(TAG, "Legacy VPN could not be disconnected", e);
+ int userId = context.getUserId();
+ LegacyVpnInfo currentLegacyVpn = getVpnManager(context).getLegacyVpnInfo(userId);
+ if (currentLegacyVpn != null) {
+ clearLockdownVpn(context);
+ getVpnManager(context).prepareVpn(null, VpnConfig.LEGACY_VPN, userId);
+ return true;
}
return false;
}
diff --git a/src/com/android/settings/widget/SettingsMainSwitchPreference.java b/src/com/android/settings/widget/SettingsMainSwitchPreference.java
index 4597842..2a7aa73 100644
--- a/src/com/android/settings/widget/SettingsMainSwitchPreference.java
+++ b/src/com/android/settings/widget/SettingsMainSwitchPreference.java
@@ -17,8 +17,11 @@
package com.android.settings.widget;
import android.content.Context;
+import android.content.res.TypedArray;
+import android.text.TextUtils;
import android.util.AttributeSet;
+import androidx.core.content.res.TypedArrayUtils;
import androidx.preference.PreferenceViewHolder;
import androidx.preference.TwoStatePreference;
@@ -47,23 +50,23 @@
public SettingsMainSwitchPreference(Context context) {
super(context);
- init();
+ init(context, null);
}
public SettingsMainSwitchPreference(Context context, AttributeSet attrs) {
super(context, attrs);
- init();
+ init(context, attrs);
}
public SettingsMainSwitchPreference(Context context, AttributeSet attrs, int defStyleAttr) {
super(context, attrs, defStyleAttr);
- init();
+ init(context, attrs);
}
public SettingsMainSwitchPreference(Context context, AttributeSet attrs, int defStyleAttr,
int defStyleRes) {
super(context, attrs, defStyleAttr, defStyleRes);
- init();
+ init(context, attrs);
}
@Override
@@ -79,8 +82,21 @@
registerListenerToSwitchBar();
}
- private void init() {
+ private void init(Context context, AttributeSet attrs) {
setLayoutResource(R.layout.preference_widget_main_switch);
+
+ if (attrs != null) {
+ TypedArray a = context.obtainStyledAttributes(attrs,
+ androidx.preference.R.styleable.Preference, 0/*defStyleAttr*/,
+ 0/*defStyleRes*/);
+ final CharSequence title = TypedArrayUtils.getText(a,
+ androidx.preference.R.styleable.Preference_title,
+ androidx.preference.R.styleable.Preference_android_title);
+ if (!TextUtils.isEmpty(title)) {
+ setTitle(title.toString());
+ }
+ a.recycle();
+ }
}
/**
@@ -153,7 +169,7 @@
/**
* Enable or disable the text and switch.
*/
- public void setEnabled(boolean enabled) {
+ public void setSwitchBarEnabled(boolean enabled) {
if (mMainSwitchBar != null) {
mMainSwitchBar.setEnabled(enabled);
}
diff --git a/src/com/android/settings/wifi/WifiConfigController.java b/src/com/android/settings/wifi/WifiConfigController.java
index cfee53c..65e45b7 100644
--- a/src/com/android/settings/wifi/WifiConfigController.java
+++ b/src/com/android/settings/wifi/WifiConfigController.java
@@ -67,6 +67,7 @@
import androidx.annotation.VisibleForTesting;
+import com.android.net.module.util.ProxyUtils;
import com.android.settings.ProxySelector;
import com.android.settings.R;
import com.android.settings.network.SubscriptionUtil;
@@ -1408,7 +1409,8 @@
if (proxyProperties != null) {
mProxyHostView.setText(proxyProperties.getHost());
mProxyPortView.setText(Integer.toString(proxyProperties.getPort()));
- mProxyExclusionListView.setText(proxyProperties.getExclusionListAsString());
+ mProxyExclusionListView.setText(
+ ProxyUtils.exclusionListAsString(proxyProperties.getExclusionList()));
}
}
} else if (mProxySettingsSpinner.getSelectedItemPosition() == PROXY_PAC) {
diff --git a/src/com/android/settings/wifi/WifiConfigController2.java b/src/com/android/settings/wifi/WifiConfigController2.java
index 62f2352..49f1b21 100644
--- a/src/com/android/settings/wifi/WifiConfigController2.java
+++ b/src/com/android/settings/wifi/WifiConfigController2.java
@@ -65,6 +65,7 @@
import androidx.annotation.VisibleForTesting;
+import com.android.net.module.util.ProxyUtils;
import com.android.settings.ProxySelector;
import com.android.settings.R;
import com.android.settings.network.SubscriptionUtil;
@@ -1372,7 +1373,8 @@
if (proxyProperties != null) {
mProxyHostView.setText(proxyProperties.getHost());
mProxyPortView.setText(Integer.toString(proxyProperties.getPort()));
- mProxyExclusionListView.setText(proxyProperties.getExclusionListAsString());
+ mProxyExclusionListView.setText(
+ ProxyUtils.exclusionListAsString(proxyProperties.getExclusionList()));
}
}
} else if (mProxySettingsSpinner.getSelectedItemPosition() == PROXY_PAC) {
diff --git a/src/com/android/settings/wifi/WifiScanModeActivity.java b/src/com/android/settings/wifi/WifiScanModeActivity.java
index 024dc10..9d50281 100644
--- a/src/com/android/settings/wifi/WifiScanModeActivity.java
+++ b/src/com/android/settings/wifi/WifiScanModeActivity.java
@@ -25,6 +25,7 @@
import android.net.wifi.WifiManager;
import android.os.Bundle;
import android.text.TextUtils;
+import android.view.WindowManager;
import androidx.appcompat.app.AlertDialog;
import androidx.fragment.app.DialogFragment;
@@ -43,6 +44,8 @@
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
+ getWindow().addSystemFlags(
+ WindowManager.LayoutParams.SYSTEM_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS);
Intent intent = getIntent();
if (savedInstanceState == null) {
if (intent != null && WifiManager.ACTION_REQUEST_SCAN_ALWAYS_AVAILABLE
diff --git a/src/com/android/settings/wifi/WifiSummaryUpdater.java b/src/com/android/settings/wifi/WifiSummaryUpdater.java
index c559e7d..79bab36 100644
--- a/src/com/android/settings/wifi/WifiSummaryUpdater.java
+++ b/src/com/android/settings/wifi/WifiSummaryUpdater.java
@@ -98,4 +98,11 @@
com.android.settingslib.R.string.preference_summary_default_combination,
ssid, mWifiTracker.statusLabel);
}
+
+ /**
+ * return true if Wi-Fi connected.
+ */
+ public boolean isWifiConnected() {
+ return mWifiTracker.connected;
+ }
}
diff --git a/tests/componenttests/Android.bp b/tests/componenttests/Android.bp
new file mode 100644
index 0000000..77932ef
--- /dev/null
+++ b/tests/componenttests/Android.bp
@@ -0,0 +1,23 @@
+//############################################################
+// Settings Component test target. #
+//############################################################
+android_test {
+ name: "SettingsComponentTests",
+ certificate: "platform",
+ privileged: true,
+ srcs: [
+ "src/**/*.java",
+ ],
+
+ static_libs: [
+ "truth-prebuilt",
+ "androidx.test.core",
+ "androidx.test.runner",
+ "androidx.test.rules",
+ "androidx.test.ext.junit",
+ ],
+
+ test_suites: ["device-tests"],
+
+ instrumentation_for: "Settings",
+}
diff --git a/tests/componenttests/AndroidManifest.xml b/tests/componenttests/AndroidManifest.xml
new file mode 100644
index 0000000..54ea374
--- /dev/null
+++ b/tests/componenttests/AndroidManifest.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2016 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
+ package="com.android.settings.tests.component">
+
+ <uses-permission android:name="android.permission.BLUETOOTH" />
+ <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
+ <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+ <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
+ <uses-permission android:name="android.permission.USE_CREDENTIALS" />
+ <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
+ <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
+ <uses-permission android:name="android.permission.INTERACT_ACROSS_USERS" />
+ <uses-permission android:name="android.permission.UPDATE_APP_OPS_STATS" />
+ <uses-permission android:name="android.permission.WRITE_SECURE_SETTINGS" />
+ <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+
+ <application/>
+
+ <instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"
+ android:targetPackage="com.android.settings"
+ android:label="Settings Test Cases">
+ </instrumentation>
+
+</manifest>
\ No newline at end of file
diff --git a/tests/componenttests/AndroidTest.xml b/tests/componenttests/AndroidTest.xml
new file mode 100644
index 0000000..ea7ac06
--- /dev/null
+++ b/tests/componenttests/AndroidTest.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2017 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<configuration description="Runs Settings Test Cases.">
+ <option name="test-suite-tag" value="apct" />
+ <option name="test-suite-tag" value="apct-instrumentation" />
+ <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
+ <option name="cleanup-apks" value="true" />
+ <option name="test-file-name" value="SettingsComponentTests.apk" />
+ </target_preparer>
+
+ <option name="test-tag" value="SettingsComponentTests" />
+ <test class="com.android.tradefed.testtype.AndroidJUnitTest" >
+ <option name="package" value="com.android.settings.tests.component" />
+ <option name="runner" value="androidx.test.runner.AndroidJUnitRunner" />
+ <option name="hidden-api-checks" value="false"/>
+ </test>
+</configuration>
diff --git a/tests/componenttests/OWNERS b/tests/componenttests/OWNERS
new file mode 100644
index 0000000..51746f0
--- /dev/null
+++ b/tests/componenttests/OWNERS
@@ -0,0 +1,3 @@
+# People who can approve changes for submission
+jyhsu@google.com
+syaoranx@google.com
\ No newline at end of file
diff --git a/tests/componenttests/src/com/android/settings/fuelgauge/batterysaver/BatterySaverButtonPreferenceControllerComponentTest.java b/tests/componenttests/src/com/android/settings/fuelgauge/batterysaver/BatterySaverButtonPreferenceControllerComponentTest.java
new file mode 100644
index 0000000..30fcbf5
--- /dev/null
+++ b/tests/componenttests/src/com/android/settings/fuelgauge/batterysaver/BatterySaverButtonPreferenceControllerComponentTest.java
@@ -0,0 +1,143 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.fuelgauge.batterysaver;
+
+import static com.google.common.truth.Truth.assertThat;
+import static com.google.common.truth.Truth.assert_;
+
+import android.app.Instrumentation;
+import android.content.Context;
+import android.content.Intent;
+import android.os.PowerManager;
+import android.provider.Settings;
+import android.util.Log;
+import android.widget.Button;
+
+import androidx.test.core.app.ActivityScenario;
+import androidx.test.ext.junit.rules.ActivityScenarioRule;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+import androidx.test.filters.SmallTest;
+import androidx.test.platform.app.InstrumentationRegistry;
+
+import com.android.settings.R;
+import com.android.settings.Settings.BatterySaverSettingsActivity;
+import com.android.settings.testutils.AdbUtils;
+import com.android.settings.testutils.UiUtils;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@RunWith(AndroidJUnit4.class)
+@SmallTest
+public class BatterySaverButtonPreferenceControllerComponentTest {
+ private static final String TAG =
+ BatterySaverButtonPreferenceControllerComponentTest.class.getSimpleName();
+ private Instrumentation mInstrumentation = InstrumentationRegistry.getInstrumentation();
+ private PowerManager mManager =
+ (PowerManager) mInstrumentation.getTargetContext().getSystemService(
+ Context.POWER_SERVICE);
+
+ @Rule
+ public ActivityScenarioRule<BatterySaverSettingsActivity> rule = new ActivityScenarioRule<>(
+ new Intent(
+ Settings.ACTION_BATTERY_SAVER_SETTINGS).setFlags(
+ Intent.FLAG_ACTIVITY_NEW_TASK));
+
+ @Before
+ public void setUp() throws Exception {
+ mInstrumentation.getUiAutomation().executeShellCommand("dumpsys battery unplug");
+ mInstrumentation.getUiAutomation().executeShellCommand("settings get global low_power 0");
+ }
+
+ @Test
+ public void test_check_battery_saver_button() throws Exception {
+ ActivityScenario scenario = rule.getScenario();
+ scenario.onActivity(activity -> {
+ final Button button = activity.findViewById(R.id.state_on_button);
+ UiUtils.waitUntilCondition(3000, () -> button.isEnabled());
+ button.callOnClick();
+ checkPowerSaverMode(true);
+
+ Button offButton = activity.findViewById(R.id.state_off_button);
+ offButton.callOnClick();
+ checkPowerSaverMode(false);
+ });
+
+ //Ideally, we should be able to also create BatteryTipPreferenceController and verify that
+ //it is showing battery saver on. Unfortunately, that part of code is tightly coupled with
+ //UI, and it's not possible to retrieve that string without reaching very deep into the
+ //codes and become very tightly coupled with any future changes. That is not what component
+ //tests should do, so either we'll need to do this through UI with another ActivityScenario,
+ //or the code needs to be refactored to be less coupled with UI.
+ }
+
+ @Test
+ public void test_battery_saver_button_changes_when_framework_setting_change() throws Exception {
+ ActivityScenario scenario = rule.getScenario();
+ scenario.onActivity(activity -> {
+ Button buttonOn = activity.findViewById(R.id.state_on_button);
+ Button buttonOff = activity.findViewById(R.id.state_off_button);
+ assertThat(buttonOn.isVisibleToUser()).isEqualTo(true);
+ assertThat(buttonOff.isVisibleToUser()).isEqualTo(false);
+ });
+
+ mManager.setPowerSaveModeEnabled(true);
+ scenario.recreate();
+ scenario.onActivity(activity -> {
+ Button buttonOn = activity.findViewById(R.id.state_on_button);
+ Button buttonOff = activity.findViewById(R.id.state_off_button);
+ assertThat(buttonOn.isVisibleToUser()).isEqualTo(false);
+ assertThat(buttonOff.isVisibleToUser()).isEqualTo(true);
+ });
+
+ mManager.setPowerSaveModeEnabled(false);
+ scenario.recreate();
+ scenario.onActivity(activity -> {
+ Button buttonOn = activity.findViewById(R.id.state_on_button);
+ Button buttonOff = activity.findViewById(R.id.state_off_button);
+ assertThat(buttonOn.isVisibleToUser()).isEqualTo(true);
+ assertThat(buttonOff.isVisibleToUser()).isEqualTo(false);
+ });
+ }
+
+ @After
+ public void tearDown() {
+ mInstrumentation.getUiAutomation().executeShellCommand("settings get global low_power 0");
+ mInstrumentation.getUiAutomation().executeShellCommand("dumpsys battery reset");
+ }
+
+ private void checkPowerSaverMode(boolean enabled) {
+ //Check through adb. Note that this needs to be done first, or a wait and poll needs to be
+ //done to the manager.isPowerSaveMode(), because calling isPowerSaveMode immediately after
+ //setting it does not return true. It takes a while for isPowerSaveMode() to return the
+ //up-to-date value.
+ try {
+ assertThat(
+ AdbUtils.checkStringInAdbCommandOutput(TAG, "settings get global low_power",
+ null, enabled ? "1" : "0", 1000)).isTrue();
+ } catch (Exception e) {
+ Log.e(TAG, e.getMessage());
+ assert_().fail();
+ }
+
+ //Check through manager
+ assertThat(mManager.isPowerSaveMode() == enabled).isTrue();
+ }
+}
diff --git a/tests/componenttests/src/com/android/settings/privacy/EnabledContentCapturePreferenceControllerComponentTest.java b/tests/componenttests/src/com/android/settings/privacy/EnabledContentCapturePreferenceControllerComponentTest.java
new file mode 100644
index 0000000..aba6f8f
--- /dev/null
+++ b/tests/componenttests/src/com/android/settings/privacy/EnabledContentCapturePreferenceControllerComponentTest.java
@@ -0,0 +1,69 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.privacy;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.app.Instrumentation;
+
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+import androidx.test.filters.SmallTest;
+import androidx.test.platform.app.InstrumentationRegistry;
+
+import com.android.settings.testutils.AdbUtils;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@RunWith(AndroidJUnit4.class)
+@SmallTest
+public class EnabledContentCapturePreferenceControllerComponentTest {
+ private Instrumentation mInstrumentation;
+ private static final String TAG =
+ EnabledContentCapturePreferenceControllerComponentTest.class.getSimpleName();
+
+ @Before
+ public void setUp() {
+ if (null == mInstrumentation) {
+ mInstrumentation = InstrumentationRegistry.getInstrumentation();
+ }
+ }
+
+ @Test
+ public void test_uncheck_content_capture() throws Exception {
+ content_capture_checkbox_test_helper(false);
+ }
+
+ @Test
+ public void test_check_content_capture() throws Exception {
+ content_capture_checkbox_test_helper(true);
+ }
+
+ private void content_capture_checkbox_test_helper(boolean check) throws Exception {
+ EnableContentCapturePreferenceController enableContentCapturePreferenceController =
+ new EnableContentCapturePreferenceController(
+ ApplicationProvider.getApplicationContext(),
+ "Test_key");
+ enableContentCapturePreferenceController.setChecked(check);
+
+ //Check through adb command
+ assertThat(AdbUtils.checkStringInAdbCommandOutput(TAG, "dumpsys content_capture",
+ "Users disabled by Settings: ", check ? "{}" : "{0=true}", 1000)).isTrue();
+ }
+}
diff --git a/tests/componenttests/src/com/android/settings/testutils/AdbUtils.java b/tests/componenttests/src/com/android/settings/testutils/AdbUtils.java
new file mode 100644
index 0000000..08eb47a
--- /dev/null
+++ b/tests/componenttests/src/com/android/settings/testutils/AdbUtils.java
@@ -0,0 +1,62 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.testutils;
+
+import android.os.ParcelFileDescriptor;
+import android.text.TextUtils;
+import android.util.Log;
+
+import androidx.test.platform.app.InstrumentationRegistry;
+
+import java.io.BufferedReader;
+import java.io.InputStreamReader;
+import java.nio.charset.StandardCharsets;
+import java.util.Optional;
+
+public class AdbUtils {
+ public static boolean checkStringInAdbCommandOutput(String logTag, String command,
+ String prefix, String target, int timeoutInMillis) throws Exception {
+ long start = System.nanoTime();
+ //Sometimes the change do no reflect in adn output immediately, so need a wait and poll here
+ while (System.nanoTime() - start < (timeoutInMillis * 1000000)) {
+ try (ParcelFileDescriptor.AutoCloseInputStream in =
+ new ParcelFileDescriptor.AutoCloseInputStream(
+ InstrumentationRegistry.getInstrumentation()
+ .getUiAutomation()
+ .executeShellCommand(command))) {
+ try (BufferedReader br =
+ new BufferedReader(
+ new InputStreamReader(in, StandardCharsets.UTF_8))) {
+ Optional<String> resultOptional = br.lines().filter(line -> {
+ Log.d(logTag, line);
+ return TextUtils.isEmpty(prefix) || line.contains(prefix);
+ }).findFirst();
+ String result = resultOptional.get();
+ if (result.contains(target)) {
+ return true;
+ } else {
+ Thread.sleep(100);
+ }
+ }
+ } catch (Exception e) {
+ throw e;
+ }
+ }
+
+ return false;
+ }
+}
diff --git a/tests/componenttests/src/com/android/settings/testutils/CommonUtils.java b/tests/componenttests/src/com/android/settings/testutils/CommonUtils.java
new file mode 100644
index 0000000..cbfe245
--- /dev/null
+++ b/tests/componenttests/src/com/android/settings/testutils/CommonUtils.java
@@ -0,0 +1,96 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.testutils;
+
+import android.app.Activity;
+import android.graphics.Bitmap;
+import android.os.Environment;
+import android.util.Log;
+import android.view.View;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.net.HttpURLConnection;
+import java.net.URL;
+
+import javax.net.ssl.HttpsURLConnection;
+
+public class CommonUtils {
+ private static final String TAG = CommonUtils.class.getSimpleName();
+
+ public static void takeScreenshot(Activity activity) {
+ long now = System.currentTimeMillis();
+
+ try {
+ // image naming and path to include sd card appending name you choose for file
+ String mPath =
+ Environment.getExternalStorageDirectory().toString() + "/" + now + ".jpg";
+ Log.d(TAG, "screenshot path is " + mPath);
+
+ // create bitmap screen capture
+ View v1 = activity.getWindow().getDecorView().getRootView();
+ v1.setDrawingCacheEnabled(true);
+ Bitmap bitmap = Bitmap.createBitmap(v1.getDrawingCache());
+ v1.setDrawingCacheEnabled(false);
+
+ File imageFile = new File(mPath);
+
+ FileOutputStream outputStream = new FileOutputStream(imageFile);
+ int quality = 100;
+ bitmap.compress(Bitmap.CompressFormat.JPEG, quality, outputStream);
+ outputStream.flush();
+ outputStream.close();
+ } catch (Throwable e) {
+ // Several error may come out with file handling or DOM
+ e.printStackTrace();
+ }
+ }
+
+ public static boolean connectToURL(URL url) {
+ HttpURLConnection connection = null;
+ try {
+ connection = (HttpsURLConnection) url.openConnection();
+ connection.setRequestMethod("GET");
+ connection.setConnectTimeout(8000);
+ connection.setReadTimeout(8000);
+ connection.connect();
+ if (HttpURLConnection.HTTP_OK == connection.getResponseCode()) {
+ InputStream in = connection.getInputStream();
+ BufferedReader reader = new BufferedReader(new InputStreamReader(in));
+ StringBuilder response = new StringBuilder();
+ String line;
+ while (null != (line = reader.readLine())) {
+ response.append(line);
+ }
+ return true;
+ }
+ } catch (Exception e) {
+ Log.d(TAG, e.getMessage());
+ return false;
+ } finally {
+ if (null != connection) {
+ connection.disconnect();
+ }
+ }
+
+ return false;
+ }
+
+}
diff --git a/tests/componenttests/src/com/android/settings/testutils/Constants.java b/tests/componenttests/src/com/android/settings/testutils/Constants.java
new file mode 100644
index 0000000..5e32f87
--- /dev/null
+++ b/tests/componenttests/src/com/android/settings/testutils/Constants.java
@@ -0,0 +1,23 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.testutils;
+
+public class Constants {
+ public static final long ACTIVITY_LAUNCH_WAIT_TIMEOUT = 5000;
+ public static final long VIEW_APPEAR_WAIT_MEDIUM_TIMEOUT = 5000;
+ public static final long WIFI_CONNECT_WAIT_TIMEOUT = 15000;
+}
diff --git a/tests/componenttests/src/com/android/settings/testutils/UiUtils.java b/tests/componenttests/src/com/android/settings/testutils/UiUtils.java
new file mode 100644
index 0000000..a482add
--- /dev/null
+++ b/tests/componenttests/src/com/android/settings/testutils/UiUtils.java
@@ -0,0 +1,58 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.testutils;
+
+import android.app.Activity;
+
+import androidx.test.platform.app.InstrumentationRegistry;
+import androidx.test.runner.lifecycle.ActivityLifecycleMonitorRegistry;
+import androidx.test.runner.lifecycle.Stage;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.function.Supplier;
+
+public class UiUtils {
+
+ public static void waitUntilCondition(long timeoutInMillis, Supplier<Boolean> condition) {
+ long start = System.nanoTime();
+ while (System.nanoTime() - start < (timeoutInMillis * 1000000)) {
+ try {
+ //Eat NPE from condition because there's a concurrency issue that when calling
+ //findViewById when the view hierarchy is still rendering, it sometimes encounter
+ //null views that may exist few milliseconds before, and causes a NPE.
+ if (condition.get()) {
+ return;
+ }
+ } catch (NullPointerException e) {
+ e.printStackTrace();
+ }
+ }
+ }
+
+ public static boolean waitForActivitiesInStage(long timeoutInMillis, Stage stage) {
+ final Collection<Activity> activities = new ArrayList<>();
+ waitUntilCondition(Constants.ACTIVITY_LAUNCH_WAIT_TIMEOUT, () -> {
+ InstrumentationRegistry.getInstrumentation().runOnMainSync(() -> activities.addAll(
+ ActivityLifecycleMonitorRegistry.getInstance().getActivitiesInStage(
+ Stage.RESUMED)));
+ return activities.size() > 0;
+ });
+
+ return activities.size() > 0;
+ }
+}
diff --git a/tests/componenttests/src/com/android/settings/wifi/WifiSettings2ActivityTest.java b/tests/componenttests/src/com/android/settings/wifi/WifiSettings2ActivityTest.java
new file mode 100644
index 0000000..aa6b252
--- /dev/null
+++ b/tests/componenttests/src/com/android/settings/wifi/WifiSettings2ActivityTest.java
@@ -0,0 +1,125 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.wifi;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.app.Instrumentation;
+import android.content.Context;
+import android.content.Intent;
+import android.net.ConnectivityManager;
+import android.provider.Settings;
+import android.util.Log;
+import android.view.View;
+import android.widget.Button;
+
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentActivity;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+import androidx.test.filters.MediumTest;
+import androidx.test.platform.app.InstrumentationRegistry;
+import androidx.test.runner.lifecycle.ActivityLifecycleMonitorRegistry;
+import androidx.test.runner.lifecycle.Stage;
+
+import com.android.settings.R;
+import com.android.settings.Settings.NetworkProviderSettingsActivity;
+import com.android.settings.fuelgauge.batterysaver.BatterySaverButtonPreferenceControllerComponentTest;
+import com.android.settings.network.NetworkProviderSettings;
+import com.android.settings.testutils.CommonUtils;
+import com.android.settings.testutils.Constants;
+import com.android.settings.testutils.UiUtils;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import java.net.URL;
+import java.util.List;
+
+@RunWith(AndroidJUnit4.class)
+@MediumTest
+/*
+This test is just for demonstration purpose. For component tests, this approach is not recommended.
+The reason why it is written this way is because the current Settings app wifi codes have tight
+coupling with UI, so it's not easy to drive from API without binding the test deeply with the code.
+ */
+public class WifiSettings2ActivityTest {
+ private static final String TAG =
+ BatterySaverButtonPreferenceControllerComponentTest.class.getSimpleName();
+ private final Instrumentation mInstrumentation = InstrumentationRegistry.getInstrumentation();
+
+ @Test
+ public void test_connect_to_wifi() throws Exception {
+ //For some reason the ActivityScenario gets null activity here
+ mInstrumentation.getTargetContext().startActivity(
+ new Intent(Settings.ACTION_WIFI_SETTINGS).setFlags(Intent.FLAG_ACTIVITY_NEW_TASK));
+ UiUtils.waitForActivitiesInStage(Constants.ACTIVITY_LAUNCH_WAIT_TIMEOUT, Stage.RESUMED);
+
+ final NetworkProviderSettings[] settings = new NetworkProviderSettings[1];
+ mInstrumentation.runOnMainSync(() -> {
+ NetworkProviderSettingsActivity activity = (NetworkProviderSettingsActivity)
+ ActivityLifecycleMonitorRegistry.getInstance().getActivitiesInStage(
+ Stage.RESUMED).iterator().next();
+ settings[0] =
+ (NetworkProviderSettings) activity.getSupportFragmentManager().getFragments()
+ .get(0);
+ });
+
+ //For some reason this view does not appear immediately after the fragment is resumed.
+ View root = settings[0].getView();
+ UiUtils.waitUntilCondition(Constants.VIEW_APPEAR_WAIT_MEDIUM_TIMEOUT,
+ () -> root.findViewById(R.id.settings_button) != null);
+ View view = root.findViewById(R.id.settings_button);
+ view.callOnClick();
+
+ UiUtils.waitForActivitiesInStage(Constants.ACTIVITY_LAUNCH_WAIT_TIMEOUT, Stage.RESUMED);
+ Button[] button = new Button[1];
+ mInstrumentation.runOnMainSync(() -> {
+ FragmentActivity activity =
+ (FragmentActivity) ActivityLifecycleMonitorRegistry.getInstance()
+ .getActivitiesInStage(Stage.RESUMED).iterator().next();
+ List<Fragment> fragments = activity.getSupportFragmentManager().getFragments();
+ Log.d(TAG, "fragment class is " + fragments.get(0).getClass());
+ button[0] = fragments.get(0).getView().findViewById(R.id.button3);
+ });
+
+ //HttpURLConnection needs to run outside of main thread, so running it in the test thread
+ final URL url = new URL("https://www.google.net/");
+
+ //Make sure the connectivity is available before disconnecting from wifi
+ assertThat(CommonUtils.connectToURL(url)).isTrue();
+
+ //Disconnect from wifi
+ button[0].callOnClick();
+
+ //Make sure the Internet connectivity is gone
+ assertThat(CommonUtils.connectToURL(url)).isFalse();
+
+ //Connect to wifi
+ button[0].callOnClick();
+ ConnectivityManager manager =
+ (ConnectivityManager) mInstrumentation.getTargetContext().getSystemService(
+ Context.CONNECTIVITY_SERVICE);
+
+ //For some reason I can't find a way to tell the time that the internet connectivity is
+ //actually available with the new, non-deprecated ways, so I still need to use this.
+ UiUtils.waitUntilCondition(Constants.WIFI_CONNECT_WAIT_TIMEOUT,
+ () -> manager.getActiveNetworkInfo().isConnected());
+
+ //Make sure the connectivity is back again
+ assertThat(CommonUtils.connectToURL(url)).isTrue();
+ }
+}
diff --git a/tests/robotests/Android.bp b/tests/robotests/Android.bp
index c8c6c38..f6ad049 100644
--- a/tests/robotests/Android.bp
+++ b/tests/robotests/Android.bp
@@ -1,4 +1,4 @@
-//############################################################
+ //############################################################
// Build SettingsRoboTestStub.apk which includes test-only resources.#
//############################################################
diff --git a/tests/robotests/src/com/android/settings/SettingsActivityTest.java b/tests/robotests/src/com/android/settings/SettingsActivityTest.java
index ada4c0e..89f8449 100644
--- a/tests/robotests/src/com/android/settings/SettingsActivityTest.java
+++ b/tests/robotests/src/com/android/settings/SettingsActivityTest.java
@@ -37,6 +37,7 @@
import com.android.settings.core.OnActivityResultListener;
import com.android.settings.testutils.FakeFeatureFactory;
+import com.android.settings.testutils.shadow.ShadowUserManager;
import org.junit.Before;
import org.junit.Test;
@@ -46,11 +47,13 @@
import org.robolectric.Robolectric;
import org.robolectric.RobolectricTestRunner;
import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
import java.util.ArrayList;
import java.util.List;
@RunWith(RobolectricTestRunner.class)
+@Config(shadows = ShadowUserManager.class)
public class SettingsActivityTest {
@Mock
diff --git a/tests/robotests/src/com/android/settings/accessibility/ShortcutsSettingsFragmentTest.java b/tests/robotests/src/com/android/settings/accessibility/ShortcutsSettingsFragmentTest.java
new file mode 100644
index 0000000..12b568f
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/accessibility/ShortcutsSettingsFragmentTest.java
@@ -0,0 +1,50 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.accessibility;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.content.Context;
+
+import androidx.test.core.app.ApplicationProvider;
+
+import com.android.settings.R;
+import com.android.settings.testutils.XmlTestUtils;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
+
+import java.util.List;
+
+/** Tests for {@link ShortcutsSettingsFragment}. */
+@RunWith(RobolectricTestRunner.class)
+public class ShortcutsSettingsFragmentTest {
+
+ private Context mContext = ApplicationProvider.getApplicationContext();
+
+ @Test
+ public void getNonIndexableKeys_existInXmlLayout() {
+ final List<String> niks = ShortcutsSettingsFragment.SEARCH_INDEX_DATA_PROVIDER
+ .getNonIndexableKeys(mContext);
+ final List<String> keys =
+ XmlTestUtils.getKeysFromPreferenceXml(mContext,
+ R.xml.accessibility_shortcuts_settings);
+
+ assertThat(keys).containsAtLeastElementsIn(niks);
+ }
+}
diff --git a/tests/robotests/src/com/android/settings/accessibility/TurnScreenDarkerFragmentTest.java b/tests/robotests/src/com/android/settings/accessibility/TurnScreenDarkerFragmentTest.java
new file mode 100644
index 0000000..f256201
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/accessibility/TurnScreenDarkerFragmentTest.java
@@ -0,0 +1,50 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.accessibility;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.content.Context;
+
+import androidx.test.core.app.ApplicationProvider;
+
+import com.android.settings.R;
+import com.android.settings.testutils.XmlTestUtils;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
+
+import java.util.List;
+
+/** Tests for {@link TurnScreenDarkerFragment}. */
+@RunWith(RobolectricTestRunner.class)
+public class TurnScreenDarkerFragmentTest {
+
+ private Context mContext = ApplicationProvider.getApplicationContext();
+
+ @Test
+ public void getNonIndexableKeys_existInXmlLayout() {
+ final List<String> niks = TurnScreenDarkerFragment.SEARCH_INDEX_DATA_PROVIDER
+ .getNonIndexableKeys(mContext);
+ final List<String> keys =
+ XmlTestUtils.getKeysFromPreferenceXml(mContext,
+ R.xml.accessibility_turn_screen_darker);
+
+ assertThat(keys).containsAtLeastElementsIn(niks);
+ }
+}
diff --git a/tests/robotests/src/com/android/settings/accounts/AvatarViewMixinTest.java b/tests/robotests/src/com/android/settings/accounts/AvatarViewMixinTest.java
index 80f21fc..02b318f 100644
--- a/tests/robotests/src/com/android/settings/accounts/AvatarViewMixinTest.java
+++ b/tests/robotests/src/com/android/settings/accounts/AvatarViewMixinTest.java
@@ -43,6 +43,7 @@
import com.android.settings.homepage.SettingsHomepageActivity;
import com.android.settings.homepage.contextualcards.slices.BatteryFixSliceTest;
+import com.android.settings.testutils.shadow.ShadowUserManager;
import org.junit.Before;
import org.junit.Test;
@@ -61,6 +62,7 @@
import org.robolectric.shadows.ShadowPackageManager;
@RunWith(RobolectricTestRunner.class)
+@Config(shadows = ShadowUserManager.class)
public class AvatarViewMixinTest {
private static final String FAKE_ACCOUNT = "test@domain.com";
private static final String FAKE_DOMAIN = "domain.com";
diff --git a/tests/robotests/src/com/android/settings/accounts/TopLevelAccountEntryPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accounts/TopLevelAccountEntryPreferenceControllerTest.java
index 1cd5fb1..3a67d7f 100644
--- a/tests/robotests/src/com/android/settings/accounts/TopLevelAccountEntryPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/accounts/TopLevelAccountEntryPreferenceControllerTest.java
@@ -48,15 +48,12 @@
mController = new TopLevelAccountEntryPreferenceController(mContext, "test_key");
LABELS = ShadowAuthenticationHelper.getLabels();
TYPES = ShadowAuthenticationHelper.getTypes();
+ FeatureFlagUtils.setEnabled(mContext, FeatureFlags.SILKY_HOME, false);
}
@After
public void tearDown() {
ShadowAuthenticationHelper.reset();
-
- if (FeatureFlagUtils.isEnabled(mContext, FeatureFlags.SILKY_HOME)) {
- FeatureFlagUtils.setEnabled(mContext, FeatureFlags.SILKY_HOME, false);
- }
}
@Test
diff --git a/tests/robotests/src/com/android/settings/backup/BackupSettingsHelperTest.java b/tests/robotests/src/com/android/settings/backup/BackupSettingsHelperTest.java
index b6ef32c..a662be8 100644
--- a/tests/robotests/src/com/android/settings/backup/BackupSettingsHelperTest.java
+++ b/tests/robotests/src/com/android/settings/backup/BackupSettingsHelperTest.java
@@ -35,8 +35,10 @@
import android.os.IBinder;
import android.os.RemoteException;
import android.os.UserHandle;
+import android.util.FeatureFlagUtils;
import com.android.settings.R;
+import com.android.settings.core.FeatureFlags;
import org.junit.Before;
import org.junit.Test;
@@ -81,6 +83,7 @@
when(mBackupManager.getCurrentTransport()).thenReturn("test_transport");
mBackupSettingsHelper = new BackupSettingsHelper(mContext);
mUserManager = Shadow.extract(mContext.getSystemService(Context.USER_SERVICE));
+ FeatureFlagUtils.setEnabled(mContext, FeatureFlags.SILKY_HOME, false);
}
@Test
diff --git a/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrollingTest.java b/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrollingTest.java
index 41a5598..9b39a03 100644
--- a/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrollingTest.java
+++ b/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrollingTest.java
@@ -97,7 +97,7 @@
any(CancellationSignal.class),
anyInt(),
callbackCaptor.capture(),
- eq(true));
+ eq(FingerprintManager.ENROLL_ENROLL));
return callbackCaptor.getValue();
}
diff --git a/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFindSensorTest.java b/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFindSensorTest.java
index f2ced9c..55f0210 100644
--- a/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFindSensorTest.java
+++ b/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFindSensorTest.java
@@ -153,7 +153,7 @@
any(CancellationSignal.class),
anyInt(),
callbackCaptor.capture(),
- eq(false));
+ eq(FingerprintManager.ENROLL_FIND_SENSOR));
return callbackCaptor.getValue();
}
diff --git a/tests/robotests/src/com/android/settings/connecteddevice/TopLevelConnectedDevicesPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/connecteddevice/TopLevelConnectedDevicesPreferenceControllerTest.java
index 232bc16..b1f9ed1 100644
--- a/tests/robotests/src/com/android/settings/connecteddevice/TopLevelConnectedDevicesPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/connecteddevice/TopLevelConnectedDevicesPreferenceControllerTest.java
@@ -27,7 +27,6 @@
import com.android.settings.R;
import com.android.settings.core.FeatureFlags;
-import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -47,13 +46,7 @@
public void setUp() {
mContext = RuntimeEnvironment.application;
mController = new TopLevelConnectedDevicesPreferenceController(mContext, "test_key");
- }
-
- @After
- public void tearDown() {
- if (FeatureFlagUtils.isEnabled(mContext, FeatureFlags.SILKY_HOME)) {
- FeatureFlagUtils.setEnabled(mContext, FeatureFlags.SILKY_HOME, false);
- }
+ FeatureFlagUtils.setEnabled(mContext, FeatureFlags.SILKY_HOME, false);
}
@Test
diff --git a/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDetailsTranscodeMtpControllerTest.java b/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDetailsTranscodeMtpControllerTest.java
new file mode 100644
index 0000000..477b592
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDetailsTranscodeMtpControllerTest.java
@@ -0,0 +1,178 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.connecteddevice.usb;
+
+import static android.hardware.usb.UsbPortStatus.DATA_ROLE_NONE;
+import static android.hardware.usb.UsbPortStatus.POWER_ROLE_NONE;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+import android.hardware.usb.UsbManager;
+import android.os.SystemProperties;
+
+import androidx.fragment.app.FragmentActivity;
+import androidx.preference.PreferenceCategory;
+import androidx.preference.PreferenceManager;
+import androidx.preference.PreferenceScreen;
+import androidx.preference.SwitchPreference;
+
+import com.android.settings.testutils.shadow.ShadowUtils;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+
+@RunWith(RobolectricTestRunner.class)
+public class UsbDetailsTranscodeMtpControllerTest {
+ private static final String TRANSCODE_MTP_SYS_PROP_KEY = "sys.fuse.transcode_mtp";
+
+ private Context mContext;
+ private PreferenceCategory mPreference;
+ private PreferenceManager mPreferenceManager;
+ private PreferenceScreen mScreen;
+ private UsbDetailsTranscodeMtpController mUnderTest;
+
+ @Mock
+ private UsbBackend mUsbBackend;
+ @Mock
+ private UsbDetailsFragment mFragment;
+ @Mock
+ private FragmentActivity mActivity;
+
+ @Before
+ public void setUp() {
+ MockitoAnnotations.initMocks(this);
+
+ mContext = RuntimeEnvironment.application;
+ mPreferenceManager = new PreferenceManager(mContext);
+ mScreen = mPreferenceManager.createPreferenceScreen(mContext);
+
+ when(mFragment.getActivity()).thenReturn(mActivity);
+ when(mActivity.getApplicationContext()).thenReturn(mContext);
+ when(mFragment.getContext()).thenReturn(mContext);
+ when(mFragment.getPreferenceManager()).thenReturn(mPreferenceManager);
+ when(mFragment.getPreferenceScreen()).thenReturn(mScreen);
+
+ mUnderTest = new UsbDetailsTranscodeMtpController(mContext, mFragment, mUsbBackend);
+
+ mPreference = new PreferenceCategory(mContext);
+ mPreference.setKey(mUnderTest.getPreferenceKey());
+ mScreen.addPreference(mPreference);
+ }
+
+ @Test
+ public void displayRefresh_noUsbConnection_shouldDisablePrefCategory() {
+ mUnderTest.displayPreference(mScreen);
+ when(mUsbBackend.areAllRolesSupported()).thenReturn(true);
+
+ mUnderTest.refresh(false /* connected */, UsbManager.FUNCTION_MTP, POWER_ROLE_NONE,
+ DATA_ROLE_NONE);
+
+ assertThat(mPreference.isEnabled()).isFalse();
+ }
+
+ @Test
+ public void displayRefresh_noDataTransfer_shouldDisablePrefCategory() {
+ mUnderTest.displayPreference(mScreen);
+ when(mUsbBackend.areAllRolesSupported()).thenReturn(true);
+
+ mUnderTest.refresh(true /* connected */, UsbManager.FUNCTION_NONE, POWER_ROLE_NONE,
+ DATA_ROLE_NONE);
+
+ assertThat(mPreference.isEnabled()).isFalse();
+ }
+
+ @Test
+ public void displayRefresh_noDataRole_shouldDisablePrefCategory() throws InterruptedException {
+ mUnderTest.displayPreference(mScreen);
+ when(mUsbBackend.areAllRolesSupported()).thenReturn(true);
+
+ mUnderTest.refresh(true /* connected */, UsbManager.FUNCTION_MTP, POWER_ROLE_NONE,
+ DATA_ROLE_NONE);
+
+ assertThat(mPreference.isEnabled()).isFalse();
+ }
+
+ @Test
+ public void displayRefresh_fileTransfer_withAbsentProp_shouldCheck() {
+ mUnderTest.displayPreference(mScreen);
+ when(mUsbBackend.areAllRolesSupported()).thenReturn(true);
+
+ mUnderTest.refresh(true /* connected */, UsbManager.FUNCTION_MTP, POWER_ROLE_NONE,
+ DATA_ROLE_NONE);
+
+ assertThat(getSwitchPreference().isChecked()).isFalse();
+ }
+
+ @Test
+ public void displayRefresh_fileTransfer_withUnsetProp_shouldUncheck() {
+ mUnderTest.displayPreference(mScreen);
+ SystemProperties.set(TRANSCODE_MTP_SYS_PROP_KEY, Boolean.toString(false));
+ when(mUsbBackend.areAllRolesSupported()).thenReturn(true);
+
+ mUnderTest.refresh(true /* connected */, UsbManager.FUNCTION_MTP, POWER_ROLE_NONE,
+ DATA_ROLE_NONE);
+
+ assertThat(getSwitchPreference().isChecked()).isFalse();
+ }
+
+ @Test
+ public void displayRefresh_fileTransfer_withSetProp_shouldCheck() {
+ mUnderTest.displayPreference(mScreen);
+ SystemProperties.set(TRANSCODE_MTP_SYS_PROP_KEY, Boolean.toString(true));
+ when(mUsbBackend.areAllRolesSupported()).thenReturn(true);
+
+ mUnderTest.refresh(true /* connected */, UsbManager.FUNCTION_MTP, POWER_ROLE_NONE,
+ DATA_ROLE_NONE);
+
+ assertThat(getSwitchPreference().isChecked()).isTrue();
+ }
+
+ @Test
+ public void click_checked_shouldSetSystemProperty() {
+ mUnderTest.displayPreference(mScreen);
+ getSwitchPreference().performClick();
+ assertThat(SystemProperties.getBoolean(TRANSCODE_MTP_SYS_PROP_KEY, false)).isTrue();
+ }
+
+ @Test
+ public void click_unChecked_shouldUnsetSystemProperty() {
+ mUnderTest.displayPreference(mScreen);
+ getSwitchPreference().performClick();
+ getSwitchPreference().performClick();
+ assertThat(SystemProperties.getBoolean(TRANSCODE_MTP_SYS_PROP_KEY, true)).isFalse();
+ }
+
+ @Test
+ @Config(shadows = ShadowUtils.class)
+ public void isAvailable_isMonkey_shouldReturnFalse() {
+ ShadowUtils.setIsUserAMonkey(true);
+ assertThat(mUnderTest.isAvailable()).isFalse();
+ }
+
+ private SwitchPreference getSwitchPreference() {
+ return (SwitchPreference) mPreference.getPreference(0);
+ }
+}
diff --git a/tests/robotests/src/com/android/settings/dashboard/DashboardFeatureProviderImplTest.java b/tests/robotests/src/com/android/settings/dashboard/DashboardFeatureProviderImplTest.java
index a0024c0..1e6bc41 100644
--- a/tests/robotests/src/com/android/settings/dashboard/DashboardFeatureProviderImplTest.java
+++ b/tests/robotests/src/com/android/settings/dashboard/DashboardFeatureProviderImplTest.java
@@ -77,7 +77,6 @@
import com.android.settingslib.drawer.Tile;
import com.android.settingslib.drawer.TileUtils;
-import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -147,13 +146,7 @@
.thenReturn(new ResolveInfo());
mFeatureFactory = FakeFeatureFactory.setupForTest();
mImpl = new DashboardFeatureProviderImpl(mContext);
- }
-
- @After
- public void tearDown() {
- if (FeatureFlagUtils.isEnabled(mContext, FeatureFlags.SILKY_HOME)) {
- FeatureFlagUtils.setEnabled(mContext, FeatureFlags.SILKY_HOME, false);
- }
+ FeatureFlagUtils.setEnabled(mContext, FeatureFlags.SILKY_HOME, false);
}
@Test
diff --git a/tests/robotests/src/com/android/settings/deletionhelper/AutomaticStorageManagerDescriptionPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deletionhelper/AutomaticStorageManagerDescriptionPreferenceControllerTest.java
index 19ecc54..dbdbf38 100644
--- a/tests/robotests/src/com/android/settings/deletionhelper/AutomaticStorageManagerDescriptionPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/deletionhelper/AutomaticStorageManagerDescriptionPreferenceControllerTest.java
@@ -7,10 +7,10 @@
import android.content.Context;
import android.provider.Settings;
-import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
import com.android.settings.R;
+import com.android.settingslib.widget.FooterPreference;
import org.junit.Before;
import org.junit.Ignore;
@@ -28,7 +28,7 @@
@Mock
private PreferenceScreen mScreen;
@Mock
- private Preference mPreference;
+ private FooterPreference mPreference;
private AutomaticStorageManagerDescriptionPreferenceController mController;
private Context mContext = RuntimeEnvironment.application;
diff --git a/tests/robotests/src/com/android/settings/development/qstile/WinscopeTraceTest.java b/tests/robotests/src/com/android/settings/development/qstile/WinscopeTraceTest.java
index 88e2886..52ba7a7 100644
--- a/tests/robotests/src/com/android/settings/development/qstile/WinscopeTraceTest.java
+++ b/tests/robotests/src/com/android/settings/development/qstile/WinscopeTraceTest.java
@@ -24,8 +24,10 @@
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyBoolean;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.ArgumentMatchers.isNull;
+import static org.mockito.Mockito.doNothing;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.doThrow;
import static org.mockito.Mockito.spy;
@@ -72,6 +74,7 @@
// default ImeTraceEnabled value, prevent tests from actually calling into IMM and
// await the result forever.
doReturn(false).when(mWinscopeTrace).isImeTraceEnabled();
+ doNothing().when(mWinscopeTrace).setImeTraceEnabled(anyBoolean());
ReflectionHelpers.setField(mWinscopeTrace, "mWindowManager", mWindowManager);
ReflectionHelpers.setField(mWinscopeTrace, "mInputMethodManager", mInputMethodManager);
ReflectionHelpers.setField(mWinscopeTrace, "mSurfaceFlinger", mSurfaceFlinger);
@@ -182,7 +185,7 @@
@Test
public void setIsEnableTrue_shouldEnableImeTrace() throws RemoteException {
mWinscopeTrace.setIsEnabled(true);
- verify(mInputMethodManager).startImeTrace();
+ verify(mWinscopeTrace).setImeTraceEnabled(eq(true));
verifyNoMoreInteractions(mInputMethodManager);
}
@@ -210,7 +213,7 @@
@Config(shadows = ShadowParcel.class)
public void setIsEnableFalse_shouldDisableImeTrace() throws RemoteException {
mWinscopeTrace.setIsEnabled(false);
- verify(mInputMethodManager).stopImeTrace();
+ verify(mWinscopeTrace).setImeTraceEnabled(eq(false));
verifyNoMoreInteractions(mInputMethodManager);
verify(mToast).show();
}
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/TopLevelStoragePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/TopLevelStoragePreferenceControllerTest.java
index e19066a..7e6be9b 100644
--- a/tests/robotests/src/com/android/settings/deviceinfo/TopLevelStoragePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/deviceinfo/TopLevelStoragePreferenceControllerTest.java
@@ -36,7 +36,6 @@
import com.android.settings.core.FeatureFlags;
import com.android.settingslib.deviceinfo.StorageManagerVolumeProvider;
-import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -69,13 +68,7 @@
when(mStorageManagerVolumeProvider.getVolumes()).thenReturn(mVolumes);
mController = new TopLevelStoragePreferenceController(mContext, "test_key");
- }
-
- @After
- public void tearDown() {
- if (FeatureFlagUtils.isEnabled(mContext, FeatureFlags.SILKY_HOME)) {
- FeatureFlagUtils.setEnabled(mContext, FeatureFlags.SILKY_HOME, false);
- }
+ FeatureFlagUtils.setEnabled(mContext, FeatureFlags.SILKY_HOME, false);
}
@Test
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/aboutphone/TopLevelAboutDevicePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/aboutphone/TopLevelAboutDevicePreferenceControllerTest.java
index 16c77a4..d20beab 100644
--- a/tests/robotests/src/com/android/settings/deviceinfo/aboutphone/TopLevelAboutDevicePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/deviceinfo/aboutphone/TopLevelAboutDevicePreferenceControllerTest.java
@@ -27,7 +27,6 @@
import com.android.settings.core.FeatureFlags;
-import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -44,13 +43,7 @@
public void setUp() {
mContext = RuntimeEnvironment.application;
mController = new TopLevelAboutDevicePreferenceController(mContext, "test_key");
- }
-
- @After
- public void teardown() {
- if (FeatureFlagUtils.isEnabled(mContext, FeatureFlags.SILKY_HOME)) {
- FeatureFlagUtils.setEnabled(mContext, FeatureFlags.SILKY_HOME, false);
- }
+ FeatureFlagUtils.setEnabled(mContext, FeatureFlags.SILKY_HOME, false);
}
@Test
diff --git a/tests/robotests/src/com/android/settings/display/NightDisplayActivationPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/NightDisplayActivationPreferenceControllerTest.java
index bad112a..d084c51 100644
--- a/tests/robotests/src/com/android/settings/display/NightDisplayActivationPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/display/NightDisplayActivationPreferenceControllerTest.java
@@ -21,13 +21,11 @@
import android.content.Context;
import android.hardware.display.ColorDisplayManager;
-import android.view.View;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
import com.android.settings.testutils.shadow.SettingsShadowResources;
-import com.android.settingslib.widget.LayoutPreference;
+import com.android.settingslib.widget.MainSwitchPreference;
import org.junit.After;
import org.junit.Before;
@@ -45,7 +43,7 @@
@Mock
private PreferenceScreen mScreen;
- private LayoutPreference mPreference;
+ private MainSwitchPreference mPreference;
private Context mContext;
private ColorDisplayManager mColorDisplayManager;
private NightDisplayActivationPreferenceController mPreferenceController;
@@ -55,7 +53,7 @@
MockitoAnnotations.initMocks(this);
mContext = RuntimeEnvironment.application;
mColorDisplayManager = mContext.getSystemService(ColorDisplayManager.class);
- mPreference = new LayoutPreference(mContext, R.layout.night_display_activation_button);
+ mPreference = new MainSwitchPreference(mContext);
when(mScreen.findPreference(anyString())).thenReturn(mPreference);
mPreferenceController = new NightDisplayActivationPreferenceController(mContext,
"night_display_activation");
@@ -104,9 +102,9 @@
public void onClick_activates() {
mColorDisplayManager.setNightDisplayActivated(false);
- final View view = mPreference.findViewById(R.id.night_display_turn_on_button);
- assertThat(view.getVisibility()).isEqualTo(View.VISIBLE);
- view.performClick();
+ final NightDisplayActivationPreferenceController controller =
+ new NightDisplayActivationPreferenceController(mContext, "night_display_activated");
+ controller.onSwitchChanged(null, true);
assertThat(mColorDisplayManager.isNightDisplayActivated()).isEqualTo(true);
}
@@ -115,9 +113,9 @@
public void onClick_deactivates() {
mColorDisplayManager.setNightDisplayActivated(true);
- final View view = mPreference.findViewById(R.id.night_display_turn_off_button);
- assertThat(view.getVisibility()).isEqualTo(View.VISIBLE);
- view.performClick();
+ final NightDisplayActivationPreferenceController controller =
+ new NightDisplayActivationPreferenceController(mContext, "night_display_activated");
+ controller.onSwitchChanged(null, false);
assertThat(mColorDisplayManager.isNightDisplayActivated()).isEqualTo(false);
}
diff --git a/tests/robotests/src/com/android/settings/display/ScreenTimeoutSettingsTest.java b/tests/robotests/src/com/android/settings/display/ScreenTimeoutSettingsTest.java
index 621ddfa..efc45e0 100644
--- a/tests/robotests/src/com/android/settings/display/ScreenTimeoutSettingsTest.java
+++ b/tests/robotests/src/com/android/settings/display/ScreenTimeoutSettingsTest.java
@@ -87,6 +87,7 @@
com.android.internal.R.bool.config_adaptive_sleep_available);
doReturn(null).when(mContext).getSystemService(DevicePolicyManager.class);
+ doReturn(mResources).when(mContext).getResources();
doReturn(mResources).when(mSettings).getResources();
doReturn(mContext).when(mSettings).getContext();
diff --git a/tests/robotests/src/com/android/settings/display/SmartAutoRotatePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/SmartAutoRotatePreferenceControllerTest.java
new file mode 100644
index 0000000..b65785f
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/display/SmartAutoRotatePreferenceControllerTest.java
@@ -0,0 +1,173 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.display;
+
+import static android.provider.Settings.Secure.CAMERA_AUTOROTATE;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.Mockito.when;
+
+import android.content.ContentResolver;
+import android.content.Context;
+import android.content.pm.PackageManager;
+import android.os.UserHandle;
+import android.provider.Settings;
+
+import com.android.settings.R;
+import com.android.settings.core.BasePreferenceController;
+import com.android.settings.testutils.FakeFeatureFactory;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Answers;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.RuntimeEnvironment;
+
+@RunWith(RobolectricTestRunner.class)
+public class SmartAutoRotatePreferenceControllerTest {
+
+ @Mock(answer = Answers.RETURNS_DEEP_STUBS)
+ private Context mContext;
+ @Mock
+ private PackageManager mPackageManager;
+ private ContentResolver mContentResolver;
+ private SmartAutoRotatePreferenceController mController;
+
+ @Before
+ public void setUp() {
+ MockitoAnnotations.initMocks(this);
+ FakeFeatureFactory.setupForTest();
+ mContentResolver = RuntimeEnvironment.application.getContentResolver();
+ when(mContext.getPackageManager()).thenReturn(mPackageManager);
+ when(mContext.getContentResolver()).thenReturn(mContentResolver);
+ when(mContext.getString(R.string.auto_rotate_option_off))
+ .thenReturn("Off");
+ when(mContext.getString(R.string.auto_rotate_option_on))
+ .thenReturn("On");
+ when(mContext.getString(R.string.auto_rotate_option_face_based))
+ .thenReturn("On - Face-based");
+
+ disableCameraBasedRotation();
+
+ mController = new SmartAutoRotatePreferenceController(mContext, "smart_auto_rotate");
+ }
+
+ @Test
+ public void isAvailableWhenPolicyAllows() {
+ assertThat(mController.isAvailable()).isFalse();
+
+ enableAutoRotationPreference();
+
+ assertThat(mController.isAvailable()).isTrue();
+ }
+
+ @Test
+ public void updatePreference_settingsIsOff_shouldTurnOffToggle() {
+ disableAutoRotation();
+
+ assertThat(mController.getSummary()).isEqualTo("Off");
+ }
+
+ @Test
+ public void updatePreference_settingsIsOn_shouldTurnOnToggle() {
+ enableAutoRotation();
+
+ assertThat(mController.getSummary()).isEqualTo("On");
+ }
+
+ @Test
+ public void updatePreference_settingsIsCameraBased_shouldTurnOnToggle() {
+ enableCameraBasedRotation();
+ enableAutoRotation();
+
+ assertThat(mController.getSummary()).isEqualTo("On - Face-based");
+
+ disableAutoRotation();
+
+ assertThat(mController.getSummary()).isEqualTo("Off");
+ }
+
+ @Test
+ public void testGetAvailabilityStatus() {
+ assertThat(mController.getAvailabilityStatus()).isEqualTo(BasePreferenceController
+ .UNSUPPORTED_ON_DEVICE);
+
+ enableAutoRotationPreference();
+
+ assertThat(mController.getAvailabilityStatus()).isEqualTo(BasePreferenceController
+ .AVAILABLE);
+
+ disableAutoRotationPreference();
+
+ assertThat(mController.getAvailabilityStatus()).isEqualTo(BasePreferenceController
+ .UNSUPPORTED_ON_DEVICE);
+ }
+
+ @Test
+ public void isSliceableCorrectKey_returnsTrue() {
+ final AutoRotatePreferenceController controller =
+ new AutoRotatePreferenceController(mContext, "auto_rotate");
+ assertThat(controller.isSliceable()).isTrue();
+ }
+
+ @Test
+ public void isSliceableIncorrectKey_returnsFalse() {
+ final AutoRotatePreferenceController controller =
+ new AutoRotatePreferenceController(mContext, "bad_key");
+ assertThat(controller.isSliceable()).isFalse();
+ }
+
+ private void enableAutoRotationPreference() {
+ when(mPackageManager.hasSystemFeature(anyString())).thenReturn(true);
+ when(mContext.getResources().getBoolean(anyInt())).thenReturn(true);
+ Settings.System.putInt(mContentResolver,
+ Settings.System.HIDE_ROTATION_LOCK_TOGGLE_FOR_ACCESSIBILITY, 0);
+ }
+
+ private void disableAutoRotationPreference() {
+ when(mPackageManager.hasSystemFeature(anyString())).thenReturn(true);
+ when(mContext.getResources().getBoolean(anyInt())).thenReturn(true);
+ Settings.System.putInt(mContentResolver,
+ Settings.System.HIDE_ROTATION_LOCK_TOGGLE_FOR_ACCESSIBILITY, 1);
+ }
+
+ private void enableAutoRotation() {
+ Settings.System.putIntForUser(mContentResolver,
+ Settings.System.ACCELEROMETER_ROTATION, 1, UserHandle.USER_CURRENT);
+ }
+
+ private void disableAutoRotation() {
+ Settings.System.putIntForUser(mContentResolver,
+ Settings.System.ACCELEROMETER_ROTATION, 0, UserHandle.USER_CURRENT);
+ }
+
+ private void enableCameraBasedRotation() {
+ Settings.Secure.putIntForUser(mContentResolver,
+ CAMERA_AUTOROTATE, 1, UserHandle.USER_CURRENT);
+ }
+
+ private void disableCameraBasedRotation() {
+ Settings.Secure.putIntForUser(mContentResolver,
+ CAMERA_AUTOROTATE, 0, UserHandle.USER_CURRENT);
+ }
+}
diff --git a/tests/robotests/src/com/android/settings/display/TopLevelDisplayPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/TopLevelDisplayPreferenceControllerTest.java
index a52ad71..864d2b9 100644
--- a/tests/robotests/src/com/android/settings/display/TopLevelDisplayPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/display/TopLevelDisplayPreferenceControllerTest.java
@@ -36,7 +36,6 @@
import com.android.settings.R;
import com.android.settings.core.FeatureFlags;
-import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -66,13 +65,7 @@
when(mContext.getString(R.string.config_wallpaper_picker_class)).thenReturn("cls");
mController = new TopLevelDisplayPreferenceController(mContext, "test_key");
- }
-
- @After
- public void tearDown() {
- if (FeatureFlagUtils.isEnabled(mContext, FeatureFlags.SILKY_HOME)) {
- FeatureFlagUtils.setEnabled(mContext, FeatureFlags.SILKY_HOME, false);
- }
+ FeatureFlagUtils.setEnabled(mContext, FeatureFlags.SILKY_HOME, false);
}
@Test
diff --git a/tests/robotests/src/com/android/settings/display/darkmode/DarkModeActivationPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/darkmode/DarkModeActivationPreferenceControllerTest.java
index 33d0927c..0d4646e 100644
--- a/tests/robotests/src/com/android/settings/display/darkmode/DarkModeActivationPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/display/darkmode/DarkModeActivationPreferenceControllerTest.java
@@ -23,9 +23,8 @@
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyBoolean;
import static org.mockito.ArgumentMatchers.anyString;
-import static org.mockito.Mockito.eq;
import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.when;
import android.app.UiModeManager;
@@ -33,13 +32,12 @@
import android.content.res.Configuration;
import android.content.res.Resources;
import android.os.PowerManager;
-import android.view.View;
-import android.widget.Button;
import androidx.preference.PreferenceScreen;
import com.android.settings.R;
-import com.android.settingslib.widget.LayoutPreference;
+import com.android.settings.testutils.FakeFeatureFactory;
+import com.android.settingslib.widget.MainSwitchPreference;
import org.junit.Before;
import org.junit.Test;
@@ -47,6 +45,7 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RobolectricTestRunner;
+import org.robolectric.RuntimeEnvironment;
import java.util.Locale;
@@ -54,25 +53,21 @@
public class DarkModeActivationPreferenceControllerTest {
private DarkModeActivationPreferenceController mController;
private String mPreferenceKey = "key";
+
@Mock
- private LayoutPreference mPreference;
+ private MainSwitchPreference mPreference;
@Mock
private PreferenceScreen mScreen;
@Mock
private Resources res;
@Mock
- private Context mContext;
- @Mock
private UiModeManager mService;
@Mock
- private Button mTurnOffButton;
- @Mock
- private Button mTurnOnButton;
- @Mock
private PowerManager mPM;
@Mock
private TimeFormatter mFormat;
+ private Context mContext;
private Configuration mConfigNightYes = new Configuration();
private Configuration mConfigNightNo = new Configuration();
private Locale mLocal = new Locale("ENG");
@@ -80,16 +75,14 @@
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
+ FakeFeatureFactory.setupForTest();
+ mContext = spy(RuntimeEnvironment.application);
mService = mock(UiModeManager.class);
when(mContext.getResources()).thenReturn(res);
when(res.getConfiguration()).thenReturn(mConfigNightNo);
when(mContext.getSystemService(UiModeManager.class)).thenReturn(mService);
when(mContext.getSystemService(PowerManager.class)).thenReturn(mPM);
when(mScreen.findPreference(anyString())).thenReturn(mPreference);
- when(mPreference.findViewById(
- eq(R.id.dark_ui_turn_on_button))).thenReturn(mTurnOnButton);
- when(mPreference.findViewById(
- eq(R.id.dark_ui_turn_off_button))).thenReturn(mTurnOffButton);
when(mService.setNightModeActivated(anyBoolean())).thenReturn(true);
when(mFormat.of(any())).thenReturn("10:00 AM");
when(mContext.getString(
@@ -124,66 +117,55 @@
public void nightMode_toggleButton_offManual() {
when(mService.getNightMode()).thenReturn(UiModeManager.MODE_NIGHT_YES);
when(res.getConfiguration()).thenReturn(mConfigNightYes);
+ final MainSwitchPreference preference = new MainSwitchPreference(mContext);
mController.updateState(mPreference);
- verify(mTurnOnButton).setVisibility(eq(View.GONE));
- verify(mTurnOffButton).setVisibility(eq(View.VISIBLE));
- verify(mTurnOffButton).setText(eq(mContext.getString(
- R.string.dark_ui_activation_off_manual)));
+ assertThat(preference.isChecked()).isFalse();
}
@Test
public void nightMode_toggleButton_offCustom() {
when(mService.getNightMode()).thenReturn(UiModeManager.MODE_NIGHT_CUSTOM);
when(res.getConfiguration()).thenReturn(mConfigNightYes);
+ final MainSwitchPreference preference = new MainSwitchPreference(mContext);
- mController.updateState(mPreference);
+ mController.updateState(preference);
- verify(mTurnOnButton).setVisibility(eq(View.GONE));
- verify(mTurnOffButton).setVisibility(eq(View.VISIBLE));
- verify(mTurnOffButton).setText(eq(mContext.getString(
- R.string.dark_ui_activation_off_custom)));
+ assertThat(preference.isChecked()).isFalse();
}
@Test
public void nightMode_toggleButton_onCustom() {
when(mService.getNightMode()).thenReturn(UiModeManager.MODE_NIGHT_CUSTOM);
when(res.getConfiguration()).thenReturn(mConfigNightYes);
+ final MainSwitchPreference preference = new MainSwitchPreference(mContext);
- mController.updateState(mPreference);
+ mController.updateState(preference);
- verify(mTurnOnButton).setVisibility(eq(View.GONE));
- verify(mTurnOffButton).setVisibility(eq(View.VISIBLE));
- verify(mTurnOffButton).setText(eq(mContext.getString(
- R.string.dark_ui_activation_on_custom)));
+ assertThat(preference.isChecked()).isFalse();
}
-
@Test
public void nightMode_toggleButton_onAutoWhenModeIsYes() {
when(mService.getNightMode()).thenReturn(UiModeManager.MODE_NIGHT_YES);
when(res.getConfiguration()).thenReturn(mConfigNightNo);
+ final MainSwitchPreference preference = new MainSwitchPreference(mContext, null);
- mController.updateState(mPreference);
+ mController.updateState(preference);
- verify(mTurnOffButton).setVisibility(eq(View.GONE));
- verify(mTurnOnButton).setVisibility(eq(View.VISIBLE));
- verify(mTurnOnButton).setText(eq(mContext.getString(
- R.string.dark_ui_activation_on_manual)));
+ assertThat(preference.isChecked()).isFalse();
}
@Test
public void nightMode_toggleButton_onAutoWhenModeIsAuto() {
when(mService.getNightMode()).thenReturn(UiModeManager.MODE_NIGHT_AUTO);
when(res.getConfiguration()).thenReturn(mConfigNightNo);
+ final MainSwitchPreference preference = new MainSwitchPreference(mContext);
- mController.updateState(mPreference);
+ mController.updateState(preference);
- verify(mTurnOffButton).setVisibility(eq(View.GONE));
- verify(mTurnOnButton).setVisibility(eq(View.VISIBLE));
- verify(mTurnOnButton).setText(eq(mContext.getString(
- R.string.dark_ui_activation_on_auto)));
+ assertThat(preference.isChecked()).isFalse();
}
@Test
@@ -207,9 +189,10 @@
@Test
public void buttonVisisbility_hideButton_offWhenInPowerSaveMode() {
when(mPM.isPowerSaveMode()).thenReturn(true);
- mController.updateState(mPreference);
- verify(mTurnOffButton).setVisibility(eq(View.GONE));
- verify(mTurnOnButton).setVisibility(eq(View.GONE));
+ final MainSwitchPreference preference = new MainSwitchPreference(mContext);
+
+ mController.updateState(preference);
+ assertThat(preference.isChecked()).isFalse();
}
@Test
diff --git a/tests/robotests/src/com/android/settings/emergency/EmergencyGestureEntrypointPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/emergency/EmergencyGestureEntrypointPreferenceControllerTest.java
index 9169372..65fa187 100644
--- a/tests/robotests/src/com/android/settings/emergency/EmergencyGestureEntrypointPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/emergency/EmergencyGestureEntrypointPreferenceControllerTest.java
@@ -52,14 +52,13 @@
private Context mContext;
private ShadowPackageManager mPackageManager;
- private EmergencyGestureEntrypointPreferenceController mController;
private static final String PREF_KEY = "gesture_emergency_button";
@Before
public void setUp() {
mContext = ApplicationProvider.getApplicationContext();
mPackageManager = Shadows.shadowOf(mContext.getPackageManager());
- mController = new EmergencyGestureEntrypointPreferenceController(mContext, PREF_KEY);
+
}
@After
@@ -69,24 +68,18 @@
@Test
public void constructor_hasCustomPackageConfig_shouldSetIntent() {
- final ResolveInfo info = new ResolveInfo();
- info.activityInfo = new ActivityInfo();
- info.activityInfo.packageName = TEST_PKG_NAME;
- info.activityInfo.name = TEST_CLASS_NAME;
-
- mPackageManager.addResolveInfoForIntent(SETTING_INTENT, info);
-
SettingsShadowResources.overrideResource(
R.bool.config_show_emergency_gesture_settings,
Boolean.TRUE);
-
SettingsShadowResources.overrideResource(
R.string.emergency_gesture_settings_package,
TEST_PKG_NAME);
+ prepareCustomIntent();
- mController = new EmergencyGestureEntrypointPreferenceController(mContext, PREF_KEY);
+ EmergencyGestureEntrypointPreferenceController controller =
+ new EmergencyGestureEntrypointPreferenceController(mContext, PREF_KEY);
- assertThat(mController.mIntent).isNotNull();
+ assertThat(controller.mIntent).isNotNull();
}
@Test
@@ -94,8 +87,10 @@
SettingsShadowResources.overrideResource(
R.bool.config_show_emergency_gesture_settings,
Boolean.TRUE);
+ EmergencyGestureEntrypointPreferenceController controller =
+ new EmergencyGestureEntrypointPreferenceController(mContext, PREF_KEY);
- assertThat(mController.getAvailabilityStatus()).isEqualTo(AVAILABLE);
+ assertThat(controller.getAvailabilityStatus()).isEqualTo(AVAILABLE);
}
@Test
@@ -103,7 +98,34 @@
SettingsShadowResources.overrideResource(
R.bool.config_show_emergency_gesture_settings,
Boolean.FALSE);
+ EmergencyGestureEntrypointPreferenceController controller =
+ new EmergencyGestureEntrypointPreferenceController(mContext, PREF_KEY);
- assertThat(mController.getAvailabilityStatus()).isEqualTo(UNSUPPORTED_ON_DEVICE);
+ assertThat(controller.getAvailabilityStatus()).isEqualTo(UNSUPPORTED_ON_DEVICE);
+ }
+
+ @Test
+ public void getAvailabilityStatus_noSuitableIntent_shouldReturnUnsupported() {
+ SettingsShadowResources.overrideResource(
+ R.bool.config_show_emergency_gesture_settings,
+ Boolean.TRUE);
+ // Provide override package name but don't provide resolvable intent
+ SettingsShadowResources.overrideResource(
+ R.string.emergency_gesture_settings_package,
+ TEST_PKG_NAME);
+
+ EmergencyGestureEntrypointPreferenceController controller =
+ new EmergencyGestureEntrypointPreferenceController(mContext, PREF_KEY);
+
+ assertThat(controller.getAvailabilityStatus()).isEqualTo(UNSUPPORTED_ON_DEVICE);
+ }
+
+ private void prepareCustomIntent() {
+ final ResolveInfo info = new ResolveInfo();
+ info.activityInfo = new ActivityInfo();
+ info.activityInfo.packageName = TEST_PKG_NAME;
+ info.activityInfo.name = TEST_CLASS_NAME;
+
+ mPackageManager.addResolveInfoForIntent(SETTING_INTENT, info);
}
}
diff --git a/tests/robotests/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsListFragmentTest.java b/tests/robotests/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsListFragmentTest.java
deleted file mode 100644
index 5295402..0000000
--- a/tests/robotests/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsListFragmentTest.java
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License
- */
-
-package com.android.settings.enterprise;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.Answers.RETURNS_DEEP_STUBS;
-import static org.mockito.Mockito.when;
-
-import android.content.Context;
-
-import androidx.preference.PreferenceManager;
-import androidx.preference.PreferenceScreen;
-
-import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
-import com.android.settings.R;
-import com.android.settingslib.core.AbstractPreferenceController;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
-
-import java.util.List;
-
-@RunWith(RobolectricTestRunner.class)
-public class EnterpriseSetDefaultAppsListFragmentTest {
-
- @Mock(answer = RETURNS_DEEP_STUBS)
- private PreferenceScreen mScreen;
- @Mock(answer = RETURNS_DEEP_STUBS)
- private PreferenceManager mPreferenceManager;
-
- private EnterpriseSetDefaultAppsListFragment mFragment;
- private Context mContext;
-
- @Before
- public void setUp() {
- MockitoAnnotations.initMocks(this);
- mContext = RuntimeEnvironment.application;
- when(mPreferenceManager.getContext()).thenReturn(mContext);
- when(mScreen.getPreferenceManager()).thenReturn(mPreferenceManager);
- mFragment = new EnterpriseSetDefaultAppsListFragmentTestable(mPreferenceManager, mScreen);
- }
-
- @Test
- public void getMetricsCategory() {
- assertThat(mFragment.getMetricsCategory())
- .isEqualTo(MetricsEvent.ENTERPRISE_PRIVACY_DEFAULT_APPS);
- }
-
- @Test
- public void getLogTag() {
- assertThat(mFragment.getLogTag()).isEqualTo("EnterprisePrivacySettings");
- }
-
- @Test
- public void getScreenResource() {
- assertThat(mFragment.getPreferenceScreenResId())
- .isEqualTo(R.xml.enterprise_set_default_apps_settings);
- }
-
- @Test
- public void getPreferenceControllers() {
- final List<AbstractPreferenceController> controllers = mFragment.createPreferenceControllers(mContext);
- assertThat(controllers).isNotNull();
- assertThat(controllers.size()).isEqualTo(1);
- assertThat(controllers.get(0))
- .isInstanceOf(EnterpriseSetDefaultAppsListPreferenceController.class);
- }
-
- private static class EnterpriseSetDefaultAppsListFragmentTestable
- extends EnterpriseSetDefaultAppsListFragment {
-
- private final PreferenceManager mPreferenceManager;
- private final PreferenceScreen mPreferenceScreen;
-
- private EnterpriseSetDefaultAppsListFragmentTestable(PreferenceManager preferenceManager,
- PreferenceScreen screen) {
- mPreferenceManager = preferenceManager;
- mPreferenceScreen = screen;
- }
-
- @Override
- public PreferenceManager getPreferenceManager() {
- return mPreferenceManager;
- }
-
- @Override
- public PreferenceScreen getPreferenceScreen() {
- return mPreferenceScreen;
- }
- }
-}
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatterySaverControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatterySaverControllerTest.java
index db9ffa5..4d2910e 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/BatterySaverControllerTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/BatterySaverControllerTest.java
@@ -17,15 +17,20 @@
import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import android.content.Context;
import android.os.PowerManager;
-import android.provider.Settings;
+import android.view.LayoutInflater;
+import android.widget.LinearLayout;
-import androidx.preference.Preference;
+import androidx.preference.PreferenceViewHolder;
+
+import com.android.settings.R;
+import com.android.settings.widget.PrimarySwitchPreference;
import org.junit.Before;
import org.junit.Test;
@@ -34,64 +39,108 @@
import org.mockito.MockitoAnnotations;
import org.robolectric.RobolectricTestRunner;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.util.ReflectionHelpers;
@RunWith(RobolectricTestRunner.class)
public class BatterySaverControllerTest {
@Mock
- private Preference mBatterySaverPref;
- @Mock
private PowerManager mPowerManager;
private BatterySaverController mBatterySaverController;
- private Context mContext;
+ private PrimarySwitchPreference mBatterySaverPref;
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
+ final Context mContext = spy(RuntimeEnvironment.application);
- mContext = RuntimeEnvironment.application;
- mBatterySaverController = spy(new BatterySaverController(mContext));
- ReflectionHelpers.setField(mBatterySaverController, "mPowerManager", mPowerManager);
- ReflectionHelpers.setField(mBatterySaverController, "mBatterySaverPref", mBatterySaverPref);
+ mBatterySaverPref = new PrimarySwitchPreference(mContext);
+ final LayoutInflater inflater = LayoutInflater.from(mContext);
+ final PreferenceViewHolder mHolder =
+ PreferenceViewHolder.createInstanceForTests(inflater.inflate(
+ com.android.settingslib.R.layout.preference_two_target, null));
+ final LinearLayout mWidgetView = mHolder.itemView.findViewById(android.R.id.widget_frame);
+ inflater.inflate(R.layout.restricted_preference_widget_primary_switch, mWidgetView, true);
+ mBatterySaverPref.onBindViewHolder(mHolder);
- Settings.Global.putInt(mContext.getContentResolver(),
- Settings.Global.LOW_POWER_MODE_TRIGGER_LEVEL, 0);
+ doReturn(mPowerManager).when(mContext).getSystemService(Context.POWER_SERVICE);
+
+ mBatterySaverController = new BatterySaverController(mContext);
+ mBatterySaverController.mBatterySaverPref = mBatterySaverPref;
}
@Test
- public void onPreferenceChange_onStart() {
- mBatterySaverController.onStart();
- verify(mBatterySaverPref).setSummary("Off");
+ public void onBatteryChanged_true_switchEnabled() {
+ mBatterySaverController.onBatteryChanged(true);
+
+ assertThat(mBatterySaverPref.getSwitch().isEnabled()).isFalse();
}
@Test
- public void onPreferenceChange_onPowerSaveModeChanged() {
- mBatterySaverController.onPowerSaveModeChanged();
- verify(mBatterySaverPref).setSummary("Off");
+ public void onBatteryChanged_false_switchDisabled() {
+ mBatterySaverController.onBatteryChanged(false);
+
+ assertThat(mBatterySaverPref.getSwitch().isEnabled()).isTrue();
}
@Test
- public void getSummary_batterySaverOn_showSummaryOn() {
+ public void onPowerSaveModeChanged_differentState_updateToIsChecked() {
when(mPowerManager.isPowerSaveMode()).thenReturn(true);
- assertThat(mBatterySaverController.getSummary()).isEqualTo("On");
+ assertThat(mBatterySaverPref.isChecked()).isFalse();
+
+ mBatterySaverController.onPowerSaveModeChanged();
+
+ assertThat(mBatterySaverPref.isChecked()).isTrue();
}
@Test
- public void getSummary_batterySaverOffButScheduled_showSummaryScheduled() {
- when(mPowerManager.isPowerSaveMode()).thenReturn(false);
- Settings.Global.putInt(mContext.getContentResolver(),
- Settings.Global.LOW_POWER_MODE_TRIGGER_LEVEL, 15);
+ public void onPowerSaveModeChanged_differentState_updateToUnChecked() {
+ mBatterySaverPref.setChecked(true);
- assertThat(mBatterySaverController.getSummary()).isEqualTo("Will turn on at 15%");
+ when(mPowerManager.isPowerSaveMode()).thenReturn(false);
+ assertThat(mBatterySaverPref.isChecked()).isTrue();
+
+ mBatterySaverController.onPowerSaveModeChanged();
+
+ assertThat(mBatterySaverPref.isChecked()).isFalse();
}
@Test
- public void getSummary_batterySaverOff_showSummaryOff() {
+ public void onPowerSaveModeChanged_sameState_noUpdate() {
+ when(mPowerManager.isPowerSaveMode()).thenReturn(false);
+ assertThat(mBatterySaverPref.isChecked()).isFalse();
+
+ mBatterySaverController.onPowerSaveModeChanged();
+
+ assertThat(mBatterySaverPref.isChecked()).isFalse();
+ }
+
+ @Test
+ public void setChecked_on_setPowerSaveMode() {
+ mBatterySaverController.setChecked(true);
+
+ verify(mPowerManager).setPowerSaveModeEnabled(true);
+ }
+
+ @Test
+ public void setChecked_off_unsetPowerSaveMode() {
+ mBatterySaverController.setChecked(false);
+
+ verify(mPowerManager).setPowerSaveModeEnabled(false);
+ }
+
+ @Test
+ public void isChecked_on_powerSaveModeOn() {
+ when(mPowerManager.isPowerSaveMode()).thenReturn(true);
+
+ assertThat(mBatterySaverController.isChecked()).isTrue();
+ }
+
+ @Test
+ public void isChecked_off_powerSaveModeOff() {
when(mPowerManager.isPowerSaveMode()).thenReturn(false);
- assertThat(mBatterySaverController.getSummary()).isEqualTo("Off");
+ assertThat(mBatterySaverController.isChecked()).isFalse();
}
}
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/SmartBatteryPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/SmartBatteryPreferenceControllerTest.java
index 91e7b04..a1f3bda 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/SmartBatteryPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/SmartBatteryPreferenceControllerTest.java
@@ -21,12 +21,12 @@
import static org.mockito.Mockito.doReturn;
import android.content.ContentResolver;
+import android.content.Context;
import android.provider.Settings;
-import androidx.preference.SwitchPreference;
-
import com.android.settings.core.BasePreferenceController;
import com.android.settings.testutils.FakeFeatureFactory;
+import com.android.settingslib.widget.MainSwitchPreference;
import org.junit.Before;
import org.junit.Test;
@@ -42,48 +42,50 @@
private static final int OFF = 0;
private SmartBatteryPreferenceController mController;
- private SwitchPreference mPreference;
private ContentResolver mContentResolver;
private FakeFeatureFactory mFeatureFactory;
+ private Context mContext;
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
+ mContext = RuntimeEnvironment.application;
mFeatureFactory = FakeFeatureFactory.setupForTest();
mContentResolver = RuntimeEnvironment.application.getContentResolver();
mController = new SmartBatteryPreferenceController(RuntimeEnvironment.application);
- mPreference = new SwitchPreference(RuntimeEnvironment.application);
}
@Test
public void testUpdateState_smartBatteryOn_preferenceChecked() {
putSmartBatteryValue(ON);
+ final MainSwitchPreference preference = new MainSwitchPreference(mContext);
- mController.updateState(mPreference);
+ mController.updateState(preference);
- assertThat(mPreference.isChecked()).isTrue();
+ assertThat(preference.isChecked()).isTrue();
}
@Test
public void testUpdateState_smartBatteryOff_preferenceUnchecked() {
putSmartBatteryValue(OFF);
+ final MainSwitchPreference preference = new MainSwitchPreference(mContext);
- mController.updateState(mPreference);
+ mController.updateState(preference);
- assertThat(mPreference.isChecked()).isFalse();
+ assertThat(preference.isChecked()).isFalse();
}
@Test
public void testUpdateState_checkPreference_smartBatteryOn() {
- mController.onPreferenceChange(mPreference, true);
+ mController.onSwitchChanged(null, true);
assertThat(getSmartBatteryValue()).isEqualTo(ON);
}
@Test
public void testUpdateState_unCheckPreference_smartBatteryOff() {
- mController.onPreferenceChange(mPreference, false);
+ mController.onSwitchChanged(null, false);
assertThat(getSmartBatteryValue()).isEqualTo(OFF);
}
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/TopLevelBatteryPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/TopLevelBatteryPreferenceControllerTest.java
index 6d2298b..f2677ce 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/TopLevelBatteryPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/TopLevelBatteryPreferenceControllerTest.java
@@ -27,7 +27,6 @@
import com.android.settings.R;
import com.android.settings.core.FeatureFlags;
-import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -44,13 +43,7 @@
public void setUp() {
mContext = RuntimeEnvironment.application;
mController = new TopLevelBatteryPreferenceController(mContext, "test_key");
- }
-
- @After
- public void tearDown() {
- if (FeatureFlagUtils.isEnabled(mContext, FeatureFlags.SILKY_HOME)) {
- FeatureFlagUtils.setEnabled(mContext, FeatureFlags.SILKY_HOME, false);
- }
+ FeatureFlagUtils.setEnabled(mContext, FeatureFlags.SILKY_HOME, false);
}
@Test
diff --git a/tests/robotests/src/com/android/settings/gestures/GesturesSettingsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/gestures/GesturesSettingsPreferenceControllerTest.java
index 1e84207..df1dfd0 100644
--- a/tests/robotests/src/com/android/settings/gestures/GesturesSettingsPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/gestures/GesturesSettingsPreferenceControllerTest.java
@@ -28,10 +28,12 @@
import android.content.ContentResolver;
import android.content.Context;
import android.provider.Settings;
+import android.util.FeatureFlagUtils;
import androidx.preference.Preference;
import com.android.settings.R;
+import com.android.settings.core.FeatureFlags;
import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settings.testutils.shadow.ShadowSecureSettings;
import com.android.settingslib.core.AbstractPreferenceController;
@@ -65,6 +67,7 @@
MockitoAnnotations.initMocks(this);
FakeFeatureFactory.setupForTest();
mController = new GesturesSettingPreferenceController(mActivity);
+ FeatureFlagUtils.setEnabled(RuntimeEnvironment.application, FeatureFlags.SILKY_HOME, false);
}
@Test
diff --git a/tests/robotests/src/com/android/settings/homepage/SettingsHomepageActivityTest.java b/tests/robotests/src/com/android/settings/homepage/SettingsHomepageActivityTest.java
index bae4432..40315d2 100644
--- a/tests/robotests/src/com/android/settings/homepage/SettingsHomepageActivityTest.java
+++ b/tests/robotests/src/com/android/settings/homepage/SettingsHomepageActivityTest.java
@@ -26,11 +26,13 @@
import static org.mockito.Mockito.when;
import android.os.Build;
+import android.util.FeatureFlagUtils;
import android.view.Window;
import android.view.WindowManager;
import android.widget.FrameLayout;
import com.android.settings.R;
+import com.android.settings.core.FeatureFlags;
import com.android.settings.core.HideNonSystemOverlayMixin;
import com.android.settings.homepage.contextualcards.slices.BatteryFixSliceTest;
@@ -41,6 +43,7 @@
import org.mockito.MockitoAnnotations;
import org.robolectric.Robolectric;
import org.robolectric.RobolectricTestRunner;
+import org.robolectric.RuntimeEnvironment;
import org.robolectric.android.controller.ActivityController;
import org.robolectric.annotation.Config;
import org.robolectric.util.ReflectionHelpers;
@@ -51,6 +54,7 @@
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
+ FeatureFlagUtils.setEnabled(RuntimeEnvironment.application, FeatureFlags.SILKY_HOME, false);
}
@Test
diff --git a/tests/robotests/src/com/android/settings/location/TopLevelLocationPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/location/TopLevelLocationPreferenceControllerTest.java
index 2fa7413..f5bc961 100644
--- a/tests/robotests/src/com/android/settings/location/TopLevelLocationPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/location/TopLevelLocationPreferenceControllerTest.java
@@ -25,7 +25,6 @@
import com.android.settings.R;
import com.android.settings.core.FeatureFlags;
-import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -44,13 +43,7 @@
mContext = RuntimeEnvironment.application;
mController = new TopLevelLocationPreferenceController(mContext, PREFERENCE_KEY);
mLocationManager = (LocationManager) mContext.getSystemService(Context.LOCATION_SERVICE);
- }
-
- @After
- public void tearDown() {
- if (FeatureFlagUtils.isEnabled(mContext, FeatureFlags.SILKY_HOME)) {
- FeatureFlagUtils.setEnabled(mContext, FeatureFlags.SILKY_HOME, false);
- }
+ FeatureFlagUtils.setEnabled(mContext, FeatureFlags.SILKY_HOME, false);
}
@Test
diff --git a/tests/robotests/src/com/android/settings/network/MobileNetworkSummaryControllerTest.java b/tests/robotests/src/com/android/settings/network/MobileNetworkSummaryControllerTest.java
index 6de83a6..097ebaf 100644
--- a/tests/robotests/src/com/android/settings/network/MobileNetworkSummaryControllerTest.java
+++ b/tests/robotests/src/com/android/settings/network/MobileNetworkSummaryControllerTest.java
@@ -104,6 +104,7 @@
@After
public void tearDown() {
+ SubscriptionUtil.setActiveSubscriptionsForTesting(null);
SubscriptionUtil.setAvailableSubscriptionsForTesting(null);
}
@@ -269,7 +270,8 @@
when(sub1.getDisplayName()).thenReturn("sub1");
when(sub2.getDisplayName()).thenReturn("sub2");
- SubscriptionUtil.setAvailableSubscriptionsForTesting(Arrays.asList(sub1));
+ when(mSubscriptionManager.getAvailableSubscriptionInfoList()).thenReturn(
+ Arrays.asList(sub1));
SubscriptionUtil.setActiveSubscriptionsForTesting(Arrays.asList(sub1));
mController.displayPreference(mPreferenceScreen);
mController.onResume();
diff --git a/tests/robotests/src/com/android/settings/network/TopLevelNetworkEntryPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/TopLevelNetworkEntryPreferenceControllerTest.java
index 857b3eb..fc01c68 100644
--- a/tests/robotests/src/com/android/settings/network/TopLevelNetworkEntryPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/network/TopLevelNetworkEntryPreferenceControllerTest.java
@@ -74,15 +74,12 @@
mMobileNetworkPreferenceController);
ReflectionHelpers.setField(mController, "mTetherPreferenceController",
mTetherPreferenceController);
+ FeatureFlagUtils.setEnabled(mContext, FeatureFlags.SILKY_HOME, false);
}
@After
public void tearDown() {
ShadowUtils.reset();
-
- if (FeatureFlagUtils.isEnabled(mContext, FeatureFlags.SILKY_HOME)) {
- FeatureFlagUtils.setEnabled(mContext, FeatureFlags.SILKY_HOME, false);
- }
}
@Test
diff --git a/tests/robotests/src/com/android/settings/network/telephony/RenameMobileNetworkDialogFragmentTest.java b/tests/robotests/src/com/android/settings/network/telephony/RenameMobileNetworkDialogFragmentTest.java
index 4526886..d0df92e 100644
--- a/tests/robotests/src/com/android/settings/network/telephony/RenameMobileNetworkDialogFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/network/telephony/RenameMobileNetworkDialogFragmentTest.java
@@ -45,8 +45,10 @@
import androidx.fragment.app.FragmentActivity;
import com.android.settings.R;
+import com.android.settings.network.SubscriptionUtil;
import com.android.settings.testutils.shadow.ShadowAlertDialogCompat;
+import org.junit.After;
import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test;
@@ -109,8 +111,15 @@
mSubscriptionInfoList.add(mSubscriptionInfo);
when(mSubscriptionMgr.getAvailableSubscriptionInfoList()).thenReturn(
mSubscriptionInfoList);
+ SubscriptionUtil.setAvailableSubscriptionsForTesting(mSubscriptionInfoList);
}
+ @After
+ public void tearDown() {
+ SubscriptionUtil.setAvailableSubscriptionsForTesting(null);
+ }
+
+
@Test
@Ignore
public void dialog_subscriptionMissing_noCrash() {
diff --git a/tests/robotests/src/com/android/settings/nfc/NfcEnablerTest.java b/tests/robotests/src/com/android/settings/nfc/NfcEnablerTest.java
index c3dfe48..cc45190 100644
--- a/tests/robotests/src/com/android/settings/nfc/NfcEnablerTest.java
+++ b/tests/robotests/src/com/android/settings/nfc/NfcEnablerTest.java
@@ -26,7 +26,7 @@
import android.nfc.NfcAdapter;
import android.provider.Settings;
-import androidx.preference.SwitchPreference;
+import com.android.settingslib.widget.MainSwitchPreference;
import org.junit.Before;
import org.junit.Test;
@@ -40,7 +40,7 @@
public class NfcEnablerTest {
@Mock
- private SwitchPreference mNfcPreference;
+ private MainSwitchPreference mNfcPreference;
private Context mContext;
private NfcEnabler mNfcEnabler;
diff --git a/tests/robotests/src/com/android/settings/nfc/NfcPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/nfc/NfcPreferenceControllerTest.java
index 1d05162..3ca553b 100644
--- a/tests/robotests/src/com/android/settings/nfc/NfcPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/nfc/NfcPreferenceControllerTest.java
@@ -31,11 +31,11 @@
import android.provider.Settings;
import androidx.preference.PreferenceScreen;
-import androidx.preference.SwitchPreference;
import com.android.settings.nfc.NfcPreferenceController.NfcSliceWorker;
import com.android.settings.nfc.NfcPreferenceController.NfcSliceWorker.NfcUpdateReceiver;
import com.android.settings.testutils.shadow.ShadowNfcAdapter;
+import com.android.settingslib.widget.MainSwitchPreference;
import org.junit.Before;
import org.junit.Test;
@@ -63,7 +63,7 @@
private PreferenceScreen mScreen;
private Context mContext;
- private SwitchPreference mNfcPreference;
+ private MainSwitchPreference mNfcPreference;
private NfcPreferenceController mNfcController;
private ShadowNfcAdapter mShadowNfcAdapter;
private NfcAdapter mNfcAdapter;
@@ -81,7 +81,7 @@
mNfcController = new NfcPreferenceController(mContext,
NfcPreferenceController.KEY_TOGGLE_NFC);
- mNfcPreference = new SwitchPreference(RuntimeEnvironment.application);
+ mNfcPreference = new MainSwitchPreference(RuntimeEnvironment.application);
when(mScreen.findPreference(mNfcController.getPreferenceKey())).thenReturn(mNfcPreference);
}
diff --git a/tests/robotests/src/com/android/settings/notification/AssistantCapabilityPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/AssistantCapabilityPreferenceControllerTest.java
deleted file mode 100644
index 5244c7e..0000000
--- a/tests/robotests/src/com/android/settings/notification/AssistantCapabilityPreferenceControllerTest.java
+++ /dev/null
@@ -1,217 +0,0 @@
-/*
- * Copyright (C) 2019 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.notification;
-
-import static com.android.settings.core.BasePreferenceController.AVAILABLE;
-import static com.android.settings.core.BasePreferenceController.DISABLED_DEPENDENT_SETTING;
-import static com.android.settings.notification.AssistantCapabilityPreferenceController.PRIORITIZER_KEY;
-import static com.android.settings.notification.AssistantCapabilityPreferenceController.RANKING_KEY;
-import static com.android.settings.notification.AssistantCapabilityPreferenceController.SMART_KEY;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.ArgumentMatchers.anyString;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import android.content.ComponentName;
-import android.content.Context;
-import android.service.notification.Adjustment;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import androidx.preference.Preference;
-import androidx.preference.PreferenceScreen;
-
-@RunWith(RobolectricTestRunner.class)
-public class AssistantCapabilityPreferenceControllerTest {
-
- @Mock
- private NotificationBackend mBackend;
- @Mock
- private PreferenceScreen mScreen;
-
- private Context mContext;
- private AssistantCapabilityPreferenceController mPrioritizerController;
- private AssistantCapabilityPreferenceController mRankingController;
- private AssistantCapabilityPreferenceController mChipController;
- private Preference mPrioritizerPreference;
- private Preference mRankingPreference;
- private Preference mChipPreference;
-
- @Before
- public void setUp() {
- MockitoAnnotations.initMocks(this);
- mContext = RuntimeEnvironment.application;
- mPrioritizerController = new AssistantCapabilityPreferenceController(
- mContext, PRIORITIZER_KEY);
- mPrioritizerController.setBackend(mBackend);
- mPrioritizerPreference = new Preference(mContext);
- mPrioritizerPreference.setKey(mPrioritizerController.getPreferenceKey());
- when(mScreen.findPreference(
- mPrioritizerController.getPreferenceKey())).thenReturn(mPrioritizerPreference);
- mRankingController = new AssistantCapabilityPreferenceController(
- mContext, RANKING_KEY);
- mRankingController.setBackend(mBackend);
- mRankingPreference = new Preference(mContext);
- mRankingPreference.setKey(mRankingController.getPreferenceKey());
- when(mScreen.findPreference(
- mRankingController.getPreferenceKey())).thenReturn(mRankingPreference);
- mChipController = new AssistantCapabilityPreferenceController(mContext, SMART_KEY);
- mChipController.setBackend(mBackend);
- mChipPreference = new Preference(mContext);
- mChipPreference.setKey(mChipController.getPreferenceKey());
- when(mScreen.findPreference(
- mChipController.getPreferenceKey())).thenReturn(mChipPreference);
- }
-
- @Test
- public void getAvailabilityStatus_NAS() {
- when(mBackend.getAllowedNotificationAssistant()).thenReturn(mock(ComponentName.class));
- assertThat(mPrioritizerController.getAvailabilityStatus())
- .isEqualTo(AVAILABLE);
- assertThat(mChipController.getAvailabilityStatus())
- .isEqualTo(AVAILABLE);
- }
-
- @Test
- public void getAvailabilityStatus_noNAS() {
- when(mBackend.getAllowedNotificationAssistant()).thenReturn(null);
- assertThat(mPrioritizerController.getAvailabilityStatus())
- .isEqualTo(DISABLED_DEPENDENT_SETTING);
- assertThat(mChipController.getAvailabilityStatus())
- .isEqualTo(DISABLED_DEPENDENT_SETTING);
- }
-
- @Test
- public void isChecked_prioritizerSettingIsOff_false() {
- List<String> capabilities = new ArrayList<>();
- capabilities.add(Adjustment.KEY_USER_SENTIMENT);
- when(mBackend.getAssistantAdjustments(anyString())).thenReturn(capabilities);
- assertThat(mPrioritizerController.isChecked()).isFalse();
- }
-
- @Test
- public void isChecked_prioritizerSettingIsOn_true() {
- List<String> capabilities = new ArrayList<>();
- capabilities.add(Adjustment.KEY_IMPORTANCE);
- when(mBackend.getAssistantAdjustments(anyString())).thenReturn(capabilities);
- assertThat(mPrioritizerController.isChecked()).isTrue();
-
- capabilities = new ArrayList<>();
- capabilities.add(Adjustment.KEY_RANKING_SCORE);
- when(mBackend.getAssistantAdjustments(anyString())).thenReturn(capabilities);
- assertThat(mPrioritizerController.isChecked()).isFalse();
- }
-
- @Test
- public void isChecked_rankingSettingIsOff_false() {
- List<String> capabilities = new ArrayList<>();
- capabilities.add(Adjustment.KEY_IMPORTANCE);
- when(mBackend.getAssistantAdjustments(anyString())).thenReturn(capabilities);
- assertThat(mRankingController.isChecked()).isFalse();
- }
-
- @Test
- public void isChecked_rankingSettingIsOn_true() {
- List<String> capabilities = new ArrayList<>();
- capabilities.add(Adjustment.KEY_RANKING_SCORE);
- when(mBackend.getAssistantAdjustments(anyString())).thenReturn(capabilities);
- assertThat(mRankingController.isChecked()).isTrue();
- }
-
- @Test
- public void isChecked_chipSettingIsOff_false() {
- List<String> capabilities = new ArrayList<>();
- capabilities.add(Adjustment.KEY_IMPORTANCE);
- when(mBackend.getAssistantAdjustments(anyString())).thenReturn(capabilities);
- assertThat(mChipController.isChecked()).isFalse();
-
- capabilities = new ArrayList<>();
- capabilities.add(Adjustment.KEY_RANKING_SCORE);
- when(mBackend.getAssistantAdjustments(anyString())).thenReturn(capabilities);
- assertThat(mChipController.isChecked()).isFalse();
-
- capabilities = new ArrayList<>();
- capabilities.add(Adjustment.KEY_CONTEXTUAL_ACTIONS);
- when(mBackend.getAssistantAdjustments(anyString())).thenReturn(capabilities);
- assertThat(mChipController.isChecked()).isFalse();
-
- capabilities = new ArrayList<>();
- capabilities.add(Adjustment.KEY_TEXT_REPLIES);
- when(mBackend.getAssistantAdjustments(anyString())).thenReturn(capabilities);
- assertThat(mChipController.isChecked()).isFalse();
- }
-
- @Test
- public void isChecked_chipSettingIsOn_true() {
- List<String> capabilities = new ArrayList<>();
- capabilities.add(Adjustment.KEY_TEXT_REPLIES);
- capabilities.add(Adjustment.KEY_CONTEXTUAL_ACTIONS);
- when(mBackend.getAssistantAdjustments(anyString())).thenReturn(capabilities);
- assertThat(mChipController.isChecked()).isTrue();
- }
-
- @Test
- public void onPreferenceChange_prioritizerOn() {
- mPrioritizerController.onPreferenceChange(mPrioritizerPreference, true);
- verify(mBackend).allowAssistantAdjustment(Adjustment.KEY_IMPORTANCE, true);
- }
-
- @Test
- public void onPreferenceChange_prioritizerOff() {
- mPrioritizerController.onPreferenceChange(mPrioritizerPreference, false);
- verify(mBackend).allowAssistantAdjustment(Adjustment.KEY_IMPORTANCE, false);
- }
-
- @Test
- public void onPreferenceChange_rankingOn() {
- mRankingController.onPreferenceChange(mRankingPreference, true);
- verify(mBackend).allowAssistantAdjustment(Adjustment.KEY_RANKING_SCORE, true);
- }
-
- @Test
- public void onPreferenceChange_rankingOff() {
- mRankingController.onPreferenceChange(mRankingPreference, false);
- verify(mBackend).allowAssistantAdjustment(Adjustment.KEY_RANKING_SCORE, false);
- }
-
- @Test
- public void onPreferenceChange_chipsOn() {
- mChipController.onPreferenceChange(mChipPreference, true);
- verify(mBackend).allowAssistantAdjustment(Adjustment.KEY_CONTEXTUAL_ACTIONS, true);
- verify(mBackend).allowAssistantAdjustment(Adjustment.KEY_TEXT_REPLIES, true);
- }
-
- @Test
- public void onPreferenceChange_chipsOff() {
- mChipController.onPreferenceChange(mChipPreference, false);
- verify(mBackend).allowAssistantAdjustment(Adjustment.KEY_CONTEXTUAL_ACTIONS, false);
- verify(mBackend).allowAssistantAdjustment(Adjustment.KEY_TEXT_REPLIES, false);
- }
-}
-
diff --git a/tests/robotests/src/com/android/settings/notification/zen/ZenModeButtonPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/zen/ZenModeButtonPreferenceControllerTest.java
index 1200402..9daef1a 100644
--- a/tests/robotests/src/com/android/settings/notification/zen/ZenModeButtonPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/zen/ZenModeButtonPreferenceControllerTest.java
@@ -22,24 +22,21 @@
import static android.provider.Settings.Global.ZEN_MODE_NO_INTERRUPTIONS;
import static android.provider.Settings.Global.ZEN_MODE_OFF;
+import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import android.app.NotificationManager;
import android.content.ContentResolver;
import android.content.Context;
import android.provider.Settings;
-import android.view.View;
-import android.widget.Button;
import androidx.fragment.app.FragmentManager;
-import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
-import com.android.settings.notification.zen.ZenModeBackend;
-import com.android.settings.notification.zen.ZenModeButtonPreferenceController;
import com.android.settingslib.core.lifecycle.Lifecycle;
+import com.android.settingslib.widget.MainSwitchPreference;
import org.junit.Before;
import org.junit.Test;
@@ -61,14 +58,10 @@
@Mock
private NotificationManager mNotificationManager;
@Mock
- private Preference mockPref;
+ private MainSwitchPreference mMockPref;
@Mock
private NotificationManager.Policy mPolicy;
@Mock
- private Button mZenButtonOn;
- @Mock
- private Button mZenButtonOff;
- @Mock
private PreferenceScreen mPreferenceScreen;
private ContentResolver mContentResolver;
private Context mContext;
@@ -85,67 +78,65 @@
mock(FragmentManager.class));
when(mNotificationManager.getNotificationPolicy()).thenReturn(mPolicy);
ReflectionHelpers.setField(mController, "mBackend", mBackend);
- ReflectionHelpers.setField(mController, "mZenButtonOn", mZenButtonOn);
- ReflectionHelpers.setField(mController, "mZenButtonOff", mZenButtonOff);
- when(mPreferenceScreen.findPreference(mController.getPreferenceKey())).thenReturn(mockPref);
+ when(mPreferenceScreen.findPreference(mController.getPreferenceKey())).thenReturn(
+ mMockPref);
mController.displayPreference(mPreferenceScreen);
}
@Test
public void updateState_TotalSilence() {
Settings.Global.putInt(mContentResolver, ZEN_MODE, ZEN_MODE_NO_INTERRUPTIONS);
- final Preference mockPref = mock(Preference.class);
- mController.updateState(mockPref);
+ final MainSwitchPreference pref = new MainSwitchPreference(mContext);
- verify(mZenButtonOn).setVisibility(View.GONE);
- verify(mZenButtonOff).setVisibility(View.VISIBLE);
+ mController.updateState(pref);
+
+ assertThat(pref.isChecked()).isFalse();
}
@Test
public void updateState_AlarmsOnly() {
Settings.Global.putInt(mContentResolver, ZEN_MODE, ZEN_MODE_ALARMS);
- final Preference mockPref = mock(Preference.class);
- mController.updateState(mockPref);
+ final MainSwitchPreference pref = new MainSwitchPreference(mContext);
- verify(mZenButtonOn).setVisibility(View.GONE);
- verify(mZenButtonOff).setVisibility(View.VISIBLE);
+ mController.updateState(pref);
+
+ assertThat(pref.isChecked()).isFalse();
}
@Test
public void updateState_Priority() {
Settings.Global.putInt(mContentResolver, ZEN_MODE, ZEN_MODE_IMPORTANT_INTERRUPTIONS);
- final Preference mockPref = mock(Preference.class);
- mController.updateState(mockPref);
+ final MainSwitchPreference pref = new MainSwitchPreference(mContext);
- verify(mZenButtonOn).setVisibility(View.GONE);
- verify(mZenButtonOff).setVisibility(View.VISIBLE);
+ mController.updateState(pref);
+
+ assertThat(pref.isChecked()).isFalse();
}
@Test
public void updateState_ZenOff() {
Settings.Global.putInt(mContentResolver, ZEN_MODE, ZEN_MODE_OFF);
- final Preference mockPref = mock(Preference.class);
- mController.updateState(mockPref);
+ final MainSwitchPreference pref = new MainSwitchPreference(mContext);
- verify(mZenButtonOn).setVisibility(View.VISIBLE);
- verify(mZenButtonOff).setVisibility(View.GONE);
+ mController.updateState(pref);
+
+ assertThat(pref.isChecked()).isFalse();
}
@Test
public void updateState_otherUserChangedZen() {
- final Preference mockPref = mock(Preference.class);
Settings.Global.putInt(mContentResolver, ZEN_MODE, ZEN_MODE_OFF);
- mController.updateState(mockPref);
- verify(mZenButtonOn).setVisibility(View.VISIBLE);
- verify(mZenButtonOff).setVisibility(View.GONE);
+ final MainSwitchPreference pref = new MainSwitchPreference(mContext);
+ mController.updateState(pref);
+
+ assertThat(pref.isChecked()).isFalse();
Settings.Global.putInt(mContentResolver, ZEN_MODE, ZEN_MODE_IMPORTANT_INTERRUPTIONS);
final int GUEST_USER_ID = 10;
mController.mSettingObserver.onChange(false,
Settings.Global.getUriFor(Settings.Global.ZEN_MODE), GUEST_USER_ID);
- verify(mZenButtonOn).setVisibility(View.GONE);
- verify(mZenButtonOff).setVisibility(View.VISIBLE);
+ assertThat(pref.isChecked()).isFalse();
}
-}
\ No newline at end of file
+}
diff --git a/tests/robotests/src/com/android/settings/panel/InternetConnectivityPanelTest.java b/tests/robotests/src/com/android/settings/panel/InternetConnectivityPanelTest.java
deleted file mode 100644
index eb82d31..0000000
--- a/tests/robotests/src/com/android/settings/panel/InternetConnectivityPanelTest.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * Copyright (C) 2018 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-package com.android.settings.panel;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import android.net.Uri;
-import android.os.SystemProperties;
-
-import com.android.settings.network.AirplaneModePreferenceController;
-import com.android.settings.slices.CustomSliceRegistry;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
-
-import java.util.List;
-
-@RunWith(RobolectricTestRunner.class)
-
-public class InternetConnectivityPanelTest {
-
- private InternetConnectivityPanel mPanel;
- private static final String SETTINGS_PROVIDER_MODEL =
- "persist.sys.fflag.override.settings_provider_model";
- private boolean mSettingsProviderModelState;
-
- @Before
- public void setUp() {
- mPanel = InternetConnectivityPanel.create(RuntimeEnvironment.application);
- mSettingsProviderModelState = SystemProperties.getBoolean(SETTINGS_PROVIDER_MODEL, false);
- }
-
- @After
- public void tearDown() {
- SystemProperties.set(SETTINGS_PROVIDER_MODEL,
- mSettingsProviderModelState ? "true" : "false");
- }
-
- @Test
- public void getSlices_providerModelDisabled_containsNecessarySlices() {
- SystemProperties.set(SETTINGS_PROVIDER_MODEL, "false");
- final List<Uri> uris = mPanel.getSlices();
-
- assertThat(uris).containsExactly(
- AirplaneModePreferenceController.SLICE_URI,
- CustomSliceRegistry.MOBILE_DATA_SLICE_URI,
- CustomSliceRegistry.WIFI_SLICE_URI);
- }
-
- @Test
- public void getSlices_providerModelEnabled_containsNecessarySlices() {
- SystemProperties.set(SETTINGS_PROVIDER_MODEL, "true");
- final List<Uri> uris = mPanel.getSlices();
-
- assertThat(uris).containsExactly(
- CustomSliceRegistry.PROVIDER_MODEL_SLICE_URI,
- CustomSliceRegistry.AIRPLANE_SAFE_NETWORKS_SLICE_URI);
- }
-
- @Test
- public void getSeeMoreIntent_notNull() {
- assertThat(mPanel.getSeeMoreIntent()).isNotNull();
- }
-}
diff --git a/tests/robotests/src/com/android/settings/password/ChooseLockGenericTest.java b/tests/robotests/src/com/android/settings/password/ChooseLockGenericTest.java
index 03ce25a..634b9a8 100644
--- a/tests/robotests/src/com/android/settings/password/ChooseLockGenericTest.java
+++ b/tests/robotests/src/com/android/settings/password/ChooseLockGenericTest.java
@@ -45,6 +45,7 @@
import android.content.Intent;
import android.os.Bundle;
import android.provider.Settings.Global;
+import android.util.FeatureFlagUtils;
import androidx.annotation.Nullable;
import androidx.preference.Preference;
@@ -53,6 +54,7 @@
import com.android.internal.widget.LockscreenCredential;
import com.android.settings.R;
import com.android.settings.biometrics.BiometricEnrollBase;
+import com.android.settings.core.FeatureFlags;
import com.android.settings.password.ChooseLockGeneric.ChooseLockGenericFragment;
import com.android.settings.search.SearchFeatureProvider;
import com.android.settings.testutils.shadow.ShadowLockPatternUtils;
@@ -68,6 +70,7 @@
import org.junit.runner.RunWith;
import org.robolectric.Robolectric;
import org.robolectric.RobolectricTestRunner;
+import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config;
import org.robolectric.shadows.ShadowApplication;
import org.robolectric.shadows.ShadowPersistentDataBlockManager;
@@ -90,6 +93,7 @@
public void setUp() {
Global.putInt(application.getContentResolver(), Global.DEVICE_PROVISIONED, 1);
mFragment = new ChooseLockGenericFragment();
+ FeatureFlagUtils.setEnabled(RuntimeEnvironment.application, FeatureFlags.SILKY_HOME, false);
}
@After
diff --git a/tests/robotests/src/com/android/settings/password/ChooseLockSettingsHelperTest.java b/tests/robotests/src/com/android/settings/password/ChooseLockSettingsHelperTest.java
index d082bde..053bbe0 100644
--- a/tests/robotests/src/com/android/settings/password/ChooseLockSettingsHelperTest.java
+++ b/tests/robotests/src/com/android/settings/password/ChooseLockSettingsHelperTest.java
@@ -120,6 +120,46 @@
.isEqualTo(ThemeHelper.THEME_GLIF_V2);
}
+ @Test
+ public void launchConfirmPattern_ForceVerify_shouldLaunchInternalActivity() {
+ final Activity activity = Robolectric.setupActivity(Activity.class);
+
+ ChooseLockSettingsHelper.Builder builder = new ChooseLockSettingsHelper.Builder(activity);
+ builder.setRequestCode(100)
+ .setForceVerifyPath(true);
+ ChooseLockSettingsHelper helper = getChooseLockSettingsHelper(builder);
+ when(helper.mLockPatternUtils.getKeyguardStoredPasswordQuality(anyInt()))
+ .thenReturn(DevicePolicyManager.PASSWORD_QUALITY_SOMETHING);
+ helper.launch();
+
+ ShadowActivity shadowActivity = Shadows.shadowOf(activity);
+ Intent startedIntent = shadowActivity.getNextStartedActivity();
+
+ assertEquals(new ComponentName("com.android.settings",
+ ConfirmLockPattern.InternalActivity.class.getName()),
+ startedIntent.getComponent());
+ }
+
+ @Test
+ public void launchConfirmPassword_ForceVerify_shouldLaunchInternalActivity() {
+ final Activity activity = Robolectric.setupActivity(Activity.class);
+
+ ChooseLockSettingsHelper.Builder builder = new ChooseLockSettingsHelper.Builder(activity);
+ builder.setRequestCode(100)
+ .setForceVerifyPath(true);
+ ChooseLockSettingsHelper helper = getChooseLockSettingsHelper(builder);
+ when(helper.mLockPatternUtils.getKeyguardStoredPasswordQuality(anyInt()))
+ .thenReturn(DevicePolicyManager.PASSWORD_QUALITY_NUMERIC);
+ helper.launch();
+
+ ShadowActivity shadowActivity = Shadows.shadowOf(activity);
+ Intent startedIntent = shadowActivity.getNextStartedActivity();
+
+ assertEquals(new ComponentName("com.android.settings",
+ ConfirmLockPassword.InternalActivity.class.getName()),
+ startedIntent.getComponent());
+ }
+
private ChooseLockSettingsHelper getChooseLockSettingsHelper(
ChooseLockSettingsHelper.Builder builder) {
LockPatternUtils mockLockPatternUtils = mock(LockPatternUtils.class);
diff --git a/tests/robotests/src/com/android/settings/security/TopLevelSecurityEntryPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/security/TopLevelSecurityEntryPreferenceControllerTest.java
index 33d22d4..05abc40 100644
--- a/tests/robotests/src/com/android/settings/security/TopLevelSecurityEntryPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/security/TopLevelSecurityEntryPreferenceControllerTest.java
@@ -30,7 +30,6 @@
import com.android.settings.R;
import com.android.settings.core.FeatureFlags;
-import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -58,13 +57,7 @@
when(mContext.getSystemService(Context.FACE_SERVICE))
.thenReturn(mFaceManager);
mController = new TopLevelSecurityEntryPreferenceController(mContext, "test_key");
- }
-
- @After
- public void tearDown() {
- if (FeatureFlagUtils.isEnabled(mContext, FeatureFlags.SILKY_HOME)) {
- FeatureFlagUtils.setEnabled(mContext, FeatureFlags.SILKY_HOME, false);
- }
+ FeatureFlagUtils.setEnabled(mContext, FeatureFlags.SILKY_HOME, false);
}
@Test
diff --git a/tests/robotests/src/com/android/settings/sim/PreferredSimDialogFragmentTest.java b/tests/robotests/src/com/android/settings/sim/PreferredSimDialogFragmentTest.java
index 62c2fc5..9bdbbcf 100644
--- a/tests/robotests/src/com/android/settings/sim/PreferredSimDialogFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/sim/PreferredSimDialogFragmentTest.java
@@ -75,6 +75,7 @@
@Test
public void onCreateDialog_twoSimsSelectFirst_correctMessage() {
+ SubscriptionUtil.setAvailableSubscriptionsForTesting(Arrays.asList(mSim1, mSim2));
SubscriptionUtil.setActiveSubscriptionsForTesting(Arrays.asList(mSim1, mSim2));
mIntent.putExtra(PREFERRED_SIM, 0);
@@ -87,6 +88,7 @@
@Test
public void onCreateDialog_twoSimsSelectSecond_correctMessage() {
+ SubscriptionUtil.setAvailableSubscriptionsForTesting(Arrays.asList(mSim1, mSim2));
SubscriptionUtil.setActiveSubscriptionsForTesting(Arrays.asList(mSim1, mSim2));
mIntent.putExtra(PREFERRED_SIM, 1);
@@ -99,6 +101,7 @@
@Test
public void onClick_yesClicked_callsOnSubscriptionSelected() {
+ SubscriptionUtil.setAvailableSubscriptionsForTesting(Arrays.asList(mSim1, mSim2));
mIntent.putExtra(PREFERRED_SIM, 0);
final AlertDialog alertDialog = startDialog();
@@ -113,6 +116,7 @@
@Test
public void onClick_noClicked_doesNotCallOnSubscriptionSelected() {
+ SubscriptionUtil.setAvailableSubscriptionsForTesting(Arrays.asList(mSim1, mSim2));
mIntent.putExtra(PREFERRED_SIM, 0);
final AlertDialog alertDialog = startDialog();
diff --git a/tests/robotests/src/com/android/settings/sim/SimSelectNotificationTest.java b/tests/robotests/src/com/android/settings/sim/SimSelectNotificationTest.java
index d6a1326..a6d3354 100644
--- a/tests/robotests/src/com/android/settings/sim/SimSelectNotificationTest.java
+++ b/tests/robotests/src/com/android/settings/sim/SimSelectNotificationTest.java
@@ -130,6 +130,7 @@
when(mTelephonyManager.createForSubscriptionId(anyInt())).thenReturn(mTelephonyManager);
when(mTelephonyManager.isDataEnabledForApn(TYPE_MMS)).thenReturn(false);
+ SubscriptionUtil.setAvailableSubscriptionsForTesting(Arrays.asList(mSubInfo));
SubscriptionUtil.setActiveSubscriptionsForTesting(Arrays.asList(mSubInfo));
when(mSubscriptionManager.isActiveSubscriptionId(mSubId)).thenReturn(true);
when(mSubscriptionManager.getActiveSubscriptionInfo(mSubId)).thenReturn(mSubInfo);
diff --git a/tests/robotests/src/com/android/settings/system/ResetPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/system/ResetPreferenceControllerTest.java
index 0d34a76..e80e77a 100644
--- a/tests/robotests/src/com/android/settings/system/ResetPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/system/ResetPreferenceControllerTest.java
@@ -21,8 +21,10 @@
import android.content.pm.UserInfo;
import android.os.UserHandle;
import android.provider.Settings;
+import android.util.FeatureFlagUtils;
import com.android.settings.R;
+import com.android.settings.core.FeatureFlags;
import com.android.settings.testutils.shadow.ShadowUserManager;
import org.junit.Before;
@@ -47,6 +49,7 @@
mContext = RuntimeEnvironment.application;
mController = new ResetPreferenceController(mContext, KEY_RESET_DASHBOARD);
mShadowUserManager = ShadowUserManager.getShadow();
+ FeatureFlagUtils.setEnabled(mContext, FeatureFlags.SILKY_HOME, false);
}
@Test
diff --git a/tests/robotests/src/com/android/settings/users/AddUserWhenLockedPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/users/AddUserWhenLockedPreferenceControllerTest.java
index 7bfee10..b27b636 100644
--- a/tests/robotests/src/com/android/settings/users/AddUserWhenLockedPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/users/AddUserWhenLockedPreferenceControllerTest.java
@@ -18,7 +18,6 @@
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.Answers.RETURNS_DEEP_STUBS;
-import static org.mockito.ArgumentMatchers.anyInt;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
@@ -28,8 +27,6 @@
import androidx.preference.PreferenceScreen;
-import com.android.internal.widget.LockPatternUtils;
-import com.android.settings.core.BasePreferenceController;
import com.android.settings.testutils.shadow.ShadowUserManager;
import com.android.settingslib.RestrictedSwitchPreference;
@@ -42,7 +39,6 @@
import org.robolectric.RobolectricTestRunner;
import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config;
-import org.robolectric.util.ReflectionHelpers;
@RunWith(RobolectricTestRunner.class)
@Config(shadows = {ShadowUserManager.class})
@@ -55,16 +51,13 @@
private Context mContext;
private ShadowUserManager mUserManager;
private AddUserWhenLockedPreferenceController mController;
- private LockPatternUtils mLockPatternUtils;
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
mContext = RuntimeEnvironment.application;
- mLockPatternUtils = mock(LockPatternUtils.class);
mUserManager = ShadowUserManager.getShadow();
mController = new AddUserWhenLockedPreferenceController(mContext, "fake_key");
- ReflectionHelpers.setField(mController, "mLockPatternUtils", mLockPatternUtils);
mUserManager.setSupportsMultipleUsers(true);
}
@@ -76,7 +69,6 @@
@Test
public void displayPref_NotAdmin_shouldNotDisplay() {
mUserManager.setIsAdminUser(false);
- when(mLockPatternUtils.isSecure(anyInt())).thenReturn(true);
final RestrictedSwitchPreference preference = mock(RestrictedSwitchPreference.class);
when(preference.getKey()).thenReturn(mController.getPreferenceKey());
when(mScreen.findPreference(preference.getKey())).thenReturn(preference);
@@ -89,7 +81,6 @@
@Test
public void updateState_NotAdmin_shouldNotDisplayPreference() {
mUserManager.setIsAdminUser(false);
- when(mLockPatternUtils.isSecure(anyInt())).thenReturn(true);
final RestrictedSwitchPreference preference = mock(RestrictedSwitchPreference.class);
mController.updateState(preference);
@@ -102,10 +93,8 @@
mUserManager.setIsAdminUser(true);
mUserManager.setUserSwitcherEnabled(true);
mUserManager.setSupportsMultipleUsers(true);
- when(mLockPatternUtils.isSecure(anyInt())).thenReturn(true);
final AddUserWhenLockedPreferenceController controller =
new AddUserWhenLockedPreferenceController(mContext, "fake_key");
- ReflectionHelpers.setField(controller, "mLockPatternUtils", mLockPatternUtils);
final RestrictedSwitchPreference preference = mock(RestrictedSwitchPreference.class);
controller.updateState(preference);
@@ -154,40 +143,4 @@
assertThat(Global.getInt(mContext.getContentResolver(), Global.ADD_USERS_WHEN_LOCKED, 0))
.isEqualTo(0);
}
-
- @Test
- public void updateState_insecureLockScreen_shouldNotDisplayPreference() {
- mUserManager.setIsAdminUser(true);
- mUserManager.setUserSwitcherEnabled(true);
- mUserManager.setSupportsMultipleUsers(true);
- when(mLockPatternUtils.isSecure(anyInt())).thenReturn(false);
- final AddUserWhenLockedPreferenceController controller =
- new AddUserWhenLockedPreferenceController(mContext, "fake_key");
- ReflectionHelpers.setField(controller, "mLockPatternUtils", mLockPatternUtils);
- final RestrictedSwitchPreference preference = mock(RestrictedSwitchPreference.class);
-
- controller.updateState(preference);
-
- verify(preference).setVisible(false);
- assertThat(controller.getAvailabilityStatus()).isEqualTo(
- BasePreferenceController.CONDITIONALLY_UNAVAILABLE);
- }
-
- @Test
- public void updateState_secureLockScreen_shouldDisplayPreference() {
- mUserManager.setIsAdminUser(true);
- mUserManager.setUserSwitcherEnabled(true);
- mUserManager.setSupportsMultipleUsers(true);
- when(mLockPatternUtils.isSecure(anyInt())).thenReturn(true);
- final AddUserWhenLockedPreferenceController controller =
- new AddUserWhenLockedPreferenceController(mContext, "fake_key");
- ReflectionHelpers.setField(controller, "mLockPatternUtils", mLockPatternUtils);
- final RestrictedSwitchPreference preference = mock(RestrictedSwitchPreference.class);
-
- controller.updateState(preference);
-
- verify(preference).setVisible(true);
- assertThat(controller.getAvailabilityStatus()).isEqualTo(
- BasePreferenceController.AVAILABLE);
- }
}
diff --git a/tests/robotests/src/com/android/settings/wifi/WifiConfigController2Test.java b/tests/robotests/src/com/android/settings/wifi/WifiConfigController2Test.java
index 80091e6..22e18bb 100644
--- a/tests/robotests/src/com/android/settings/wifi/WifiConfigController2Test.java
+++ b/tests/robotests/src/com/android/settings/wifi/WifiConfigController2Test.java
@@ -49,6 +49,7 @@
import android.widget.TextView;
import com.android.settings.R;
+import com.android.settings.network.SubscriptionUtil;
import com.android.settings.testutils.shadow.ShadowConnectivityManager;
import com.android.settings.wifi.details2.WifiPrivacyPreferenceController2;
import com.android.wifitrackerlib.WifiEntry;
@@ -834,6 +835,7 @@
when(subscriptionInfo.getDisplayName()).thenReturn("FAKE-CARRIER");
when(subscriptionInfo.getCarrierId()).thenReturn(carrierId);
when(subscriptionInfo.getCarrierName()).thenReturn("FAKE-CARRIER");
+ SubscriptionUtil.setAvailableSubscriptionsForTesting(Arrays.asList(subscriptionInfo));
mShadowSubscriptionManager.setActiveSubscriptionInfoList(Arrays.asList(subscriptionInfo));
mController = new TestWifiConfigController2(mConfigUiBase, mView, mWifiEntry,
WifiConfigUiBase2.MODE_CONNECT);
diff --git a/tests/robotests/src/com/android/settings/wifi/WifiConfigControllerTest.java b/tests/robotests/src/com/android/settings/wifi/WifiConfigControllerTest.java
index 305f41d..455e9f1 100644
--- a/tests/robotests/src/com/android/settings/wifi/WifiConfigControllerTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/WifiConfigControllerTest.java
@@ -49,6 +49,7 @@
import android.widget.TextView;
import com.android.settings.R;
+import com.android.settings.network.SubscriptionUtil;
import com.android.settings.testutils.shadow.ShadowConnectivityManager;
import com.android.settingslib.wifi.AccessPoint;
@@ -629,6 +630,7 @@
when(subscriptionInfo.getDisplayName()).thenReturn("FAKE-CARRIER");
when(subscriptionInfo.getCarrierId()).thenReturn(carrierId);
when(subscriptionInfo.getCarrierName()).thenReturn("FAKE-CARRIER");
+ SubscriptionUtil.setAvailableSubscriptionsForTesting(Arrays.asList(subscriptionInfo));
mShadowSubscriptionManager.setActiveSubscriptionInfoList(Arrays.asList(subscriptionInfo));
mController = new TestWifiConfigController(mConfigUiBase, mView, mAccessPoint,
WifiConfigUiBase.MODE_CONNECT);
diff --git a/tests/robotests/src/com/android/settings/wifi/calling/WifiCallingSettingsTest.java b/tests/robotests/src/com/android/settings/wifi/calling/WifiCallingSettingsTest.java
index 0159f49..d7f75e1 100644
--- a/tests/robotests/src/com/android/settings/wifi/calling/WifiCallingSettingsTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/calling/WifiCallingSettingsTest.java
@@ -125,6 +125,8 @@
when(info1.getDisplayName()).thenReturn(DISPLAY_NAME1);
when(info2.getDisplayName()).thenReturn(DISPLAY_NAME2);
+ SubscriptionUtil.setAvailableSubscriptionsForTesting(new ArrayList<>(
+ Arrays.asList(info1, info2)));
SubscriptionUtil.setActiveSubscriptionsForTesting(new ArrayList<>(
Arrays.asList(info1, info2)));
diff --git a/tests/unit/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogControllerTest.java b/tests/unit/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogControllerTest.java
index e94c4e7..ae534d0 100644
--- a/tests/unit/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogControllerTest.java
+++ b/tests/unit/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogControllerTest.java
@@ -136,7 +136,7 @@
when(mContext.getSystemService(SubscriptionManager.class)).thenReturn(mSubscriptionManager);
doReturn(mTelephonyManager).when(mTelephonyManager).createForSubscriptionId(
- SubscriptionManager.DEFAULT_SUBSCRIPTION_ID);
+ anyInt());
doReturn(2).when(mTelephonyManager).getCardIdForDefaultEuicc();
doReturn(TelephonyManager.NETWORK_TYPE_LTE).when(mTelephonyManager).getDataNetworkType();
diff --git a/tests/unit/src/com/android/settings/network/AirplaneSafeNetworksSliceTest.java b/tests/unit/src/com/android/settings/network/AirplaneSafeNetworksSliceTest.java
index a344ab6..a90b89d 100644
--- a/tests/unit/src/com/android/settings/network/AirplaneSafeNetworksSliceTest.java
+++ b/tests/unit/src/com/android/settings/network/AirplaneSafeNetworksSliceTest.java
@@ -34,7 +34,6 @@
import androidx.test.core.app.ApplicationProvider;
import androidx.test.ext.junit.runners.AndroidJUnit4;
-import com.android.settings.testutils.AirplaneModeRule;
import com.android.settings.testutils.ResourcesUtils;
import org.junit.Before;
@@ -50,8 +49,6 @@
@Rule
public MockitoRule mMocks = MockitoJUnit.rule();
- @Rule
- public AirplaneModeRule mAirplaneModeRule = new AirplaneModeRule();
@Mock
private WifiManager mWifiManager;
@@ -67,18 +64,18 @@
SliceProvider.setSpecs(SliceLiveData.SUPPORTED_SPECS);
mAirplaneSafeNetworksSlice = new AirplaneSafeNetworksSlice(mContext);
+ mAirplaneSafeNetworksSlice.onAirplaneModeChanged(true);
}
@Test
- public void getSlice_airplaneModeOff_shouldBeNull() {
- mAirplaneModeRule.setAirplaneMode(false);
+ public void getSlice_airplaneModeOff_shouldBeNotNull() {
+ mAirplaneSafeNetworksSlice.onAirplaneModeChanged(false);
- assertThat(mAirplaneSafeNetworksSlice.getSlice()).isNull();
+ assertThat(mAirplaneSafeNetworksSlice.getSlice()).isNotNull();
}
@Test
- public void getSlice_wifiDisabled_shouldShowViewAirplaneSafeNetworks() {
- mAirplaneModeRule.setAirplaneMode(true);
+ public void getSlice_wifiDisabled_shouldShowTurnOnNetworks() {
when(mWifiManager.isWifiEnabled()).thenReturn(false);
final Slice slice = mAirplaneSafeNetworksSlice.getSlice();
@@ -87,12 +84,11 @@
final SliceItem sliceTitle =
SliceMetadata.from(mContext, slice).getListContent().getHeader().getTitleItem();
assertThat(sliceTitle.getText()).isEqualTo(
- ResourcesUtils.getResourcesString(mContext, "view_airplane_safe_networks"));
+ ResourcesUtils.getResourcesString(mContext, "turn_on_networks"));
}
@Test
- public void getSlice_wifiEnabled_shouldShowTurnOffAirplaneMode() {
- mAirplaneModeRule.setAirplaneMode(true);
+ public void getSlice_wifiEnabled_shouldShowTurnOffNetworks() {
when(mWifiManager.isWifiEnabled()).thenReturn(true);
final Slice slice = mAirplaneSafeNetworksSlice.getSlice();
@@ -101,12 +97,11 @@
final SliceItem sliceTitle =
SliceMetadata.from(mContext, slice).getListContent().getHeader().getTitleItem();
assertThat(sliceTitle.getText()).isEqualTo(
- ResourcesUtils.getResourcesString(mContext, "turn_off_airplane_mode"));
+ ResourcesUtils.getResourcesString(mContext, "turn_off_networks"));
}
@Test
- public void onNotifyChange_viewAirplaneSafeNetworks_shouldSetWifiEnabled() {
- mAirplaneModeRule.setAirplaneMode(true);
+ public void onNotifyChange_turnOnNetworks_shouldSetWifiEnabled() {
when(mWifiManager.isWifiEnabled()).thenReturn(false);
Intent intent = mAirplaneSafeNetworksSlice.getIntent();
@@ -116,13 +111,12 @@
}
@Test
- public void onNotifyChange_turnOffAirplaneMode_shouldSetAirplaneModeOff() {
- mAirplaneModeRule.setAirplaneMode(true);
+ public void onNotifyChange_turnOffNetworks_shouldSetWifiDisabled() {
when(mWifiManager.isWifiEnabled()).thenReturn(true);
Intent intent = mAirplaneSafeNetworksSlice.getIntent();
mAirplaneSafeNetworksSlice.onNotifyChange(intent);
- assertThat(mAirplaneModeRule.isAirplaneModeOn()).isFalse();
+ verify(mWifiManager).setWifiEnabled(false);
}
}
diff --git a/tests/unit/src/com/android/settings/network/InternetPreferenceControllerTest.java b/tests/unit/src/com/android/settings/network/InternetPreferenceControllerTest.java
index a612177..ad07953 100644
--- a/tests/unit/src/com/android/settings/network/InternetPreferenceControllerTest.java
+++ b/tests/unit/src/com/android/settings/network/InternetPreferenceControllerTest.java
@@ -16,6 +16,7 @@
package com.android.settings.network;
+import static com.android.settings.network.InternetUpdater.INTERNET_APM_NETWORKS;
import static com.android.settings.network.InternetUpdater.INTERNET_WIFI;
import static com.google.common.truth.Truth.assertThat;
@@ -36,6 +37,7 @@
import android.net.wifi.WifiManager;
import android.os.Handler;
import android.os.Looper;
+import android.telephony.SubscriptionManager;
import androidx.lifecycle.Lifecycle;
import androidx.preference.Preference;
@@ -56,6 +58,7 @@
public class InternetPreferenceControllerTest {
private static final String TEST_SUMMARY = "test summary";
+ private static final String NOT_CONNECTED = "Not connected";
@Rule
public final MockitoRule mMockitoRule = MockitoJUnit.rule();
@@ -78,6 +81,7 @@
when(wifiManager.getWifiState()).thenReturn(WifiManager.WIFI_STATE_DISABLED);
mController = new InternetPreferenceController(mContext, mock(Lifecycle.class));
+ mController.sIconMap.put(INTERNET_WIFI, 0);
if (Looper.myLooper() == null) {
Looper.prepare();
}
@@ -115,12 +119,45 @@
}
@Test
- public void onSummaryChanged_shouldUpdatePreferenceSummary() {
+ public void mustUseWiFiHelperSummary_internetWifi_updateSummary() {
mController.onInternetTypeChanged(INTERNET_WIFI);
mController.displayPreference(mScreen);
- mController.onSummaryChanged(TEST_SUMMARY);
+ mController.mustUseWiFiHelperSummary(true /* isWifiConnected */, TEST_SUMMARY);
assertThat(mPreference.getSummary()).isEqualTo(TEST_SUMMARY);
+
+ mController.mustUseWiFiHelperSummary(false /* isWifiConnected */, NOT_CONNECTED);
+
+ assertThat(mPreference.getSummary()).isEqualTo(NOT_CONNECTED);
+ }
+
+ @Test
+ public void mustUseWiFiHelperSummary_internetApmNetworksWifiConnected_updateSummary() {
+ mController.onInternetTypeChanged(INTERNET_APM_NETWORKS);
+ mController.displayPreference(mScreen);
+
+ mController.mustUseWiFiHelperSummary(true /* isWifiConnected */, TEST_SUMMARY);
+
+ assertThat(mPreference.getSummary()).isEqualTo(TEST_SUMMARY);
+ }
+
+ @Test
+ public void mustUseWiFiHelperSummary_internetApmNetworksWifiDisconnected_notUpdateSummary() {
+ mController.onInternetTypeChanged(INTERNET_APM_NETWORKS);
+ mController.displayPreference(mScreen);
+
+ mController.mustUseWiFiHelperSummary(false /* isWifiConnected */, NOT_CONNECTED);
+
+ assertThat(mPreference.getSummary()).isNotEqualTo(NOT_CONNECTED);
+ }
+
+ @Test
+ public void updateCellularSummary_getNullSubscriptionInfo_shouldNotCrash() {
+ final SubscriptionManager subscriptionManager = mock(SubscriptionManager.class);
+ when(mContext.getSystemService(SubscriptionManager.class)).thenReturn(subscriptionManager);
+ when(subscriptionManager.getDefaultDataSubscriptionInfo()).thenReturn(null);
+
+ mController.updateCellularSummary();
}
}
diff --git a/tests/unit/src/com/android/settings/network/NetworkProviderCallsSmsControllerTest.java b/tests/unit/src/com/android/settings/network/NetworkProviderCallsSmsControllerTest.java
index 8444f11..eba45d4 100644
--- a/tests/unit/src/com/android/settings/network/NetworkProviderCallsSmsControllerTest.java
+++ b/tests/unit/src/com/android/settings/network/NetworkProviderCallsSmsControllerTest.java
@@ -17,9 +17,13 @@
package com.android.settings.network;
import static androidx.lifecycle.Lifecycle.Event;
+
import static com.google.common.truth.Truth.assertThat;
import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.when;
import android.content.Context;
import android.os.Looper;
@@ -27,19 +31,17 @@
import android.telephony.SubscriptionManager;
import android.text.TextUtils;
-import com.android.settings.testutils.ResourcesUtils;
-import com.android.settingslib.core.lifecycle.Lifecycle;
-import com.android.settingslib.RestrictedPreference;
-
import androidx.lifecycle.LifecycleOwner;
import androidx.lifecycle.LifecycleRegistry;
-import androidx.preference.PreferenceCategory;
import androidx.preference.PreferenceManager;
import androidx.preference.PreferenceScreen;
import androidx.test.annotation.UiThreadTest;
import androidx.test.core.app.ApplicationProvider;
import androidx.test.ext.junit.runners.AndroidJUnit4;
-import androidx.test.InstrumentationRegistry;
+
+import com.android.settings.testutils.ResourcesUtils;
+import com.android.settingslib.RestrictedPreference;
+import com.android.settingslib.core.lifecycle.Lifecycle;
import org.junit.Before;
import org.junit.Test;
@@ -50,9 +52,6 @@
import java.util.ArrayList;
import java.util.Arrays;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.when;
@RunWith(AndroidJUnit4.class)
public class NetworkProviderCallsSmsControllerTest {
@@ -94,7 +93,7 @@
private int mDefaultVoiceSubscriptionId;
private int mDefaultSmsSubscriptionId;
-
+ private boolean mIsInService;
@Override
protected int getDefaultVoiceSubscriptionId() {
return mDefaultVoiceSubscriptionId;
@@ -105,6 +104,11 @@
return mDefaultSmsSubscriptionId;
}
+ @Override
+ protected boolean isInService(int subId) {
+ return mIsInService;
+ }
+
public void setDefaultVoiceSubscriptionId(int subscriptionId) {
mDefaultVoiceSubscriptionId = subscriptionId;
}
@@ -112,6 +116,10 @@
public void setDefaultSmsSubscriptionId(int subscriptionId) {
mDefaultSmsSubscriptionId = subscriptionId;
}
+
+ public void setInService(boolean inService) {
+ mIsInService = inService;
+ }
}
@Before
@@ -129,7 +137,7 @@
mPreference = new RestrictedPreference(mContext);
mPreference.setKey(KEY_PREFERENCE_CALLS_SMS);
mController = new MockNetworkProviderCallsSmsController(mContext, mLifecycle);
-
+ mController.setInService(true);
mLifecycleRegistry = new LifecycleRegistry(mLifecycleOwner);
when(mLifecycleOwner.getLifecycle()).thenReturn(mLifecycleRegistry);
}
@@ -156,6 +164,7 @@
@UiThreadTest
public void getSummary_noSim_returnNoSim() {
when(mSubscriptionManager.getActiveSubscriptionInfoList()).thenReturn(new ArrayList<>());
+ when(mSubscriptionManager.getAvailableSubscriptionInfoList()).thenReturn(new ArrayList<>());
displayPreferenceWithLifecycle();
assertTrue(TextUtils.equals(mController.getSummary(),
@@ -169,12 +178,14 @@
mSubscriptionInfo1);
when(mSubscriptionManager.getActiveSubscriptionInfoList()).thenReturn(
Arrays.asList(mSubscriptionInfo1));
+ when(mSubscriptionManager.getAvailableSubscriptionInfoList()).thenReturn(
+ Arrays.asList(mSubscriptionInfo1));
displayPreferenceWithLifecycle();
final StringBuilder summary = new StringBuilder();
summary.append(DISPLAY_NAME_1)
.append(" (")
- .append(setSummaryResId("calls_sms_unavailable"))
+ .append(setSummaryResId("calls_sms_temp_unavailable"))
.append(")");
assertTrue(TextUtils.equals(mController.getSummary(), summary));
@@ -188,6 +199,8 @@
setupSubscriptionInfoList(SUB_ID_2, DISPLAY_NAME_2, mSubscriptionInfo2);
when(mSubscriptionManager.getActiveSubscriptionInfoList()).thenReturn(
Arrays.asList(mSubscriptionInfo1, mSubscriptionInfo2));
+ when(mSubscriptionManager.getAvailableSubscriptionInfoList()).thenReturn(
+ Arrays.asList(mSubscriptionInfo1, mSubscriptionInfo2));
displayPreferenceWithLifecycle();
final StringBuilder summary = new StringBuilder();
@@ -209,6 +222,8 @@
setupSubscriptionInfoList(SUB_ID_1, DISPLAY_NAME_1, mSubscriptionInfo1);
when(mSubscriptionManager.getActiveSubscriptionInfoList()).thenReturn(
Arrays.asList(mSubscriptionInfo1));
+ when(mSubscriptionManager.getAvailableSubscriptionInfoList()).thenReturn(
+ Arrays.asList(mSubscriptionInfo1));
displayPreferenceWithLifecycle();
assertThat(mPreference.getSummary()).isEqualTo(DISPLAY_NAME_1);
@@ -221,6 +236,8 @@
setupSubscriptionInfoList(SUB_ID_2, DISPLAY_NAME_2, mSubscriptionInfo2);
when(mSubscriptionManager.getActiveSubscriptionInfoList()).thenReturn(
Arrays.asList(mSubscriptionInfo1, mSubscriptionInfo2));
+ when(mSubscriptionManager.getAvailableSubscriptionInfoList()).thenReturn(
+ Arrays.asList(mSubscriptionInfo1, mSubscriptionInfo2));
displayPreferenceWithLifecycle();
final StringBuilder summary = new StringBuilder();
@@ -240,6 +257,8 @@
setupSubscriptionInfoList(SUB_ID_2, DISPLAY_NAME_2, mSubscriptionInfo2);
when(mSubscriptionManager.getActiveSubscriptionInfoList()).thenReturn(
Arrays.asList(mSubscriptionInfo1, mSubscriptionInfo2));
+ when(mSubscriptionManager.getAvailableSubscriptionInfoList()).thenReturn(
+ Arrays.asList(mSubscriptionInfo1, mSubscriptionInfo2));
displayPreferenceWithLifecycle();
final StringBuilder summary = new StringBuilder();
@@ -267,6 +286,8 @@
setupSubscriptionInfoList(SUB_ID_2, DISPLAY_NAME_2, mSubscriptionInfo2);
when(mSubscriptionManager.getActiveSubscriptionInfoList()).thenReturn(
Arrays.asList(mSubscriptionInfo1, mSubscriptionInfo2));
+ when(mSubscriptionManager.getAvailableSubscriptionInfoList()).thenReturn(
+ Arrays.asList(mSubscriptionInfo1, mSubscriptionInfo2));
displayPreferenceWithLifecycle();
final StringBuilder summary = new StringBuilder();
@@ -294,6 +315,8 @@
setupSubscriptionInfoList(SUB_ID_2, DISPLAY_NAME_2, mSubscriptionInfo2);
when(mSubscriptionManager.getActiveSubscriptionInfoList()).thenReturn(
Arrays.asList(mSubscriptionInfo1, mSubscriptionInfo2));
+ when(mSubscriptionManager.getAvailableSubscriptionInfoList()).thenReturn(
+ Arrays.asList(mSubscriptionInfo1, mSubscriptionInfo2));
displayPreferenceWithLifecycle();
final StringBuilder summary = new StringBuilder();
diff --git a/tests/unit/src/com/android/settings/network/ProviderModelSliceHelperTest.java b/tests/unit/src/com/android/settings/network/ProviderModelSliceHelperTest.java
index bee48d1..72e9be4 100644
--- a/tests/unit/src/com/android/settings/network/ProviderModelSliceHelperTest.java
+++ b/tests/unit/src/com/android/settings/network/ProviderModelSliceHelperTest.java
@@ -177,7 +177,7 @@
when(mDefaultDataSubscriptionInfo.getDisplayName()).thenReturn(expectDisplayName);
when(mSubscriptionManager.getActiveSubscriptionInfo(defaultDataSubId)).thenReturn(
mDefaultDataSubscriptionInfo);
- when(mSubscriptionManager.getActiveSubscriptionInfoList()).thenReturn(
+ when(mSubscriptionManager.getAvailableSubscriptionInfoList()).thenReturn(
Arrays.asList(mDefaultDataSubscriptionInfo));
when(mServiceState.getState()).thenReturn(ServiceState.STATE_IN_SERVICE);
@@ -207,7 +207,7 @@
when(mDefaultDataSubscriptionInfo.getDisplayName()).thenReturn(expectDisplayName);
when(mSubscriptionManager.getActiveSubscriptionInfo(defaultDataSubId)).thenReturn(
mDefaultDataSubscriptionInfo);
- when(mSubscriptionManager.getActiveSubscriptionInfoList()).thenReturn(
+ when(mSubscriptionManager.getAvailableSubscriptionInfoList()).thenReturn(
Arrays.asList(mDefaultDataSubscriptionInfo));
when(mServiceState.getState()).thenReturn(ServiceState.STATE_IN_SERVICE);
mBundle.putBoolean(CarrierConfigManager.KEY_INFLATE_SIGNAL_STRENGTH_BOOL, false);
diff --git a/tests/unit/src/com/android/settings/network/ProviderModelSliceTest.java b/tests/unit/src/com/android/settings/network/ProviderModelSliceTest.java
index 9f70bcf..476d854 100644
--- a/tests/unit/src/com/android/settings/network/ProviderModelSliceTest.java
+++ b/tests/unit/src/com/android/settings/network/ProviderModelSliceTest.java
@@ -16,8 +16,6 @@
package com.android.settings.network;
-import static android.app.slice.Slice.EXTRA_TOGGLE_STATE;
-
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.ArgumentMatchers.any;
@@ -25,6 +23,7 @@
import static org.mockito.ArgumentMatchers.anyLong;
import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.Mockito.eq;
+import static org.mockito.Mockito.never;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
@@ -132,7 +131,8 @@
SliceProvider.setSpecs(SliceLiveData.SUPPORTED_SPECS);
mMockNetworkProviderWorker = spy(new MockNetworkProviderWorker(mContext,
PROVIDER_MODEL_SLICE_URI));
- mMockProviderModelSlice = new MockProviderModelSlice(mContext, mMockNetworkProviderWorker);
+ mMockProviderModelSlice = spy(new MockProviderModelSlice(
+ mContext, mMockNetworkProviderWorker));
mListBuilder = spy(new ListBuilder(mContext, PROVIDER_MODEL_SLICE_URI,
ListBuilder.INFINITY).setAccentColor(-1));
when(mProviderModelSliceHelper.createListBuilder(PROVIDER_MODEL_SLICE_URI)).thenReturn(
@@ -386,32 +386,34 @@
}
@Test
- public void onNotifyChange_intentToggleActionOn_shouldSetCarrierNetworkEnabledTrue() {
- Intent intent = mMockProviderModelSlice.getBroadcastIntent(mContext).getIntent();
- intent.putExtra(EXTRA_TOGGLE_STATE, true);
-
- mMockProviderModelSlice.onNotifyChange(intent);
+ public void doCarrierNetworkAction_toggleActionSetDataEnabled_setCarrierNetworkEnabledTrue() {
+ mMockProviderModelSlice.doCarrierNetworkAction(true /* isToggleAction */,
+ true /* isDataEnabled */);
verify(mMockNetworkProviderWorker).setCarrierNetworkEnabled(true);
}
@Test
- public void onNotifyChange_intentToggleActionOff_shouldSetCarrierNetworkEnabledFalse() {
- Intent intent = mMockProviderModelSlice.getBroadcastIntent(mContext).getIntent();
- intent.putExtra(EXTRA_TOGGLE_STATE, false);
-
- mMockProviderModelSlice.onNotifyChange(intent);
+ public void doCarrierNetworkAction_toggleActionSetDataDisabled_setCarrierNetworkEnabledFalse() {
+ mMockProviderModelSlice.doCarrierNetworkAction(true /* isToggleAction */,
+ false /* isDataEnabled */);
verify(mMockNetworkProviderWorker).setCarrierNetworkEnabled(false);
}
@Test
- public void onNotifyChange_intentPrimaryAction_shouldConnectCarrierNetwork() {
- when(mTelephonyManager.isDataEnabled()).thenReturn(true);
- Intent intent = mMockProviderModelSlice.getBroadcastIntent(mContext).getIntent();
-
- mMockProviderModelSlice.onNotifyChange(intent);
+ public void doCarrierNetworkAction_primaryActionAndDataEnabled_connectCarrierNetwork() {
+ mMockProviderModelSlice.doCarrierNetworkAction(false /* isToggleAction */,
+ true /* isDataEnabled */);
verify(mMockNetworkProviderWorker).connectCarrierNetwork();
}
+
+ @Test
+ public void doCarrierNetworkAction_primaryActionAndDataDisabled_notConnectCarrierNetwork() {
+ mMockProviderModelSlice.doCarrierNetworkAction(false /* isToggleAction */,
+ false /* isDataEnabled */);
+
+ verify(mMockNetworkProviderWorker, never()).connectCarrierNetwork();
+ }
}
diff --git a/tests/unit/src/com/android/settings/network/SubscriptionUtilTest.java b/tests/unit/src/com/android/settings/network/SubscriptionUtilTest.java
index b36675a..c0e5205 100644
--- a/tests/unit/src/com/android/settings/network/SubscriptionUtilTest.java
+++ b/tests/unit/src/com/android/settings/network/SubscriptionUtilTest.java
@@ -48,7 +48,7 @@
private static final int SUBID_1 = 1;
private static final int SUBID_2 = 2;
private static final int SUBID_3 = 3;
- private static final CharSequence CARRIER_1 = "carrier1";
+ private static final CharSequence CARRIER_1 = "carrier1111111";
private static final CharSequence CARRIER_2 = "carrier2";
private Context mContext;
@@ -94,6 +94,8 @@
final SubscriptionInfo info2 = mock(SubscriptionInfo.class);
when(mSubMgr.getAvailableSubscriptionInfoList()).thenReturn(Arrays.asList(info1, info2));
+ // // TODO remove this line.
+ // when(mSubMgr.getAvailableSubscriptionInfoList()).thenReturn(Arrays.asList(info1, info2));
final List<SubscriptionInfo> subs = SubscriptionUtil.getAvailableSubscriptions(mContext);
assertThat(subs).isNotNull();
@@ -143,8 +145,9 @@
when(info2.getSubscriptionId()).thenReturn(SUBID_2);
when(info1.getDisplayName()).thenReturn(CARRIER_1);
when(info2.getDisplayName()).thenReturn(CARRIER_2);
- when(mSubMgr.getActiveSubscriptionInfoList()).thenReturn(
+ when(mSubMgr.getAvailableSubscriptionInfoList()).thenReturn(
Arrays.asList(info1, info2));
+ // Arrays.asList(info2));
// Each subscription has a unique last 4 digits of the phone number.
TelephonyManager sub1Telmgr = mock(TelephonyManager.class);
@@ -172,7 +175,7 @@
when(info2.getSubscriptionId()).thenReturn(SUBID_2);
when(info1.getDisplayName()).thenReturn(CARRIER_1);
when(info2.getDisplayName()).thenReturn(CARRIER_1);
- when(mSubMgr.getActiveSubscriptionInfoList()).thenReturn(
+ when(mSubMgr.getAvailableSubscriptionInfoList()).thenReturn(
Arrays.asList(info1, info2));
// Each subscription has a unique last 4 digits of the phone number.
@@ -201,8 +204,7 @@
when(info2.getSubscriptionId()).thenReturn(SUBID_2);
when(info1.getDisplayName()).thenReturn(CARRIER_1);
when(info2.getDisplayName()).thenReturn(CARRIER_1);
- when(mSubMgr.getActiveSubscriptionInfoList()).thenReturn(
- Arrays.asList(info1, info2));
+ when(mSubMgr.getAvailableSubscriptionInfoList()).thenReturn(Arrays.asList(info1, info2));
// The subscriptions' phone numbers cannot be revealed to the user.
TelephonyManager sub1Telmgr = mock(TelephonyManager.class);
@@ -234,7 +236,7 @@
when(info1.getDisplayName()).thenReturn(CARRIER_1);
when(info2.getDisplayName()).thenReturn(CARRIER_1);
when(info3.getDisplayName()).thenReturn(CARRIER_1);
- when(mSubMgr.getActiveSubscriptionInfoList()).thenReturn(
+ when(mSubMgr.getAvailableSubscriptionInfoList()).thenReturn(
Arrays.asList(info1, info2, info3));
// Subscription 1 has a unique phone number, but subscriptions 2 and 3 share the same
@@ -265,8 +267,7 @@
final SubscriptionInfo info1 = mock(SubscriptionInfo.class);
when(info1.getSubscriptionId()).thenReturn(SUBID_1);
when(info1.getDisplayName()).thenReturn(CARRIER_1);
- when(mSubMgr.getActiveSubscriptionInfoList()).thenReturn(
- Arrays.asList(info1));
+ when(mSubMgr.getAvailableSubscriptionInfoList()).thenReturn(Arrays.asList(info1));
TelephonyManager sub1Telmgr = mock(TelephonyManager.class);
when(sub1Telmgr.getLine1Number()).thenReturn("1112223333");
@@ -288,8 +289,7 @@
when(info2.getSubscriptionId()).thenReturn(SUBID_2);
when(info1.getDisplayName()).thenReturn(CARRIER_1);
when(info2.getDisplayName()).thenReturn(CARRIER_1);
- when(mSubMgr.getActiveSubscriptionInfoList()).thenReturn(
- Arrays.asList(info1, info2));
+ when(mSubMgr.getAvailableSubscriptionInfoList()).thenReturn(Arrays.asList(info1, info2));
// Each subscription has a unique last 4 digits of the phone number.
TelephonyManager sub1Telmgr = mock(TelephonyManager.class);
@@ -318,8 +318,7 @@
when(info2.getSubscriptionId()).thenReturn(SUBID_2);
when(info1.getDisplayName()).thenReturn(CARRIER_1);
when(info2.getDisplayName()).thenReturn(CARRIER_1);
- when(mSubMgr.getActiveSubscriptionInfoList()).thenReturn(
- Arrays.asList(info1, info2));
+ when(mSubMgr.getAvailableSubscriptionInfoList()).thenReturn(Arrays.asList(info1, info2));
// Both subscriptions have a the same 4 digits of the phone number.
TelephonyManager sub1Telmgr = mock(TelephonyManager.class);
@@ -345,8 +344,7 @@
final SubscriptionInfo info1 = mock(SubscriptionInfo.class);
when(info1.getSubscriptionId()).thenReturn(SUBID_1);
when(info1.getDisplayName()).thenReturn(CARRIER_1);
- when(mSubMgr.getActiveSubscriptionInfoList()).thenReturn(
- Arrays.asList(info1));
+ when(mSubMgr.getAvailableSubscriptionInfoList()).thenReturn(Arrays.asList(info1));
TelephonyManager sub1Telmgr = mock(TelephonyManager.class);
when(sub1Telmgr.getLine1Number()).thenReturn("1112223333");
@@ -366,8 +364,7 @@
final SubscriptionInfo info1 = mock(SubscriptionInfo.class);
when(info1.getSubscriptionId()).thenReturn(SUBID_1);
when(info1.getDisplayName()).thenReturn(CARRIER_1);
- when(mSubMgr.getActiveSubscriptionInfoList()).thenReturn(
- Arrays.asList(info1));
+ when(mSubMgr.getAvailableSubscriptionInfoList()).thenReturn(Arrays.asList(info1));
TelephonyManager sub1Telmgr = mock(TelephonyManager.class);
when(sub1Telmgr.getLine1Number()).thenReturn("1112223333");
@@ -381,6 +378,26 @@
}
@Test
+ public void getUniqueDisplayName_nullSubscriptionInfo_emptyStringReturned() {
+ final SubscriptionInfo info1 = mock(SubscriptionInfo.class);
+ when(info1.getSubscriptionId()).thenReturn(SUBID_1);
+ when(info1.getDisplayName()).thenReturn(CARRIER_1);
+ when(mSubMgr.getActiveSubscriptionInfoList()).thenReturn(
+ Arrays.asList(info1));
+
+ TelephonyManager sub1Telmgr = mock(TelephonyManager.class);
+ when(sub1Telmgr.getLine1Number()).thenReturn("1112223333");
+ when(mTelMgr.createForSubscriptionId(SUBID_1)).thenReturn(sub1Telmgr);
+
+ SubscriptionInfo info2 = null;
+ final CharSequence name =
+ SubscriptionUtil.getUniqueSubscriptionDisplayName(info2, mContext);
+
+ assertThat(name).isNotNull();
+ assertTrue(TextUtils.isEmpty(name));
+ }
+
+ @Test
public void isInactiveInsertedPSim_nullSubInfo_doesNotCrash() {
assertThat(SubscriptionUtil.isInactiveInsertedPSim(null)).isFalse();
}
diff --git a/tests/unit/src/com/android/settings/network/SubscriptionsPreferenceControllerTest.java b/tests/unit/src/com/android/settings/network/SubscriptionsPreferenceControllerTest.java
index f3e084c..ef3f130 100644
--- a/tests/unit/src/com/android/settings/network/SubscriptionsPreferenceControllerTest.java
+++ b/tests/unit/src/com/android/settings/network/SubscriptionsPreferenceControllerTest.java
@@ -272,6 +272,7 @@
@UiThreadTest
public void onSubscriptionsChanged_subscriptionReplaced_preferencesChanged() {
final List<SubscriptionInfo> subs = setupMockSubscriptions(3);
+ doReturn(subs).when(mSubscriptionManager).getAvailableSubscriptionInfoList();
// Start out with only sub1 and sub2.
SubscriptionUtil.setActiveSubscriptionsForTesting(subs.subList(0, 2));
@@ -388,6 +389,7 @@
final List<SubscriptionInfo> sub = setupMockSubscriptions(1);
doReturn(true).when(sInjector).isProviderModelEnabled(mContext);
doReturn(sub.get(0)).when(mSubscriptionManager).getDefaultDataSubscriptionInfo();
+ doReturn(sub).when(mSubscriptionManager).getAvailableSubscriptionInfoList();
mController.onResume();
mController.displayPreference(mPreferenceScreen);
@@ -402,6 +404,7 @@
final List<SubscriptionInfo> sub = setupMockSubscriptions(2);
doReturn(true).when(sInjector).isProviderModelEnabled(mContext);
doReturn(sub.get(0)).when(mSubscriptionManager).getDefaultDataSubscriptionInfo();
+ doReturn(sub).when(mSubscriptionManager).getAvailableSubscriptionInfoList();
mController.onResume();
mController.displayPreference(mPreferenceScreen);
@@ -530,6 +533,7 @@
final List<SubscriptionInfo> sub = setupMockSubscriptions(2);
doReturn(true).when(sInjector).isProviderModelEnabled(mContext);
doReturn(sub.get(0)).when(mSubscriptionManager).getDefaultDataSubscriptionInfo();
+ doReturn(sub).when(mSubscriptionManager).getAvailableSubscriptionInfoList();
Intent intent = new Intent(TelephonyManager.ACTION_DEFAULT_DATA_SUBSCRIPTION_CHANGED);
mController.onResume();
@@ -548,6 +552,7 @@
final int subId = sub.get(0).getSubscriptionId();
doReturn(true).when(sInjector).isProviderModelEnabled(mContext);
doReturn(sub.get(0)).when(mSubscriptionManager).getDefaultDataSubscriptionInfo();
+ doReturn(sub).when(mSubscriptionManager).getAvailableSubscriptionInfoList();
Intent intent = new Intent(TelephonyManager.ACTION_DEFAULT_DATA_SUBSCRIPTION_CHANGED);
mController.onResume();
diff --git a/tests/unit/src/com/android/settings/network/telephony/DefaultSubscriptionControllerTest.java b/tests/unit/src/com/android/settings/network/telephony/DefaultSubscriptionControllerTest.java
index 282704d..93621d9 100644
--- a/tests/unit/src/com/android/settings/network/telephony/DefaultSubscriptionControllerTest.java
+++ b/tests/unit/src/com/android/settings/network/telephony/DefaultSubscriptionControllerTest.java
@@ -54,7 +54,7 @@
@RunWith(AndroidJUnit4.class)
public class DefaultSubscriptionControllerTest {
@Mock
- private SubscriptionManager mManager;
+ private SubscriptionManager mSubMgr;
@Mock
private TelecomManager mTelecomManager;
@@ -68,7 +68,7 @@
public void setUp() {
MockitoAnnotations.initMocks(this);
mContext = spy(ApplicationProvider.getApplicationContext());
- when(mContext.getSystemService(SubscriptionManager.class)).thenReturn(mManager);
+ when(mContext.getSystemService(SubscriptionManager.class)).thenReturn(mSubMgr);
when(mContext.getSystemService(TelecomManager.class)).thenReturn(mTelecomManager);
final String key = "prefkey";
@@ -123,6 +123,7 @@
final SubscriptionInfo sub1 = createMockSub(111, "sub1");
final SubscriptionInfo sub2 = createMockSub(222, "sub2");
SubscriptionUtil.setActiveSubscriptionsForTesting(Arrays.asList(sub1, sub2));
+ when(mSubMgr.getAvailableSubscriptionInfoList()).thenReturn(Arrays.asList(sub1, sub2));
mController.setDefaultSubscription(sub1.getSubscriptionId());
mController.displayPreference(mScreen);
@@ -152,6 +153,7 @@
final SubscriptionInfo sub1 = createMockSub(111, "sub1");
final SubscriptionInfo sub2 = createMockSub(222, "sub2");
SubscriptionUtil.setActiveSubscriptionsForTesting(Arrays.asList(sub1, sub2));
+ when(mSubMgr.getAvailableSubscriptionInfoList()).thenReturn(Arrays.asList(sub1, sub2));
mController.setDefaultSubscription(sub2.getSubscriptionId());
mController.displayPreference(mScreen);
@@ -186,6 +188,8 @@
when(sub2.isOpportunistic()).thenReturn(true);
SubscriptionUtil.setActiveSubscriptionsForTesting(Arrays.asList(sub1, sub2, sub3));
+ when(mSubMgr.getAvailableSubscriptionInfoList()).thenReturn(
+ Arrays.asList(sub1, sub2, sub3));
mController.setDefaultSubscription(sub1.getSubscriptionId());
mController.displayPreference(mScreen);
@@ -240,6 +244,7 @@
// Start with only one sub active, so the pref is not available
SubscriptionUtil.setActiveSubscriptionsForTesting(Arrays.asList(sub1));
+ when(mSubMgr.getAvailableSubscriptionInfoList()).thenReturn(Arrays.asList(sub1));
mController.setDefaultSubscription(sub1.getSubscriptionId());
mController.displayPreference(mScreen);
@@ -261,6 +266,7 @@
final SubscriptionInfo sub1 = createMockSub(111, "sub1");
final SubscriptionInfo sub2 = createMockSub(222, "sub2");
SubscriptionUtil.setActiveSubscriptionsForTesting(Arrays.asList(sub1, sub2));
+ when(mSubMgr.getAvailableSubscriptionInfoList()).thenReturn(Arrays.asList(sub1, sub2));
mController.setDefaultSubscription(sub1.getSubscriptionId());
mController.displayPreference(mScreen);
@@ -296,6 +302,7 @@
final SubscriptionInfo sub1 = createMockSub(111, "sub1");
final SubscriptionInfo sub2 = createMockSub(222, "sub2");
SubscriptionUtil.setActiveSubscriptionsForTesting(Arrays.asList(sub1));
+ when(mSubMgr.getAvailableSubscriptionInfoList()).thenReturn(Arrays.asList(sub1));
mController.setDefaultSubscription(sub1.getSubscriptionId());
mController.displayPreference(mScreen);
@@ -303,6 +310,7 @@
assertThat(mListPreference.isVisible()).isFalse();
SubscriptionUtil.setActiveSubscriptionsForTesting(Arrays.asList(sub1, sub2));
+ when(mSubMgr.getAvailableSubscriptionInfoList()).thenReturn(Arrays.asList(sub1, sub2));
mController.onSubscriptionsChanged();
assertThat(mController.isAvailable()).isTrue();
@@ -315,12 +323,15 @@
final SubscriptionInfo sub2 = createMockSub(222, "sub2");
final SubscriptionInfo sub3 = createMockSub(333, "sub3");
SubscriptionUtil.setActiveSubscriptionsForTesting(Arrays.asList(sub1, sub2));
+ when(mSubMgr.getAvailableSubscriptionInfoList()).thenReturn(Arrays.asList(sub1, sub2));
mController.setDefaultSubscription(sub1.getSubscriptionId());
mController.displayPreference(mScreen);
assertThat(mListPreference.getEntries().length).isEqualTo(3);
SubscriptionUtil.setActiveSubscriptionsForTesting(Arrays.asList(sub1, sub2, sub3));
+ when(mSubMgr.getAvailableSubscriptionInfoList()).thenReturn(
+ Arrays.asList(sub1, sub2, sub3));
mController.onSubscriptionsChanged();
assertThat(mController.isAvailable()).isTrue();
diff --git a/tests/unit/src/com/android/settings/network/telephony/MmsMessagePreferenceControllerTest.java b/tests/unit/src/com/android/settings/network/telephony/MmsMessagePreferenceControllerTest.java
index 67f5f1a..a0219a0 100644
--- a/tests/unit/src/com/android/settings/network/telephony/MmsMessagePreferenceControllerTest.java
+++ b/tests/unit/src/com/android/settings/network/telephony/MmsMessagePreferenceControllerTest.java
@@ -111,11 +111,11 @@
@Test
public void setChecked_setDataIntoSubscriptionManager() {
mController.setChecked(true);
- verify(mTelephonyManager).setMobileDataPolicyEnabledStatus(
+ verify(mTelephonyManager).setMobileDataPolicyEnabled(
TelephonyManager.MOBILE_DATA_POLICY_MMS_ALWAYS_ALLOWED, true);
mController.setChecked(false);
- verify(mTelephonyManager).setMobileDataPolicyEnabledStatus(
+ verify(mTelephonyManager).setMobileDataPolicyEnabled(
TelephonyManager.MOBILE_DATA_POLICY_MMS_ALWAYS_ALLOWED, false);
}
}
diff --git a/tests/unit/src/com/android/settings/network/telephony/NetworkProviderWifiCallingGroupTest.java b/tests/unit/src/com/android/settings/network/telephony/NetworkProviderWifiCallingGroupTest.java
index ed6f161..660772e 100644
--- a/tests/unit/src/com/android/settings/network/telephony/NetworkProviderWifiCallingGroupTest.java
+++ b/tests/unit/src/com/android/settings/network/telephony/NetworkProviderWifiCallingGroupTest.java
@@ -39,15 +39,15 @@
import android.telephony.TelephonyManager;
import android.util.FeatureFlagUtils;
-import com.android.settings.network.ims.MockWfcQueryImsState;
-import com.android.settingslib.core.lifecycle.Lifecycle;
-
import androidx.preference.PreferenceCategory;
import androidx.preference.PreferenceManager;
import androidx.preference.PreferenceScreen;
import androidx.test.core.app.ApplicationProvider;
import androidx.test.ext.junit.runners.AndroidJUnit4;
+import com.android.settings.network.ims.MockWfcQueryImsState;
+import com.android.settingslib.core.lifecycle.Lifecycle;
+
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -132,10 +132,8 @@
@Test
public void shouldShowWifiCallingForSub_invalidSubId_returnFalse() {
- when(mSubscriptionManager.getActiveSubscriptionInfo(SUB_ID)).thenReturn(null);
-
- assertThat(mNetworkProviderWifiCallingGroup.shouldShowWifiCallingForSub(SUB_ID))
- .isEqualTo(false);
+ assertThat(mNetworkProviderWifiCallingGroup.shouldShowWifiCallingForSub(
+ SubscriptionManager.INVALID_SUBSCRIPTION_ID)).isEqualTo(false);
}
@Test
diff --git a/tests/unit/src/com/android/settings/network/telephony/NetworkProviderWorkerTest.java b/tests/unit/src/com/android/settings/network/telephony/NetworkProviderWorkerTest.java
index 1905e44..2ce9a51 100644
--- a/tests/unit/src/com/android/settings/network/telephony/NetworkProviderWorkerTest.java
+++ b/tests/unit/src/com/android/settings/network/telephony/NetworkProviderWorkerTest.java
@@ -229,6 +229,18 @@
}
@Test
+ @UiThreadTest
+ public void onDataConnectionStateChanged_notifyPhoneStateListener_callUpdateSlice() {
+ mMockNetworkProviderWorker.onSlicePinned();
+ mMockNetworkProviderWorker.receiveNotification(false);
+
+ mMockNetworkProviderWorker.mPhoneStateListener.onDataConnectionStateChanged(
+ TelephonyManager.DATA_DISCONNECTED, TelephonyManager.NETWORK_TYPE_LTE);
+
+ assertThat(mMockNetworkProviderWorker.hasNotification()).isTrue();
+ }
+
+ @Test
public void onInternetTypeChanged_connectedFromWifiToEthernet_callUpdateSlice() {
mMockNetworkProviderWorker.receiveNotification(false);
mMockNetworkProviderWorker.onInternetTypeChanged(INTERNET_WIFI);
diff --git a/tests/robotests/src/com/android/settings/network/telephony/WifiCallingPreferenceControllerTest.java b/tests/unit/src/com/android/settings/network/telephony/WifiCallingPreferenceControllerTest.java
similarity index 74%
rename from tests/robotests/src/com/android/settings/network/telephony/WifiCallingPreferenceControllerTest.java
rename to tests/unit/src/com/android/settings/network/telephony/WifiCallingPreferenceControllerTest.java
index dbfd3b2..5827516 100644
--- a/tests/robotests/src/com/android/settings/network/telephony/WifiCallingPreferenceControllerTest.java
+++ b/tests/unit/src/com/android/settings/network/telephony/WifiCallingPreferenceControllerTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2018 The Android Open Source Project
+ * Copyright (C) 2021 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -19,8 +19,6 @@
import static com.google.common.truth.Truth.assertThat;
import static org.junit.Assert.assertNull;
-import static org.mockito.ArgumentMatchers.anyInt;
-import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.when;
@@ -35,11 +33,16 @@
import android.telephony.ims.ImsMmTelManager;
import androidx.preference.Preference;
+import androidx.preference.PreferenceManager;
import androidx.preference.PreferenceScreen;
+import androidx.test.annotation.UiThreadTest;
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
import com.android.internal.R;
import com.android.settings.core.BasePreferenceController;
import com.android.settings.network.ims.MockWifiCallingQueryImsState;
+import com.android.settings.network.ims.WifiCallingQueryImsState;
import org.junit.Before;
import org.junit.Ignore;
@@ -47,62 +50,57 @@
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
-import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
-@RunWith(RobolectricTestRunner.class)
+@RunWith(AndroidJUnit4.class)
public class WifiCallingPreferenceControllerTest {
private static final int SUB_ID = 2;
-
+ @Mock
+ private SubscriptionManager mSubscriptionManager;
@Mock
private CarrierConfigManager mCarrierConfigManager;
@Mock
private TelephonyManager mTelephonyManager;
@Mock
private ImsMmTelManager mImsMmTelManager;
- @Mock
- private PreferenceScreen mPreferenceScreen;
+
+ private PreferenceScreen mScreen;
+ private PreferenceManager mPreferenceManager;
private MockWifiCallingQueryImsState mQueryImsState;
- private WifiCallingPreferenceController mController;
+ private TestWifiCallingPreferenceController mController;
private Preference mPreference;
private Context mContext;
private PersistableBundle mCarrierConfig;
@Before
+ @UiThreadTest
public void setUp() {
MockitoAnnotations.initMocks(this);
- mContext = spy(RuntimeEnvironment.application);
+ mContext = spy(ApplicationProvider.getApplicationContext());
+ when(mContext.getSystemService(SubscriptionManager.class)).thenReturn(mSubscriptionManager);
mQueryImsState = new MockWifiCallingQueryImsState(mContext, SUB_ID);
mQueryImsState.setIsEnabledByUser(true);
mQueryImsState.setIsProvisionedOnDevice(true);
- mPreference = new Preference(mContext);
- mController = spy(new WifiCallingPreferenceController(mContext, "wifi_calling") {
- @Override
- protected ImsMmTelManager getImsMmTelManager(int subId) {
- return mImsMmTelManager;
- }
- });
+ mController = new TestWifiCallingPreferenceController(mContext, "wifi_calling");
mController.mCarrierConfigManager = mCarrierConfigManager;
mController.init(SUB_ID);
mController.mCallState = TelephonyManager.CALL_STATE_IDLE;
- doReturn(mQueryImsState).when(mController).queryImsState(anyInt());
- mPreference.setKey(mController.getPreferenceKey());
-
- when(mController.getTelephonyManager(mContext, SUB_ID)).thenReturn(mTelephonyManager);
-
mCarrierConfig = new PersistableBundle();
when(mCarrierConfigManager.getConfigForSubId(SUB_ID)).thenReturn(mCarrierConfig);
- when(mPreferenceScreen.findPreference(mController.getPreferenceKey())).thenReturn(
- mPreference);
+ mPreferenceManager = new PreferenceManager(mContext);
+ mScreen = mPreferenceManager.createPreferenceScreen(mContext);
+ mPreference = new Preference(mContext);
+ mPreference.setKey(mController.getPreferenceKey());
+ mScreen.addPreference(mPreference);
}
@Test
+ @UiThreadTest
public void updateState_noSimCallManager_setCorrectSummary() {
mController.mSimCallManager = null;
mQueryImsState.setIsEnabledByUser(true);
@@ -118,6 +116,7 @@
}
@Test
+ @UiThreadTest
public void updateState_notCallIdle_disable() {
mController.mCallState = TelephonyManager.CALL_STATE_RINGING;
@@ -127,6 +126,7 @@
}
@Test
+ @UiThreadTest
public void updateState_invalidPhoneAccountHandle_shouldNotCrash() {
mController.mSimCallManager = new PhoneAccountHandle(null /* invalid */, "");
@@ -135,6 +135,7 @@
}
@Test
+ @UiThreadTest
public void updateState_wfcNonRoamingByConfig() {
assertNull(mController.mSimCallManager);
mCarrierConfig.putBoolean(
@@ -154,6 +155,7 @@
}
@Test
+ @UiThreadTest
public void updateState_wfcRoamingByConfig() {
assertNull(mController.mSimCallManager);
// useWfcHomeModeForRoaming is false by default. In order to check wfc in roaming mode. We
@@ -171,12 +173,15 @@
}
@Test
+ @UiThreadTest
public void displayPreference_notAvailable_setPreferenceInvisible() {
mController.init(SubscriptionManager.INVALID_SUBSCRIPTION_ID);
+ when(mSubscriptionManager.getActiveSubscriptionInfoList()).thenReturn(null);
- mController.displayPreference(mPreferenceScreen);
+ mController.displayPreference(mScreen);
- assertThat(mPreferenceScreen.isVisible()).isFalse();
+ assertThat(mController.getPreferenceKey()).isEqualTo("wifi_calling");
+ assertThat(mScreen.findPreference(mController.getPreferenceKey()).isVisible()).isFalse();
}
@Test
@@ -184,16 +189,39 @@
public void displayPreference_available_setsSubscriptionIdOnIntent() {
final Intent intent = new Intent();
mPreference.setIntent(intent);
- mController.displayPreference(mPreferenceScreen);
+ mController.displayPreference(mScreen);
assertThat(intent.getIntExtra(Settings.EXTRA_SUB_ID,
SubscriptionManager.INVALID_SUBSCRIPTION_ID)).isEqualTo(SUB_ID);
}
@Test
+ @UiThreadTest
public void getAvailabilityStatus_noWiFiCalling_shouldReturnUnsupported() {
mController.init(SubscriptionManager.INVALID_SUBSCRIPTION_ID);
+ when(mSubscriptionManager.getActiveSubscriptionInfoList()).thenReturn(null);
assertThat(mController.getAvailabilityStatus()).isEqualTo(
BasePreferenceController.UNSUPPORTED_ON_DEVICE);
}
+
+ private class TestWifiCallingPreferenceController extends WifiCallingPreferenceController {
+ TestWifiCallingPreferenceController(Context context, String preferenceKey) {
+ super(context, preferenceKey);
+ }
+
+ @Override
+ protected ImsMmTelManager getImsMmTelManager(int subId) {
+ return mImsMmTelManager;
+ }
+
+ @Override
+ protected TelephonyManager getTelephonyManager(Context context, int subId) {
+ return mTelephonyManager;
+ }
+
+ @Override
+ protected WifiCallingQueryImsState queryImsState(int subId) {
+ return mQueryImsState;
+ }
+ }
}
diff --git a/tests/unit/src/com/android/settings/panel/InternetConnectivityPanelTest.java b/tests/unit/src/com/android/settings/panel/InternetConnectivityPanelTest.java
new file mode 100644
index 0000000..a4d4ad1
--- /dev/null
+++ b/tests/unit/src/com/android/settings/panel/InternetConnectivityPanelTest.java
@@ -0,0 +1,224 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.panel;
+
+import static com.android.settings.network.InternetUpdater.INTERNET_APM;
+import static com.android.settings.network.InternetUpdater.INTERNET_APM_NETWORKS;
+import static com.android.settings.network.InternetUpdater.INTERNET_CELLULAR;
+import static com.android.settings.network.InternetUpdater.INTERNET_ETHERNET;
+import static com.android.settings.network.InternetUpdater.INTERNET_WIFI;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.clearInvocations;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+
+import android.content.Context;
+import android.net.Uri;
+
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import com.android.settings.network.AirplaneModePreferenceController;
+import com.android.settings.slices.CustomSliceRegistry;
+import com.android.settings.testutils.ResourcesUtils;
+
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.junit.MockitoJUnit;
+import org.mockito.junit.MockitoRule;
+
+import java.util.List;
+
+@RunWith(AndroidJUnit4.class)
+public class InternetConnectivityPanelTest {
+
+ public static final String TITLE_INTERNET = ResourcesUtils.getResourcesString(
+ ApplicationProvider.getApplicationContext(), "provider_internet_settings");
+ public static final String TITLE_APM_NETWORKS = ResourcesUtils.getResourcesString(
+ ApplicationProvider.getApplicationContext(), "airplane_mode_network_panel_title");
+ public static final String SUBTITLE_APM_IS_ON = ResourcesUtils.getResourcesString(
+ ApplicationProvider.getApplicationContext(), "condition_airplane_title");
+ public static final String BUTTON_SETTINGS = ResourcesUtils.getResourcesString(
+ ApplicationProvider.getApplicationContext(), "settings_button");
+
+ @Rule
+ public final MockitoRule mMocks = MockitoJUnit.rule();
+ @Mock
+ PanelContentCallback mPanelContentCallback;
+
+ private Context mContext;
+ private InternetConnectivityPanel mPanel;
+
+ @Before
+ public void setUp() {
+ mContext = spy(ApplicationProvider.getApplicationContext());
+
+ mPanel = InternetConnectivityPanel.create(mContext);
+ mPanel.registerCallback(mPanelContentCallback);
+ mPanel.mIsProviderModelEnabled = true;
+ }
+
+ @Test
+ public void getTitle_internetApmNetworks_shouldBeApmNetworks() {
+ mPanel.onInternetTypeChanged(INTERNET_APM_NETWORKS);
+
+ assertThat(mPanel.getTitle()).isEqualTo(TITLE_APM_NETWORKS);
+ }
+
+ @Test
+ public void getTitle_notInternetApmNetworks_shouldBeInternet() {
+ mPanel.onInternetTypeChanged(INTERNET_APM);
+
+ assertThat(mPanel.getTitle()).isEqualTo(TITLE_INTERNET);
+
+ mPanel.onInternetTypeChanged(INTERNET_WIFI);
+
+ assertThat(mPanel.getTitle()).isEqualTo(TITLE_INTERNET);
+
+ mPanel.onInternetTypeChanged(INTERNET_CELLULAR);
+
+ assertThat(mPanel.getTitle()).isEqualTo(TITLE_INTERNET);
+
+ mPanel.onInternetTypeChanged(INTERNET_ETHERNET);
+
+ assertThat(mPanel.getTitle()).isEqualTo(TITLE_INTERNET);
+ }
+
+ @Test
+ public void getSubTitle_internetApm_shouldBeApmIsOn() {
+ mPanel.onInternetTypeChanged(INTERNET_APM);
+
+ assertThat(mPanel.getSubTitle()).isEqualTo(SUBTITLE_APM_IS_ON);
+ }
+
+ @Test
+ public void getSubTitle_notinternetApm_shouldBeNull() {
+ mPanel.onInternetTypeChanged(INTERNET_APM_NETWORKS);
+
+ assertThat(mPanel.getSubTitle()).isNull();
+
+ mPanel.onInternetTypeChanged(INTERNET_WIFI);
+
+ assertThat(mPanel.getSubTitle()).isNull();
+
+ mPanel.onInternetTypeChanged(INTERNET_CELLULAR);
+
+ assertThat(mPanel.getSubTitle()).isNull();
+
+ mPanel.onInternetTypeChanged(INTERNET_ETHERNET);
+
+ assertThat(mPanel.getSubTitle()).isNull();
+ }
+
+ @Test
+ public void getCustomizedButtonTitle_internetApm_shouldBeNull() {
+ mPanel.onInternetTypeChanged(INTERNET_APM);
+
+ assertThat(mPanel.getCustomizedButtonTitle()).isNull();
+ }
+
+ @Test
+ public void getCustomizedButtonTitle_notInternetApm_shouldBeSettings() {
+ mPanel.onInternetTypeChanged(INTERNET_APM_NETWORKS);
+
+ assertThat(mPanel.getCustomizedButtonTitle()).isEqualTo(BUTTON_SETTINGS);
+
+ mPanel.onInternetTypeChanged(INTERNET_WIFI);
+
+ assertThat(mPanel.getCustomizedButtonTitle()).isEqualTo(BUTTON_SETTINGS);
+
+ mPanel.onInternetTypeChanged(INTERNET_CELLULAR);
+
+ assertThat(mPanel.getCustomizedButtonTitle()).isEqualTo(BUTTON_SETTINGS);
+
+ mPanel.onInternetTypeChanged(INTERNET_ETHERNET);
+
+ assertThat(mPanel.getCustomizedButtonTitle()).isEqualTo(BUTTON_SETTINGS);
+ }
+
+ @Test
+ public void getSlices_providerModelDisabled_containsNecessarySlices() {
+ mPanel.mIsProviderModelEnabled = false;
+ final List<Uri> uris = mPanel.getSlices();
+
+ assertThat(uris).containsExactly(
+ AirplaneModePreferenceController.SLICE_URI,
+ CustomSliceRegistry.MOBILE_DATA_SLICE_URI,
+ CustomSliceRegistry.WIFI_SLICE_URI);
+ }
+
+ @Test
+ public void getSlices_providerModelEnabled_containsNecessarySlices() {
+ final List<Uri> uris = mPanel.getSlices();
+
+ assertThat(uris).containsExactly(
+ CustomSliceRegistry.PROVIDER_MODEL_SLICE_URI,
+ CustomSliceRegistry.AIRPLANE_SAFE_NETWORKS_SLICE_URI);
+ }
+
+ @Test
+ public void getSeeMoreIntent_notNull() {
+ assertThat(mPanel.getSeeMoreIntent()).isNotNull();
+ }
+
+ @Test
+ public void onInternetTypeChanged_internetTypeChangedToApm_changeHeaderAndHideSettings() {
+ mPanel.onInternetTypeChanged(INTERNET_APM_NETWORKS);
+ clearInvocations(mPanelContentCallback);
+
+ mPanel.onInternetTypeChanged(INTERNET_APM);
+
+ verify(mPanelContentCallback).onHeaderChanged();
+ verify(mPanelContentCallback).onCustomizedButtonStateChanged();
+ }
+
+ @Test
+ public void onInternetTypeChanged_internetTypeChangedFomApm_changeTitleAndShowSettings() {
+ mPanel.onInternetTypeChanged(INTERNET_APM);
+ clearInvocations(mPanelContentCallback);
+
+ mPanel.onInternetTypeChanged(INTERNET_APM_NETWORKS);
+
+ verify(mPanelContentCallback).onTitleChanged();
+ verify(mPanelContentCallback).onCustomizedButtonStateChanged();
+ }
+
+ @Test
+ public void onInternetTypeChanged_internetTypeChangedToApmNetworks_changeTitle() {
+ mPanel.onInternetTypeChanged(INTERNET_WIFI);
+ clearInvocations(mPanelContentCallback);
+
+ mPanel.onInternetTypeChanged(INTERNET_APM_NETWORKS);
+
+ verify(mPanelContentCallback).onTitleChanged();
+ }
+
+ @Test
+ public void onInternetTypeChanged_internetTypeChangedFromApmNetworks_changeTitle() {
+ mPanel.onInternetTypeChanged(INTERNET_APM_NETWORKS);
+ clearInvocations(mPanelContentCallback);
+
+ mPanel.onInternetTypeChanged(INTERNET_WIFI);
+
+ verify(mPanelContentCallback).onTitleChanged();
+ }
+}