Merging from qt-qpr1-sysui-dev @ build 5855545
Test: manual, presubmit on the source branch
Change-Id: Idc3d5c39427722a5486552312552f7f77ef40980
diff --git a/Android.bp b/Android.bp
new file mode 100644
index 0000000..15e36f1
--- /dev/null
+++ b/Android.bp
@@ -0,0 +1,66 @@
+java_library {
+ name: "settings-logtags",
+ srcs: ["src/**/*.logtags"],
+ static_libs: ["WifiTrackerLib"],
+}
+
+// Build the Settings APK
+android_library {
+ name: "Settings-core",
+ platform_apis: true,
+ defaults: [
+ "SettingsLibDefaults",
+ "SettingsLib-search-defaults",
+ ],
+
+ srcs: ["src/**/*.java"],
+
+ static_libs: [
+ "androidx-constraintlayout_constraintlayout",
+ "androidx.slice_slice-builders",
+ "androidx.slice_slice-core",
+ "androidx.slice_slice-view",
+ "androidx.core_core",
+ "androidx.appcompat_appcompat",
+ "androidx.cardview_cardview",
+ "androidx.preference_preference",
+ "androidx.recyclerview_recyclerview",
+ "com.google.android.material_material",
+ "setupcompat",
+ "setupdesign",
+ "androidx-constraintlayout_constraintlayout-solver",
+ "androidx.lifecycle_lifecycle-runtime",
+ "androidx.lifecycle_lifecycle-extensions",
+ "guava",
+ "jsr305",
+ "settings-contextual-card-protos-lite",
+ "settings-log-bridge-protos-lite",
+ "contextualcards",
+ "settings-logtags",
+ "zxing-core-1.7",
+ ],
+
+ libs: [
+ "telephony-common",
+ "ims-common",
+ ],
+}
+
+android_app {
+ name: "Settings",
+ platform_apis: true,
+ certificate: "platform",
+ product_specific: true,
+ privileged: true,
+ required: ["privapp_whitelist_com.android.settings"],
+ static_libs: ["Settings-core"],
+ resource_dirs: [],
+ optimize: {
+ proguard_flags_files: ["proguard.flags"],
+ },
+}
+
+android_library_import {
+ name: "contextualcards",
+ aars: ["libs/contextualcards.aar"],
+}
diff --git a/Android.mk b/Android.mk
deleted file mode 100644
index 906cfc7..0000000
--- a/Android.mk
+++ /dev/null
@@ -1,78 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_SRC_FILES := \
- $(call all-logtags-files-under, src)
-
-LOCAL_MODULE := settings-logtags
-
-include $(BUILD_STATIC_JAVA_LIBRARY)
-
-# Build the Settings APK
-include $(CLEAR_VARS)
-
-LOCAL_PACKAGE_NAME := Settings
-LOCAL_PRIVATE_PLATFORM_APIS := true
-LOCAL_CERTIFICATE := platform
-LOCAL_PRODUCT_MODULE := true
-LOCAL_PRIVILEGED_MODULE := true
-LOCAL_REQUIRED_MODULES := privapp_whitelist_com.android.settings
-LOCAL_MODULE_TAGS := optional
-LOCAL_USE_AAPT2 := true
-
-LOCAL_SRC_FILES := $(call all-java-files-under, src)
-
-LOCAL_STATIC_ANDROID_LIBRARIES := \
- androidx-constraintlayout_constraintlayout \
- androidx.slice_slice-builders \
- androidx.slice_slice-core \
- androidx.slice_slice-view \
- androidx.core_core \
- androidx.appcompat_appcompat \
- androidx.cardview_cardview \
- androidx.preference_preference \
- androidx.recyclerview_recyclerview \
- com.google.android.material_material \
- setupcompat \
- setupdesign
-
-LOCAL_JAVA_LIBRARIES := \
- telephony-common \
- ims-common
-
-LOCAL_STATIC_JAVA_LIBRARIES := \
- androidx-constraintlayout_constraintlayout-solver \
- androidx.lifecycle_lifecycle-runtime \
- androidx.lifecycle_lifecycle-extensions \
- guava \
- jsr305 \
- settings-contextual-card-protos-lite \
- settings-log-bridge-protos-lite \
- contextualcards \
- settings-logtags \
- zxing-core-1.7
-
-LOCAL_PROGUARD_FLAG_FILES := proguard.flags
-
-ifneq ($(INCREMENTAL_BUILDS),)
- LOCAL_PROGUARD_ENABLED := disabled
- LOCAL_JACK_ENABLED := incremental
- LOCAL_JACK_FLAGS := --multi-dex native
-endif
-
-include frameworks/base/packages/SettingsLib/common.mk
-include frameworks/base/packages/SettingsLib/search/common.mk
-
-include $(BUILD_PACKAGE)
-
-# ==== prebuilt library ========================
-include $(CLEAR_VARS)
-
-LOCAL_PREBUILT_STATIC_JAVA_LIBRARIES := \
- contextualcards:libs/contextualcards.aar
-include $(BUILD_MULTI_PREBUILT)
-
-# Use the following include to make our test apk.
-ifeq (,$(ONE_SHOT_MAKEFILE))
-include $(call all-makefiles-under,$(LOCAL_PATH))
-endif
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 325fc8d..ef5facf 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -30,8 +30,6 @@
<uses-permission android:name="android.permission.WRITE_CONTACTS" />
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
<uses-permission android:name="android.permission.LOCAL_MAC_ADDRESS" />
- <uses-permission android:name="android.permission.ACCESS_WIMAX_STATE" />
- <uses-permission android:name="android.permission.CHANGE_WIMAX_STATE" />
<uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
<uses-permission android:name="com.android.certinstaller.INSTALL_AS_USER" />
<uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
@@ -81,7 +79,6 @@
<uses-permission android:name="android.permission.OEM_UNLOCK_STATE" />
<uses-permission android:name="android.permission.MANAGE_USER_OEM_UNLOCK_STATE" />
<uses-permission android:name="android.permission.OVERRIDE_WIFI_CONFIG" />
- <uses-permission android:name="android.permission.USE_FINGERPRINT" />
<uses-permission android:name="android.permission.MANAGE_FINGERPRINT" />
<uses-permission android:name="android.permission.USE_BIOMETRIC" />
<uses-permission android:name="android.permission.USE_BIOMETRIC_INTERNAL" />
@@ -120,6 +117,7 @@
<activity android:name=".homepage.SettingsHomepageActivity"
android:label="@string/settings_label_launcher"
android:theme="@style/Theme.Settings.Home"
+ android:taskAffinity="com.android.settings.root"
android:launchMode="singleTask">
<intent-filter android:priority="1">
<action android:name="android.settings.SETTINGS" />
@@ -144,6 +142,7 @@
<!-- Alias for launcher activity only, as this belongs to each profile. -->
<activity-alias android:name="Settings"
android:label="@string/settings_label_launcher"
+ android:taskAffinity="com.android.settings.root"
android:launchMode="singleTask"
android:targetActivity=".homepage.SettingsHomepageActivity">
<intent-filter>
@@ -162,8 +161,7 @@
</receiver>
<activity android:name=".SubSettings"
- android:parentActivityName="Settings"
- android:theme="@style/Theme.SubSettings"/>
+ android:parentActivityName="Settings"/>
<activity android:name=".Settings$CreateShortcutActivity"
android:label="@string/settings_shortcut">
@@ -269,6 +267,26 @@
</activity>
<activity
+ android:name="Settings$WifiSettings2Activity"
+ android:label="@string/wifi_settings"
+ android:icon="@drawable/ic_settings_wireless"
+ android:configChanges="orientation|keyboardHidden|screenSize"
+ android:parentActivityName="Settings">
+ <intent-filter android:priority="1">
+ <action android:name="android.settings.WIFI_SETTINGS2" />
+ <category android:name="android.intent.category.DEFAULT" />
+ </intent-filter>
+ <intent-filter android:priority="1">
+ <action android:name="android.intent.action.MAIN" />
+ <category android:name="com.android.settings.SHORTCUT" />
+ </intent-filter>
+ <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
+ android:value="com.android.settings.wifi.WifiSettings2" />
+ <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
+ android:value="true" />
+ </activity>
+
+ <activity
android:name=".wifi.WifiPickerActivity"
android:parentActivityName="Settings">
<intent-filter android:priority="1">
@@ -1028,8 +1046,7 @@
<activity
android:name="Settings$ManageDomainUrlsActivity"
- android:label="@string/domain_urls_title"
- android:parentActivityName="Settings">
+ android:label="@string/domain_urls_title">
<intent-filter>
<action android:name="android.settings.MANAGE_DOMAIN_URLS" />
<category android:name="android.intent.category.DEFAULT" />
@@ -1211,8 +1228,7 @@
android:name="Settings$LocationSettingsActivity"
android:label="@string/location_settings_title"
android:icon="@drawable/ic_homepage_location"
- android:configChanges="orientation|keyboardHidden|screenSize"
- android:parentActivityName="Settings">
+ android:configChanges="orientation|keyboardHidden|screenSize">
<intent-filter android:priority="1">
<action android:name="android.settings.LOCATION_SOURCE_SETTINGS" />
<category android:name="android.intent.category.DEFAULT" />
@@ -2712,7 +2728,7 @@
android:launchMode="singleTop"
android:taskAffinity=".wifi.NetworkRequestDialogActivity"
android:exported="true"
- android:permission="android.permission.NETWORK_SETTINGS">
+ android:permission="android.permission.MAINLINE_WIFI_STACK">
<intent-filter>
<action android:name="com.android.settings.wifi.action.NETWORK_REQUEST" />
<category android:name="android.intent.category.DEFAULT" />
diff --git a/OWNERS b/OWNERS
index ccf8e81..e5b26dc 100644
--- a/OWNERS
+++ b/OWNERS
@@ -1,22 +1,19 @@
# Use this reviewer by default.
-pixel-sw-exp-reviews+gerrit@google.com
+android-settings-core-eng+gerrit@google.com
# People who can approve changes for submission
-asapperstein@google.com
-asargent@google.com
-dehboxturtle@google.com
-dhnishi@google.com
+chiujason@google.com
edgarwang@google.com
emilychuang@google.com
-jackqdyulei@google.com
-lindatseng@google.com
-mfritze@google.com
+millchen@google.com
rafftsai@google.com
+stanleytfwang@google.com
+sunnyshao@google.com
tmfang@google.com
-zhfan@google.com
+yantingyang@google.com
# Emergency approvers in case the above are not available
-miket@google.com
+zhfan@google.com
# Exempt resource files (because they are in a flat directory and too hard to manage via OWNERS)
per-file *.xml=*
diff --git a/res/anim/enrollment_fingerprint_background_1_path_animation.xml b/res/anim/enrollment_fingerprint_background_1_path_animation.xml
index aed30c0..60654fc 100644
--- a/res/anim/enrollment_fingerprint_background_1_path_animation.xml
+++ b/res/anim/enrollment_fingerprint_background_1_path_animation.xml
@@ -23,14 +23,12 @@
android:propertyName="fillColor"
android:valueFrom="#000000"
android:valueTo="#4285F4"
- android:valueType="intType"
android:interpolator="@android:interpolator/linear_out_slow_in" />
<objectAnimator
android:duration="300"
android:propertyName="fillAlpha"
- android:valueFrom="0.07f"
- android:valueTo="0.65f"
- android:valueType="floatType" />
+ android:valueFrom="0.07"
+ android:valueTo="0.65" />
</set>
<set
android:ordering="together" >
@@ -39,13 +37,11 @@
android:propertyName="fillColor"
android:valueFrom="#4285F4"
android:valueTo="#000000"
- android:valueType="intType"
android:interpolator="@android:interpolator/fast_out_slow_in" />
<objectAnimator
android:duration="300"
android:propertyName="fillAlpha"
- android:valueFrom="0.65f"
- android:valueTo="0.07f"
- android:valueType="floatType" />
+ android:valueFrom="0.65"
+ android:valueTo="0.07" />
</set>
</set>
diff --git a/res/anim/enrollment_fingerprint_background_2_path_animation.xml b/res/anim/enrollment_fingerprint_background_2_path_animation.xml
index aed30c0..60654fc 100644
--- a/res/anim/enrollment_fingerprint_background_2_path_animation.xml
+++ b/res/anim/enrollment_fingerprint_background_2_path_animation.xml
@@ -23,14 +23,12 @@
android:propertyName="fillColor"
android:valueFrom="#000000"
android:valueTo="#4285F4"
- android:valueType="intType"
android:interpolator="@android:interpolator/linear_out_slow_in" />
<objectAnimator
android:duration="300"
android:propertyName="fillAlpha"
- android:valueFrom="0.07f"
- android:valueTo="0.65f"
- android:valueType="floatType" />
+ android:valueFrom="0.07"
+ android:valueTo="0.65" />
</set>
<set
android:ordering="together" >
@@ -39,13 +37,11 @@
android:propertyName="fillColor"
android:valueFrom="#4285F4"
android:valueTo="#000000"
- android:valueType="intType"
android:interpolator="@android:interpolator/fast_out_slow_in" />
<objectAnimator
android:duration="300"
android:propertyName="fillAlpha"
- android:valueFrom="0.65f"
- android:valueTo="0.07f"
- android:valueType="floatType" />
+ android:valueFrom="0.65"
+ android:valueTo="0.07" />
</set>
</set>
diff --git a/res/anim/enrollment_fingerprint_background_5_path_animation.xml b/res/anim/enrollment_fingerprint_background_5_path_animation.xml
index aed30c0..60654fc 100644
--- a/res/anim/enrollment_fingerprint_background_5_path_animation.xml
+++ b/res/anim/enrollment_fingerprint_background_5_path_animation.xml
@@ -23,14 +23,12 @@
android:propertyName="fillColor"
android:valueFrom="#000000"
android:valueTo="#4285F4"
- android:valueType="intType"
android:interpolator="@android:interpolator/linear_out_slow_in" />
<objectAnimator
android:duration="300"
android:propertyName="fillAlpha"
- android:valueFrom="0.07f"
- android:valueTo="0.65f"
- android:valueType="floatType" />
+ android:valueFrom="0.07"
+ android:valueTo="0.65" />
</set>
<set
android:ordering="together" >
@@ -39,13 +37,11 @@
android:propertyName="fillColor"
android:valueFrom="#4285F4"
android:valueTo="#000000"
- android:valueType="intType"
android:interpolator="@android:interpolator/fast_out_slow_in" />
<objectAnimator
android:duration="300"
android:propertyName="fillAlpha"
- android:valueFrom="0.65f"
- android:valueTo="0.07f"
- android:valueType="floatType" />
+ android:valueFrom="0.65"
+ android:valueTo="0.07" />
</set>
</set>
diff --git a/res/anim/enrollment_fingerprint_background_6_path_animation.xml b/res/anim/enrollment_fingerprint_background_6_path_animation.xml
index aed30c0..60654fc 100644
--- a/res/anim/enrollment_fingerprint_background_6_path_animation.xml
+++ b/res/anim/enrollment_fingerprint_background_6_path_animation.xml
@@ -23,14 +23,12 @@
android:propertyName="fillColor"
android:valueFrom="#000000"
android:valueTo="#4285F4"
- android:valueType="intType"
android:interpolator="@android:interpolator/linear_out_slow_in" />
<objectAnimator
android:duration="300"
android:propertyName="fillAlpha"
- android:valueFrom="0.07f"
- android:valueTo="0.65f"
- android:valueType="floatType" />
+ android:valueFrom="0.07"
+ android:valueTo="0.65" />
</set>
<set
android:ordering="together" >
@@ -39,13 +37,11 @@
android:propertyName="fillColor"
android:valueFrom="#4285F4"
android:valueTo="#000000"
- android:valueType="intType"
android:interpolator="@android:interpolator/fast_out_slow_in" />
<objectAnimator
android:duration="300"
android:propertyName="fillAlpha"
- android:valueFrom="0.65f"
- android:valueTo="0.07f"
- android:valueType="floatType" />
+ android:valueFrom="0.65"
+ android:valueTo="0.07" />
</set>
</set>
diff --git a/res/anim/enrollment_fingerprint_background_7_path_animation.xml b/res/anim/enrollment_fingerprint_background_7_path_animation.xml
index aed30c0..60654fc 100644
--- a/res/anim/enrollment_fingerprint_background_7_path_animation.xml
+++ b/res/anim/enrollment_fingerprint_background_7_path_animation.xml
@@ -23,14 +23,12 @@
android:propertyName="fillColor"
android:valueFrom="#000000"
android:valueTo="#4285F4"
- android:valueType="intType"
android:interpolator="@android:interpolator/linear_out_slow_in" />
<objectAnimator
android:duration="300"
android:propertyName="fillAlpha"
- android:valueFrom="0.07f"
- android:valueTo="0.65f"
- android:valueType="floatType" />
+ android:valueFrom="0.07"
+ android:valueTo="0.65" />
</set>
<set
android:ordering="together" >
@@ -39,13 +37,11 @@
android:propertyName="fillColor"
android:valueFrom="#4285F4"
android:valueTo="#000000"
- android:valueType="intType"
android:interpolator="@android:interpolator/fast_out_slow_in" />
<objectAnimator
android:duration="300"
android:propertyName="fillAlpha"
- android:valueFrom="0.65f"
- android:valueTo="0.07f"
- android:valueType="floatType" />
+ android:valueFrom="0.65"
+ android:valueTo="0.07" />
</set>
</set>
diff --git a/res/drawable-hdpi/ic_menu_refresh_holo_dark.png b/res/drawable-hdpi/ic_menu_refresh_holo_dark.png
deleted file mode 100644
index 69ac31b..0000000
--- a/res/drawable-hdpi/ic_menu_refresh_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_network_signal_0.png b/res/drawable-hdpi/ic_network_signal_0.png
deleted file mode 100644
index 1629ae6..0000000
--- a/res/drawable-hdpi/ic_network_signal_0.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_network_signal_1.png b/res/drawable-hdpi/ic_network_signal_1.png
deleted file mode 100644
index 162ade2..0000000
--- a/res/drawable-hdpi/ic_network_signal_1.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_network_signal_2.png b/res/drawable-hdpi/ic_network_signal_2.png
deleted file mode 100644
index d91273c..0000000
--- a/res/drawable-hdpi/ic_network_signal_2.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_network_signal_3.png b/res/drawable-hdpi/ic_network_signal_3.png
deleted file mode 100644
index 5634bc9..0000000
--- a/res/drawable-hdpi/ic_network_signal_3.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_network_signal_4.png b/res/drawable-hdpi/ic_network_signal_4.png
deleted file mode 100644
index 0588950..0000000
--- a/res/drawable-hdpi/ic_network_signal_4.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_power_system.png b/res/drawable-hdpi/ic_power_system.png
deleted file mode 100644
index 3592466..0000000
--- a/res/drawable-hdpi/ic_power_system.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_settings_cell_standby.png b/res/drawable-hdpi/ic_settings_cell_standby.png
deleted file mode 100644
index 7d51c80..0000000
--- a/res/drawable-hdpi/ic_settings_cell_standby.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_settings_development_alpha.png b/res/drawable-hdpi/ic_settings_development_alpha.png
deleted file mode 100644
index 44cfb57..0000000
--- a/res/drawable-hdpi/ic_settings_development_alpha.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_settings_nfc_payment_am_alpha.png b/res/drawable-hdpi/ic_settings_nfc_payment_am_alpha.png
deleted file mode 100644
index 0a71416..0000000
--- a/res/drawable-hdpi/ic_settings_nfc_payment_am_alpha.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_settings_phone_idle.png b/res/drawable-hdpi/ic_settings_phone_idle.png
deleted file mode 100644
index 6ae7f5e..0000000
--- a/res/drawable-hdpi/ic_settings_phone_idle.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_settings_voice_calls.png b/res/drawable-hdpi/ic_settings_voice_calls.png
deleted file mode 100644
index b3cefda..0000000
--- a/res/drawable-hdpi/ic_settings_voice_calls.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_sim_card_alert_white_48dp.png b/res/drawable-hdpi/ic_sim_card_alert_white_48dp.png
deleted file mode 100644
index c8fbf42..0000000
--- a/res/drawable-hdpi/ic_sim_card_alert_white_48dp.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_sync_grey_holo.png b/res/drawable-hdpi/ic_sync_grey_holo.png
deleted file mode 100644
index ff927e9..0000000
--- a/res/drawable-hdpi/ic_sync_grey_holo.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_sync_red_holo.png b/res/drawable-hdpi/ic_sync_red_holo.png
deleted file mode 100644
index f7949ae..0000000
--- a/res/drawable-hdpi/ic_sync_red_holo.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-ldrtl-hdpi/ic_network_signal_0.png b/res/drawable-ldrtl-hdpi/ic_network_signal_0.png
deleted file mode 100644
index 54e7af9..0000000
--- a/res/drawable-ldrtl-hdpi/ic_network_signal_0.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-ldrtl-hdpi/ic_network_signal_1.png b/res/drawable-ldrtl-hdpi/ic_network_signal_1.png
deleted file mode 100644
index de959d5..0000000
--- a/res/drawable-ldrtl-hdpi/ic_network_signal_1.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-ldrtl-hdpi/ic_network_signal_2.png b/res/drawable-ldrtl-hdpi/ic_network_signal_2.png
deleted file mode 100644
index 097b9fb..0000000
--- a/res/drawable-ldrtl-hdpi/ic_network_signal_2.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-ldrtl-hdpi/ic_network_signal_3.png b/res/drawable-ldrtl-hdpi/ic_network_signal_3.png
deleted file mode 100644
index 11cb40b..0000000
--- a/res/drawable-ldrtl-hdpi/ic_network_signal_3.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-ldrtl-hdpi/ic_network_signal_4.png b/res/drawable-ldrtl-hdpi/ic_network_signal_4.png
deleted file mode 100644
index d741ffc..0000000
--- a/res/drawable-ldrtl-hdpi/ic_network_signal_4.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-ldrtl-mdpi/ic_network_signal_0.png b/res/drawable-ldrtl-mdpi/ic_network_signal_0.png
deleted file mode 100644
index 4cac9ed..0000000
--- a/res/drawable-ldrtl-mdpi/ic_network_signal_0.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-ldrtl-mdpi/ic_network_signal_1.png b/res/drawable-ldrtl-mdpi/ic_network_signal_1.png
deleted file mode 100644
index 9323a13..0000000
--- a/res/drawable-ldrtl-mdpi/ic_network_signal_1.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-ldrtl-mdpi/ic_network_signal_2.png b/res/drawable-ldrtl-mdpi/ic_network_signal_2.png
deleted file mode 100644
index e2f38a9..0000000
--- a/res/drawable-ldrtl-mdpi/ic_network_signal_2.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-ldrtl-mdpi/ic_network_signal_3.png b/res/drawable-ldrtl-mdpi/ic_network_signal_3.png
deleted file mode 100644
index b565289..0000000
--- a/res/drawable-ldrtl-mdpi/ic_network_signal_3.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-ldrtl-mdpi/ic_network_signal_4.png b/res/drawable-ldrtl-mdpi/ic_network_signal_4.png
deleted file mode 100644
index f63a426..0000000
--- a/res/drawable-ldrtl-mdpi/ic_network_signal_4.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-ldrtl-xhdpi/ic_network_signal_0.png b/res/drawable-ldrtl-xhdpi/ic_network_signal_0.png
deleted file mode 100644
index e4ec015..0000000
--- a/res/drawable-ldrtl-xhdpi/ic_network_signal_0.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-ldrtl-xhdpi/ic_network_signal_1.png b/res/drawable-ldrtl-xhdpi/ic_network_signal_1.png
deleted file mode 100644
index 712685a..0000000
--- a/res/drawable-ldrtl-xhdpi/ic_network_signal_1.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-ldrtl-xhdpi/ic_network_signal_2.png b/res/drawable-ldrtl-xhdpi/ic_network_signal_2.png
deleted file mode 100644
index 99fe1ac..0000000
--- a/res/drawable-ldrtl-xhdpi/ic_network_signal_2.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-ldrtl-xhdpi/ic_network_signal_3.png b/res/drawable-ldrtl-xhdpi/ic_network_signal_3.png
deleted file mode 100644
index 4ac2f10..0000000
--- a/res/drawable-ldrtl-xhdpi/ic_network_signal_3.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-ldrtl-xhdpi/ic_network_signal_4.png b/res/drawable-ldrtl-xhdpi/ic_network_signal_4.png
deleted file mode 100644
index 34608f1..0000000
--- a/res/drawable-ldrtl-xhdpi/ic_network_signal_4.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_menu_refresh_holo_dark.png b/res/drawable-mdpi/ic_menu_refresh_holo_dark.png
deleted file mode 100644
index f68aacf..0000000
--- a/res/drawable-mdpi/ic_menu_refresh_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_network_signal_0.png b/res/drawable-mdpi/ic_network_signal_0.png
deleted file mode 100644
index a1b8431..0000000
--- a/res/drawable-mdpi/ic_network_signal_0.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_network_signal_1.png b/res/drawable-mdpi/ic_network_signal_1.png
deleted file mode 100644
index cc6179d..0000000
--- a/res/drawable-mdpi/ic_network_signal_1.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_network_signal_2.png b/res/drawable-mdpi/ic_network_signal_2.png
deleted file mode 100644
index 1373fb6..0000000
--- a/res/drawable-mdpi/ic_network_signal_2.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_network_signal_3.png b/res/drawable-mdpi/ic_network_signal_3.png
deleted file mode 100644
index 14468eb..0000000
--- a/res/drawable-mdpi/ic_network_signal_3.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_network_signal_4.png b/res/drawable-mdpi/ic_network_signal_4.png
deleted file mode 100644
index 43cdf26..0000000
--- a/res/drawable-mdpi/ic_network_signal_4.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_power_system.png b/res/drawable-mdpi/ic_power_system.png
deleted file mode 100644
index f9813d9..0000000
--- a/res/drawable-mdpi/ic_power_system.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_settings_cell_standby.png b/res/drawable-mdpi/ic_settings_cell_standby.png
deleted file mode 100644
index c922222..0000000
--- a/res/drawable-mdpi/ic_settings_cell_standby.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_settings_development_alpha.png b/res/drawable-mdpi/ic_settings_development_alpha.png
deleted file mode 100644
index cdc3ffe..0000000
--- a/res/drawable-mdpi/ic_settings_development_alpha.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_settings_nfc_payment_am_alpha.png b/res/drawable-mdpi/ic_settings_nfc_payment_am_alpha.png
deleted file mode 100644
index 1a66a30..0000000
--- a/res/drawable-mdpi/ic_settings_nfc_payment_am_alpha.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_settings_phone_idle.png b/res/drawable-mdpi/ic_settings_phone_idle.png
deleted file mode 100644
index 92b4b0a..0000000
--- a/res/drawable-mdpi/ic_settings_phone_idle.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_settings_voice_calls.png b/res/drawable-mdpi/ic_settings_voice_calls.png
deleted file mode 100644
index 9277295..0000000
--- a/res/drawable-mdpi/ic_settings_voice_calls.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_sim_card_alert_white_48dp.png b/res/drawable-mdpi/ic_sim_card_alert_white_48dp.png
deleted file mode 100644
index 18cd7f9..0000000
--- a/res/drawable-mdpi/ic_sim_card_alert_white_48dp.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_sync_grey_holo.png b/res/drawable-mdpi/ic_sync_grey_holo.png
deleted file mode 100644
index 822fa20..0000000
--- a/res/drawable-mdpi/ic_sync_grey_holo.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_sync_red_holo.png b/res/drawable-mdpi/ic_sync_red_holo.png
deleted file mode 100644
index 2fd7ae1..0000000
--- a/res/drawable-mdpi/ic_sync_red_holo.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_menu_refresh_holo_dark.png b/res/drawable-xhdpi/ic_menu_refresh_holo_dark.png
deleted file mode 100644
index 3db90ee..0000000
--- a/res/drawable-xhdpi/ic_menu_refresh_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_network_signal_0.png b/res/drawable-xhdpi/ic_network_signal_0.png
deleted file mode 100644
index b609ecf..0000000
--- a/res/drawable-xhdpi/ic_network_signal_0.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_network_signal_1.png b/res/drawable-xhdpi/ic_network_signal_1.png
deleted file mode 100644
index 854921f..0000000
--- a/res/drawable-xhdpi/ic_network_signal_1.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_network_signal_2.png b/res/drawable-xhdpi/ic_network_signal_2.png
deleted file mode 100644
index 3db4ce6..0000000
--- a/res/drawable-xhdpi/ic_network_signal_2.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_network_signal_3.png b/res/drawable-xhdpi/ic_network_signal_3.png
deleted file mode 100644
index 18003e5..0000000
--- a/res/drawable-xhdpi/ic_network_signal_3.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_network_signal_4.png b/res/drawable-xhdpi/ic_network_signal_4.png
deleted file mode 100644
index 304108f..0000000
--- a/res/drawable-xhdpi/ic_network_signal_4.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_power_system.png b/res/drawable-xhdpi/ic_power_system.png
deleted file mode 100644
index 8671616..0000000
--- a/res/drawable-xhdpi/ic_power_system.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_settings_cell_standby.png b/res/drawable-xhdpi/ic_settings_cell_standby.png
deleted file mode 100644
index a02b5a2..0000000
--- a/res/drawable-xhdpi/ic_settings_cell_standby.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_settings_development_alpha.png b/res/drawable-xhdpi/ic_settings_development_alpha.png
deleted file mode 100644
index 3a4b3d9..0000000
--- a/res/drawable-xhdpi/ic_settings_development_alpha.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_settings_nfc_payment_am_alpha.png b/res/drawable-xhdpi/ic_settings_nfc_payment_am_alpha.png
deleted file mode 100644
index 9aa2fd2..0000000
--- a/res/drawable-xhdpi/ic_settings_nfc_payment_am_alpha.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_settings_phone_idle.png b/res/drawable-xhdpi/ic_settings_phone_idle.png
deleted file mode 100644
index 1f8bd65..0000000
--- a/res/drawable-xhdpi/ic_settings_phone_idle.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_settings_voice_calls.png b/res/drawable-xhdpi/ic_settings_voice_calls.png
deleted file mode 100644
index fac4916..0000000
--- a/res/drawable-xhdpi/ic_settings_voice_calls.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_sim_card_alert_white_48dp.png b/res/drawable-xhdpi/ic_sim_card_alert_white_48dp.png
deleted file mode 100644
index 6d983b7..0000000
--- a/res/drawable-xhdpi/ic_sim_card_alert_white_48dp.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_sync_grey_holo.png b/res/drawable-xhdpi/ic_sync_grey_holo.png
deleted file mode 100644
index 9b4662c..0000000
--- a/res/drawable-xhdpi/ic_sync_grey_holo.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_sync_red_holo.png b/res/drawable-xhdpi/ic_sync_red_holo.png
deleted file mode 100644
index a9e2b8c..0000000
--- a/res/drawable-xhdpi/ic_sync_red_holo.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_network_signal_4.png b/res/drawable-xxhdpi/ic_network_signal_4.png
deleted file mode 100644
index dafe7c4..0000000
--- a/res/drawable-xxhdpi/ic_network_signal_4.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_power_system.png b/res/drawable-xxhdpi/ic_power_system.png
deleted file mode 100644
index 8d4979f..0000000
--- a/res/drawable-xxhdpi/ic_power_system.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_settings_cell_standby.png b/res/drawable-xxhdpi/ic_settings_cell_standby.png
deleted file mode 100644
index 07d5c85..0000000
--- a/res/drawable-xxhdpi/ic_settings_cell_standby.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_settings_development_alpha.png b/res/drawable-xxhdpi/ic_settings_development_alpha.png
deleted file mode 100644
index fc23084..0000000
--- a/res/drawable-xxhdpi/ic_settings_development_alpha.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_settings_nfc_payment_am_alpha.png b/res/drawable-xxhdpi/ic_settings_nfc_payment_am_alpha.png
deleted file mode 100644
index 6e09248..0000000
--- a/res/drawable-xxhdpi/ic_settings_nfc_payment_am_alpha.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_settings_phone_idle.png b/res/drawable-xxhdpi/ic_settings_phone_idle.png
deleted file mode 100644
index a6fe868..0000000
--- a/res/drawable-xxhdpi/ic_settings_phone_idle.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_settings_voice_calls.png b/res/drawable-xxhdpi/ic_settings_voice_calls.png
deleted file mode 100644
index 78e4483..0000000
--- a/res/drawable-xxhdpi/ic_settings_voice_calls.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_sim_card_alert_white_48dp.png b/res/drawable-xxhdpi/ic_sim_card_alert_white_48dp.png
deleted file mode 100644
index 6c8dd1f..0000000
--- a/res/drawable-xxhdpi/ic_sim_card_alert_white_48dp.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_sync_grey_holo.png b/res/drawable-xxhdpi/ic_sync_grey_holo.png
deleted file mode 100644
index 3b933be..0000000
--- a/res/drawable-xxhdpi/ic_sync_grey_holo.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_sync_red_holo.png b/res/drawable-xxhdpi/ic_sync_red_holo.png
deleted file mode 100644
index 9144709..0000000
--- a/res/drawable-xxhdpi/ic_sync_red_holo.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_network_signal_4.png b/res/drawable-xxxhdpi/ic_network_signal_4.png
deleted file mode 100644
index 622cc4c..0000000
--- a/res/drawable-xxxhdpi/ic_network_signal_4.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_power_system.png b/res/drawable-xxxhdpi/ic_power_system.png
deleted file mode 100644
index bc92e90..0000000
--- a/res/drawable-xxxhdpi/ic_power_system.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_settings_cell_standby.png b/res/drawable-xxxhdpi/ic_settings_cell_standby.png
deleted file mode 100644
index 3c864ce..0000000
--- a/res/drawable-xxxhdpi/ic_settings_cell_standby.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_settings_development_alpha.png b/res/drawable-xxxhdpi/ic_settings_development_alpha.png
deleted file mode 100644
index 47f4547..0000000
--- a/res/drawable-xxxhdpi/ic_settings_development_alpha.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_settings_nfc_payment_am_alpha.png b/res/drawable-xxxhdpi/ic_settings_nfc_payment_am_alpha.png
deleted file mode 100644
index 6c29a53..0000000
--- a/res/drawable-xxxhdpi/ic_settings_nfc_payment_am_alpha.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_settings_phone_idle.png b/res/drawable-xxxhdpi/ic_settings_phone_idle.png
deleted file mode 100644
index 4851676..0000000
--- a/res/drawable-xxxhdpi/ic_settings_phone_idle.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_settings_voice_calls.png b/res/drawable-xxxhdpi/ic_settings_voice_calls.png
deleted file mode 100644
index 633cfc1..0000000
--- a/res/drawable-xxxhdpi/ic_settings_voice_calls.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_sim_card_alert_white_48dp.png b/res/drawable-xxxhdpi/ic_sim_card_alert_white_48dp.png
deleted file mode 100644
index e8b6667..0000000
--- a/res/drawable-xxxhdpi/ic_sim_card_alert_white_48dp.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_sync_grey_holo.png b/res/drawable-xxxhdpi/ic_sync_grey_holo.png
deleted file mode 100644
index 7cff102..0000000
--- a/res/drawable-xxxhdpi/ic_sync_grey_holo.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_sync_red_holo.png b/res/drawable-xxxhdpi/ic_sync_red_holo.png
deleted file mode 100644
index 115bb7a..0000000
--- a/res/drawable-xxxhdpi/ic_sync_red_holo.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable/ic_check_circle_green.xml b/res/drawable/ic_check_circle_green.xml
index 214d2cf..1c42607 100644
--- a/res/drawable/ic_check_circle_green.xml
+++ b/res/drawable/ic_check_circle_green.xml
@@ -15,8 +15,8 @@
-->
<vector
xmlns:android="http://schemas.android.com/apk/res/android"
- android:width="24dp"
- android:height="24dp"
+ android:width="16dp"
+ android:height="16dp"
android:viewportWidth="64.0"
android:viewportHeight="64.0">
<path
diff --git a/res/drawable/ic_devices_check_circle_green.xml b/res/drawable/ic_devices_check_circle_green_32dp.xml
similarity index 76%
rename from res/drawable/ic_devices_check_circle_green.xml
rename to res/drawable/ic_devices_check_circle_green_32dp.xml
index 71c683b..b964b15 100644
--- a/res/drawable/ic_devices_check_circle_green.xml
+++ b/res/drawable/ic_devices_check_circle_green_32dp.xml
@@ -16,15 +16,15 @@
<layer-list
xmlns:android="http://schemas.android.com/apk/res/android">
<item
- android:drawable="@drawable/ic_devices_other_opaque_black"
- android:width="@dimen/wifi_dpp_fragment_icon_width_height"
- android:height="@dimen/wifi_dpp_fragment_icon_width_height"
+ android:drawable="@drawable/ic_devices_other_32dp"
+ android:width="40dp"
+ android:height="40dp"
android:gravity="center"/>
<item
android:drawable="@drawable/ic_check_circle_green"
- android:top="28dp"
- android:left="44dp"
+ android:top="16dp"
+ android:left="32dp"
android:gravity="center"/>
</layer-list>
diff --git a/res/drawable/ic_devices_other_opaque_black.xml b/res/drawable/ic_devices_other_32dp.xml
similarity index 92%
rename from res/drawable/ic_devices_other_opaque_black.xml
rename to res/drawable/ic_devices_other_32dp.xml
index 40cf527..7f9df8c 100644
--- a/res/drawable/ic_devices_other_opaque_black.xml
+++ b/res/drawable/ic_devices_other_32dp.xml
@@ -14,9 +14,9 @@
limitations under the License.
-->
<vector xmlns:android="http://schemas.android.com/apk/res/android"
- android:width="24dp"
- android:height="24dp"
- android:tint="@android:color/black"
+ android:width="32dp"
+ android:height="32dp"
+ android:tint="?android:attr/colorAccent"
android:viewportWidth="24"
android:viewportHeight="24">
<path
diff --git a/res/drawable/ic_power_system.xml b/res/drawable/ic_power_system.xml
new file mode 100644
index 0000000..3b84f59
--- /dev/null
+++ b/res/drawable/ic_power_system.xml
@@ -0,0 +1,26 @@
+<!--
+ 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.
+-->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24.0"
+ android:viewportHeight="24.0"
+ android:tint="?android:attr/colorControlNormal">
+ <path
+ android:fillColor="#000000"
+ android:pathData="M6,18c0,0.55 0.45,1 1,1h1v3.5c0,0.83 0.67,1.5 1.5,1.5s1.5,-0.67 1.5,-1.5L11,19h2v3.5c0,0.83 0.67,1.5 1.5,1.5s1.5,-0.67 1.5,-1.5L16,19h1c0.55,0 1,-0.45 1,-1L18,8L6,8v10zM3.5,8C2.67,8 2,8.67 2,9.5v7c0,0.83 0.67,1.5 1.5,1.5S5,17.33 5,16.5v-7C5,8.67 4.33,8 3.5,8zM20.5,8c-0.83,0 -1.5,0.67 -1.5,1.5v7c0,0.83 0.67,1.5 1.5,1.5s1.5,-0.67 1.5,-1.5v-7c0,-0.83 -0.67,-1.5 -1.5,-1.5zM15.53,2.16l1.3,-1.3c0.2,-0.2 0.2,-0.51 0,-0.71 -0.2,-0.2 -0.51,-0.2 -0.71,0l-1.48,1.48C13.85,1.23 12.95,1 12,1c-0.96,0 -1.86,0.23 -2.66,0.63L7.85,0.15c-0.2,-0.2 -0.51,-0.2 -0.71,0 -0.2,0.2 -0.2,0.51 0,0.71l1.31,1.31C6.97,3.26 6,5.01 6,7h12c0,-1.99 -0.97,-3.75 -2.47,-4.84zM10,5L9,5L9,4h1v1zM15,5h-1L14,4h1v1z"/>
+</vector>
diff --git a/res/drawable/ic_qrcode_32dp.xml b/res/drawable/ic_qrcode_32dp.xml
new file mode 100644
index 0000000..512d44e
--- /dev/null
+++ b/res/drawable/ic_qrcode_32dp.xml
@@ -0,0 +1,25 @@
+<!--
+ 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.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="32dp"
+ android:height="32dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24"
+ android:tint="?android:attr/colorAccent">
+ <path
+ android:fillColor="#FF000000"
+ android:pathData="M3,9h6V3H3V9zM5,5h2v2H5V5zM15,3v6h6V3H15zM19,7h-2V5h2V7zM3,21h6v-6H3V21zM5,17h2v2H5V17zM13,15v2h-2v-2v-2v-2h2v2h2v-2h2v2v2H13zM17,19h4v2h-4h-2v-2v-2h2V19zM19,11h2v6h-2V11zM7,11h2v2H7V11zM11,19h2v2h-2V19zM5,13H3v-2h2V13zM13,9h-2V3h2V9z"/>
+</vector>
diff --git a/res/drawable/ic_scan_32dp.xml b/res/drawable/ic_scan_32dp.xml
new file mode 100644
index 0000000..d1eda4f
--- /dev/null
+++ b/res/drawable/ic_scan_32dp.xml
@@ -0,0 +1,25 @@
+<!--
+ 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.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="32dp"
+ android:height="32dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24"
+ android:tint="?android:attr/colorAccent">
+ <path
+ android:fillColor="#FF000000"
+ android:pathData="M3,9h6V3H3V9zM5,5h2v2H5V5zM15,3v6h6V3H15zM19,7h-2V5h2V7zM3,21h6v-6H3V21zM5,17h2v2H5V17zM17,15h4v2h-4v4h-2v-4h-4v-2h4v-4h2V15zM7,11h2v2H7V11zM5,13H3v-2h2V13zM13,9h-2V3h2V9z"/>
+</vector>
diff --git a/res/drawable/ic_settings_cell_standby.xml b/res/drawable/ic_settings_cell_standby.xml
new file mode 100644
index 0000000..5a9a300
--- /dev/null
+++ b/res/drawable/ic_settings_cell_standby.xml
@@ -0,0 +1,27 @@
+<?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.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24"
+ android:tint="?android:attr/colorControlNormal">
+ <path
+ android:pathData="m11.986,12.0357c5.4299,-5.4312 9.9013,-9.875 9.9363,-9.875 0.035,0 0.0637,4.4437 0.0637,9.875v9.875L12.0497,21.9107 2.1134,21.9107ZM19.986,13.3522L19.986,6.7936l-3,2.9922 -3,2.9922v3.5664,3.5664h3,3z"
+ android:strokeWidth="0.25"
+ android:fillColor="#000000"/>
+</vector>
diff --git a/res/drawable/ic_settings_development.xml b/res/drawable/ic_settings_development.xml
index 211b3a2..a6577b4 100644
--- a/res/drawable/ic_settings_development.xml
+++ b/res/drawable/ic_settings_development.xml
@@ -15,7 +15,14 @@
limitations under the License.
-->
-<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
- android:src="@drawable/ic_settings_development_alpha"
- android:tint="?android:attr/colorControlNormal" />
-
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24"
+ android:tint="?android:attr/colorControlNormal">
+ <path
+ android:pathData="m4.3301,20.7553c-0.9663,-0.9663 -0.9968,-1.0933 -0.9968,-4.1483 0,-3.2625 -0.1683,-3.7057 -1.5,-3.9507C0.6808,12.4444 0.8254,11.2374 2.0688,10.6903l1.0978,-0.483 0.1667,-3.2801c0.1577,-3.1043 0.218,-3.3242 1.1232,-4.1016 1.1668,-1.0022 2.7101,-0.9771 2.7101,0.0439 0,0.3936 -0.3717,0.8403 -0.9167,1.1015 -0.8964,0.4296 -0.9167,0.5037 -0.9167,3.347 0,2.0922 -0.1455,3.1154 -0.5189,3.6485 -0.4696,0.6705 -0.4696,0.8112 0,1.4817 0.3796,0.542 0.5189,1.5755 0.5189,3.8507v3.1098l1.0181,0.3549c0.7672,0.2674 0.9931,0.5301 0.9167,1.066 -0.1664,1.1666 -1.7368,1.127 -2.9379,-0.0742zM16.8889,21.485c-0.5444,-0.5444 -0.1586,-1.4014 0.7778,-1.7278l1,-0.3486v-3.1098c0,-2.2752 0.1393,-3.3087 0.5189,-3.8507 0.4696,-0.6705 0.4696,-0.8112 0,-1.4817 -0.3734,-0.5331 -0.5189,-1.5563 -0.5189,-3.6485 0,-2.8432 -0.0203,-2.9174 -0.9167,-3.347 -0.5449,-0.2612 -0.9167,-0.7079 -0.9167,-1.1015 0,-1.0211 1.5433,-1.0461 2.7101,-0.0439 0.9052,0.7775 0.9655,0.9974 1.1232,4.1016l0.1667,3.2801 1.0978,0.483c1.2434,0.5471 1.388,1.7541 0.2355,1.9661 -1.3317,0.2449 -1.5,0.6881 -1.5,3.9507 0,3.0388 -0.0349,3.1863 -0.9744,4.1259 -0.9044,0.9044 -2.2817,1.2739 -2.8034,0.7521z"
+ android:strokeWidth="0.33333334"
+ android:fillColor="#000000"/>
+</vector>
diff --git a/res/drawable/ic_settings_nfc_payment.xml b/res/drawable/ic_settings_nfc_payment.xml
index 555a6b4..f7fb288 100644
--- a/res/drawable/ic_settings_nfc_payment.xml
+++ b/res/drawable/ic_settings_nfc_payment.xml
@@ -14,9 +14,16 @@
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"
+ android:tint="?android:attr/colorControlNormal">
+ <path
+ android:pathData="M4.7422,21.6746C4.6047,21.6205 4.1754,21.5061 3.7882,21.4204 2.4797,21.1309 2.3672,20.3896 2.3672,12.0568c0,-4.1205 0.1047,-7.7672 0.2328,-8.104 0.3419,-0.8993 2.1763,-1.2692 5.5101,-1.1111 2.904,0.1376 3.6549,0.3894 4.0191,1.3473 0.3107,0.8173 0.3107,15.3698 0,16.187 -0.1309,0.3443 -0.4965,0.7667 -0.8125,0.9385 -0.5355,0.2912 -5.9905,0.59 -6.5745,0.3601zM7.7422,20.2791c0,-0.5359 -0.7264,-0.4585 -0.8318,0.0886 -0.0643,0.3341 0.0375,0.4359 0.3716,0.3716 0.2531,-0.0487 0.4602,-0.2558 0.4602,-0.4602zM11.6172,11.5325v-6.5h-4.25,-4.25v6.5,6.5h4.25,4.25zM19.8405,17.0325c-0.3665,-0.2142 -0.3618,-0.3503 0.0543,-1.5549 0.596,-1.7254 0.5957,-4.4158 -0.0008,-6.1426C19.4486,8.0455 19.449,8.0063 19.9096,7.7597c0.4018,-0.215 0.5258,-0.1249 0.8301,0.6034 0.9392,2.2477 0.941,5.8365 0.0042,8.0787 -0.3921,0.9385 -0.3526,0.9127 -0.9034,0.5907zM17.4039,15.5602c-0.2801,-0.1773 -0.2823,-0.3164 -0.0128,-0.8084 0.4184,-0.7639 0.4225,-3.9174 0.0061,-4.6773 -0.2754,-0.5026 -0.2564,-0.63 0.1378,-0.9241 0.4109,-0.3066 0.492,-0.2601 0.8001,0.458 0.5034,1.1735 0.6184,3.6213 0.2304,4.9051 -0.3526,1.1669 -0.608,1.3971 -1.1615,1.0467zM15.0728,14.2726c-0.3388,-0.1977 -0.3753,-0.3984 -0.1901,-1.0443 0.1384,-0.4825 0.139,-1.1267 0.0016,-1.6244 -0.1944,-0.7041 -0.1543,-0.8642 0.274,-1.0934 0.276,-0.1477 0.5582,-0.2121 0.6272,-0.1431 0.2664,0.2664 0.5519,2.0703 0.4219,2.6651 -0.3596,1.6447 -0.388,1.6757 -1.1346,1.2401z"
+ android:strokeWidth="0.25"
+ android:fillColor="#000000"/>
+</vector>
-<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
- android:src="@drawable/ic_settings_nfc_payment_am_alpha"
- android:tint="?android:attr/colorControlNormal"
- android:autoMirrored="true" />
diff --git a/res/drawable/ic_settings_sync_disabled.xml b/res/drawable/ic_settings_sync_disabled.xml
new file mode 100644
index 0000000..7dd71c7
--- /dev/null
+++ b/res/drawable/ic_settings_sync_disabled.xml
@@ -0,0 +1,27 @@
+<!--
+ 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.
+-->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24"
+ android:tint="?android:attr/colorControlNormal">
+ <path
+ android:fillColor="#FF000000"
+ android:pathData="M19.78,22.61l-3.72,-3.72c-0.92,0.54 -1.95,0.91 -3.05,1.05v-2.02c0.56,-0.09 1.08,-0.28 1.57,-0.52L6.6,9.43c-0.38,0.78 -0.6,1.65 -0.6,2.57 0,2.22 1.21,4.15 3,5.19L9,14h2v6L5,20v-2h1.74C5.07,16.54 4,14.4 4,12c0,-1.48 0.41,-2.86 1.12,-4.05L1.39,4.22 2.8,2.81l18.38,18.38 -1.4,1.42zM15,6.81c1.79,1.04 3,2.97 3,5.19 0,0.92 -0.23,1.79 -0.6,2.57l1.49,1.49C19.59,14.87 20,13.48 20,12c0,-2.4 -1.07,-4.54 -2.74,-6L19,6L19,4h-6v6h2L15,6.81zM11,6.09L11,4.07c-1.11,0.14 -2.14,0.51 -3.05,1.05l1.49,1.49c0.49,-0.24 1.01,-0.43 1.56,-0.52z"/>
+</vector>
+
diff --git a/res/drawable/ic_settings_sync_failed.xml b/res/drawable/ic_settings_sync_failed.xml
new file mode 100644
index 0000000..8cb128a
--- /dev/null
+++ b/res/drawable/ic_settings_sync_failed.xml
@@ -0,0 +1,27 @@
+<!--
+ 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.
+-->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24"
+ android:tint="?android:attr/colorError">
+ <path
+ android:fillColor="#FF000000"
+ android:pathData="M11,4.07v2.02C8.17,6.57 6,9.03 6,12c0,2.22 1.21,4.15 3,5.19L9,14h2v6L5,20v-2h1.74C5.07,16.54 4,14.4 4,12c0,-4.08 3.05,-7.44 7,-7.93zM19.51,14.74c0.3,0.52 0.49,1.11 0.49,1.76 0,1.93 -1.57,3.5 -3.5,3.5 -0.65,0 -1.25,-0.19 -1.77,-0.49 -0.65,-0.38 -1.17,-0.96 -1.46,-1.67 -0.17,-0.41 -0.27,-0.87 -0.27,-1.34 0,-1.93 1.57,-3.5 3.5,-3.5 0.48,0 0.93,0.1 1.35,0.27 0.09,-0.41 0.15,-0.83 0.15,-1.27 0,-2.22 -1.21,-4.15 -3,-5.19L15,10h-2L13,4h6v2h-1.74C18.93,7.46 20,9.6 20,12c0,0.96 -0.18,1.89 -0.49,2.74zM17,18h-1v1h1v-1zM17,14h-1v3h1v-3z"/>
+</vector>
+
diff --git a/res/drawable/ic_sim_alert.xml b/res/drawable/ic_sim_alert.xml
new file mode 100644
index 0000000..ed9aa43
--- /dev/null
+++ b/res/drawable/ic_sim_alert.xml
@@ -0,0 +1,27 @@
+<!--
+ 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.
+ -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+ <path
+ android:pathData="m4.8578,21.8264c-0.2247,-0.137 -0.5206,-0.4329 -0.6575,-0.6575 -0.2399,-0.3935 -0.2491,-0.6433 -0.2495,-6.7995l-0.0005,-6.391 2.9757,-2.9776 2.9757,-2.9776 4.3876,0.0005c4.1571,0.0004 4.4091,0.0135 4.7961,0.2495 0.2247,0.137 0.5206,0.4329 0.6575,0.6575 0.2422,0.3972 0.2491,0.6479 0.2491,9.1192 0,8.4712 -0.007,8.7219 -0.2491,9.1191 -0.137,0.2247 -0.4329,0.5206 -0.6575,0.6575 -0.3942,0.2403 -0.6436,0.2491 -7.1138,0.2491 -6.4703,0 -6.7197,-0.009 -7.1138,-0.2491zM12.9743,16.0604v-1.0027h-1.0027,-1.0027v1.0027,1.0027h1.0027,1.0027zM12.9743,10.5457L12.9743,8.039h-1.0027,-1.0027v2.5067,2.5067h1.0027,1.0027z"
+ android:strokeWidth="0.12533334"
+ android:fillColor="#ffffff"/>
+</vector>
+
diff --git a/res/drawable/ic_wifi_signal_4_32dp.xml b/res/drawable/ic_wifi_signal_4_32dp.xml
new file mode 100644
index 0000000..64de14d
--- /dev/null
+++ b/res/drawable/ic_wifi_signal_4_32dp.xml
@@ -0,0 +1,22 @@
+<?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.
+-->
+<com.android.settings.widget.TintDrawable
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:drawable="@*android:drawable/ic_wifi_signal_4"
+ android:width="32dp"
+ android:height="32dp"
+ android:tint="?android:attr/colorAccent"/>
diff --git a/res/drawable/signal.xml b/res/drawable/signal.xml
deleted file mode 100644
index f315600..0000000
--- a/res/drawable/signal.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 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.
--->
-
-<level-list xmlns:android="http://schemas.android.com/apk/res/android">
- <item android:maxLevel="0" android:drawable="@drawable/ic_network_signal_0" />
- <item android:maxLevel="1" android:drawable="@drawable/ic_network_signal_1" />
- <item android:maxLevel="2" android:drawable="@drawable/ic_network_signal_2" />
- <item android:maxLevel="3" android:drawable="@drawable/ic_network_signal_3" />
- <item android:maxLevel="4" android:drawable="@drawable/ic_network_signal_4" />
-</level-list>
-
diff --git a/res/drawable/tile_icon_sensors_off.xml b/res/drawable/tile_icon_sensors_off.xml
index 890fa83..b9b3500 100644
--- a/res/drawable/tile_icon_sensors_off.xml
+++ b/res/drawable/tile_icon_sensors_off.xml
@@ -18,7 +18,8 @@
android:width="24dp"
android:height="24dp"
android:viewportWidth="24.0"
- android:viewportHeight="24.0">
+ android:viewportHeight="24.0"
+ android:tint="?android:attr/colorControlNormal">
<path
android:pathData="M21.966,2 L2,22"
android:strokeLineCap="round"
diff --git a/res/layout-land/choose_lock_pattern.xml b/res/layout-land/choose_lock_pattern.xml
index 331d4a4..df40ed4 100644
--- a/res/layout-land/choose_lock_pattern.xml
+++ b/res/layout-land/choose_lock_pattern.xml
@@ -43,27 +43,27 @@
android:clipToPadding="false"
android:orientation="vertical">
- <ImageView
- android:id="@+id/sud_layout_icon"
- style="@style/SudGlifIcon"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="?attr/sudGlifHeaderGravity"
- android:layout_marginStart="0dp"
- android:layout_marginEnd="0dp"
- android:src="@drawable/ic_lock"/>
-
<ScrollView
android:id="@+id/scroll_layout_title_header"
android:layout_width="match_parent"
android:layout_height="0dp"
- android:layout_weight="3.0">
+ android:layout_weight="1">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
+ <ImageView
+ android:id="@+id/sud_layout_icon"
+ style="@style/SudGlifIcon"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="?attr/sudGlifHeaderGravity"
+ android:layout_marginStart="0dp"
+ android:layout_marginEnd="0dp"
+ android:src="@drawable/ic_lock"/>
+
<TextView
android:id="@+id/suc_layout_title"
style="@style/SudGlifHeaderTitle"
@@ -88,6 +88,14 @@
android:gravity="?attr/sudGlifHeaderGravity"
android:textSize="18sp"/>
+ <TextView android:id="@+id/footerText"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_centerHorizontal="true"
+ android:layout_marginTop="10dp"
+ android:textSize="14sp"
+ android:visibility="gone" />
+
<Button
android:id="@+id/screen_lock_options"
style="@style/SudGlifButton.Tertiary"
@@ -102,65 +110,6 @@
</ScrollView>
- <!-- footer can show a message, or confirm / restart buttons -->
- <RelativeLayout
- android:layout_width="match_parent"
- android:layout_height="0dip"
- android:layout_weight="1.0"
- android:clipChildren="false"
- android:clipToPadding="false">
-
- <!-- confirm / restart buttons -->
- <LinearLayout android:id="@+id/buttonContainer"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_centerHorizontal="true"
- android:layout_alignParentBottom="true"
- android:clipChildren="false"
- android:clipToPadding="false"
- android:orientation="horizontal">
-
- <!-- left : skip -->
- <Button android:id="@+id/skip_button"
- style="@style/SudGlifButton.Secondary"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="@string/skip_label"
- android:visibility="gone" />
-
- <!-- left / top button: skip, or re-try -->
- <Button android:id="@+id/footerLeftButton"
- style="@style/SetupWizardButton.Negative"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="@string/lockpattern_restart_button_text" />
-
- <Space
- android:layout_width="0dp"
- android:layout_height="0dp"
- android:layout_weight="1" />
-
- <!-- right / bottom button: confirm or ok -->
- <Button android:id="@+id/footerRightButton"
- style="@style/SetupWizardButton.Positive"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="@string/lockpattern_confirm_button_text" />
-
- </LinearLayout>
-
- <!-- message above buttons -->
- <TextView android:id="@+id/footerText"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_above="@+id/buttonContainer"
- android:layout_centerHorizontal="true"
- android:layout_marginBottom="4dip"
- android:textSize="14sp"
- android:visibility="gone" />
-
- </RelativeLayout>
-
</LinearLayout>
<!-- right side: lock pattern -->
diff --git a/res/layout-land/wifi_dpp_qrcode_scanner_fragment.xml b/res/layout-land/wifi_dpp_qrcode_scanner_fragment.xml
index cfe6cc0..240dbb5 100644
--- a/res/layout-land/wifi_dpp_qrcode_scanner_fragment.xml
+++ b/res/layout-land/wifi_dpp_qrcode_scanner_fragment.xml
@@ -15,33 +15,33 @@
limitations under the License.
-->
-<LinearLayout
+<com.google.android.setupdesign.GlifLayout
xmlns:android="http://schemas.android.com/apk/res/android"
- android:id="@+id/root"
android:layout_width="match_parent"
- android:layout_height="match_parent">
+ android:layout_height="match_parent"
+ android:icon="@drawable/ic_scan_32dp">
- <ScrollView
+ <LinearLayout
+ style="@style/SudContentFrame"
android:layout_width="match_parent"
- android:layout_height="match_parent">
+ android:layout_height="match_parent"
+ android:gravity="center_horizontal"
+ android:orientation="vertical">
+
+ <TextView
+ android:id="@android:id/summary"
+ style="@style/TextAppearance.SudGlifBody"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginStart="?attr/sudMarginSides"
+ android:layout_marginEnd="?attr/sudMarginSides"
+ android:textAlignment="center"/>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:orientation="vertical"
- android:gravity="center_horizontal">
-
- <include layout="@layout/wifi_dpp_fragment_header"/>
-
- <ProgressBar
- android:id="@+id/indeterminate_bar"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:indeterminate="true"
- android:paddingStart="16dp"
- android:paddingEnd="16dp"
- android:layout_marginBottom="8dp"
- style="?android:attr/progressBarStyleHorizontal"/>
+ android:gravity="center"
+ android:orientation="vertical">
<FrameLayout
android:layout_width="@dimen/qrcode_preview_size"
@@ -59,18 +59,18 @@
<TextView
android:id="@+id/error_message"
+ style="@style/TextAppearance.ErrorText"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
- android:layout_marginStart="24dp"
- android:layout_marginEnd="24dp"
+ android:layout_marginStart="?attr/sudMarginSides"
+ android:layout_marginEnd="?attr/sudMarginSides"
android:textAlignment="center"
- android:textColor="?android:attr/colorError"
android:visibility="invisible"/>
</LinearLayout>
- </ScrollView>
+ </LinearLayout>
-</LinearLayout>
+</com.google.android.setupdesign.GlifLayout>
diff --git a/res/layout/apps_filter_spinner.xml b/res/layout/apps_filter_spinner.xml
index 23465b9..13d8078 100644
--- a/res/layout/apps_filter_spinner.xml
+++ b/res/layout/apps_filter_spinner.xml
@@ -27,7 +27,8 @@
android:layout_width="wrap_content"
android:layout_centerHorizontal="true"
android:layout_marginTop="16dp"
- android:layout_marginBottom="8dp"/>
+ android:layout_marginBottom="8dp"
+ android:theme="@style/Widget.PopupWindow.Settings"/>
<ImageView
android:id="@+id/filter_settings"
diff --git a/res/layout/battery_header.xml b/res/layout/battery_header.xml
index b3b699a..dca0972 100644
--- a/res/layout/battery_header.xml
+++ b/res/layout/battery_header.xml
@@ -44,16 +44,10 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
- android:minLines="2"
+ android:minLines="3"
android:textAppearance="@android:style/TextAppearance.DeviceDefault.Small"/>
android:textColor="?android:attr/textColorPrimary"/>
- <TextView
- android:id="@+id/summary2"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:textAppearance="@android:style/TextAppearance.DeviceDefault.Small"/>
- android:textColor="?android:attr/textColorPrimary"/>
</LinearLayout>
<com.android.settings.fuelgauge.BatteryMeterView
diff --git a/res/layout/choose_lock_password.xml b/res/layout/choose_lock_password.xml
index be947dc..3914551 100644
--- a/res/layout/choose_lock_password.xml
+++ b/res/layout/choose_lock_password.xml
@@ -63,6 +63,7 @@
style="@style/TextAppearance.PasswordEntry"/>
<androidx.recyclerview.widget.RecyclerView
+ android:layout_marginTop="8dp"
android:id="@+id/password_requirements_view"
android:layout_width="match_parent"
android:layout_height="wrap_content"/>
diff --git a/res/layout/confirm_lock_password_base.xml b/res/layout/confirm_lock_password_base.xml
index ed25e74..19a9fbb 100644
--- a/res/layout/confirm_lock_password_base.xml
+++ b/res/layout/confirm_lock_password_base.xml
@@ -84,6 +84,7 @@
android:id="@+id/errorText"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
+ android:layout_marginTop="8dp"
android:layout_marginStart="12dp"
android:layout_marginEnd="12dp"/>
diff --git a/res/layout/confirm_lock_password_normal.xml b/res/layout/confirm_lock_password_normal.xml
index 61d8505..9021f24 100644
--- a/res/layout/confirm_lock_password_normal.xml
+++ b/res/layout/confirm_lock_password_normal.xml
@@ -61,6 +61,9 @@
style="@style/TextAppearance.ErrorText"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
+ android:layout_marginTop="8dp"
+ android:layout_marginStart="12dp"
+ android:layout_marginEnd="12dp"
android:accessibilityLiveRegion="polite"/>
</LinearLayout>
diff --git a/res/layout/dialog_edittext.xml b/res/layout/dialog_edittext.xml
index 22729b6..f7062f0 100644
--- a/res/layout/dialog_edittext.xml
+++ b/res/layout/dialog_edittext.xml
@@ -28,6 +28,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:inputType="textCapSentences"
+ android:minHeight="@dimen/min_tap_target_size"
android:maxLength="50"
android:singleLine="true" />
</LinearLayout>
diff --git a/res/layout/disable_accessibility_service_dialog_content.xml b/res/layout/disable_accessibility_service_dialog_content.xml
index e365484..680de4a 100644
--- a/res/layout/disable_accessibility_service_dialog_content.xml
+++ b/res/layout/disable_accessibility_service_dialog_content.xml
@@ -57,12 +57,12 @@
<Button
android:id="@+id/permission_disable_stop_button"
android:text="@string/accessibility_dialog_button_stop"
- style="@style/AccessibilityDialogButtonAllow" />
+ style="@style/AccessibilityDialogButton" />
<Button
android:id="@+id/permission_disable_cancel_button"
android:text="@string/accessibility_dialog_button_cancel"
- style="@style/AccessibilityDialogButtonDeny" />
+ style="@style/AccessibilityDialogButton" />
</LinearLayout>
diff --git a/res/layout/edit_user_info_dialog_content.xml b/res/layout/edit_user_info_dialog_content.xml
index 4d76e13..30ae1d8 100644
--- a/res/layout/edit_user_info_dialog_content.xml
+++ b/res/layout/edit_user_info_dialog_content.xml
@@ -44,6 +44,7 @@
android:labelFor="@id/user_photo"
android:inputType="text|textCapWords"
android:selectAllOnFocus="true"
- android:hint="@string/user_nickname"/>
+ android:hint="@string/user_nickname"
+ android:maxLength="100"/>
</LinearLayout>
diff --git a/res/layout/enable_accessibility_service_dialog_content.xml b/res/layout/enable_accessibility_service_dialog_content.xml
index 066c339..59cb6dd 100644
--- a/res/layout/enable_accessibility_service_dialog_content.xml
+++ b/res/layout/enable_accessibility_service_dialog_content.xml
@@ -127,12 +127,12 @@
<Button
android:id="@+id/permission_enable_allow_button"
android:text="@string/accessibility_dialog_button_allow"
- style="@style/AccessibilityDialogButtonAllow" />
+ style="@style/AccessibilityDialogButton" />
<Button
android:id="@+id/permission_enable_deny_button"
android:text="@string/accessibility_dialog_button_deny"
- style="@style/AccessibilityDialogButtonDeny" />
+ style="@style/AccessibilityDialogButton" />
</LinearLayout>
</LinearLayout>
diff --git a/res/layout/face_enroll_button.xml b/res/layout/face_enroll_button.xml
index 2a6d676..f40c42c 100644
--- a/res/layout/face_enroll_button.xml
+++ b/res/layout/face_enroll_button.xml
@@ -17,7 +17,8 @@
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
- android:layout_height="wrap_content">
+ android:layout_height="wrap_content"
+ android:minHeight="?android:attr/listPreferredItemHeight">
<Button
android:id="@+id/security_settings_face_settings_enroll_button"
diff --git a/res/layout/face_remove_button.xml b/res/layout/face_remove_button.xml
index 7fd28b6..98459f0 100644
--- a/res/layout/face_remove_button.xml
+++ b/res/layout/face_remove_button.xml
@@ -17,7 +17,8 @@
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
- android:layout_height="wrap_content">
+ android:layout_height="wrap_content"
+ android:minHeight="?android:attr/listPreferredItemHeight">
<Button
android:id="@+id/security_settings_face_settings_remove_button"
diff --git a/res/layout/night_display_activation_button.xml b/res/layout/night_display_activation_button.xml
index b0bfe86..df160ec 100644
--- a/res/layout/night_display_activation_button.xml
+++ b/res/layout/night_display_activation_button.xml
@@ -15,10 +15,11 @@
limitations under the License.
-->
-<FrameLayout
+<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
- android:layout_height="wrap_content">
+ android:layout_height="wrap_content"
+ android:minHeight="?android:attr/listPreferredItemHeight">
<Button
android:id="@+id/night_display_turn_on_button"
@@ -26,7 +27,7 @@
android:layout_marginStart="@dimen/screen_margin_sides"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_gravity="start" />
+ android:layout_gravity="center_vertical" />
<Button
android:id="@+id/night_display_turn_off_button"
@@ -34,6 +35,6 @@
android:layout_marginStart="@dimen/screen_margin_sides"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_gravity="start" />
+ android:layout_gravity="center_vertical" />
-</FrameLayout>
\ No newline at end of file
+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/password_requirement_item.xml b/res/layout/password_requirement_item.xml
index ff7e04c..40bf742 100644
--- a/res/layout/password_requirement_item.xml
+++ b/res/layout/password_requirement_item.xml
@@ -19,4 +19,4 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="?attr/sudGlifHeaderGravity"
- android:textSize="14sp"/>
+ android:textSize="@*android:dimen/text_size_body_1_material"/>
diff --git a/res/layout/preference_widget_summary.xml b/res/layout/preference_widget_summary.xml
index fae5027..bee46db 100644
--- a/res/layout/preference_widget_summary.xml
+++ b/res/layout/preference_widget_summary.xml
@@ -18,6 +18,7 @@
android:id="@+id/widget_summary"
android:layout_width="match_parent"
android:layout_height="wrap_content"
+ android:layout_marginStart="8dp"
android:drawablePadding="8dp"
android:gravity="center_vertical|end"
android:textAlignment="viewEnd"
diff --git a/res/layout/private_dns_mode_dialog.xml b/res/layout/private_dns_mode_dialog.xml
index 641905d..4d614e2 100644
--- a/res/layout/private_dns_mode_dialog.xml
+++ b/res/layout/private_dns_mode_dialog.xml
@@ -33,7 +33,7 @@
<RadioButton
android:id="@+id/private_dns_mode_off"
android:text="@string/private_dns_mode_off"
- android:layout_width="wrap_content"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:minHeight="48dp"/>
@@ -41,7 +41,7 @@
<RadioButton
android:id="@+id/private_dns_mode_opportunistic"
android:text="@string/private_dns_mode_opportunistic"
- android:layout_width="wrap_content"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:minHeight="48dp"/>
@@ -49,7 +49,7 @@
<RadioButton
android:id="@+id/private_dns_mode_provider"
android:text="@string/private_dns_mode_provider"
- android:layout_width="wrap_content"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:minHeight="48dp"/>
diff --git a/res/layout/reset_network.xml b/res/layout/reset_network.xml
index 2c31d1a..9181ed8 100644
--- a/res/layout/reset_network.xml
+++ b/res/layout/reset_network.xml
@@ -19,7 +19,6 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical" >
-
<ScrollView
android:layout_width="match_parent"
android:layout_height="0dip"
@@ -27,39 +26,33 @@
android:layout_marginEnd="@dimen/reset_network_margin_end"
android:layout_marginTop="12dp"
android:layout_weight="1">
-
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
-
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textSize="18sp"
android:textDirection="locale"
android:text="@string/reset_network_desc" />
-
<include layout="@layout/reset_esim_checkbox"/>
-
</LinearLayout>
-
</ScrollView>
-
<Spinner android:id="@+id/reset_network_subscription"
android:layout_gravity="center_horizontal"
- android:layout_marginTop="20dip"
+ android:layout_marginTop="20dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
-
<Button
android:id="@+id/initiate_reset_network"
- android:layout_gravity="center_horizontal"
- android:layout_marginTop="20dip"
- android:layout_marginBottom="12dip"
+ android:layout_gravity="end"
+ android:layout_marginEnd="@dimen/suc_customization_button_margin_end"
+ android:layout_marginTop="20dp"
+ android:layout_marginBottom="12dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/reset_network_button_text"
- android:gravity="center" />
-
+ android:gravity="center"
+ style="@style/ActionPrimaryButton"/>
</LinearLayout>
diff --git a/res/layout/reset_network_confirm.xml b/res/layout/reset_network_confirm.xml
index 0e5327f..1ec446e 100644
--- a/res/layout/reset_network_confirm.xml
+++ b/res/layout/reset_network_confirm.xml
@@ -17,23 +17,25 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
-
<TextView
android:id="@+id/reset_network_confirm"
android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_marginStart="12dp"
- android:layout_marginEnd="12dp"
+ android:layout_height="0dp"
+ android:layout_weight="1"
+ android:layout_marginStart="@dimen/reset_network_margin_start"
+ android:layout_marginEnd="@dimen/reset_network_margin_end"
android:layout_marginTop="12dp"
- android:textSize="20sp"
+ android:textSize="18sp"
android:text="@string/reset_network_final_desc" />
-
- <Button android:id="@+id/execute_reset_network"
- android:layout_gravity="center_horizontal"
- android:layout_marginTop="40dip"
+ <Button
+ android:id="@+id/execute_reset_network"
+ android:layout_gravity="end"
+ android:layout_marginEnd="@dimen/suc_customization_button_margin_end"
+ android:layout_marginTop="20dp"
+ android:layout_marginBottom="12dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/reset_network_final_button_text"
- android:gravity="center" />
-
+ android:gravity="center"
+ style="@style/ActionPrimaryButton"/>
</LinearLayout>
diff --git a/res/layout/tutorial_dialog_launch_by_gesture_navigation_settings.xml b/res/layout/tutorial_dialog_launch_by_gesture_navigation_settings.xml
index fb4b6cc..524f7c9 100644
--- a/res/layout/tutorial_dialog_launch_by_gesture_navigation_settings.xml
+++ b/res/layout/tutorial_dialog_launch_by_gesture_navigation_settings.xml
@@ -57,4 +57,4 @@
</LinearLayout>
-</ScrollView>
\ No newline at end of file
+</ScrollView>
diff --git a/res/layout/tutorial_dialog_launch_service_by_accessibility_button.xml b/res/layout/tutorial_dialog_launch_service_by_accessibility_button.xml
index caa91a8..ecbccab 100644
--- a/res/layout/tutorial_dialog_launch_service_by_accessibility_button.xml
+++ b/res/layout/tutorial_dialog_launch_service_by_accessibility_button.xml
@@ -58,4 +58,4 @@
</LinearLayout>
-</ScrollView>
\ No newline at end of file
+</ScrollView>
diff --git a/res/layout/tutorial_dialog_launch_service_by_gesture_navigation.xml b/res/layout/tutorial_dialog_launch_service_by_gesture_navigation.xml
index 454029b..7c4971f 100644
--- a/res/layout/tutorial_dialog_launch_service_by_gesture_navigation.xml
+++ b/res/layout/tutorial_dialog_launch_service_by_gesture_navigation.xml
@@ -57,4 +57,4 @@
</LinearLayout>
-</ScrollView>
\ No newline at end of file
+</ScrollView>
diff --git a/res/layout/two_state_button.xml b/res/layout/two_state_button.xml
index 3ad1634..162465e 100644
--- a/res/layout/two_state_button.xml
+++ b/res/layout/two_state_button.xml
@@ -22,7 +22,8 @@
android:paddingStart="72dp"
android:paddingEnd="72dp"
android:layout_width="match_parent"
- android:layout_height="match_parent">
+ android:layout_height="wrap_content"
+ android:minHeight="?android:attr/listPreferredItemHeight">
<Button
android:id="@+id/state_on_button"
diff --git a/res/layout/wifi_button_preference_widget.xml b/res/layout/wifi_button_preference_widget.xml
index 4b004e3..f4f1618 100644
--- a/res/layout/wifi_button_preference_widget.xml
+++ b/res/layout/wifi_button_preference_widget.xml
@@ -19,7 +19,7 @@
android:id="@+id/button_icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:minWidth="@dimen/min_tap_target_size"
+ android:minWidth="64dp"
android:minHeight="@dimen/min_tap_target_size"
android:layout_gravity="center"
android:background="?android:attr/selectableItemBackground"/>
diff --git a/res/layout/wifi_dialog.xml b/res/layout/wifi_dialog.xml
index 0a25934..83a0833 100644
--- a/res/layout/wifi_dialog.xml
+++ b/res/layout/wifi_dialog.xml
@@ -287,30 +287,12 @@
style="@style/wifi_item_label"
android:text="@string/wifi_password" />
- <androidx.constraintlayout.widget.ConstraintLayout
- xmlns:app="http://schemas.android.com/apk/res-auto"
- android:layout_width="match_parent"
- android:layout_height="wrap_content">
- <EditText android:id="@+id/password"
- android:layout_width="0dp"
- android:layout_height="wrap_content"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintEnd_toStartOf="@+id/password_scanner_button"
- style="@style/wifi_item_edit_content"
- android:singleLine="true"
- android:password="true"/>
-
- <ImageButton
- android:id="@+id/password_scanner_button"
- android:layout_width="wrap_content"
+ <EditText android:id="@+id/password"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:minWidth="@dimen/min_tap_target_size"
- android:minHeight="@dimen/min_tap_target_size"
- app:layout_constraintEnd_toEndOf="parent"
- android:background="?android:attr/selectableItemBackground"
- android:src="@drawable/ic_scan_24dp"
- android:contentDescription="@string/wifi_dpp_scan_qr_code"/>
- </androidx.constraintlayout.widget.ConstraintLayout>
+ style="@style/wifi_item_edit_content"
+ android:singleLine="true"
+ android:password="true"/>
</LinearLayout>
<LinearLayout android:id="@+id/show_password_layout"
@@ -329,6 +311,25 @@
style="@style/wifi_item_content"
android:text="@string/wifi_show_password" />
</LinearLayout>
+
+ <LinearLayout android:id="@+id/sae_password_id_layout"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ style="@style/wifi_item"
+ android:visibility="gone">
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ style="@style/wifi_item_label"
+ android:text="@string/wifi_sae_password_id" />
+
+ <EditText android:id="@+id/sae_password_id"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ style="@style/wifi_item_edit_content"
+ android:singleLine="true"
+ android:inputType="textNoSuggestions" />
+ </LinearLayout>
</LinearLayout>
<LinearLayout android:id="@+id/wifi_advanced_toggle"
diff --git a/res/layout/wifi_dpp_add_device_fragment.xml b/res/layout/wifi_dpp_add_device_fragment.xml
index 3ffdeef..8ad6391 100644
--- a/res/layout/wifi_dpp_add_device_fragment.xml
+++ b/res/layout/wifi_dpp_add_device_fragment.xml
@@ -15,62 +15,53 @@
limitations under the License.
-->
-<androidx.constraintlayout.widget.ConstraintLayout
+<com.google.android.setupdesign.GlifLayout
xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:app="http://schemas.android.com/apk/res-auto"
- android:id="@+id/root"
android:layout_width="match_parent"
- android:layout_height="match_parent">
+ android:layout_height="match_parent"
+ android:icon="@drawable/ic_devices_other_32dp">
- <ScrollView
+ <LinearLayout
+ style="@style/SudContentFrame"
android:layout_width="match_parent"
- android:layout_height="match_parent">
+ android:layout_height="match_parent"
+ android:gravity="center_horizontal"
+ android:orientation="vertical">
+
+ <TextView
+ android:id="@android:id/summary"
+ style="@style/TextAppearance.SudGlifBody"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginStart="?attr/sudMarginSides"
+ android:layout_marginEnd="?attr/sudMarginSides"
+ android:textAlignment="center"
+ android:accessibilityLiveRegion="polite"/>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:gravity="center_horizontal"
+ android:gravity="center"
android:orientation="vertical">
- <include layout="@layout/wifi_dpp_fragment_header"/>
-
- <ProgressBar
- android:id="@+id/indeterminate_bar"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:indeterminate="true"
- android:paddingStart="16dp"
- android:paddingEnd="16dp"
- android:layout_marginBottom="8dp"
- style="?android:attr/progressBarStyleHorizontal"
- android:visibility="invisible"/>
-
<ImageView
android:id="@+id/wifi_ap_picture_view"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/wifi_dpp_success"
- android:scaleType="fitCenter"
- app:layout_constraintTop_toBottomOf="@+id/header"/>
+ android:scaleType="fitCenter"/>
<Button
android:id="@+id/choose_different_network"
style="@style/SudGlifButton.Secondary"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- app:layout_constraintTop_toBottomOf="@+id/wifi_ap_picture_view"
android:layout_marginTop="8dp"
android:text="@string/wifi_dpp_choose_different_network"/>
</LinearLayout>
- </ScrollView>
+ </LinearLayout>
- <include
- layout="@layout/wifi_dpp_fragment_footer"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- app:layout_constraintBottom_toBottomOf="parent"/>
-
-</androidx.constraintlayout.widget.ConstraintLayout>
+</com.google.android.setupdesign.GlifLayout>
diff --git a/res/layout/wifi_dpp_choose_saved_wifi_network_fragment.xml b/res/layout/wifi_dpp_choose_saved_wifi_network_fragment.xml
index 3606ccd..534f32e 100644
--- a/res/layout/wifi_dpp_choose_saved_wifi_network_fragment.xml
+++ b/res/layout/wifi_dpp_choose_saved_wifi_network_fragment.xml
@@ -15,22 +15,28 @@
limitations under the License.
-->
-<androidx.constraintlayout.widget.ConstraintLayout
+<com.google.android.setupdesign.GlifLayout
xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:app="http://schemas.android.com/apk/res-auto"
- android:id="@+id/root"
android:layout_width="match_parent"
- android:layout_height="match_parent">
+ android:layout_height="match_parent"
+ android:icon="@drawable/ic_wifi_signal_4_32dp">
<LinearLayout
+ style="@style/SudContentFrame"
android:layout_width="match_parent"
- android:layout_height="0dp"
+ android:layout_height="match_parent"
android:gravity="center_horizontal"
- android:orientation="vertical"
- app:layout_constraintTop_toTopOf="parent"
- app:layout_constraintBottom_toTopOf="@+id/footer">
+ android:orientation="vertical">
- <include layout="@layout/wifi_dpp_fragment_header"/>
+ <TextView
+ android:id="@android:id/summary"
+ style="@style/TextAppearance.SudGlifBody"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginStart="?attr/sudMarginSides"
+ android:layout_marginEnd="?attr/sudMarginSides"
+ android:textAlignment="center"
+ android:accessibilityLiveRegion="polite"/>
<LinearLayout android:id="@+id/wifi_network_list_container"
android:layout_width="match_parent"
@@ -38,12 +44,5 @@
</LinearLayout>
- <include
- android:id="@+id/footer"
- layout="@layout/wifi_dpp_fragment_footer"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- app:layout_constraintBottom_toBottomOf="parent"/>
-
-</androidx.constraintlayout.widget.ConstraintLayout>
+</com.google.android.setupdesign.GlifLayout>
diff --git a/res/layout/wifi_dpp_fragment_footer.xml b/res/layout/wifi_dpp_fragment_footer.xml
deleted file mode 100644
index d29f16e..0000000
--- a/res/layout/wifi_dpp_fragment_footer.xml
+++ /dev/null
@@ -1,43 +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"
- style="@style/SudGlifButtonBar">
-
- <Button
- android:id="@+id/button_left"
- style="@style/SudGlifButton.Secondary"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="start"/>
-
- <Space
- android:layout_width="0dp"
- android:layout_height="0dp"
- android:layout_weight="1"/>
-
- <Button
- android:id="@+id/button_right"
- style="@style/SudGlifButton.Primary"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="end"/>
-
-</LinearLayout>
diff --git a/res/layout/wifi_dpp_fragment_header.xml b/res/layout/wifi_dpp_fragment_header.xml
deleted file mode 100644
index 364f360..0000000
--- a/res/layout/wifi_dpp_fragment_header.xml
+++ /dev/null
@@ -1,74 +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"
- style="@style/EntityHeader"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_centerHorizontal="true"
- android:gravity="center_horizontal"
- android:orientation="vertical"
- android:paddingStart="16dp"
- android:paddingEnd="16dp">
-
- <ImageView
- android:id="@android:id/icon"
- android:layout_width="@dimen/wifi_dpp_fragment_icon_width_height"
- android:layout_height="@dimen/wifi_dpp_fragment_icon_width_height"
- android:scaleType="fitCenter"/>
-
- <!-- Special header icon only for ic_devices_check_circle_green -->
- <ImageView
- android:id="@+id/devices_check_circle_green_icon"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:src="@drawable/ic_devices_check_circle_green"
- android:scaleType="fitCenter"/>
-
- <!-- Add title_summary_container to group content for Talkback -->
- <LinearLayout
- android:id="@+id/title_summary_container"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:orientation="vertical"
- android:focusable="true">
-
- <TextView
- android:id="@android:id/title"
- style="@style/TextAppearance.EntityHeaderTitle"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:gravity="center_horizontal"
- android:textAlignment="center"
- android:layout_marginTop="8dp"
- android:paddingStart="32dp"
- android:paddingEnd="32dp"/>
-
- <TextView
- android:id="@android:id/summary"
- style="@style/TextAppearance.EntityHeaderSummary"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:singleLine="false"
- android:gravity="center_horizontal"
- android:textAlignment="center"
- android:layout_marginTop="2dp"
- android:paddingStart="32dp"
- android:paddingEnd="32dp"/>
- </LinearLayout>
-</LinearLayout>
diff --git a/res/layout/wifi_dpp_qrcode_generator_fragment.xml b/res/layout/wifi_dpp_qrcode_generator_fragment.xml
index 31bf7cc..1f8b37c 100644
--- a/res/layout/wifi_dpp_qrcode_generator_fragment.xml
+++ b/res/layout/wifi_dpp_qrcode_generator_fragment.xml
@@ -15,25 +15,35 @@
limitations under the License.
-->
-<LinearLayout
+<com.google.android.setupdesign.GlifLayout
xmlns:android="http://schemas.android.com/apk/res/android"
- android:id="@+id/root"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:orientation="vertical">
+ android:icon="@drawable/ic_qrcode_32dp">
- <ScrollView
+ <LinearLayout
+ style="@style/SudContentFrame"
android:layout_width="match_parent"
- android:layout_height="match_parent">
+ android:layout_height="match_parent"
+ android:gravity="center_horizontal"
+ android:orientation="vertical">
+
+ <TextView
+ android:id="@android:id/summary"
+ style="@style/TextAppearance.SudGlifBody"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginStart="?attr/sudMarginSides"
+ android:layout_marginEnd="?attr/sudMarginSides"
+ android:textAlignment="center"
+ android:accessibilityLiveRegion="polite"/>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:gravity="center_horizontal"
+ android:gravity="center"
android:orientation="vertical">
- <include layout="@layout/wifi_dpp_fragment_header"/>
-
<ImageView
android:id="@+id/qrcode_view"
android:layout_width="@dimen/qrcode_size"
@@ -50,7 +60,7 @@
android:textColor="?android:attr/textColorSecondary"/>
</LinearLayout>
- </ScrollView>
+ </LinearLayout>
-</LinearLayout>
+</com.google.android.setupdesign.GlifLayout>
diff --git a/res/layout/wifi_dpp_qrcode_scanner_fragment.xml b/res/layout/wifi_dpp_qrcode_scanner_fragment.xml
index 01b9e34..3d1e99b 100644
--- a/res/layout/wifi_dpp_qrcode_scanner_fragment.xml
+++ b/res/layout/wifi_dpp_qrcode_scanner_fragment.xml
@@ -15,33 +15,34 @@
limitations under the License.
-->
-<LinearLayout
+<com.google.android.setupdesign.GlifLayout
xmlns:android="http://schemas.android.com/apk/res/android"
- android:id="@+id/root"
android:layout_width="match_parent"
- android:layout_height="match_parent">
+ android:layout_height="match_parent"
+ android:icon="@drawable/ic_scan_32dp">
- <ScrollView
+ <LinearLayout
+ style="@style/SudContentFrame"
android:layout_width="match_parent"
- android:layout_height="match_parent">
+ android:layout_height="match_parent"
+ android:orientation="vertical"
+ android:gravity="center_horizontal">
+
+ <TextView
+ android:id="@android:id/summary"
+ style="@style/TextAppearance.SudGlifBody"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginStart="?attr/sudMarginSides"
+ android:layout_marginEnd="?attr/sudMarginSides"
+ android:textAlignment="center"
+ android:accessibilityLiveRegion="polite"/>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:orientation="vertical"
- android:gravity="center_horizontal">
-
- <include layout="@layout/wifi_dpp_fragment_header"/>
-
- <ProgressBar
- android:id="@+id/indeterminate_bar"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:indeterminate="true"
- android:paddingStart="16dp"
- android:paddingEnd="16dp"
- android:layout_marginBottom="8dp"
- style="?android:attr/progressBarStyleHorizontal"/>
+ android:gravity="center"
+ android:orientation="vertical">
<FrameLayout
android:layout_width="wrap_content"
@@ -59,18 +60,18 @@
<TextView
android:id="@+id/error_message"
+ style="@style/TextAppearance.ErrorText"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
- android:layout_marginStart="24dp"
- android:layout_marginEnd="24dp"
+ android:layout_marginStart="?attr/sudMarginSides"
+ android:layout_marginEnd="?attr/sudMarginSides"
android:textAlignment="center"
- android:textColor="?android:attr/colorError"
android:visibility="invisible"/>
</LinearLayout>
- </ScrollView>
+ </LinearLayout>
-</LinearLayout>
+</com.google.android.setupdesign.GlifLayout>
diff --git a/res/layout/zen_mode_settings_button.xml b/res/layout/zen_mode_settings_button.xml
index 7db52a2..7bd9b47 100644
--- a/res/layout/zen_mode_settings_button.xml
+++ b/res/layout/zen_mode_settings_button.xml
@@ -18,7 +18,8 @@
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
- android:layout_height="wrap_content">
+ android:layout_height="wrap_content"
+ android:paddingVertical="@dimen/zen_mode_button_padding_vertical">
<Button
android:id="@+id/zen_mode_settings_turn_on_button"
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index 09544b3..f4750ff 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -360,8 +360,6 @@
<string name="security_enable_widgets_disabled_summary" msgid="6392489775303464905">"Gedeaktiveer deur administrateur"</string>
<string name="lockdown_settings_title" msgid="7393790212603280213">"Wys snelsluitopsie"</string>
<string name="lockdown_settings_summary" msgid="4359438673563318171">"Wys aan/af-skakelaaropsie wat Smart Lock, biometriese ontsluiting en kennisgewings op die sluitskerm afskakel"</string>
- <string name="trust_agents_extend_unlock_title" msgid="2796555263565097031">"Vertrouensagente brei net ontsluit uit"</string>
- <string name="trust_agents_extend_unlock_summary" msgid="3976344969220255010">"As dit geaktiveer is, sal vertrouensagente jou toestel langer ontsluit hou, maar kan dit nie meer \'n geslote toestel ontsluit nie."</string>
<string name="trust_lost_locks_screen_title" msgid="2992742466966021682">"Sluit skerm wanneer vertroue verloor word"</string>
<string name="trust_lost_locks_screen_summary" msgid="693784434582021206">"As dit geaktiveer is, sal die toestel sluit wanneer die laaste vertrouensagent vertroue verloor"</string>
<string name="owner_info_settings_summary" msgid="7472393443779227052">"Geen"</string>
@@ -937,6 +935,7 @@
<string name="wifi_eap_identity" msgid="4359453783379679103">"Identiteit"</string>
<string name="wifi_eap_anonymous" msgid="2989469344116577955">"Anonieme identiteit"</string>
<string name="wifi_password" msgid="5948219759936151048">"Wagwoord"</string>
+ <string name="wifi_sae_password_id" msgid="1697832722221765763">"SAE-wagwoordidentifiseerder"</string>
<string name="wifi_show_password" msgid="6461249871236968884">"Wys wagwoord"</string>
<string name="wifi_ap_band_config" msgid="1611826705989117930">"Kies toegangspuntband"</string>
<string name="wifi_ap_choose_auto" msgid="2677800651271769965">"Outo"</string>
@@ -957,7 +956,6 @@
<string name="wifi_dpp_share_wifi" msgid="9065890131734833809">"Deel Wi‑Fi"</string>
<string name="wifi_dpp_scan_qr_code_with_another_device" msgid="5854392840857123065">"Skandeer hierdie QR-kode om aan “<xliff:g id="SSID">%1$s</xliff:g>” te koppel en die wagwoord te deel"</string>
<string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="4436318319178361543">"Skandeer hierdie QR-kode om aan “<xliff:g id="SSID">%1$s</xliff:g>” te koppel"</string>
- <string name="wifi_dpp_could_not_detect_valid_qr_code" msgid="641893675646330576">"Kon nie QR-kode lees nie. Voer kode weer in en probeer weer"</string>
<string name="wifi_dpp_failure_authentication_or_configuration" msgid="3372757783382381044">"Probeer weer. Kontak die toestelvervaardiger as die kwessie voortduur"</string>
<string name="wifi_dpp_failure_not_compatible" msgid="2829930473520603740">"Iets is fout"</string>
<string name="wifi_dpp_failure_timeout" msgid="5228320772245820458">"Maak seker dat die toestel ingeprop is, gelaai is, en aangeskakel is"</string>
@@ -980,6 +978,7 @@
<string name="wifi_dpp_hotspot_password" msgid="4120419278831581613">"Warmkolwagwoord: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
<string name="wifi_dpp_add_device" msgid="4072206063308645677">"Voeg toestel by"</string>
<string name="wifi_dpp_connect_network_using_qr_code" msgid="3887335309163999665">"Gebruik \'n QR-kode om \'n toestel by hierdie netwerk te voeg"</string>
+ <string name="wifi_dpp_qr_code_is_not_valid_format" msgid="3700087439867692944">"QR-kode is nie \'n geldige formaat nie"</string>
<string name="retry" msgid="6472609612090877557">"Herprobeer"</string>
<string name="wifi_shared" msgid="844142443226926070">"Deel met ander toestelgebruikers"</string>
<string name="wifi_unchanged" msgid="3410422020930397102">"(onveranderd)"</string>
@@ -1129,6 +1128,7 @@
<string name="emergency_address_title" msgid="932729250447887545">"Noodadres"</string>
<string name="emergency_address_summary" msgid="7751971156196115129">"Word as jou ligging gebruik wanneer jy \'n noodoproep oor Wi-Fi maak"</string>
<string name="private_dns_help_message" msgid="3299567069152568958"><annotation id="url">"Kom meer te wete"</annotation>" oor Private DNS-kenmerke"</string>
+ <string name="private_dns_mode_on" msgid="5882613439541371003">"Aan"</string>
<string name="wifi_calling_pref_managed_by_carrier" msgid="6845711858866828986">"Instelling word deur diensverskaffer bestuur"</string>
<string name="wifi_calling_settings_activation_instructions" msgid="7492509632478260955">"Aktiveer Wi-Fi-oproepe"</string>
<string name="wifi_calling_turn_on" msgid="1171403510313983983">"Skakel Wi-Fi-oproepe aan"</string>
@@ -1872,7 +1872,7 @@
<string name="default_emergency_app" msgid="1951760659640369980">"Noodprogram"</string>
<string name="reset_app_preferences" msgid="1321050641018356925">"Stel programvoorkeure terug"</string>
<string name="reset_app_preferences_title" msgid="6093179367325336662">"Stel programvoorkeure terug?"</string>
- <string name="reset_app_preferences_desc" msgid="4822447731869201512">"Dit sal al die voorkeure terugstel vir:\n\n"<li>"Gedeaktiveerde programme"</li>\n<li>"Gedeaktiveerde programkennisgewings"</li>\n<li>"Verstek programme vir handelinge"</li>\n<li>"Agtergronddatabeperkings vir programme"</li>\n<li>"Enige toestemmingbeperkings"</li>\n\n" Jy sal nie enige programdata verloor nie."</string>
+ <string name="reset_app_preferences_desc" msgid="731757609326016760">"Dit sal al die voorkeure terugstel vir:\n\n"<li>"Gedeaktiveerde programme"</li>\n<li>"Gedeaktiveerdeprogram-kennisgewings"</li>\n<li>"Verstekprogramme vir handelinge"</li>\n<li>"Agtergronddatabeperkings vir programme"</li>\n<li>"Enige toestemmingbeperkings"</li>\n\n"Jy sal geen programdata verloor nie."</string>
<string name="reset_app_preferences_button" msgid="2559089511841281242">"Stel programme terug"</string>
<string name="manage_space_text" msgid="8852711522447794676">"Bestuur spasie"</string>
<string name="filter" msgid="2018011724373033887">"Filter"</string>
@@ -2087,7 +2087,7 @@
<string name="accessibility_screen_magnification_short_summary" msgid="3411979839172752057">"Tik 3 keer om te zoem"</string>
<string name="accessibility_screen_magnification_navbar_short_summary" msgid="3693116360267980492">"Tik op \'n knoppie om te zoem"</string>
<string name="accessibility_screen_magnification_summary" msgid="5258868553337478505"><b>"Om te zoem"</b>", tik 3 keer vinnig op die skerm.\n"<ul><li>"Sleep 2 of meer vingers om te rollees"</li>\n<li>"Knyp 2 of meer vingers om zoem te verstel"</li></ul>\n\n<b>"Om tydelik te zoem"</b>", tik 3 keer vinnig op die skerm en hou jou vinger op die skerm met die derde tik.\n"<ul><li>"Sleep om op die skerm rond te beweeg"</li>\n<li>"Lig vinger op om uit te zoem"</li></ul>\n\n"Jy kan nie op die sleutelbord en navigasiebalk inzoem nie."</string>
- <string name="accessibility_screen_magnification_navbar_summary" msgid="2272878354599332009">"Wanneer vergroting aangeskakel is, kan jy op jou skerm inzoem.\n\n"<b>"Om te zoem"</b>", begin vergroting, en tik dan op enige plek op die skerm.\n"<ul><li>"• Sleep 2 of meer vingers om te rollees"</li>\n<li>"• Knyp 2 of meer vingers om die zoem te verstel"</li></ul>\n\n<b>"Om tydelik te zoem"</b>", begin vergroting, en raak en hou dan enige plek op die skerm.\n"<ul><li>"• Sleep om op die skerm rond te beweeg"</li>\n<li>"• Lig jou vinger op om uit te zoem"</li></ul>\n\n"Jy kan nie op die sleutelbord of die navigasiebalk inzoem nie."</string>
+ <string name="accessibility_screen_magnification_navbar_summary" msgid="6700716275347612310">"Wanneer vergroting aangeskakel is, kan jy op jou skerm inzoem.\n\n"<b>"Om te zoem"</b>", moet jy vergroting begin en dan op enige plek op die skerm tik.\n"<ul><li>"Sleep 2 of meer vingers om te rollees"</li>\n<li>"Knyp 2 of meer vingers om zoem te verstel"</li></ul>\n\n<b>"Om tydelik te zoem"</b>", moet jy vergroting begin en dan enige plek op die skerm raak en hou.\n"<ul><li>"Sleep om op die skerm rond te beweeg"</li>\n<li>"Lig jou vinger op om uit te zoem"</li></ul>\n\n"Jy kan nie op die sleutelbord of die navigasiebalk inzoem nie."</string>
<string name="accessibility_tutorial_dialog_title_button" msgid="3682222614034474845">"Gebruik toeganklikheidknoppie om oop te maak"</string>
<string name="accessibility_tutorial_dialog_title_gesture" msgid="1342726230497913398">"Gebruik gebaar om oop te maak"</string>
<string name="accessibility_tutorial_dialog_title_gesture_settings" msgid="8539392614235820285">"Gebruik nuwe toeganklikheidgebaar"</string>
@@ -2140,8 +2140,7 @@
<string name="accessibility_hearingaid_title" msgid="8312145423610648518">"Gehoortoestelle"</string>
<string name="accessibility_hearingaid_not_connected_summary" msgid="6240237523789614599">"Geen gehoortoestelle is gekoppel nie"</string>
<string name="accessibility_hearingaid_adding_summary" msgid="2947474468412309778">"Voeg gehoortoestelle by"</string>
- <string name="accessibility_hearingaid_pair_instructions_first_message" msgid="3912093691643131154">"Soek en tik op jou toestel op die volgende skerm om jou gehoortoestelle saam te bind."</string>
- <string name="accessibility_hearingaid_pair_instructions_second_message" msgid="5596683393607650243">"Maak seker dat jou gehoortoestelle in saambindmodus is."</string>
+ <string name="accessibility_hearingaid_pair_instructions_message" msgid="3094382949733435414">"Soek en tik op jou toestel op die volgende skerm om jou gehoortoestelle saam te bind. Maak seker dat jou gehoortoestelle in saambindmodus is."</string>
<string name="accessibility_hearingaid_active_device_summary" msgid="3924362383258688984">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> is aktief"</string>
<plurals name="show_number_hearingaid_count" formatted="false" msgid="3160782397139295486">
<item quantity="other"><xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> gestoorde gehoortoestelle</item>
@@ -2490,7 +2489,6 @@
<string name="menu_stats_last_unplugged" msgid="5922246077592434526">"Sedert laas uitgeprop vir <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
<string name="menu_stats_total" msgid="8973377864854807854">"Gebruikstotale"</string>
<string name="menu_stats_refresh" msgid="1676215433344981075">"Herlaai"</string>
- <string name="process_kernel_label" msgid="3916858646836739323">"Android-bedryfstelsel"</string>
<string name="process_mediaserver_label" msgid="6500382062945689285">"Mediabediener"</string>
<string name="process_dex2oat_label" msgid="2592408651060518226">"Programoptimering"</string>
<string name="battery_saver" msgid="8172485772238572153">"Batterybespaarder"</string>
@@ -2621,8 +2619,6 @@
<string name="no_device_admins" msgid="4846602835339095768">"Geen toesteladministrateurprogramme beskikbaar nie"</string>
<string name="personal_device_admin_title" msgid="2849617316347669861">"Persoonlik"</string>
<string name="managed_device_admin_title" msgid="7853955652864478435">"Werk"</string>
- <string name="sms_access_restriction_enabled" msgid="7054488078710530278">"Beperk SMS- en oproeprekordtoegang"</string>
- <string name="sms_access_restriction_enabled_summary" msgid="6851339654677842328">"Net verstekfoon- en -boodskapprogramme het SMS- en oproeprekordtoestemmings"</string>
<string name="no_trust_agents" msgid="7450273545568977523">"Geen beskikbare vertrouensagente nie"</string>
<string name="add_device_admin_msg" msgid="1501847129819382149">"Aktiveer toesteladministrasieprogram?"</string>
<string name="add_device_admin" msgid="4192055385312215731">"Aktiveer toesteladministrasieprogram"</string>
@@ -3111,7 +3107,7 @@
<string name="keywords_app_default" msgid="5822717006354487071">"Maak oop met"</string>
<string name="keywords_applications_settings" msgid="1268353611121497450">"Programme"</string>
<string name="keywords_time_zone" msgid="998254736898753085">"tydsone"</string>
- <string name="keywords_draw_overlay" msgid="4130899177619041842">"Kletskop-ikoon"</string>
+ <string name="keywords_draw_overlay" msgid="1001120206241401007">"Kletskop, stelsel, opletberig, venster, dialoog, skerm, bo-op ander programme, teken"</string>
<string name="keywords_flashlight" msgid="6161632177705233710">"Flitslig, Lig, Flits"</string>
<string name="keywords_change_wifi_state" msgid="627068244033681010">"wifi, wi-fi, wissel, beheer"</string>
<string name="keywords_more_mobile_networks" msgid="8995946622054642367">"sellulêr, mobiel, selfoondiensverskaffer, draadloos, data, 4g, 3g, 2g, lte"</string>
@@ -3135,7 +3131,7 @@
<string name="keywords_sounds_and_notifications_interruptions" msgid="5426093074031208917">"moenie moenie pla nie, onderbreek, onderbreking, pouse"</string>
<string name="keywords_app" msgid="6334757056536837791">"RAM"</string>
<string name="keywords_location" msgid="4132655528196729043">"naby, ligging, geskiedenis, rapportering, GPS"</string>
- <string name="keywords_accounts" msgid="1957925565953357627">"rekening"</string>
+ <string name="keywords_accounts" msgid="4479029747403203867">"rekening, voeg \'n rekening by, werkprofiel"</string>
<string name="keywords_users" msgid="3434190133131387942">"beperking, beperk, is beperk"</string>
<string name="keywords_keyboard_and_ime" msgid="9143339015329957107">"teksregstelling, korrek, klank, vibreer, outomaties, taal, gebaar, stel voor, voorstel, tema, aanstootlik, woord, tik, emosiekoon, internasionaal"</string>
<string name="keywords_reset_apps" msgid="5293291209613191845">"stel terug, voorkeure, verstek"</string>
@@ -3173,6 +3169,7 @@
<string name="keywords_storage_settings" msgid="297283751968446577">"geheue, kas, data, vee uit, maak skoon, maak beskikbaar, spasie"</string>
<string name="keywords_bluetooth_settings" msgid="6804844062789439858">"gekoppel, toestel, oorfone, kopstuk, luidspreker, draadloos, bind saam, oorfoonknoppies, musiek, media"</string>
<string name="keywords_wallpaper" msgid="5058364390917429896">"agtergrond, skerm, sluitskerm, tema"</string>
+ <string name="keywords_styles" msgid="5828725481814049422">"ikoonvorm, aksentkleur, lettertipe"</string>
<string name="keywords_assist_input" msgid="5017533309492679287">"verstek, assistent"</string>
<string name="keywords_default_payment_app" msgid="3838565809518896799">"betaling, verstek"</string>
<string name="keywords_ambient_display" msgid="3103487805748659132">"inkomende kennisgewing"</string>
@@ -3182,7 +3179,7 @@
<string name="keywords_notification_vibration" msgid="31924624421190547">"raakinteraksie, vibreer, sensitiwiteit"</string>
<string name="keywords_battery_saver_sticky" msgid="5586215686021650278">"batterybespaarder, vaste, volhard, kragbespaarder, battery"</string>
<string name="keywords_battery_saver_schedule" msgid="7358789228486231944">"roetine, skedule, batterybespaarder, kragbespaarder, battery, outomaties, persent"</string>
- <string name="keywords_add_an_account" msgid="6488139919428902434">"werkprofiel"</string>
+ <string name="keywords_enhance_4g_lte" msgid="2273810564244790859">"VolTE, gevorderde oproepe, 4G-oproepe"</string>
<string name="default_sound" msgid="8821684447333687810">"Verstekgeluid"</string>
<string name="sound_settings_summary" msgid="4100853606668287965">"Luivolume op <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
<string name="sound_dashboard_summary" msgid="3402435125958012986">"Volume, vibrasie, Moenie Steur Nie"</string>
@@ -3889,7 +3886,6 @@
<string name="permit_draw_overlay" msgid="7456536798718633432">"Laat toe dat dit bo-oor ander programme wys"</string>
<string name="allow_overlay_description" msgid="8961670023925421358">"Laat hierdie program toe om te wys bo-oor ander programme wat jy gebruik. Dit kan met jou gebruik van daardie programme inmeng of die manier verander waarop hulle voorkom of optree."</string>
<string name="keywords_vr_listener" msgid="7441221822576384680">"vr virtuele realiteit luisteraar stereo helper diens"</string>
- <string name="keywords_system_alert_window" msgid="5049498015597864850">"stelselwaarskuwingvenster-dialoog wys bo-oor ander programme"</string>
<string name="overlay_settings" msgid="6930854109449524280">"Wys bo-oor ander programme"</string>
<string name="system_alert_window_summary" msgid="602892301318324492">"<xliff:g id="COUNT_0">%1$d</xliff:g> van <xliff:g id="COUNT_1">%2$d</xliff:g> programme word toegelaat om oor ander te wys"</string>
<string name="filter_overlay_apps" msgid="6965969283342557573">"Programme met toestemming"</string>
@@ -4125,7 +4121,6 @@
<string name="notification_log_details_none" msgid="184131801230614059">"geen"</string>
<string name="notification_log_details_ranking_null" msgid="244660392058720919">"Graderingvoorwerp ontbreek."</string>
<string name="notification_log_details_ranking_none" msgid="599607025882587844">"Graderingvoorwerp bevat nie hierdie sleutel nie."</string>
- <string name="theme_customization_category" msgid="1049181544004163283">"Temas"</string>
<string name="theme_customization_device_default" msgid="5058147707906551368">"Toestelverstek"</string>
<string name="display_cutout_emulation" msgid="7466869822418376317">"Skermuitsnede"</string>
<string name="display_cutout_emulation_keywords" msgid="4495418317471622562">"skermuitsnede, uitkeep"</string>
@@ -4551,6 +4546,8 @@
<string name="network_connection_errorstate_dialog_message" msgid="6953778550775646710">"Iets het voorgeval. Die program het die versoek gekanselleer om \'n toestel te kies."</string>
<string name="network_connection_connect_successful" msgid="5935510954474494928">"Verbinding suksesvol"</string>
<string name="network_connection_request_dialog_showall" msgid="6938922880244567521">"Wys alles"</string>
+ <string name="network_connection_searching_message" msgid="4638576789450817530">"Soek tans na toestel …"</string>
+ <string name="network_connection_connecting_message" msgid="3740982406609245654">"Koppel tans aan toestel …"</string>
<plurals name="show_bluetooth_devices" formatted="false" msgid="1715020480026568408">
<item quantity="other"><xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> toestelle is gekoppel</item>
<item quantity="one"><xliff:g id="NUMBER_DEVICE_COUNT_0">%1$d</xliff:g> toestel is gekoppel</item>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index 291dbc8..4b2a812 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -360,8 +360,6 @@
<string name="security_enable_widgets_disabled_summary" msgid="6392489775303464905">"በአስተዳዳሪ ተሰናክሏል"</string>
<string name="lockdown_settings_title" msgid="7393790212603280213">"የመቆለፊያ አማራጭን አሳይ"</string>
<string name="lockdown_settings_summary" msgid="4359438673563318171">"Smart Lockን፣ ባዮሜትሪክስን መክፈት እና በማያ ገጹ ቁልፉ ላይ ማሳወቂያዎችን የሚያጠፋ የኃይል አዝራር አማራጩን አሳይ"</string>
- <string name="trust_agents_extend_unlock_title" msgid="2796555263565097031">"የእምነት ወኪሎች መክፈትን ብቻ ነው የሚያስቀጥሉት"</string>
- <string name="trust_agents_extend_unlock_summary" msgid="3976344969220255010">"ከነቃ የእምነት ወኪሎች ለረዥም ጊዜ መሣሪያውን እንደተከፈተ ያቆዩታል፣ ሆኖም ግን የተቆለፈ መሣሪያን ከእንግዲህ መክፈት አይችሉም።"</string>
<string name="trust_lost_locks_screen_title" msgid="2992742466966021682">"እምነት ሲጠፋ ማያ ገጽን ቆልፍ"</string>
<string name="trust_lost_locks_screen_summary" msgid="693784434582021206">"ከነቃ፣ መሣሪያው የመጨረሻው የታመነ ወኪል እምነት ሲያጣ ይቆለፋል"</string>
<string name="owner_info_settings_summary" msgid="7472393443779227052">"ምንም"</string>
@@ -937,6 +935,7 @@
<string name="wifi_eap_identity" msgid="4359453783379679103">"መታወቂያ"</string>
<string name="wifi_eap_anonymous" msgid="2989469344116577955">"ስም አልባ መታወቂያ"</string>
<string name="wifi_password" msgid="5948219759936151048">" የይለፍ ቃል፡"</string>
+ <string name="wifi_sae_password_id" msgid="1697832722221765763">"SAE የይለፍ ቃል ለዪ"</string>
<string name="wifi_show_password" msgid="6461249871236968884">"የይለፍ ቃል አሳይ"</string>
<string name="wifi_ap_band_config" msgid="1611826705989117930">"የመዳረሻ ነጥብ ባንድ ይምረጡ"</string>
<string name="wifi_ap_choose_auto" msgid="2677800651271769965">"ራስ-ሰር"</string>
@@ -957,7 +956,6 @@
<string name="wifi_dpp_share_wifi" msgid="9065890131734833809">"Wi‑Fiን አጋራ"</string>
<string name="wifi_dpp_scan_qr_code_with_another_device" msgid="5854392840857123065">"ወደ «<xliff:g id="SSID">%1$s</xliff:g>»ን ለማገናኘት ይህን የQR ኮድ ይቃኙ እና የይለፍ ቃሉን ያጋሩ"</string>
<string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="4436318319178361543">"ወደ «<xliff:g id="SSID">%1$s</xliff:g>» ለማገናኘት ይህን የQR ኮድ ይቃኙት"</string>
- <string name="wifi_dpp_could_not_detect_valid_qr_code" msgid="641893675646330576">"የQR ኮድን ማንበብ አልተቻለም። ኮድን ዳግም ያማክሉና እንደገና ይሞክሩ"</string>
<string name="wifi_dpp_failure_authentication_or_configuration" msgid="3372757783382381044">"እንደገና ይሞክሩ። ችግሩ ከቀጠለ የመሣሪያ አምራቹን ያነጋግሩ"</string>
<string name="wifi_dpp_failure_not_compatible" msgid="2829930473520603740">"የሆነ ችግር ተፈጥሯል"</string>
<string name="wifi_dpp_failure_timeout" msgid="5228320772245820458">"መሣሪያው መሰካቱን፣ ኃይል መሙላቱን እና መብራቱን ያረጋግጡ"</string>
@@ -980,6 +978,7 @@
<string name="wifi_dpp_hotspot_password" msgid="4120419278831581613">"የመገናኛ ነጥብ የይለፍ ቃል፦ <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
<string name="wifi_dpp_add_device" msgid="4072206063308645677">"መሣሪያ ያክሉ"</string>
<string name="wifi_dpp_connect_network_using_qr_code" msgid="3887335309163999665">"አንድ መሣሪያ ወደዚህ አውታረ መረብ ለማከል የQR ኮድ ይጠቀሙ"</string>
+ <string name="wifi_dpp_qr_code_is_not_valid_format" msgid="3700087439867692944">"QR ኮድ ልክ ያልኾነ ቅርጸት ነው"</string>
<string name="retry" msgid="6472609612090877557">"እንደገና ይሞክሩ"</string>
<string name="wifi_shared" msgid="844142443226926070">"ለሌሎች የመሣሪያ ተጠቃሚዎች አጋራ"</string>
<string name="wifi_unchanged" msgid="3410422020930397102">"(ያልተለወጠ)"</string>
@@ -1129,6 +1128,7 @@
<string name="emergency_address_title" msgid="932729250447887545">"የአስቸኳይ አደጋ አድራሻ"</string>
<string name="emergency_address_summary" msgid="7751971156196115129">"በWi-Fi ላይ የአስቸኳይ አደጋ ጥሪ ሲያደርጉ እንደ የእርስዎ አካባቢ ሆኖ ስራ ላይ ይውላል"</string>
<string name="private_dns_help_message" msgid="3299567069152568958">"ስለግል ዲኤንኤስ ባህሪያት "<annotation id="url">"የበለጠ ይረዱ"</annotation></string>
+ <string name="private_dns_mode_on" msgid="5882613439541371003">"በርቷል"</string>
<string name="wifi_calling_pref_managed_by_carrier" msgid="6845711858866828986">"ቅንብር የሚተዳደረው በአገልግሎት አቅራቢ ነው"</string>
<string name="wifi_calling_settings_activation_instructions" msgid="7492509632478260955">"የWi-Fi ጥሪ አደራረግን አግብር"</string>
<string name="wifi_calling_turn_on" msgid="1171403510313983983">"Wi-Fi Callingን ያብሩ"</string>
@@ -1872,7 +1872,7 @@
<string name="default_emergency_app" msgid="1951760659640369980">"የድንገተኛ አደጋ መተግበሪያ"</string>
<string name="reset_app_preferences" msgid="1321050641018356925">"የመተግበሪያዎች ምርጫዎችን ዳግም አስጀምር"</string>
<string name="reset_app_preferences_title" msgid="6093179367325336662">"የመተግበሪያዎች ምርጫዎች ዳግም ይጀመሩ?"</string>
- <string name="reset_app_preferences_desc" msgid="4822447731869201512">"ይሄ ሁሉንም የእነኚህ ምርጫዎችን ዳግም ያስጀምራቸዋል፦\n\n "<li>"የተሰናከሉ መተግበሪያዎች"</li>\n" "<li>"የተሰናከሉ መተግበሪያ ማሳወቂያዎች"</li>\n" "<li>"ለሁሉም እርምጃዎች ነባሪ መተግበሪያዎች"</li>\n" "<li>"የመተግበሪያዎች የጀርባ ውሂብ ገደቦች"</li>\n" "<li>"ማንኛቸውም የፍቃድ ገደቦች"</li>\n\n"ምንም የመተግበሪያ ውሂብ አይጠፋብዎትም።"</string>
+ <string name="reset_app_preferences_desc" msgid="731757609326016760">"ይሄ ሁሉንም የእነኚህ ምርጫዎች ዳግም ያስጀምራቸዋል፦\n\n"<li>"የተሰናከሉ መተግበሪያዎች"</li>\n<li>"የተሰናከሉ መተግበሪያ ማሳወቂያዎች"</li>\n<li>"ለእርምጃዎች ነባሪ መተግበሪያዎች"</li>\n<li>"ለመተግበሪያዎች የጀርባ ውሂብ ገደቦች"</li>\n<li>"ማናቸውም የፈቃድ ገደቦች"</li>\n\n"ምንም የመተግበሪያ ውሂብ አይጠፋብዎትም።"</string>
<string name="reset_app_preferences_button" msgid="2559089511841281242">"መተግበሪያዎችን ዳግም አስጀምር"</string>
<string name="manage_space_text" msgid="8852711522447794676">"ባዶ ቦታ አደራጅ"</string>
<string name="filter" msgid="2018011724373033887">"አጣራ"</string>
@@ -2087,7 +2087,7 @@
<string name="accessibility_screen_magnification_short_summary" msgid="3411979839172752057">"ለማጉላት 3 ጊዜ መታ ያድርጉ"</string>
<string name="accessibility_screen_magnification_navbar_short_summary" msgid="3693116360267980492">"ለማጉላት አንድ አዝራር መታ ያድርጉ"</string>
<string name="accessibility_screen_magnification_summary" msgid="5258868553337478505"><b>"ለማጉላት"</b>" ማያ ገጹን በፍጥነት 3 ጊዜ መታ ያድርጉት።\n"<ul><li>"ለማሸብለል 2 ወይም ተጨማሪ ጣቶችን ይጎትቱ"</li>\n<li>"ማጉላትን ለማስተካከል በ2 ወይም ተጨማሪ ጣቶች ይቆንጥጡ"</li></ul>\n\n<b>"ለጊዜው ለማጉላት"</b>" ማያ ገጹን በፍጥነት ሶስቴ መታ ያድርጉና ለሶስተኛ ጊዜ መታ ሲያደርጉት በዚያው ያዝ ያድርጉት።\n"<ul><li>"በማያ ገጹ ላይ ለማንቀሳቀስ ይጎትቱ"</li>\n<li>"ለማሳነስ ጣት ያንሱ"</li></ul>\n\n"ቁልፍ ሰሌዳውን እና የአሰሳ አሞሌውን ማጉላት አይችሉም።"</string>
- <string name="accessibility_screen_magnification_navbar_summary" msgid="2272878354599332009">"ማጉያ ሲበራ ማያ ገጽዎን ማጉላት ይችላሉ።\n\n"<b>"ለማጉላት"</b>" ማጉያን ያስጀምሩ፣ ከዚያ በማያ ገጹ ማንኛውም ክፍል ላይ መታ ያድርጉ።\n"<ul><li>"• ለማሸብለል 2 ወይም ተጨማሪ ጣቶችን ይጎትቱ"</li>\n<li>"• ማጉያን ለማስተካከል በ2 ወይም ተጨማሪ ጣቶችን ይቆንጥጡ"</li></ul>\n\n<b>"ለጊዜው ለማጉላት"</b>" ማጉያን ያስጀምሩ፣ ከዚያ በማያ ገጹ ማንኛውም ቦታ ላይ ነክተው ይያዙ።\n"<ul><li>"• በማያ ገጹ ዙሪያ ለመንቀሳቀስ ይጎትቱ"</li>\n<li>"• ለማሳነስ ጣትን ያንሱ"</li></ul>\n\n"ቁልፍ ሰሌዳውን ወይም የመዳሰሻ አሞሌውን ማጉላት አይችሉም።"</string>
+ <string name="accessibility_screen_magnification_navbar_summary" msgid="6700716275347612310">"ማጉያ ሲበራ ማያ ገጽዎን ማጉላት ይችላሉ።\n\n"<b>"ለማጉላት"</b>"፣ ማጉያን ያስጀምሩ፣ ከዚያ በማያ ገጹ ማንኛውም ክፍል ላይ መታ ያድርጉ።\n"<ul><li>"ለማሸብለል 2 ወይም ተጨማሪ ጣቶችን ይጎትቱ"</li>\n<li>"ማጉላትን ለማስተካከል በ2 ወይም ተጨማሪ ጣቶችን ይቆንጥጡ"</li></ul>\n\n<b>"ለጊዜው ለማጉላት"</b>"፣ ማጉላትን ይጀምሩ፣ በመቀጠል በማያ ገጹ ላይ በማናቸውም ቦታ ላይ ነካ ያድርጉ እና ይያዙ።\n"<ul><li>"በማያ ገጹ ላይ ለማንቀሳቀስ ይጎትቱ"</li>\n<li>"ከማጉላት ለመውጣት ጣትን ያንሡ"</li></ul>\n\n"ቁልፍ ሰሌዳውን ወይም የአሰሳ አሞሌውን ማጉላት አይችሉም።"</string>
<string name="accessibility_tutorial_dialog_title_button" msgid="3682222614034474845">"ለመክፈት የተደራሽነት አዝራር ይጠቀሙ"</string>
<string name="accessibility_tutorial_dialog_title_gesture" msgid="1342726230497913398">"ለመክፈት የጣት ምልክትን ይጠቀሙ"</string>
<string name="accessibility_tutorial_dialog_title_gesture_settings" msgid="8539392614235820285">"አዲስ የተደራሽነት የጣት ምልክትን ይጠቀሙ"</string>
@@ -2140,8 +2140,7 @@
<string name="accessibility_hearingaid_title" msgid="8312145423610648518">"አጋዥ መስሚያዎች"</string>
<string name="accessibility_hearingaid_not_connected_summary" msgid="6240237523789614599">"ምንም አጋዥ መስሚያዎች አልተገናኙም"</string>
<string name="accessibility_hearingaid_adding_summary" msgid="2947474468412309778">"የአጋዥ መስሚያዎችን ያክሉ"</string>
- <string name="accessibility_hearingaid_pair_instructions_first_message" msgid="3912093691643131154">"የእርስዎን አጋዥ መስሚያዎች ለማጣመር የእርስዎን መሣሪያ በቀጣዩ ማያ ገጽ ላይ ያግኙ እና መታ ያድርጉት።"</string>
- <string name="accessibility_hearingaid_pair_instructions_second_message" msgid="5596683393607650243">"የእርስዎ አጋዥ መስሚያዎች በእርስዎ የጥምረት ሁነታ ውስጥ መሆኑን ያረጋግጡ።"</string>
+ <string name="accessibility_hearingaid_pair_instructions_message" msgid="3094382949733435414">"የእርስዎን አጋዥ መስሚያዎች ለማጣመር የእርስዎን መሣሪያ በቀጣዩ ማያ ገጽ ላይ ያግኙ እና መታ ያድርጉት። የእርስዎ አጋዥ መስሚያዎች በእርስዎ የጥምረት ሁነታ ውስጥ መሆኑን ያረጋግጡ።"</string>
<string name="accessibility_hearingaid_active_device_summary" msgid="3924362383258688984">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ገቢር ነው"</string>
<plurals name="show_number_hearingaid_count" formatted="false" msgid="3160782397139295486">
<item quantity="one"><xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> የተቀመጡ አጋዥ መስሚያዎች</item>
@@ -2490,7 +2489,6 @@
<string name="menu_stats_last_unplugged" msgid="5922246077592434526">"በመጨረሻ ለ<xliff:g id="UNPLUGGED">%1$s</xliff:g> አልተሰካም"</string>
<string name="menu_stats_total" msgid="8973377864854807854">"ጠቅላላ አጠቃቀም"</string>
<string name="menu_stats_refresh" msgid="1676215433344981075">"አድስ"</string>
- <string name="process_kernel_label" msgid="3916858646836739323">"Android ስርዓተ ክወና"</string>
<string name="process_mediaserver_label" msgid="6500382062945689285">"ማህደረ መረጃ አገልጋይ"</string>
<string name="process_dex2oat_label" msgid="2592408651060518226">"የመተግበሪያ ማትባት"</string>
<string name="battery_saver" msgid="8172485772238572153">"ባትሪ ቆጣቢ"</string>
@@ -2621,8 +2619,6 @@
<string name="no_device_admins" msgid="4846602835339095768">"ምንም የመሣሪያ አስተዳዳሪ መተግበሪያዎች አይገኙም"</string>
<string name="personal_device_admin_title" msgid="2849617316347669861">"የግል"</string>
<string name="managed_device_admin_title" msgid="7853955652864478435">"ስራ"</string>
- <string name="sms_access_restriction_enabled" msgid="7054488078710530278">"የኤስኤምኤስ እና የጥሪ ምዝግብ መዳረሻን ገድብ"</string>
- <string name="sms_access_restriction_enabled_summary" msgid="6851339654677842328">"ነባሪ የስልክ እና የመልዕክት መላላኪያ መተግበሪያዎች ብቻ የኤስኤምኤስ እና የጥሪ ምዝግብ ማስታወሻ ፈቃዶች አላቸው"</string>
<string name="no_trust_agents" msgid="7450273545568977523">"ምንም የሚገኙ የተአማኒነት ወኪሎች የሉም"</string>
<string name="add_device_admin_msg" msgid="1501847129819382149">"የመሣሪያ አስተዳዳሪ መተግበሪያ ገቢር ይሁን?"</string>
<string name="add_device_admin" msgid="4192055385312215731">"የዚህ መሣሪያ አስተዳዳሪ መተግበሪያን አግብር"</string>
@@ -3111,7 +3107,7 @@
<string name="keywords_app_default" msgid="5822717006354487071">"ክፈት በ"</string>
<string name="keywords_applications_settings" msgid="1268353611121497450">"መተግበሪያዎች"</string>
<string name="keywords_time_zone" msgid="998254736898753085">"የጊዜ ሰቅ"</string>
- <string name="keywords_draw_overlay" msgid="4130899177619041842">"የውይይት አናት"</string>
+ <string name="keywords_draw_overlay" msgid="1001120206241401007">"የውይይት አናት፣ ሥርዓት፣ ማንቂያ፣ መስኮት፣ መገናኛ፣ ማሳያ፣ በሌሎች መተግበሪያዎች ላይ፣ ሳል"</string>
<string name="keywords_flashlight" msgid="6161632177705233710">"የእጅ መብራት፣ ብርሃን፣ ላምባዲና"</string>
<string name="keywords_change_wifi_state" msgid="627068244033681010">"wifi፣ wi-fi፣ ቀያይር፣ ቁጥጥር"</string>
<string name="keywords_more_mobile_networks" msgid="8995946622054642367">"የተንቀሳቃሽ ስልክ፣ የተንቀሳቃሽ ስልክ አገልግሎት አቅራቢ፣ ገመድ-አልባ፣ ውሂብ፣ 4ጂ፣ 3ጂ፣ 2ጂ፣ lte"</string>
@@ -3135,7 +3131,7 @@
<string name="keywords_sounds_and_notifications_interruptions" msgid="5426093074031208917">"አትረብሽ፣ አቋርጥ፣ ማቋረጥ፣ እረፍት"</string>
<string name="keywords_app" msgid="6334757056536837791">"RAM"</string>
<string name="keywords_location" msgid="4132655528196729043">"አቅራቢያ፣ አካባቢ፣ ታሪክ፣ ሪፖርት ማድረግ"</string>
- <string name="keywords_accounts" msgid="1957925565953357627">"መለያ"</string>
+ <string name="keywords_accounts" msgid="4479029747403203867">"መለያ፣ መለያ አክል፣ የሥራ መገለጫ"</string>
<string name="keywords_users" msgid="3434190133131387942">"ገደብ፣ ገድብ፣ የተገደበ"</string>
<string name="keywords_keyboard_and_ime" msgid="9143339015329957107">"የጽሑፍ እርማት፣ ትክክል፣ ድምፅ፣ ንዘር፣ ራስ-ሰር፣ ቋንቋ፣ የጣት ምልክት፣ ጠቁም፣ የአስተያየት ጥቆማ፣ ገጽታ፣ የሚያስከፋ፣ ቃል፣ ተይብ፣ ስሜት ገላጭ ምስል፣ አለምአቀፍ"</string>
<string name="keywords_reset_apps" msgid="5293291209613191845">"ዳግም አስጀምር፣ ምርጫዎች፣ ነባሪ"</string>
@@ -3173,6 +3169,7 @@
<string name="keywords_storage_settings" msgid="297283751968446577">"ማህደረ ትውስታ፣ ውሂብ፣ ሰርዝ፣ አፅዳ፣ ነጻ፣ ባዶ ቦታ"</string>
<string name="keywords_bluetooth_settings" msgid="6804844062789439858">"ተገናኝቷል፣ መሣሪያ፣ የጆሮ ማዳመጫዎች፣ ማዳመጫዎች፣ ስፒከር፣ ገመድ አልባ፣ አጣምር፣ ጆሮ ተሰኪዎች፣ ሙዚቃ፣ ማህደረ መረጃ"</string>
<string name="keywords_wallpaper" msgid="5058364390917429896">"በስተጀርባ፣ ማያ ገጽ፣ ማያ ገጽ መቆለፊያ፣ ገጽታ"</string>
+ <string name="keywords_styles" msgid="5828725481814049422">"አዶ ቅርጽ፣ የድፋት ቀለም፣ ቅርጸ ቁምፊ"</string>
<string name="keywords_assist_input" msgid="5017533309492679287">"ነባሪ፣ ረዳት"</string>
<string name="keywords_default_payment_app" msgid="3838565809518896799">"ክፍያ፣ ነባሪ"</string>
<string name="keywords_ambient_display" msgid="3103487805748659132">"ገቢ ማሳወቂያ"</string>
@@ -3182,7 +3179,7 @@
<string name="keywords_notification_vibration" msgid="31924624421190547">"ሃፕቲክስ፣ ንዘር፣ አደገኛነት"</string>
<string name="keywords_battery_saver_sticky" msgid="5586215686021650278">"ባትሪ ቆጣቢ፣ ተለጣፊ፣ ጽና፣ የኃይል ቆጣቢ፣ ባትሪ"</string>
<string name="keywords_battery_saver_schedule" msgid="7358789228486231944">"ዕለታዊ ተግባር፣ መርሐግብር፣ ባትሪ ቆጣቢ፣ ኃይል ቆጣቢ፣ ባትሪ፣ ራስ-ሰር፣ በመቶ"</string>
- <string name="keywords_add_an_account" msgid="6488139919428902434">"የሥራ መገለጫ"</string>
+ <string name="keywords_enhance_4g_lte" msgid="2273810564244790859">"ቮልት፣ የላቀ ጥሪ አደራረግ፣ 4g ጥሪ አደራረግ"</string>
<string name="default_sound" msgid="8821684447333687810">"ነባሪ ድምፅ"</string>
<string name="sound_settings_summary" msgid="4100853606668287965">"የጥሪ ድምጽ መጠን <xliff:g id="PERCENTAGE">%1$s</xliff:g> ላይ"</string>
<string name="sound_dashboard_summary" msgid="3402435125958012986">"ድምፅ፣ ንዝረት፣ አትረብሽ"</string>
@@ -3889,7 +3886,6 @@
<string name="permit_draw_overlay" msgid="7456536798718633432">"በሌሎች መተግበሪያዎች ላይ ማሳየትን ፍቀድ"</string>
<string name="allow_overlay_description" msgid="8961670023925421358">"ይህ መተግበሪያ እየተጠቀሙ ባሉ ሌሎች መተግበሪያዎች ላይ እንዲያሳይ ይፍቀዱለት። በእነዚያ መተግበሪያዎች አጠቃቀምዎ ላይ ጣልቃ ሊገባ፣ ወይም መልካቸውን ወይም ባህሪያቸው ሊቀይር ይችላል።"</string>
<string name="keywords_vr_listener" msgid="7441221822576384680">"ምናባዊ ዕውነታ አዳማጭ ስቲሪዮ አጋዥ አገልግሎት"</string>
- <string name="keywords_system_alert_window" msgid="5049498015597864850">"ሥርዓት ማንቂያ መስኮት መገናኛ ማሳያ በሌሎች መተግበሪያዎች ላይ አሳይ"</string>
<string name="overlay_settings" msgid="6930854109449524280">"በሌሎች መተግበሪያዎች ላይ አሳይ"</string>
<string name="system_alert_window_summary" msgid="602892301318324492">"<xliff:g id="COUNT_0">%1$d</xliff:g> ከ<xliff:g id="COUNT_1">%2$d</xliff:g> መተግበሪያዎች በሌሎች መተግበሪያዎች ላይ እንዲያሳዩ ተፈቅዶላቸዋል"</string>
<string name="filter_overlay_apps" msgid="6965969283342557573">"ፍቃድ ያላቸው መተግበሪያዎች"</string>
@@ -4125,7 +4121,6 @@
<string name="notification_log_details_none" msgid="184131801230614059">"ምንም"</string>
<string name="notification_log_details_ranking_null" msgid="244660392058720919">"ደረጃ ያለው ነገር ይጎድላል።"</string>
<string name="notification_log_details_ranking_none" msgid="599607025882587844">"ደረጃ ያለው ነገር ይህን ቁልፍ አይዝም።"</string>
- <string name="theme_customization_category" msgid="1049181544004163283">"ገጽታ በማዘጋጀት ላይ"</string>
<string name="theme_customization_device_default" msgid="5058147707906551368">"የመሣሪያ ነባሪ"</string>
<string name="display_cutout_emulation" msgid="7466869822418376317">"የማሳያ ቅርጽ"</string>
<string name="display_cutout_emulation_keywords" msgid="4495418317471622562">"የማሳያ ቅርጽ፣ ስርጉድ"</string>
@@ -4551,6 +4546,8 @@
<string name="network_connection_errorstate_dialog_message" msgid="6953778550775646710">"የሆነ ነገር መጥቷል። መተግበሪያው መሣሪያን የመምረጥ ጥያቄውን ሰርዞታል።"</string>
<string name="network_connection_connect_successful" msgid="5935510954474494928">"ግንኙነት ተሳክቷል"</string>
<string name="network_connection_request_dialog_showall" msgid="6938922880244567521">"ሁሉንም አሳይ"</string>
+ <string name="network_connection_searching_message" msgid="4638576789450817530">"መሣሪያ በመፈለግ ላይ…"</string>
+ <string name="network_connection_connecting_message" msgid="3740982406609245654">"ወደ መሣሪያ በማገናኘት ላይ…"</string>
<plurals name="show_bluetooth_devices" formatted="false" msgid="1715020480026568408">
<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>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 652cb5b..63392fb 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -368,8 +368,6 @@
<string name="security_enable_widgets_disabled_summary" msgid="6392489775303464905">"تم إيقاف الإعداد بواسطة المشرف"</string>
<string name="lockdown_settings_title" msgid="7393790212603280213">"عرض خيار التأمين"</string>
<string name="lockdown_settings_summary" msgid="4359438673563318171">"عرض خيار زر التشغيل الذي يوقِف Smart Lock، وفتح القفل باستخدام البيانات الحيوية، والإشعارات على شاشة التأمين"</string>
- <string name="trust_agents_extend_unlock_title" msgid="2796555263565097031">"بإمكان الوكلاء المعتمَدين تمديد فتح القفل فقط"</string>
- <string name="trust_agents_extend_unlock_summary" msgid="3976344969220255010">"في حال تفعيل هذه الميزة، سيُبقي الوكلاء المعتمَدون الجهاز مفتوحًا لوقت أطول، إلا أنّهم لن يتمكنوا بعد ذلك من فتح جهاز تمّ قفله."</string>
<string name="trust_lost_locks_screen_title" msgid="2992742466966021682">"قفل الشاشة عند فقدان الثقة"</string>
<string name="trust_lost_locks_screen_summary" msgid="693784434582021206">"في حال تفعيل الميزة، سيتم قفل الجهاز عندما يفقد الوكيل المعتمد الأخير الثقة."</string>
<string name="owner_info_settings_summary" msgid="7472393443779227052">"بدون"</string>
@@ -1001,6 +999,7 @@
<string name="wifi_eap_identity" msgid="4359453783379679103">"الهوية"</string>
<string name="wifi_eap_anonymous" msgid="2989469344116577955">"هوية مجهولة"</string>
<string name="wifi_password" msgid="5948219759936151048">"كلمة المرور"</string>
+ <string name="wifi_sae_password_id" msgid="1697832722221765763">"معرّف كلمة مرور SAE"</string>
<string name="wifi_show_password" msgid="6461249871236968884">"إظهار كلمة المرور"</string>
<string name="wifi_ap_band_config" msgid="1611826705989117930">"تحديد نطاق AP"</string>
<string name="wifi_ap_choose_auto" msgid="2677800651271769965">"تلقائي"</string>
@@ -1021,7 +1020,6 @@
<string name="wifi_dpp_share_wifi" msgid="9065890131734833809">"مشاركة اتصال Wi‑Fi"</string>
<string name="wifi_dpp_scan_qr_code_with_another_device" msgid="5854392840857123065">"يمكنك مسح رمز الاستجابة السريعة هذا ضوئيًا للاتصال بشبكة \"<xliff:g id="SSID">%1$s</xliff:g>\" ومشاركة كلمة المرور."</string>
<string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="4436318319178361543">"يمكنك مسح رمز الاستجابة السريعة ضوئيًا للاتصال بشبكة \"<xliff:g id="SSID">%1$s</xliff:g>\""</string>
- <string name="wifi_dpp_could_not_detect_valid_qr_code" msgid="641893675646330576">"تعذَّرت قراءة رمز الاستجابة السريعة. يُرجى إعادة توسيط الرمز والمحاولة مرة أخرى."</string>
<string name="wifi_dpp_failure_authentication_or_configuration" msgid="3372757783382381044">"يُرجى إعادة المحاولة. وإذا استمرّت المشكلة، عليك الاتصال بالشركة المصنِّعة للجهاز."</string>
<string name="wifi_dpp_failure_not_compatible" msgid="2829930473520603740">"حدث خطأ."</string>
<string name="wifi_dpp_failure_timeout" msgid="5228320772245820458">"تأكَّد من أنه تمّ توصيل الجهاز وشحنه وتشغيله."</string>
@@ -1044,6 +1042,7 @@
<string name="wifi_dpp_hotspot_password" msgid="4120419278831581613">"كلمة مرور نقطة الاتصال: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
<string name="wifi_dpp_add_device" msgid="4072206063308645677">"إضافة جهاز"</string>
<string name="wifi_dpp_connect_network_using_qr_code" msgid="3887335309163999665">"استخدِم رمز استجابة سريعة لإضافة جهاز إلى هذه الشبكة."</string>
+ <string name="wifi_dpp_qr_code_is_not_valid_format" msgid="3700087439867692944">"تنسيق رمز الاستجابة السريعة غير صالح."</string>
<string name="retry" msgid="6472609612090877557">"إعادة المحاولة"</string>
<string name="wifi_shared" msgid="844142443226926070">"المشاركة مع مستخدمي الجهاز الآخرين"</string>
<string name="wifi_unchanged" msgid="3410422020930397102">"(لم يتم التغيير)"</string>
@@ -1205,6 +1204,7 @@
<string name="emergency_address_title" msgid="932729250447887545">"عنوان الطوارئ"</string>
<string name="emergency_address_summary" msgid="7751971156196115129">"يتم اعتباره موقعك الجغرافي عند إجراء مكالمة طوارئ عبر Wi‑Fi"</string>
<string name="private_dns_help_message" msgid="3299567069152568958"><annotation id="url">"مزيد من المعلومات"</annotation>" عن ميزات نظام أسماء النطاقات الخاص"</string>
+ <string name="private_dns_mode_on" msgid="5882613439541371003">"مفعَّل"</string>
<string name="wifi_calling_pref_managed_by_carrier" msgid="6845711858866828986">"الإعداد تحت إدارة مشغّل شبكة الجوّال"</string>
<string name="wifi_calling_settings_activation_instructions" msgid="7492509632478260955">"تفعيل الاتصال عبر Wi‑Fi"</string>
<string name="wifi_calling_turn_on" msgid="1171403510313983983">"تشغيل الاتصال عبر Wi-Fi"</string>
@@ -1960,7 +1960,7 @@
<string name="default_emergency_app" msgid="1951760659640369980">"تطبيق الطوارئ"</string>
<string name="reset_app_preferences" msgid="1321050641018356925">"إعادة ضبط الإعدادات المفضّلة للتطبيقات"</string>
<string name="reset_app_preferences_title" msgid="6093179367325336662">"هل تريد إعادة ضبط الإعدادات المفضّلة للتطبيقات؟"</string>
- <string name="reset_app_preferences_desc" msgid="4822447731869201512">"سيؤدي هذا إلى إعادة ضبط كل الإعدادات المفضّلة لما يلي:\n\n "<li>"التطبيقات غير المفعّلة"</li>\n" "<li>"إشعارات التطبيقات غير المفعّلة"</li>\n" "<li>"التطبيقات التلقائية للإجراءات"</li>\n" "<li>"القيود على البيانات الخلفية للتطبيقات"</li>\n" "<li>"القيود على الأذونات"</li>\n\n"لن تفقد أي بيانات للتطبيقات."</string>
+ <string name="reset_app_preferences_desc" msgid="731757609326016760">"يؤدي ذلك إلى إعادة ضبط جميع الإعدادات المفضَّلة لما يلي:\n\n"<li>"التطبيقات الموقوفة"</li>\n<li>"إشعارات التطبيقات الموقوفة"</li>\n<li>"التطبيقات التلقائية للإجراءات"</li>\n<li>"قيود بيانات الخلفية للتطبيقات"</li>\n<li>"أيّ قيود على الأذونات"</li>\n\n"ولن تفقد أيّ بيانات للتطبيقات."</string>
<string name="reset_app_preferences_button" msgid="2559089511841281242">"إعادة ضبط التطبيقات"</string>
<string name="manage_space_text" msgid="8852711522447794676">"إدارة المساحة"</string>
<string name="filter" msgid="2018011724373033887">"تصفية"</string>
@@ -2175,7 +2175,7 @@
<string name="accessibility_screen_magnification_short_summary" msgid="3411979839172752057">"انقر ٣ مرات للتكبير."</string>
<string name="accessibility_screen_magnification_navbar_short_summary" msgid="3693116360267980492">"انقر على أحد الأزرار للتكبير"</string>
<string name="accessibility_screen_magnification_summary" msgid="5258868553337478505"><b>"للتكبير/التصغير"</b>"، انقر على الشاشة 3 مرات بسرعة.\n"<ul><li>"اسحب بإصبعين أو أكثر للتمرير"</li>\n<li>"اضغط بإصبعين أو أكثر على الشاشة لضبط التكبير/التصغير"</li></ul>\n\n<b>"للتكبير/التصغير مؤقتًا"</b>"، انقر على الشاشة 3 مرات بسرعة واستمر بالضغط بإصبعك بعد النقرة الثالثة.\n"<ul><li>"اسحب للتنقل على الشاشة"</li>\n<li>"ارفع إصبعك للتصغير"</li></ul>\n\n"لا يمكنك استخدام التكبير عند استخدام لوحة المفاتيح وشريط التنقل."</string>
- <string name="accessibility_screen_magnification_navbar_summary" msgid="2272878354599332009">"عند تفعيل ميزة التكبير، يمكنك تكبير حجم المحتوى على الشاشة.\n\n"<b>"للتكبير"</b>"، يمكنك تفعيل ميزة التكبير والنقر بعد ذلك على أي مكان في الشاشة.\n"<ul><li>"• يمكنك سحب إصبعين أو أكثر للتمرير"</li>\n<li>"• يمكنك ضمّ إصبعين أو أكثر لتعديل حجم المحتوى"</li></ul>\n\n<b>"للتكبير مؤقتًا"</b>"، يمكنك تفعيل ميزة التكبير والنقر مع الاستمرار على أي مكان في الشاشة.\n"<ul><li>"• يمكنك السحب للتنقّل داخل الشاشة"</li>\n<li>"• يمكنك رفع إصبعك للتصغير"</li></ul>\n\n"لن يكون بإمكانك التكبير على لوحة المفاتيح أو شريط التنقل."</string>
+ <string name="accessibility_screen_magnification_navbar_summary" msgid="6700716275347612310">"عند تفعيل ميزة \"التكبير\"، يمكنك تكبير حجم المحتوى على الشاشة.\n\n"<b>"للتكبير"</b>"، يمكنك تفعيل ميزة \"التكبير\" والنقر بعد ذلك على أي مكان في الشاشة.\n"<ul><li>"يمكنك سحب إصبعين أو أكثر للتمرير."</li>\n<li>"يمكنك ضمّ إصبعين أو أكثر لتعديل حجم المحتوى."</li></ul>\n\n<b>"للتكبير مؤقتًا"</b>"، يمكنك تفعيل ميزة التكبير والنقر مع الاستمرار على أي مكان في الشاشة.\n"<ul><li>"يمكنك السحب للتنقّل داخل الشاشة."</li>\n<li>"يمكنك رفع إصبعك للتصغير."</li></ul>\n\n"لن يكون بإمكانك التكبير على لوحة المفاتيح أو شريط التنقل."</string>
<string name="accessibility_tutorial_dialog_title_button" msgid="3682222614034474845">"استخدام زر \"سهولة الاستخدام\" في الفتح"</string>
<string name="accessibility_tutorial_dialog_title_gesture" msgid="1342726230497913398">"الفتح بإيماءة"</string>
<string name="accessibility_tutorial_dialog_title_gesture_settings" msgid="8539392614235820285">"استخدام إيماءة \"سهولة الاستخدام\" الجديدة"</string>
@@ -2228,8 +2228,7 @@
<string name="accessibility_hearingaid_title" msgid="8312145423610648518">"سماعات الأذن الطبية"</string>
<string name="accessibility_hearingaid_not_connected_summary" msgid="6240237523789614599">"لم يتم توصيل سماعات أذن طبية"</string>
<string name="accessibility_hearingaid_adding_summary" msgid="2947474468412309778">"إضافة سمّاعات الأذن الطبية"</string>
- <string name="accessibility_hearingaid_pair_instructions_first_message" msgid="3912093691643131154">"لإقران سماعات الأذن الطبية، ابحث عن جهازك ثم انقر عليه في الشاشة التالية."</string>
- <string name="accessibility_hearingaid_pair_instructions_second_message" msgid="5596683393607650243">"تأكد من أن سماعات الأذن الطبية في وضع الإقران."</string>
+ <string name="accessibility_hearingaid_pair_instructions_message" msgid="3094382949733435414">"لإقران سماعات الأذن الطبية، ابحث عن جهازك ثم انقر عليه في الشاشة التالية. احرص على أن تكون سماعات الأذن الطبية في وضع الإقران."</string>
<string name="accessibility_hearingaid_active_device_summary" msgid="3924362383258688984">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> مفعَّل"</string>
<plurals name="show_number_hearingaid_count" formatted="false" msgid="3160782397139295486">
<item quantity="zero">تم حفظ <xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> سماعة أذن طبية</item>
@@ -2638,7 +2637,6 @@
<string name="menu_stats_last_unplugged" msgid="5922246077592434526">"أثناء آخر فترة من عدم التوصيل بـ <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
<string name="menu_stats_total" msgid="8973377864854807854">"إجمالي الاستخدام"</string>
<string name="menu_stats_refresh" msgid="1676215433344981075">"تحديث"</string>
- <string name="process_kernel_label" msgid="3916858646836739323">"نظام التشغيل Android"</string>
<string name="process_mediaserver_label" msgid="6500382062945689285">"خادم الوسائط"</string>
<string name="process_dex2oat_label" msgid="2592408651060518226">"تحسين التطبيقات"</string>
<string name="battery_saver" msgid="8172485772238572153">"توفير شحن البطارية"</string>
@@ -2769,8 +2767,6 @@
<string name="no_device_admins" msgid="4846602835339095768">"لا تتوفر تطبيقات لمشرف الجهاز"</string>
<string name="personal_device_admin_title" msgid="2849617316347669861">"شخصي"</string>
<string name="managed_device_admin_title" msgid="7853955652864478435">"العمل"</string>
- <string name="sms_access_restriction_enabled" msgid="7054488078710530278">"تقييد الوصول إلى الرسائل القصيرة وسجلّ المكالمات"</string>
- <string name="sms_access_restriction_enabled_summary" msgid="6851339654677842328">"منح أذونات الوصول إلى الرسائل القصيرة وسجلّ المكالمات لتطبيقات الرسائل والهاتف التلقائية فقط"</string>
<string name="no_trust_agents" msgid="7450273545568977523">"ليس هناك وكلاء معتمدون متاحون"</string>
<string name="add_device_admin_msg" msgid="1501847129819382149">"هل تريد تفعيل تطبيق مشرف الجهاز؟"</string>
<string name="add_device_admin" msgid="4192055385312215731">"تفعيل تطبيق مشرف الجهاز هذا"</string>
@@ -3279,7 +3275,7 @@
<string name="keywords_app_default" msgid="5822717006354487071">"فتح باستخدام"</string>
<string name="keywords_applications_settings" msgid="1268353611121497450">"التطبيقات"</string>
<string name="keywords_time_zone" msgid="998254736898753085">"المنطقة الزمنية"</string>
- <string name="keywords_draw_overlay" msgid="4130899177619041842">"رأس قائمة تطبيقات المحادثة"</string>
+ <string name="keywords_draw_overlay" msgid="1001120206241401007">"عنوان المحادثة، نظام، تنبيه، نافذة، مربع حوار، عرض، في مقدمة التطبيقات الأخرى، رسم"</string>
<string name="keywords_flashlight" msgid="6161632177705233710">"مصباح يدوي، ضوء، فلاش"</string>
<string name="keywords_change_wifi_state" msgid="627068244033681010">"wifi، wi-fi، تبديل، التحكم"</string>
<string name="keywords_more_mobile_networks" msgid="8995946622054642367">"خلوي، جوّال، مشغل شبكة جوال، لاسلكي، بيانات، جيل رابع، جيل ثالث، جيل ثاني، lte"</string>
@@ -3303,7 +3299,7 @@
<string name="keywords_sounds_and_notifications_interruptions" msgid="5426093074031208917">"ممنوع الإزعاج، ممنوع، المقاطعة، مقاطعة"</string>
<string name="keywords_app" msgid="6334757056536837791">"ذاكرة الوصول العشوائي"</string>
<string name="keywords_location" msgid="4132655528196729043">"الأجهزة المجاورة، الموقع الجغرافي، السجلّ، إعداد التقارير، نظام تحديد المواقع العالمي (GPS)"</string>
- <string name="keywords_accounts" msgid="1957925565953357627">"الحساب"</string>
+ <string name="keywords_accounts" msgid="4479029747403203867">"الحساب، إضافة حساب، الملف الشخصي للعمل"</string>
<string name="keywords_users" msgid="3434190133131387942">"تقييد، يقيد، مقيد"</string>
<string name="keywords_keyboard_and_ime" msgid="9143339015329957107">"تصحيح نص، تصحيح، صوت، اهتزاز، تلقائي، لغة، إيماءة، اقتراح، يقترح، مظهر، مسيء، كلمة، نوع، رمز تعبيري، دولي"</string>
<string name="keywords_reset_apps" msgid="5293291209613191845">"إعادة ضبط، تفضيلات، تلقائي"</string>
@@ -3341,6 +3337,7 @@
<string name="keywords_storage_settings" msgid="297283751968446577">"ذاكرة، تخزين مؤقت، بيانات، حذف، محو، فارغة، مساحة"</string>
<string name="keywords_bluetooth_settings" msgid="6804844062789439858">"متصل، جهاز، سماعات رأس، سماعة، مكبر صوت، لاسلكي، إقران، سمّاعات أذن، موسيقى، وسائط"</string>
<string name="keywords_wallpaper" msgid="5058364390917429896">"خلفية، شاشة، شاشة تأمين، موضوع"</string>
+ <string name="keywords_styles" msgid="5828725481814049422">"شكل الرمز، لون التمييز، الخط"</string>
<string name="keywords_assist_input" msgid="5017533309492679287">"تلقائي، مساعد"</string>
<string name="keywords_default_payment_app" msgid="3838565809518896799">"دفع، تلقائي"</string>
<string name="keywords_ambient_display" msgid="3103487805748659132">"إشعار وارد"</string>
@@ -3350,7 +3347,7 @@
<string name="keywords_notification_vibration" msgid="31924624421190547">"أجهزة تعمل باللمس، اهتزاز، حساسية"</string>
<string name="keywords_battery_saver_sticky" msgid="5586215686021650278">"توفير شحن البطارية، ثابت، مستمر، توفير طاقة، بطارية"</string>
<string name="keywords_battery_saver_schedule" msgid="7358789228486231944">"سلسلة إجراءات، جدول زمني، توفير شحن البطارية، توفير الطاقة، بطارية، تلقائي، نسبة مئوية"</string>
- <string name="keywords_add_an_account" msgid="6488139919428902434">"الملف الشخصي للعمل"</string>
+ <string name="keywords_enhance_4g_lte" msgid="2273810564244790859">"خدمة volte، الاتصال المتقدم، اتصال 4g"</string>
<string name="default_sound" msgid="8821684447333687810">"الصوت التلقائي"</string>
<string name="sound_settings_summary" msgid="4100853606668287965">"مستوى صوت الرنين على <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
<string name="sound_dashboard_summary" msgid="3402435125958012986">"مستوى الصوت والاهتزاز ووضع\"عدم الإزعاج\""</string>
@@ -4141,7 +4138,6 @@
<string name="permit_draw_overlay" msgid="7456536798718633432">"السماح بظهور التطبيق فوق التطبيقات الأخرى"</string>
<string name="allow_overlay_description" msgid="8961670023925421358">"السماح بعرض واجهة هذا التطبيق فوق تطبيقات أخرى تستخدمها. وقد يتداخل التطبيق مع استخدامك لهذه التطبيقات أو يغيِّر طريقة ظهورها أو عملها."</string>
<string name="keywords_vr_listener" msgid="7441221822576384680">"خدمة مساعد استريو مستمع الواقع الافتراضي"</string>
- <string name="keywords_system_alert_window" msgid="5049498015597864850">"يظهر مربع حوار نافذة تنبيه النظام أمام التطبيقات الأخرى"</string>
<string name="overlay_settings" msgid="6930854109449524280">"إظهار فوق التطبيقات الأخرى"</string>
<string name="system_alert_window_summary" msgid="602892301318324492">"يتم السماح لعدد <xliff:g id="COUNT_0">%1$d</xliff:g> من <xliff:g id="COUNT_1">%2$d</xliff:g> تطبيق بالظهور فوق التطبيقات الأخرى"</string>
<string name="filter_overlay_apps" msgid="6965969283342557573">"التطبيقات التي تحمل أذونات"</string>
@@ -4401,7 +4397,6 @@
<string name="notification_log_details_none" msgid="184131801230614059">"بدون"</string>
<string name="notification_log_details_ranking_null" msgid="244660392058720919">"ترتيب العناصر مفقود."</string>
<string name="notification_log_details_ranking_none" msgid="599607025882587844">"لا يحتوي ترتيب العناصر على هذا المفتاح."</string>
- <string name="theme_customization_category" msgid="1049181544004163283">"التصميم"</string>
<string name="theme_customization_device_default" msgid="5058147707906551368">"الإعداد التلقائي للجهاز"</string>
<string name="display_cutout_emulation" msgid="7466869822418376317">"صورة مقطوعة للشاشة"</string>
<string name="display_cutout_emulation_keywords" msgid="4495418317471622562">"جزء مقتطع من الشاشة، قطع علوي"</string>
@@ -4875,6 +4870,8 @@
<string name="network_connection_errorstate_dialog_message" msgid="6953778550775646710">"حدث خطأ. ألغى التطبيق طلب اختيار أحد الأجهزة."</string>
<string name="network_connection_connect_successful" msgid="5935510954474494928">"تمّ الاتصال."</string>
<string name="network_connection_request_dialog_showall" msgid="6938922880244567521">"عرض الكل"</string>
+ <string name="network_connection_searching_message" msgid="4638576789450817530">"جارٍ البحث عن جهاز…"</string>
+ <string name="network_connection_connecting_message" msgid="3740982406609245654">"جارٍ الاتصال بجهاز…"</string>
<plurals name="show_bluetooth_devices" formatted="false" msgid="1715020480026568408">
<item quantity="zero">تم توصيل <xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> جهاز.</item>
<item quantity="two">تم توصيل جهازين (<xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g>).</item>
diff --git a/res/values-as/strings.xml b/res/values-as/strings.xml
index 836f5b6..24e48fd 100644
--- a/res/values-as/strings.xml
+++ b/res/values-as/strings.xml
@@ -359,8 +359,6 @@
<string name="security_enable_widgets_disabled_summary" msgid="6392489775303464905">"প্ৰশাসকৰ দ্বাৰা অক্ষম কৰা হৈছে"</string>
<string name="lockdown_settings_title" msgid="7393790212603280213">"লকডাউন বিকল্পসমূহ দেখুৱাওক"</string>
<string name="lockdown_settings_summary" msgid="4359438673563318171">"লক স্ক্ৰীণত স্মাৰ্ট লক, বায়’মেট্ৰিকৰ জৰিয়তে আনলক কৰাৰ সুবিধা আৰু জাননীসমূহ অফ কৰা পাৱাৰ বুটামৰ বিকল্প দেখুৱাওক"</string>
- <string name="trust_agents_extend_unlock_title" msgid="2796555263565097031">"বিশ্বাসী এজেণ্টে কেৱল আনলকৰ সময় বৃদ্ধি কৰিব পাৰে"</string>
- <string name="trust_agents_extend_unlock_summary" msgid="3976344969220255010">"যদি সক্ষম কৰা হয় তেন্তে বিশ্বাসী এজেণ্টে আপোনাৰ ডিভাইচটো দীর্ঘ সময় ধৰি আনলক কৰি ৰাখিব কিন্তু কোনো লক হৈ থকা ডিভাইচ আনলক কৰিব নোৱাৰে।"</string>
<string name="trust_lost_locks_screen_title" msgid="2992742466966021682">"বিশ্বাস হেৰুৱালে স্ক্ৰীণ লক হ’ব"</string>
<string name="trust_lost_locks_screen_summary" msgid="693784434582021206">"সক্ষম কৰিলে অন্তিম বিশ্বাসী এজেণ্টটোৱে বিশ্বাস হেৰুৱালে ডিভাইচটো লক হ’ব"</string>
<string name="owner_info_settings_summary" msgid="7472393443779227052">"নাই"</string>
@@ -936,6 +934,8 @@
<string name="wifi_eap_identity" msgid="4359453783379679103">"পৰিচয়"</string>
<string name="wifi_eap_anonymous" msgid="2989469344116577955">"পৰিচয় অজ্ঞাত"</string>
<string name="wifi_password" msgid="5948219759936151048">"পাছৱৰ্ড"</string>
+ <!-- no translation found for wifi_sae_password_id (1697832722221765763) -->
+ <skip />
<string name="wifi_show_password" msgid="6461249871236968884">"পাছৱৰ্ড দেখুৱাওক"</string>
<string name="wifi_ap_band_config" msgid="1611826705989117930">"AP বেণ্ড বাছনি কৰক"</string>
<string name="wifi_ap_choose_auto" msgid="2677800651271769965">"স্বয়ংক্ৰিয়"</string>
@@ -956,7 +956,6 @@
<string name="wifi_dpp_share_wifi" msgid="9065890131734833809">"ৱাই-ফাই শ্বেয়াৰ কৰক"</string>
<string name="wifi_dpp_scan_qr_code_with_another_device" msgid="5854392840857123065">"“<xliff:g id="SSID">%1$s</xliff:g>”ৰ সৈতে সংযোগ কৰিবলৈ কিউআৰ ক’ডটো স্কেন কৰক আৰু পাছৱৰ্ড শ্বেয়াৰ কৰক"</string>
<string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="4436318319178361543">"“<xliff:g id="SSID">%1$s</xliff:g>”ৰ সৈতে সংযোগ কৰিবলৈ এই কিউআৰ ক’ডটো স্কেন কৰক"</string>
- <string name="wifi_dpp_could_not_detect_valid_qr_code" msgid="641893675646330576">"কিউআৰ ক’ডটো পঢ়িব পৰা নগ’ল। ক’ডটো পুনৰ সোঁমাজলৈ আনি আকৌ চেষ্টা কৰক"</string>
<string name="wifi_dpp_failure_authentication_or_configuration" msgid="3372757783382381044">"আকৌ চেষ্টা কৰক। যদি এই সমস্যাটো চলি থাকে তেন্তে ডিভাইচ নিৰ্মাতাৰ সৈতে যোগাযোগ কৰক"</string>
<string name="wifi_dpp_failure_not_compatible" msgid="2829930473520603740">"কিবা সমস্যা হৈছে"</string>
<string name="wifi_dpp_failure_timeout" msgid="5228320772245820458">"ডিভাইচটো যাতে প্লাগ কৰি থোৱা হয়, চ্চাৰ্জ হৈ থাকে আৰু অন থাকে সেইটো নিশ্চিত কৰক"</string>
@@ -979,6 +978,7 @@
<string name="wifi_dpp_hotspot_password" msgid="4120419278831581613">"হটস্পটৰ পাছৱৰ্ড: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
<string name="wifi_dpp_add_device" msgid="4072206063308645677">"ডিভাইচ যোগ কৰক"</string>
<string name="wifi_dpp_connect_network_using_qr_code" msgid="3887335309163999665">"এই নেটৱৰ্কটোত কোনো ডিভাইচ যোগ কৰিবলৈ এটা কিউআৰ ক’ড ব্যৱহাৰ কৰক"</string>
+ <string name="wifi_dpp_qr_code_is_not_valid_format" msgid="3700087439867692944">"কিউআৰ ক\'ডটো মান্য ফৰ্মেট নহয়"</string>
<string name="retry" msgid="6472609612090877557">"আকৌ চেষ্টা কৰক"</string>
<string name="wifi_shared" msgid="844142443226926070">"ডিভাইচৰ অন্য ব্যৱহাৰকাৰীৰ সৈতে শ্বেয়াৰ কৰক"</string>
<string name="wifi_unchanged" msgid="3410422020930397102">"(সালসলনি নাই)"</string>
@@ -1128,6 +1128,7 @@
<string name="emergency_address_title" msgid="932729250447887545">"জৰূৰীকালীন ঠিকনা"</string>
<string name="emergency_address_summary" msgid="7751971156196115129">"আপুনি ৱাই-ফাইৰ জৰিয়তে জৰুৰীকালীন কল কৰাৰ সময়ত আপোনাৰ অৱস্থান হিচাপে ব্যৱহাৰ কৰা হৈছে"</string>
<string name="private_dns_help_message" msgid="3299567069152568958">"ব্যক্তিগত ডিএনএছ সুবিধাসমূহৰ বিষয়ে "<annotation id="url">"অধিক জানক"</annotation></string>
+ <string name="private_dns_mode_on" msgid="5882613439541371003">"অন আছে"</string>
<string name="wifi_calling_pref_managed_by_carrier" msgid="6845711858866828986">"বাহকে ছেটিং পৰিচালনা কৰে"</string>
<string name="wifi_calling_settings_activation_instructions" msgid="7492509632478260955">"ৱাই-ফাইৰ জৰিয়তে কল কৰা সুবিধা সক্ৰিয় কৰক"</string>
<string name="wifi_calling_turn_on" msgid="1171403510313983983">"ৱাই-ফাইৰ জৰিয়তে কল কৰাৰ সুবিধা অন কৰক"</string>
@@ -1871,7 +1872,7 @@
<string name="default_emergency_app" msgid="1951760659640369980">"জৰুৰীকালীন এপ্"</string>
<string name="reset_app_preferences" msgid="1321050641018356925">"এপৰ অগ্ৰাধিকাৰসমূহ ৰিছেট কৰক"</string>
<string name="reset_app_preferences_title" msgid="6093179367325336662">"এপৰ অগ্ৰাধিকাৰসমূহ ৰিছেট কৰিবনে?"</string>
- <string name="reset_app_preferences_desc" msgid="4822447731869201512">"ইয়ে:\n\n "<li>"নিষ্ক্ৰিয় এপবিলাক"</li>\n" "<li>"নিষ্ক্ৰিয় এপবিলাকৰ জাননীসমূহ"</li>\n" "<li>"বিভিন্ন কাৰ্য সম্পাদনৰ বাবে ডিফ\'ল্ট এপ্লিকেশ্বনসমূহ"</li>\n" "<li>"এপৰ বাবে নেপথ্য ডেটা নিয়ন্ত্ৰণ"</li>\n" "<li>"যিকোনো অনুমতি নিয়ন্ত্ৰণৰ অগ্ৰাধিকাৰসমূহ ৰিছেট কৰিব"</li>\n\n"আপুনি এপৰ কোনো ডেটা নেহেৰুৱায়।"</string>
+ <string name="reset_app_preferences_desc" msgid="731757609326016760">"ইয়ে এইসমূহলৈ অগ্ৰাধিকাৰসমূহ ৰিছেট কৰিব:\n\n"<li>"অক্ষম কৰি থোৱা এপ্"</li>\n<li>"অক্ষম কৰি থোৱা এপ্ জাননী"</li>\n<li>"কাৰ্যৰ ডিফ’ল্ট এপ্লিকেশ্বন"</li>\n<li>"এপৰ নেপথ্য ডেটা সীমাবদ্ধকৰণ"</li>\n<li>"যিকোনো অনুমতিৰ সীমাবদ্ধকৰণ"</li>\n\n"আপুনি কোনো এপৰ ডেটা নেহেৰুৱায়।"</string>
<string name="reset_app_preferences_button" msgid="2559089511841281242">"এপ্ ৰিছেট কৰক"</string>
<string name="manage_space_text" msgid="8852711522447794676">"ঠাই পৰিচালনা কৰক"</string>
<string name="filter" msgid="2018011724373033887">"ফিল্টাৰ"</string>
@@ -2086,7 +2087,7 @@
<string name="accessibility_screen_magnification_short_summary" msgid="3411979839172752057">"জুম কৰিবলৈ ৩ বাৰ টিপক"</string>
<string name="accessibility_screen_magnification_navbar_short_summary" msgid="3693116360267980492">"জুম কৰিবলৈ এটা বুটাম টিপক"</string>
<string name="accessibility_screen_magnification_summary" msgid="5258868553337478505"><b>"জুম কৰিবলৈ"</b>" স্ক্ৰীণখনত ক্ষিপ্ৰতাৰে ৩ বাৰ টিপক।\n"<ul><li>"স্ক্ৰ’ল কৰিবলৈ ২টা বা তাতকৈ বেছি আঙুলিৰে টানক"</li>\n<li>"জুম মিলাবলৈ ২টা বা তাতকৈ বেছি আঙুলিৰে চেপি ধৰক"</li></ul>\n\n<b>"অস্থায়ীৰূপে জুম কৰিবলৈ"</b>" স্ক্ৰীণখনত ক্ষিপ্ৰতাৰে ৩ বাৰ টিপক আৰু তৃতীয়বাৰ টিপোঁতে আপোনাৰ আঙুলি তললৈ হেঁচি ধৰি ৰাখক।\n"<ul><li>"স্ক্ৰীণখন ইফালে-সিফালে নিবলৈ টানক"</li>\n<li>"জুম কমাবলৈ আঙুলি ওপৰলৈ উঠাওক"</li></ul>\n\n"আপুনি কীব’ৰ্ড আৰু নেভিগেশ্বন বাৰত জুম কৰিব নোৱাৰে।"</string>
- <string name="accessibility_screen_magnification_navbar_summary" msgid="2272878354599332009">"বিৱৰ্ধন অন কৰা থাকিলে আপুনি নিজৰ স্ক্রীণখনত জুম ইন কৰিব পাৰে।\n\n"<b>"জুম কৰিবলৈ"</b>", বিৱৰ্ধন আৰম্ভ কৰক আৰু তাৰ পাছত স্ক্রীণখনৰ যিকোনো ঠাইত টিপক।\n"<ul><li>"• স্ক্র’ল কৰিবলৈ ২টা ততোধিক আঙুলি ড্ৰেগ কৰক"</li>\n<li>"• জুম মিলাবলৈ ২টা বা ততোধিক আঙুলি স্ক্রীণখনত অলপ দূৰে-দূৰে থৈ সেইকেইটা পৰস্পৰৰ ওচৰ চপাই আনক"</li></ul>\n\n<b>"সাময়িকভাৱে জুম কৰিবলৈ"</b>", বিৱৰ্ধন আৰম্ভ কৰক আৰ তাৰ পাছত স্ক্রীণখনৰ যিকোনো ঠাইত স্পৰ্শ কৰি ধৰি ৰাখক।\n"<ul><li>"• স্ক্রীণখনৰ যিকোনো ঠাইলৈ যাবলৈ ড্রেগ কৰক"</li>\n<li>"• জুম আউট কৰিবলৈ আঙুলি উঠাওক"</li></ul>\n\n"আপুনি কীব’ৰ্ড আৰু নেভিগেশ্বন বাৰত জুম ইন কৰিব নোৱাৰে।"</string>
+ <string name="accessibility_screen_magnification_navbar_summary" msgid="6700716275347612310">"বিৱৰ্ধন অন কৰা থাকিলে আপুনি নিজৰ স্ক্রীণখনত জুম ইন কৰিব পাৰে।\n\n"<b>"জুম কৰিবলৈ"</b>", বিৱৰ্ধন আৰম্ভ কৰক আৰু তাৰ পাছত স্ক্রীণখনৰ যিকোনো ঠাইত টিপক।\n"<ul><li>"স্ক্ৰ’ল কৰিবলৈ ২টা অথবা ততোধিক আঙুলি স্ক্ৰীণত পিছলাওক"</li>\n<li>"জুম মিলাবলৈ স্ক্ৰীণত ২টা অথবা অধিক আঙুলিৰে চেপক"</li></ul>\n\n<b>"সাময়িকভাৱে জুম কৰিবলৈ"</b>"বিৱৰ্ধন আৰম্ভ কৰক, তাৰ পাছত স্ক্ৰীণৰ যিকোনো অংশত স্পৰ্শ কৰি হেঁচি ধৰক।\n"<ul><li>"স্ক্ৰীণখন ইফালে-সিফালে নিবলৈ আঙুলিৰে টানক"</li>\n<li>"জুম আউট কৰিবলৈ আঙুলি উঠাওক"</li></ul>\n\n"আপুনি কীব’ৰ্ড অথবা নেভিগেশ্বন বাৰ জুম কৰিব নোৱাৰে।"</string>
<string name="accessibility_tutorial_dialog_title_button" msgid="3682222614034474845">"খুলিবলৈ সাধ্য সুবিধাৰ বুটাম ব্যৱহাৰ কৰক"</string>
<string name="accessibility_tutorial_dialog_title_gesture" msgid="1342726230497913398">"খুলিবলৈ ভংগিমা ব্যৱহাৰ কৰক"</string>
<string name="accessibility_tutorial_dialog_title_gesture_settings" msgid="8539392614235820285">"সাধ্য সুবিধাৰ নতুন ভংগিমা ব্যৱহাৰ কৰক"</string>
@@ -2139,8 +2140,7 @@
<string name="accessibility_hearingaid_title" msgid="8312145423610648518">"শ্ৰৱণ যন্ত্ৰ"</string>
<string name="accessibility_hearingaid_not_connected_summary" msgid="6240237523789614599">"কোনো শ্ৰৱণ যন্ত্ৰ সংযুক্ত হৈ থকা নাই"</string>
<string name="accessibility_hearingaid_adding_summary" msgid="2947474468412309778">"শ্ৰৱণ যন্ত্ৰ যোগ কৰক"</string>
- <string name="accessibility_hearingaid_pair_instructions_first_message" msgid="3912093691643131154">"শ্ৰৱণ যন্ত্ৰ যোৰ পতাবলৈ পৰৱৰ্তী স্ক্ৰীণত আপোনাৰ ডিভাইচটো বিচাৰি তাত টিপক।"</string>
- <string name="accessibility_hearingaid_pair_instructions_second_message" msgid="5596683393607650243">"শ্ৰৱণ যন্ত্ৰটো যোৰ পতোৱা ম\'ডত থকাটো নিশ্চিত কৰক।"</string>
+ <string name="accessibility_hearingaid_pair_instructions_message" msgid="3094382949733435414">"শ্ৰৱণ যন্ত্ৰ যোৰা পতাবলৈ পৰৱৰ্তী স্ক্ৰীণত আপোনাৰ ডিভাইচটো বিচাৰি তাত টিপক। শ্ৰৱণ যন্ত্ৰটো যোৰা পতোৱা ম\'ডত থকাটো নিশ্চিত কৰক।"</string>
<string name="accessibility_hearingaid_active_device_summary" msgid="3924362383258688984">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> সক্ৰিয় হৈ আছে"</string>
<plurals name="show_number_hearingaid_count" formatted="false" msgid="3160782397139295486">
<item quantity="one"><xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> ছেভ কৰি থোৱা শ্ৰৱণ যন্ত্ৰ</item>
@@ -2489,7 +2489,6 @@
<string name="menu_stats_last_unplugged" msgid="5922246077592434526">"যেতিয়া <xliff:g id="UNPLUGGED">%1$s</xliff:g> অন্তিমবাৰ আনপ্লাগ কৰা হৈছিল"</string>
<string name="menu_stats_total" msgid="8973377864854807854">"ব্য়ৱহাৰৰ মুঠ"</string>
<string name="menu_stats_refresh" msgid="1676215433344981075">"ৰিফ্ৰেশ্ব"</string>
- <string name="process_kernel_label" msgid="3916858646836739323">"Android OS"</string>
<string name="process_mediaserver_label" msgid="6500382062945689285">"মিডিয়াছাৰ্ভাৰ"</string>
<string name="process_dex2oat_label" msgid="2592408651060518226">"এপ অপ্টিমাইজেশ্বন"</string>
<string name="battery_saver" msgid="8172485772238572153">"বেটাৰি সঞ্চয়কাৰী"</string>
@@ -2620,8 +2619,6 @@
<string name="no_device_admins" msgid="4846602835339095768">"কোনো ডিভাইচ প্ৰশাসকৰ এপ্ উপলব্ধ নাই"</string>
<string name="personal_device_admin_title" msgid="2849617316347669861">"ব্যক্তিগত"</string>
<string name="managed_device_admin_title" msgid="7853955652864478435">"কৰ্মস্থান"</string>
- <string name="sms_access_restriction_enabled" msgid="7054488078710530278">"এছএমএছ আৰু কল লগ প্ৰতিবন্ধিত কৰক"</string>
- <string name="sms_access_restriction_enabled_summary" msgid="6851339654677842328">"কেৱল ডিফ\'ল্ট ফ\'ন আৰু মেছেজিং এপতহে এছএমএছ আৰু কল লগৰ অনুমতি আছে"</string>
<string name="no_trust_agents" msgid="7450273545568977523">"কোনো বিশ্বাসী এজেণ্ট পোৱা নগ\'ল"</string>
<string name="add_device_admin_msg" msgid="1501847129819382149">"এই ডিভাইচ প্ৰশাসক এপটো সক্ৰিয় কৰেনে?"</string>
<string name="add_device_admin" msgid="4192055385312215731">"এই ডিভাইচ এডমিন এপটো সক্ৰিয় কৰক"</string>
@@ -3110,7 +3107,7 @@
<string name="keywords_app_default" msgid="5822717006354487071">"ইয়াৰ জৰিয়তে খোলক"</string>
<string name="keywords_applications_settings" msgid="1268353611121497450">"এপ্লিকেশ্বনসমূহ"</string>
<string name="keywords_time_zone" msgid="998254736898753085">"সময় মণ্ডল"</string>
- <string name="keywords_draw_overlay" msgid="4130899177619041842">"চাট হে’ড"</string>
+ <string name="keywords_draw_overlay" msgid="1001120206241401007">"চাট হে’ড, ছিষ্টেম, সতৰ্কবাৰ্তা, ৱিণ্ড’, ডায়লগ, ডিছপ্লে’, অন্য এপ্সমূহৰ ওপৰত, অংকন"</string>
<string name="keywords_flashlight" msgid="6161632177705233710">"ফ্লাশ্বলাইট, লাইট, টৰ্চ"</string>
<string name="keywords_change_wifi_state" msgid="627068244033681010">"ৱাইফাই, ৱাই-ফাই, ট\'গল, নিয়ন্ত্ৰণ"</string>
<string name="keywords_more_mobile_networks" msgid="8995946622054642367">"চেলুলাৰ, ম’বাইল, ম’বাইল সেৱা প্ৰদানকাৰী, ৱায়াৰলেচ, ডেটা, 4g,3g, 2g, lte"</string>
@@ -3134,7 +3131,7 @@
<string name="keywords_sounds_and_notifications_interruptions" msgid="5426093074031208917">"অসুবিধা নিদিব, অসুবিধা, অসুবিধা, বিৰতি"</string>
<string name="keywords_app" msgid="6334757056536837791">"ৰেম"</string>
<string name="keywords_location" msgid="4132655528196729043">"নিকটৱৰ্তী, অৱস্থান, ইতিহাস, ৰিপ’ৰ্টিং, জিপিএছ"</string>
- <string name="keywords_accounts" msgid="1957925565953357627">"একাউণ্ট"</string>
+ <string name="keywords_accounts" msgid="4479029747403203867">"একাউণ্ট, এটা একাউণ্ট যোগ কৰক, কৰ্মস্থানৰ প্ৰ’ফাইল"</string>
<string name="keywords_users" msgid="3434190133131387942">"সীমাবদ্ধতা, সীমাবদ্ধ কৰা, সীমাবদ্ধ কাৰ হোৱা"</string>
<string name="keywords_keyboard_and_ime" msgid="9143339015329957107">"পাঠ শুধৰণী, শুদ্ধ, ধ্বনি, কম্পন, স্বয়ং, ভাষা, নিৰ্দেশ, পৰামৰ্শ দিয়া, পৰামৰ্শ, থিম, অশালীন, শব্দ, প্ৰকাৰ, ইম’জি, আন্তৰ্জাতিক"</string>
<string name="keywords_reset_apps" msgid="5293291209613191845">"ৰিছেট, অগ্ৰাধিকাৰ, ডিফ’ল্ট"</string>
@@ -3172,6 +3169,7 @@
<string name="keywords_storage_settings" msgid="297283751968446577">"মেম’ৰি, কেশ্ব, ডেটা, মচা, খালী, ঠাই"</string>
<string name="keywords_bluetooth_settings" msgid="6804844062789439858">"সংযুক্ত, ডিভাইচ, হেডফ\'ন, হেডছেট, স্পীকাৰ, বেঁতাৰ, যোৰ, ইয়েৰবাড, সংগীত, মিডিয়া"</string>
<string name="keywords_wallpaper" msgid="5058364390917429896">"পটভূমি, স্ক্ৰীণ, লকস্ক্ৰীণ, থীম"</string>
+ <string name="keywords_styles" msgid="5828725481814049422">"আইকনৰ আকৃতি, এক্সেণ্টৰ ৰং, ফণ্ট"</string>
<string name="keywords_assist_input" msgid="5017533309492679287">"ডিফ\'ল্ট, সহায়ক"</string>
<string name="keywords_default_payment_app" msgid="3838565809518896799">"পেমেণ্ট, ডিফ’ল্ট"</string>
<string name="keywords_ambient_display" msgid="3103487805748659132">"অন্তৰ্গামী জাননী"</string>
@@ -3181,7 +3179,7 @@
<string name="keywords_notification_vibration" msgid="31924624421190547">"হেপটিক্স, কম্পন, সংবেদনশীলতা"</string>
<string name="keywords_battery_saver_sticky" msgid="5586215686021650278">"বেটাৰি সঞ্চয়কাৰী, ষ্টিকি, পাৰছিষ্ট, পাৱাৰ ছেভাৰ, বেটাৰি"</string>
<string name="keywords_battery_saver_schedule" msgid="7358789228486231944">"ৰুটিন, সময়সূচী, বেটাৰী সঞ্চয়কাৰী, পাৱাৰ ছেভাৰ, বেটাৰী, স্বয়ংক্ৰিয়, শতাংশ"</string>
- <string name="keywords_add_an_account" msgid="6488139919428902434">"কৰ্মস্থানৰ প্ৰ’ফাইল"</string>
+ <string name="keywords_enhance_4g_lte" msgid="2273810564244790859">"volte, উচ্চখাপৰ কলিং, 4g কলিং"</string>
<string name="default_sound" msgid="8821684447333687810">"ডিফ\'ল্ট ধ্বনি"</string>
<string name="sound_settings_summary" msgid="4100853606668287965">"ৰিঙৰ ভলিউম <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
<string name="sound_dashboard_summary" msgid="3402435125958012986">"ভলিউম, কম্পন, অসুবিধা নিদিব"</string>
@@ -3888,7 +3886,6 @@
<string name="permit_draw_overlay" msgid="7456536798718633432">"অইন এপৰ ওপৰত দেখুৱাবলৈ অনুমতি দিয়ক"</string>
<string name="allow_overlay_description" msgid="8961670023925421358">"আপুনি ব্যৱহাৰ কৰি থকা অইন এপৰ ওপৰত দেখুৱাবলৈ এই এপটোক অনুমতি দিয়ক। ইয়ে আপুনি ব্যৱহাৰ কৰি থকা এপসমূহ চলাত ব্যাঘাত জন্মাব পাৰে বা সেইবিলাক স্ক্ৰীণত কেনেধৰণে ওলাই বা আচৰণ কৰে তাক সলনি কৰিব পাৰে।"</string>
<string name="keywords_vr_listener" msgid="7441221822576384680">"ভিআৰ ভাৰ্শ্বুৱেল ৰিয়েলিটি শ্ৰোতা ষ্টেৰিঅ\' সহায়ক সেৱা"</string>
- <string name="keywords_system_alert_window" msgid="5049498015597864850">"অইন এপৰ ওপৰত ছিষ্টেমৰ আগজাননী ৱিণ্ড\' উক্তি প্ৰদৰ্শন"</string>
<string name="overlay_settings" msgid="6930854109449524280">"অন্য এপৰ ওপৰত দেখুৱাওক"</string>
<string name="system_alert_window_summary" msgid="602892301318324492">"<xliff:g id="COUNT_1">%2$d</xliff:g>ৰ ভিতৰত <xliff:g id="COUNT_0">%1$d</xliff:g> টা এপক অন্য এপ্সমূহত প্ৰদৰ্শিত হ’বলৈ অনুমতি দিছে"</string>
<string name="filter_overlay_apps" msgid="6965969283342557573">"অনুমতি লাভ কৰা এপসমূহ"</string>
@@ -4124,7 +4121,6 @@
<string name="notification_log_details_none" msgid="184131801230614059">"নাই"</string>
<string name="notification_log_details_ranking_null" msgid="244660392058720919">"ৰেংকিং অবজেক্ট পোৱা নগ\'ল।"</string>
<string name="notification_log_details_ranking_none" msgid="599607025882587844">"ৰেংকিং অৱজেক্টেত এই কীটো নাই৷"</string>
- <string name="theme_customization_category" msgid="1049181544004163283">"থিম বনাই থকা হৈছে"</string>
<string name="theme_customization_device_default" msgid="5058147707906551368">"ডিভাইচৰ ডিফ’ল্ট ছেটিং"</string>
<string name="display_cutout_emulation" msgid="7466869822418376317">"ডিছপ্লে’ কাটআউট"</string>
<string name="display_cutout_emulation_keywords" msgid="4495418317471622562">"ডিছপ্লে’ কাটআউট, ন’চ্চ"</string>
@@ -4550,6 +4546,8 @@
<string name="network_connection_errorstate_dialog_message" msgid="6953778550775646710">"কিবা এটা সমস্যা হৈছে। এপ্লিকেশ্বনটোৱে ডিভাইচ বাচনি কৰাৰ অনুৰোধ বাতিল কৰিলে।"</string>
<string name="network_connection_connect_successful" msgid="5935510954474494928">"সংযোগ সফল হৈছে"</string>
<string name="network_connection_request_dialog_showall" msgid="6938922880244567521">"সকলো দেখুৱাওক"</string>
+ <string name="network_connection_searching_message" msgid="4638576789450817530">"ডিভাইচৰ সন্ধান কৰি থকা হৈছে…"</string>
+ <string name="network_connection_connecting_message" msgid="3740982406609245654">"ডিভাইচৰ সৈতে সংযোগ কৰি থকা হৈছে…"</string>
<plurals name="show_bluetooth_devices" formatted="false" msgid="1715020480026568408">
<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>
diff --git a/res/values-az/strings.xml b/res/values-az/strings.xml
index 9e72305..8df3d6b 100644
--- a/res/values-az/strings.xml
+++ b/res/values-az/strings.xml
@@ -360,8 +360,6 @@
<string name="security_enable_widgets_disabled_summary" msgid="6392489775303464905">"Admin tərəfindən deaktiv edildi"</string>
<string name="lockdown_settings_title" msgid="7393790212603280213">"Kilid seçimini göstərin"</string>
<string name="lockdown_settings_summary" msgid="4359438673563318171">"Kilid ekranında Ağıllı Kilidi, biometrik kilidi və bilidirişləri deaktiv edən yandırıb-söndürmək düyməsini göstərin"</string>
- <string name="trust_agents_extend_unlock_title" msgid="2796555263565097031">"İnam agentləri yalnız kiliddən çıxarmanı genişləndirir"</string>
- <string name="trust_agents_extend_unlock_summary" msgid="3976344969220255010">"Aktiv edilərsə, cihaz kilidlənənə qədər inam agentləri cihazı kilidsiz saxlayacaq, lakin kilidli cihazı kiliddən çıxara bilməyəcək."</string>
<string name="trust_lost_locks_screen_title" msgid="2992742466966021682">"Təhlükəli mühitlərdə ekranı kilidləyin"</string>
<string name="trust_lost_locks_screen_summary" msgid="693784434582021206">"Aktiv edilsə, cihaz təhlükəli mühitlərdə avtomatik kilidlənəcək"</string>
<string name="owner_info_settings_summary" msgid="7472393443779227052">"Heç biri"</string>
@@ -937,6 +935,7 @@
<string name="wifi_eap_identity" msgid="4359453783379679103">"İdentiklik"</string>
<string name="wifi_eap_anonymous" msgid="2989469344116577955">"Anonim kimlik"</string>
<string name="wifi_password" msgid="5948219759936151048">"Parol"</string>
+ <string name="wifi_sae_password_id" msgid="1697832722221765763">"SAE parol identifikatoru"</string>
<string name="wifi_show_password" msgid="6461249871236968884">"Parolu göstər"</string>
<string name="wifi_ap_band_config" msgid="1611826705989117930">"AP Band Seçin"</string>
<string name="wifi_ap_choose_auto" msgid="2677800651271769965">"Avtomatik"</string>
@@ -957,7 +956,6 @@
<string name="wifi_dpp_share_wifi" msgid="9065890131734833809">"Wi‑Fi şəbəkəsini paylaşın"</string>
<string name="wifi_dpp_scan_qr_code_with_another_device" msgid="5854392840857123065">"\"<xliff:g id="SSID">%1$s</xliff:g>\" şəbəkəsinə qoşulmaq və parolu paylaşmaq üçün bu QR kodu skan edin"</string>
<string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="4436318319178361543">"\"<xliff:g id="SSID">%1$s</xliff:g>\" şəbəkəsinə qoşulmaq üçün bu QR kodu skan edin"</string>
- <string name="wifi_dpp_could_not_detect_valid_qr_code" msgid="641893675646330576">"QR kodunu oxumaq mümkün olmadı. Kodu mərkəzə tutduqdan sonra yenidən cəhd edin"</string>
<string name="wifi_dpp_failure_authentication_or_configuration" msgid="3372757783382381044">"Yenidən cəhd edin. Problem davam edərsə, cihaz istehsalçısı ilə əlaqə saxlayın"</string>
<string name="wifi_dpp_failure_not_compatible" msgid="2829930473520603740">"Xəta baş verdi"</string>
<string name="wifi_dpp_failure_timeout" msgid="5228320772245820458">"Cihazın elektrik mənbəyinə qoşulu olduğuna, batareya yığdığına və aktiv olduğuna əmin olun"</string>
@@ -980,6 +978,7 @@
<string name="wifi_dpp_hotspot_password" msgid="4120419278831581613">"Hotspot parolu: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
<string name="wifi_dpp_add_device" msgid="4072206063308645677">"Cihaz əlavə edin"</string>
<string name="wifi_dpp_connect_network_using_qr_code" msgid="3887335309163999665">"Bu şəbəkəyə cihaz əlavə etmək üçün QR kodundan istifadə edin"</string>
+ <string name="wifi_dpp_qr_code_is_not_valid_format" msgid="3700087439867692944">"QR kodu doğru formatda deyil"</string>
<string name="retry" msgid="6472609612090877557">"Yenidən cəhd edin"</string>
<string name="wifi_shared" msgid="844142443226926070">"Digər cihaz istifadəçiləri ilə paylaşın"</string>
<string name="wifi_unchanged" msgid="3410422020930397102">"(dəyişilməyən)"</string>
@@ -1129,6 +1128,7 @@
<string name="emergency_address_title" msgid="932729250447887545">"Fövqəladə Ünvan"</string>
<string name="emergency_address_summary" msgid="7751971156196115129">"Wi‑Fi vasitəilə təcili zəng etdiyiniz zaman məkanınız kimi istidafə edilir"</string>
<string name="private_dns_help_message" msgid="3299567069152568958">"Fərdi DNS funksiyaları haqqında "<annotation id="url">"ətraflı məlumat"</annotation></string>
+ <string name="private_dns_mode_on" msgid="5882613439541371003">"Aktiv"</string>
<string name="wifi_calling_pref_managed_by_carrier" msgid="6845711858866828986">"Operator tərəfindən idarə olunan ayar"</string>
<string name="wifi_calling_settings_activation_instructions" msgid="7492509632478260955">"Wi-Fi Zəngini aktiv edin"</string>
<string name="wifi_calling_turn_on" msgid="1171403510313983983">"Wi-Fi zəngini aktiv edin"</string>
@@ -1872,7 +1872,7 @@
<string name="default_emergency_app" msgid="1951760659640369980">"Təcili tətbiq"</string>
<string name="reset_app_preferences" msgid="1321050641018356925">"Tətbiq tərcihlərini sıfırla"</string>
<string name="reset_app_preferences_title" msgid="6093179367325336662">"Tətbiq tərcihləri sıfırlansın?"</string>
- <string name="reset_app_preferences_desc" msgid="4822447731869201512">"Bu seçimlər sıfırlanacaq:\n\n"<li>"Deaktiv tətbiqlər"</li>\n<li>"Deaktiv tətbiq bildirişləri"</li>\n<li>"Əməliyyatlar üçün deaktiv tətbiq bildirişləri"</li>\n<li>"Tətbiqlər üçün arxa fon limitləri"</li>\n<li>"İcazə limitləri"</li>\n\n"Heç bir tətbiq datası itirməyəcəksiniz."</string>
+ <string name="reset_app_preferences_desc" msgid="731757609326016760">"Bu, aşağıdakılar üçün bütün tərcihləri sıfırlayacaq:\n\n"<li>" Deaktiv edilmiş tətbiqlər"</li>\n<li>"Deaktiv edilmiş tətbiq bildirişləri"</li>\n<li>"Əməliyyatlar üçün defolt tətbiqlər"</li>\n<li>"Tətbiqlər üçün arxa fon məlumatlarının məhdudlaşdırılması"</li>\n<li>"İstənilən icazə məhdudiyyətləri"</li>\n\n"Hər hansı tətbiq məlumatınız silinməyəcək."</string>
<string name="reset_app_preferences_button" msgid="2559089511841281242">"Tətbiqləri sıfırla"</string>
<string name="manage_space_text" msgid="8852711522447794676">"Boşluğu idarə edin"</string>
<string name="filter" msgid="2018011724373033887">"Filter"</string>
@@ -2087,7 +2087,7 @@
<string name="accessibility_screen_magnification_short_summary" msgid="3411979839172752057">"Miqyası dəyişmək üçün 3 dəfə tıklayın"</string>
<string name="accessibility_screen_magnification_navbar_short_summary" msgid="3693116360267980492">"Yaxınlaşdırmaq üçün düyməyə klikləyin"</string>
<string name="accessibility_screen_magnification_summary" msgid="5258868553337478505"><b>"Yaxınlaşdırmaq üçün"</b>" ekrana 3 dəfə cəld klikləyin.\n"<ul><li>"Sürüşdürmək üçün 2 və ya daha çox barmağınızla çəkin"</li>\n<li>"Yaxınlaşdırmağı tənzimləmək üçün 2 və ya daha çox barmağınızla sürüşdürün"</li></ul>\n\n<b>"Müvəqqəti böyütmək üçün"</b>" ekrana 3 dəfə cəld vurun və üçüncü klikdə barmağınızı basıb saxlayın.\n"<ul><li>"Ekranda hərəkət etmək üçün çəkin"</li>\n<li>"Uzaqlaşdırmaq üçün barmağınızı qaldırın"</li></ul>\n\n"Klaviatura və naviqasiya panelində böyüdə bilməzsiniz."</string>
- <string name="accessibility_screen_magnification_navbar_summary" msgid="2272878354599332009">"Böyütmə aktiv edildikdə ekrandakını yaxınlaşdıra bilərsiniz.\n\n"<b>"Miqyaslamaq üçün"</b>" böyütməni başlatdıqdan sonra ekranda istənilən yerə toxunun.\n"<ul><li>"• Sürüşdürmək üçün ən azı 2 barmağınızla çəkin"</li>\n<li>"• Miqyası tənzimləmək üçün ən azı 2 barmağınızla sürüşdürərək yaxınlaşdırın"</li></ul>\n\n<b>"Müvəqqəti miqyaslamaq üçün "</b>" böyütməni başladıb ekranda istənilən yerə basın & saxlayın.\n"<ul><li>"• Ekranda hərəkət etmək üçün çəkin"</li>\n<li>"• Uzaqlaşdırmaq üçün barmağınızı qaldırın"</li></ul>\n\n"Klaviatura və ya naviqasiya panelində yaxınlaşdıra bilməzsiniz."</string>
+ <string name="accessibility_screen_magnification_navbar_summary" msgid="6700716275347612310">"Böyütmə aktiv edildikdə ekranda yaxınlaşdıra bilərsiniz.\n\n"<b>"Miqyası dəyişmək üçün"</b>" böyütməni başlatdıqdan sonra ekranda istənilən yerə toxunun.\n"<ul><li>"Sürüşdürmək üçün ən azı 2 barmağınızla çəkin"</li>\n<li>"Miqyası tənzimləmək üçün ən azı 2 barmağınızla sürüşdürərək yaxınlaşdırın"</li></ul>\n\n<b>"Miqyası müvəqqəti dəyişmək üçün"</b>" böyütməni başladıb ekranda istənilən yerə basın & saxlayın.\n"<ul><li>"Ekranda hərəkət etmək üçün çəkin"</li>\n<li>"Uzaqlaşdırmaq üçün barmağınızı qaldırın"</li></ul>\n\n"Klaviatura və ya naviqasiya panelində yaxınlaşdıra bilməzsiniz."</string>
<string name="accessibility_tutorial_dialog_title_button" msgid="3682222614034474845">"Açmaq üçün əlçatımlılıq düyməsindən istifadə edin"</string>
<string name="accessibility_tutorial_dialog_title_gesture" msgid="1342726230497913398">"Açmaq üçün jestdən istifadə edin"</string>
<string name="accessibility_tutorial_dialog_title_gesture_settings" msgid="8539392614235820285">"Yeni əlçatımlılıq jestindən istifadə edin"</string>
@@ -2140,8 +2140,7 @@
<string name="accessibility_hearingaid_title" msgid="8312145423610648518">"Qulaqlıq"</string>
<string name="accessibility_hearingaid_not_connected_summary" msgid="6240237523789614599">"Qulaqlıq qoşulmayıb"</string>
<string name="accessibility_hearingaid_adding_summary" msgid="2947474468412309778">"Eşitmə aparatları əlavə edin"</string>
- <string name="accessibility_hearingaid_pair_instructions_first_message" msgid="3912093691643131154">"Qulaqlığı birləşdirmək üçün növbəti ekranda cihazı taparaq ona klikləyin."</string>
- <string name="accessibility_hearingaid_pair_instructions_second_message" msgid="5596683393607650243">"Əmin olun ki, qulaqlıq birləşmə rejimindədir."</string>
+ <string name="accessibility_hearingaid_pair_instructions_message" msgid="3094382949733435414">"Eşitmə aparatını qoşmaq üçün növbəti ekranda cihazınızı tapın və ona klikləyin. Əmin olun ki, eşitmə aparatı birləşmə rejimindədir."</string>
<string name="accessibility_hearingaid_active_device_summary" msgid="3924362383258688984">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> aktivdir"</string>
<plurals name="show_number_hearingaid_count" formatted="false" msgid="3160782397139295486">
<item quantity="other"><xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> yadda saxlanmış qulaqlıq</item>
@@ -2490,7 +2489,6 @@
<string name="menu_stats_last_unplugged" msgid="5922246077592434526">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> ərzində elektrikə qoşulmayıb"</string>
<string name="menu_stats_total" msgid="8973377864854807854">"Ümumi istifadə"</string>
<string name="menu_stats_refresh" msgid="1676215433344981075">"Təzələ"</string>
- <string name="process_kernel_label" msgid="3916858646836739323">"Android OS"</string>
<string name="process_mediaserver_label" msgid="6500382062945689285">"Mediaserver"</string>
<string name="process_dex2oat_label" msgid="2592408651060518226">"Tətbiq optimallaşdırması"</string>
<string name="battery_saver" msgid="8172485772238572153">"Batareya Qənaəti"</string>
@@ -2621,8 +2619,6 @@
<string name="no_device_admins" msgid="4846602835339095768">"Əlçatan cihaz admin tətbiqi yoxdur"</string>
<string name="personal_device_admin_title" msgid="2849617316347669861">"Şəxsi"</string>
<string name="managed_device_admin_title" msgid="7853955652864478435">"İş"</string>
- <string name="sms_access_restriction_enabled" msgid="7054488078710530278">"SMS və zəng siyahısına girişin məhdudlaşdırılması"</string>
- <string name="sms_access_restriction_enabled_summary" msgid="6851339654677842328">"Yalnız defolt telefon və mesajlaşma tətbiqlərinin SMS və zəng siyahısına giriş icazələri var"</string>
<string name="no_trust_agents" msgid="7450273545568977523">"Əlçatımlı əmanət agenti yoxdur"</string>
<string name="add_device_admin_msg" msgid="1501847129819382149">"Cihaz admin tətbiqi aktiv edilsin?"</string>
<string name="add_device_admin" msgid="4192055385312215731">"Bu cihazın admin tətbiqini aktiv edin"</string>
@@ -3111,7 +3107,7 @@
<string name="keywords_app_default" msgid="5822717006354487071">"Bununla açın:"</string>
<string name="keywords_applications_settings" msgid="1268353611121497450">"Tətbiqlər"</string>
<string name="keywords_time_zone" msgid="998254736898753085">"saat qurşağı"</string>
- <string name="keywords_draw_overlay" msgid="4130899177619041842">"Çat başlığı"</string>
+ <string name="keywords_draw_overlay" msgid="1001120206241401007">"Söhbət başlığı, sistem, bildiriş, pəncərə, dialoq, ekran, digər tətbiqlərin üstündə, çəkmək"</string>
<string name="keywords_flashlight" msgid="6161632177705233710">"Fleş işığı, İşıq, Fənər"</string>
<string name="keywords_change_wifi_state" msgid="627068244033681010">"wifi, wi-fi, aktiv, nəzarət"</string>
<string name="keywords_more_mobile_networks" msgid="8995946622054642367">"şəbəkə, mobil, şəbəkə operatoru, simsiz, data, 4g, 3g, 2g, lte"</string>
@@ -3135,7 +3131,7 @@
<string name="keywords_sounds_and_notifications_interruptions" msgid="5426093074031208917">"narahat etməyin, bölməyin, bölmək, fasilə"</string>
<string name="keywords_app" msgid="6334757056536837791">"RAM"</string>
<string name="keywords_location" msgid="4132655528196729043">"yaxınlıqda, məkan, tarixçə, hesabat, GPS"</string>
- <string name="keywords_accounts" msgid="1957925565953357627">"hesab"</string>
+ <string name="keywords_accounts" msgid="4479029747403203867">"hesab, hesab əlavə edin, iş profili"</string>
<string name="keywords_users" msgid="3434190133131387942">"məhdudiyyət, məhdudlaşma, məhdudlaşıb"</string>
<string name="keywords_keyboard_and_ime" msgid="9143339015329957107">"mətn düzəlişi, bağlantı, səs, titrəyiş, avtomatik, dil, jest, təklif etmək, təklif, tema, incidici, söz, növ, emosiya işarəsi, beynəlxalq"</string>
<string name="keywords_reset_apps" msgid="5293291209613191845">"sıfırlama, tərcihlər, defolt"</string>
@@ -3173,6 +3169,7 @@
<string name="keywords_storage_settings" msgid="297283751968446577">"yaddaş, data, silin, təmizləyin, pulsuz, yaddaş"</string>
<string name="keywords_bluetooth_settings" msgid="6804844062789439858">"qoşulu, cihaz, qulaqlıq, qulaqlıq, spiker, simsiz, cüt, qulaqlıq, musiqi, media"</string>
<string name="keywords_wallpaper" msgid="5058364390917429896">"arxa fon, ekran, ekran kilidi, tema"</string>
+ <string name="keywords_styles" msgid="5828725481814049422">"ikona forması, rəng çaları, şrift"</string>
<string name="keywords_assist_input" msgid="5017533309492679287">"defolt, assistent"</string>
<string name="keywords_default_payment_app" msgid="3838565809518896799">"ödəniş, defolt"</string>
<string name="keywords_ambient_display" msgid="3103487805748659132">"gələn bildiriş"</string>
@@ -3182,7 +3179,7 @@
<string name="keywords_notification_vibration" msgid="31924624421190547">"haptik, vibrasiya, həssaslıq"</string>
<string name="keywords_battery_saver_sticky" msgid="5586215686021650278">"enerjiyə qənaət, sabit, davamlı, enerji qənaəti, batareya"</string>
<string name="keywords_battery_saver_schedule" msgid="7358789228486231944">"rejim, cədvəl, enerjiyə qənaət, batareyaya qənaət, batareya, avtomatik, faiz"</string>
- <string name="keywords_add_an_account" msgid="6488139919428902434">"iş profili"</string>
+ <string name="keywords_enhance_4g_lte" msgid="2273810564244790859">"volt, qabaqcıl zəng, 4g zəng"</string>
<string name="default_sound" msgid="8821684447333687810">"Defolt səs"</string>
<string name="sound_settings_summary" msgid="4100853606668287965">"Zəng səsi <xliff:g id="PERCENTAGE">%1$s</xliff:g> faizdir"</string>
<string name="sound_dashboard_summary" msgid="3402435125958012986">"Səs, vibrasiya, \"Narahat etməyin\" rejimi"</string>
@@ -3889,7 +3886,6 @@
<string name="permit_draw_overlay" msgid="7456536798718633432">"Digər tətbiq üzərindən görüntüləmək icazəsi"</string>
<string name="allow_overlay_description" msgid="8961670023925421358">"Bu tətbiqə istifadə etdiyiniz digər tətbiqlərin üzərində göstərilmək icazəsi verin. Bu tətbiq həmin tətbiqlərin istifadəsinə müdaxilə edə və ya tətbiqlərin görünüş və davranışını dəyişə bilər."</string>
<string name="keywords_vr_listener" msgid="7441221822576384680">"vr virtual reallıq dinləyici stereo köməkçi xidməti"</string>
- <string name="keywords_system_alert_window" msgid="5049498015597864850">"digər tətbiqlərin üzərində sistem siqnalının pəncərə dialoq görüntüsü"</string>
<string name="overlay_settings" msgid="6930854109449524280">"Tətbiqlər üzərindən görüntüləmə"</string>
<string name="system_alert_window_summary" msgid="602892301318324492">"Digər tətbiqlərin üzərindən görüntülənən <xliff:g id="COUNT_1">%2$d</xliff:g> tətbiqdən <xliff:g id="COUNT_0">%1$d</xliff:g> tətbiq"</string>
<string name="filter_overlay_apps" msgid="6965969283342557573">"Icazəsi ilə Apps"</string>
@@ -4125,7 +4121,6 @@
<string name="notification_log_details_none" msgid="184131801230614059">"heç biri"</string>
<string name="notification_log_details_ranking_null" msgid="244660392058720919">"Sıralama obyekti yoxdur."</string>
<string name="notification_log_details_ranking_none" msgid="599607025882587844">"Obyekt sıralamasında bu açar yoxdur."</string>
- <string name="theme_customization_category" msgid="1049181544004163283">"Temalar"</string>
<string name="theme_customization_device_default" msgid="5058147707906551368">"Cihaz defoltu"</string>
<string name="display_cutout_emulation" msgid="7466869822418376317">"Ekran kəsimi"</string>
<string name="display_cutout_emulation_keywords" msgid="4495418317471622562">"ekran kəsimi, nişan"</string>
@@ -4551,6 +4546,8 @@
<string name="network_connection_errorstate_dialog_message" msgid="6953778550775646710">"Xəta baş verdi. Bu tətbiq cihaz seçmək üçün sorğunu ləğv etdi."</string>
<string name="network_connection_connect_successful" msgid="5935510954474494928">"Qoşuldu"</string>
<string name="network_connection_request_dialog_showall" msgid="6938922880244567521">"Hamısına baxın"</string>
+ <string name="network_connection_searching_message" msgid="4638576789450817530">"Cihaz axtarılır..."</string>
+ <string name="network_connection_connecting_message" msgid="3740982406609245654">"Cihaza qoşulur…"</string>
<plurals name="show_bluetooth_devices" formatted="false" msgid="1715020480026568408">
<item quantity="other"><xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> cihaz qoşuldu</item>
<item quantity="one"><xliff:g id="NUMBER_DEVICE_COUNT_0">%1$d</xliff:g> cihaz qoşuldu</item>
diff --git a/res/values-b+sr+Latn/strings.xml b/res/values-b+sr+Latn/strings.xml
index f73feb6..f1166f5 100644
--- a/res/values-b+sr+Latn/strings.xml
+++ b/res/values-b+sr+Latn/strings.xml
@@ -362,8 +362,6 @@
<string name="security_enable_widgets_disabled_summary" msgid="6392489775303464905">"Administrator je onemogućio"</string>
<string name="lockdown_settings_title" msgid="7393790212603280213">"Prikaži opciju zaključavanja"</string>
<string name="lockdown_settings_summary" msgid="4359438673563318171">"Prikazuje opciju dugmeta za napajanje koja isključuje Smart Lock, biometrijsko otključavanje i obaveštenja na zaključanom ekranu"</string>
- <string name="trust_agents_extend_unlock_title" msgid="2796555263565097031">"Pouzdani agenti - duže otključano"</string>
- <string name="trust_agents_extend_unlock_summary" msgid="3976344969220255010">"Ako je omogućeno, pouzdani agenti će omogućiti da uređaj duže ostane otključan, ali ne mogu više da otključavaju zaključan uređaj."</string>
<string name="trust_lost_locks_screen_title" msgid="2992742466966021682">"Zaključaj ekran kada je agent nepouzdan"</string>
<string name="trust_lost_locks_screen_summary" msgid="693784434582021206">"Ako se omogući, uređaj će se zaključati kada poslednji pouzdani agent više ne bude pouzdan"</string>
<string name="owner_info_settings_summary" msgid="7472393443779227052">"Ništa"</string>
@@ -953,6 +951,7 @@
<string name="wifi_eap_identity" msgid="4359453783379679103">"Identitet"</string>
<string name="wifi_eap_anonymous" msgid="2989469344116577955">"Anonimni identitet"</string>
<string name="wifi_password" msgid="5948219759936151048">"Lozinka"</string>
+ <string name="wifi_sae_password_id" msgid="1697832722221765763">"Identifikator SAE lozinke"</string>
<string name="wifi_show_password" msgid="6461249871236968884">"Prikaži lozinku"</string>
<string name="wifi_ap_band_config" msgid="1611826705989117930">"Izaberite opseg pristupne tačke"</string>
<string name="wifi_ap_choose_auto" msgid="2677800651271769965">"Automatski"</string>
@@ -973,7 +972,6 @@
<string name="wifi_dpp_share_wifi" msgid="9065890131734833809">"Deli Wi‑Fi"</string>
<string name="wifi_dpp_scan_qr_code_with_another_device" msgid="5854392840857123065">"Skenirajte ovaj QR kôd da biste se povezali sa „<xliff:g id="SSID">%1$s</xliff:g>“ i delili lozinku"</string>
<string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="4436318319178361543">"Skenirajte ovaj QR kôd da biste se pridružili mreži „<xliff:g id="SSID">%1$s</xliff:g>“"</string>
- <string name="wifi_dpp_could_not_detect_valid_qr_code" msgid="641893675646330576">"Čitanje QR koda nije uspelo. Ponovo centrirajte kôd, pa probajte ponovo"</string>
<string name="wifi_dpp_failure_authentication_or_configuration" msgid="3372757783382381044">"Probajte ponovo. Ako se problem nastavi, kontaktirajte proizvođača uređaja"</string>
<string name="wifi_dpp_failure_not_compatible" msgid="2829930473520603740">"Došlo je do greške"</string>
<string name="wifi_dpp_failure_timeout" msgid="5228320772245820458">"Uverite se da je uređaj priključen na izvor napajanja, napunjen i uključen"</string>
@@ -996,6 +994,7 @@
<string name="wifi_dpp_hotspot_password" msgid="4120419278831581613">"Lozinka hotspota: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
<string name="wifi_dpp_add_device" msgid="4072206063308645677">"Dodajte uređaj"</string>
<string name="wifi_dpp_connect_network_using_qr_code" msgid="3887335309163999665">"Koristite QR kôd da biste dodali uređaj na ovu mrežu"</string>
+ <string name="wifi_dpp_qr_code_is_not_valid_format" msgid="3700087439867692944">"QR kôd nije u važećem formatu"</string>
<string name="retry" msgid="6472609612090877557">"Probaj ponovo"</string>
<string name="wifi_shared" msgid="844142443226926070">"Deli sa drugim korisnicima uređaja"</string>
<string name="wifi_unchanged" msgid="3410422020930397102">"(nepromenjeno)"</string>
@@ -1148,6 +1147,7 @@
<string name="emergency_address_title" msgid="932729250447887545">"Adresa za hitne slučajeve"</string>
<string name="emergency_address_summary" msgid="7751971156196115129">"Koristi se kao vaša lokacija kada uputite hitni poziv pomoću Wi-Fi-ja"</string>
<string name="private_dns_help_message" msgid="3299567069152568958"><annotation id="url">"Saznajte više"</annotation>" o funkcijama Privatnog DNS-a"</string>
+ <string name="private_dns_mode_on" msgid="5882613439541371003">"Uključeno"</string>
<string name="wifi_calling_pref_managed_by_carrier" msgid="6845711858866828986">"Mobilni operater upravlja podešavanjem"</string>
<string name="wifi_calling_settings_activation_instructions" msgid="7492509632478260955">"Aktivirajte Pozivanje preko Wi-Fi-ja"</string>
<string name="wifi_calling_turn_on" msgid="1171403510313983983">"Uključite pozivanje preko Wi-Fi-ja"</string>
@@ -1894,7 +1894,7 @@
<string name="default_emergency_app" msgid="1951760659640369980">"Aplikacija za hitne slučajeve"</string>
<string name="reset_app_preferences" msgid="1321050641018356925">"Resetuj podešavanja aplikacije"</string>
<string name="reset_app_preferences_title" msgid="6093179367325336662">"Želite da resetujete podešavanja aplikacije?"</string>
- <string name="reset_app_preferences_desc" msgid="4822447731869201512">"Ovim ćete vratiti na početne vrednosti sva podešavanja za:\n\n"<li>"Onemogućene aplikacije"</li>\n<li>"Obaveštenja o onemogućenim aplikacijama"</li>\n<li>"Podrazumevane aplikacije za radnje"</li>\n<li>"Ograničenja za pozadinske podatke za aplikacije"</li>\n<li>"Bilo kakva ograničenja za dozvole"</li>\n\n" Nećete izgubiti podatke aplikacija."</string>
+ <string name="reset_app_preferences_desc" msgid="731757609326016760">"Ovim će se resetovati sva podešavanja za:\n\n"<li>"Onemogućene aplikacije"</li>\n<li>"Obaveštenja o onemogućenim aplikacijama"</li>\n<li>"Podrazumevane aplikacije za radnje"</li>\n<li>"Ograničenja za pozadinske podatke za aplikacije"</li>\n<li>"Sva ograničenja za dozvole"</li>\n\n"Nećete izgubiti nikakve podatke aplikacije."</string>
<string name="reset_app_preferences_button" msgid="2559089511841281242">"Resetuj aplikacije"</string>
<string name="manage_space_text" msgid="8852711522447794676">"Upravljaj prostorom"</string>
<string name="filter" msgid="2018011724373033887">"Filtriraj"</string>
@@ -2109,7 +2109,7 @@
<string name="accessibility_screen_magnification_short_summary" msgid="3411979839172752057">"Dodirnite 3 puta da biste zumirali"</string>
<string name="accessibility_screen_magnification_navbar_short_summary" msgid="3693116360267980492">"Dodirnite dugme da biste zumirali"</string>
<string name="accessibility_screen_magnification_summary" msgid="5258868553337478505"><b>"Da biste zumirali"</b>", brzo dodirnite ekran 3 puta.\n"<ul><li>"Prevucite pomoću 2 ili više prstiju da biste pomerali prikaz"</li>\n<li>"Skupite 2 ili više prstiju da biste prilagodili zumiranje"</li></ul>\n\n<b>"Za privremeno zumiranje"</b>" brzo dodirnite ekran 3 puta i zadržite prst pri trećem dodiru.\n"<ul><li>"Prevlačite prstom da biste se kretali po ekranu"</li>\n<li>"Podignite prst da biste umanjili prikaz"</li></ul>\n\n"Ne možete da zumirate tastaturu ni traku za navigaciju."</string>
- <string name="accessibility_screen_magnification_navbar_summary" msgid="2272878354599332009">"Kada je uvećanje uključeno, možete da uvećate ekran.\n\n"<b>"Da biste zumirali"</b>", pokrenite uvećanje, pa dodirnite bilo koji deo ekrana.\n"<ul><li>"• Prevucite pomoću 2 ili više prstiju da biste pomerali prikaz"</li>\n<li>"• Skupite 2 ili više prstiju da biste prilagodili zumiranje"</li></ul>\n\n<b>"Za privremeno zumiranje"</b>" pokrenite uvećanje, pa dodirnite i zadržite bilo koji deo ekrana.\n"<ul><li>"• Prevlačite prstom da biste se kretali po ekranu"</li>\n<li>"• Podignite prst da biste umanjili prikaz"</li></ul>\n\n"Ne možete da uvećavate tastaturu ili traku za navigaciju."</string>
+ <string name="accessibility_screen_magnification_navbar_summary" msgid="6700716275347612310">"Kada je uvećanje uključeno, možete da uvećate ekran.\n\n"<b>"Da biste zumirali"</b>", pokrenite uvećanje, pa dodirnite bilo koji deo ekrana.\n"<ul><li>"Prevlačite pomoću 2 ili više prstiju da biste pomerali prikaz"</li>\n<li>"Skupite 2 ili više prstiju da biste prilagodili zumiranje"</li></ul>\n\n<b>"Za privremeno zumiranje"</b>" pokrenite uvećanje, pa dodirnite i zadržite bilo koji deo ekrana.\n"<ul><li>"Prevlačite da biste se kretali po ekranu"</li>\n<li>"Podignite prst da biste umanjili prikaz"</li></ul>\n\n"Ne možete da uvećavate tastaturu ili traku za navigaciju."</string>
<string name="accessibility_tutorial_dialog_title_button" msgid="3682222614034474845">"Otvarajte pomoću dugmeta za pristupačnost"</string>
<string name="accessibility_tutorial_dialog_title_gesture" msgid="1342726230497913398">"Otvarajte pomoću pokreta"</string>
<string name="accessibility_tutorial_dialog_title_gesture_settings" msgid="8539392614235820285">"Koristite novi pokret za pristupačnost"</string>
@@ -2162,8 +2162,7 @@
<string name="accessibility_hearingaid_title" msgid="8312145423610648518">"Slušni aparati"</string>
<string name="accessibility_hearingaid_not_connected_summary" msgid="6240237523789614599">"Nije povezan nijedan slušni aparat"</string>
<string name="accessibility_hearingaid_adding_summary" msgid="2947474468412309778">"Dodajte slušne aparate"</string>
- <string name="accessibility_hearingaid_pair_instructions_first_message" msgid="3912093691643131154">"Da biste uparili slušne aparate, pronađite i dodirnite svoj uređaj na sledećem ekranu."</string>
- <string name="accessibility_hearingaid_pair_instructions_second_message" msgid="5596683393607650243">"Proverite da li su slušni aparati u režimu uparivanja."</string>
+ <string name="accessibility_hearingaid_pair_instructions_message" msgid="3094382949733435414">"Da biste uparili slušne aparate, pronađite i dodirnite uređaj na sledećem ekranu. Proverite da li su slušni aparati u režimu uparivanja."</string>
<string name="accessibility_hearingaid_active_device_summary" msgid="3924362383258688984">"Aktivan: <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
<plurals name="show_number_hearingaid_count" formatted="false" msgid="3160782397139295486">
<item quantity="one"><xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> sačuvani slušni aparat</item>
@@ -2527,7 +2526,6 @@
<string name="menu_stats_last_unplugged" msgid="5922246077592434526">"Tokom poslednjeg isključivanja za <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
<string name="menu_stats_total" msgid="8973377864854807854">"Ukupno korišćeno"</string>
<string name="menu_stats_refresh" msgid="1676215433344981075">"Osveži"</string>
- <string name="process_kernel_label" msgid="3916858646836739323">"Android OS"</string>
<string name="process_mediaserver_label" msgid="6500382062945689285">"Medija server"</string>
<string name="process_dex2oat_label" msgid="2592408651060518226">"Optimizacija aplikacija"</string>
<string name="battery_saver" msgid="8172485772238572153">"Ušteda baterije"</string>
@@ -2658,8 +2656,6 @@
<string name="no_device_admins" msgid="4846602835339095768">"Nema dostupnih aplikacija za administratora uređaja"</string>
<string name="personal_device_admin_title" msgid="2849617316347669861">"Lični"</string>
<string name="managed_device_admin_title" msgid="7853955652864478435">"Posao"</string>
- <string name="sms_access_restriction_enabled" msgid="7054488078710530278">"Ograniči pristup SMS-ovima i evidenciji poziva"</string>
- <string name="sms_access_restriction_enabled_summary" msgid="6851339654677842328">"Samo podrazumevane aplikacije za pozive i razmenu SMS-ova imaju dozvole za pristup SMS-ovima i evidenciji poziva"</string>
<string name="no_trust_agents" msgid="7450273545568977523">"Nema dostupnih pouzdanih agenata"</string>
<string name="add_device_admin_msg" msgid="1501847129819382149">"Aktiviraj aplikaciju za administratore?"</string>
<string name="add_device_admin" msgid="4192055385312215731">"Aktiviraj ovu aplikaciju za administratore uređaja"</string>
@@ -3153,7 +3149,7 @@
<string name="keywords_app_default" msgid="5822717006354487071">"Otvori pomoću"</string>
<string name="keywords_applications_settings" msgid="1268353611121497450">"Aplikacije"</string>
<string name="keywords_time_zone" msgid="998254736898753085">"vremenska zona"</string>
- <string name="keywords_draw_overlay" msgid="4130899177619041842">"Prikaz ćaskanja preko drugih aplikacija"</string>
+ <string name="keywords_draw_overlay" msgid="1001120206241401007">"Oblačić za ćaskanje, sistem, obaveštenje, prozor, dijalog, prikaz, preko drugih aplikacija, prevlačenje"</string>
<string name="keywords_flashlight" msgid="6161632177705233710">"Baterijska lampa, svetlo, lampa"</string>
<string name="keywords_change_wifi_state" msgid="627068244033681010">"wifi, wi-fi, uključi/isključi, kontrola"</string>
<string name="keywords_more_mobile_networks" msgid="8995946622054642367">"mobilna mreža, mobilni podaci, mobilni operater, bežično, podaci, 4g, 3g, 2g, lte"</string>
@@ -3177,7 +3173,7 @@
<string name="keywords_sounds_and_notifications_interruptions" msgid="5426093074031208917">"ne ometati, prekidati, prekid, prekinuti"</string>
<string name="keywords_app" msgid="6334757056536837791">"RAM"</string>
<string name="keywords_location" msgid="4132655528196729043">"u blizini, lokacija, istorija, izveštavanje, GPS"</string>
- <string name="keywords_accounts" msgid="1957925565953357627">"nalog"</string>
+ <string name="keywords_accounts" msgid="4479029747403203867">"nalog, dodajte nalog, profil za Work"</string>
<string name="keywords_users" msgid="3434190133131387942">"ograničenje, ograničiti, ograničeno"</string>
<string name="keywords_keyboard_and_ime" msgid="9143339015329957107">"ispravka teksta, ispraviti, zvuk, vibrirati, automatski, jezik, pokret, predlagati, predlog, tema, uvredljivo, reč, kucati, emodži, međunarodno"</string>
<string name="keywords_reset_apps" msgid="5293291209613191845">"resetovanje, podešavanja, podrazumevano"</string>
@@ -3215,6 +3211,7 @@
<string name="keywords_storage_settings" msgid="297283751968446577">"memorija, keš, podaci, izbriši, obriši, slobodno, prostor"</string>
<string name="keywords_bluetooth_settings" msgid="6804844062789439858">"povezano, uređaj, slušalice, hedset, zvučnik, bežično, upari, bubice, muzika, mediji"</string>
<string name="keywords_wallpaper" msgid="5058364390917429896">"pozadina, ekran, zaključani ekran, tema"</string>
+ <string name="keywords_styles" msgid="5828725481814049422">"oblik ikone, boja za naglašavanje, font"</string>
<string name="keywords_assist_input" msgid="5017533309492679287">"podrazumevano, pomoćnik"</string>
<string name="keywords_default_payment_app" msgid="3838565809518896799">"plaćanje, podrazumevano"</string>
<string name="keywords_ambient_display" msgid="3103487805748659132">"dolazno obaveštenje"</string>
@@ -3224,7 +3221,7 @@
<string name="keywords_notification_vibration" msgid="31924624421190547">"dodirne povratne informacije, vibriranje, osetljivost"</string>
<string name="keywords_battery_saver_sticky" msgid="5586215686021650278">"ušteda baterije, lepljivo, trajno, ušteda energije, baterija"</string>
<string name="keywords_battery_saver_schedule" msgid="7358789228486231944">"rutina, raspored, ušteda baterije, ušteda energije, baterija, automatsko, procenat"</string>
- <string name="keywords_add_an_account" msgid="6488139919428902434">"profil za Work"</string>
+ <string name="keywords_enhance_4g_lte" msgid="2273810564244790859">"volte, napredno pozivanje, 4g pozivanje"</string>
<string name="default_sound" msgid="8821684447333687810">"Podrazumevani zvuk"</string>
<string name="sound_settings_summary" msgid="4100853606668287965">"Jačina zvona je <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
<string name="sound_dashboard_summary" msgid="3402435125958012986">"Jačina zvuka, vibracija, Ne uznemiravaj"</string>
@@ -3952,7 +3949,6 @@
<string name="permit_draw_overlay" msgid="7456536798718633432">"Dozvoli prikaz preko drugih aplikacija"</string>
<string name="allow_overlay_description" msgid="8961670023925421358">"Omogućite ovoj aplikaciji da se prikazuje preko drugih aplikacija koje koristite. To može da ometa korišćenje tih aplikacija ili da promeni njihov izgled ili ponašanje."</string>
<string name="keywords_vr_listener" msgid="7441221822576384680">"vr virtuelna realnost obrađivač usluga stereo pomagača"</string>
- <string name="keywords_system_alert_window" msgid="5049498015597864850">"sistem obaveštenje prozor dijalog prikaz preko drugih aplikacija"</string>
<string name="overlay_settings" msgid="6930854109449524280">"Prikaz preko drugih aplikacija"</string>
<string name="system_alert_window_summary" msgid="602892301318324492">"Aplikacije sa dozvolom za prikaz preko drugih: <xliff:g id="COUNT_0">%1$d</xliff:g> od <xliff:g id="COUNT_1">%2$d</xliff:g>"</string>
<string name="filter_overlay_apps" msgid="6965969283342557573">"Aplikacije sa dozvolom"</string>
@@ -4194,7 +4190,6 @@
<string name="notification_log_details_none" msgid="184131801230614059">"nijedno"</string>
<string name="notification_log_details_ranking_null" msgid="244660392058720919">"Nedostaje objekat za rangiranje."</string>
<string name="notification_log_details_ranking_none" msgid="599607025882587844">"Objekat za rangiranje ne sadrži ovu šifru."</string>
- <string name="theme_customization_category" msgid="1049181544004163283">"Teme"</string>
<string name="theme_customization_device_default" msgid="5058147707906551368">"Podrazumevano podešavanje za uređaj"</string>
<string name="display_cutout_emulation" msgid="7466869822418376317">"Izrez ekrana"</string>
<string name="display_cutout_emulation_keywords" msgid="4495418317471622562">"izrezana slika za ekran, urez"</string>
@@ -4632,6 +4627,8 @@
<string name="network_connection_errorstate_dialog_message" msgid="6953778550775646710">"Došlo je do nekog problema. Aplikacija je otkazala zahtev za izbor uređaja."</string>
<string name="network_connection_connect_successful" msgid="5935510954474494928">"Povezivanje je uspelo"</string>
<string name="network_connection_request_dialog_showall" msgid="6938922880244567521">"Prikaži sve"</string>
+ <string name="network_connection_searching_message" msgid="4638576789450817530">"Traži se uređaj…"</string>
+ <string name="network_connection_connecting_message" msgid="3740982406609245654">"Povezuje se sa uređajem…"</string>
<plurals name="show_bluetooth_devices" formatted="false" msgid="1715020480026568408">
<item quantity="one">Povezan je <xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> uređaj</item>
<item quantity="few">Povezana su <xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> uređaja</item>
diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml
index 77fb0d3..2d9f7d7 100644
--- a/res/values-be/strings.xml
+++ b/res/values-be/strings.xml
@@ -364,8 +364,6 @@
<string name="security_enable_widgets_disabled_summary" msgid="6392489775303464905">"Адключана адміністратарам"</string>
<string name="lockdown_settings_title" msgid="7393790212603280213">"Паказаць параметр блакіроўкі"</string>
<string name="lockdown_settings_summary" msgid="4359438673563318171">"Дадаць у меню кнопкі сілкавання функцыю, якая выключае разумную блакіроўку, біяметрычную разблакіроўку і апавяшчэнні на экране блакіроўкі"</string>
- <string name="trust_agents_extend_unlock_title" msgid="2796555263565097031">"Давераныя агенты падаўжаюць разблакіроўку"</string>
- <string name="trust_agents_extend_unlock_summary" msgid="3976344969220255010">"Калі функцыя ўключана, давераныя агенты будуць даўжэй трымаць прыладу разблакіраванай, аднак не змогуць разблакіраваць ужо заблакіраваную прыладу."</string>
<string name="trust_lost_locks_screen_title" msgid="2992742466966021682">"Блакіраваць экран, калі давер страчаны"</string>
<string name="trust_lost_locks_screen_summary" msgid="693784434582021206">"Пры ўключанай функцыі прылада будзе заблакіравана, калі страціць давер апошні агент"</string>
<string name="owner_info_settings_summary" msgid="7472393443779227052">"Няма"</string>
@@ -969,6 +967,7 @@
<string name="wifi_eap_identity" msgid="4359453783379679103">"Ідэнтыфікатар"</string>
<string name="wifi_eap_anonymous" msgid="2989469344116577955">"Ананімны ідэнтыфікатар"</string>
<string name="wifi_password" msgid="5948219759936151048">"Пароль"</string>
+ <string name="wifi_sae_password_id" msgid="1697832722221765763">"Ідэнтыфікатар пароля SAE"</string>
<string name="wifi_show_password" msgid="6461249871236968884">"Паказваць пароль"</string>
<string name="wifi_ap_band_config" msgid="1611826705989117930">"Выбраць дыяпазон для пунктаў доступу"</string>
<string name="wifi_ap_choose_auto" msgid="2677800651271769965">"Аўтаматычна"</string>
@@ -989,7 +988,6 @@
<string name="wifi_dpp_share_wifi" msgid="9065890131734833809">"Абагуліць Wi‑Fi"</string>
<string name="wifi_dpp_scan_qr_code_with_another_device" msgid="5854392840857123065">"Прасканіруйце QR-код, каб падключыцца да сеткі \"<xliff:g id="SSID">%1$s</xliff:g>\" і абагуліць пароль"</string>
<string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="4436318319178361543">"Каб падключыцца да \"<xliff:g id="SSID">%1$s</xliff:g>\", прасканіруйце гэты QR-код"</string>
- <string name="wifi_dpp_could_not_detect_valid_qr_code" msgid="641893675646330576">"Не ўдалося прачытаць QR-код. Паўторна ўвядзіце код і паўтарыце спробу"</string>
<string name="wifi_dpp_failure_authentication_or_configuration" msgid="3372757783382381044">"Паўтарыце спробу. Калі памылка застанецца, звярніцеся да вытворцы прылады"</string>
<string name="wifi_dpp_failure_not_compatible" msgid="2829930473520603740">"Нешта пайшло не так"</string>
<string name="wifi_dpp_failure_timeout" msgid="5228320772245820458">"Пераканайцеся, што прылада падключана, зараджана і ўключана"</string>
@@ -1012,6 +1010,7 @@
<string name="wifi_dpp_hotspot_password" msgid="4120419278831581613">"Пароль хот-спота: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
<string name="wifi_dpp_add_device" msgid="4072206063308645677">"Дадаць прыладу"</string>
<string name="wifi_dpp_connect_network_using_qr_code" msgid="3887335309163999665">"Каб дадаць прыладу ў гэту сетку, скарыстайце QR-код"</string>
+ <string name="wifi_dpp_qr_code_is_not_valid_format" msgid="3700087439867692944">"QR-код мае несапраўдны фармат"</string>
<string name="retry" msgid="6472609612090877557">"Паўтарыць"</string>
<string name="wifi_shared" msgid="844142443226926070">"Падзяліцца з іншымі карыстальнікамі прылады"</string>
<string name="wifi_unchanged" msgid="3410422020930397102">"(не зменена)"</string>
@@ -1167,6 +1166,7 @@
<string name="emergency_address_title" msgid="932729250447887545">"Экстранны адрас"</string>
<string name="emergency_address_summary" msgid="7751971156196115129">"Выкарыстоўваецца як ваша месцазнаходжанне, калі вы робіце экстранны выклік праз Wi‑Fi"</string>
<string name="private_dns_help_message" msgid="3299567069152568958"><annotation id="url">"Дадатковыя звесткі"</annotation>" аб функцыях Прыватнай DNS"</string>
+ <string name="private_dns_mode_on" msgid="5882613439541371003">"Уключана"</string>
<string name="wifi_calling_pref_managed_by_carrier" msgid="6845711858866828986">"Наладамі кіруе аператар"</string>
<string name="wifi_calling_settings_activation_instructions" msgid="7492509632478260955">"Актываваць Wi-Fi-тэлефанію"</string>
<string name="wifi_calling_turn_on" msgid="1171403510313983983">"Уключыць Wi-Fi-тэлефанію"</string>
@@ -1917,7 +1917,7 @@
<string name="default_emergency_app" msgid="1951760659640369980">"Праграма для экстранных сітуацый"</string>
<string name="reset_app_preferences" msgid="1321050641018356925">"Скінуць налады праграм"</string>
<string name="reset_app_preferences_title" msgid="6093179367325336662">"Скінуць налады праграм?"</string>
- <string name="reset_app_preferences_desc" msgid="4822447731869201512">"Будуць скінуты наступныя налады:\n\n"<li>"Адключаныя праграмы"</li>\n<li>"Адключаныя апавяшчэнні з праграм"</li>\n<li>"Перадвызначаныя праграмы"</li>\n<li>"Абмежаванні на перадачу даных у фонавым рэжыме"</li>\n<li>"Любыя абмежаванні правоў доступу"</li>\n\n"Даныя праграм выдалены не будуць."</string>
+ <string name="reset_app_preferences_desc" msgid="731757609326016760">"Будуць скінуты наступныя налады:\n\n"<li>" адключаныя праграмы;"</li>\n<li>"адключаныя апавяшчэнні праграм;"</li>\n<li>"стандартныя праграмы для дзеянняў;"</li>\n<li>"абмежаванні на фонавую перадачу даных для праграм;"</li>\n<li>"абмежаванні дазволаў."</li>\n\n"Даныя праграм не будуць выдалены."</string>
<string name="reset_app_preferences_button" msgid="2559089511841281242">"Скінуць праграмы"</string>
<string name="manage_space_text" msgid="8852711522447794676">"Кіраванне вольным месцам"</string>
<string name="filter" msgid="2018011724373033887">"Фільтр"</string>
@@ -2132,7 +2132,7 @@
<string name="accessibility_screen_magnification_short_summary" msgid="3411979839172752057">"Тройчы дакраніцеся, каб змяніць маштаб"</string>
<string name="accessibility_screen_magnification_navbar_short_summary" msgid="3693116360267980492">"Дакраніцеся да кнопкі, каб павялічыць маштаб"</string>
<string name="accessibility_screen_magnification_summary" msgid="5258868553337478505"><b>"Каб павялічыць маштаб"</b>", хутка краніце экран 3 разы.\n"<ul><li>"Правядзіце 2 ці некалькімі пальцамі па экране, каб выканаць пракрутку"</li>\n<li>"Звядзіце 2 ці некалькі пальцаў, каб адрэгуляваць маштаб"</li></ul>\n\n<b>"Каб павялічыць маштаб часова"</b>", хутка краніце экран 3 разы і ўтрымлівайце палец падчас трэцяга дотыку.\n"<ul><li>"Праводзьце пальцам, каб перамяшчацца па экране"</li>\n<li>"Падніміце палец, каб паменшыць маштаб"</li></ul>\n\n"На клавіятуры і панэлі навігацыі павялічваць маштаб нельга."</string>
- <string name="accessibility_screen_magnification_navbar_summary" msgid="2272878354599332009">"Калі ўключана функцыя павелічэння, вы можаце павялічыць маштаб на экране.\n\n"<b>"Для гэтага"</b>" запусціце функцыю павелічэння, а пасля націсніце ў любым месцы экрана.\n"<ul><li>"• Каб прагартаць, перацягніце пальцамі (двума ці больш)"</li>\n<li>"• Каб адрэгуляваць маштаб, звядзіце ці развядзіце пальцы (два ці больш)"</li></ul>\n\n<b>"Каб часова змяніць маштаб"</b>", запусціце функцыю павелічэння, потым утрымлівайце націснутым любое месца на экране.\n"<ul><li>"• Перацягніце для навігацыі па экране"</li>\n<li>"• Падыміце палец, каб паменшыць маштаб"</li></ul>\n\n"Павелічэнне маштабу клавіятуры ці панэлі навігацыі не прадугледжана."</string>
+ <string name="accessibility_screen_magnification_navbar_summary" msgid="6700716275347612310">"Калі ўключана функцыя павелічэння, вы можаце павялічыць маштаб на экране.\n\n"<b>"Для гэтага"</b>" запусціце функцыю павелічэння, а пасля націсніце ў любым месцы экрана.\n"<ul><li>"Каб прагартаць, перацягніце пальцамі (двума ці больш)."</li>\n<li>"Каб адрэгуляваць маштаб, звядзіце ці развядзіце пальцы (два ці больш)."</li></ul>\n\n<b>"Каб часова змяніць маштаб"</b>", запусціце функцыю павелічэння, потым утрымлівайце націснутым любое месца на экране.\n"<ul><li>"Перацягніце для навігацыі па экране."</li>\n<li>"Падыміце палец, каб паменшыць маштаб."</li></ul>\n\n"Павелічэнне маштабу клавіятуры ці панэлі навігацыі не прадугледжана."</string>
<string name="accessibility_tutorial_dialog_title_button" msgid="3682222614034474845">"Адкрывайце кнопкай спецыяльных магчымасцей"</string>
<string name="accessibility_tutorial_dialog_title_gesture" msgid="1342726230497913398">"Адкрывайце жэстам"</string>
<string name="accessibility_tutorial_dialog_title_gesture_settings" msgid="8539392614235820285">"Выкарыстоўвайце новы жэст спецыяльных магчымасцей"</string>
@@ -2185,8 +2185,7 @@
<string name="accessibility_hearingaid_title" msgid="8312145423610648518">"Слыхавы апарат"</string>
<string name="accessibility_hearingaid_not_connected_summary" msgid="6240237523789614599">"Няма падключаных слыхавых апаратаў"</string>
<string name="accessibility_hearingaid_adding_summary" msgid="2947474468412309778">"Дадаць слыхавыя апараты"</string>
- <string name="accessibility_hearingaid_pair_instructions_first_message" msgid="3912093691643131154">"Каб спалучыць слыхавы апарат, націсн. на яго на наступ. экране."</string>
- <string name="accessibility_hearingaid_pair_instructions_second_message" msgid="5596683393607650243">"Пераканайцеся, што слыхавы апарат знаходзіцца ў рэжыме спалучэння."</string>
+ <string name="accessibility_hearingaid_pair_instructions_message" msgid="3094382949733435414">"Каб спалучыць слыхавы апарат, націсн. на яго на наступ. экране. Пераканайцеся, што слыхавы апарат знаходзіцца ў рэжыме спалучэння."</string>
<string name="accessibility_hearingaid_active_device_summary" msgid="3924362383258688984">"Прылада <xliff:g id="DEVICE_NAME">%1$s</xliff:g> актыўная"</string>
<plurals name="show_number_hearingaid_count" formatted="false" msgid="3160782397139295486">
<item quantity="one">Захаваны <xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> слыхавы апарат</item>
@@ -2565,7 +2564,6 @@
<string name="menu_stats_last_unplugged" msgid="5922246077592434526">"Адключаны ад сілкавання на працягу <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
<string name="menu_stats_total" msgid="8973377864854807854">"Вынікі выкарыстання"</string>
<string name="menu_stats_refresh" msgid="1676215433344981075">"Абнавіць"</string>
- <string name="process_kernel_label" msgid="3916858646836739323">"АС Android"</string>
<string name="process_mediaserver_label" msgid="6500382062945689285">"Сервер медыя"</string>
<string name="process_dex2oat_label" msgid="2592408651060518226">"Аптымізацыя дадаткаў"</string>
<string name="battery_saver" msgid="8172485772238572153">"Эканомія зараду"</string>
@@ -2696,8 +2694,6 @@
<string name="no_device_admins" msgid="4846602835339095768">"Няма даступных праграм адміністратара прылады"</string>
<string name="personal_device_admin_title" msgid="2849617316347669861">"Персанальныя"</string>
<string name="managed_device_admin_title" msgid="7853955652864478435">"Рабочыя"</string>
- <string name="sms_access_restriction_enabled" msgid="7054488078710530278">"Абмежаваць доступ да SMS і журналу выклікаў"</string>
- <string name="sms_access_restriction_enabled_summary" msgid="6851339654677842328">"Толькі стандартныя праграмы \"Тэлефон\" і праграмы-месенджары маюць дазволы на доступ да SMS і журналу выклікаў"</string>
<string name="no_trust_agents" msgid="7450273545568977523">"Няма даступных давераных агентаў"</string>
<string name="add_device_admin_msg" msgid="1501847129819382149">"Актываваць праграму адміністратара?"</string>
<string name="add_device_admin" msgid="4192055385312215731">"Актываваць гэту праграму адміністратара прылады"</string>
@@ -3196,7 +3192,7 @@
<string name="keywords_app_default" msgid="5822717006354487071">"Адкрыць з дапамогай"</string>
<string name="keywords_applications_settings" msgid="1268353611121497450">"Праграмы"</string>
<string name="keywords_time_zone" msgid="998254736898753085">"часавы пояс"</string>
- <string name="keywords_draw_overlay" msgid="4130899177619041842">"Загаловак чата"</string>
+ <string name="keywords_draw_overlay" msgid="1001120206241401007">"Загаловак чата, сістэма, абвестка, акно, дыялог, дысплэй, паверх іншых праграм, намаляваць"</string>
<string name="keywords_flashlight" msgid="6161632177705233710">"Успышка, святло, ліхтарык"</string>
<string name="keywords_change_wifi_state" msgid="627068244033681010">"wifi, wi-fi, пераключэнне, кіраванне"</string>
<string name="keywords_more_mobile_networks" msgid="8995946622054642367">"сотавы, мабільны, сотавы аператар, бесправадны, даныя, 4g, 3g, 2g, lte"</string>
@@ -3220,7 +3216,7 @@
<string name="keywords_sounds_and_notifications_interruptions" msgid="5426093074031208917">"не турбаваць, умешвацца, умяшанне, перапыняць"</string>
<string name="keywords_app" msgid="6334757056536837791">"аператыўная памяць"</string>
<string name="keywords_location" msgid="4132655528196729043">"паблізу, месцазнаходжанне, гісторыя, справаздачы, GPS"</string>
- <string name="keywords_accounts" msgid="1957925565953357627">"уліковы запіс"</string>
+ <string name="keywords_accounts" msgid="4479029747403203867">"уліковы запіс, дадаць уліковы запіс, працоўны профіль"</string>
<string name="keywords_users" msgid="3434190133131387942">"абмежаванне, абмяжоўваць, абмежаваны"</string>
<string name="keywords_keyboard_and_ime" msgid="9143339015329957107">"выпраўленне тэксту, правільны, гук, вібрацыя, аўтаматычна, мова, жэст, прапанаваць, прапанова, тэма, абразлівы, слова, набіраць, эмодзі, міжнародны"</string>
<string name="keywords_reset_apps" msgid="5293291209613191845">"скінуць, параметры, стандартныя"</string>
@@ -3258,6 +3254,7 @@
<string name="keywords_storage_settings" msgid="297283751968446577">"памяць, кэш, даныя, выдаліць, ачысціць, вызваліць, месца"</string>
<string name="keywords_bluetooth_settings" msgid="6804844062789439858">"падключаны, прылада, навушнікі, гарнітура, дынамік, бесправадны, спалучыць, навушнікі-ўкладышы, музыка, медыя"</string>
<string name="keywords_wallpaper" msgid="5058364390917429896">"фон, экран, экран блакіроўкі, тэма"</string>
+ <string name="keywords_styles" msgid="5828725481814049422">"форма значка, колер акцэнту, шрыфт"</string>
<string name="keywords_assist_input" msgid="5017533309492679287">"стандартны, памочнік"</string>
<string name="keywords_default_payment_app" msgid="3838565809518896799">"аплата, стандартная"</string>
<string name="keywords_ambient_display" msgid="3103487805748659132">"уваходнае апавяшчэнне"</string>
@@ -3267,7 +3264,7 @@
<string name="keywords_notification_vibration" msgid="31924624421190547">"дотык, вібрацыя, адчувальнасць"</string>
<string name="keywords_battery_saver_sticky" msgid="5586215686021650278">"эканомія зараду, замацаваны, захаваць, эканомія энергіі, акумулятар"</string>
<string name="keywords_battery_saver_schedule" msgid="7358789228486231944">"працэдура, расклад, эканомія зараду, эканомія энергіі, акумулятар, аўтаматычна, працэнт"</string>
- <string name="keywords_add_an_account" msgid="6488139919428902434">"працоўны профіль"</string>
+ <string name="keywords_enhance_4g_lte" msgid="2273810564244790859">"volte, пашыраныя магчымасці выкліку, выклік у 4g"</string>
<string name="default_sound" msgid="8821684447333687810">"Гук па змаўчанні"</string>
<string name="sound_settings_summary" msgid="4100853606668287965">"Гучнасць званка – <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
<string name="sound_dashboard_summary" msgid="3402435125958012986">"Гучнасць, вібрацыя, рэжым \"Не турбаваць\""</string>
@@ -4017,7 +4014,6 @@
<string name="permit_draw_overlay" msgid="7456536798718633432">"Дазволіць паказ паверх іншых праграм"</string>
<string name="allow_overlay_description" msgid="8961670023925421358">"Дазволіць гэтай праграме паказвацца паверх іншых праграм, якія вы выкарыстоўваеце. Гэта можа перашкодзіць выкарыстанню гэтых праграм або змяніць спосаб, якім яны могуць паказвацца або працаваць."</string>
<string name="keywords_vr_listener" msgid="7441221822576384680">"vr віртуальная рэальнасць сродак праслухоўвання стэрэа служба-памочнік"</string>
- <string name="keywords_system_alert_window" msgid="5049498015597864850">"паказваць дыялог акна сістэмных абвестак паверх іншых праграм"</string>
<string name="overlay_settings" msgid="6930854109449524280">"Паказваць паверх іншых праграм"</string>
<string name="system_alert_window_summary" msgid="602892301318324492">"<xliff:g id="COUNT_0">%1$d</xliff:g> з <xliff:g id="COUNT_1">%2$d</xliff:g> праграм(-ы) дазволена паказвацца паверх іншых праграм"</string>
<string name="filter_overlay_apps" msgid="6965969283342557573">"Дадаткі з дазволам"</string>
@@ -4265,7 +4261,6 @@
<string name="notification_log_details_none" msgid="184131801230614059">"няма"</string>
<string name="notification_log_details_ranking_null" msgid="244660392058720919">"Аб\'ект ранжыравання адсутнічае."</string>
<string name="notification_log_details_ranking_none" msgid="599607025882587844">"Аб\'ект ранжыравання не ўтрымлівае гэты сімвал."</string>
- <string name="theme_customization_category" msgid="1049181544004163283">"Тэмы"</string>
<string name="theme_customization_device_default" msgid="5058147707906551368">"Стандартная налада"</string>
<string name="display_cutout_emulation" msgid="7466869822418376317">"Выраз на экране"</string>
<string name="display_cutout_emulation_keywords" msgid="4495418317471622562">"выраз дысплея, выемка"</string>
@@ -4715,6 +4710,8 @@
<string name="network_connection_errorstate_dialog_message" msgid="6953778550775646710">"Нешта здарылася. Праграма скасавала запыт на выбар прылады."</string>
<string name="network_connection_connect_successful" msgid="5935510954474494928">"Падключэнне выканана"</string>
<string name="network_connection_request_dialog_showall" msgid="6938922880244567521">"Паказаць усе"</string>
+ <string name="network_connection_searching_message" msgid="4638576789450817530">"Ідзе пошук прылады…"</string>
+ <string name="network_connection_connecting_message" msgid="3740982406609245654">"Ідзе падключэнне да прылады…"</string>
<plurals name="show_bluetooth_devices" formatted="false" msgid="1715020480026568408">
<item quantity="one">Падключана <xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> прылада</item>
<item quantity="few">Падключаны <xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> прылады</item>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index d1a38ae..ff59c6d 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -360,8 +360,6 @@
<string name="security_enable_widgets_disabled_summary" msgid="6392489775303464905">"Деактивирано от администратора"</string>
<string name="lockdown_settings_title" msgid="7393790212603280213">"Показване на опция за заключване"</string>
<string name="lockdown_settings_summary" msgid="4359438673563318171">"Показване на опция за бутона за захранване, която изключва Smart Lock, биометричното отключване и известията на заключения екран"</string>
- <string name="trust_agents_extend_unlock_title" msgid="2796555263565097031">"Удължено откл. само за надеждни агенти"</string>
- <string name="trust_agents_extend_unlock_summary" msgid="3976344969220255010">"Ако функцията е активирана, надеждните агенти ще поддържат устройството ви отключено за по-дълъг период от време, но повече няма да могат да го отключват, ако е заключено."</string>
<string name="trust_lost_locks_screen_title" msgid="2992742466966021682">"Заключ. на екрана при изгубено доверие"</string>
<string name="trust_lost_locks_screen_summary" msgid="693784434582021206">"Ако функцията е активирана, устройството ще се заключи, когато бъде изгубено доверието в последния надежден агент"</string>
<string name="owner_info_settings_summary" msgid="7472393443779227052">"Няма"</string>
@@ -937,6 +935,7 @@
<string name="wifi_eap_identity" msgid="4359453783379679103">"Самоличност"</string>
<string name="wifi_eap_anonymous" msgid="2989469344116577955">"Анонимна самоличност"</string>
<string name="wifi_password" msgid="5948219759936151048">"Парола"</string>
+ <string name="wifi_sae_password_id" msgid="1697832722221765763">"Идентификатор на парола за SAE"</string>
<string name="wifi_show_password" msgid="6461249871236968884">"Показване на паролата"</string>
<string name="wifi_ap_band_config" msgid="1611826705989117930">"Избиране на честота на точката за достъп"</string>
<string name="wifi_ap_choose_auto" msgid="2677800651271769965">"Автоматично"</string>
@@ -957,7 +956,6 @@
<string name="wifi_dpp_share_wifi" msgid="9065890131734833809">"Споделяне на Wi‑Fi мрежата"</string>
<string name="wifi_dpp_scan_qr_code_with_another_device" msgid="5854392840857123065">"Сканирайте този код за бърза реакция, за да се свържете към „<xliff:g id="SSID">%1$s</xliff:g>“ и да споделите паролата"</string>
<string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="4436318319178361543">"Сканирайте този код за бърза реакция, за да се свържете към „<xliff:g id="SSID">%1$s</xliff:g>“"</string>
- <string name="wifi_dpp_could_not_detect_valid_qr_code" msgid="641893675646330576">"Кодът за бърза реакция не можа да бъде прочетен. Центрирайте го отново и опитайте пак"</string>
<string name="wifi_dpp_failure_authentication_or_configuration" msgid="3372757783382381044">"Опитайте отново. Ако проблемът не се отстрани, свържете се с производителя на устройството."</string>
<string name="wifi_dpp_failure_not_compatible" msgid="2829930473520603740">"Нещо се обърка"</string>
<string name="wifi_dpp_failure_timeout" msgid="5228320772245820458">"Уверете се, че устройството е включено в захранването, заредено и включено"</string>
@@ -980,6 +978,7 @@
<string name="wifi_dpp_hotspot_password" msgid="4120419278831581613">"Парола за точката за достъп: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
<string name="wifi_dpp_add_device" msgid="4072206063308645677">"Добавяне на устройство"</string>
<string name="wifi_dpp_connect_network_using_qr_code" msgid="3887335309163999665">"Използвайте код за бърза реакция, за да добавите устройство към тази мрежа"</string>
+ <string name="wifi_dpp_qr_code_is_not_valid_format" msgid="3700087439867692944">"Невалиден формат на кода за бърза реакция"</string>
<string name="retry" msgid="6472609612090877557">"Нов опит"</string>
<string name="wifi_shared" msgid="844142443226926070">"Споделяне с другите потребители на устройството"</string>
<string name="wifi_unchanged" msgid="3410422020930397102">"(непроменени)"</string>
@@ -1129,6 +1128,7 @@
<string name="emergency_address_title" msgid="932729250447887545">"Адрес за спешни случаи"</string>
<string name="emergency_address_summary" msgid="7751971156196115129">"Използва се като вашето местоположение, когато извършвате спешно обаждане през Wi-Fi"</string>
<string name="private_dns_help_message" msgid="3299567069152568958"><annotation id="url">"Научете повече"</annotation>" за функциите на частния DNS"</string>
+ <string name="private_dns_mode_on" msgid="5882613439541371003">"Включено"</string>
<string name="wifi_calling_pref_managed_by_carrier" msgid="6845711858866828986">"Настройката се управлява от оператора"</string>
<string name="wifi_calling_settings_activation_instructions" msgid="7492509632478260955">"Активиране на функцията за обаждания през Wi-Fi"</string>
<string name="wifi_calling_turn_on" msgid="1171403510313983983">"Включване на функцията за обаждания през Wi-Fi"</string>
@@ -1872,7 +1872,7 @@
<string name="default_emergency_app" msgid="1951760659640369980">"Приложение за спешни случаи"</string>
<string name="reset_app_preferences" msgid="1321050641018356925">"Нулиране на предпочитанията за приложенията"</string>
<string name="reset_app_preferences_title" msgid="6093179367325336662">"Нулиране на предпочитанията?"</string>
- <string name="reset_app_preferences_desc" msgid="4822447731869201512">"Това ще нулира всички предпочитания за:\n\n"<li>"деактивираните приложения;"</li>\n<li>"известията за деактивирани приложения;"</li>\n<li>"стандартните приложения за действия;"</li>\n<li>"ограниченията за данни на заден план за приложенията;"</li>\n<li>"ограниченията за всички разрешения."</li>\n\n" Няма да загубите данни от приложенията."</string>
+ <string name="reset_app_preferences_desc" msgid="731757609326016760">"Това действие ще нулира всички предпочитания за:\n\n"<li>"деактивираните приложения;"</li>\n<li>"известията за деактивирани приложения;"</li>\n<li>"стандартните приложения за действия;"</li>\n<li>"ограниченията за данни на заден план за приложенията;"</li>\n<li>" ограниченията за всички разрешения."</li>\n\n"Няма да загубите данни от приложенията."</string>
<string name="reset_app_preferences_button" msgid="2559089511841281242">"Нулиране на приложенията"</string>
<string name="manage_space_text" msgid="8852711522447794676">"Управление на място"</string>
<string name="filter" msgid="2018011724373033887">"Филтриране"</string>
@@ -2087,7 +2087,7 @@
<string name="accessibility_screen_magnification_short_summary" msgid="3411979839172752057">"Трикратно докосване за промяна на мащаба"</string>
<string name="accessibility_screen_magnification_navbar_short_summary" msgid="3693116360267980492">"Променяйте мащаба с докосване на бутон"</string>
<string name="accessibility_screen_magnification_summary" msgid="5258868553337478505"><b>"За да промените мащаба"</b>", докоснете бързо екрана 3 пъти.\n"<ul><li>"Плъзнете 2 или повече пръсти, за да превъртите."</li>\n<li>"Съберете или разтворете 2 или повече пръсти, за да коригирате мащаба."</li></ul>\n\n<b>"За да промените временно мащаба"</b>", докоснете бързо екрана 3 пъти и задръжте пръста си при третото докосване.\n"<ul><li>"Плъзнете пръста си, за да се придвижите на екрана."</li>\n<li>"Вдигнете пръста си, за да намалите мащаба."</li></ul>\n\n"Не можете да увеличавате мащаба на клавиатурата или лентата за навигация."</string>
- <string name="accessibility_screen_magnification_navbar_summary" msgid="2272878354599332009">"Когато функцията за увеличение е включена, можете да увеличавате мащаба на екрана.\n\n"<b>"За да промените мащаба"</b>", стартирайте функцията за увеличение, след което докоснете произволно място на екрана.\n"<ul><li>"• Плъзнете 2 или повече пръсти, за да превъртите."</li>\n<li>"• Съберете или разтворете 2 или повече пръсти, за да коригирате мащаба."</li></ul>\n\n<b>"За да промените временно мащаба"</b>", стартирайте функцията за увеличение, след което докоснете и задръжте произволно място на екрана.\n"<ul><li>"• Плъзнете пръста си, за да се придвижите на екрана."</li>\n<li>"• Вдигнете пръста си, за да намалите мащаба."</li></ul>\n\n"Не можете да увеличавате мащаба на клавиатурата или лентата за навигация."</string>
+ <string name="accessibility_screen_magnification_navbar_summary" msgid="6700716275347612310">"Когато функцията за увеличение е включена, можете да увеличавате мащаба на екрана.\n\n"<b>"За да промените мащаба"</b>", стартирайте функцията за увеличение, след което докоснете произволно място на екрана.\n"<ul><li>"Плъзнете 2 или повече пръсти, за да превъртите."</li>\n<li>"Съберете или разтворете 2 или повече пръсти, за да коригирате мащаба."</li></ul>\n\n<b>"За да промените временно мащаба"</b>", стартирайте функцията за увеличение, след което докоснете и задръжте произволно място на екрана.\n"<ul><li>"Плъзнете пръста си, за да се придвижите на екрана."</li>\n<li>"Вдигнете пръста си, за да намалите мащаба."</li></ul>\n\n"Не можете да увеличавате мащаба на клавиатурата или лентата за навигация."</string>
<string name="accessibility_tutorial_dialog_title_button" msgid="3682222614034474845">"Отваряне с бутона за достъпност"</string>
<string name="accessibility_tutorial_dialog_title_gesture" msgid="1342726230497913398">"Отваряне с жест"</string>
<string name="accessibility_tutorial_dialog_title_gesture_settings" msgid="8539392614235820285">"Използване на новите жестове за достъпност"</string>
@@ -2140,8 +2140,7 @@
<string name="accessibility_hearingaid_title" msgid="8312145423610648518">"Слухови апарати"</string>
<string name="accessibility_hearingaid_not_connected_summary" msgid="6240237523789614599">"Няма свързани слухови апарати"</string>
<string name="accessibility_hearingaid_adding_summary" msgid="2947474468412309778">"Добавяне на слухови апарати"</string>
- <string name="accessibility_hearingaid_pair_instructions_first_message" msgid="3912093691643131154">"За да сдвоите слухов апарат, на следващия екран намерете устройството си и го докоснете."</string>
- <string name="accessibility_hearingaid_pair_instructions_second_message" msgid="5596683393607650243">"Уверете се, че слуховите ви апарати са в режим за сдвояване."</string>
+ <string name="accessibility_hearingaid_pair_instructions_message" msgid="3094382949733435414">"За да сдвоите слухов апарат, на следващия екран намерете устройството си и го докоснете. Слуховият апарат трябва да е в режим за сдвояване."</string>
<string name="accessibility_hearingaid_active_device_summary" msgid="3924362383258688984">"Устройството „<xliff:g id="DEVICE_NAME">%1$s</xliff:g>“ е активно"</string>
<plurals name="show_number_hearingaid_count" formatted="false" msgid="3160782397139295486">
<item quantity="other">Запазени са <xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> слухови апарата</item>
@@ -2490,7 +2489,6 @@
<string name="menu_stats_last_unplugged" msgid="5922246077592434526">"При последното изключване за <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
<string name="menu_stats_total" msgid="8973377864854807854">"Обща употреба"</string>
<string name="menu_stats_refresh" msgid="1676215433344981075">"Опресняване"</string>
- <string name="process_kernel_label" msgid="3916858646836739323">"Android (ОС)"</string>
<string name="process_mediaserver_label" msgid="6500382062945689285">"Медиен сървър"</string>
<string name="process_dex2oat_label" msgid="2592408651060518226">"Оптимизиране на приложенията"</string>
<string name="battery_saver" msgid="8172485772238572153">"Режим за запазване на батерията"</string>
@@ -2621,8 +2619,6 @@
<string name="no_device_admins" msgid="4846602835339095768">"Няма приложения за администриране на устройството"</string>
<string name="personal_device_admin_title" msgid="2849617316347669861">"Лично"</string>
<string name="managed_device_admin_title" msgid="7853955652864478435">"Служебно"</string>
- <string name="sms_access_restriction_enabled" msgid="7054488078710530278">"Огранич. на достъпа до SMS и списъка с обажданията"</string>
- <string name="sms_access_restriction_enabled_summary" msgid="6851339654677842328">"Само стандартните приложения за телефон и съобщения имат разрешения за SMS и списъка с обажданията"</string>
<string name="no_trust_agents" msgid="7450273545568977523">"Няма налични trust agents"</string>
<string name="add_device_admin_msg" msgid="1501847129819382149">"Да се активира ли прилож. за администр.?"</string>
<string name="add_device_admin" msgid="4192055385312215731">"Активиране на това приложение за администриране на устройството"</string>
@@ -3111,7 +3107,7 @@
<string name="keywords_app_default" msgid="5822717006354487071">"Отваряне чрез"</string>
<string name="keywords_applications_settings" msgid="1268353611121497450">"Приложения"</string>
<string name="keywords_time_zone" msgid="998254736898753085">"часова зона"</string>
- <string name="keywords_draw_overlay" msgid="4130899177619041842">"Балонче за разговор"</string>
+ <string name="keywords_draw_overlay" msgid="1001120206241401007">"балонче за разговор, системни, сигнал, прозорец, диалогов прозорец, показване, върху други приложения, изобразяване"</string>
<string name="keywords_flashlight" msgid="6161632177705233710">"фенерче, светлина, фенер"</string>
<string name="keywords_change_wifi_state" msgid="627068244033681010">"wifi, wi-fi, превключване, контрола"</string>
<string name="keywords_more_mobile_networks" msgid="8995946622054642367">"мобилни данни, мобилна мрежа, мобилен оператор, безжична мрежа, данни, 4g, 3g, 2g, lte"</string>
@@ -3135,7 +3131,7 @@
<string name="keywords_sounds_and_notifications_interruptions" msgid="5426093074031208917">"не, не безпокойте, прекъсвам, прекъсване, почивка"</string>
<string name="keywords_app" msgid="6334757056536837791">"RAM"</string>
<string name="keywords_location" msgid="4132655528196729043">"в района, местоположение, история, отчитане, GPS"</string>
- <string name="keywords_accounts" msgid="1957925565953357627">"профил"</string>
+ <string name="keywords_accounts" msgid="4479029747403203867">"профил, добавяне на профил, служебен потребителски профил"</string>
<string name="keywords_users" msgid="3434190133131387942">"ограничение, ограничаване, ограничено"</string>
<string name="keywords_keyboard_and_ime" msgid="9143339015329957107">"коригиране на текст, коригиране, звук, вибриране, автоматично, език, жест, предлагане, предложение, тема, обидно, дума, тип, емотикони, международно"</string>
<string name="keywords_reset_apps" msgid="5293291209613191845">"нулиране, предпочитания, по подразбиране"</string>
@@ -3173,6 +3169,7 @@
<string name="keywords_storage_settings" msgid="297283751968446577">"памет, кеш, данни, изтриване, изчистване, освобождаване, място"</string>
<string name="keywords_bluetooth_settings" msgid="6804844062789439858">"свързано, устройство, слушалки, слушалки, високоговорител, безжично, сдвояване, слушалки, музика, мултимедия"</string>
<string name="keywords_wallpaper" msgid="5058364390917429896">"фон, екран, заключване на екрана, тема"</string>
+ <string name="keywords_styles" msgid="5828725481814049422">"форма на иконите, цвят на акцентирането, шрифт"</string>
<string name="keywords_assist_input" msgid="5017533309492679287">"по подразбиране, Асистент"</string>
<string name="keywords_default_payment_app" msgid="3838565809518896799">"плащане, по подразбиране"</string>
<string name="keywords_ambient_display" msgid="3103487805748659132">"входящо известие"</string>
@@ -3182,7 +3179,7 @@
<string name="keywords_notification_vibration" msgid="31924624421190547">"осезателна обратна връзка, вибриране, чувствителност"</string>
<string name="keywords_battery_saver_sticky" msgid="5586215686021650278">"режим за запазване на батерията, фиксиран, винаги включен, енергоспестяващ режим, батерия"</string>
<string name="keywords_battery_saver_schedule" msgid="7358789228486231944">"поредица, график, режим за запазване на батерията, енергоспестяващ режим, батерия, автоматично, процент"</string>
- <string name="keywords_add_an_account" msgid="6488139919428902434">"служебен потребителски профил"</string>
+ <string name="keywords_enhance_4g_lte" msgid="2273810564244790859">"volte, разширени обаждания, обаждане през 4g"</string>
<string name="default_sound" msgid="8821684447333687810">"Стандартен звук"</string>
<string name="sound_settings_summary" msgid="4100853606668287965">"Сила на звука при звънене: <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
<string name="sound_dashboard_summary" msgid="3402435125958012986">"Сила на звука, вибриране, „Не безпокойте“"</string>
@@ -3889,7 +3886,6 @@
<string name="permit_draw_overlay" msgid="7456536798718633432">"Разрешаване на показв. върху други приложения"</string>
<string name="allow_overlay_description" msgid="8961670023925421358">"Разрешава на приложението да се показва върху другите използвани от вас приложения. Това може да възпрепятства работата ви с тях или да промени поведението им или начина, по който ги виждате."</string>
<string name="keywords_vr_listener" msgid="7441221822576384680">"vr виртуална реалност приемател стерео помощна услуга"</string>
- <string name="keywords_system_alert_window" msgid="5049498015597864850">"системен сигнал прозорец диалогов прозорец показване върху други приложения"</string>
<string name="overlay_settings" msgid="6930854109449524280">"Показв. върху други приложения"</string>
<string name="system_alert_window_summary" msgid="602892301318324492">"<xliff:g id="COUNT_0">%1$d</xliff:g> от <xliff:g id="COUNT_1">%2$d</xliff:g> приложения имат разрешение да се показват върху други"</string>
<string name="filter_overlay_apps" msgid="6965969283342557573">"Приложения с разрешение"</string>
@@ -4125,7 +4121,6 @@
<string name="notification_log_details_none" msgid="184131801230614059">"няма"</string>
<string name="notification_log_details_ranking_null" msgid="244660392058720919">"Класиращият се обект липсва."</string>
<string name="notification_log_details_ranking_none" msgid="599607025882587844">"Класиращият се обект не съдържа този ключ."</string>
- <string name="theme_customization_category" msgid="1049181544004163283">"Теми"</string>
<string name="theme_customization_device_default" msgid="5058147707906551368">"Стандартна настройка за устройството"</string>
<string name="display_cutout_emulation" msgid="7466869822418376317">"Прорез на екрана"</string>
<string name="display_cutout_emulation_keywords" msgid="4495418317471622562">"прорез на екрана, изрез"</string>
@@ -4551,6 +4546,8 @@
<string name="network_connection_errorstate_dialog_message" msgid="6953778550775646710">"Нещо стана. Приложението анулира заявката за избиране на устройство."</string>
<string name="network_connection_connect_successful" msgid="5935510954474494928">"Връзката е успешна"</string>
<string name="network_connection_request_dialog_showall" msgid="6938922880244567521">"Показване на всички"</string>
+ <string name="network_connection_searching_message" msgid="4638576789450817530">"Търси се устройство…"</string>
+ <string name="network_connection_connecting_message" msgid="3740982406609245654">"Установява се връзка с устройството…"</string>
<plurals name="show_bluetooth_devices" formatted="false" msgid="1715020480026568408">
<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>
diff --git a/res/values-bn/strings.xml b/res/values-bn/strings.xml
index 00027de..6c98068 100644
--- a/res/values-bn/strings.xml
+++ b/res/values-bn/strings.xml
@@ -360,8 +360,6 @@
<string name="security_enable_widgets_disabled_summary" msgid="6392489775303464905">"প্রশাসক দ্বারা অক্ষম করা হয়েছে"</string>
<string name="lockdown_settings_title" msgid="7393790212603280213">"লকডাউনের বিকল্পগুলি দেখুন"</string>
<string name="lockdown_settings_summary" msgid="4359438673563318171">"পাওয়ার বোতামের যে বিকল্পে স্মার্ট লক, বায়োমেট্রিক আনলক করার সুবিধা এবং লক স্ক্রিনে বিজ্ঞপ্তি দেখতে পাওয়ার বৈশিষ্ট্য বন্ধ করা যায়, সেটি দেখুন"</string>
- <string name="trust_agents_extend_unlock_title" msgid="2796555263565097031">"ট্রাস্ট এজেন্ট শুধু আনলকের সময়সীমা বাড়ায়"</string>
- <string name="trust_agents_extend_unlock_summary" msgid="3976344969220255010">"যদি চালু করা হয় তাহলে ট্রাস্ট এজেন্ট বেশি সময় ধরে আপনার ডিভাইস আনলক করে রাখতে পারবে, কিন্তু লক করা ডিভাইস আনলক করতে পারবে না।"</string>
<string name="trust_lost_locks_screen_title" msgid="2992742466966021682">"\"বিশ্বস্ত\" না হওয়ায় লক স্ক্রিন"</string>
<string name="trust_lost_locks_screen_summary" msgid="693784434582021206">"যদি এটি চালু করেন, তাহলে শেষ বিশ্বস্ত এজেন্টকে বিশ্বস্ত হিসেবে চিহ্নিত করা না হলে ডিভাইসটি লক হয়ে যাবে"</string>
<string name="owner_info_settings_summary" msgid="7472393443779227052">"কোনো কিছুই নয়"</string>
@@ -937,6 +935,8 @@
<string name="wifi_eap_identity" msgid="4359453783379679103">"পরিচয়"</string>
<string name="wifi_eap_anonymous" msgid="2989469344116577955">"নামহীন পরিচয়"</string>
<string name="wifi_password" msgid="5948219759936151048">"পাসওয়ার্ড"</string>
+ <!-- no translation found for wifi_sae_password_id (1697832722221765763) -->
+ <skip />
<string name="wifi_show_password" msgid="6461249871236968884">"পাসওয়ার্ড দেখুন"</string>
<string name="wifi_ap_band_config" msgid="1611826705989117930">"AP ব্যান্ড বেছে নিন"</string>
<string name="wifi_ap_choose_auto" msgid="2677800651271769965">"অটোমেটিক"</string>
@@ -957,7 +957,6 @@
<string name="wifi_dpp_share_wifi" msgid="9065890131734833809">"ওয়াই-ফাই শেয়ার করুন"</string>
<string name="wifi_dpp_scan_qr_code_with_another_device" msgid="5854392840857123065">"“<xliff:g id="SSID">%1$s</xliff:g>”-এর সাথে কানেক্ট করতে এই QR কোড স্ক্যান করুন ও পাসওয়ার্ড শেয়ার করুন"</string>
<string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="4436318319178361543">"“<xliff:g id="SSID">%1$s</xliff:g>”-এর সাথে কানেক্ট করতে এই QR কোড স্ক্যান করুন"</string>
- <string name="wifi_dpp_could_not_detect_valid_qr_code" msgid="641893675646330576">"QR কোড পড়া যায়নি। কোড আবার লিখুন এবং আবার চেষ্টা করুন"</string>
<string name="wifi_dpp_failure_authentication_or_configuration" msgid="3372757783382381044">"আবার চেষ্টা করুন৷ সমস্যা যদি তাও থেকে যায় তাহলে ডিভাইসের প্রস্তুতকারকের সাথে যোগাযোগ করুন"</string>
<string name="wifi_dpp_failure_not_compatible" msgid="2829930473520603740">"কোনও সমস্যা হয়েছে"</string>
<string name="wifi_dpp_failure_timeout" msgid="5228320772245820458">"ডিভাইসটি প্লাগ-ইন করা আছে কিনা, চার্জ দেওয়া আছে কিনা এবং চালু আছে কিনা তা দেখে নিন"</string>
@@ -980,6 +979,7 @@
<string name="wifi_dpp_hotspot_password" msgid="4120419278831581613">"হটস্পটের পাসওয়ার্ড: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
<string name="wifi_dpp_add_device" msgid="4072206063308645677">"ডিভাইস যোগ করুন"</string>
<string name="wifi_dpp_connect_network_using_qr_code" msgid="3887335309163999665">"এই নেটওয়ার্কে কোনও ডিভাইস যোগ করার জন্য QR কোড ব্যবহার করুন"</string>
+ <string name="wifi_dpp_qr_code_is_not_valid_format" msgid="3700087439867692944">"QR কোড ফর্ম্যাট ভুল"</string>
<string name="retry" msgid="6472609612090877557">"আবার করুন"</string>
<string name="wifi_shared" msgid="844142443226926070">"অন্য ডিভাইস ব্যবহারকারীদের সাথে শেয়ার করুন"</string>
<string name="wifi_unchanged" msgid="3410422020930397102">"(অপরিবর্তিত)"</string>
@@ -1129,6 +1129,7 @@
<string name="emergency_address_title" msgid="932729250447887545">"জরুরি ঠিকানা"</string>
<string name="emergency_address_summary" msgid="7751971156196115129">"ওয়াই-ফাই নেটওয়ার্ক ব্যবহার করে জরুরি কল করার সময় আপনার লোকেশন হিসেবে ব্যবহার করা হয়"</string>
<string name="private_dns_help_message" msgid="3299567069152568958">"ব্যক্তিগত ডিএনএস বৈশিষ্ট্যের বিষয়ে "<annotation id="url">"আরও জানুন"</annotation></string>
+ <string name="private_dns_mode_on" msgid="5882613439541371003">"চালু আছে"</string>
<string name="wifi_calling_pref_managed_by_carrier" msgid="6845711858866828986">"পরিষেবা প্রদানকারী দ্বারা সেটিং ম্যানেজ করা হয়"</string>
<string name="wifi_calling_settings_activation_instructions" msgid="7492509632478260955">"ওয়াই-ফাই দিয়ে কল করার সুবিধা অ্যাক্টিভেট করুন"</string>
<string name="wifi_calling_turn_on" msgid="1171403510313983983">"ওয়াই-ফাই দিয়ে কল করার সুবিধা চালু করুন"</string>
@@ -1872,7 +1873,7 @@
<string name="default_emergency_app" msgid="1951760659640369980">"জরুরি অ্যাপ্লিকেশান"</string>
<string name="reset_app_preferences" msgid="1321050641018356925">"অ্যাপ্লিকেশানগুলির পছন্দ আবার সেট করুন"</string>
<string name="reset_app_preferences_title" msgid="6093179367325336662">"অ্যাপ পছন্দ রিসেট করবেন?"</string>
- <string name="reset_app_preferences_desc" msgid="4822447731869201512">"এটি এগুলির জন্য সমস্ত পছন্দ পরিবর্তন করবে:\n\n"<li>"বন্ধ করা অ্যাপ"</li>\n<li>"বন্ধ করা অ্যাপ বিজ্ঞপ্তি"</li>\n<li>"কাজের জন্য ডিফল্ট অ্যাপ"</li>\n<li>"অ্যাপের জন্য ব্যাকগ্রাউন্ড ডেটার সীমাবদ্ধতা"</li>\n<li>"যেকোনও অনুমতির সীমাবদ্ধতা"</li>\n\n"আপনি কোনও অ্যাপ ডেটা হারাবেন না।"</string>
+ <string name="reset_app_preferences_desc" msgid="731757609326016760">"এটি নিম্নলিখিত বিষয়গুলির সব পছন্দ রিসেট করবে:\n\n"<li>" বন্ধ করা আছে এমন অ্যাপ"</li>\n<li>" বন্ধ করা আছে এমন অ্যাপের বিজ্ঞপ্তি"</li>\n<li>" অ্যাকশনের জন্য ডিফল্ট অ্যাপ্লিকেশন"</li>\n<li>" অ্যাপের ক্ষেত্রে ব্যাকগ্রাউন্ড ডেটার সীমাবদ্ধতা"</li>\n<li>" যেকোনও রকম অনুমতির সীমাবদ্ধতা"</li>\n\n" আপনি কোনও অ্যাপের ডেটা হারাবেন না।"</string>
<string name="reset_app_preferences_button" msgid="2559089511841281242">"অ্যাপ রিসেট করুন"</string>
<string name="manage_space_text" msgid="8852711522447794676">"জায়গা পরিচালনা করুন"</string>
<string name="filter" msgid="2018011724373033887">"ফিল্টার"</string>
@@ -2087,7 +2088,7 @@
<string name="accessibility_screen_magnification_short_summary" msgid="3411979839172752057">"জুম করতে ৩ বার ট্যাপ করুন"</string>
<string name="accessibility_screen_magnification_navbar_short_summary" msgid="3693116360267980492">"জুম করার জন্য বোতামে ট্যাপ করুন"</string>
<string name="accessibility_screen_magnification_summary" msgid="5258868553337478505"><b>"জুম করার জন্য"</b>" স্ক্রিনে ৩ বার দ্রুত ট্যাপ করুন।\n"<ul><li>"স্ক্রল করতে ২টি বা তার বেশি আঙ্গুল টেনে নিয়ে যান"</li>\n<li>"জুমের সমন্বয়ের জন্য ২টি বা তার বেশি আঙ্গুল ব্যবহার করুন"</li></ul>\n\n<b>" অস্থায়ী জুমের জন্য"</b>" স্ক্রিনে দ্রুত ৩ বার ট্যাপ করুন এবং তৃতীয় বার ট্যাপ করার সময় আঙ্গুলটি দিয়ে টিপে ধরুন।\n"<ul><li>"স্ক্রিনের উপরে বিভিন্ন দিকে যাওয়ার জন্য আঙ্গুল টেনে নিয়ে যান"</li>\n<li>"জুম কম করতে আঙ্গুল সরিয়ে নিন"</li></ul>\n\n"কিবোর্ডে অথবা নেভিগেশন বারে জুম করতে পারবেন না।"</string>
- <string name="accessibility_screen_magnification_navbar_summary" msgid="2272878354599332009">"ম্যাগনিফিকেশন চালু করা থাকলে, আপনি স্ক্রিনে জুম বাড়াতে পারবেন।\n\n"<b>"জুম করতে"</b>", ম্যাগনিফিকেশন চালু করে স্ক্রিনের যেকোনও জায়গায় ট্যাপ করুন।\n"<ul><li>"• স্ক্রল করতে ২ বা তার বেশি আঙ্গুল দিয়ে টানুন"</li>\n<li>"• জুম অ্যাডজাস্ট করতে ২ বা তার বেশি আঙ্গুল দিয়ে পিঞ্চ করুন"</li></ul>\n\n<b>"সাময়িকভাবে জুম করতে"</b>", ম্যাগনিফিকেশন চালু করে স্ক্রিনের যেকোনও জায়গায় টাচ করে ধরে থাকুন।\n"<ul><li>"• টেনে স্ক্রিনের বিভিন্ন জায়গায় সরান"</li>\n<li>"• জুম কমাতে স্ক্রিন থেকে আঙ্গুল তুলে নিন"</li></ul>\n\n"কীবোর্ড বা নেভিগেশন বারে আপনি জুম করতে পারবেন না।"</string>
+ <string name="accessibility_screen_magnification_navbar_summary" msgid="6700716275347612310">"ম্যাগনিফিকেশন চালু করা থাকলে, আপনি স্ক্রিনে জুম বাড়াতে পারবেন।\n\n"<b>"জুম করতে"</b>", ম্যাগনিফিকেশন চালু করে স্ক্রিনের যেকোনও জায়গায় ট্যাপ করুন।\n"<ul><li>"• স্ক্রল করতে ২ বা তার বেশি আঙ্গুল দিয়ে টানুন"</li>\n<li>"• জুম অ্যাডজাস্ট করতে ২ বা তার বেশি আঙ্গুল দিয়ে পিঞ্চ করুন"</li></ul>\n\n<b>"সাময়িকভাবে জুম করতে"</b>", ম্যাগনিফিকেশন চালু করে স্ক্রিনের যেকোনও জায়গায় টাচ করে ধরে থাকুন।\n"<ul><li>"• টেনে স্ক্রিনের বিভিন্ন জায়গায় সরান"</li>\n<li>"• জুম কমাতে স্ক্রিন থেকে আঙ্গুল তুলে নিন"</li></ul>\n\n"কীবোর্ড বা নেভিগেশন বারে আপনি জুম করতে পারবেন না।"</string>
<string name="accessibility_tutorial_dialog_title_button" msgid="3682222614034474845">"অ্যাক্সেসিবিলিটি বোতাম ব্যবহার করে খোলা"</string>
<string name="accessibility_tutorial_dialog_title_gesture" msgid="1342726230497913398">"ইঙ্গিতের মাধ্যমে খোলা"</string>
<string name="accessibility_tutorial_dialog_title_gesture_settings" msgid="8539392614235820285">"নতুন অ্যাক্সেসিবিলিটি ইঙ্গিত ব্যবহার করা"</string>
@@ -2140,8 +2141,7 @@
<string name="accessibility_hearingaid_title" msgid="8312145423610648518">"হিয়ারিং এড"</string>
<string name="accessibility_hearingaid_not_connected_summary" msgid="6240237523789614599">"কোনও হিয়ারিং এড কানেক্ট করা নেই"</string>
<string name="accessibility_hearingaid_adding_summary" msgid="2947474468412309778">"হিয়ারিং এড যোগ করুন"</string>
- <string name="accessibility_hearingaid_pair_instructions_first_message" msgid="3912093691643131154">"আপনার হিয়ারিং এড পেয়ার করতে পরবর্তী স্ক্রিনে আপনার ডিভাইসটি খুঁজে নিয়ে ট্যাপ করুন।"</string>
- <string name="accessibility_hearingaid_pair_instructions_second_message" msgid="5596683393607650243">"আপনার হিয়ারিং এডটি পেয়ারিং মোডে আছে কিনা তা দেখে নিন।"</string>
+ <string name="accessibility_hearingaid_pair_instructions_message" msgid="3094382949733435414">"আপনার হিয়ারিং এড পেয়ার করার জন্য, পরের স্ক্রিনে আপনার ডিভাইসটি খুঁজে নিয়ে ট্যাপ করুন। হিয়ারিং এড পেয়ারিং মোডে আছে কিনা দেখে নিন।"</string>
<string name="accessibility_hearingaid_active_device_summary" msgid="3924362383258688984">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> চালু আছে"</string>
<plurals name="show_number_hearingaid_count" formatted="false" msgid="3160782397139295486">
<item quantity="one"><xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g>টি সেভ করা হিয়ারিং এড</item>
@@ -2490,7 +2490,6 @@
<string name="menu_stats_last_unplugged" msgid="5922246077592434526">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> এর জন্য শেষ আনপ্ল্যাগ করার সময়"</string>
<string name="menu_stats_total" msgid="8973377864854807854">"মোট ব্যবহার"</string>
<string name="menu_stats_refresh" msgid="1676215433344981075">"রিফ্রেশ করুন"</string>
- <string name="process_kernel_label" msgid="3916858646836739323">"Android OS"</string>
<string name="process_mediaserver_label" msgid="6500382062945689285">"মিডিয়াসার্ভার"</string>
<string name="process_dex2oat_label" msgid="2592408651060518226">"অ্যাপ অপটিমাইজেশান"</string>
<string name="battery_saver" msgid="8172485772238572153">"ব্যাটারি সেভার"</string>
@@ -2621,8 +2620,6 @@
<string name="no_device_admins" msgid="4846602835339095768">"কোনো ডিভাইস প্রশাসক অ্যাপ উপলব্ধ নেই"</string>
<string name="personal_device_admin_title" msgid="2849617316347669861">"ব্যক্তিগত"</string>
<string name="managed_device_admin_title" msgid="7853955652864478435">"কর্মস্থল"</string>
- <string name="sms_access_restriction_enabled" msgid="7054488078710530278">"এসএমএস ও কল লগে অ্যাক্সেস সীমাবদ্ধ করুন"</string>
- <string name="sms_access_restriction_enabled_summary" msgid="6851339654677842328">"শুধুমাত্র ডিফল্ট ফোন এবং মেসেজ পাঠানোর অ্যাপের এসএমএস ও কল লগ অ্যাক্সেস করার অনুমতি রয়েছে"</string>
<string name="no_trust_agents" msgid="7450273545568977523">"কোনো বিশ্বস্ত এজেন্ট উপলব্ধ নেই"</string>
<string name="add_device_admin_msg" msgid="1501847129819382149">"ডিভাইস প্রশাসক অ্যাপটি সক্রিয় করবেন?"</string>
<string name="add_device_admin" msgid="4192055385312215731">"এই ডিভাইস প্রশাসক অ্যাপটি সক্রিয় করুন"</string>
@@ -3111,7 +3108,7 @@
<string name="keywords_app_default" msgid="5822717006354487071">"এটি দিয়ে খুলুন"</string>
<string name="keywords_applications_settings" msgid="1268353611121497450">"অ্যাপ্লিকেশন"</string>
<string name="keywords_time_zone" msgid="998254736898753085">"টাইমজোন"</string>
- <string name="keywords_draw_overlay" msgid="4130899177619041842">"চ্যাটের শীর্ষক"</string>
+ <string name="keywords_draw_overlay" msgid="1001120206241401007">"চ্যাটের শীর্ষক, সিস্টেম, সতর্কতা, ডায়ালগ, ডিসপ্লে, অন্য অ্যাপের উপরে, ড্র"</string>
<string name="keywords_flashlight" msgid="6161632177705233710">"ফ্ল্যাশলাইট, আলো, টর্চ"</string>
<string name="keywords_change_wifi_state" msgid="627068244033681010">"ওয়াইফাই, ওয়াই-ফাই, চালু বন্ধ, নিয়ন্ত্রণ"</string>
<string name="keywords_more_mobile_networks" msgid="8995946622054642367">"সেলুলার, মোবাইল, সেলুলার পরিষেবা প্রদানকারী, ওয়্যারলেস, ডেটা, 4g, 3g, 2g, lte"</string>
@@ -3135,7 +3132,7 @@
<string name="keywords_sounds_and_notifications_interruptions" msgid="5426093074031208917">"বিরক্ত করবে না, বাধা দেওয়া, বাধা, বিরতি"</string>
<string name="keywords_app" msgid="6334757056536837791">"RAM"</string>
<string name="keywords_location" msgid="4132655528196729043">"আশেপাশে, লোকেশন, ইতিহাস, রিপোর্টিং, জিপিএস"</string>
- <string name="keywords_accounts" msgid="1957925565953357627">"অ্যাকাউন্ট"</string>
+ <string name="keywords_accounts" msgid="4479029747403203867">"অ্যাকাউন্ট, একটি অ্যাকাউন্ট যোগ করুন, অফিস প্রোফাইল"</string>
<string name="keywords_users" msgid="3434190133131387942">"বাধানিষেধ, বাধানিষেধ আরোপ করা, বাধানিষেধযুক্ত"</string>
<string name="keywords_keyboard_and_ime" msgid="9143339015329957107">"টেক্সট সংশোধন, সঠিক, শব্দ, স্পন্দন, স্বয়ং, ভাষা, ইঙ্গিত, প্রস্তাব, প্রস্তাবনা, থিম, আপত্তিজনক, শব্দ, লেখা, ইমোজি, আন্তর্জাতিক"</string>
<string name="keywords_reset_apps" msgid="5293291209613191845">"আবার সেট করুন, পছন্দগুলি, ডিফল্ট"</string>
@@ -3173,6 +3170,7 @@
<string name="keywords_storage_settings" msgid="297283751968446577">"মেমরি, ক্যাশে, ডেটা, মুছে ফেলা, পরিষ্কার করা, খালি, জায়গা"</string>
<string name="keywords_bluetooth_settings" msgid="6804844062789439858">"কানেক্ট, ডিভাইস, হেডফোন, হেডসেট, স্পিকার, ওয়্যারলেস, পেয়ার, মিউজিক, মিডিয়া"</string>
<string name="keywords_wallpaper" msgid="5058364390917429896">"ব্যাকগ্রাউন্ড, স্ক্রিন, লকস্ক্রিন, থিম"</string>
+ <string name="keywords_styles" msgid="5828725481814049422">"আইকনের আকার, অ্যাকসেন্টের রঙ, ফন্ট"</string>
<string name="keywords_assist_input" msgid="5017533309492679287">"ডিফল্ট অ্যাসিস্ট্যান্ট"</string>
<string name="keywords_default_payment_app" msgid="3838565809518896799">"পেমেন্ট, ডিফল্ট"</string>
<string name="keywords_ambient_display" msgid="3103487805748659132">"ইনকামিং বিজ্ঞপ্তি"</string>
@@ -3182,7 +3180,7 @@
<string name="keywords_notification_vibration" msgid="31924624421190547">"হ্যাপটিক, ভাইব্রেট, সংবেদনশীলতা"</string>
<string name="keywords_battery_saver_sticky" msgid="5586215686021650278">"ব্যাটারি সেভার, স্টিকি, লেগে থাকা, পাওয়ার সেভার, ব্যাটারি"</string>
<string name="keywords_battery_saver_schedule" msgid="7358789228486231944">"রুটিন, সময়সূচি, ব্যাটারি সেভার, পাওয়ার সেভার, ব্যাটারি, অটোমেটিক, শতাংশ"</string>
- <string name="keywords_add_an_account" msgid="6488139919428902434">"অফিসের প্রোফাইল"</string>
+ <string name="keywords_enhance_4g_lte" msgid="2273810564244790859">"VoLTE, উন্নত কলিং, 4G কলিং"</string>
<string name="default_sound" msgid="8821684447333687810">"ডিফল্ট সাউন্ড"</string>
<string name="sound_settings_summary" msgid="4100853606668287965">"রিং ভলিউম <xliff:g id="PERCENTAGE">%1$s</xliff:g> তে রয়েছে"</string>
<string name="sound_dashboard_summary" msgid="3402435125958012986">"ভলিউম, কম্পন, বিরক্ত করবে না"</string>
@@ -3889,7 +3887,6 @@
<string name="permit_draw_overlay" msgid="7456536798718633432">"অন্য অ্যাপের উপর প্রদর্শিত হওয়ার অনুমতি দিন"</string>
<string name="allow_overlay_description" msgid="8961670023925421358">"আপনি অন্য যে সমস্ত অ্যাপ ব্যবহার করছেন, সেগুলির উপরে এই অ্যাপটিকে প্রদর্শিত হওয়ার অনুমতি দিন। এর ফলে বাকি অ্যাপগুলি ব্যবহারে ব্যাঘাত ঘটতে পারে এবং স্ক্রিনে সেগুলির উপস্থিতি অথবা আচরণে পরিবর্তন হতে পারে।"</string>
<string name="keywords_vr_listener" msgid="7441221822576384680">"ভার্চুয়াল রিয়েলিটিVR লিসনার স্টিরিও সহায়তাকারী পরিষেবা"</string>
- <string name="keywords_system_alert_window" msgid="5049498015597864850">"সিস্টেম সতর্কতা উইন্ডো ডায়লগ অন্যান্য অ্যাপের উপরে দেখুন"</string>
<string name="overlay_settings" msgid="6930854109449524280">"অন্য অ্যাপের উপরে দেখুন"</string>
<string name="system_alert_window_summary" msgid="602892301318324492">"<xliff:g id="COUNT_1">%2$d</xliff:g>টির মধ্যে <xliff:g id="COUNT_0">%1$d</xliff:g>টি অ্যাপকে বাকিগুলির উপরে দেখতে পাওয়া যাবে"</string>
<string name="filter_overlay_apps" msgid="6965969283342557573">"অনুমতি সহ অ্যাপ্লিকেশানগুলি"</string>
@@ -4125,7 +4122,6 @@
<string name="notification_log_details_none" msgid="184131801230614059">"কোনো কিছুই নয়"</string>
<string name="notification_log_details_ranking_null" msgid="244660392058720919">"রেঙ্কিং অবজেক্ট অনুপস্থিত।"</string>
<string name="notification_log_details_ranking_none" msgid="599607025882587844">"রেঙ্কিং অবজেক্টে এই কী থাকে না।"</string>
- <string name="theme_customization_category" msgid="1049181544004163283">"থিমিং"</string>
<string name="theme_customization_device_default" msgid="5058147707906551368">"ডিভাইসের ডিফল্ট"</string>
<string name="display_cutout_emulation" msgid="7466869822418376317">"ডিসপ্লে কাট-আউট"</string>
<string name="display_cutout_emulation_keywords" msgid="4495418317471622562">"ডিসপ্লে কাট-আউট, নচ"</string>
@@ -4551,6 +4547,8 @@
<string name="network_connection_errorstate_dialog_message" msgid="6953778550775646710">"কোনও সমস্যা হয়েছে। ডিভাইস বেছে নেওয়ার আবেদনটি এই অ্যাপ্লিকেশনের মাধ্যমে বাতিল করা হয়েছে।"</string>
<string name="network_connection_connect_successful" msgid="5935510954474494928">"কানেক্ট করা হয়েছে"</string>
<string name="network_connection_request_dialog_showall" msgid="6938922880244567521">"সব দেখুন"</string>
+ <string name="network_connection_searching_message" msgid="4638576789450817530">"ডিভাইস সার্চ করা হচ্ছে…"</string>
+ <string name="network_connection_connecting_message" msgid="3740982406609245654">"ডিভাইসে কানেক্ট করা হচ্ছে…"</string>
<plurals name="show_bluetooth_devices" formatted="false" msgid="1715020480026568408">
<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>
diff --git a/res/values-bs/arrays.xml b/res/values-bs/arrays.xml
index 8a649e6..f17c338 100644
--- a/res/values-bs/arrays.xml
+++ b/res/values-bs/arrays.xml
@@ -362,9 +362,9 @@
<item msgid="1319652728542138112">"Zadano"</item>
<item msgid="1016452621833735880">"Sans-serif"</item>
<item msgid="2496277987934654454">"Sans-serif kondenzovani"</item>
- <item msgid="7247838127505318669">"Sans-serif fiksnog razmaka"</item>
+ <item msgid="7247838127505318669">"Sans-serif monospace"</item>
<item msgid="4478414822462359763">"Serif"</item>
- <item msgid="7502451783483660829">"Serif fiksnog razmaka"</item>
+ <item msgid="7502451783483660829">"Serif monospace"</item>
<item msgid="639503332147461010">"Casual"</item>
<item msgid="7967169925231332424">"Kurziv"</item>
<item msgid="561832997193039673">"Mala početna slova"</item>
diff --git a/res/values-bs/strings.xml b/res/values-bs/strings.xml
index aea8d94..f2ca4b3 100644
--- a/res/values-bs/strings.xml
+++ b/res/values-bs/strings.xml
@@ -362,8 +362,6 @@
<string name="security_enable_widgets_disabled_summary" msgid="6392489775303464905">"Onemogućio administrator"</string>
<string name="lockdown_settings_title" msgid="7393790212603280213">"Prikaži opciju zaključavanja"</string>
<string name="lockdown_settings_summary" msgid="4359438673563318171">"Prikaz opcije dugmeta za uključivanje koja isključuje Smart Lock, biometrijsko otključavanje i obavještenja na zaključanom ekranu."</string>
- <string name="trust_agents_extend_unlock_title" msgid="2796555263565097031">"Pouzdani agenti produžuju otključavanje"</string>
- <string name="trust_agents_extend_unlock_summary" msgid="3976344969220255010">"Ako je omogućeno, pouzdani agenti će vaš uređaj držati otključanim duže, ali ne mogu otključati zaključan uređaj."</string>
<string name="trust_lost_locks_screen_title" msgid="2992742466966021682">"Zaključan ekran kad nema pouzdanosti"</string>
<string name="trust_lost_locks_screen_summary" msgid="693784434582021206">"Ako je omogućeno, uređaj će se zaključati kad zadnji pouzdani agent više ne bude pouzdan"</string>
<string name="owner_info_settings_summary" msgid="7472393443779227052">"Ništa"</string>
@@ -953,6 +951,7 @@
<string name="wifi_eap_identity" msgid="4359453783379679103">"Identitet"</string>
<string name="wifi_eap_anonymous" msgid="2989469344116577955">"Anonimni identitet"</string>
<string name="wifi_password" msgid="5948219759936151048">"Lozinka"</string>
+ <string name="wifi_sae_password_id" msgid="1697832722221765763">"Identifikator lozinke za SAE"</string>
<string name="wifi_show_password" msgid="6461249871236968884">"Prikaži lozinku"</string>
<string name="wifi_ap_band_config" msgid="1611826705989117930">"Odaberite opseg pristupne tačke"</string>
<string name="wifi_ap_choose_auto" msgid="2677800651271769965">"Automatski"</string>
@@ -973,7 +972,6 @@
<string name="wifi_dpp_share_wifi" msgid="9065890131734833809">"Dijeljenje WiFi mreže"</string>
<string name="wifi_dpp_scan_qr_code_with_another_device" msgid="5854392840857123065">"Skenirajte ovaj QR kôd da se povežete na mrežu “<xliff:g id="SSID">%1$s</xliff:g>” i dijelite lozinku"</string>
<string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="4436318319178361543">"Skenirajte ovaj QR kôd da se povežete na mrežu “<xliff:g id="SSID">%1$s</xliff:g>”"</string>
- <string name="wifi_dpp_could_not_detect_valid_qr_code" msgid="641893675646330576">"Očivatanje QR kôda nije uspjelo. Centrirajte kôd i pokušajte ponovo"</string>
<string name="wifi_dpp_failure_authentication_or_configuration" msgid="3372757783382381044">"Pokušajte ponovo. Ako se problem ne riješi, kontaktirajte proizvođača uređaja"</string>
<string name="wifi_dpp_failure_not_compatible" msgid="2829930473520603740">"Nešto nije uredu"</string>
<string name="wifi_dpp_failure_timeout" msgid="5228320772245820458">"Provjerite je li uređaj priključen, napunjen i uključen"</string>
@@ -996,6 +994,7 @@
<string name="wifi_dpp_hotspot_password" msgid="4120419278831581613">"Lozinka pristupne tačke: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
<string name="wifi_dpp_add_device" msgid="4072206063308645677">"Dodajte uređaj"</string>
<string name="wifi_dpp_connect_network_using_qr_code" msgid="3887335309163999665">"Dodajte uređaj na ovu mrežu pomoću QR koda"</string>
+ <string name="wifi_dpp_qr_code_is_not_valid_format" msgid="3700087439867692944">"Format QR koda nije važeći"</string>
<string name="retry" msgid="6472609612090877557">"Pokušaj ponovo"</string>
<string name="wifi_shared" msgid="844142443226926070">"Dijeli s ostalim korisnicima uređaja"</string>
<string name="wifi_unchanged" msgid="3410422020930397102">"(nepromijenjeno)"</string>
@@ -1148,6 +1147,7 @@
<string name="emergency_address_title" msgid="932729250447887545">"Adresa za hitne slučajeve"</string>
<string name="emergency_address_summary" msgid="7751971156196115129">"Koristi se kao vaša lokacija prilikom hitnog poziva putem Wi‑Fi mreže"</string>
<string name="private_dns_help_message" msgid="3299567069152568958"><annotation id="url">"Saznajte više"</annotation>" o funkcijama Privatnog DNS-a"</string>
+ <string name="private_dns_mode_on" msgid="5882613439541371003">"Uključeno"</string>
<string name="wifi_calling_pref_managed_by_carrier" msgid="6845711858866828986">"Postavkom upravlja mobilni operater"</string>
<string name="wifi_calling_settings_activation_instructions" msgid="7492509632478260955">"Aktivirajte pozivanje putem WiFi-ja"</string>
<string name="wifi_calling_turn_on" msgid="1171403510313983983">"Uključite pozivanje putem WiFi-ja"</string>
@@ -1894,7 +1894,7 @@
<string name="default_emergency_app" msgid="1951760659640369980">"Aplikacija za hitne situacije"</string>
<string name="reset_app_preferences" msgid="1321050641018356925">"Vrati postavke aplikacije na zadano"</string>
<string name="reset_app_preferences_title" msgid="6093179367325336662">"Vratiti postavke aplikacije na zadano?"</string>
- <string name="reset_app_preferences_desc" msgid="4822447731869201512">"Ovim će se vratiti sve postavke na zadano za:\n\n"<li>"onemogućene aplikacije"</li>\n<li>"obavještenja za onemogućene aplikacije"</li>\n<li>"zadane aplikacije za radnje"</li>\n<li>"ograničenja pozadinskih podataka za aplikacije"</li>\n<li>"sva ograničenja za odobrenja"</li>\n\n" Nećete izgubiti podatke iz aplikacija."</string>
+ <string name="reset_app_preferences_desc" msgid="731757609326016760">"Na ovaj način će se vratiti sve postavke na zadano za:\n\n"<li>" Onemogućene aplikacije"</li>\n<li>"Obavještenja za onemogućene aplikacije"</li>\n<li>"Zadane aplikacije za radnje"</li>\n<li>" Ograničenje pozadinskih podataka za aplikacije"</li>\n<li>" Sva ograničenja za odobrenja"</li>\n\n" Nećete izgubiti podatke iz aplikacija."</string>
<string name="reset_app_preferences_button" msgid="2559089511841281242">"Vrati aplikacije na zadano"</string>
<string name="manage_space_text" msgid="8852711522447794676">"Upravljaj prostorom"</string>
<string name="filter" msgid="2018011724373033887">"Filter"</string>
@@ -2109,7 +2109,7 @@
<string name="accessibility_screen_magnification_short_summary" msgid="3411979839172752057">"Dodirnite tri puta da zumirate"</string>
<string name="accessibility_screen_magnification_navbar_short_summary" msgid="3693116360267980492">"Dodirnite dugme da zumirate"</string>
<string name="accessibility_screen_magnification_summary" msgid="5258868553337478505"><b>"Da zumirate "</b>", brzo dodirnite ekran 3 puta.\n"<ul><li>"Povlačite s 2 ili više prstiju da pomjerate prikaz"</li>\n<li>"Sastavite 2 ili više prstiju da podesite zumiranje"</li></ul>\n\n<b>"Da privremeno zumirate prikaz"</b>", brzo dodirnite ekran 3 puta i zadržite prst na trećem dodiru.\n"<ul><li>"Povlačite prstom da pregledate ekran"</li>\n<li>"Podignite prst da umanjite prikaz"</li></ul>\n\n"Ne možete uvećati prikaz na tastaturi i navigacionoj traci."</string>
- <string name="accessibility_screen_magnification_navbar_summary" msgid="2272878354599332009">"Kada je uvećavanje uključeno, možete uvećavati sadržaj na ekranu.\n\n"<b>"Da zumirate"</b>", pokrenite uvećavanje, a zatim dodirnite ekran bilo gdje.\n"<ul><li>"• Prevucite dva ili više prstiju za klizanje"</li>\n<li>"• Uhvatite s dva ili više prstiju za podešavanje zumiranja"</li></ul>\n\n<b>"Za privremeno zumiranje,"</b>" pokrenite uvećanje, a zatim dodirnite ekran bilo gdje i zadržite.\n"<ul><li>"• Prevucite za kretanje po ekranu"</li>\n<li>"• Podignite prst za umanjivanje"</li></ul>\n\n"Nije moguće uvećati na tastaturi ili traci za navigaciju."</string>
+ <string name="accessibility_screen_magnification_navbar_summary" msgid="6700716275347612310">"Kada je uvećavanje uključeno, možete uvećavati sadržaj na ekranu.\n\n"<b>"Da zumirate"</b>", pokrenite uvećavanje, a zatim dodirnite ekran bilo gdje.\n"<ul><li>"Prevucite dva ili više prstiju za klizanje"</li>\n<li>"Uhvatite s dva ili više prstiju za podešavanje zumiranja"</li></ul>\n\n<b>"Za privremeno zumiranje"</b>" pokrenite uvećanje, a zatim dodirnite ekran bilo gdje i zadržite.\n"<ul><li>"Prevucite za kretanje po ekranu"</li>\n<li>"Podignite prst za umanjivanje"</li></ul>\n\n"Nije moguće uvećati na tastaturi ili traci za navigaciju."</string>
<string name="accessibility_tutorial_dialog_title_button" msgid="3682222614034474845">"Otvorite pomoću dugmeta za pristupačnost"</string>
<string name="accessibility_tutorial_dialog_title_gesture" msgid="1342726230497913398">"Otvorite pokretom"</string>
<string name="accessibility_tutorial_dialog_title_gesture_settings" msgid="8539392614235820285">"Koristite novi pokret za pristupačnost"</string>
@@ -2162,8 +2162,7 @@
<string name="accessibility_hearingaid_title" msgid="8312145423610648518">"Slušni aparat"</string>
<string name="accessibility_hearingaid_not_connected_summary" msgid="6240237523789614599">"Nije povezan nijedan slušni aparat"</string>
<string name="accessibility_hearingaid_adding_summary" msgid="2947474468412309778">"Dodaj slušne aparate"</string>
- <string name="accessibility_hearingaid_pair_instructions_first_message" msgid="3912093691643131154">"Da uparite slušne aparate, pronađite i dodirnite svoj uređaj na sljedećem ekranu."</string>
- <string name="accessibility_hearingaid_pair_instructions_second_message" msgid="5596683393607650243">"Provjerite jesu li slušni aparati u načinu rada uparivanja."</string>
+ <string name="accessibility_hearingaid_pair_instructions_message" msgid="3094382949733435414">"Da uparite slušne aparate, pronađite i dodirnite svoj uređaj na sljedećem ekranu. Provjerite jesu li slušni aparati u načinu rada uparivanja."</string>
<string name="accessibility_hearingaid_active_device_summary" msgid="3924362383258688984">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> aktivan"</string>
<plurals name="show_number_hearingaid_count" formatted="false" msgid="3160782397139295486">
<item quantity="one"><xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> slušni aparat sačuvan</item>
@@ -2527,7 +2526,6 @@
<string name="menu_stats_last_unplugged" msgid="5922246077592434526">"Tokom posljednjeg isključivanja s napajanja <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
<string name="menu_stats_total" msgid="8973377864854807854">"Ukupno korištenje"</string>
<string name="menu_stats_refresh" msgid="1676215433344981075">"Osvježi"</string>
- <string name="process_kernel_label" msgid="3916858646836739323">"Android OS"</string>
<string name="process_mediaserver_label" msgid="6500382062945689285">"Server za medijske sadržaje"</string>
<string name="process_dex2oat_label" msgid="2592408651060518226">"Optimizacija aplikacija"</string>
<string name="battery_saver" msgid="8172485772238572153">"Ušteda baterije"</string>
@@ -2658,8 +2656,6 @@
<string name="no_device_admins" msgid="4846602835339095768">"Nema dostupnih aplikacija administratora uređaja"</string>
<string name="personal_device_admin_title" msgid="2849617316347669861">"Lični"</string>
<string name="managed_device_admin_title" msgid="7853955652864478435">"Work"</string>
- <string name="sms_access_restriction_enabled" msgid="7054488078710530278">"Ograniči pristup SMS-u i zapisniku poziva"</string>
- <string name="sms_access_restriction_enabled_summary" msgid="6851339654677842328">"Samo zadane aplikacije za telefon i poruke imaju odobrenja za SMS i zapisnike poziva"</string>
<string name="no_trust_agents" msgid="7450273545568977523">"Nema dostupnih pouzdanih agenata"</string>
<string name="add_device_admin_msg" msgid="1501847129819382149">"Aktivirati aplikaciju administratora uređaja?"</string>
<string name="add_device_admin" msgid="4192055385312215731">"Aktiviraj aplikaciju administratora uređaja"</string>
@@ -3153,7 +3149,7 @@
<string name="keywords_app_default" msgid="5822717006354487071">"Otvori koristeći"</string>
<string name="keywords_applications_settings" msgid="1268353611121497450">"Aplikacije"</string>
<string name="keywords_time_zone" msgid="998254736898753085">"vremenska zona"</string>
- <string name="keywords_draw_overlay" msgid="4130899177619041842">"Skočni prozor za chat"</string>
+ <string name="keywords_draw_overlay" msgid="1001120206241401007">"Skočni prozor za chat, sistem, obavještenje, prozor, dijalog, ekran, prikazivanje preko drugih aplikacija, crtanje"</string>
<string name="keywords_flashlight" msgid="6161632177705233710">"Svjetiljka, svjetlo, lampa"</string>
<string name="keywords_change_wifi_state" msgid="627068244033681010">"wifi, wi-fi, aktivacija/deaktivacija, kontrola"</string>
<string name="keywords_more_mobile_networks" msgid="8995946622054642367">"mobilni, mobilni operater, bežični, podaci, 4g, 3g, 2g, lte"</string>
@@ -3177,7 +3173,7 @@
<string name="keywords_sounds_and_notifications_interruptions" msgid="5426093074031208917">"ne ne uznemiravaj, prekinuti, prekidanje, pauza"</string>
<string name="keywords_app" msgid="6334757056536837791">"RAM"</string>
<string name="keywords_location" msgid="4132655528196729043">"u blizini, lokacija, historija, izvještavanje, GPS"</string>
- <string name="keywords_accounts" msgid="1957925565953357627">"račun"</string>
+ <string name="keywords_accounts" msgid="4479029747403203867">"račun, dodaj račun, radni profil"</string>
<string name="keywords_users" msgid="3434190133131387942">"ograničenje, ograničavanje, ograničen"</string>
<string name="keywords_keyboard_and_ime" msgid="9143339015329957107">"korekcija teksta, ispravan, zvuk, vibrirati, auto, jezik, gest, predložiti, prijedlog, tema, uvredljivo, riječ, vrsta, emoji, međunarodna"</string>
<string name="keywords_reset_apps" msgid="5293291209613191845">"ponovo podesi, željene postavke, zadano"</string>
@@ -3215,6 +3211,7 @@
<string name="keywords_storage_settings" msgid="297283751968446577">"memorija, keš memorija, podaci, izbrisati, obrisati, osloboditi, prostor"</string>
<string name="keywords_bluetooth_settings" msgid="6804844062789439858">"povezan, uređaj, slušalice, slušalice s mikrofonom, zvučnik, bežično, uparivanje, slušalice za umetanje u uho, muzika, medij"</string>
<string name="keywords_wallpaper" msgid="5058364390917429896">"pozadina, ekran, zaključani ekran, tema"</string>
+ <string name="keywords_styles" msgid="5828725481814049422">"oblik ikone, boja za isticanje, font"</string>
<string name="keywords_assist_input" msgid="5017533309492679287">"zadani, asistent"</string>
<string name="keywords_default_payment_app" msgid="3838565809518896799">"plaćanje, zadano"</string>
<string name="keywords_ambient_display" msgid="3103487805748659132">"dolazno obavještenje"</string>
@@ -3224,7 +3221,7 @@
<string name="keywords_notification_vibration" msgid="31924624421190547">"haptika, vibriranje, osjetljivost"</string>
<string name="keywords_battery_saver_sticky" msgid="5586215686021650278">"ušteda baterije, ljepljivo, istrajnost, ušteda energije, baterija"</string>
<string name="keywords_battery_saver_schedule" msgid="7358789228486231944">"rutina, raspored, ušteda baterije, ušteda energije, baterija, automatski, procenat"</string>
- <string name="keywords_add_an_account" msgid="6488139919428902434">"radni profil"</string>
+ <string name="keywords_enhance_4g_lte" msgid="2273810564244790859">"volte, napredno pozivanje, 4g pozivanje"</string>
<string name="default_sound" msgid="8821684447333687810">"Podrazumijevani zvuk"</string>
<string name="sound_settings_summary" msgid="4100853606668287965">"Jačina zvuka zvona je na <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
<string name="sound_dashboard_summary" msgid="3402435125958012986">"Jačina zvuka, vibracija, Ne ometaj"</string>
@@ -3952,7 +3949,6 @@
<string name="permit_draw_overlay" msgid="7456536798718633432">"Dozvoli prikaz preko drugih aplikacija"</string>
<string name="allow_overlay_description" msgid="8961670023925421358">"Dozvolite ovoj aplikaciji da prekrije ostale aplikacije koje koristite. Može vas ometati u korištenju tih aplikacija ili promijeniti način na koji se one prikazuju ili ponašaju."</string>
<string name="keywords_vr_listener" msgid="7441221822576384680">"vr slušalac virtuelne realnosti stereo pomoćna usluga"</string>
- <string name="keywords_system_alert_window" msgid="5049498015597864850">"sistem upozorenje prozor dijaloški okvir prikazivanje preko drugih aplikacija"</string>
<string name="overlay_settings" msgid="6930854109449524280">"Prikaz preko drugih aplikacija"</string>
<string name="system_alert_window_summary" msgid="602892301318324492">"Aplikacije s odobrenjem za prikaz preko drugih aplikacija: <xliff:g id="COUNT_0">%1$d</xliff:g> od <xliff:g id="COUNT_1">%2$d</xliff:g>"</string>
<string name="filter_overlay_apps" msgid="6965969283342557573">"Aplikacije s odobrenjem"</string>
@@ -4194,7 +4190,6 @@
<string name="notification_log_details_none" msgid="184131801230614059">"ništa"</string>
<string name="notification_log_details_ranking_null" msgid="244660392058720919">"Rangirani objekt nedostaje."</string>
<string name="notification_log_details_ranking_none" msgid="599607025882587844">"Rangirani objekt ne sadrži ovu tipku."</string>
- <string name="theme_customization_category" msgid="1049181544004163283">"Prilagođavanje teme"</string>
<string name="theme_customization_device_default" msgid="5058147707906551368">"Zadana postavka uređaja"</string>
<string name="display_cutout_emulation" msgid="7466869822418376317">"Urez u ekranu"</string>
<string name="display_cutout_emulation_keywords" msgid="4495418317471622562">"urez ekrana, urez"</string>
@@ -4632,6 +4627,8 @@
<string name="network_connection_errorstate_dialog_message" msgid="6953778550775646710">"Nešto se dogodilo. Ova aplikacija je otkazala zahtjev za odabir uređaja."</string>
<string name="network_connection_connect_successful" msgid="5935510954474494928">"Uspješno povezivanje"</string>
<string name="network_connection_request_dialog_showall" msgid="6938922880244567521">"Prikaži sve"</string>
+ <string name="network_connection_searching_message" msgid="4638576789450817530">"Traženje uređaja…"</string>
+ <string name="network_connection_connecting_message" msgid="3740982406609245654">"Povezivanje s uređajem…"</string>
<plurals name="show_bluetooth_devices" formatted="false" msgid="1715020480026568408">
<item quantity="one"><xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> povezan uređaj</item>
<item quantity="few"><xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> povezana uređaja</item>
diff --git a/res/values-ca/arrays.xml b/res/values-ca/arrays.xml
index 6b8103f..a4454cd 100644
--- a/res/values-ca/arrays.xml
+++ b/res/values-ca/arrays.xml
@@ -380,7 +380,7 @@
<item msgid="4733815704128258753">"Predeterminat"</item>
<item msgid="3217099060748617005">"Cap"</item>
<item msgid="7467615139904599420">"Contorn"</item>
- <item msgid="5623165557468608975">"Ombra paral·lela"</item>
+ <item msgid="5623165557468608975">"Ombra"</item>
<item msgid="8088451174058214588">"Elevat"</item>
<item msgid="3821418743395480313">"Enfonsat"</item>
</string-array>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 5669301..3e62b25 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -360,8 +360,6 @@
<string name="security_enable_widgets_disabled_summary" msgid="6392489775303464905">"Desactivada per l\'administrador"</string>
<string name="lockdown_settings_title" msgid="7393790212603280213">"Mostra l\'opció de bloqueig de seguretat"</string>
<string name="lockdown_settings_summary" msgid="4359438673563318171">"Mostra l\'opció del botó d\'engegada que desactiva Smart Lock, el desbloqueig biomètric i les notificacions a la pantalla de bloqueig"</string>
- <string name="trust_agents_extend_unlock_title" msgid="2796555263565097031">"Desbloqueig ampliat per a agents de confiança"</string>
- <string name="trust_agents_extend_unlock_summary" msgid="3976344969220255010">"Si s\'activa, els agents de confiança mantindran el dispositiu desbloquejat durant més temps, però ja no podran desbloquejar un dispositiu bloquejat."</string>
<string name="trust_lost_locks_screen_title" msgid="2992742466966021682">"Bloqueja pantalla si no és de confiança"</string>
<string name="trust_lost_locks_screen_summary" msgid="693784434582021206">"Si s\'activa aquesta opció, el dispositiu es bloquejarà quan l\'últim agent de confiança deixi de ser-ho"</string>
<string name="owner_info_settings_summary" msgid="7472393443779227052">"Cap"</string>
@@ -937,6 +935,7 @@
<string name="wifi_eap_identity" msgid="4359453783379679103">"Identitat"</string>
<string name="wifi_eap_anonymous" msgid="2989469344116577955">"Identitat anònima"</string>
<string name="wifi_password" msgid="5948219759936151048">"Contrasenya"</string>
+ <string name="wifi_sae_password_id" msgid="1697832722221765763">"Identificador de password SAE"</string>
<string name="wifi_show_password" msgid="6461249871236968884">"Mostra la contrasenya"</string>
<string name="wifi_ap_band_config" msgid="1611826705989117930">"Selecciona la banda del punt d\'accés"</string>
<string name="wifi_ap_choose_auto" msgid="2677800651271769965">"Automàtica"</string>
@@ -957,7 +956,6 @@
<string name="wifi_dpp_share_wifi" msgid="9065890131734833809">"Comparteix la Wi‑Fi"</string>
<string name="wifi_dpp_scan_qr_code_with_another_device" msgid="5854392840857123065">"Escaneja aquest codi QR per connectar-te a <xliff:g id="SSID">%1$s</xliff:g> i compartir la contrasenya"</string>
<string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="4436318319178361543">"Escaneja aquest codi QR per conectar-te a <xliff:g id="SSID">%1$s</xliff:g>"</string>
- <string name="wifi_dpp_could_not_detect_valid_qr_code" msgid="641893675646330576">"No s\'ha pogut llegir el codi QR. Torna\'l a centrar i prova-ho una altra vegada."</string>
<string name="wifi_dpp_failure_authentication_or_configuration" msgid="3372757783382381044">"Torna-ho a provar. Si el problema continua, contacta amb el fabricant del dispositiu"</string>
<string name="wifi_dpp_failure_not_compatible" msgid="2829930473520603740">"S\'ha produït un error"</string>
<string name="wifi_dpp_failure_timeout" msgid="5228320772245820458">"Comprova que el dispositiu tingui bateria i estigui connectat i encès"</string>
@@ -980,6 +978,7 @@
<string name="wifi_dpp_hotspot_password" msgid="4120419278831581613">"Contrasenya del punt d\'accés Wi‑Fi: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
<string name="wifi_dpp_add_device" msgid="4072206063308645677">"Afegeix un dispositiu"</string>
<string name="wifi_dpp_connect_network_using_qr_code" msgid="3887335309163999665">"Utilitza un codi QR per afegir un dispositiu a aquesta xarxa"</string>
+ <string name="wifi_dpp_qr_code_is_not_valid_format" msgid="3700087439867692944">"El codi QR no té un format vàlid"</string>
<string name="retry" msgid="6472609612090877557">"Torna-ho a provar"</string>
<string name="wifi_shared" msgid="844142443226926070">"Comparteix amb altres usuaris del dispositiu"</string>
<string name="wifi_unchanged" msgid="3410422020930397102">"(sense canvis)"</string>
@@ -1129,6 +1128,7 @@
<string name="emergency_address_title" msgid="932729250447887545">"Adreça d\'emergència"</string>
<string name="emergency_address_summary" msgid="7751971156196115129">"S\'utilitza com la teva ubicació si fas una trucada d\'emergència per Wi-Fi"</string>
<string name="private_dns_help_message" msgid="3299567069152568958"><annotation id="url">"Més informació"</annotation>" sobre les funcions de DNS privat"</string>
+ <string name="private_dns_mode_on" msgid="5882613439541371003">"Activat"</string>
<string name="wifi_calling_pref_managed_by_carrier" msgid="6845711858866828986">"Opció gestionada per l\'operador de telefonia mòbil"</string>
<string name="wifi_calling_settings_activation_instructions" msgid="7492509632478260955">"Activa Trucades per Wi-Fi"</string>
<string name="wifi_calling_turn_on" msgid="1171403510313983983">"Activa Trucades per Wi-Fi"</string>
@@ -1872,7 +1872,7 @@
<string name="default_emergency_app" msgid="1951760659640369980">"Aplicació en casos d\'emergència"</string>
<string name="reset_app_preferences" msgid="1321050641018356925">"Restableix les preferències d\'aplicacions"</string>
<string name="reset_app_preferences_title" msgid="6093179367325336662">"Restablir les preferències d\'aplicacions?"</string>
- <string name="reset_app_preferences_desc" msgid="4822447731869201512">"Es restabliran les preferències de:\n\n "<li>"Aplicacions desactivades"</li>\n" "<li>"Notificacions d\'aplicacions desactivades"</li>\n" "<li>"Aplicacions predeterminades per a accions"</li>\n" "<li>"Restriccions de dades en segon pla per a aplicacions"</li>\n" "<li>"Restriccions de permisos"</li>\n\n" No es perdran les dades de les aplicacions."</string>
+ <string name="reset_app_preferences_desc" msgid="731757609326016760">"Amb aquesta acció, es restabliran les preferències dels elements següents:\n\n"<li>"aplicacions desactivades"</li>\n<li>"notificacions d\'aplicacions desactivades"</li>\n<li>"aplicacions predeterminades per a les accions"</li>\n<li>"restriccions de dades en segon pla per a les aplicacions"</li>\n<li>"restriccions de permisos"</li>\n\n"No perdràs les dades de les aplicacions."</string>
<string name="reset_app_preferences_button" msgid="2559089511841281242">"Restableix aplicacions"</string>
<string name="manage_space_text" msgid="8852711522447794676">"Gestiona l\'espai"</string>
<string name="filter" msgid="2018011724373033887">"Filtra"</string>
@@ -2087,7 +2087,7 @@
<string name="accessibility_screen_magnification_short_summary" msgid="3411979839172752057">"Toca tres cops per fer zoom"</string>
<string name="accessibility_screen_magnification_navbar_short_summary" msgid="3693116360267980492">"Toca un botó per fer zoom"</string>
<string name="accessibility_screen_magnification_summary" msgid="5258868553337478505"><b>"Per ampliar la imatge"</b>", fes tres tocs ràpids a la pantalla.\n"<ul><li>"Arrossega dos dits o més per desplaçar-la"</li>\n<li>"Pinça la pantalla unint dos dits o més per ajustar el zoom"</li></ul>\n\n<b>"Per fer zoom de manera temporal"</b>", fes tres tocs ràpids a la pantalla i mantén-la premuda al tercer toc.\n"<ul><li>"Arrossega el dit per desplaçar-te per la pantalla"</li>\n<li>"Aixeca\'l per allunyar la imatge"</li></ul>\n\n"No pots fer zoom al teclat ni a la barra de navegació."</string>
- <string name="accessibility_screen_magnification_navbar_summary" msgid="2272878354599332009">"Quan l\'opció d\'ampliació està activada, pots ampliar la pantalla.\n\n"<b>"Per ampliar-la"</b>", activa l\'opció i toca qualsevol punt de la pantalla.\n"<ul><li>"• Arrossega dos o més dits per desplaçar-te"</li>\n<li>"• Pinça amb dos o més dits per ajustar el zoom"</li></ul>\n\n<b>"Per fer zoom temporalment"</b>", activa l\'ampliació i mantén premut qualsevol punt de la pantalla.\n"<ul><li>"• Arrossega per moure\'t per la pantalla"</li>\n<li>"• Aixeca els dits per allunyar la pantalla"</li></ul>\n\n"No es pot ampliar el teclat ni la barra de navegació."</string>
+ <string name="accessibility_screen_magnification_navbar_summary" msgid="6700716275347612310">"Quan l\'opció d\'ampliació està activada, pots ampliar la pantalla.\n\n"<b>"Per ampliar-la"</b>", activa l\'opció i toca qualsevol punt de la pantalla.\n"<ul><li>"Arrossega dos o més dits per desplaçar-te."</li>\n<li>"Pinça amb dos o més dits per ajustar el zoom."</li></ul>\n\n<b>"Per fer zoom temporalment"</b>", activa l\'ampliació i mantén premut qualsevol punt de la pantalla.\n"<ul><li>"Arrossega per moure\'t per la pantalla."</li>\n<li>"Aixeca el dit per allunyar la pantalla."</li></ul>\n\n"No es pot ampliar el teclat ni la barra de navegació."</string>
<string name="accessibility_tutorial_dialog_title_button" msgid="3682222614034474845">"Utilitza el botó d\'accessibilitat per obrir"</string>
<string name="accessibility_tutorial_dialog_title_gesture" msgid="1342726230497913398">"Utilitza un gest per obrir"</string>
<string name="accessibility_tutorial_dialog_title_gesture_settings" msgid="8539392614235820285">"Utilitza un nou gest d\'accessibilitat"</string>
@@ -2140,8 +2140,7 @@
<string name="accessibility_hearingaid_title" msgid="8312145423610648518">"Audiòfons"</string>
<string name="accessibility_hearingaid_not_connected_summary" msgid="6240237523789614599">"No hi ha cap audiòfon connectat"</string>
<string name="accessibility_hearingaid_adding_summary" msgid="2947474468412309778">"Afegeix uns audiòfons"</string>
- <string name="accessibility_hearingaid_pair_instructions_first_message" msgid="3912093691643131154">"Per vincular els audiòfons, cerca i toca el dispositiu a la pantalla següent."</string>
- <string name="accessibility_hearingaid_pair_instructions_second_message" msgid="5596683393607650243">"Comprova que els audiòfons estiguin en mode de vinculació."</string>
+ <string name="accessibility_hearingaid_pair_instructions_message" msgid="3094382949733435414">"Per vincular els audiòfons, cerca i toca el dispositiu a la pantalla següent. Comprova que els audiòfons estiguin en mode de vinculació."</string>
<string name="accessibility_hearingaid_active_device_summary" msgid="3924362383258688984">"El dispositiu <xliff:g id="DEVICE_NAME">%1$s</xliff:g> està actiu"</string>
<plurals name="show_number_hearingaid_count" formatted="false" msgid="3160782397139295486">
<item quantity="other">S\'han desat <xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> audiòfons</item>
@@ -2490,7 +2489,6 @@
<string name="menu_stats_last_unplugged" msgid="5922246077592434526">"Mentre es va desconnectar per darrera vegada durant <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
<string name="menu_stats_total" msgid="8973377864854807854">"Totals d\'ús"</string>
<string name="menu_stats_refresh" msgid="1676215433344981075">"Actualitza"</string>
- <string name="process_kernel_label" msgid="3916858646836739323">"Android OS"</string>
<string name="process_mediaserver_label" msgid="6500382062945689285">"Servidor multimèdia"</string>
<string name="process_dex2oat_label" msgid="2592408651060518226">"Optimització de l\'aplicació"</string>
<string name="battery_saver" msgid="8172485772238572153">"Estalvi de bateria"</string>
@@ -2621,8 +2619,6 @@
<string name="no_device_admins" msgid="4846602835339095768">"No hi ha cap aplicació d\'administració disponible"</string>
<string name="personal_device_admin_title" msgid="2849617316347669861">"Personal"</string>
<string name="managed_device_admin_title" msgid="7853955652864478435">"Professional"</string>
- <string name="sms_access_restriction_enabled" msgid="7054488078710530278">"Restringeix accés a SMS i registre de trucades"</string>
- <string name="sms_access_restriction_enabled_summary" msgid="6851339654677842328">"Només les aplicacions de trucades i missatgeria predeterminades tenen accés als SMS i al registre de trucades"</string>
<string name="no_trust_agents" msgid="7450273545568977523">"No hi ha agents de confiança disponibles."</string>
<string name="add_device_admin_msg" msgid="1501847129819382149">"Activar l\'app d\'admin. del dispositiu?"</string>
<string name="add_device_admin" msgid="4192055385312215731">"Activa l\'aplicació d\'administració d\'aquest dispositiu"</string>
@@ -3111,7 +3107,7 @@
<string name="keywords_app_default" msgid="5822717006354487071">"Obre amb"</string>
<string name="keywords_applications_settings" msgid="1268353611121497450">"Aplicacions"</string>
<string name="keywords_time_zone" msgid="998254736898753085">"zona horària"</string>
- <string name="keywords_draw_overlay" msgid="4130899177619041842">"Principi del xat"</string>
+ <string name="keywords_draw_overlay" msgid="1001120206241401007">"Principi del xat, sistema, alerta, finestra, diàleg, mostrar, sobre altres aplicacions, dibuixar"</string>
<string name="keywords_flashlight" msgid="6161632177705233710">"Llanterna, Llum"</string>
<string name="keywords_change_wifi_state" msgid="627068244033681010">"wifi, wi-fi, commutador, control"</string>
<string name="keywords_more_mobile_networks" msgid="8995946622054642367">"telèfon, mòbil, operador de telefonia mòbil, sense fil, dades, 4g, 3g, 2g, lte"</string>
@@ -3135,7 +3131,7 @@
<string name="keywords_sounds_and_notifications_interruptions" msgid="5426093074031208917">"no molestis, interrompeixis interrupció, pausa"</string>
<string name="keywords_app" msgid="6334757056536837791">"RAM"</string>
<string name="keywords_location" msgid="4132655528196729043">"a prop, ubicació, historial, informes, GPS"</string>
- <string name="keywords_accounts" msgid="1957925565953357627">"compte"</string>
+ <string name="keywords_accounts" msgid="4479029747403203867">"compte, afegeix un compte, perfil professional"</string>
<string name="keywords_users" msgid="3434190133131387942">"restricció, restringir, restringit"</string>
<string name="keywords_keyboard_and_ime" msgid="9143339015329957107">"text, correcció, correcte, so, vibració, automàtic, idioma, gest, suggerir, suggeriment, tema, ofensiu, paraula, tipus, emoji, internacional"</string>
<string name="keywords_reset_apps" msgid="5293291209613191845">"restablir, preferències, predeterminades"</string>
@@ -3173,6 +3169,7 @@
<string name="keywords_storage_settings" msgid="297283751968446577">"memòria, memòria cau, dades, suprimir, esborrar, alliberar, espai"</string>
<string name="keywords_bluetooth_settings" msgid="6804844062789439858">"connectat, dispositiu, auriculars, auriculars amb micro, altaveu, sense fil, vincular, música, multimèdia"</string>
<string name="keywords_wallpaper" msgid="5058364390917429896">"fons, pantalla, pantalla de bloqueig, tema"</string>
+ <string name="keywords_styles" msgid="5828725481814049422">"forma de la icona, color per destacar, tipus de lletra"</string>
<string name="keywords_assist_input" msgid="5017533309492679287">"predeterminat, assistent"</string>
<string name="keywords_default_payment_app" msgid="3838565809518896799">"pagament, predeterminat"</string>
<string name="keywords_ambient_display" msgid="3103487805748659132">"notificació entrant"</string>
@@ -3182,7 +3179,7 @@
<string name="keywords_notification_vibration" msgid="31924624421190547">"sensors tàctils, vibrar, sensibilitat"</string>
<string name="keywords_battery_saver_sticky" msgid="5586215686021650278">"estalvi de bateria, fixa, duració, estalvi d\'energia, bateria"</string>
<string name="keywords_battery_saver_schedule" msgid="7358789228486231944">"rutina, programació, estalvi de bateria, estalvi d\'energia, bateria, automàtic, percentatge"</string>
- <string name="keywords_add_an_account" msgid="6488139919428902434">"perfil professional"</string>
+ <string name="keywords_enhance_4g_lte" msgid="2273810564244790859">"volte, trucades avançades, trucades 4g"</string>
<string name="default_sound" msgid="8821684447333687810">"So predeterminat"</string>
<string name="sound_settings_summary" msgid="4100853606668287965">"Volum del to: <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
<string name="sound_dashboard_summary" msgid="3402435125958012986">"Volum, vibració, No molestis"</string>
@@ -3889,7 +3886,6 @@
<string name="permit_draw_overlay" msgid="7456536798718633432">"Permet mostrar sobre altres aplicacions"</string>
<string name="allow_overlay_description" msgid="8961670023925421358">"Permet que aquesta aplicació es mostri sobre les altres aplicacions que estiguis utilitzant. És possible que interfereixi amb l\'ús que fas d\'aquestes aplicacions i canviï la manera com es mostren o es comporten."</string>
<string name="keywords_vr_listener" msgid="7441221822576384680">"RV realitat virtual processador estèreo servei ajuda"</string>
- <string name="keywords_system_alert_window" msgid="5049498015597864850">"sistema alerta finestra diàleg mostrar-se sobre altres aplicacions"</string>
<string name="overlay_settings" msgid="6930854109449524280">"Mostra sobre altres aplicacions"</string>
<string name="system_alert_window_summary" msgid="602892301318324492">"<xliff:g id="COUNT_0">%1$d</xliff:g> de <xliff:g id="COUNT_1">%2$d</xliff:g> aplicacions que poden es mostrar sobre altres"</string>
<string name="filter_overlay_apps" msgid="6965969283342557573">"Aplicacions amb permís"</string>
@@ -4125,7 +4121,6 @@
<string name="notification_log_details_none" msgid="184131801230614059">"cap"</string>
<string name="notification_log_details_ranking_null" msgid="244660392058720919">"Falta l\'objecte de classificació."</string>
<string name="notification_log_details_ranking_none" msgid="599607025882587844">"L\'objecte de classificació no conté aquesta clau."</string>
- <string name="theme_customization_category" msgid="1049181544004163283">"Temes"</string>
<string name="theme_customization_device_default" msgid="5058147707906551368">"Opció predeterminada del dispositiu"</string>
<string name="display_cutout_emulation" msgid="7466869822418376317">"Retall de pantalla"</string>
<string name="display_cutout_emulation_keywords" msgid="4495418317471622562">"retall de pantalla, tall"</string>
@@ -4551,6 +4546,8 @@
<string name="network_connection_errorstate_dialog_message" msgid="6953778550775646710">"S\'ha produït un error. L\'aplicació ha cancel·lat la sol·licitud per seleccionar un dispositiu."</string>
<string name="network_connection_connect_successful" msgid="5935510954474494928">"S\'ha connectat correctament"</string>
<string name="network_connection_request_dialog_showall" msgid="6938922880244567521">"Mostra-ho tot"</string>
+ <string name="network_connection_searching_message" msgid="4638576789450817530">"S\'està cercant el dispositiu…"</string>
+ <string name="network_connection_connecting_message" msgid="3740982406609245654">"S’està connectant amb el dispositiu…"</string>
<plurals name="show_bluetooth_devices" formatted="false" msgid="1715020480026568408">
<item quantity="other"><xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> dispositius connectats</item>
<item quantity="one"><xliff:g id="NUMBER_DEVICE_COUNT_0">%1$d</xliff:g> dispositiu connectat</item>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 2e54e2e..99270be 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -364,8 +364,6 @@
<string name="security_enable_widgets_disabled_summary" msgid="6392489775303464905">"Zakázáno administrátorem"</string>
<string name="lockdown_settings_title" msgid="7393790212603280213">"Zobrazit možnost uzamčení"</string>
<string name="lockdown_settings_summary" msgid="4359438673563318171">"Zobrazí vypínač, který vypíná funkci Smart Lock, biometrické odemykání a oznámení na obrazovce uzamčení"</string>
- <string name="trust_agents_extend_unlock_title" msgid="2796555263565097031">"Agenti důvěry jen prodlužují odemčení"</string>
- <string name="trust_agents_extend_unlock_summary" msgid="3976344969220255010">"Bude-li tato možnost aktivována, agenti důvěry ponechají vaše zařízení odemčená delší dobu, ale uzamčené zařízení už nebudou moci odemknout."</string>
<string name="trust_lost_locks_screen_title" msgid="2992742466966021682">"Zamknout obrazovku při ztrátě důvěry"</string>
<string name="trust_lost_locks_screen_summary" msgid="693784434582021206">"Když bude možnost aktivována a poslední agent důvěry přestane být důvěryhodný, zařízení se zamkne."</string>
<string name="owner_info_settings_summary" msgid="7472393443779227052">"Žádná"</string>
@@ -969,6 +967,7 @@
<string name="wifi_eap_identity" msgid="4359453783379679103">"Identita"</string>
<string name="wifi_eap_anonymous" msgid="2989469344116577955">"Anonymní identita"</string>
<string name="wifi_password" msgid="5948219759936151048">"Heslo"</string>
+ <string name="wifi_sae_password_id" msgid="1697832722221765763">"Identifikátor hesla SAE"</string>
<string name="wifi_show_password" msgid="6461249871236968884">"Zobrazovat heslo"</string>
<string name="wifi_ap_band_config" msgid="1611826705989117930">"Vybrat pásmo přístupového bodu"</string>
<string name="wifi_ap_choose_auto" msgid="2677800651271769965">"Automatické"</string>
@@ -989,7 +988,6 @@
<string name="wifi_dpp_share_wifi" msgid="9065890131734833809">"Sdílení sítě Wi-Fi"</string>
<string name="wifi_dpp_scan_qr_code_with_another_device" msgid="5854392840857123065">"Chcete-li se připojit k síti <xliff:g id="SSID">%1$s</xliff:g>, naskenujte tento QR kód a sdílejte heslo"</string>
<string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="4436318319178361543">"Chcete-li se připojit k síti <xliff:g id="SSID">%1$s</xliff:g>, naskenujte tento QR kód"</string>
- <string name="wifi_dpp_could_not_detect_valid_qr_code" msgid="641893675646330576">"QR kód se nepodařilo přečíst. Zadejte ho znovu."</string>
<string name="wifi_dpp_failure_authentication_or_configuration" msgid="3372757783382381044">"Zkuste to znovu. Pokud problém přetrvává, obraťte se na výrobce zařízení"</string>
<string name="wifi_dpp_failure_not_compatible" msgid="2829930473520603740">"Něco se pokazilo"</string>
<string name="wifi_dpp_failure_timeout" msgid="5228320772245820458">"Zkontrolujte, zda je zařízení zapojeno, nabito a zapnuto"</string>
@@ -1012,6 +1010,7 @@
<string name="wifi_dpp_hotspot_password" msgid="4120419278831581613">"Heslo k hotspotu: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
<string name="wifi_dpp_add_device" msgid="4072206063308645677">"Přidat zařízení"</string>
<string name="wifi_dpp_connect_network_using_qr_code" msgid="3887335309163999665">"Pomocí QR kódu přidejte zařízení do této sítě"</string>
+ <string name="wifi_dpp_qr_code_is_not_valid_format" msgid="3700087439867692944">"QR kód není platný formát"</string>
<string name="retry" msgid="6472609612090877557">"Zkusit znovu"</string>
<string name="wifi_shared" msgid="844142443226926070">"Sdílet s ostatními uživateli zařízení"</string>
<string name="wifi_unchanged" msgid="3410422020930397102">"(nezměněno)"</string>
@@ -1167,6 +1166,7 @@
<string name="emergency_address_title" msgid="932729250447887545">"Nouzová adresa"</string>
<string name="emergency_address_summary" msgid="7751971156196115129">"Použije se jako vaše poloha, pokud uskutečníte tísňové volání přes Wi-Fi"</string>
<string name="private_dns_help_message" msgid="3299567069152568958"><annotation id="url">"Další informace"</annotation>" o funkcích soukromého režimu DNS"</string>
+ <string name="private_dns_mode_on" msgid="5882613439541371003">"Zapnuto"</string>
<string name="wifi_calling_pref_managed_by_carrier" msgid="6845711858866828986">"Nastavení spravováno operátorem"</string>
<string name="wifi_calling_settings_activation_instructions" msgid="7492509632478260955">"Aktivujte volání přes Wi-Fi"</string>
<string name="wifi_calling_turn_on" msgid="1171403510313983983">"Zapněte volání přes Wi-Fi"</string>
@@ -1916,7 +1916,7 @@
<string name="default_emergency_app" msgid="1951760659640369980">"Aplikace k příjmu výstražných zpráv"</string>
<string name="reset_app_preferences" msgid="1321050641018356925">"Obnovit nastavení aplikací"</string>
<string name="reset_app_preferences_title" msgid="6093179367325336662">"Obnovit nastavení aplikací?"</string>
- <string name="reset_app_preferences_desc" msgid="4822447731869201512">"Tímto obnovíte všechna nastavení následujících položek:\n\n"<li>"deaktivované aplikace,"</li>\n<li>"deaktivovaná oznámení aplikací,"</li>\n<li>"výchozí aplikace pro různé akce,"</li>\n<li>"omezení datových přenosů na pozadí pro aplikace,"</li>\n<li>"veškerá omezení oprávnění."</li>\n\n"Nepřijdete o žádná data aplikací."</string>
+ <string name="reset_app_preferences_desc" msgid="731757609326016760">"Touto akcí obnovíte všechna nastavení pro:\n\n"<li>"deaktivované aplikace,"</li>\n<li>"deaktivovaná oznámení aplikací,"</li>\n<li>"výchozí aplikace k provádění akcí,"</li>\n<li>"omezení dat na pozadí pro aplikace,"</li>\n<li>"omezení oprávnění."</li>\n\n"O žádná data aplikací nepřijdete."</string>
<string name="reset_app_preferences_button" msgid="2559089511841281242">"Obnovit aplikace"</string>
<string name="manage_space_text" msgid="8852711522447794676">"Správa paměti"</string>
<string name="filter" msgid="2018011724373033887">"Filtrovat"</string>
@@ -2131,7 +2131,7 @@
<string name="accessibility_screen_magnification_short_summary" msgid="3411979839172752057">"Trojitým klepnutím aktivujete přiblížení"</string>
<string name="accessibility_screen_magnification_navbar_short_summary" msgid="3693116360267980492">"Přiblížení zobrazení klepnutím na tlačítko"</string>
<string name="accessibility_screen_magnification_summary" msgid="5258868553337478505"><b>"Přiblížení"</b>" provedete tak, že třikrát klepnete na obrazovku.\n"<ul><li>"Přetažením dvěma prsty zobrazení posunete."</li>\n<li>"Úroveň přiblížení upravíte stažením nebo roztažením dvou nebo více prstů."</li></ul>\n\n"Chcete-li zobrazení "<b>"přiblížit dočasně"</b>", rychle na obrazovku klepněte třikrát za sebou a při posledním klepnutí prst přidržte.\n"<ul><li>"Přetažením se můžete pohybovat po obrazovce."</li>\n<li>"Zvednutím prstu zobrazení vrátíte do původního stavu."</li></ul>\n\n"Na klávesnici a navigačním panelu přiblížení není k dispozici."</string>
- <string name="accessibility_screen_magnification_navbar_summary" msgid="2272878354599332009">"Když je zapnuté zvětšení, můžete přibližovat obsah na obrazovce.\n\n"<b>"Chcete-li obsah přiblížit"</b>", spusťte zvětšení a poté klepněte kamkoliv na obrazovku.\n"<ul><li>"• Přetažením dvěma nebo více prsty můžete obsah posouvat."</li>\n<li>"• Stažením nebo roztažením dvou či více prstů upravíte přiblížení."</li></ul>\n\n<b>"Chcete-li obsah přiblížit dočasně"</b>", spusťte zvětšení a poté se dotkněte libovolného místa na obrazovce a podržte ho.\n"<ul><li>"• Přetažením se můžete pohybovat po obrazovce."</li>\n<li>"• Zvednutím prstu obsah oddálíte."</li></ul>\n\n"Na klávesnici a navigačním panelu přiblížení není k dispozici."</string>
+ <string name="accessibility_screen_magnification_navbar_summary" msgid="6700716275347612310">"Když je zapnuté zvětšení, můžete přibližovat obsah na obrazovce.\n\n"<b>"Chcete-li obsah přiblížit"</b>", spusťte zvětšení a poté klepněte kamkoliv na obrazovku.\n"<ul><li>"Přetažením dvěma nebo více prsty můžete obsah posouvat."</li>\n<li>"Stažením nebo roztažením dvou či více prstů upravíte přiblížení."</li></ul>\n\n<b>"Chcete-li obsah přiblížit dočasně"</b>", spusťte zvětšení a poté se dotkněte libovolného místa na obrazovce a podržte ho.\n"<ul><li>"Přetažením se můžete pohybovat po obrazovce."</li>\n<li>"Zvednutím prstu zobrazení vrátíte do původního stavu."</li></ul>\n\n"Na klávesnici a navigačním panelu přiblížení není k dispozici."</string>
<string name="accessibility_tutorial_dialog_title_button" msgid="3682222614034474845">"Otevření pomocí tlačítka přístupnosti"</string>
<string name="accessibility_tutorial_dialog_title_gesture" msgid="1342726230497913398">"Otevření gestem"</string>
<string name="accessibility_tutorial_dialog_title_gesture_settings" msgid="8539392614235820285">"Použití nového gesta pro usnadnění přístupu"</string>
@@ -2184,8 +2184,7 @@
<string name="accessibility_hearingaid_title" msgid="8312145423610648518">"Naslouchátka"</string>
<string name="accessibility_hearingaid_not_connected_summary" msgid="6240237523789614599">"Nejsou připojena žádná naslouchátka"</string>
<string name="accessibility_hearingaid_adding_summary" msgid="2947474468412309778">"Přidat naslouchátka"</string>
- <string name="accessibility_hearingaid_pair_instructions_first_message" msgid="3912093691643131154">"Chcete-li spárovat naslouchátka, na další obrazovce klepněte na své zařízení."</string>
- <string name="accessibility_hearingaid_pair_instructions_second_message" msgid="5596683393607650243">"Ujistěte se, zda jsou naslouchátka v režimu párování."</string>
+ <string name="accessibility_hearingaid_pair_instructions_message" msgid="3094382949733435414">"Chcete-li spárovat naslouchátka, na další obrazovce najděte své zařízení a klepněte na něj. Ujistěte se, zda jsou naslouchátka v režimu párování."</string>
<string name="accessibility_hearingaid_active_device_summary" msgid="3924362383258688984">"Zařízení <xliff:g id="DEVICE_NAME">%1$s</xliff:g> je aktivní"</string>
<plurals name="show_number_hearingaid_count" formatted="false" msgid="3160782397139295486">
<item quantity="few"><xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> uložená naslouchátka</item>
@@ -2564,7 +2563,6 @@
<string name="menu_stats_last_unplugged" msgid="5922246077592434526">"Při posledním odpojení pro <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
<string name="menu_stats_total" msgid="8973377864854807854">"Využití baterie celkem"</string>
<string name="menu_stats_refresh" msgid="1676215433344981075">"Aktualizovat"</string>
- <string name="process_kernel_label" msgid="3916858646836739323">"OS Android"</string>
<string name="process_mediaserver_label" msgid="6500382062945689285">"Mediaserver"</string>
<string name="process_dex2oat_label" msgid="2592408651060518226">"Optimalizace aplikací"</string>
<string name="battery_saver" msgid="8172485772238572153">"Spořič baterie"</string>
@@ -2695,8 +2693,6 @@
<string name="no_device_admins" msgid="4846602835339095768">"Nejsou k dispozici žádné aplikace pro správu zařízení"</string>
<string name="personal_device_admin_title" msgid="2849617316347669861">"Osobní"</string>
<string name="managed_device_admin_title" msgid="7853955652864478435">"Pracovní"</string>
- <string name="sms_access_restriction_enabled" msgid="7054488078710530278">"Omezit přístup k SMS a seznamu hovorů"</string>
- <string name="sms_access_restriction_enabled_summary" msgid="6851339654677842328">"Přístup k SMS a seznamu hovorů mají jen výchozí aplikace na telefonování a odesílání zpráv"</string>
<string name="no_trust_agents" msgid="7450273545568977523">"Nejsou k dispozici žádní zástupci důvěryhodnosti."</string>
<string name="add_device_admin_msg" msgid="1501847129819382149">"Aktivovat aplikaci pro správu zařízení?"</string>
<string name="add_device_admin" msgid="4192055385312215731">"Aktivovat tuto aplikaci pro správu zařízení"</string>
@@ -3195,7 +3191,7 @@
<string name="keywords_app_default" msgid="5822717006354487071">"Otevřít pomocí aplikace"</string>
<string name="keywords_applications_settings" msgid="1268353611121497450">"Aplikace"</string>
<string name="keywords_time_zone" msgid="998254736898753085">"časové pásmo"</string>
- <string name="keywords_draw_overlay" msgid="4130899177619041842">"Hlava chatu"</string>
+ <string name="keywords_draw_overlay" msgid="1001120206241401007">"Hlava chatu, systém, upozornění, okno, dialog, displej, nad jinými aplikacemi"</string>
<string name="keywords_flashlight" msgid="6161632177705233710">"Svítilna, světlo, baterka"</string>
<string name="keywords_change_wifi_state" msgid="627068244033681010">"wifi, wi-fi, přepnout, ovládání"</string>
<string name="keywords_more_mobile_networks" msgid="8995946622054642367">"mobilní síť, mobilní operátor, mobilní data, bezdrátové, data, 4g, 3g, 2g, lte"</string>
@@ -3219,7 +3215,7 @@
<string name="keywords_sounds_and_notifications_interruptions" msgid="5426093074031208917">"nerušit, vyrušit, vyrušení, pauza"</string>
<string name="keywords_app" msgid="6334757056536837791">"RAM"</string>
<string name="keywords_location" msgid="4132655528196729043">"okolí, poloha, historie, hlášení, GPS"</string>
- <string name="keywords_accounts" msgid="1957925565953357627">"účet"</string>
+ <string name="keywords_accounts" msgid="4479029747403203867">"účet, přidání účtu, pracovní profil"</string>
<string name="keywords_users" msgid="3434190133131387942">"omezení, omezit, omezeno"</string>
<string name="keywords_keyboard_and_ime" msgid="9143339015329957107">"oprava textu, opravit, zvuk, vibrace, auto, jazyk, gesto, navrhnout, návrh, motiv, nevhodné, slovo, typ, emodži, mezinárodní"</string>
<string name="keywords_reset_apps" msgid="5293291209613191845">"resetování, předvolby, výchozí"</string>
@@ -3257,6 +3253,7 @@
<string name="keywords_storage_settings" msgid="297283751968446577">"paměť, mezipaměť, data, smazat, vymazat, uvolnit, místo"</string>
<string name="keywords_bluetooth_settings" msgid="6804844062789439858">"připojené, zařízení, sluchátka, náhlavní souprava, reproduktor, bezdrátové, párování, hudba, média"</string>
<string name="keywords_wallpaper" msgid="5058364390917429896">"pozadí, obrazovka, obrazovka uzamčení, motiv"</string>
+ <string name="keywords_styles" msgid="5828725481814049422">"tvar ikony, barva zvýraznění, písmo"</string>
<string name="keywords_assist_input" msgid="5017533309492679287">"výchozí, asistent"</string>
<string name="keywords_default_payment_app" msgid="3838565809518896799">"placení, výchozí"</string>
<string name="keywords_ambient_display" msgid="3103487805748659132">"příchozí oznámení"</string>
@@ -3266,7 +3263,7 @@
<string name="keywords_notification_vibration" msgid="31924624421190547">"hmatová odezva, vibrace, citlivost"</string>
<string name="keywords_battery_saver_sticky" msgid="5586215686021650278">"spořič baterie, pevné, trvalé, úspora energie, baterie"</string>
<string name="keywords_battery_saver_schedule" msgid="7358789228486231944">"sled činností, plán, spořič baterie, úspora energie, baterie, automatické, procenta"</string>
- <string name="keywords_add_an_account" msgid="6488139919428902434">"pracovní profil"</string>
+ <string name="keywords_enhance_4g_lte" msgid="2273810564244790859">"volte, rozšířené volání, volání 4g"</string>
<string name="default_sound" msgid="8821684447333687810">"Výchozí zvuk"</string>
<string name="sound_settings_summary" msgid="4100853606668287965">"Hlasitost vyzvánění: <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
<string name="sound_dashboard_summary" msgid="3402435125958012986">"Hlasitost, vibrace, režim Nerušit"</string>
@@ -4015,7 +4012,6 @@
<string name="permit_draw_overlay" msgid="7456536798718633432">"Povolit zobrazení přes jiné aplikace"</string>
<string name="allow_overlay_description" msgid="8961670023925421358">"Umožní této aplikaci zobrazovat se přes ostatní aplikace, které používáte. Může tak narušit vaši práci s těmito aplikacemi a změnit způsob jejich zobrazování nebo chování."</string>
<string name="keywords_vr_listener" msgid="7441221822576384680">"VR virtuální realita přijímač stereo pomocná služba"</string>
- <string name="keywords_system_alert_window" msgid="5049498015597864850">"systém upozornění okno dialog zobrazení nad jinými aplikacemi"</string>
<string name="overlay_settings" msgid="6930854109449524280">"Zobrazit přes ostatní aplikace"</string>
<string name="system_alert_window_summary" msgid="602892301318324492">"Aplikace s povolením k zobrazení přes ostatní aplikace: <xliff:g id="COUNT_0">%1$d</xliff:g> z <xliff:g id="COUNT_1">%2$d</xliff:g>"</string>
<string name="filter_overlay_apps" msgid="6965969283342557573">"Aplikace s oprávněním"</string>
@@ -4263,7 +4259,6 @@
<string name="notification_log_details_none" msgid="184131801230614059">"žádné"</string>
<string name="notification_log_details_ranking_null" msgid="244660392058720919">"Objekt hodnocení chybí."</string>
<string name="notification_log_details_ranking_none" msgid="599607025882587844">"Objekt hodnocení tento klíč neobsahuje."</string>
- <string name="theme_customization_category" msgid="1049181544004163283">"Nastavování motivů"</string>
<string name="theme_customization_device_default" msgid="5058147707906551368">"Výchozí nastavení zařízení"</string>
<string name="display_cutout_emulation" msgid="7466869822418376317">"Výřez displeje"</string>
<string name="display_cutout_emulation_keywords" msgid="4495418317471622562">"výřez displeje"</string>
@@ -4713,6 +4708,8 @@
<string name="network_connection_errorstate_dialog_message" msgid="6953778550775646710">"Něco se stalo. Aplikace zrušila požadavek na výběr zařízení."</string>
<string name="network_connection_connect_successful" msgid="5935510954474494928">"Připojení úspěšně navázáno"</string>
<string name="network_connection_request_dialog_showall" msgid="6938922880244567521">"Zobrazit vše"</string>
+ <string name="network_connection_searching_message" msgid="4638576789450817530">"Vyhledávání zařízení…"</string>
+ <string name="network_connection_connecting_message" msgid="3740982406609245654">"Připojování k zařízení…"</string>
<plurals name="show_bluetooth_devices" formatted="false" msgid="1715020480026568408">
<item quantity="few"><xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> připojená zařízení</item>
<item quantity="many"><xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> připojeného zařízení</item>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 186187c..fadbf95 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -360,8 +360,6 @@
<string name="security_enable_widgets_disabled_summary" msgid="6392489775303464905">"Deaktiveret af administratoren"</string>
<string name="lockdown_settings_title" msgid="7393790212603280213">"Se mulighed for lukning"</string>
<string name="lockdown_settings_summary" msgid="4359438673563318171">"Vis mulighed for afbryderknap, der deaktiverer Smart Lock, biometrisk oplåsning og notifikationer på låseskærmen"</string>
- <string name="trust_agents_extend_unlock_title" msgid="2796555263565097031">"Trust agents låser kun op"</string>
- <string name="trust_agents_extend_unlock_summary" msgid="3976344969220255010">"Hvis denne indstilling aktiveres, vil trust agents holde din enhed oplåst i længere tid, men en låst enhed kan ikke længere låses op."</string>
<string name="trust_lost_locks_screen_title" msgid="2992742466966021682">"Lås skærmen, når der ikke længere er sikkert"</string>
<string name="trust_lost_locks_screen_summary" msgid="693784434582021206">"Hvis denne indstilling er aktiveret, låses enheden, når den sidste trust agent ikke længere er sikker"</string>
<string name="owner_info_settings_summary" msgid="7472393443779227052">"Ingen"</string>
@@ -937,6 +935,7 @@
<string name="wifi_eap_identity" msgid="4359453783379679103">"Identitet"</string>
<string name="wifi_eap_anonymous" msgid="2989469344116577955">"Anonym identitet"</string>
<string name="wifi_password" msgid="5948219759936151048">"Adgangskode"</string>
+ <string name="wifi_sae_password_id" msgid="1697832722221765763">"Adgangskode-id til SAE"</string>
<string name="wifi_show_password" msgid="6461249871236968884">"Vis adgangskode"</string>
<string name="wifi_ap_band_config" msgid="1611826705989117930">"Vælg AP-bånd"</string>
<string name="wifi_ap_choose_auto" msgid="2677800651271769965">"Automatisk"</string>
@@ -957,7 +956,6 @@
<string name="wifi_dpp_share_wifi" msgid="9065890131734833809">"Del Wi‑Fi"</string>
<string name="wifi_dpp_scan_qr_code_with_another_device" msgid="5854392840857123065">"Scan denne QR-kode for at oprette forbindelse til \"<xliff:g id="SSID">%1$s</xliff:g>\" og dele adgangskoden"</string>
<string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="4436318319178361543">"Scan denne QR-kode for at oprette forbindelse til \"<xliff:g id="SSID">%1$s</xliff:g>\""</string>
- <string name="wifi_dpp_could_not_detect_valid_qr_code" msgid="641893675646330576">"QR-koden kunne ikke læses. Sørg for, at koden er i midten af feltet, og prøv igen"</string>
<string name="wifi_dpp_failure_authentication_or_configuration" msgid="3372757783382381044">"Prøv igen. Hvis problemet fortsætter, skal du kontakte enhedsproducenten"</string>
<string name="wifi_dpp_failure_not_compatible" msgid="2829930473520603740">"Noget gik galt"</string>
<string name="wifi_dpp_failure_timeout" msgid="5228320772245820458">"Sørg for, at enheden er tilsluttet, opladet og tændt"</string>
@@ -980,6 +978,7 @@
<string name="wifi_dpp_hotspot_password" msgid="4120419278831581613">"Adgangskode til hotspot: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
<string name="wifi_dpp_add_device" msgid="4072206063308645677">"Tilføj enhed"</string>
<string name="wifi_dpp_connect_network_using_qr_code" msgid="3887335309163999665">"Brug en QR-kode til at føje en enhed til dette netværk"</string>
+ <string name="wifi_dpp_qr_code_is_not_valid_format" msgid="3700087439867692944">"QR-koden har ikke et gyldigt format"</string>
<string name="retry" msgid="6472609612090877557">"Prøv igen"</string>
<string name="wifi_shared" msgid="844142443226926070">"Del med andre enhedsbrugere"</string>
<string name="wifi_unchanged" msgid="3410422020930397102">"(uændret)"</string>
@@ -1129,6 +1128,7 @@
<string name="emergency_address_title" msgid="932729250447887545">"Adresse til nødstilfælde"</string>
<string name="emergency_address_summary" msgid="7751971156196115129">"Anvendes som din placering, hvis du foretager et nødopkald via Wi-Fi"</string>
<string name="private_dns_help_message" msgid="3299567069152568958"><annotation id="url">"Få flere oplysninger"</annotation>" om private DNS-funktioner"</string>
+ <string name="private_dns_mode_on" msgid="5882613439541371003">"Til"</string>
<string name="wifi_calling_pref_managed_by_carrier" msgid="6845711858866828986">"Indstillingen administreres af mobilselskabet"</string>
<string name="wifi_calling_settings_activation_instructions" msgid="7492509632478260955">"Aktivér Wi-Fi-opkald"</string>
<string name="wifi_calling_turn_on" msgid="1171403510313983983">"Aktivér Wi-Fi-opkald"</string>
@@ -1872,7 +1872,7 @@
<string name="default_emergency_app" msgid="1951760659640369980">"Nødapp"</string>
<string name="reset_app_preferences" msgid="1321050641018356925">"Nulstil app-præferencer"</string>
<string name="reset_app_preferences_title" msgid="6093179367325336662">"Nulstil app-præferencer?"</string>
- <string name="reset_app_preferences_desc" msgid="4822447731869201512">"Dette vil nulstille alle præferencer for:\n\n"<li>"Deaktiverede apps"</li>\n<li>"Deaktiverede appnotifikationer"</li>\n<li>"Standardapps til handlinger"</li>\n<li>"Begrænsning af baggrundsdata for apps"</li>\n<li>"Eventuelle begrænsede tilladelser"</li>\n\n"Du vil ikke miste nogen appdata."</string>
+ <string name="reset_app_preferences_desc" msgid="731757609326016760">"Dette nulstiller alle præferencer for:\n\n "<li>"Deaktiverede apps"</li>\n" "<li>"Deaktiverede appnotifikationer"</li>\n" "<li>"Standardapps til handlinger"</li>\n" "<li>"Begrænsning af baggrundsdata for apps"</li>\n<li>" "</li>"Eventuelle begrænsede tilladelser\n\n Du vil ikke miste nogen appdata."</string>
<string name="reset_app_preferences_button" msgid="2559089511841281242">"Nulstil apps"</string>
<string name="manage_space_text" msgid="8852711522447794676">"Administrer plads"</string>
<string name="filter" msgid="2018011724373033887">"Filter"</string>
@@ -2087,7 +2087,7 @@
<string name="accessibility_screen_magnification_short_summary" msgid="3411979839172752057">"Tryk tre gange for at zoome ind"</string>
<string name="accessibility_screen_magnification_navbar_short_summary" msgid="3693116360267980492">"Tryk på en knap for at zoome"</string>
<string name="accessibility_screen_magnification_summary" msgid="5258868553337478505"><b>"Hvis du vil zoome"</b>", skal du hurtigt trykke tre gange på skærmen.\n"<ul><li>"Træk med to eller flere fingre for at rulle"</li>\n<li>"Knib sammen med to eller flere fingre for at justere zoomniveauet"</li></ul>\n\n<b>"Hvis du vil zoome midlertidigt"</b>", skal du hurtigt trykke tre gange på skærmen og holde fingeren nede på det tredje tryk.\n"<ul><li>"Træk for at udforske forskellige dele af skærmen"</li>\n<li>"Løft fingeren for at zoome ud"</li></ul>\n\n"Du kan ikke zoome ind på tastaturet eller navigationslinjen."</string>
- <string name="accessibility_screen_magnification_navbar_summary" msgid="2272878354599332009">"Når forstørrelse er aktiveret, kan du zoome ind på skærmen.\n\n"<b>"Hvis du vil zoome"</b>", skal du åbne forstørrelse og derefter trykke et vilkårligt sted på skærmen.\n"<ul><li>"• Træk to eller flere fingre for at rulle"</li>\n<li>"• Knib to eller flere fingre sammen for at justere zoomniveauet"</li></ul>\n\n<b>"Hvis du vil zoome midlertidigt"</b>", skal du åbne forstørrelse og derefter holde et vilkårligt sted på skærmen nede.\n"<ul><li>"• Træk for at bevæge dig rundt på siden"</li>\n<li>"• Løft fingeren for at zoome ud"</li></ul>\n\n"Du kan ikke zoome ind på tastaturet eller navigationslinjen."</string>
+ <string name="accessibility_screen_magnification_navbar_summary" msgid="6700716275347612310">"Når forstørrelse er aktiveret, kan du zoome ind på skærmen.\n\n"<b>"Hvis du vil zoome"</b>", skal du åbne forstørrelse og derefter trykke et vilkårligt sted på skærmen.\n"<ul><li>"Træk med to eller flere fingre for at rulle"</li>\n<li>"Knib sammen med to eller flere fingre for at justere zoomniveauet"</li></ul>\n\n<b>"Hvis du vil zoome midlertidigt"</b>", skal du åbne forstørrelse og holde fingeren nede et vilkårligt sted på skærmen.\n"<ul><li>"Træk for at udforske forskellige dele af skærmen"</li>\n<li>"Løft fingeren for at zoome ud"</li></ul>\n\n"Du kan ikke zoome ind på tastaturet eller navigationslinjen."</string>
<string name="accessibility_tutorial_dialog_title_button" msgid="3682222614034474845">"Brug knappen Hjælpefunktioner til at åbne"</string>
<string name="accessibility_tutorial_dialog_title_gesture" msgid="1342726230497913398">"Brug en bevægelse til at åbne"</string>
<string name="accessibility_tutorial_dialog_title_gesture_settings" msgid="8539392614235820285">"Brug den nye bevægelse for hjælpefunktioner"</string>
@@ -2140,8 +2140,7 @@
<string name="accessibility_hearingaid_title" msgid="8312145423610648518">"Høreapparater"</string>
<string name="accessibility_hearingaid_not_connected_summary" msgid="6240237523789614599">"Der er ikke tilknyttet nogen høreapparater"</string>
<string name="accessibility_hearingaid_adding_summary" msgid="2947474468412309778">"Tilføj høreapparater"</string>
- <string name="accessibility_hearingaid_pair_instructions_first_message" msgid="3912093691643131154">"Find og tryk på din enhed på næste skærm for at parre dine høreapparater."</string>
- <string name="accessibility_hearingaid_pair_instructions_second_message" msgid="5596683393607650243">"Sørg for, at dine høreapparater er i parringstilstand."</string>
+ <string name="accessibility_hearingaid_pair_instructions_message" msgid="3094382949733435414">"Find og tryk på din enhed på næste skærm for at parre dine høreapparater. Sørg for, at dine høreapparater er i parringstilstand."</string>
<string name="accessibility_hearingaid_active_device_summary" msgid="3924362383258688984">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> er aktiv"</string>
<plurals name="show_number_hearingaid_count" formatted="false" msgid="3160782397139295486">
<item quantity="one"><xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> gemt høreapparat</item>
@@ -2490,7 +2489,6 @@
<string name="menu_stats_last_unplugged" msgid="5922246077592434526">"Siden sidste afbrydelse for <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
<string name="menu_stats_total" msgid="8973377864854807854">"Brugstotal"</string>
<string name="menu_stats_refresh" msgid="1676215433344981075">"Opdater"</string>
- <string name="process_kernel_label" msgid="3916858646836739323">"Android OS"</string>
<string name="process_mediaserver_label" msgid="6500382062945689285">"Medieserver"</string>
<string name="process_dex2oat_label" msgid="2592408651060518226">"Appoptimering"</string>
<string name="battery_saver" msgid="8172485772238572153">"Batterisparefunktion"</string>
@@ -2621,8 +2619,6 @@
<string name="no_device_admins" msgid="4846602835339095768">"Der er ikke nogen tilgængelige apps til enhedsadministration"</string>
<string name="personal_device_admin_title" msgid="2849617316347669861">"Personlig"</string>
<string name="managed_device_admin_title" msgid="7853955652864478435">"Arbejde"</string>
- <string name="sms_access_restriction_enabled" msgid="7054488078710530278">"Begræns adgang til sms og opkaldsliste"</string>
- <string name="sms_access_restriction_enabled_summary" msgid="6851339654677842328">"Det er kun standardapps til opkald og beskeder, der har tilladelser for sms og opkaldsliste"</string>
<string name="no_trust_agents" msgid="7450273545568977523">"Der er ingen tilgængelige trust agents"</string>
<string name="add_device_admin_msg" msgid="1501847129819382149">"Aktiver appen til enhedsadministration?"</string>
<string name="add_device_admin" msgid="4192055385312215731">"Aktivér denne app til enhedsadministration"</string>
@@ -3111,7 +3107,7 @@
<string name="keywords_app_default" msgid="5822717006354487071">"Åbn med"</string>
<string name="keywords_applications_settings" msgid="1268353611121497450">"Apps"</string>
<string name="keywords_time_zone" msgid="998254736898753085">"tidszone"</string>
- <string name="keywords_draw_overlay" msgid="4130899177619041842">"Chathoved"</string>
+ <string name="keywords_draw_overlay" msgid="1001120206241401007">"Chathoved, system, underretning, vindue, dialogboks, skærm, oven på andre apps, tegn"</string>
<string name="keywords_flashlight" msgid="6161632177705233710">"Lommelygte, lys, lygte"</string>
<string name="keywords_change_wifi_state" msgid="627068244033681010">"wifi, wi-fi, skift, styring"</string>
<string name="keywords_more_mobile_networks" msgid="8995946622054642367">"mobil, mobilselskab, trådløs, data, 4g, 3g, 2g, lte"</string>
@@ -3135,7 +3131,7 @@
<string name="keywords_sounds_and_notifications_interruptions" msgid="5426093074031208917">"forstyr ikke, afbryd, afbrydelse, pause"</string>
<string name="keywords_app" msgid="6334757056536837791">"RAM"</string>
<string name="keywords_location" msgid="4132655528196729043">"tæt på, placering, historik, rapportering, GPS"</string>
- <string name="keywords_accounts" msgid="1957925565953357627">"konto"</string>
+ <string name="keywords_accounts" msgid="4479029747403203867">"konto, tilføj en konto, arbejdsprofil"</string>
<string name="keywords_users" msgid="3434190133131387942">"begrænsning, begræns, begrænset"</string>
<string name="keywords_keyboard_and_ime" msgid="9143339015329957107">"rettelser, ret, lyd, vibrer, automatisk, sprog, bevægelse, anbefale, forslag, tema, stødende, ord, type, emoji, international"</string>
<string name="keywords_reset_apps" msgid="5293291209613191845">"nulstilling, præferencer, standard"</string>
@@ -3173,6 +3169,7 @@
<string name="keywords_storage_settings" msgid="297283751968446577">"hukommelse, cache, data, slet, ryd, frigør, plads"</string>
<string name="keywords_bluetooth_settings" msgid="6804844062789439858">"forbundet, enhed, høretelefoner, headset, højttaler, trådløs, parre, øretelefoner, musik, medier"</string>
<string name="keywords_wallpaper" msgid="5058364390917429896">"baggrund, skærm, låseskærm, tema"</string>
+ <string name="keywords_styles" msgid="5828725481814049422">"ikonform, kontrastfarve, skrifttype"</string>
<string name="keywords_assist_input" msgid="5017533309492679287">"standard, assistent"</string>
<string name="keywords_default_payment_app" msgid="3838565809518896799">"betaling, standard"</string>
<string name="keywords_ambient_display" msgid="3103487805748659132">"ny notifikation"</string>
@@ -3182,7 +3179,7 @@
<string name="keywords_notification_vibration" msgid="31924624421190547">"berøringssensorer, vibration, følsomhed"</string>
<string name="keywords_battery_saver_sticky" msgid="5586215686021650278">"batterisparefunktion, klæbende, vedvare, strømbesparelse, batteri"</string>
<string name="keywords_battery_saver_schedule" msgid="7358789228486231944">"rutine, tidsplan, batterisparefunktion, strømsparefunktion, batteri, automatisk, procent"</string>
- <string name="keywords_add_an_account" msgid="6488139919428902434">"arbejdsprofil"</string>
+ <string name="keywords_enhance_4g_lte" msgid="2273810564244790859">"volte, avancerede opkald, 4g-opkald"</string>
<string name="default_sound" msgid="8821684447333687810">"Standardlyd"</string>
<string name="sound_settings_summary" msgid="4100853606668287965">"Lydstyrken for ringesignalet er på <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
<string name="sound_dashboard_summary" msgid="3402435125958012986">"Lydstyrke, vibration, Forstyr ikke"</string>
@@ -3889,7 +3886,6 @@
<string name="permit_draw_overlay" msgid="7456536798718633432">"Tillad visning over andre apps"</string>
<string name="allow_overlay_description" msgid="8961670023925421358">"Tillad, at denne app vises oven på andre apps, du bruger. Dette kan forstyrre din brug af disse apps eller ændre deres udseende eller adfærd."</string>
<string name="keywords_vr_listener" msgid="7441221822576384680">"vr virtual reality lyttefunktion stereo hjælpetjeneste"</string>
- <string name="keywords_system_alert_window" msgid="5049498015597864850">"dialogboks med systemadvarsel vises oven på andre apps"</string>
<string name="overlay_settings" msgid="6930854109449524280">"Vis oven på andre apps"</string>
<string name="system_alert_window_summary" msgid="602892301318324492">"<xliff:g id="COUNT_0">%1$d</xliff:g> af <xliff:g id="COUNT_1">%2$d</xliff:g> apps må vises oven på andre apps"</string>
<string name="filter_overlay_apps" msgid="6965969283342557573">"Apps med tilladelse"</string>
@@ -4125,7 +4121,6 @@
<string name="notification_log_details_none" msgid="184131801230614059">"intet"</string>
<string name="notification_log_details_ranking_null" msgid="244660392058720919">"Rangeringsobjektet mangler."</string>
<string name="notification_log_details_ranking_none" msgid="599607025882587844">"Rangeringobjektet indeholder ikke denne nøgle."</string>
- <string name="theme_customization_category" msgid="1049181544004163283">"Tilpasning af tema"</string>
<string name="theme_customization_device_default" msgid="5058147707906551368">"Enhedens standardindstilling"</string>
<string name="display_cutout_emulation" msgid="7466869822418376317">"Skærmhak"</string>
<string name="display_cutout_emulation_keywords" msgid="4495418317471622562">"udskæring på skærmen, hak"</string>
@@ -4551,6 +4546,8 @@
<string name="network_connection_errorstate_dialog_message" msgid="6953778550775646710">"Der opstod et problem Appen har annulleret anmodningen om at vælge en enhed."</string>
<string name="network_connection_connect_successful" msgid="5935510954474494928">"Der blev oprettet forbindelse"</string>
<string name="network_connection_request_dialog_showall" msgid="6938922880244567521">"Vis alle"</string>
+ <string name="network_connection_searching_message" msgid="4638576789450817530">"Søger efter enhed…"</string>
+ <string name="network_connection_connecting_message" msgid="3740982406609245654">"Opretter forbindelse til enhed…"</string>
<plurals name="show_bluetooth_devices" formatted="false" msgid="1715020480026568408">
<item quantity="one"><xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> enhed er tilsluttet</item>
<item quantity="other"><xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> enheder er tilsluttet</item>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 5e3663f..7ed62a0 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -359,8 +359,6 @@
<string name="security_enable_widgets_disabled_summary" msgid="6392489775303464905">"Vom Administrator deaktiviert"</string>
<string name="lockdown_settings_title" msgid="7393790212603280213">"Option zum Sperren anzeigen"</string>
<string name="lockdown_settings_summary" msgid="4359438673563318171">"Option für Ein/Aus-Taste des Displays, durch die Smart Lock, das biometrische Entsperren und Benachrichtigungen auf dem Sperrbildschirm deaktiviert werden"</string>
- <string name="trust_agents_extend_unlock_title" msgid="2796555263565097031">"Trust Agents können Entsperrung nur verlängern"</string>
- <string name="trust_agents_extend_unlock_summary" msgid="3976344969220255010">"Wenn aktiviert, halten Trust Agents das Gerät länger entsperrt, sie können aber gesperrte Geräte nicht mehr entsperren"</string>
<string name="trust_lost_locks_screen_title" msgid="2992742466966021682">"Bildschirm sperren, wenn nicht mehr vertrauenswürdig"</string>
<string name="trust_lost_locks_screen_summary" msgid="693784434582021206">"Wenn aktiviert, wird das Gerät gesperrt, sobald der letzte Trust Agent nicht mehr vertrauenswürdig ist"</string>
<string name="owner_info_settings_summary" msgid="7472393443779227052">"Keine"</string>
@@ -937,6 +935,7 @@
<string name="wifi_eap_identity" msgid="4359453783379679103">"Identität"</string>
<string name="wifi_eap_anonymous" msgid="2989469344116577955">"Anonyme Identität"</string>
<string name="wifi_password" msgid="5948219759936151048">"Passwort"</string>
+ <string name="wifi_sae_password_id" msgid="1697832722221765763">"SAE-Passwort-Kennzeichnung"</string>
<string name="wifi_show_password" msgid="6461249871236968884">"Passwort anzeigen"</string>
<string name="wifi_ap_band_config" msgid="1611826705989117930">"Band für Zugangspunkt auswählen"</string>
<string name="wifi_ap_choose_auto" msgid="2677800651271769965">"Automatisch"</string>
@@ -957,7 +956,6 @@
<string name="wifi_dpp_share_wifi" msgid="9065890131734833809">"WLAN teilen"</string>
<string name="wifi_dpp_scan_qr_code_with_another_device" msgid="5854392840857123065">"Scanne diesen QR-Code, um eine Verbindung mit \"<xliff:g id="SSID">%1$s</xliff:g>\" herzustellen und das Passwort zu teilen"</string>
<string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="4436318319178361543">"Diesen QR-Code scannen, um eine Verbindung mit \"<xliff:g id="SSID">%1$s</xliff:g>\" herzustellen"</string>
- <string name="wifi_dpp_could_not_detect_valid_qr_code" msgid="641893675646330576">"Lesen des QR-Codes nicht möglich. Halte die Kamera so, dass der Code in der Mitte des Felds zu sehen ist, und versuche es noch einmal"</string>
<string name="wifi_dpp_failure_authentication_or_configuration" msgid="3372757783382381044">"Versuche es noch einmal. Falls das Problem weiterhin besteht, wende dich an den Hersteller des Geräts"</string>
<string name="wifi_dpp_failure_not_compatible" msgid="2829930473520603740">"Fehler"</string>
<string name="wifi_dpp_failure_timeout" msgid="5228320772245820458">"Prüfe, ob das Gerät angeschlossen, aufgeladen und eingeschaltet ist"</string>
@@ -980,6 +978,7 @@
<string name="wifi_dpp_hotspot_password" msgid="4120419278831581613">"Passwort des Hotspots: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
<string name="wifi_dpp_add_device" msgid="4072206063308645677">"Gerät hinzufügen"</string>
<string name="wifi_dpp_connect_network_using_qr_code" msgid="3887335309163999665">"QR-Code verwenden, um diesem Netzwerk ein Gerät hinzuzufügen"</string>
+ <string name="wifi_dpp_qr_code_is_not_valid_format" msgid="3700087439867692944">"QR-Code ist kein gültiges Format"</string>
<string name="retry" msgid="6472609612090877557">"Noch mal versuchen"</string>
<string name="wifi_shared" msgid="844142443226926070">"Für andere Gerätenutzer freigeben"</string>
<string name="wifi_unchanged" msgid="3410422020930397102">"(nicht geändert)"</string>
@@ -1129,6 +1128,7 @@
<string name="emergency_address_title" msgid="932729250447887545">"Notfalladresse"</string>
<string name="emergency_address_summary" msgid="7751971156196115129">"Wird als dein Standort verwendet, wenn du einen Notruf über WLAN tätigst"</string>
<string name="private_dns_help_message" msgid="3299567069152568958"><annotation id="url">"Weitere Informationen zu privaten DNS-Funktionen"</annotation></string>
+ <string name="private_dns_mode_on" msgid="5882613439541371003">"An"</string>
<string name="wifi_calling_pref_managed_by_carrier" msgid="6845711858866828986">"Einstellung wird vom Mobilfunkanbieter verwaltet"</string>
<string name="wifi_calling_settings_activation_instructions" msgid="7492509632478260955">"WLAN-Telefonie aktivieren"</string>
<string name="wifi_calling_turn_on" msgid="1171403510313983983">"WLAN-Telefonie verwenden"</string>
@@ -1872,7 +1872,7 @@
<string name="default_emergency_app" msgid="1951760659640369980">"App für Notfallbenachrichtigungen"</string>
<string name="reset_app_preferences" msgid="1321050641018356925">"App-Einstellungen zurücksetzen"</string>
<string name="reset_app_preferences_title" msgid="6093179367325336662">"App-Einstellungen zurücksetzen?"</string>
- <string name="reset_app_preferences_desc" msgid="4822447731869201512">"Hierdurch werden die folgenden Einstellungen zurückgesetzt:\n\n"<li>"Deaktivierung von Apps"</li>\n<li>"Deaktivierung von App-Benachrichtigungen"</li>\n<li>"Festlegung von Standard-Apps für bestimmte Aktionen"</li>\n<li>"Einschränkungen der Hintergrunddaten für Apps"</li>\n<li>"Jegliche Zugriffsbeschränkungen"</li>\n\n"Alle App-Daten bleiben erhalten."</string>
+ <string name="reset_app_preferences_desc" msgid="731757609326016760">"Hierdurch werden die folgenden Einstellungen zurückgesetzt:\n\n "<li>"Deaktivierung von Apps"</li>\n" "<li>"Deaktivierung von App-Benachrichtigungen"</li>\n" "<li>"Festlegung von Standard-Apps für bestimmte Aktionen"</li>\n<li>"Einschränkungen der Hintergrunddaten für Apps"</li>\n<li>"Jegliche Zugriffsbeschränkungen"</li>\n\n"Alle App-Daten bleiben erhalten."</string>
<string name="reset_app_preferences_button" msgid="2559089511841281242">"Apps zurücksetzen"</string>
<string name="manage_space_text" msgid="8852711522447794676">"Speicherplatz verwalten"</string>
<string name="filter" msgid="2018011724373033887">"Filter"</string>
@@ -2087,7 +2087,7 @@
<string name="accessibility_screen_magnification_short_summary" msgid="3411979839172752057">"Zum Zoomen dreimal tippen"</string>
<string name="accessibility_screen_magnification_navbar_short_summary" msgid="3693116360267980492">"Zum Zoomen auf eine Schaltfläche tippen"</string>
<string name="accessibility_screen_magnification_summary" msgid="5258868553337478505"><b>"Wenn du zoomen möchtest"</b>", brauchst du einfach dreimal schnell auf das Display zu tippen.\n"<ul><li>"Zum Scrollen ziehst du mindestens zwei Finger über das Display."</li>\n<li>"Um den Zoom anzupassen, ziehst du einfach mindestens zwei Finger zusammen."</li></ul>\n\n<b>"Wenn du einen Bereich vorübergehend heranzoomen möchtest"</b>", tippe dreimal schnell auf das Display und halte deinen Finger beim dritten Tippen auf das Display gedrückt.\n"<ul><li>"Ziehe den Finger über das Display, um dich auf dem Display hin- und herzubewegen."</li>\n<li>"Um wieder herauszuzoomen, hebe den Finger an."</li></ul>\n\n"Auf der Tastatur und in der Navigationsleiste kann nicht gezoomt werden."</string>
- <string name="accessibility_screen_magnification_navbar_summary" msgid="2272878354599332009">"Wenn die Vergrößerung aktiviert ist, kannst du Elemente auf dem Bildschirm heranzoomen.\n\n"<b>"Wenn du zoomen möchtest"</b>", starte die Vergrößerung und tippe dann auf eine beliebige Stelle auf dem Bildschirm.\n"<ul><li>"• Zum Scrollen ziehe mit zwei oder mehr Fingern"</li>\n<li>"• Zum Anpassen des Zooms ziehe zwei oder mehr Finger zusammen bzw. auseinander"</li></ul>\n\n<b>"Wenn du vorübergehend heranzoomen möchtest"</b>", starte die Vergrößerung und tippe dann auf eine beliebige Stelle auf dem Bildschirm und halte sie gedrückt.\n"<ul><li>"• Wenn du dich im Bildschirm bewegen möchtest, ziehe den Bildschirm"</li>\n<li>"• Zum Herauszoomen hebe den Finger"</li></ul>\n\n"In die Tastatur oder Navigationsleiste kann nicht hineingezoomt werden."</string>
+ <string name="accessibility_screen_magnification_navbar_summary" msgid="6700716275347612310">"Wenn die Vergrößerung aktiviert ist, kannst du Elemente auf dem Bildschirm heranzoomen.\n\n"<b>"Wenn du zoomen möchtest"</b>", starte die Vergrößerung und tippe dann auf eine beliebige Stelle auf dem Bildschirm.\n"<ul><li>"Zum Scrollen ziehe mit zwei oder mehr Fingern"</li>\n<li>"Zum Anpassen des Zooms ziehe zwei oder mehr Finger zusammen bzw. auseinander"</li></ul>\n\n<b>"Wenn du vorübergehend heranzoomen möchtest"</b>", starte die Vergrößerung und tippe dann auf eine beliebige Stelle auf dem Bildschirm und halte sie gedrückt.\n"<ul><li>"Wenn du dich im Bildschirm bewegen möchtest, ziehe den Bildschirm"</li>\n<li>"Zum Herauszoomen hebe den Finger"</li></ul>\n\n"In die Tastatur oder Navigationsleiste kann nicht hineingezoomt werden."</string>
<string name="accessibility_tutorial_dialog_title_button" msgid="3682222614034474845">"Zum Öffnen Schaltfläche \"Bedienungshilfen\" nutzen"</string>
<string name="accessibility_tutorial_dialog_title_gesture" msgid="1342726230497913398">"Zum Öffnen Touch-Geste verwenden"</string>
<string name="accessibility_tutorial_dialog_title_gesture_settings" msgid="8539392614235820285">"Neue Touch-Geste für Bedienungshilfen verwenden"</string>
@@ -2140,8 +2140,7 @@
<string name="accessibility_hearingaid_title" msgid="8312145423610648518">"Hörhilfen"</string>
<string name="accessibility_hearingaid_not_connected_summary" msgid="6240237523789614599">"Keine Hörhilfen verbunden"</string>
<string name="accessibility_hearingaid_adding_summary" msgid="2947474468412309778">"Hörhilfen hinzufügen"</string>
- <string name="accessibility_hearingaid_pair_instructions_first_message" msgid="3912093691643131154">"Um deine Hörhilfen zu koppeln, tippe auf dem nächsten Bildschirm auf dein Gerät."</string>
- <string name="accessibility_hearingaid_pair_instructions_second_message" msgid="5596683393607650243">"Sorge dafür, dass deine Hörhilfen im Kopplungsmodus sind."</string>
+ <string name="accessibility_hearingaid_pair_instructions_message" msgid="3094382949733435414">"Wenn du deine Hörhilfen koppeln möchtest, tippe auf dem nächsten Bildschirm auf dein Gerät. Deine Hörhilfen müssen im Kopplungsmodus sein."</string>
<string name="accessibility_hearingaid_active_device_summary" msgid="3924362383258688984">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> aktiv"</string>
<plurals name="show_number_hearingaid_count" formatted="false" msgid="3160782397139295486">
<item quantity="other"><xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> gespeicherte Hörhilfen</item>
@@ -2490,7 +2489,6 @@
<string name="menu_stats_last_unplugged" msgid="5922246077592434526">"Seit dem letzten Ausstecken für <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
<string name="menu_stats_total" msgid="8973377864854807854">"Verbrauch insgesamt"</string>
<string name="menu_stats_refresh" msgid="1676215433344981075">"Aktualisieren"</string>
- <string name="process_kernel_label" msgid="3916858646836739323">"Android OS"</string>
<string name="process_mediaserver_label" msgid="6500382062945689285">"Mediaserver"</string>
<string name="process_dex2oat_label" msgid="2592408651060518226">"App-Optimierung"</string>
<string name="battery_saver" msgid="8172485772238572153">"Energiesparmodus"</string>
@@ -2621,8 +2619,6 @@
<string name="no_device_admins" msgid="4846602835339095768">"Keine App zur Geräteverwaltung verfügbar"</string>
<string name="personal_device_admin_title" msgid="2849617316347669861">"Nutzer"</string>
<string name="managed_device_admin_title" msgid="7853955652864478435">"Geschäftlich"</string>
- <string name="sms_access_restriction_enabled" msgid="7054488078710530278">"Zugriff auf SMS und Anrufliste einschränken"</string>
- <string name="sms_access_restriction_enabled_summary" msgid="6851339654677842328">"Nur standardmäßige Telefon- und Nachrichten-Apps haben Zugriff auf SMS und Anruflisteneinträge"</string>
<string name="no_trust_agents" msgid="7450273545568977523">"Keine verfügbaren Trust Agents"</string>
<string name="add_device_admin_msg" msgid="1501847129819382149">"App zur Geräteverwaltung aktivieren?"</string>
<string name="add_device_admin" msgid="4192055385312215731">"Diese App zur Geräteverwaltung aktivieren"</string>
@@ -3111,7 +3107,7 @@
<string name="keywords_app_default" msgid="5822717006354487071">"Öffnen mit"</string>
<string name="keywords_applications_settings" msgid="1268353611121497450">"Anwendungen"</string>
<string name="keywords_time_zone" msgid="998254736898753085">"Zeitzone"</string>
- <string name="keywords_draw_overlay" msgid="4130899177619041842">"Chat Head"</string>
+ <string name="keywords_draw_overlay" msgid="1001120206241401007">"Chat Head, System, Benachrichtigung, Fenster, Dialogfeld, einblenden, über anderen Apps, anzeigen"</string>
<string name="keywords_flashlight" msgid="6161632177705233710">"Taschenlampe, Licht, Lampe"</string>
<string name="keywords_change_wifi_state" msgid="627068244033681010">"wlan, umschalten, steuern"</string>
<string name="keywords_more_mobile_networks" msgid="8995946622054642367">"mobilfunk, mobil, mobilfunkanbieter, kabellos, drahtlos, daten, 4g, 3g, 2g, lte"</string>
@@ -3135,7 +3131,7 @@
<string name="keywords_sounds_and_notifications_interruptions" msgid="5426093074031208917">"bitte nicht stören, unterbrechen, unterbrechung, pause"</string>
<string name="keywords_app" msgid="6334757056536837791">"ram"</string>
<string name="keywords_location" msgid="4132655528196729043">"in der nähe, ort, standort, verlauf, berichterstellung, bericht erstellung, bericht erstellen, berichte erstellen, GPS"</string>
- <string name="keywords_accounts" msgid="1957925565953357627">"konto"</string>
+ <string name="keywords_accounts" msgid="4479029747403203867">"Konto, ein Konto hinzufügen, Arbeitsprofil"</string>
<string name="keywords_users" msgid="3434190133131387942">"einschränkung, einschränken, eingeschränkt"</string>
<string name="keywords_keyboard_and_ime" msgid="9143339015329957107">"text korrektur, textkorrektur, korrigieren, sound, ton, vibrieren, automatisch, sprache, geste, touch-geste, vorschlagen, vorschlag, design, anstößig, wort, eingeben, emoji, international"</string>
<string name="keywords_reset_apps" msgid="5293291209613191845">"zurücksetzen, einstellungen, standard, standardeinstellung"</string>
@@ -3173,6 +3169,7 @@
<string name="keywords_storage_settings" msgid="297283751968446577">"Speicher, Cache, Daten, löschen, entfernen, frei machen, Platz"</string>
<string name="keywords_bluetooth_settings" msgid="6804844062789439858">"verbunden, gerät, kopfhörer, headset, lautsprecher, drahtlos, koppeln, ohrhörer, musik, medien"</string>
<string name="keywords_wallpaper" msgid="5058364390917429896">"hintergrund, bildschirm, sperrbildschirm, design"</string>
+ <string name="keywords_styles" msgid="5828725481814049422">"Symbolform, Akzentfarbe, Schriftart"</string>
<string name="keywords_assist_input" msgid="5017533309492679287">"standard, assistent"</string>
<string name="keywords_default_payment_app" msgid="3838565809518896799">"zahlung, standard"</string>
<string name="keywords_ambient_display" msgid="3103487805748659132">"eingehende Benachrichtigung"</string>
@@ -3182,7 +3179,7 @@
<string name="keywords_notification_vibration" msgid="31924624421190547">"Haptik, vibrieren, Empfindlichkeit"</string>
<string name="keywords_battery_saver_sticky" msgid="5586215686021650278">"Energiesparmodus, fixiert, nichtflüchtig, Stromsparfunktion, Akku"</string>
<string name="keywords_battery_saver_schedule" msgid="7358789228486231944">"ablauf, zeitplan, energiesparmodus, stromsparfunktion, akku, automatisch, prozent"</string>
- <string name="keywords_add_an_account" msgid="6488139919428902434">"Arbeitsprofil"</string>
+ <string name="keywords_enhance_4g_lte" msgid="2273810564244790859">"VoLTE, erweiterte Anruffunktionen, 4G-Anrufe"</string>
<string name="default_sound" msgid="8821684447333687810">"Standardton"</string>
<string name="sound_settings_summary" msgid="4100853606668287965">"Klingeltonlautstärke: <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
<string name="sound_dashboard_summary" msgid="3402435125958012986">"Lautstärke, Vibration, Bitte nicht stören"</string>
@@ -3889,7 +3886,6 @@
<string name="permit_draw_overlay" msgid="7456536798718633432">"Einblendung über anderen Apps zulassen"</string>
<string name="allow_overlay_description" msgid="8961670023925421358">"Erlaube, dass diese App über anderen Apps eingeblendet wird. Dies beeinträchtigt möglicherweise deine Nutzung dieser Apps oder ändert deren Darstellung oder Verhalten."</string>
<string name="keywords_vr_listener" msgid="7441221822576384680">"vr virtuelle realität listener stereo hilfe dienst"</string>
- <string name="keywords_system_alert_window" msgid="5049498015597864850">"systemwarnung fenster dialogfeld einblenden über anderen apps"</string>
<string name="overlay_settings" msgid="6930854109449524280">"Über anderen Apps einblenden"</string>
<string name="system_alert_window_summary" msgid="602892301318324492">"<xliff:g id="COUNT_0">%1$d</xliff:g> von <xliff:g id="COUNT_1">%2$d</xliff:g> Apps dürfen über anderen eingeblendet werden"</string>
<string name="filter_overlay_apps" msgid="6965969283342557573">"Apps mit Berechtigung"</string>
@@ -4125,7 +4121,6 @@
<string name="notification_log_details_none" msgid="184131801230614059">"Keine"</string>
<string name="notification_log_details_ranking_null" msgid="244660392058720919">"Das Rangobjekt fehlt."</string>
<string name="notification_log_details_ranking_none" msgid="599607025882587844">"Dieser Schlüssel ist in dem Rangobjekt nicht enthalten."</string>
- <string name="theme_customization_category" msgid="1049181544004163283">"Designs"</string>
<string name="theme_customization_device_default" msgid="5058147707906551368">"Gemäß Standard fürs Gerät"</string>
<string name="display_cutout_emulation" msgid="7466869822418376317">"Display-Aussparung"</string>
<string name="display_cutout_emulation_keywords" msgid="4495418317471622562">"display aussparung, notch"</string>
@@ -4551,6 +4546,8 @@
<string name="network_connection_errorstate_dialog_message" msgid="6953778550775646710">"Ein Fehler ist aufgetreten. Die Anwendung hat die Anfrage zur Auswahl eines Geräts abgebrochen."</string>
<string name="network_connection_connect_successful" msgid="5935510954474494928">"Verbindung hergestellt"</string>
<string name="network_connection_request_dialog_showall" msgid="6938922880244567521">"Alle anzeigen"</string>
+ <string name="network_connection_searching_message" msgid="4638576789450817530">"Gerät wird gesucht…"</string>
+ <string name="network_connection_connecting_message" msgid="3740982406609245654">"Verbindung mit Gerät wird hergestellt…"</string>
<plurals name="show_bluetooth_devices" formatted="false" msgid="1715020480026568408">
<item quantity="other"><xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> Geräte verbunden</item>
<item quantity="one"><xliff:g id="NUMBER_DEVICE_COUNT_0">%1$d</xliff:g> Gerät verbunden</item>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index cf3b9df..9791cbf 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -360,8 +360,6 @@
<string name="security_enable_widgets_disabled_summary" msgid="6392489775303464905">"Απενεργοποιήθηκε από τον διαχειριστή"</string>
<string name="lockdown_settings_title" msgid="7393790212603280213">"Εμφάνιση επιλογής κλειδώματος"</string>
<string name="lockdown_settings_summary" msgid="4359438673563318171">"Προβάλετε την επιλογή του κουμπιού λειτουργίας που απενεργοποιεί το Smart Lock, το ξεκλείδωμα με βιομετρικά χαρακτηριστικά και τις ειδοποιήσεις στην οθόνη κλειδώματος."</string>
- <string name="trust_agents_extend_unlock_title" msgid="2796555263565097031">"Οι παράγ. εμπιστοσ. μόνο επεκτ. το ξεκλ."</string>
- <string name="trust_agents_extend_unlock_summary" msgid="3976344969220255010">"Αν ενεργοποιήσετε την επιλογή, οι παράγοντες εμπιστοσύνης θα διατηρούν τη συσκευή ξεκλείδωτη για μεγαλύτερο χρονικό διάστημα, αλλά δεν θα μπορούν να ξεκλειδώνουν πλέον μια κλειδωμένη συσκευή."</string>
<string name="trust_lost_locks_screen_title" msgid="2992742466966021682">"Κλείδωμα οθόνης όταν χαθεί η εμπιστοσύνη"</string>
<string name="trust_lost_locks_screen_summary" msgid="693784434582021206">"Εάν ενεργοποιηθεί, η συσκευή θα κλειδωθεί όταν χαθεί η εμπιστοσύνη για τον τελευταίο παράγοντα εμπιστοσύνης"</string>
<string name="owner_info_settings_summary" msgid="7472393443779227052">"Κανένα"</string>
@@ -937,6 +935,7 @@
<string name="wifi_eap_identity" msgid="4359453783379679103">"Ταυτότητα"</string>
<string name="wifi_eap_anonymous" msgid="2989469344116577955">"Ανώνυμη ταυτότητα"</string>
<string name="wifi_password" msgid="5948219759936151048">"Κωδικός πρόσβασης"</string>
+ <string name="wifi_sae_password_id" msgid="1697832722221765763">"Αναγνωριστικό κωδ. πρόσβασης SAE"</string>
<string name="wifi_show_password" msgid="6461249871236968884">"Εμφάνιση κωδικού πρόσβασης"</string>
<string name="wifi_ap_band_config" msgid="1611826705989117930">"Επιλέξτε ζώνη σημείου πρόσβασης"</string>
<string name="wifi_ap_choose_auto" msgid="2677800651271769965">"Αυτόματα"</string>
@@ -957,7 +956,6 @@
<string name="wifi_dpp_share_wifi" msgid="9065890131734833809">"Μοιραστείτε το Wi‑Fi"</string>
<string name="wifi_dpp_scan_qr_code_with_another_device" msgid="5854392840857123065">"Σαρώστε αυτόν τον κωδικό QR για σύνδεση στο δίκτυο \"<xliff:g id="SSID">%1$s</xliff:g>\" και κοινοποιήστε τον κωδικό πρόσβασης"</string>
<string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="4436318319178361543">"Σάρωση αυτού του κωδικού QR για σύνδεση στο δίκτυο \"<xliff:g id="SSID">%1$s</xliff:g>\""</string>
- <string name="wifi_dpp_could_not_detect_valid_qr_code" msgid="641893675646330576">"Δεν ήταν δυνατή η ανάγνωση του κωδικού QR. Κεντράρετε ξανά τον κωδικό και δοκιμάστε ξανά"</string>
<string name="wifi_dpp_failure_authentication_or_configuration" msgid="3372757783382381044">"Δοκιμάστε ξανά. Εάν το πρόβλημα παραμένει, επικοινωνήστε με τον κατασκευαστή της συσκευής"</string>
<string name="wifi_dpp_failure_not_compatible" msgid="2829930473520603740">"Παρουσιάστηκε κάποιο πρόβλημα"</string>
<string name="wifi_dpp_failure_timeout" msgid="5228320772245820458">"Βεβαιωθείτε ότι η συσκευή έχει συνδεθεί, έχει φορτιστεί και ενεργοποιηθεί"</string>
@@ -980,6 +978,7 @@
<string name="wifi_dpp_hotspot_password" msgid="4120419278831581613">"Κωδικός πρόσβασης σημείου πρόσβασης Wi-Fi: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
<string name="wifi_dpp_add_device" msgid="4072206063308645677">"Προσθήκη συσκευής"</string>
<string name="wifi_dpp_connect_network_using_qr_code" msgid="3887335309163999665">"Χρησιμοποιήστε έναν κωδικό QR για να προσθέσετε μια συσκευή σε αυτό το δίκτυο"</string>
+ <string name="wifi_dpp_qr_code_is_not_valid_format" msgid="3700087439867692944">"Ο κωδικός QR δεν έχει έγκυρη μορφή"</string>
<string name="retry" msgid="6472609612090877557">"Επανάληψη"</string>
<string name="wifi_shared" msgid="844142443226926070">"Κοινή χρήση με άλλους χρήστες της συσκευής"</string>
<string name="wifi_unchanged" msgid="3410422020930397102">"(δεν έγινε αλλαγή)"</string>
@@ -1129,6 +1128,7 @@
<string name="emergency_address_title" msgid="932729250447887545">"Διεύθυνση έκτακτης ανάγκης"</string>
<string name="emergency_address_summary" msgid="7751971156196115129">"Χρήση ως τοποθεσίας σας όταν πραγματοποιείτε κλήση έκτακτης ανάγκης μέσω Wi‑Fi"</string>
<string name="private_dns_help_message" msgid="3299567069152568958"><annotation id="url">"Περισσότερα"</annotation>" σχετικά με τις λειτουργίες Ιδιωτικού DNS"</string>
+ <string name="private_dns_mode_on" msgid="5882613439541371003">"Ενεργό"</string>
<string name="wifi_calling_pref_managed_by_carrier" msgid="6845711858866828986">"Η διαχείριση της ρύθμισης πραγματοποιείται από την εταιρεία κινητής τηλεφωνίας"</string>
<string name="wifi_calling_settings_activation_instructions" msgid="7492509632478260955">"Ενεργοποίηση Κλήσης Wi-Fi"</string>
<string name="wifi_calling_turn_on" msgid="1171403510313983983">"Ενεργοποίηση Κλήσης Wi-Fi"</string>
@@ -1872,7 +1872,7 @@
<string name="default_emergency_app" msgid="1951760659640369980">"Εφαρμογή έκτακτης ανάγκης"</string>
<string name="reset_app_preferences" msgid="1321050641018356925">"Επαναφ. προτιμ. εφαρμ."</string>
<string name="reset_app_preferences_title" msgid="6093179367325336662">"Επαναφ. προτιμ. εφαρμ;"</string>
- <string name="reset_app_preferences_desc" msgid="4822447731869201512">"Θα γίνει επαναφορά όλων των προτιμήσεων για:\n\n"<li>"Απενεργοποιημένες εφαρμογές"</li>\n<li>"Απενεργοποιημένες ειδοποιήσεις εφ."</li>\n<li>"Προεπιλεγμένες εφ. για ενέργειες"</li>\n<li>"Περιορισμούς δεδ/νων παρασκηνίου για εφ."</li>\n<li>"Τυχόν περιορισμούς αδειών"</li>\n\n" Δεν θα χάσετε δεδομένα εφαρμογών."</string>
+ <string name="reset_app_preferences_desc" msgid="731757609326016760">"Με αυτήν την ενέργεια, θα γίνει επαναφορά όλων των προτιμήσεων για:\n\n"<li>"Απενεργοποιημένες εφαρμογές"</li>\n<li>"Απενεργοποιημένες ειδοποιήσεις εφαρμογών"</li>\n<li>"Προεπιλεγμένες εφαρμογές για ενέργειες"</li>\n<li>"Περιορισμούς δεδομένων παρασκηνίου για εφαρμογές"</li>\n<li>"Τυχόν περιορισμούς αδειών"</li>\n\n"Δεν θα χάσετε τυχόν δεδομένα εφαρμογών."</string>
<string name="reset_app_preferences_button" msgid="2559089511841281242">"Επαναφορά εφαρμογών"</string>
<string name="manage_space_text" msgid="8852711522447794676">"Διαχείριση χώρου"</string>
<string name="filter" msgid="2018011724373033887">"Φίλτρο"</string>
@@ -2087,7 +2087,7 @@
<string name="accessibility_screen_magnification_short_summary" msgid="3411979839172752057">"Πατήστε 3 φορές για εστίαση"</string>
<string name="accessibility_screen_magnification_navbar_short_summary" msgid="3693116360267980492">"Πατήστε ένα κουμπί για εστίαση"</string>
<string name="accessibility_screen_magnification_summary" msgid="5258868553337478505"><b>"Για να κάνετε εστίαση"</b>", πατήστε γρήγορα 3 φορές στην οθόνη.\n"<ul><li>"Σύρετε 2 ή περισσότερα δάχτυλα για να κάνετε κύλιση"</li>\n<li>"Πλησιάστε 2 ή περισσότερα δάχτυλα για να προσαρμόσετε την εστίαση"</li></ul>\n\n<b>"Για προσωρινή εστίαση"</b>", πατήστε γρήγορα 3 φορές στην οθόνη και κρατήστε το δάχτυλό σας πατημένο κατά το τρίτο πάτημα.\n"<ul><li>"Σύρετε για να την μετακινήσετε στην οθόνη"</li>\n<li>"Ανασηκώστε το δάχτυλο για να κάνετε σμίκρυνση"</li></ul>\n\n"Δεν είναι δυνατή η μεγέθυνση στο πληκτρολόγιο ή στη γραμμή πλοήγησης."</string>
- <string name="accessibility_screen_magnification_navbar_summary" msgid="2272878354599332009">"Όταν η μεγέθυνση είναι ενεργοποιημένη, μπορείτε να μεγεθύνετε την οθόνη σας.\n\n"<b>"Για εστίαση "</b>", ανοίξτε τη μεγέθυνση και, στη συνέχεια, πατήστε οπουδήποτε στην οθόνη σας.\n"<ul><li>"• Σύρετε 2 ή περισσότερα δάχτυλα για κύλιση"</li>\n<li>"• Πλησιάστε 2 ή περισσότερα δάχτυλα για να προσαρμόσετε την εστίαση"</li></ul>\n\n<b>"Για προσωρινή εστίαση"</b>", ανοίξτε τη μεγέθυνση και, στη συνέχεια, αγγίξτε παρατεταμένα οπουδήποτε στην οθόνη.\n"<ul><li>"• Σύρετε για να μετακινηθείτε στην οθόνη"</li>\n<li>"• Ανασηκώστε το δάχτυλο για σμίκρυνση"</li></ul>\n\n"Δεν μπορείτε να κάνετε μεγέθυνση στο πληκτρολόγιο ή τη γραμμή πλοήγησης."</string>
+ <string name="accessibility_screen_magnification_navbar_summary" msgid="6700716275347612310">"Όταν η μεγέθυνση είναι ενεργοποιημένη, μπορείτε να μεγεθύνετε την οθόνη σας.\n\n"<b>"Για εστίαση "</b>", ανοίξτε τη μεγέθυνση και, στη συνέχεια, πατήστε οπουδήποτε στην οθόνη σας.\n"<ul><li>"Σύρετε 2 ή περισσότερα δάχτυλα για κύλιση"</li>\n<li>"Πλησιάστε 2 ή περισσότερα δάχτυλα για να προσαρμόσετε την εστίαση"</li></ul>\n\n<b>"Για προσωρινή εστίαση"</b>", ανοίξτε τη μεγέθυνση και, στη συνέχεια, αγγίξτε παρατεταμένα οπουδήποτε στην οθόνη.\n"<ul><li>"Σύρετε για να μετακινηθείτε στην οθόνη"</li>\n<li>"Ανασηκώστε το δάχτυλο για σμίκρυνση"</li></ul>\n\n"Δεν μπορείτε να κάνετε μεγέθυνση στο πληκτρολόγιο ή τη γραμμή πλοήγησης."</string>
<string name="accessibility_tutorial_dialog_title_button" msgid="3682222614034474845">"Χρήση κουμπιού προσβασιμότητας για άνοιγμα"</string>
<string name="accessibility_tutorial_dialog_title_gesture" msgid="1342726230497913398">"Χρήση κίνησης για άνοιγμα"</string>
<string name="accessibility_tutorial_dialog_title_gesture_settings" msgid="8539392614235820285">"Χρήση της νέας κίνησης προσβασιμότητας"</string>
@@ -2140,8 +2140,7 @@
<string name="accessibility_hearingaid_title" msgid="8312145423610648518">"Ακουστικά βοηθήματα"</string>
<string name="accessibility_hearingaid_not_connected_summary" msgid="6240237523789614599">"Δεν έχουν συνδεθεί ακουστικά βοηθήματα"</string>
<string name="accessibility_hearingaid_adding_summary" msgid="2947474468412309778">"Προσθήκη βοηθημάτων ακοής"</string>
- <string name="accessibility_hearingaid_pair_instructions_first_message" msgid="3912093691643131154">"Για να κάνετε σύζευξη των ακουστικών βοηθημάτων σας, βρείτε και πατήστε τη συσκευή σας στην επόμενη οθόνη."</string>
- <string name="accessibility_hearingaid_pair_instructions_second_message" msgid="5596683393607650243">"Βεβαιωθείτε ότι τα ακουστικά βοηθήματά σας βρίσκονται σε λειτουργία σύζευξης."</string>
+ <string name="accessibility_hearingaid_pair_instructions_message" msgid="3094382949733435414">"Για να κάνετε σύζευξη των βοηθημάτων ακοής σας, βρείτε και πατήστε τη συσκευή σας στην επόμενη οθόνη. Βεβαιωθείτε ότι τα ακουστικά βοηθήματά σας βρίσκονται σε λειτουργία σύζευξης."</string>
<string name="accessibility_hearingaid_active_device_summary" msgid="3924362383258688984">"Η συσκευή <xliff:g id="DEVICE_NAME">%1$s</xliff:g> είναι ενεργοποιημένη"</string>
<plurals name="show_number_hearingaid_count" formatted="false" msgid="3160782397139295486">
<item quantity="other"><xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> αποθηκευμένα ακουστικά βοηθήματα</item>
@@ -2490,7 +2489,6 @@
<string name="menu_stats_last_unplugged" msgid="5922246077592434526">"Από την τελευταία αποσύνδεση για <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
<string name="menu_stats_total" msgid="8973377864854807854">"Συνολικές τιμές χρήσης"</string>
<string name="menu_stats_refresh" msgid="1676215433344981075">"Ανανέωση"</string>
- <string name="process_kernel_label" msgid="3916858646836739323">"Λειτουργικό σύστημα Android"</string>
<string name="process_mediaserver_label" msgid="6500382062945689285">"Mediaserver"</string>
<string name="process_dex2oat_label" msgid="2592408651060518226">"Βελτιστοποίηση εφαρμογών"</string>
<string name="battery_saver" msgid="8172485772238572153">"Εξοικονόμηση μπαταρίας"</string>
@@ -2621,8 +2619,6 @@
<string name="no_device_admins" msgid="4846602835339095768">"Δεν υπάρχουν διαθέσιμες εφαρμογές διαχειριστή συσκευής"</string>
<string name="personal_device_admin_title" msgid="2849617316347669861">"Προσωπική"</string>
<string name="managed_device_admin_title" msgid="7853955652864478435">"Εργασία"</string>
- <string name="sms_access_restriction_enabled" msgid="7054488078710530278">"Περιορ. πρόσβασης σε αρχεία καταγρ SMS και κλήσεων"</string>
- <string name="sms_access_restriction_enabled_summary" msgid="6851339654677842328">"Μόνο οι προεπιλεγμένες εφαρμογές τηλεφώνου και ανταλλαγής μηνυμάτων έχουν άδειες καταγραφής SMS και κλήσεων"</string>
<string name="no_trust_agents" msgid="7450273545568977523">"Δεν υπάρχουν διαθέσιμοι trust agents"</string>
<string name="add_device_admin_msg" msgid="1501847129819382149">"Ενεργοπ. εφαρμογής διαχειριστή συσκευής;"</string>
<string name="add_device_admin" msgid="4192055385312215731">"Ενεργοποίηση αυτής της εφαρμογής διαχειριστή συσκευής"</string>
@@ -3111,7 +3107,7 @@
<string name="keywords_app_default" msgid="5822717006354487071">"Άνοιγμα με"</string>
<string name="keywords_applications_settings" msgid="1268353611121497450">"Εφαρμογές"</string>
<string name="keywords_time_zone" msgid="998254736898753085">"ζώνη ώρας"</string>
- <string name="keywords_draw_overlay" msgid="4130899177619041842">"Εικονίδιο συζήτησης"</string>
+ <string name="keywords_draw_overlay" msgid="1001120206241401007">"Εικονίδιο συζήτησης, σύστημα, ειδοποίηση, παράθυρο, παράθυρο διαλόγου, οθόνη, πάνω από άλλες εφαρμογές, σχεδίαση"</string>
<string name="keywords_flashlight" msgid="6161632177705233710">"Φακός, λυχνία, φως"</string>
<string name="keywords_change_wifi_state" msgid="627068244033681010">"wifi, wi-fi, ενλλαγή, έλεγχος"</string>
<string name="keywords_more_mobile_networks" msgid="8995946622054642367">"δίκτυο κινητής τηλεφωνίας, εταιρεία κινητής τηλεφωνίας, ασύρματο, δεδομένα, 4g, 3g, 2g, lte"</string>
@@ -3135,7 +3131,7 @@
<string name="keywords_sounds_and_notifications_interruptions" msgid="5426093074031208917">"μην μην ενοχλείτε, διακόπτω, διακοπή, διάλειμμα"</string>
<string name="keywords_app" msgid="6334757056536837791">"RAM"</string>
<string name="keywords_location" msgid="4132655528196729043">"nearby, τοποθεσία, ιστορικό, αναφορές, GPS"</string>
- <string name="keywords_accounts" msgid="1957925565953357627">"λογαριασμός"</string>
+ <string name="keywords_accounts" msgid="4479029747403203867">"λογαριασμός, προσθέστε έναν λογαριασμό, προφίλ εργασίας"</string>
<string name="keywords_users" msgid="3434190133131387942">"περιορισμός, περιορίζω, περιορισμένο"</string>
<string name="keywords_keyboard_and_ime" msgid="9143339015329957107">"διόρθωση κειμένου, διόρθωση, ήχος, δόνηση, αυτόματο, γλώσσα, κίνηση, προτείνω, πρόταση, θέμα, προσβλητικό, λέξη, πληκτρολόγηση, emoji, διεθνές"</string>
<string name="keywords_reset_apps" msgid="5293291209613191845">"επαναφορά, προτιμήσεις, προεπιλογή"</string>
@@ -3173,6 +3169,7 @@
<string name="keywords_storage_settings" msgid="297283751968446577">"μνήμη, κρυφή μνήμη, δεδομένα, διαγραφή, απαλοιφή, δωρεάν, χώρος"</string>
<string name="keywords_bluetooth_settings" msgid="6804844062789439858">"συνδεδεμένο, συσκευή, ακουστικά, ακουστικό, ηχείο, ασύρματο, σύζευξη, ακουστικά ψείρες, μουσική, μέσα"</string>
<string name="keywords_wallpaper" msgid="5058364390917429896">"φόντο, οθόνη, οθόνη κλειδώματος, θέμα"</string>
+ <string name="keywords_styles" msgid="5828725481814049422">"σχήμα εικονιδίου, χρώμα έμφασης, γραμματοσειρά"</string>
<string name="keywords_assist_input" msgid="5017533309492679287">"προεπιλογή, βοηθός"</string>
<string name="keywords_default_payment_app" msgid="3838565809518896799">"πληρωμή, προεπιλογή"</string>
<string name="keywords_ambient_display" msgid="3103487805748659132">"εισερχόμενη ειδοποίηση"</string>
@@ -3182,7 +3179,7 @@
<string name="keywords_notification_vibration" msgid="31924624421190547">"απτική, δόνηση, ευαισθησία"</string>
<string name="keywords_battery_saver_sticky" msgid="5586215686021650278">"εξοικονόμηση μπαταρίας, σταθερή, μόνιμη, εξοικονόμηση ενέργειας, μπαταρία"</string>
<string name="keywords_battery_saver_schedule" msgid="7358789228486231944">"ρουτίνα, χρονοδιάγραμμα, εξοικονόμηση μπαταρίας, εξοικονόμηση ενέργειας, μπαταρία, αυτόματα, ποσοστό"</string>
- <string name="keywords_add_an_account" msgid="6488139919428902434">"προφίλ εργασίας"</string>
+ <string name="keywords_enhance_4g_lte" msgid="2273810564244790859">"volte, σύνθετες λειτουργίες κλήσης, κλήσεις 4g"</string>
<string name="default_sound" msgid="8821684447333687810">"Προεπιλεγμένος ήχος"</string>
<string name="sound_settings_summary" msgid="4100853606668287965">"Ένταση ήχου κλήσης στο <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
<string name="sound_dashboard_summary" msgid="3402435125958012986">"Ένταση ήχου, δόνηση, λειτουργία \"Μην ενοχλείτε\""</string>
@@ -3889,7 +3886,6 @@
<string name="permit_draw_overlay" msgid="7456536798718633432">"Να επιτρέπεται η εμφάνιση πάνω σε άλλες εφαρμογές"</string>
<string name="allow_overlay_description" msgid="8961670023925421358">"Επιτρέψτε σε αυτήν την εφαρμογή να εμφανίζεται πάνω από άλλες εφαρμογές που χρησιμοποιείτε. Μπορεί να επηρεάσει τη χρήση αυτών των εφαρμογών ή να αλλάξει τον τρόπο εμφάνισης ή συμπεριφοράς τους."</string>
<string name="keywords_vr_listener" msgid="7441221822576384680">"βοηθητική υπηρεσία στερεοφωνική ακρόαση εικονική πραγματικότητα vr"</string>
- <string name="keywords_system_alert_window" msgid="5049498015597864850">"εμφάνιση πλαισίου διαλόγου παράθυρου ειδοποίησης συστήματος πάνω από άλλες εφαρμογές"</string>
<string name="overlay_settings" msgid="6930854109449524280">"Εμφάνιση πάνω σε άλλες εφαρμογές"</string>
<string name="system_alert_window_summary" msgid="602892301318324492">"<xliff:g id="COUNT_0">%1$d</xliff:g> από τις <xliff:g id="COUNT_1">%2$d</xliff:g> εφαρμογές μπορούν να εμφανίζονται πάνω σε άλλες"</string>
<string name="filter_overlay_apps" msgid="6965969283342557573">"Εφαρμογές με άδεια"</string>
@@ -4125,7 +4121,6 @@
<string name="notification_log_details_none" msgid="184131801230614059">"κανένα"</string>
<string name="notification_log_details_ranking_null" msgid="244660392058720919">"Το αντικείμενο κατάταξης λείπει."</string>
<string name="notification_log_details_ranking_none" msgid="599607025882587844">"Το αντικείμενο κατάταξης δεν περιέχει αυτό το κλειδί."</string>
- <string name="theme_customization_category" msgid="1049181544004163283">"Χρήση θεμάτων"</string>
<string name="theme_customization_device_default" msgid="5058147707906551368">"Προεπιλογή συσκευής"</string>
<string name="display_cutout_emulation" msgid="7466869822418376317">"Εγκοπή οθόνης"</string>
<string name="display_cutout_emulation_keywords" msgid="4495418317471622562">"διακοπή οθόνης, εγκοπή"</string>
@@ -4551,6 +4546,8 @@
<string name="network_connection_errorstate_dialog_message" msgid="6953778550775646710">"Παρουσιάστηκε κάποιο πρόβλημα. Η εφαρμογή ακύρωσε το αίτημα για επιλογή συσκευής."</string>
<string name="network_connection_connect_successful" msgid="5935510954474494928">"Η σύνδεση είναι επιτυχής"</string>
<string name="network_connection_request_dialog_showall" msgid="6938922880244567521">"Εμφάνιση όλων"</string>
+ <string name="network_connection_searching_message" msgid="4638576789450817530">"Αναζήτηση συσκευής…"</string>
+ <string name="network_connection_connecting_message" msgid="3740982406609245654">"Σύνδεση με συσκευή…"</string>
<plurals name="show_bluetooth_devices" formatted="false" msgid="1715020480026568408">
<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>
diff --git a/res/values-en-rAU/strings.xml b/res/values-en-rAU/strings.xml
index cb16122..c54a59c 100644
--- a/res/values-en-rAU/strings.xml
+++ b/res/values-en-rAU/strings.xml
@@ -360,8 +360,6 @@
<string name="security_enable_widgets_disabled_summary" msgid="6392489775303464905">"Disabled by admin"</string>
<string name="lockdown_settings_title" msgid="7393790212603280213">"Show lockdown option"</string>
<string name="lockdown_settings_summary" msgid="4359438673563318171">"Display power button option that turns off Smart Lock, biometric unlocking and notifications on the lock screen"</string>
- <string name="trust_agents_extend_unlock_title" msgid="2796555263565097031">"Trust agents only extend unlock"</string>
- <string name="trust_agents_extend_unlock_summary" msgid="3976344969220255010">"If enabled, trust agents will keep your device unlocked for longer, but can no longer unlock a locked device."</string>
<string name="trust_lost_locks_screen_title" msgid="2992742466966021682">"Lock screen when trust is lost"</string>
<string name="trust_lost_locks_screen_summary" msgid="693784434582021206">"If enabled, the device will lock when the last trust agent loses trust"</string>
<string name="owner_info_settings_summary" msgid="7472393443779227052">"None"</string>
@@ -937,6 +935,7 @@
<string name="wifi_eap_identity" msgid="4359453783379679103">"Identity"</string>
<string name="wifi_eap_anonymous" msgid="2989469344116577955">"Anonymous identity"</string>
<string name="wifi_password" msgid="5948219759936151048">"Password"</string>
+ <string name="wifi_sae_password_id" msgid="1697832722221765763">"SAE password identifier"</string>
<string name="wifi_show_password" msgid="6461249871236968884">"Show password"</string>
<string name="wifi_ap_band_config" msgid="1611826705989117930">"Select AP band"</string>
<string name="wifi_ap_choose_auto" msgid="2677800651271769965">"Auto"</string>
@@ -957,7 +956,6 @@
<string name="wifi_dpp_share_wifi" msgid="9065890131734833809">"Share Wi‑Fi"</string>
<string name="wifi_dpp_scan_qr_code_with_another_device" msgid="5854392840857123065">"Scan this QR code to connect to \'<xliff:g id="SSID">%1$s</xliff:g>\' and share the password"</string>
<string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="4436318319178361543">"Scan this QR code to connect to \'<xliff:g id="SSID">%1$s</xliff:g>\'"</string>
- <string name="wifi_dpp_could_not_detect_valid_qr_code" msgid="641893675646330576">"Couldn’t read QR code. Re-centre code and try again"</string>
<string name="wifi_dpp_failure_authentication_or_configuration" msgid="3372757783382381044">"Try again. If the issue continues, contact the device manufacturer"</string>
<string name="wifi_dpp_failure_not_compatible" msgid="2829930473520603740">"Something went wrong"</string>
<string name="wifi_dpp_failure_timeout" msgid="5228320772245820458">"Make sure that the device has been plugged in, charged and turned on"</string>
@@ -980,6 +978,7 @@
<string name="wifi_dpp_hotspot_password" msgid="4120419278831581613">"Hotspot password: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
<string name="wifi_dpp_add_device" msgid="4072206063308645677">"Add device"</string>
<string name="wifi_dpp_connect_network_using_qr_code" msgid="3887335309163999665">"Use a QR code to add a device to this network"</string>
+ <string name="wifi_dpp_qr_code_is_not_valid_format" msgid="3700087439867692944">"QR code isn\'t a valid format"</string>
<string name="retry" msgid="6472609612090877557">"Retry"</string>
<string name="wifi_shared" msgid="844142443226926070">"Share with other device users"</string>
<string name="wifi_unchanged" msgid="3410422020930397102">"(unchanged)"</string>
@@ -1129,6 +1128,7 @@
<string name="emergency_address_title" msgid="932729250447887545">"Emergency Address"</string>
<string name="emergency_address_summary" msgid="7751971156196115129">"Used as your location when you make an emergency call over Wi‑Fi"</string>
<string name="private_dns_help_message" msgid="3299567069152568958"><annotation id="url">"Learn more"</annotation>" about Private DNS features"</string>
+ <string name="private_dns_mode_on" msgid="5882613439541371003">"On"</string>
<string name="wifi_calling_pref_managed_by_carrier" msgid="6845711858866828986">"Setting managed by operator"</string>
<string name="wifi_calling_settings_activation_instructions" msgid="7492509632478260955">"Activate Wi‑Fi Calling"</string>
<string name="wifi_calling_turn_on" msgid="1171403510313983983">"Turn on Wi‑Fi calling"</string>
@@ -1872,7 +1872,7 @@
<string name="default_emergency_app" msgid="1951760659640369980">"Emergency app"</string>
<string name="reset_app_preferences" msgid="1321050641018356925">"Reset app preferences"</string>
<string name="reset_app_preferences_title" msgid="6093179367325336662">"Reset app preferences?"</string>
- <string name="reset_app_preferences_desc" msgid="4822447731869201512">"This will reset all preferences for:\n\n"<li>"Disabled apps"</li>\n<li>"Disabled app notifications"</li>\n<li>"Default applications for actions"</li>\n<li>"Background data restrictions for apps"</li>\n<li>"Any permission restrictions"</li>\n\n"You will not lose any app data."</string>
+ <string name="reset_app_preferences_desc" msgid="731757609326016760">"This will reset all preferences for:\n\n"<li>"Disabled apps"</li>\n<li>"Disabled app notifications"</li>\n<li>"Default applications for actions"</li>\n<li>"Background data restrictions for apps"</li>\n<li>"Any permission restrictions"</li>\n\n"You will not lose any app data."</string>
<string name="reset_app_preferences_button" msgid="2559089511841281242">"Reset apps"</string>
<string name="manage_space_text" msgid="8852711522447794676">"Manage space"</string>
<string name="filter" msgid="2018011724373033887">"Filter"</string>
@@ -2087,7 +2087,7 @@
<string name="accessibility_screen_magnification_short_summary" msgid="3411979839172752057">"Tap 3 times to zoom"</string>
<string name="accessibility_screen_magnification_navbar_short_summary" msgid="3693116360267980492">"Tap a button to zoom"</string>
<string name="accessibility_screen_magnification_summary" msgid="5258868553337478505"><b>"To zoom"</b>", quickly tap the screen 3 times.\n"<ul><li>"Drag 2 or more fingers to scroll"</li>\n<li>"Pinch 2 or more fingers to adjust zoom"</li></ul>\n\n<b>"To zoom temporarily"</b>", quickly tap the screen 3 times and hold down your finger on the third tap.\n"<ul><li>"Drag to move around the screen"</li>\n<li>"Lift finger to zoom out"</li></ul>\n\n"You can\'t zoom in on the keyboard and navigation bar."</string>
- <string name="accessibility_screen_magnification_navbar_summary" msgid="2272878354599332009">"When magnification is turned on, you can zoom in on your screen.\n\n"<b>"To zoom"</b>", start magnification, then tap anywhere on the screen.\n"<ul><li>"• Drag two or more fingers to scroll"</li>\n<li>"• Pinch two or more fingers to adjust zoom"</li></ul>\n\n<b>"To zoom temporarily"</b>", start magnification, then touch & hold anywhere on the screen.\n"<ul><li>"• Drag to move around the screen"</li>\n<li>"• Lift finger to zoom out"</li></ul>\n\n"You can’t zoom in on the keyboard or navigation bar."</string>
+ <string name="accessibility_screen_magnification_navbar_summary" msgid="6700716275347612310">"When magnification is turned on, you can zoom in on your screen.\n\n"<b>"To zoom"</b>", start magnification, then tap anywhere on the screen.\n"<ul><li>"Drag 2 or more fingers to scroll"</li>\n<li>"Pinch 2 or more fingers to adjust zoom"</li></ul>\n\n<b>"To zoom temporarily"</b>", start magnification, then touch and hold anywhere on the screen.\n"<ul><li>"Drag to move around the screen"</li>\n<li>"Lift finger to zoom out"</li></ul>\n\n"You can’t zoom in on the keyboard or navigation bar."</string>
<string name="accessibility_tutorial_dialog_title_button" msgid="3682222614034474845">"Use accessibility button to open"</string>
<string name="accessibility_tutorial_dialog_title_gesture" msgid="1342726230497913398">"Use gesture to open"</string>
<string name="accessibility_tutorial_dialog_title_gesture_settings" msgid="8539392614235820285">"Use new accessibility gesture"</string>
@@ -2140,8 +2140,7 @@
<string name="accessibility_hearingaid_title" msgid="8312145423610648518">"Hearing aids"</string>
<string name="accessibility_hearingaid_not_connected_summary" msgid="6240237523789614599">"No hearing aids connected"</string>
<string name="accessibility_hearingaid_adding_summary" msgid="2947474468412309778">"Add hearing aids"</string>
- <string name="accessibility_hearingaid_pair_instructions_first_message" msgid="3912093691643131154">"To pair your hearing aids, find and tap your device on the next screen."</string>
- <string name="accessibility_hearingaid_pair_instructions_second_message" msgid="5596683393607650243">"Make sure that your hearing aids are in pairing mode."</string>
+ <string name="accessibility_hearingaid_pair_instructions_message" msgid="3094382949733435414">"To pair your hearing aids, find and tap your device on the next screen. Make sure that your hearing aids are in pairing mode."</string>
<string name="accessibility_hearingaid_active_device_summary" msgid="3924362383258688984">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> active"</string>
<plurals name="show_number_hearingaid_count" formatted="false" msgid="3160782397139295486">
<item quantity="other"><xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> saved hearing aids</item>
@@ -2490,7 +2489,6 @@
<string name="menu_stats_last_unplugged" msgid="5922246077592434526">"While last for unplugged for <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
<string name="menu_stats_total" msgid="8973377864854807854">"Usage totals"</string>
<string name="menu_stats_refresh" msgid="1676215433344981075">"Refresh"</string>
- <string name="process_kernel_label" msgid="3916858646836739323">"Android OS"</string>
<string name="process_mediaserver_label" msgid="6500382062945689285">"Media server"</string>
<string name="process_dex2oat_label" msgid="2592408651060518226">"App optimisation"</string>
<string name="battery_saver" msgid="8172485772238572153">"Battery Saver"</string>
@@ -2621,8 +2619,6 @@
<string name="no_device_admins" msgid="4846602835339095768">"No device admin apps available"</string>
<string name="personal_device_admin_title" msgid="2849617316347669861">"Personal"</string>
<string name="managed_device_admin_title" msgid="7853955652864478435">"Work"</string>
- <string name="sms_access_restriction_enabled" msgid="7054488078710530278">"Restrict SMS & call log access"</string>
- <string name="sms_access_restriction_enabled_summary" msgid="6851339654677842328">"Only default phone and messaging apps have SMS & call log permissions"</string>
<string name="no_trust_agents" msgid="7450273545568977523">"No available trust agents"</string>
<string name="add_device_admin_msg" msgid="1501847129819382149">"Activate device admin app?"</string>
<string name="add_device_admin" msgid="4192055385312215731">"Activate this device admin app"</string>
@@ -3111,7 +3107,7 @@
<string name="keywords_app_default" msgid="5822717006354487071">"Open with"</string>
<string name="keywords_applications_settings" msgid="1268353611121497450">"Applications"</string>
<string name="keywords_time_zone" msgid="998254736898753085">"time zone"</string>
- <string name="keywords_draw_overlay" msgid="4130899177619041842">"Chat head"</string>
+ <string name="keywords_draw_overlay" msgid="1001120206241401007">"Chat head, system, alert, window, dialogue, display, on top other apps, draw"</string>
<string name="keywords_flashlight" msgid="6161632177705233710">"Flashlight, Light, Torch"</string>
<string name="keywords_change_wifi_state" msgid="627068244033681010">"wifi, wi-fi, toggle, control"</string>
<string name="keywords_more_mobile_networks" msgid="8995946622054642367">"mobile, mobile operator, wireless, data, 4g,3g, 2g, lte"</string>
@@ -3135,7 +3131,7 @@
<string name="keywords_sounds_and_notifications_interruptions" msgid="5426093074031208917">"don\'t disturb, interrupt, interruption, break"</string>
<string name="keywords_app" msgid="6334757056536837791">"RAM"</string>
<string name="keywords_location" msgid="4132655528196729043">"nearby, location, history, reporting, GPS"</string>
- <string name="keywords_accounts" msgid="1957925565953357627">"account"</string>
+ <string name="keywords_accounts" msgid="4479029747403203867">"account, add an account, work profile"</string>
<string name="keywords_users" msgid="3434190133131387942">"restriction, restrict, restricted"</string>
<string name="keywords_keyboard_and_ime" msgid="9143339015329957107">"text correction, correct, sound, vibrate, auto, language, gesture, suggest, suggestion, theme, offensive, word, type, emoji, international"</string>
<string name="keywords_reset_apps" msgid="5293291209613191845">"reset, preferences, default"</string>
@@ -3173,6 +3169,7 @@
<string name="keywords_storage_settings" msgid="297283751968446577">"memory, cache, data, delete, clear, free, space"</string>
<string name="keywords_bluetooth_settings" msgid="6804844062789439858">"connected, device, headphones, headset, speaker, wireless, pair, earbuds, music, media"</string>
<string name="keywords_wallpaper" msgid="5058364390917429896">"background, screen, lockscreen, theme"</string>
+ <string name="keywords_styles" msgid="5828725481814049422">"icon shape, accent colour, font"</string>
<string name="keywords_assist_input" msgid="5017533309492679287">"default, assistant"</string>
<string name="keywords_default_payment_app" msgid="3838565809518896799">"payment, default"</string>
<string name="keywords_ambient_display" msgid="3103487805748659132">"incoming notification"</string>
@@ -3182,7 +3179,7 @@
<string name="keywords_notification_vibration" msgid="31924624421190547">"haptics, vibrate, sensitivity"</string>
<string name="keywords_battery_saver_sticky" msgid="5586215686021650278">"battery saver, sticky, persist, power saver, battery"</string>
<string name="keywords_battery_saver_schedule" msgid="7358789228486231944">"routine, schedule, battery saver, power saver, battery, automatic, per cent"</string>
- <string name="keywords_add_an_account" msgid="6488139919428902434">"work profile"</string>
+ <string name="keywords_enhance_4g_lte" msgid="2273810564244790859">"VoLTE, advanced calling, 4G calling"</string>
<string name="default_sound" msgid="8821684447333687810">"Default sound"</string>
<string name="sound_settings_summary" msgid="4100853606668287965">"Ring volume at <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
<string name="sound_dashboard_summary" msgid="3402435125958012986">"Volume, vibration, Do Not Disturb"</string>
@@ -3889,7 +3886,6 @@
<string name="permit_draw_overlay" msgid="7456536798718633432">"Allow display over other apps"</string>
<string name="allow_overlay_description" msgid="8961670023925421358">"Allow this app to display on top of other apps that you’re using. It may interfere with your use of those apps or change the way they seem to appear or behave."</string>
<string name="keywords_vr_listener" msgid="7441221822576384680">"VR virtual reality listener stereo helper service"</string>
- <string name="keywords_system_alert_window" msgid="5049498015597864850">"system alert window dialogue display on top of other apps"</string>
<string name="overlay_settings" msgid="6930854109449524280">"Display over other apps"</string>
<string name="system_alert_window_summary" msgid="602892301318324492">"<xliff:g id="COUNT_0">%1$d</xliff:g> of <xliff:g id="COUNT_1">%2$d</xliff:g> apps allowed to display over other apps"</string>
<string name="filter_overlay_apps" msgid="6965969283342557573">"Apps with permission"</string>
@@ -4125,7 +4121,6 @@
<string name="notification_log_details_none" msgid="184131801230614059">"None"</string>
<string name="notification_log_details_ranking_null" msgid="244660392058720919">"Ranking object is missing."</string>
<string name="notification_log_details_ranking_none" msgid="599607025882587844">"Ranking object doesn\'t contain this key."</string>
- <string name="theme_customization_category" msgid="1049181544004163283">"Theming"</string>
<string name="theme_customization_device_default" msgid="5058147707906551368">"Device default"</string>
<string name="display_cutout_emulation" msgid="7466869822418376317">"Display cutout"</string>
<string name="display_cutout_emulation_keywords" msgid="4495418317471622562">"display cutout, notch"</string>
@@ -4551,6 +4546,8 @@
<string name="network_connection_errorstate_dialog_message" msgid="6953778550775646710">"Something came up. The application has cancelled the request to choose a device."</string>
<string name="network_connection_connect_successful" msgid="5935510954474494928">"Connection successful"</string>
<string name="network_connection_request_dialog_showall" msgid="6938922880244567521">"Show all"</string>
+ <string name="network_connection_searching_message" msgid="4638576789450817530">"Searching for device…"</string>
+ <string name="network_connection_connecting_message" msgid="3740982406609245654">"Connecting to device…"</string>
<plurals name="show_bluetooth_devices" formatted="false" msgid="1715020480026568408">
<item quantity="other"><xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> devices connected</item>
<item quantity="one"><xliff:g id="NUMBER_DEVICE_COUNT_0">%1$d</xliff:g> device connected</item>
diff --git a/res/values-en-rCA/strings.xml b/res/values-en-rCA/strings.xml
index f412e86..0bdd5a9 100644
--- a/res/values-en-rCA/strings.xml
+++ b/res/values-en-rCA/strings.xml
@@ -360,8 +360,6 @@
<string name="security_enable_widgets_disabled_summary" msgid="6392489775303464905">"Disabled by admin"</string>
<string name="lockdown_settings_title" msgid="7393790212603280213">"Show lockdown option"</string>
<string name="lockdown_settings_summary" msgid="4359438673563318171">"Display power button option that turns off Smart Lock, biometric unlocking and notifications on the lock screen"</string>
- <string name="trust_agents_extend_unlock_title" msgid="2796555263565097031">"Trust agents only extend unlock"</string>
- <string name="trust_agents_extend_unlock_summary" msgid="3976344969220255010">"If enabled, trust agents will keep your device unlocked for longer, but can no longer unlock a locked device."</string>
<string name="trust_lost_locks_screen_title" msgid="2992742466966021682">"Lock screen when trust is lost"</string>
<string name="trust_lost_locks_screen_summary" msgid="693784434582021206">"If enabled, the device will lock when the last trust agent loses trust"</string>
<string name="owner_info_settings_summary" msgid="7472393443779227052">"None"</string>
@@ -937,6 +935,7 @@
<string name="wifi_eap_identity" msgid="4359453783379679103">"Identity"</string>
<string name="wifi_eap_anonymous" msgid="2989469344116577955">"Anonymous identity"</string>
<string name="wifi_password" msgid="5948219759936151048">"Password"</string>
+ <string name="wifi_sae_password_id" msgid="1697832722221765763">"SAE password identifier"</string>
<string name="wifi_show_password" msgid="6461249871236968884">"Show password"</string>
<string name="wifi_ap_band_config" msgid="1611826705989117930">"Select AP band"</string>
<string name="wifi_ap_choose_auto" msgid="2677800651271769965">"Auto"</string>
@@ -957,7 +956,6 @@
<string name="wifi_dpp_share_wifi" msgid="9065890131734833809">"Share Wi‑Fi"</string>
<string name="wifi_dpp_scan_qr_code_with_another_device" msgid="5854392840857123065">"Scan this QR code to connect to \'<xliff:g id="SSID">%1$s</xliff:g>\' and share the password"</string>
<string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="4436318319178361543">"Scan this QR code to connect to \'<xliff:g id="SSID">%1$s</xliff:g>\'"</string>
- <string name="wifi_dpp_could_not_detect_valid_qr_code" msgid="641893675646330576">"Couldn’t read QR code. Re-centre code and try again"</string>
<string name="wifi_dpp_failure_authentication_or_configuration" msgid="3372757783382381044">"Try again. If the issue continues, contact the device manufacturer"</string>
<string name="wifi_dpp_failure_not_compatible" msgid="2829930473520603740">"Something went wrong"</string>
<string name="wifi_dpp_failure_timeout" msgid="5228320772245820458">"Make sure that the device has been plugged in, charged and turned on"</string>
@@ -980,6 +978,7 @@
<string name="wifi_dpp_hotspot_password" msgid="4120419278831581613">"Hotspot password: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
<string name="wifi_dpp_add_device" msgid="4072206063308645677">"Add device"</string>
<string name="wifi_dpp_connect_network_using_qr_code" msgid="3887335309163999665">"Use a QR code to add a device to this network"</string>
+ <string name="wifi_dpp_qr_code_is_not_valid_format" msgid="3700087439867692944">"QR code isn\'t a valid format"</string>
<string name="retry" msgid="6472609612090877557">"Retry"</string>
<string name="wifi_shared" msgid="844142443226926070">"Share with other device users"</string>
<string name="wifi_unchanged" msgid="3410422020930397102">"(unchanged)"</string>
@@ -1129,6 +1128,7 @@
<string name="emergency_address_title" msgid="932729250447887545">"Emergency Address"</string>
<string name="emergency_address_summary" msgid="7751971156196115129">"Used as your location when you make an emergency call over Wi‑Fi"</string>
<string name="private_dns_help_message" msgid="3299567069152568958"><annotation id="url">"Learn more"</annotation>" about Private DNS features"</string>
+ <string name="private_dns_mode_on" msgid="5882613439541371003">"On"</string>
<string name="wifi_calling_pref_managed_by_carrier" msgid="6845711858866828986">"Setting managed by operator"</string>
<string name="wifi_calling_settings_activation_instructions" msgid="7492509632478260955">"Activate Wi‑Fi Calling"</string>
<string name="wifi_calling_turn_on" msgid="1171403510313983983">"Turn on Wi‑Fi calling"</string>
@@ -1872,7 +1872,7 @@
<string name="default_emergency_app" msgid="1951760659640369980">"Emergency app"</string>
<string name="reset_app_preferences" msgid="1321050641018356925">"Reset app preferences"</string>
<string name="reset_app_preferences_title" msgid="6093179367325336662">"Reset app preferences?"</string>
- <string name="reset_app_preferences_desc" msgid="4822447731869201512">"This will reset all preferences for:\n\n"<li>"Disabled apps"</li>\n<li>"Disabled app notifications"</li>\n<li>"Default applications for actions"</li>\n<li>"Background data restrictions for apps"</li>\n<li>"Any permission restrictions"</li>\n\n"You will not lose any app data."</string>
+ <string name="reset_app_preferences_desc" msgid="731757609326016760">"This will reset all preferences for:\n\n"<li>"Disabled apps"</li>\n<li>"Disabled app notifications"</li>\n<li>"Default applications for actions"</li>\n<li>"Background data restrictions for apps"</li>\n<li>"Any permission restrictions"</li>\n\n"You will not lose any app data."</string>
<string name="reset_app_preferences_button" msgid="2559089511841281242">"Reset apps"</string>
<string name="manage_space_text" msgid="8852711522447794676">"Manage space"</string>
<string name="filter" msgid="2018011724373033887">"Filter"</string>
@@ -2087,7 +2087,7 @@
<string name="accessibility_screen_magnification_short_summary" msgid="3411979839172752057">"Tap 3 times to zoom"</string>
<string name="accessibility_screen_magnification_navbar_short_summary" msgid="3693116360267980492">"Tap a button to zoom"</string>
<string name="accessibility_screen_magnification_summary" msgid="5258868553337478505"><b>"To zoom"</b>", quickly tap the screen 3 times.\n"<ul><li>"Drag 2 or more fingers to scroll"</li>\n<li>"Pinch 2 or more fingers to adjust zoom"</li></ul>\n\n<b>"To zoom temporarily"</b>", quickly tap the screen 3 times and hold down your finger on the third tap.\n"<ul><li>"Drag to move around the screen"</li>\n<li>"Lift finger to zoom out"</li></ul>\n\n"You can\'t zoom in on the keyboard and navigation bar."</string>
- <string name="accessibility_screen_magnification_navbar_summary" msgid="2272878354599332009">"When magnification is turned on, you can zoom in on your screen.\n\n"<b>"To zoom"</b>", start magnification, then tap anywhere on the screen.\n"<ul><li>"• Drag two or more fingers to scroll"</li>\n<li>"• Pinch two or more fingers to adjust zoom"</li></ul>\n\n<b>"To zoom temporarily"</b>", start magnification, then touch & hold anywhere on the screen.\n"<ul><li>"• Drag to move around the screen"</li>\n<li>"• Lift finger to zoom out"</li></ul>\n\n"You can’t zoom in on the keyboard or navigation bar."</string>
+ <string name="accessibility_screen_magnification_navbar_summary" msgid="6700716275347612310">"When magnification is turned on, you can zoom in on your screen.\n\n"<b>"To zoom"</b>", start magnification, then tap anywhere on the screen.\n"<ul><li>"Drag 2 or more fingers to scroll"</li>\n<li>"Pinch 2 or more fingers to adjust zoom"</li></ul>\n\n<b>"To zoom temporarily"</b>", start magnification, then touch and hold anywhere on the screen.\n"<ul><li>"Drag to move around the screen"</li>\n<li>"Lift finger to zoom out"</li></ul>\n\n"You can’t zoom in on the keyboard or navigation bar."</string>
<string name="accessibility_tutorial_dialog_title_button" msgid="3682222614034474845">"Use accessibility button to open"</string>
<string name="accessibility_tutorial_dialog_title_gesture" msgid="1342726230497913398">"Use gesture to open"</string>
<string name="accessibility_tutorial_dialog_title_gesture_settings" msgid="8539392614235820285">"Use new accessibility gesture"</string>
@@ -2140,8 +2140,7 @@
<string name="accessibility_hearingaid_title" msgid="8312145423610648518">"Hearing aids"</string>
<string name="accessibility_hearingaid_not_connected_summary" msgid="6240237523789614599">"No hearing aids connected"</string>
<string name="accessibility_hearingaid_adding_summary" msgid="2947474468412309778">"Add hearing aids"</string>
- <string name="accessibility_hearingaid_pair_instructions_first_message" msgid="3912093691643131154">"To pair your hearing aids, find and tap your device on the next screen."</string>
- <string name="accessibility_hearingaid_pair_instructions_second_message" msgid="5596683393607650243">"Make sure that your hearing aids are in pairing mode."</string>
+ <string name="accessibility_hearingaid_pair_instructions_message" msgid="3094382949733435414">"To pair your hearing aids, find and tap your device on the next screen. Make sure that your hearing aids are in pairing mode."</string>
<string name="accessibility_hearingaid_active_device_summary" msgid="3924362383258688984">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> active"</string>
<plurals name="show_number_hearingaid_count" formatted="false" msgid="3160782397139295486">
<item quantity="other"><xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> saved hearing aids</item>
@@ -2490,7 +2489,6 @@
<string name="menu_stats_last_unplugged" msgid="5922246077592434526">"While last for unplugged for <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
<string name="menu_stats_total" msgid="8973377864854807854">"Usage totals"</string>
<string name="menu_stats_refresh" msgid="1676215433344981075">"Refresh"</string>
- <string name="process_kernel_label" msgid="3916858646836739323">"Android OS"</string>
<string name="process_mediaserver_label" msgid="6500382062945689285">"Media server"</string>
<string name="process_dex2oat_label" msgid="2592408651060518226">"App optimisation"</string>
<string name="battery_saver" msgid="8172485772238572153">"Battery Saver"</string>
@@ -2621,8 +2619,6 @@
<string name="no_device_admins" msgid="4846602835339095768">"No device admin apps available"</string>
<string name="personal_device_admin_title" msgid="2849617316347669861">"Personal"</string>
<string name="managed_device_admin_title" msgid="7853955652864478435">"Work"</string>
- <string name="sms_access_restriction_enabled" msgid="7054488078710530278">"Restrict SMS & call log access"</string>
- <string name="sms_access_restriction_enabled_summary" msgid="6851339654677842328">"Only default phone and messaging apps have SMS & call log permissions"</string>
<string name="no_trust_agents" msgid="7450273545568977523">"No available trust agents"</string>
<string name="add_device_admin_msg" msgid="1501847129819382149">"Activate device admin app?"</string>
<string name="add_device_admin" msgid="4192055385312215731">"Activate this device admin app"</string>
@@ -3111,7 +3107,7 @@
<string name="keywords_app_default" msgid="5822717006354487071">"Open with"</string>
<string name="keywords_applications_settings" msgid="1268353611121497450">"Applications"</string>
<string name="keywords_time_zone" msgid="998254736898753085">"time zone"</string>
- <string name="keywords_draw_overlay" msgid="4130899177619041842">"Chat head"</string>
+ <string name="keywords_draw_overlay" msgid="1001120206241401007">"Chat head, system, alert, window, dialogue, display, on top other apps, draw"</string>
<string name="keywords_flashlight" msgid="6161632177705233710">"Flashlight, Light, Torch"</string>
<string name="keywords_change_wifi_state" msgid="627068244033681010">"wifi, wi-fi, toggle, control"</string>
<string name="keywords_more_mobile_networks" msgid="8995946622054642367">"mobile, mobile operator, wireless, data, 4g,3g, 2g, lte"</string>
@@ -3135,7 +3131,7 @@
<string name="keywords_sounds_and_notifications_interruptions" msgid="5426093074031208917">"don\'t disturb, interrupt, interruption, break"</string>
<string name="keywords_app" msgid="6334757056536837791">"RAM"</string>
<string name="keywords_location" msgid="4132655528196729043">"nearby, location, history, reporting, GPS"</string>
- <string name="keywords_accounts" msgid="1957925565953357627">"account"</string>
+ <string name="keywords_accounts" msgid="4479029747403203867">"account, add an account, work profile"</string>
<string name="keywords_users" msgid="3434190133131387942">"restriction, restrict, restricted"</string>
<string name="keywords_keyboard_and_ime" msgid="9143339015329957107">"text correction, correct, sound, vibrate, auto, language, gesture, suggest, suggestion, theme, offensive, word, type, emoji, international"</string>
<string name="keywords_reset_apps" msgid="5293291209613191845">"reset, preferences, default"</string>
@@ -3173,6 +3169,7 @@
<string name="keywords_storage_settings" msgid="297283751968446577">"memory, cache, data, delete, clear, free, space"</string>
<string name="keywords_bluetooth_settings" msgid="6804844062789439858">"connected, device, headphones, headset, speaker, wireless, pair, earbuds, music, media"</string>
<string name="keywords_wallpaper" msgid="5058364390917429896">"background, screen, lockscreen, theme"</string>
+ <string name="keywords_styles" msgid="5828725481814049422">"icon shape, accent colour, font"</string>
<string name="keywords_assist_input" msgid="5017533309492679287">"default, assistant"</string>
<string name="keywords_default_payment_app" msgid="3838565809518896799">"payment, default"</string>
<string name="keywords_ambient_display" msgid="3103487805748659132">"incoming notification"</string>
@@ -3182,7 +3179,7 @@
<string name="keywords_notification_vibration" msgid="31924624421190547">"haptics, vibrate, sensitivity"</string>
<string name="keywords_battery_saver_sticky" msgid="5586215686021650278">"battery saver, sticky, persist, power saver, battery"</string>
<string name="keywords_battery_saver_schedule" msgid="7358789228486231944">"routine, schedule, battery saver, power saver, battery, automatic, per cent"</string>
- <string name="keywords_add_an_account" msgid="6488139919428902434">"work profile"</string>
+ <string name="keywords_enhance_4g_lte" msgid="2273810564244790859">"VoLTE, advanced calling, 4G calling"</string>
<string name="default_sound" msgid="8821684447333687810">"Default sound"</string>
<string name="sound_settings_summary" msgid="4100853606668287965">"Ring volume at <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
<string name="sound_dashboard_summary" msgid="3402435125958012986">"Volume, vibration, Do Not Disturb"</string>
@@ -3889,7 +3886,6 @@
<string name="permit_draw_overlay" msgid="7456536798718633432">"Allow display over other apps"</string>
<string name="allow_overlay_description" msgid="8961670023925421358">"Allow this app to display on top of other apps that you’re using. It may interfere with your use of those apps or change the way they seem to appear or behave."</string>
<string name="keywords_vr_listener" msgid="7441221822576384680">"VR virtual reality listener stereo helper service"</string>
- <string name="keywords_system_alert_window" msgid="5049498015597864850">"system alert window dialogue display on top of other apps"</string>
<string name="overlay_settings" msgid="6930854109449524280">"Display over other apps"</string>
<string name="system_alert_window_summary" msgid="602892301318324492">"<xliff:g id="COUNT_0">%1$d</xliff:g> of <xliff:g id="COUNT_1">%2$d</xliff:g> apps allowed to display over other apps"</string>
<string name="filter_overlay_apps" msgid="6965969283342557573">"Apps with permission"</string>
@@ -4125,7 +4121,6 @@
<string name="notification_log_details_none" msgid="184131801230614059">"None"</string>
<string name="notification_log_details_ranking_null" msgid="244660392058720919">"Ranking object is missing."</string>
<string name="notification_log_details_ranking_none" msgid="599607025882587844">"Ranking object doesn\'t contain this key."</string>
- <string name="theme_customization_category" msgid="1049181544004163283">"Theming"</string>
<string name="theme_customization_device_default" msgid="5058147707906551368">"Device default"</string>
<string name="display_cutout_emulation" msgid="7466869822418376317">"Display cutout"</string>
<string name="display_cutout_emulation_keywords" msgid="4495418317471622562">"display cutout, notch"</string>
@@ -4553,6 +4548,8 @@
<string name="network_connection_errorstate_dialog_message" msgid="6953778550775646710">"Something came up. The application has cancelled the request to choose a device."</string>
<string name="network_connection_connect_successful" msgid="5935510954474494928">"Connection successful"</string>
<string name="network_connection_request_dialog_showall" msgid="6938922880244567521">"Show all"</string>
+ <string name="network_connection_searching_message" msgid="4638576789450817530">"Searching for device…"</string>
+ <string name="network_connection_connecting_message" msgid="3740982406609245654">"Connecting to device…"</string>
<plurals name="show_bluetooth_devices" formatted="false" msgid="1715020480026568408">
<item quantity="other"><xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> devices connected</item>
<item quantity="one"><xliff:g id="NUMBER_DEVICE_COUNT_0">%1$d</xliff:g> device connected</item>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index cb16122..c54a59c 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -360,8 +360,6 @@
<string name="security_enable_widgets_disabled_summary" msgid="6392489775303464905">"Disabled by admin"</string>
<string name="lockdown_settings_title" msgid="7393790212603280213">"Show lockdown option"</string>
<string name="lockdown_settings_summary" msgid="4359438673563318171">"Display power button option that turns off Smart Lock, biometric unlocking and notifications on the lock screen"</string>
- <string name="trust_agents_extend_unlock_title" msgid="2796555263565097031">"Trust agents only extend unlock"</string>
- <string name="trust_agents_extend_unlock_summary" msgid="3976344969220255010">"If enabled, trust agents will keep your device unlocked for longer, but can no longer unlock a locked device."</string>
<string name="trust_lost_locks_screen_title" msgid="2992742466966021682">"Lock screen when trust is lost"</string>
<string name="trust_lost_locks_screen_summary" msgid="693784434582021206">"If enabled, the device will lock when the last trust agent loses trust"</string>
<string name="owner_info_settings_summary" msgid="7472393443779227052">"None"</string>
@@ -937,6 +935,7 @@
<string name="wifi_eap_identity" msgid="4359453783379679103">"Identity"</string>
<string name="wifi_eap_anonymous" msgid="2989469344116577955">"Anonymous identity"</string>
<string name="wifi_password" msgid="5948219759936151048">"Password"</string>
+ <string name="wifi_sae_password_id" msgid="1697832722221765763">"SAE password identifier"</string>
<string name="wifi_show_password" msgid="6461249871236968884">"Show password"</string>
<string name="wifi_ap_band_config" msgid="1611826705989117930">"Select AP band"</string>
<string name="wifi_ap_choose_auto" msgid="2677800651271769965">"Auto"</string>
@@ -957,7 +956,6 @@
<string name="wifi_dpp_share_wifi" msgid="9065890131734833809">"Share Wi‑Fi"</string>
<string name="wifi_dpp_scan_qr_code_with_another_device" msgid="5854392840857123065">"Scan this QR code to connect to \'<xliff:g id="SSID">%1$s</xliff:g>\' and share the password"</string>
<string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="4436318319178361543">"Scan this QR code to connect to \'<xliff:g id="SSID">%1$s</xliff:g>\'"</string>
- <string name="wifi_dpp_could_not_detect_valid_qr_code" msgid="641893675646330576">"Couldn’t read QR code. Re-centre code and try again"</string>
<string name="wifi_dpp_failure_authentication_or_configuration" msgid="3372757783382381044">"Try again. If the issue continues, contact the device manufacturer"</string>
<string name="wifi_dpp_failure_not_compatible" msgid="2829930473520603740">"Something went wrong"</string>
<string name="wifi_dpp_failure_timeout" msgid="5228320772245820458">"Make sure that the device has been plugged in, charged and turned on"</string>
@@ -980,6 +978,7 @@
<string name="wifi_dpp_hotspot_password" msgid="4120419278831581613">"Hotspot password: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
<string name="wifi_dpp_add_device" msgid="4072206063308645677">"Add device"</string>
<string name="wifi_dpp_connect_network_using_qr_code" msgid="3887335309163999665">"Use a QR code to add a device to this network"</string>
+ <string name="wifi_dpp_qr_code_is_not_valid_format" msgid="3700087439867692944">"QR code isn\'t a valid format"</string>
<string name="retry" msgid="6472609612090877557">"Retry"</string>
<string name="wifi_shared" msgid="844142443226926070">"Share with other device users"</string>
<string name="wifi_unchanged" msgid="3410422020930397102">"(unchanged)"</string>
@@ -1129,6 +1128,7 @@
<string name="emergency_address_title" msgid="932729250447887545">"Emergency Address"</string>
<string name="emergency_address_summary" msgid="7751971156196115129">"Used as your location when you make an emergency call over Wi‑Fi"</string>
<string name="private_dns_help_message" msgid="3299567069152568958"><annotation id="url">"Learn more"</annotation>" about Private DNS features"</string>
+ <string name="private_dns_mode_on" msgid="5882613439541371003">"On"</string>
<string name="wifi_calling_pref_managed_by_carrier" msgid="6845711858866828986">"Setting managed by operator"</string>
<string name="wifi_calling_settings_activation_instructions" msgid="7492509632478260955">"Activate Wi‑Fi Calling"</string>
<string name="wifi_calling_turn_on" msgid="1171403510313983983">"Turn on Wi‑Fi calling"</string>
@@ -1872,7 +1872,7 @@
<string name="default_emergency_app" msgid="1951760659640369980">"Emergency app"</string>
<string name="reset_app_preferences" msgid="1321050641018356925">"Reset app preferences"</string>
<string name="reset_app_preferences_title" msgid="6093179367325336662">"Reset app preferences?"</string>
- <string name="reset_app_preferences_desc" msgid="4822447731869201512">"This will reset all preferences for:\n\n"<li>"Disabled apps"</li>\n<li>"Disabled app notifications"</li>\n<li>"Default applications for actions"</li>\n<li>"Background data restrictions for apps"</li>\n<li>"Any permission restrictions"</li>\n\n"You will not lose any app data."</string>
+ <string name="reset_app_preferences_desc" msgid="731757609326016760">"This will reset all preferences for:\n\n"<li>"Disabled apps"</li>\n<li>"Disabled app notifications"</li>\n<li>"Default applications for actions"</li>\n<li>"Background data restrictions for apps"</li>\n<li>"Any permission restrictions"</li>\n\n"You will not lose any app data."</string>
<string name="reset_app_preferences_button" msgid="2559089511841281242">"Reset apps"</string>
<string name="manage_space_text" msgid="8852711522447794676">"Manage space"</string>
<string name="filter" msgid="2018011724373033887">"Filter"</string>
@@ -2087,7 +2087,7 @@
<string name="accessibility_screen_magnification_short_summary" msgid="3411979839172752057">"Tap 3 times to zoom"</string>
<string name="accessibility_screen_magnification_navbar_short_summary" msgid="3693116360267980492">"Tap a button to zoom"</string>
<string name="accessibility_screen_magnification_summary" msgid="5258868553337478505"><b>"To zoom"</b>", quickly tap the screen 3 times.\n"<ul><li>"Drag 2 or more fingers to scroll"</li>\n<li>"Pinch 2 or more fingers to adjust zoom"</li></ul>\n\n<b>"To zoom temporarily"</b>", quickly tap the screen 3 times and hold down your finger on the third tap.\n"<ul><li>"Drag to move around the screen"</li>\n<li>"Lift finger to zoom out"</li></ul>\n\n"You can\'t zoom in on the keyboard and navigation bar."</string>
- <string name="accessibility_screen_magnification_navbar_summary" msgid="2272878354599332009">"When magnification is turned on, you can zoom in on your screen.\n\n"<b>"To zoom"</b>", start magnification, then tap anywhere on the screen.\n"<ul><li>"• Drag two or more fingers to scroll"</li>\n<li>"• Pinch two or more fingers to adjust zoom"</li></ul>\n\n<b>"To zoom temporarily"</b>", start magnification, then touch & hold anywhere on the screen.\n"<ul><li>"• Drag to move around the screen"</li>\n<li>"• Lift finger to zoom out"</li></ul>\n\n"You can’t zoom in on the keyboard or navigation bar."</string>
+ <string name="accessibility_screen_magnification_navbar_summary" msgid="6700716275347612310">"When magnification is turned on, you can zoom in on your screen.\n\n"<b>"To zoom"</b>", start magnification, then tap anywhere on the screen.\n"<ul><li>"Drag 2 or more fingers to scroll"</li>\n<li>"Pinch 2 or more fingers to adjust zoom"</li></ul>\n\n<b>"To zoom temporarily"</b>", start magnification, then touch and hold anywhere on the screen.\n"<ul><li>"Drag to move around the screen"</li>\n<li>"Lift finger to zoom out"</li></ul>\n\n"You can’t zoom in on the keyboard or navigation bar."</string>
<string name="accessibility_tutorial_dialog_title_button" msgid="3682222614034474845">"Use accessibility button to open"</string>
<string name="accessibility_tutorial_dialog_title_gesture" msgid="1342726230497913398">"Use gesture to open"</string>
<string name="accessibility_tutorial_dialog_title_gesture_settings" msgid="8539392614235820285">"Use new accessibility gesture"</string>
@@ -2140,8 +2140,7 @@
<string name="accessibility_hearingaid_title" msgid="8312145423610648518">"Hearing aids"</string>
<string name="accessibility_hearingaid_not_connected_summary" msgid="6240237523789614599">"No hearing aids connected"</string>
<string name="accessibility_hearingaid_adding_summary" msgid="2947474468412309778">"Add hearing aids"</string>
- <string name="accessibility_hearingaid_pair_instructions_first_message" msgid="3912093691643131154">"To pair your hearing aids, find and tap your device on the next screen."</string>
- <string name="accessibility_hearingaid_pair_instructions_second_message" msgid="5596683393607650243">"Make sure that your hearing aids are in pairing mode."</string>
+ <string name="accessibility_hearingaid_pair_instructions_message" msgid="3094382949733435414">"To pair your hearing aids, find and tap your device on the next screen. Make sure that your hearing aids are in pairing mode."</string>
<string name="accessibility_hearingaid_active_device_summary" msgid="3924362383258688984">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> active"</string>
<plurals name="show_number_hearingaid_count" formatted="false" msgid="3160782397139295486">
<item quantity="other"><xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> saved hearing aids</item>
@@ -2490,7 +2489,6 @@
<string name="menu_stats_last_unplugged" msgid="5922246077592434526">"While last for unplugged for <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
<string name="menu_stats_total" msgid="8973377864854807854">"Usage totals"</string>
<string name="menu_stats_refresh" msgid="1676215433344981075">"Refresh"</string>
- <string name="process_kernel_label" msgid="3916858646836739323">"Android OS"</string>
<string name="process_mediaserver_label" msgid="6500382062945689285">"Media server"</string>
<string name="process_dex2oat_label" msgid="2592408651060518226">"App optimisation"</string>
<string name="battery_saver" msgid="8172485772238572153">"Battery Saver"</string>
@@ -2621,8 +2619,6 @@
<string name="no_device_admins" msgid="4846602835339095768">"No device admin apps available"</string>
<string name="personal_device_admin_title" msgid="2849617316347669861">"Personal"</string>
<string name="managed_device_admin_title" msgid="7853955652864478435">"Work"</string>
- <string name="sms_access_restriction_enabled" msgid="7054488078710530278">"Restrict SMS & call log access"</string>
- <string name="sms_access_restriction_enabled_summary" msgid="6851339654677842328">"Only default phone and messaging apps have SMS & call log permissions"</string>
<string name="no_trust_agents" msgid="7450273545568977523">"No available trust agents"</string>
<string name="add_device_admin_msg" msgid="1501847129819382149">"Activate device admin app?"</string>
<string name="add_device_admin" msgid="4192055385312215731">"Activate this device admin app"</string>
@@ -3111,7 +3107,7 @@
<string name="keywords_app_default" msgid="5822717006354487071">"Open with"</string>
<string name="keywords_applications_settings" msgid="1268353611121497450">"Applications"</string>
<string name="keywords_time_zone" msgid="998254736898753085">"time zone"</string>
- <string name="keywords_draw_overlay" msgid="4130899177619041842">"Chat head"</string>
+ <string name="keywords_draw_overlay" msgid="1001120206241401007">"Chat head, system, alert, window, dialogue, display, on top other apps, draw"</string>
<string name="keywords_flashlight" msgid="6161632177705233710">"Flashlight, Light, Torch"</string>
<string name="keywords_change_wifi_state" msgid="627068244033681010">"wifi, wi-fi, toggle, control"</string>
<string name="keywords_more_mobile_networks" msgid="8995946622054642367">"mobile, mobile operator, wireless, data, 4g,3g, 2g, lte"</string>
@@ -3135,7 +3131,7 @@
<string name="keywords_sounds_and_notifications_interruptions" msgid="5426093074031208917">"don\'t disturb, interrupt, interruption, break"</string>
<string name="keywords_app" msgid="6334757056536837791">"RAM"</string>
<string name="keywords_location" msgid="4132655528196729043">"nearby, location, history, reporting, GPS"</string>
- <string name="keywords_accounts" msgid="1957925565953357627">"account"</string>
+ <string name="keywords_accounts" msgid="4479029747403203867">"account, add an account, work profile"</string>
<string name="keywords_users" msgid="3434190133131387942">"restriction, restrict, restricted"</string>
<string name="keywords_keyboard_and_ime" msgid="9143339015329957107">"text correction, correct, sound, vibrate, auto, language, gesture, suggest, suggestion, theme, offensive, word, type, emoji, international"</string>
<string name="keywords_reset_apps" msgid="5293291209613191845">"reset, preferences, default"</string>
@@ -3173,6 +3169,7 @@
<string name="keywords_storage_settings" msgid="297283751968446577">"memory, cache, data, delete, clear, free, space"</string>
<string name="keywords_bluetooth_settings" msgid="6804844062789439858">"connected, device, headphones, headset, speaker, wireless, pair, earbuds, music, media"</string>
<string name="keywords_wallpaper" msgid="5058364390917429896">"background, screen, lockscreen, theme"</string>
+ <string name="keywords_styles" msgid="5828725481814049422">"icon shape, accent colour, font"</string>
<string name="keywords_assist_input" msgid="5017533309492679287">"default, assistant"</string>
<string name="keywords_default_payment_app" msgid="3838565809518896799">"payment, default"</string>
<string name="keywords_ambient_display" msgid="3103487805748659132">"incoming notification"</string>
@@ -3182,7 +3179,7 @@
<string name="keywords_notification_vibration" msgid="31924624421190547">"haptics, vibrate, sensitivity"</string>
<string name="keywords_battery_saver_sticky" msgid="5586215686021650278">"battery saver, sticky, persist, power saver, battery"</string>
<string name="keywords_battery_saver_schedule" msgid="7358789228486231944">"routine, schedule, battery saver, power saver, battery, automatic, per cent"</string>
- <string name="keywords_add_an_account" msgid="6488139919428902434">"work profile"</string>
+ <string name="keywords_enhance_4g_lte" msgid="2273810564244790859">"VoLTE, advanced calling, 4G calling"</string>
<string name="default_sound" msgid="8821684447333687810">"Default sound"</string>
<string name="sound_settings_summary" msgid="4100853606668287965">"Ring volume at <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
<string name="sound_dashboard_summary" msgid="3402435125958012986">"Volume, vibration, Do Not Disturb"</string>
@@ -3889,7 +3886,6 @@
<string name="permit_draw_overlay" msgid="7456536798718633432">"Allow display over other apps"</string>
<string name="allow_overlay_description" msgid="8961670023925421358">"Allow this app to display on top of other apps that you’re using. It may interfere with your use of those apps or change the way they seem to appear or behave."</string>
<string name="keywords_vr_listener" msgid="7441221822576384680">"VR virtual reality listener stereo helper service"</string>
- <string name="keywords_system_alert_window" msgid="5049498015597864850">"system alert window dialogue display on top of other apps"</string>
<string name="overlay_settings" msgid="6930854109449524280">"Display over other apps"</string>
<string name="system_alert_window_summary" msgid="602892301318324492">"<xliff:g id="COUNT_0">%1$d</xliff:g> of <xliff:g id="COUNT_1">%2$d</xliff:g> apps allowed to display over other apps"</string>
<string name="filter_overlay_apps" msgid="6965969283342557573">"Apps with permission"</string>
@@ -4125,7 +4121,6 @@
<string name="notification_log_details_none" msgid="184131801230614059">"None"</string>
<string name="notification_log_details_ranking_null" msgid="244660392058720919">"Ranking object is missing."</string>
<string name="notification_log_details_ranking_none" msgid="599607025882587844">"Ranking object doesn\'t contain this key."</string>
- <string name="theme_customization_category" msgid="1049181544004163283">"Theming"</string>
<string name="theme_customization_device_default" msgid="5058147707906551368">"Device default"</string>
<string name="display_cutout_emulation" msgid="7466869822418376317">"Display cutout"</string>
<string name="display_cutout_emulation_keywords" msgid="4495418317471622562">"display cutout, notch"</string>
@@ -4551,6 +4546,8 @@
<string name="network_connection_errorstate_dialog_message" msgid="6953778550775646710">"Something came up. The application has cancelled the request to choose a device."</string>
<string name="network_connection_connect_successful" msgid="5935510954474494928">"Connection successful"</string>
<string name="network_connection_request_dialog_showall" msgid="6938922880244567521">"Show all"</string>
+ <string name="network_connection_searching_message" msgid="4638576789450817530">"Searching for device…"</string>
+ <string name="network_connection_connecting_message" msgid="3740982406609245654">"Connecting to device…"</string>
<plurals name="show_bluetooth_devices" formatted="false" msgid="1715020480026568408">
<item quantity="other"><xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> devices connected</item>
<item quantity="one"><xliff:g id="NUMBER_DEVICE_COUNT_0">%1$d</xliff:g> device connected</item>
diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml
index ff78e61..6dabd10 100644
--- a/res/values-en-rIN/strings.xml
+++ b/res/values-en-rIN/strings.xml
@@ -360,8 +360,6 @@
<string name="security_enable_widgets_disabled_summary" msgid="6392489775303464905">"Disabled by admin"</string>
<string name="lockdown_settings_title" msgid="7393790212603280213">"Show lockdown option"</string>
<string name="lockdown_settings_summary" msgid="4359438673563318171">"Display power button option that turns off Smart Lock, biometric unlocking and notifications on the lock screen"</string>
- <string name="trust_agents_extend_unlock_title" msgid="2796555263565097031">"Trust agents only extend unlock"</string>
- <string name="trust_agents_extend_unlock_summary" msgid="3976344969220255010">"If enabled, trust agents will keep your device unlocked for longer, but can no longer unlock a locked device."</string>
<string name="trust_lost_locks_screen_title" msgid="2992742466966021682">"Lock screen when trust is lost"</string>
<string name="trust_lost_locks_screen_summary" msgid="693784434582021206">"If enabled, the device will lock when the last trust agent loses trust"</string>
<string name="owner_info_settings_summary" msgid="7472393443779227052">"None"</string>
@@ -937,6 +935,7 @@
<string name="wifi_eap_identity" msgid="4359453783379679103">"Identity"</string>
<string name="wifi_eap_anonymous" msgid="2989469344116577955">"Anonymous identity"</string>
<string name="wifi_password" msgid="5948219759936151048">"Password"</string>
+ <string name="wifi_sae_password_id" msgid="1697832722221765763">"SAE password identifier"</string>
<string name="wifi_show_password" msgid="6461249871236968884">"Show password"</string>
<string name="wifi_ap_band_config" msgid="1611826705989117930">"Select AP band"</string>
<string name="wifi_ap_choose_auto" msgid="2677800651271769965">"Auto"</string>
@@ -957,7 +956,6 @@
<string name="wifi_dpp_share_wifi" msgid="9065890131734833809">"Share Wi‑Fi"</string>
<string name="wifi_dpp_scan_qr_code_with_another_device" msgid="5854392840857123065">"Scan this QR code to connect to \'<xliff:g id="SSID">%1$s</xliff:g>\' and share the password"</string>
<string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="4436318319178361543">"Scan this QR code to connect to \'<xliff:g id="SSID">%1$s</xliff:g>\'"</string>
- <string name="wifi_dpp_could_not_detect_valid_qr_code" msgid="641893675646330576">"Couldn’t read QR code. Re-centre code and try again"</string>
<string name="wifi_dpp_failure_authentication_or_configuration" msgid="3372757783382381044">"Try again. If the issue continues, contact the device manufacturer"</string>
<string name="wifi_dpp_failure_not_compatible" msgid="2829930473520603740">"Something went wrong"</string>
<string name="wifi_dpp_failure_timeout" msgid="5228320772245820458">"Make sure that the device has been plugged in, charged and turned on"</string>
@@ -980,6 +978,7 @@
<string name="wifi_dpp_hotspot_password" msgid="4120419278831581613">"Hotspot password: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
<string name="wifi_dpp_add_device" msgid="4072206063308645677">"Add device"</string>
<string name="wifi_dpp_connect_network_using_qr_code" msgid="3887335309163999665">"Use a QR code to add a device to this network"</string>
+ <string name="wifi_dpp_qr_code_is_not_valid_format" msgid="3700087439867692944">"QR code isn\'t a valid format"</string>
<string name="retry" msgid="6472609612090877557">"Retry"</string>
<string name="wifi_shared" msgid="844142443226926070">"Share with other device users"</string>
<string name="wifi_unchanged" msgid="3410422020930397102">"(unchanged)"</string>
@@ -1129,6 +1128,7 @@
<string name="emergency_address_title" msgid="932729250447887545">"Emergency Address"</string>
<string name="emergency_address_summary" msgid="7751971156196115129">"Used as your location when you make an emergency call over Wi‑Fi"</string>
<string name="private_dns_help_message" msgid="3299567069152568958"><annotation id="url">"Learn more"</annotation>" about Private DNS features"</string>
+ <string name="private_dns_mode_on" msgid="5882613439541371003">"On"</string>
<string name="wifi_calling_pref_managed_by_carrier" msgid="6845711858866828986">"Setting managed by operator"</string>
<string name="wifi_calling_settings_activation_instructions" msgid="7492509632478260955">"Activate Wi‑Fi Calling"</string>
<string name="wifi_calling_turn_on" msgid="1171403510313983983">"Turn on Wi‑Fi calling"</string>
@@ -1872,7 +1872,7 @@
<string name="default_emergency_app" msgid="1951760659640369980">"Emergency app"</string>
<string name="reset_app_preferences" msgid="1321050641018356925">"Reset app preferences"</string>
<string name="reset_app_preferences_title" msgid="6093179367325336662">"Reset app preferences?"</string>
- <string name="reset_app_preferences_desc" msgid="4822447731869201512">"This will reset all preferences for:\n\n"<li>"Disabled apps"</li>\n<li>"Disabled app notifications"</li>\n<li>"Default applications for actions"</li>\n<li>"Background data restrictions for apps"</li>\n<li>"Any permission restrictions"</li>\n\n"You will not lose any app data."</string>
+ <string name="reset_app_preferences_desc" msgid="731757609326016760">"This will reset all preferences for:\n\n"<li>"Disabled apps"</li>\n<li>"Disabled app notifications"</li>\n<li>"Default applications for actions"</li>\n<li>"Background data restrictions for apps"</li>\n<li>"Any permission restrictions"</li>\n\n"You will not lose any app data."</string>
<string name="reset_app_preferences_button" msgid="2559089511841281242">"Reset apps"</string>
<string name="manage_space_text" msgid="8852711522447794676">"Manage space"</string>
<string name="filter" msgid="2018011724373033887">"Filter"</string>
@@ -2087,7 +2087,7 @@
<string name="accessibility_screen_magnification_short_summary" msgid="3411979839172752057">"Tap 3 times to zoom"</string>
<string name="accessibility_screen_magnification_navbar_short_summary" msgid="3693116360267980492">"Tap a button to zoom"</string>
<string name="accessibility_screen_magnification_summary" msgid="5258868553337478505"><b>"To zoom"</b>", quickly tap the screen 3 times.\n"<ul><li>"Drag 2 or more fingers to scroll"</li>\n<li>"Pinch 2 or more fingers to adjust zoom"</li></ul>\n\n<b>"To zoom temporarily"</b>", quickly tap the screen 3 times and hold down your finger on the third tap.\n"<ul><li>"Drag to move around the screen"</li>\n<li>"Lift finger to zoom out"</li></ul>\n\n"You can\'t zoom in on the keyboard and navigation bar."</string>
- <string name="accessibility_screen_magnification_navbar_summary" msgid="2272878354599332009">"When magnification is turned on, you can zoom in on your screen.\n\n"<b>"To zoom"</b>", start magnification, then tap anywhere on the screen.\n"<ul><li>"• Drag two or more fingers to scroll"</li>\n<li>"• Pinch two or more fingers to adjust zoom"</li></ul>\n\n<b>"To zoom temporarily"</b>", start magnification, then touch & hold anywhere on the screen.\n"<ul><li>"• Drag to move around the screen"</li>\n<li>"• Lift finger to zoom out"</li></ul>\n\n"You can’t zoom in on the keyboard or navigation bar."</string>
+ <string name="accessibility_screen_magnification_navbar_summary" msgid="6700716275347612310">"When magnification is turned on, you can zoom in on your screen.\n\n"<b>"To zoom"</b>", start magnification, then tap anywhere on the screen.\n"<ul><li>"Drag 2 or more fingers to scroll"</li>\n<li>"Pinch 2 or more fingers to adjust zoom"</li></ul>\n\n<b>"To zoom temporarily"</b>", start magnification, then touch and hold anywhere on the screen.\n"<ul><li>"Drag to move around the screen"</li>\n<li>"Lift finger to zoom out"</li></ul>\n\n"You can’t zoom in on the keyboard or navigation bar."</string>
<string name="accessibility_tutorial_dialog_title_button" msgid="3682222614034474845">"Use accessibility button to open"</string>
<string name="accessibility_tutorial_dialog_title_gesture" msgid="1342726230497913398">"Use gesture to open"</string>
<string name="accessibility_tutorial_dialog_title_gesture_settings" msgid="8539392614235820285">"Use new accessibility gesture"</string>
@@ -2140,8 +2140,7 @@
<string name="accessibility_hearingaid_title" msgid="8312145423610648518">"Hearing aids"</string>
<string name="accessibility_hearingaid_not_connected_summary" msgid="6240237523789614599">"No hearing aids connected"</string>
<string name="accessibility_hearingaid_adding_summary" msgid="2947474468412309778">"Add hearing aids"</string>
- <string name="accessibility_hearingaid_pair_instructions_first_message" msgid="3912093691643131154">"To pair your hearing aids, find and tap your device on the next screen."</string>
- <string name="accessibility_hearingaid_pair_instructions_second_message" msgid="5596683393607650243">"Make sure that your hearing aids are in pairing mode."</string>
+ <string name="accessibility_hearingaid_pair_instructions_message" msgid="3094382949733435414">"To pair your hearing aids, find and tap your device on the next screen. Make sure that your hearing aids are in pairing mode."</string>
<string name="accessibility_hearingaid_active_device_summary" msgid="3924362383258688984">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> active"</string>
<plurals name="show_number_hearingaid_count" formatted="false" msgid="3160782397139295486">
<item quantity="other"><xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> saved hearing aids</item>
@@ -2490,7 +2489,6 @@
<string name="menu_stats_last_unplugged" msgid="5922246077592434526">"While last for unplugged for <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
<string name="menu_stats_total" msgid="8973377864854807854">"Usage totals"</string>
<string name="menu_stats_refresh" msgid="1676215433344981075">"Refresh"</string>
- <string name="process_kernel_label" msgid="3916858646836739323">"Android OS"</string>
<string name="process_mediaserver_label" msgid="6500382062945689285">"Media server"</string>
<string name="process_dex2oat_label" msgid="2592408651060518226">"App optimisation"</string>
<string name="battery_saver" msgid="8172485772238572153">"Battery Saver"</string>
@@ -2621,8 +2619,6 @@
<string name="no_device_admins" msgid="4846602835339095768">"No device admin apps available"</string>
<string name="personal_device_admin_title" msgid="2849617316347669861">"Personal"</string>
<string name="managed_device_admin_title" msgid="7853955652864478435">"Work"</string>
- <string name="sms_access_restriction_enabled" msgid="7054488078710530278">"Restrict SMS & call log access"</string>
- <string name="sms_access_restriction_enabled_summary" msgid="6851339654677842328">"Only default phone and messaging apps have SMS & call log permissions"</string>
<string name="no_trust_agents" msgid="7450273545568977523">"No available trust agents"</string>
<string name="add_device_admin_msg" msgid="1501847129819382149">"Activate device admin app?"</string>
<string name="add_device_admin" msgid="4192055385312215731">"Activate this device admin app"</string>
@@ -3111,7 +3107,7 @@
<string name="keywords_app_default" msgid="5822717006354487071">"Open with"</string>
<string name="keywords_applications_settings" msgid="1268353611121497450">"Applications"</string>
<string name="keywords_time_zone" msgid="998254736898753085">"time zone"</string>
- <string name="keywords_draw_overlay" msgid="4130899177619041842">"Chat head"</string>
+ <string name="keywords_draw_overlay" msgid="1001120206241401007">"Chat head, system, alert, window, dialogue, display, on top other apps, draw"</string>
<string name="keywords_flashlight" msgid="6161632177705233710">"Flashlight, Light, Torch"</string>
<string name="keywords_change_wifi_state" msgid="627068244033681010">"wifi, wi-fi, toggle, control"</string>
<string name="keywords_more_mobile_networks" msgid="8995946622054642367">"mobile, mobile operator, wireless, data, 4g,3g, 2g, lte"</string>
@@ -3135,7 +3131,7 @@
<string name="keywords_sounds_and_notifications_interruptions" msgid="5426093074031208917">"don\'t disturb, interrupt, interruption, break"</string>
<string name="keywords_app" msgid="6334757056536837791">"RAM"</string>
<string name="keywords_location" msgid="4132655528196729043">"nearby, location, history, reporting, GPS"</string>
- <string name="keywords_accounts" msgid="1957925565953357627">"account"</string>
+ <string name="keywords_accounts" msgid="4479029747403203867">"account, add an account, work profile"</string>
<string name="keywords_users" msgid="3434190133131387942">"restriction, restrict, restricted"</string>
<string name="keywords_keyboard_and_ime" msgid="9143339015329957107">"text correction, correct, sound, vibrate, auto, language, gesture, suggest, suggestion, theme, offensive, word, type, emoji, international"</string>
<string name="keywords_reset_apps" msgid="5293291209613191845">"reset, preferences, default"</string>
@@ -3173,6 +3169,7 @@
<string name="keywords_storage_settings" msgid="297283751968446577">"memory, cache, data, delete, clear, free, space"</string>
<string name="keywords_bluetooth_settings" msgid="6804844062789439858">"connected, device, headphones, headset, speaker, wireless, pair, earbuds, music, media"</string>
<string name="keywords_wallpaper" msgid="5058364390917429896">"background, screen, lockscreen, theme"</string>
+ <string name="keywords_styles" msgid="5828725481814049422">"icon shape, accent colour, font"</string>
<string name="keywords_assist_input" msgid="5017533309492679287">"default, assistant"</string>
<string name="keywords_default_payment_app" msgid="3838565809518896799">"payment, default"</string>
<string name="keywords_ambient_display" msgid="3103487805748659132">"incoming notification"</string>
@@ -3182,7 +3179,7 @@
<string name="keywords_notification_vibration" msgid="31924624421190547">"haptics, vibrate, sensitivity"</string>
<string name="keywords_battery_saver_sticky" msgid="5586215686021650278">"battery saver, sticky, persist, power saver, battery"</string>
<string name="keywords_battery_saver_schedule" msgid="7358789228486231944">"routine, schedule, battery saver, power saver, battery, automatic, per cent"</string>
- <string name="keywords_add_an_account" msgid="6488139919428902434">"work profile"</string>
+ <string name="keywords_enhance_4g_lte" msgid="2273810564244790859">"VoLTE, advanced calling, 4G calling"</string>
<string name="default_sound" msgid="8821684447333687810">"Default sound"</string>
<string name="sound_settings_summary" msgid="4100853606668287965">"Ring volume at <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
<string name="sound_dashboard_summary" msgid="3402435125958012986">"Volume, vibration, Do Not Disturb"</string>
@@ -3889,7 +3886,6 @@
<string name="permit_draw_overlay" msgid="7456536798718633432">"Allow display over other apps"</string>
<string name="allow_overlay_description" msgid="8961670023925421358">"Allow this app to display on top of other apps that you’re using. It may interfere with your use of those apps or change the way they seem to appear or behave."</string>
<string name="keywords_vr_listener" msgid="7441221822576384680">"VR virtual reality listener stereo helper service"</string>
- <string name="keywords_system_alert_window" msgid="5049498015597864850">"system alert window dialogue display on top of other apps"</string>
<string name="overlay_settings" msgid="6930854109449524280">"Display over other apps"</string>
<string name="system_alert_window_summary" msgid="602892301318324492">"<xliff:g id="COUNT_0">%1$d</xliff:g> of <xliff:g id="COUNT_1">%2$d</xliff:g> apps allowed to display over other apps"</string>
<string name="filter_overlay_apps" msgid="6965969283342557573">"Apps with permission"</string>
@@ -4125,7 +4121,6 @@
<string name="notification_log_details_none" msgid="184131801230614059">"None"</string>
<string name="notification_log_details_ranking_null" msgid="244660392058720919">"Ranking object is missing."</string>
<string name="notification_log_details_ranking_none" msgid="599607025882587844">"Ranking object doesn\'t contain this key."</string>
- <string name="theme_customization_category" msgid="1049181544004163283">"Theming"</string>
<string name="theme_customization_device_default" msgid="5058147707906551368">"Device default"</string>
<string name="display_cutout_emulation" msgid="7466869822418376317">"Display cutout"</string>
<string name="display_cutout_emulation_keywords" msgid="4495418317471622562">"display cutout, notch"</string>
@@ -4551,6 +4546,8 @@
<string name="network_connection_errorstate_dialog_message" msgid="6953778550775646710">"Something came up. The application has cancelled the request to choose a device."</string>
<string name="network_connection_connect_successful" msgid="5935510954474494928">"Connection successful"</string>
<string name="network_connection_request_dialog_showall" msgid="6938922880244567521">"Show all"</string>
+ <string name="network_connection_searching_message" msgid="4638576789450817530">"Searching for device…"</string>
+ <string name="network_connection_connecting_message" msgid="3740982406609245654">"Connecting to device…"</string>
<plurals name="show_bluetooth_devices" formatted="false" msgid="1715020480026568408">
<item quantity="other"><xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> devices connected</item>
<item quantity="one"><xliff:g id="NUMBER_DEVICE_COUNT_0">%1$d</xliff:g> device connected</item>
diff --git a/res/values-en-rXC/strings.xml b/res/values-en-rXC/strings.xml
index b778b6a..cb96e20 100644
--- a/res/values-en-rXC/strings.xml
+++ b/res/values-en-rXC/strings.xml
@@ -359,8 +359,6 @@
<string name="security_enable_widgets_disabled_summary" msgid="6392489775303464905">"Disabled by admin"</string>
<string name="lockdown_settings_title" msgid="7393790212603280213">"Show lockdown option"</string>
<string name="lockdown_settings_summary" msgid="4359438673563318171">"Display power button option that turns off Smart Lock, biometric unlocking, and notifications on the lock screen"</string>
- <string name="trust_agents_extend_unlock_title" msgid="2796555263565097031">"Trust agents only extend unlock"</string>
- <string name="trust_agents_extend_unlock_summary" msgid="3976344969220255010">"If enabled, trust agents will keep your device unlocked for longer, but can no longer unlock a locked device."</string>
<string name="trust_lost_locks_screen_title" msgid="2992742466966021682">"Lock screen when trust is lost"</string>
<string name="trust_lost_locks_screen_summary" msgid="693784434582021206">"If enabled, the device will lock when the last trust agent loses trust"</string>
<string name="owner_info_settings_summary" msgid="7472393443779227052">"None"</string>
@@ -936,6 +934,7 @@
<string name="wifi_eap_identity" msgid="4359453783379679103">"Identity"</string>
<string name="wifi_eap_anonymous" msgid="2989469344116577955">"Anonymous identity"</string>
<string name="wifi_password" msgid="5948219759936151048">"Password"</string>
+ <string name="wifi_sae_password_id" msgid="1697832722221765763">"SAE password identifier"</string>
<string name="wifi_show_password" msgid="6461249871236968884">"Show password"</string>
<string name="wifi_ap_band_config" msgid="1611826705989117930">"Select AP Band"</string>
<string name="wifi_ap_choose_auto" msgid="2677800651271769965">"Auto"</string>
@@ -956,7 +955,6 @@
<string name="wifi_dpp_share_wifi" msgid="9065890131734833809">"Share Wi‑Fi"</string>
<string name="wifi_dpp_scan_qr_code_with_another_device" msgid="5854392840857123065">"Scan this QR code to connect to “<xliff:g id="SSID">%1$s</xliff:g>” and share the password"</string>
<string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="4436318319178361543">"Scan this QR code to connect to “<xliff:g id="SSID">%1$s</xliff:g>”"</string>
- <string name="wifi_dpp_could_not_detect_valid_qr_code" msgid="641893675646330576">"Couldn’t read QR code. Re-center code and try again"</string>
<string name="wifi_dpp_failure_authentication_or_configuration" msgid="3372757783382381044">"Try again. If the issue continues, contact the device manufacturer"</string>
<string name="wifi_dpp_failure_not_compatible" msgid="2829930473520603740">"Something went wrong"</string>
<string name="wifi_dpp_failure_timeout" msgid="5228320772245820458">"Make sure the device has been plugged in, charged, and turned on"</string>
@@ -979,6 +977,7 @@
<string name="wifi_dpp_hotspot_password" msgid="4120419278831581613">"Hotspot password: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
<string name="wifi_dpp_add_device" msgid="4072206063308645677">"Add device"</string>
<string name="wifi_dpp_connect_network_using_qr_code" msgid="3887335309163999665">"Use a QR code to add a device to this network"</string>
+ <string name="wifi_dpp_qr_code_is_not_valid_format" msgid="3700087439867692944">"QR code isn\'t a valid format"</string>
<string name="retry" msgid="6472609612090877557">"Retry"</string>
<string name="wifi_shared" msgid="844142443226926070">"Share with other device users"</string>
<string name="wifi_unchanged" msgid="3410422020930397102">"(unchanged)"</string>
@@ -1128,6 +1127,7 @@
<string name="emergency_address_title" msgid="932729250447887545">"Emergency Address"</string>
<string name="emergency_address_summary" msgid="7751971156196115129">"Used as your location when you make an emergency call over Wi‑Fi"</string>
<string name="private_dns_help_message" msgid="3299567069152568958">""<annotation id="url">"Learn more"</annotation>" about Private DNS features"</string>
+ <string name="private_dns_mode_on" msgid="5882613439541371003">"On"</string>
<string name="wifi_calling_pref_managed_by_carrier" msgid="6845711858866828986">"Setting managed by carrier"</string>
<string name="wifi_calling_settings_activation_instructions" msgid="7492509632478260955">"Activate Wi‑Fi Calling"</string>
<string name="wifi_calling_turn_on" msgid="1171403510313983983">"Turn on Wi‑Fi calling"</string>
@@ -1871,7 +1871,7 @@
<string name="default_emergency_app" msgid="1951760659640369980">"Emergency app"</string>
<string name="reset_app_preferences" msgid="1321050641018356925">"Reset app preferences"</string>
<string name="reset_app_preferences_title" msgid="6093179367325336662">"Reset app preferences?"</string>
- <string name="reset_app_preferences_desc" msgid="4822447731869201512">"This will reset all preferences for:\n\n "<li>"Disabled apps"</li>"\n "<li>"Disabled app notifications"</li>"\n "<li>"Default applications for actions"</li>"\n "<li>"Background data restrictions for apps"</li>"\n "<li>"Any permission restrictions"</li>"\n\n You will not lose any app data."</string>
+ <string name="reset_app_preferences_desc" msgid="731757609326016760">"This will reset all preferences for:\n\n"<li>"Disabled apps"</li>"\n"<li>"Disabled app notifications"</li>"\n"<li>"Default applications for actions"</li>"\n"<li>"Background data restrictions for apps"</li>"\n"<li>"Any permission restrictions"</li>"\n\nYou will not lose any app data."</string>
<string name="reset_app_preferences_button" msgid="2559089511841281242">"Reset apps"</string>
<string name="manage_space_text" msgid="8852711522447794676">"Manage space"</string>
<string name="filter" msgid="2018011724373033887">"Filter"</string>
@@ -2086,7 +2086,7 @@
<string name="accessibility_screen_magnification_short_summary" msgid="3411979839172752057">"Tap 3 times to zoom"</string>
<string name="accessibility_screen_magnification_navbar_short_summary" msgid="3693116360267980492">"Tap a button to zoom"</string>
<string name="accessibility_screen_magnification_summary" msgid="5258868553337478505">""<b>"To zoom"</b>", quickly tap the screen 3 times.\n"<ul>""<li>"Drag 2 or more fingers to scroll"</li>"\n"<li>"Pinch 2 or more fingers to adjust zoom"</li>""</ul>"\n\n"<b>"To zoom temporarily"</b>", quickly tap the screen 3 times and hold down your finger on the third tap.\n"<ul>""<li>"Drag to move around the screen"</li>"\n"<li>"Lift finger to zoom out"</li>""</ul>"\n\nYou can\'t zoom in on the keyboard and navigation bar."</string>
- <string name="accessibility_screen_magnification_navbar_summary" msgid="2272878354599332009">"When magnification is turned on, you can zoom in on your screen.\n\n"<b>"To zoom"</b>", start magnification, then tap anywhere on the screen.\n"<ul>""<li>"• Drag 2 or more fingers to scroll"</li>"\n"<li>"• Pinch 2 or more fingers to adjust zoom"</li>""</ul>"\n\n"<b>"To zoom temporarily"</b>", start magnification, then touch & hold anywhere on the screen.\n"<ul>""<li>"• Drag to move around the screen"</li>"\n"<li>"• Lift finger to zoom out"</li>""</ul>"\n\nYou can’t zoom in on the keyboard or navigation bar."</string>
+ <string name="accessibility_screen_magnification_navbar_summary" msgid="6700716275347612310">"When magnification is turned on, you can zoom in on your screen.\n\n"<b>"To zoom"</b>", start magnification, then tap anywhere on the screen.\n"<ul>""<li>"Drag 2 or more fingers to scroll"</li>"\n"<li>"Pinch 2 or more fingers to adjust zoom"</li>""</ul>"\n\n"<b>"To zoom temporarily"</b>", start magnification, then touch & hold anywhere on the screen.\n"<ul>""<li>"Drag to move around the screen"</li>"\n"<li>"Lift finger to zoom out"</li>""</ul>"\n\nYou can’t zoom in on the keyboard or navigation bar."</string>
<string name="accessibility_tutorial_dialog_title_button" msgid="3682222614034474845">"Use accessibility button to open"</string>
<string name="accessibility_tutorial_dialog_title_gesture" msgid="1342726230497913398">"Use gesture to open"</string>
<string name="accessibility_tutorial_dialog_title_gesture_settings" msgid="8539392614235820285">"Use new accessibility gesture"</string>
@@ -2139,8 +2139,7 @@
<string name="accessibility_hearingaid_title" msgid="8312145423610648518">"Hearing aids"</string>
<string name="accessibility_hearingaid_not_connected_summary" msgid="6240237523789614599">"No hearing aids connected"</string>
<string name="accessibility_hearingaid_adding_summary" msgid="2947474468412309778">"Add hearing aids"</string>
- <string name="accessibility_hearingaid_pair_instructions_first_message" msgid="3912093691643131154">"To pair your hearing aids, find and tap your device on the next screen."</string>
- <string name="accessibility_hearingaid_pair_instructions_second_message" msgid="5596683393607650243">"Make sure your hearing aids are in pairing mode."</string>
+ <string name="accessibility_hearingaid_pair_instructions_message" msgid="3094382949733435414">"To pair your hearing aids, find and tap your device on the next screen. Make sure your hearing aids are in pairing mode."</string>
<string name="accessibility_hearingaid_active_device_summary" msgid="3924362383258688984">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> active"</string>
<plurals name="show_number_hearingaid_count" formatted="false" msgid="3160782397139295486">
<item quantity="other"><xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> saved hearing aids</item>
@@ -2489,7 +2488,6 @@
<string name="menu_stats_last_unplugged" msgid="5922246077592434526">"While last unplugged for <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
<string name="menu_stats_total" msgid="8973377864854807854">"Usage totals"</string>
<string name="menu_stats_refresh" msgid="1676215433344981075">"Refresh"</string>
- <string name="process_kernel_label" msgid="3916858646836739323">"Android OS"</string>
<string name="process_mediaserver_label" msgid="6500382062945689285">"Mediaserver"</string>
<string name="process_dex2oat_label" msgid="2592408651060518226">"App optimization"</string>
<string name="battery_saver" msgid="8172485772238572153">"Battery Saver"</string>
@@ -2620,8 +2618,6 @@
<string name="no_device_admins" msgid="4846602835339095768">"No device admin apps available"</string>
<string name="personal_device_admin_title" msgid="2849617316347669861">"Personal"</string>
<string name="managed_device_admin_title" msgid="7853955652864478435">"Work"</string>
- <string name="sms_access_restriction_enabled" msgid="7054488078710530278">"Restrict SMS & call log access"</string>
- <string name="sms_access_restriction_enabled_summary" msgid="6851339654677842328">"Only default phone and messaging apps have SMS & call log permissions"</string>
<string name="no_trust_agents" msgid="7450273545568977523">"No available trust agents"</string>
<string name="add_device_admin_msg" msgid="1501847129819382149">"Activate device admin app?"</string>
<string name="add_device_admin" msgid="4192055385312215731">"Activate this device admin app"</string>
@@ -3110,7 +3106,7 @@
<string name="keywords_app_default" msgid="5822717006354487071">"Open with"</string>
<string name="keywords_applications_settings" msgid="1268353611121497450">"Applications"</string>
<string name="keywords_time_zone" msgid="998254736898753085">"timezone"</string>
- <string name="keywords_draw_overlay" msgid="4130899177619041842">"Chat head"</string>
+ <string name="keywords_draw_overlay" msgid="1001120206241401007">"Chat head, system, alert, window, dialog, display, on top other apps, draw"</string>
<string name="keywords_flashlight" msgid="6161632177705233710">"Flashlight, Light, Torch"</string>
<string name="keywords_change_wifi_state" msgid="627068244033681010">"wifi, wi-fi, toggle, control"</string>
<string name="keywords_more_mobile_networks" msgid="8995946622054642367">"cellular, mobile, cell carrier, wireless, data, 4g,3g, 2g, lte"</string>
@@ -3134,7 +3130,7 @@
<string name="keywords_sounds_and_notifications_interruptions" msgid="5426093074031208917">"dont don’t disturb, interrupt, interruption, break"</string>
<string name="keywords_app" msgid="6334757056536837791">"RAM"</string>
<string name="keywords_location" msgid="4132655528196729043">"nearby, location, history, reporting, GPS"</string>
- <string name="keywords_accounts" msgid="1957925565953357627">"account"</string>
+ <string name="keywords_accounts" msgid="4479029747403203867">"account, add an account, work profile"</string>
<string name="keywords_users" msgid="3434190133131387942">"restriction, restrict, restricted"</string>
<string name="keywords_keyboard_and_ime" msgid="9143339015329957107">"text correction, correct, sound, vibrate, auto, language, gesture, suggest, suggestion, theme, offensive, word, type, emoji, international"</string>
<string name="keywords_reset_apps" msgid="5293291209613191845">"reset, preferences, default"</string>
@@ -3172,6 +3168,7 @@
<string name="keywords_storage_settings" msgid="297283751968446577">"memory, cache, data, delete, clear, free, space"</string>
<string name="keywords_bluetooth_settings" msgid="6804844062789439858">"connected, device, headphones, headset, speaker, wireless, pair, earbuds, music, media"</string>
<string name="keywords_wallpaper" msgid="5058364390917429896">"background, screen, lockscreen, theme"</string>
+ <string name="keywords_styles" msgid="5828725481814049422">"icon shape, accent color, font"</string>
<string name="keywords_assist_input" msgid="5017533309492679287">"default, assistant"</string>
<string name="keywords_default_payment_app" msgid="3838565809518896799">"payment, default"</string>
<string name="keywords_ambient_display" msgid="3103487805748659132">"incoming notification"</string>
@@ -3181,7 +3178,7 @@
<string name="keywords_notification_vibration" msgid="31924624421190547">"haptics, vibrate, sensitivity"</string>
<string name="keywords_battery_saver_sticky" msgid="5586215686021650278">"battery saver, sticky, persist, power saver, battery"</string>
<string name="keywords_battery_saver_schedule" msgid="7358789228486231944">"routine, schedule, battery saver, power saver, battery, automatic, percent"</string>
- <string name="keywords_add_an_account" msgid="6488139919428902434">"work profile"</string>
+ <string name="keywords_enhance_4g_lte" msgid="2273810564244790859">"volte, advanced calling, 4g calling"</string>
<string name="default_sound" msgid="8821684447333687810">"Default sound"</string>
<string name="sound_settings_summary" msgid="4100853606668287965">"Ring volume at <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
<string name="sound_dashboard_summary" msgid="3402435125958012986">"Volume, vibration, Do Not Disturb"</string>
@@ -3888,7 +3885,6 @@
<string name="permit_draw_overlay" msgid="7456536798718633432">"Allow display over other apps"</string>
<string name="allow_overlay_description" msgid="8961670023925421358">"Allow this app to display on top of other apps you’re using. It may interfere with your use of those apps or change the way they seem to appear or behave."</string>
<string name="keywords_vr_listener" msgid="7441221822576384680">"vr virtual reality listener stereo helper service"</string>
- <string name="keywords_system_alert_window" msgid="5049498015597864850">"system alert window dialog display on top other apps"</string>
<string name="overlay_settings" msgid="6930854109449524280">"Display over other apps"</string>
<string name="system_alert_window_summary" msgid="602892301318324492">"<xliff:g id="COUNT_0">%1$d</xliff:g> of <xliff:g id="COUNT_1">%2$d</xliff:g> apps allowed to display over other apps"</string>
<string name="filter_overlay_apps" msgid="6965969283342557573">"Apps with permission"</string>
@@ -4124,7 +4120,6 @@
<string name="notification_log_details_none" msgid="184131801230614059">"none"</string>
<string name="notification_log_details_ranking_null" msgid="244660392058720919">"Ranking object is missing."</string>
<string name="notification_log_details_ranking_none" msgid="599607025882587844">"Ranking object doesn\'t contain this key."</string>
- <string name="theme_customization_category" msgid="1049181544004163283">"Theming"</string>
<string name="theme_customization_device_default" msgid="5058147707906551368">"Device default"</string>
<string name="display_cutout_emulation" msgid="7466869822418376317">"Display cutout"</string>
<string name="display_cutout_emulation_keywords" msgid="4495418317471622562">"display cutout, notch"</string>
@@ -4552,6 +4547,8 @@
<string name="network_connection_errorstate_dialog_message" msgid="6953778550775646710">"Something came up. The application has cancelled the request to choose a device."</string>
<string name="network_connection_connect_successful" msgid="5935510954474494928">"Connection successful"</string>
<string name="network_connection_request_dialog_showall" msgid="6938922880244567521">"Show all"</string>
+ <string name="network_connection_searching_message" msgid="4638576789450817530">"Searching for device…"</string>
+ <string name="network_connection_connecting_message" msgid="3740982406609245654">"Connecting to device…"</string>
<plurals name="show_bluetooth_devices" formatted="false" msgid="1715020480026568408">
<item quantity="other"><xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> devices connected</item>
<item quantity="one"><xliff:g id="NUMBER_DEVICE_COUNT_0">%1$d</xliff:g> device connected</item>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 79d64d9..95743bc 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -360,8 +360,6 @@
<string name="security_enable_widgets_disabled_summary" msgid="6392489775303464905">"El administrador inhabilitó la opción"</string>
<string name="lockdown_settings_title" msgid="7393790212603280213">"Mostrar opción de bloqueo"</string>
<string name="lockdown_settings_summary" msgid="4359438673563318171">"Mostrar la opción del botón de encendido que desactiva Smart Lock, el desbloqueo biométrico y las notificaciones en la pantalla bloqueada"</string>
- <string name="trust_agents_extend_unlock_title" msgid="2796555263565097031">"Los agentes de confianza solo extienden el desbloqueo"</string>
- <string name="trust_agents_extend_unlock_summary" msgid="3976344969220255010">"Si habilitas la opción, los agentes de confianza mantendrán el dispositivo desbloqueado durante más tiempo, pero ya no podrán desbloquear un dispositivo bloqueado."</string>
<string name="trust_lost_locks_screen_title" msgid="2992742466966021682">"Bloquear pantalla al perder confianza"</string>
<string name="trust_lost_locks_screen_summary" msgid="693784434582021206">"Si habilitas la opción, el dispositivo se bloqueará cuando el último agente de confianza pierda este privilegio"</string>
<string name="owner_info_settings_summary" msgid="7472393443779227052">"Ninguno"</string>
@@ -937,6 +935,7 @@
<string name="wifi_eap_identity" msgid="4359453783379679103">"Identidad"</string>
<string name="wifi_eap_anonymous" msgid="2989469344116577955">"Identidad anónima"</string>
<string name="wifi_password" msgid="5948219759936151048">"Contraseña"</string>
+ <string name="wifi_sae_password_id" msgid="1697832722221765763">"Identificador de contraseña SAE"</string>
<string name="wifi_show_password" msgid="6461249871236968884">"Mostrar contraseña"</string>
<string name="wifi_ap_band_config" msgid="1611826705989117930">"Seleccionar banda AP"</string>
<string name="wifi_ap_choose_auto" msgid="2677800651271769965">"Automático"</string>
@@ -957,7 +956,6 @@
<string name="wifi_dpp_share_wifi" msgid="9065890131734833809">"Compartir Wi‑Fi"</string>
<string name="wifi_dpp_scan_qr_code_with_another_device" msgid="5854392840857123065">"Escanea este código QR para conectarte a \"<xliff:g id="SSID">%1$s</xliff:g>\" y compartir la contraseña"</string>
<string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="4436318319178361543">"Escanea este código QR para conectarte a \"<xliff:g id="SSID">%1$s</xliff:g>\""</string>
- <string name="wifi_dpp_could_not_detect_valid_qr_code" msgid="641893675646330576">"No se pudo leer el código QR. Centra el código de nuevo y vuelve a intentarlo"</string>
<string name="wifi_dpp_failure_authentication_or_configuration" msgid="3372757783382381044">"Vuelve a intentarlo. Si el problema persiste, comunícate con el fabricante del dispositivo"</string>
<string name="wifi_dpp_failure_not_compatible" msgid="2829930473520603740">"Se produjo un error"</string>
<string name="wifi_dpp_failure_timeout" msgid="5228320772245820458">"Asegúrate de que el dispositivo se haya enchufado, cargado y encendido"</string>
@@ -980,6 +978,7 @@
<string name="wifi_dpp_hotspot_password" msgid="4120419278831581613">"Contraseña del hotspot: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
<string name="wifi_dpp_add_device" msgid="4072206063308645677">"Agregar dispositivo"</string>
<string name="wifi_dpp_connect_network_using_qr_code" msgid="3887335309163999665">"Usar un código QR para agregar un dispositivo a esta red"</string>
+ <string name="wifi_dpp_qr_code_is_not_valid_format" msgid="3700087439867692944">"El código QR no es un formato válido"</string>
<string name="retry" msgid="6472609612090877557">"Reintentar"</string>
<string name="wifi_shared" msgid="844142443226926070">"Compartir con otros usuarios del dispositivo"</string>
<string name="wifi_unchanged" msgid="3410422020930397102">"(sin cambios)"</string>
@@ -1129,6 +1128,7 @@
<string name="emergency_address_title" msgid="932729250447887545">"Dirección de emergencia"</string>
<string name="emergency_address_summary" msgid="7751971156196115129">"Se usa como tu ubicación cuando haces una llamada de emergencia mediante Wi-Fi"</string>
<string name="private_dns_help_message" msgid="3299567069152568958"><annotation id="url">"Más información"</annotation>" sobre las funciones de DNS privado"</string>
+ <string name="private_dns_mode_on" msgid="5882613439541371003">"Activado"</string>
<string name="wifi_calling_pref_managed_by_carrier" msgid="6845711858866828986">"Configuración que administra el proveedor"</string>
<string name="wifi_calling_settings_activation_instructions" msgid="7492509632478260955">"Habilitar Llamada por Wi-Fi"</string>
<string name="wifi_calling_turn_on" msgid="1171403510313983983">"Activar Llamada por Wi-Fi"</string>
@@ -1872,7 +1872,7 @@
<string name="default_emergency_app" msgid="1951760659640369980">"Aplicación de emergencia"</string>
<string name="reset_app_preferences" msgid="1321050641018356925">"Restablecer preferencias de apps"</string>
<string name="reset_app_preferences_title" msgid="6093179367325336662">"¿Restablecer preferencias?"</string>
- <string name="reset_app_preferences_desc" msgid="4822447731869201512">"Se restablecerán las preferencias de:\n\n"<li>"Apps inhabilitadas"</li>\n<li>"Notificaciones de apps inhabilitadas"</li>\n<li>"Apps predeterminadas para realizar acciones"</li>\n<li>"Restricciones de datos en segundo plano para apps"</li>\n<li>"Restricciones de permisos"</li>\n\n"No se perderán los datos de las apps."</string>
+ <string name="reset_app_preferences_desc" msgid="731757609326016760">"Se restablecerán todas las preferencias de lo siguiente:\n\n"<li>"Apps inhabilitadas"</li>\n<li>"Notificaciones de apps inhabilitadas"</li>\n<li>"Apps predeterminadas para realizar acciones"</li>\n<li>"Restricciones de datos en segundo plano para apps"</li>\n<li>"Restricciones de permisos"</li>\n\n"No perderás los datos de las apps."</string>
<string name="reset_app_preferences_button" msgid="2559089511841281242">"Restablecer apps"</string>
<string name="manage_space_text" msgid="8852711522447794676">"Administrar el espacio"</string>
<string name="filter" msgid="2018011724373033887">"Filtro"</string>
@@ -2087,7 +2087,7 @@
<string name="accessibility_screen_magnification_short_summary" msgid="3411979839172752057">"Presiona tres veces para ampliar"</string>
<string name="accessibility_screen_magnification_navbar_short_summary" msgid="3693116360267980492">"Presiona un botón para ampliar"</string>
<string name="accessibility_screen_magnification_summary" msgid="5258868553337478505"><b>"Para ampliar"</b>", presiona la pantalla 3 veces rápidamente \n"<ul><li>"Arrastra 2 o más dedos para desplazarte."</li>\n<li>"Pellizca con 2 o más dedos para ajustar el zoom."</li></ul>\n\n<b>"Para hacer zoom de manera temporal"</b>", presiona la pantalla 3 veces rápidamente y mantén presionado la última vez.\n"<ul><li>"Arrastra el dedo para moverte por la pantalla."</li>\n<li>"Levanta el dedo para alejar la imagen."</li></ul>\n\n"No se puede ampliar el teclado ni la barra de navegación."</string>
- <string name="accessibility_screen_magnification_navbar_summary" msgid="2272878354599332009">"Cuando la ampliación esté activada, podrás acercar el contenido en la pantalla.\n\n"<b>"Para usar el zoom"</b>", inicia la ampliación y, luego, presiona cualquier parte de la pantalla.\n"<ul><li>"• Arrastra 2 o más dedos para desplazarte."</li>\n<li>"• Pellizca con 2 o más dedos para ajustar el zoom."</li></ul>\n\n<b>"Para hacer zoom de manera temporal"</b>", inicia la ampliación y, luego, mantén presionada cualquier parte de la pantalla.\n"<ul><li>"• Arrastra el dedo para moverte por la pantalla."</li>\n<li>"• Levanta el dedo para alejar el contenido."</li></ul>\n\n"No se puede ampliar el teclado ni la barra de navegación."</string>
+ <string name="accessibility_screen_magnification_navbar_summary" msgid="6700716275347612310">"Cuando la ampliación esté activada, podrás acercar el contenido en pantalla.\n\n"<b>"Para usar el zoom"</b>", inicia la ampliación y, luego, presiona cualquier parte de la pantalla.\n"<ul><li>"Arrastra 2 o más dedos para desplazarte."</li>\n<li>"Pellizca con 2 o más dedos para ajustar el zoom."</li></ul>\n\n<b>"Para hacer zoom de manera temporal"</b>", inicia la ampliación y, luego, mantén presionada cualquier parte de la pantalla.\n"<ul><li>"Arrastra el dedo para moverte por la pantalla."</li>\n<li>"Levanta el dedo para alejar el contenido."</li></ul>\n\n"No puedes acercar con el teclado ni en la barra de navegación."</string>
<string name="accessibility_tutorial_dialog_title_button" msgid="3682222614034474845">"Usa el botón de accesibilidad para abrir"</string>
<string name="accessibility_tutorial_dialog_title_gesture" msgid="1342726230497913398">"Usa el gesto para abrir"</string>
<string name="accessibility_tutorial_dialog_title_gesture_settings" msgid="8539392614235820285">"Usa el nuevo gesto de accesibilidad"</string>
@@ -2140,8 +2140,7 @@
<string name="accessibility_hearingaid_title" msgid="8312145423610648518">"Audífonos"</string>
<string name="accessibility_hearingaid_not_connected_summary" msgid="6240237523789614599">"No hay audífonos conectados"</string>
<string name="accessibility_hearingaid_adding_summary" msgid="2947474468412309778">"Agregar audífonos"</string>
- <string name="accessibility_hearingaid_pair_instructions_first_message" msgid="3912093691643131154">"Para sincronizar tus audífonos, busca y presiona tu dispositivo en la pantalla siguiente."</string>
- <string name="accessibility_hearingaid_pair_instructions_second_message" msgid="5596683393607650243">"Asegúrate de que tus audífonos estén en modo de sincronización."</string>
+ <string name="accessibility_hearingaid_pair_instructions_message" msgid="3094382949733435414">"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_active_device_summary" msgid="3924362383258688984">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> activo"</string>
<plurals name="show_number_hearingaid_count" formatted="false" msgid="3160782397139295486">
<item quantity="other"><xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> audífonos guardados</item>
@@ -2490,7 +2489,6 @@
<string name="menu_stats_last_unplugged" msgid="5922246077592434526">"Durante la última desconexión para <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
<string name="menu_stats_total" msgid="8973377864854807854">"Total de usos"</string>
<string name="menu_stats_refresh" msgid="1676215433344981075">"Actualizar"</string>
- <string name="process_kernel_label" msgid="3916858646836739323">"SO Android"</string>
<string name="process_mediaserver_label" msgid="6500382062945689285">"Servidor de medios"</string>
<string name="process_dex2oat_label" msgid="2592408651060518226">"Optimización de las aplicaciones"</string>
<string name="battery_saver" msgid="8172485772238572153">"Ahorro de batería"</string>
@@ -2621,8 +2619,6 @@
<string name="no_device_admins" msgid="4846602835339095768">"No hay apps de administración de dispositivo disponibles"</string>
<string name="personal_device_admin_title" msgid="2849617316347669861">"Personal"</string>
<string name="managed_device_admin_title" msgid="7853955652864478435">"Trabajo"</string>
- <string name="sms_access_restriction_enabled" msgid="7054488078710530278">"Restringir acceso a SMS y registro de llamadas"</string>
- <string name="sms_access_restriction_enabled_summary" msgid="6851339654677842328">"Solo las apps de teléfono y mensajes predeterminadas tienen permiso de acceso a los SMS y el registro de llamadas"</string>
<string name="no_trust_agents" msgid="7450273545568977523">"No hay agentes de confianza disponibles."</string>
<string name="add_device_admin_msg" msgid="1501847129819382149">"¿Activar la app de administración?"</string>
<string name="add_device_admin" msgid="4192055385312215731">"Activar la app de administración de este dispositivo"</string>
@@ -3111,7 +3107,7 @@
<string name="keywords_app_default" msgid="5822717006354487071">"Abrir con"</string>
<string name="keywords_applications_settings" msgid="1268353611121497450">"Apps"</string>
<string name="keywords_time_zone" msgid="998254736898753085">"zona horaria"</string>
- <string name="keywords_draw_overlay" msgid="4130899177619041842">"Burbuja de chat"</string>
+ <string name="keywords_draw_overlay" msgid="1001120206241401007">"burbuja de chat, sistema, alerta, ventana, diálogo, mostrar, sobre otras apps, dibujo"</string>
<string name="keywords_flashlight" msgid="6161632177705233710">"Linterna, luz"</string>
<string name="keywords_change_wifi_state" msgid="627068244033681010">"Wi-Fi, activar o desactivar, control"</string>
<string name="keywords_more_mobile_networks" msgid="8995946622054642367">"celular, móvil, operador de telefonía celular, inalámbrico, datos, 4G, 3G, 2G, LTE"</string>
@@ -3135,7 +3131,7 @@
<string name="keywords_sounds_and_notifications_interruptions" msgid="5426093074031208917">"no interrumpir, interrumpir, interrupción, descanso"</string>
<string name="keywords_app" msgid="6334757056536837791">"RAM"</string>
<string name="keywords_location" msgid="4132655528196729043">"nearby, ubicación, historial, informe, GPS"</string>
- <string name="keywords_accounts" msgid="1957925565953357627">"cuenta"</string>
+ <string name="keywords_accounts" msgid="4479029747403203867">"cuenta, agregar una cuenta, perfil de trabajo"</string>
<string name="keywords_users" msgid="3434190133131387942">"restricción, restringir, restringido"</string>
<string name="keywords_keyboard_and_ime" msgid="9143339015329957107">"corrección de texto, corregir, sonido, vibrar, automático, idioma, gesto, sugerir, sugerencia, tema, ofensivo, palabra, tipo, emoji, internacional"</string>
<string name="keywords_reset_apps" msgid="5293291209613191845">"restablecer, preferencias, predeterminadas"</string>
@@ -3173,6 +3169,7 @@
<string name="keywords_storage_settings" msgid="297283751968446577">"memoria, caché, datos, eliminar, borrar, liberar, espacio"</string>
<string name="keywords_bluetooth_settings" msgid="6804844062789439858">"conectado, dispositivo, audífonos, auriculares, bocina, inalámbrico, sincronizar, auricular, música, multimedia"</string>
<string name="keywords_wallpaper" msgid="5058364390917429896">"fondo, pantalla, pantalla bloqueada, tema"</string>
+ <string name="keywords_styles" msgid="5828725481814049422">"forma del ícono, color destacado, fuente"</string>
<string name="keywords_assist_input" msgid="5017533309492679287">"predeterminado, asistente"</string>
<string name="keywords_default_payment_app" msgid="3838565809518896799">"pago, predeterminado"</string>
<string name="keywords_ambient_display" msgid="3103487805748659132">"notificación entrante"</string>
@@ -3182,7 +3179,7 @@
<string name="keywords_notification_vibration" msgid="31924624421190547">"háptica, vibrar, sensibilidad"</string>
<string name="keywords_battery_saver_sticky" msgid="5586215686021650278">"ahorro de batería, fijo, permanente, ahorro de energía, batería"</string>
<string name="keywords_battery_saver_schedule" msgid="7358789228486231944">"rutina, programa, ahorro de batería, ahorro de energía, batería, automático, porcentaje"</string>
- <string name="keywords_add_an_account" msgid="6488139919428902434">"perfil de trabajo"</string>
+ <string name="keywords_enhance_4g_lte" msgid="2273810564244790859">"volte, llamadas avanzadas, llamadas mediante 4G"</string>
<string name="default_sound" msgid="8821684447333687810">"Sonido predeterminado"</string>
<string name="sound_settings_summary" msgid="4100853606668287965">"Volumen de tono: <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
<string name="sound_dashboard_summary" msgid="3402435125958012986">"Volumen, vibración, No interrumpir"</string>
@@ -3887,7 +3884,6 @@
<string name="permit_draw_overlay" msgid="7456536798718633432">"Permitir mostrar sobre otras apps"</string>
<string name="allow_overlay_description" msgid="8961670023925421358">"Permite que esta app se muestre sobre otras en uso. Es posible que interfiera con el uso de esas apps o cambie afecte su apariencia o el comportamiento."</string>
<string name="keywords_vr_listener" msgid="7441221822576384680">"rv, procesador de realidad virtual, estéreo, servicio de ayuda"</string>
- <string name="keywords_system_alert_window" msgid="5049498015597864850">"sistema, alerta, ventana, cuadro de diálogo, mostrar sobre otras apps"</string>
<string name="overlay_settings" msgid="6930854109449524280">"Mostrar sobre otras apps"</string>
<string name="system_alert_window_summary" msgid="602892301318324492">"<xliff:g id="COUNT_0">%1$d</xliff:g> de <xliff:g id="COUNT_1">%2$d</xliff:g> apps que pueden mostrarse sobre otras apps"</string>
<string name="filter_overlay_apps" msgid="6965969283342557573">"Aplicaciones con permiso"</string>
@@ -4123,7 +4119,6 @@
<string name="notification_log_details_none" msgid="184131801230614059">"ninguno"</string>
<string name="notification_log_details_ranking_null" msgid="244660392058720919">"Falta el objeto de la clasificación."</string>
<string name="notification_log_details_ranking_none" msgid="599607025882587844">"El objeto de la clasificación no incluye esta tecla."</string>
- <string name="theme_customization_category" msgid="1049181544004163283">"Temas"</string>
<string name="theme_customization_device_default" msgid="5058147707906551368">"Opción predeterminada del dispositivo"</string>
<string name="display_cutout_emulation" msgid="7466869822418376317">"Corte de pantalla"</string>
<string name="display_cutout_emulation_keywords" msgid="4495418317471622562">"recorte de la pantalla, corte"</string>
@@ -4549,6 +4544,8 @@
<string name="network_connection_errorstate_dialog_message" msgid="6953778550775646710">"Se produjo un error. La aplicación canceló la solicitud para elegir un dispositivo."</string>
<string name="network_connection_connect_successful" msgid="5935510954474494928">"Conexión exitosa"</string>
<string name="network_connection_request_dialog_showall" msgid="6938922880244567521">"Mostrar todo"</string>
+ <string name="network_connection_searching_message" msgid="4638576789450817530">"Buscando dispositivo…"</string>
+ <string name="network_connection_connecting_message" msgid="3740982406609245654">"Estableciendo conexión con dispositivo…"</string>
<plurals name="show_bluetooth_devices" formatted="false" msgid="1715020480026568408">
<item quantity="other"><xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> dispositivos conectados</item>
<item quantity="one"><xliff:g id="NUMBER_DEVICE_COUNT_0">%1$d</xliff:g> dispositivo conectado</item>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index d0dbd57..f152d5a 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -360,8 +360,6 @@
<string name="security_enable_widgets_disabled_summary" msgid="6392489775303464905">"Inhabilitado por el administrador"</string>
<string name="lockdown_settings_title" msgid="7393790212603280213">"Mostrar opción de bloqueo de seguridad"</string>
<string name="lockdown_settings_summary" msgid="4359438673563318171">"Mostrar la opción del botón de encendido que desactiva Smart Lock, el desbloqueo por biometría y las notificaciones en la pantalla de bloqueo"</string>
- <string name="trust_agents_extend_unlock_title" msgid="2796555263565097031">"Los agentes de confianza solo extienden el desbloqueo"</string>
- <string name="trust_agents_extend_unlock_summary" msgid="3976344969220255010">"Si se habilita esta opción, los agentes de confianza mantendrán el dispositivo desbloqueado durante más tiempo, pero ya no podrán desbloquear un dispositivo bloqueado"</string>
<string name="trust_lost_locks_screen_title" msgid="2992742466966021682">"Bloquear pantalla si no hay confianza"</string>
<string name="trust_lost_locks_screen_summary" msgid="693784434582021206">"Si se habilita esta opción, el dispositivo se bloqueará cuando el último agente de confianza pierda la confianza"</string>
<string name="owner_info_settings_summary" msgid="7472393443779227052">"Ninguno"</string>
@@ -937,6 +935,7 @@
<string name="wifi_eap_identity" msgid="4359453783379679103">"Identidad"</string>
<string name="wifi_eap_anonymous" msgid="2989469344116577955">"Identidad anónima"</string>
<string name="wifi_password" msgid="5948219759936151048">"Contraseña"</string>
+ <string name="wifi_sae_password_id" msgid="1697832722221765763">"ID de contraseña SAE"</string>
<string name="wifi_show_password" msgid="6461249871236968884">"Mostrar contraseña"</string>
<string name="wifi_ap_band_config" msgid="1611826705989117930">"Seleccionar banda de AP"</string>
<string name="wifi_ap_choose_auto" msgid="2677800651271769965">"Automática"</string>
@@ -957,7 +956,6 @@
<string name="wifi_dpp_share_wifi" msgid="9065890131734833809">"Compartir Wi‑Fi"</string>
<string name="wifi_dpp_scan_qr_code_with_another_device" msgid="5854392840857123065">"Escanea el código QR con otro dispositivo para conectarlo a \"<xliff:g id="SSID">%1$s</xliff:g>\" y compartir la contraseña"</string>
<string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="4436318319178361543">"Escanea el código QR con otro dispositivo para conectarte a \"<xliff:g id="SSID">%1$s</xliff:g>\""</string>
- <string name="wifi_dpp_could_not_detect_valid_qr_code" msgid="641893675646330576">"No se ha podido leer el código QR. Encuadra bien el código y vuelve a intentarlo."</string>
<string name="wifi_dpp_failure_authentication_or_configuration" msgid="3372757783382381044">"Vuelve a intentarlo. Si el problema persiste, ponte en contacto con el fabricante del dispositivo"</string>
<string name="wifi_dpp_failure_not_compatible" msgid="2829930473520603740">"Ha habido un error"</string>
<string name="wifi_dpp_failure_timeout" msgid="5228320772245820458">"Comprueba que el dispositivo esté enchufado, cargado y encendido"</string>
@@ -980,6 +978,7 @@
<string name="wifi_dpp_hotspot_password" msgid="4120419278831581613">"Contraseña del punto de acceso: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
<string name="wifi_dpp_add_device" msgid="4072206063308645677">"Añadir dispositivo"</string>
<string name="wifi_dpp_connect_network_using_qr_code" msgid="3887335309163999665">"Usa un código QR para añadir un dispositivo a esta red"</string>
+ <string name="wifi_dpp_qr_code_is_not_valid_format" msgid="3700087439867692944">"El formato del código QR no es válido"</string>
<string name="retry" msgid="6472609612090877557">"Reintentar"</string>
<string name="wifi_shared" msgid="844142443226926070">"Compartir con otros usuarios del dispositivo"</string>
<string name="wifi_unchanged" msgid="3410422020930397102">"(no modificada)"</string>
@@ -1129,6 +1128,7 @@
<string name="emergency_address_title" msgid="932729250447887545">"Dirección de emergencia"</string>
<string name="emergency_address_summary" msgid="7751971156196115129">"Se utiliza como tu ubicación al hacer una llamada de emergencia por Wi‑Fi"</string>
<string name="private_dns_help_message" msgid="3299567069152568958"><annotation id="url">"Más información"</annotation>" sobre las funciones de DNS privado"</string>
+ <string name="private_dns_mode_on" msgid="5882613439541371003">"Activado"</string>
<string name="wifi_calling_pref_managed_by_carrier" msgid="6845711858866828986">"Ajuste gestionado por el operador"</string>
<string name="wifi_calling_settings_activation_instructions" msgid="7492509632478260955">"Activar la función de llamada por Wi‑Fi"</string>
<string name="wifi_calling_turn_on" msgid="1171403510313983983">"Activar la función de llamada por Wi‑Fi"</string>
@@ -1872,7 +1872,7 @@
<string name="default_emergency_app" msgid="1951760659640369980">"Aplicación Emergencia"</string>
<string name="reset_app_preferences" msgid="1321050641018356925">"Recuperar ajustes de aplicaciones"</string>
<string name="reset_app_preferences_title" msgid="6093179367325336662">"¿Recuperar preferencias de las aplicaciones?"</string>
- <string name="reset_app_preferences_desc" msgid="4822447731869201512">"Se recuperarán todas las preferencias de:\n\n"<li>"Aplicaciones inhabilitadas"</li>\n<li>"Notificaciones de aplicaciones inhabilitadas"</li>\n<li>"Aplicaciones predeterminadas"</li>\n<li>"Restricciones de datos móviles de aplicaciones"</li>\n<li>"Restricciones de permisos"</li>\n\n"No se perderán los datos de las aplicaciones."</string>
+ <string name="reset_app_preferences_desc" msgid="731757609326016760">"Se restablecerán todas las preferencias de:\n\n"<li>"Aplicaciones desactivadas"</li>\n<li>"Notificaciones de aplicaciones desactivadas"</li>\n<li>"Aplicaciones para acciones predeterminadas"</li>\n<li>"Restricciones de datos en segundo plano de aplicaciones"</li>\n<li>"Restricciones de permisos"</li>\n\n"No se perderán los datos de las aplicaciones."</string>
<string name="reset_app_preferences_button" msgid="2559089511841281242">"Recuperar aplicaciones"</string>
<string name="manage_space_text" msgid="8852711522447794676">"Administrar espacio"</string>
<string name="filter" msgid="2018011724373033887">"Filtrar"</string>
@@ -2087,7 +2087,7 @@
<string name="accessibility_screen_magnification_short_summary" msgid="3411979839172752057">"Toca tres veces para hacer zoom"</string>
<string name="accessibility_screen_magnification_navbar_short_summary" msgid="3693116360267980492">"Toca un botón para ampliar"</string>
<string name="accessibility_screen_magnification_summary" msgid="5258868553337478505"><b>"Para ampliar el contenido"</b>", toca la pantalla tres veces rápidamente.\n"<ul><li>"Arrastra dos o más dedos para desplazarte."</li>\n<li>"Pellizca la pantalla con dos dedos o más para ajustar el zoom."</li></ul>\n\n<b>"Para ampliar elementos de forma temporal"</b>", toca la pantalla tres veces rápidamente y mantenla pulsada en el tercer toque.\n"<ul><li>"Arrastra el dedo para desplazarte por la pantalla."</li>\n<li>"Levanta el dedo para reducir la imagen."</li></ul>\n\n"No se puede ampliar el teclado ni la barra de navegación."</string>
- <string name="accessibility_screen_magnification_navbar_summary" msgid="2272878354599332009">"Si la ampliación está activada, puedes ampliar la pantalla.\n\n"<b>"Para aumentar"</b>", inicia la ampliación y, a continuación toca cualquier parte de la pantalla.\n"<ul><li>"• Arrastra dos o más dedos para desplazarte."</li>\n<li>"• Pellizca la pantalla con dos o más dedos para ajustar el zoom."</li></ul>\n\n<b>"Para hacer zoom temporalmente"</b>", inicia la ampliación y mantén pulsada cualquier parte de la pantalla.\n"<ul><li>"• Arrastra el dedo para desplazarte por la pantalla."</li>\n<li>"• Levanta el dedo para dejar de ampliar."</li></ul>\n\n"No se puede ampliar el teclado ni la barra de navegación."</string>
+ <string name="accessibility_screen_magnification_navbar_summary" msgid="6700716275347612310">"Si la ampliación está activada, puedes ampliar la pantalla.\n\n"<b>"Para ampliar"</b>", inicia la ampliación y toca la parte de la pantalla que quieras ampliar.\n"<ul><li>"Arrastra al menos dos dedos para desplazarte."</li>\n<li>"Pellizca la pantalla con al menos dos dedos para ajustar el zoom."</li></ul>\n\n<b>"Para ampliar elementos temporalmente"</b>", inicia la ampliación y mantén pulsada cualquier parte de la pantalla.\n"<ul><li>"Arrastra un dedo para desplazarte por la pantalla."</li>\n<li>"Levanta el dedo para reducir la imagen."</li></ul>\n\n"No se puede ampliar el teclado ni la barra de navegación."</string>
<string name="accessibility_tutorial_dialog_title_button" msgid="3682222614034474845">"Usa el botón de accesibilidad para abrir"</string>
<string name="accessibility_tutorial_dialog_title_gesture" msgid="1342726230497913398">"Usar gesto para abrir"</string>
<string name="accessibility_tutorial_dialog_title_gesture_settings" msgid="8539392614235820285">"Usa el nuevo gesto de accesibilidad"</string>
@@ -2140,8 +2140,7 @@
<string name="accessibility_hearingaid_title" msgid="8312145423610648518">"Audífonos"</string>
<string name="accessibility_hearingaid_not_connected_summary" msgid="6240237523789614599">"No hay audífonos conectados"</string>
<string name="accessibility_hearingaid_adding_summary" msgid="2947474468412309778">"Añadir audífonos"</string>
- <string name="accessibility_hearingaid_pair_instructions_first_message" msgid="3912093691643131154">"Para vincular audífonos, toca tu dispositivo en la siguiente pantalla."</string>
- <string name="accessibility_hearingaid_pair_instructions_second_message" msgid="5596683393607650243">"Comprueba que tus audífonos estén en modo de vinculación."</string>
+ <string name="accessibility_hearingaid_pair_instructions_message" msgid="3094382949733435414">"Para vincular audífonos, toca tu dispositivo en la siguiente pantalla. Comprueba que tus audífonos estén en modo de vinculación."</string>
<string name="accessibility_hearingaid_active_device_summary" msgid="3924362383258688984">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> está activo"</string>
<plurals name="show_number_hearingaid_count" formatted="false" msgid="3160782397139295486">
<item quantity="other">Se han guardado <xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> audífonos</item>
@@ -2490,7 +2489,6 @@
<string name="menu_stats_last_unplugged" msgid="5922246077592434526">"Desde la última vez que se desenchufó para <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
<string name="menu_stats_total" msgid="8973377864854807854">"Total de consumo"</string>
<string name="menu_stats_refresh" msgid="1676215433344981075">"Actualizar"</string>
- <string name="process_kernel_label" msgid="3916858646836739323">"SO Android"</string>
<string name="process_mediaserver_label" msgid="6500382062945689285">"Servidor multimedia"</string>
<string name="process_dex2oat_label" msgid="2592408651060518226">"Optimización de aplicación"</string>
<string name="battery_saver" msgid="8172485772238572153">"Ahorro de batería"</string>
@@ -2621,8 +2619,6 @@
<string name="no_device_admins" msgid="4846602835339095768">"No hay aplicaciones de administrador de dispositivos disponibles"</string>
<string name="personal_device_admin_title" msgid="2849617316347669861">"Personal"</string>
<string name="managed_device_admin_title" msgid="7853955652864478435">"Trabajo"</string>
- <string name="sms_access_restriction_enabled" msgid="7054488078710530278">"Restringir acceso al registro de llamadas y SMS"</string>
- <string name="sms_access_restriction_enabled_summary" msgid="6851339654677842328">"Solo las aplicaciones de teléfono y mensajería predeterminadas tienen permiso para acceder al registro de llamadas y SMS"</string>
<string name="no_trust_agents" msgid="7450273545568977523">"No hay agentes de confianza disponibles"</string>
<string name="add_device_admin_msg" msgid="1501847129819382149">"¿Activar administrador de dispositivos?"</string>
<string name="add_device_admin" msgid="4192055385312215731">"Activar esta aplicación de administrador de dispositivos"</string>
@@ -3111,7 +3107,7 @@
<string name="keywords_app_default" msgid="5822717006354487071">"Abrir con"</string>
<string name="keywords_applications_settings" msgid="1268353611121497450">"Aplicaciones"</string>
<string name="keywords_time_zone" msgid="998254736898753085">"Zona horaria"</string>
- <string name="keywords_draw_overlay" msgid="4130899177619041842">"Encabezado del chat"</string>
+ <string name="keywords_draw_overlay" msgid="1001120206241401007">"encabezado del chat, sistema, alerta, ventana, cuadro de diálogo, mostrar sobre otras aplicaciones, dibujar"</string>
<string name="keywords_flashlight" msgid="6161632177705233710">"Linterna, luz"</string>
<string name="keywords_change_wifi_state" msgid="627068244033681010">"wifi, wi‑fi, alternar, controlar"</string>
<string name="keywords_more_mobile_networks" msgid="8995946622054642367">"móvil, operador móvil, conexión inalámbrica, datos, 4G, 3G, 2G, LTE"</string>
@@ -3135,7 +3131,7 @@
<string name="keywords_sounds_and_notifications_interruptions" msgid="5426093074031208917">"no molestar, interrumpir, interrupción, descanso"</string>
<string name="keywords_app" msgid="6334757056536837791">"RAM"</string>
<string name="keywords_location" msgid="4132655528196729043">"cercano, ubicación, historial, informes, GPS"</string>
- <string name="keywords_accounts" msgid="1957925565953357627">"cuenta"</string>
+ <string name="keywords_accounts" msgid="4479029747403203867">"cuenta, añadir una cuenta, perfil de trabajo"</string>
<string name="keywords_users" msgid="3434190133131387942">"restricción, restringir, restringido"</string>
<string name="keywords_keyboard_and_ime" msgid="9143339015329957107">"corrección de texto, corregir, sonido, vibración, automático, idioma, gesto, sugerencia, tema, ofensivo, palabra, escribir, emoji, internacional"</string>
<string name="keywords_reset_apps" msgid="5293291209613191845">"recuperar, preferencias, predeterminadas"</string>
@@ -3173,6 +3169,7 @@
<string name="keywords_storage_settings" msgid="297283751968446577">"memoria, caché, eliminar, borrar, liberar, espacio"</string>
<string name="keywords_bluetooth_settings" msgid="6804844062789439858">"conectado, dispositivo, auriculares, cascos, altavoz, inalámbrico, vincular, auriculares de botón, música, contenido multimedia"</string>
<string name="keywords_wallpaper" msgid="5058364390917429896">"fondo, pantalla, pantalla de bloqueo, tema"</string>
+ <string name="keywords_styles" msgid="5828725481814049422">"forma del icono, color para destacar, fuente"</string>
<string name="keywords_assist_input" msgid="5017533309492679287">"predeterminado, asistente"</string>
<string name="keywords_default_payment_app" msgid="3838565809518896799">"pago, predeterminado"</string>
<string name="keywords_ambient_display" msgid="3103487805748659132">"notificación entrante"</string>
@@ -3182,7 +3179,7 @@
<string name="keywords_notification_vibration" msgid="31924624421190547">"háptica, vibrar, sensibilidad"</string>
<string name="keywords_battery_saver_sticky" msgid="5586215686021650278">"ahorro de batería, batería fija, duradera, ahorro de batería, batería"</string>
<string name="keywords_battery_saver_schedule" msgid="7358789228486231944">"rutina, horario, ahorro de batería, ahorro de corriente, batería, automático, porcentaje"</string>
- <string name="keywords_add_an_account" msgid="6488139919428902434">"perfil de trabajo"</string>
+ <string name="keywords_enhance_4g_lte" msgid="2273810564244790859">"volte, llamadas avanzadas, llamadas 4g"</string>
<string name="default_sound" msgid="8821684447333687810">"Sonido predeterminado"</string>
<string name="sound_settings_summary" msgid="4100853606668287965">"Volumen del tono de llamada al <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
<string name="sound_dashboard_summary" msgid="3402435125958012986">"Volumen, vibración y No molestar"</string>
@@ -3889,7 +3886,6 @@
<string name="permit_draw_overlay" msgid="7456536798718633432">"Permitir mostrar sobre otras aplicaciones"</string>
<string name="allow_overlay_description" msgid="8961670023925421358">"Permite que esta aplicación se muestre sobre otras aplicaciones que estés utilizando. Esto puede interferir en el uso de dichas aplicaciones o cambiar el modo en el que se muestran o se comportan."</string>
<string name="keywords_vr_listener" msgid="7441221822576384680">"rv realidad virtual procesador estéreo servicio ayuda"</string>
- <string name="keywords_system_alert_window" msgid="5049498015597864850">"sistema alerta ventana cuadro de diálogo mostrar sobre otras aplicaciones"</string>
<string name="overlay_settings" msgid="6930854109449524280">"Mostrar sobre otras apps"</string>
<string name="system_alert_window_summary" msgid="602892301318324492">"<xliff:g id="COUNT_0">%1$d</xliff:g> de <xliff:g id="COUNT_1">%2$d</xliff:g> aplicaciones que se pueden mostrar sobre otras"</string>
<string name="filter_overlay_apps" msgid="6965969283342557573">"Aplicaciones con permiso"</string>
@@ -4125,7 +4121,6 @@
<string name="notification_log_details_none" msgid="184131801230614059">"ninguno"</string>
<string name="notification_log_details_ranking_null" msgid="244660392058720919">"Falta un objeto de la clasificación."</string>
<string name="notification_log_details_ranking_none" msgid="599607025882587844">"El objeto de la clasificación no incluye esta tecla."</string>
- <string name="theme_customization_category" msgid="1049181544004163283">"Temas"</string>
<string name="theme_customization_device_default" msgid="5058147707906551368">"Opción predeterminada del dispositivo"</string>
<string name="display_cutout_emulation" msgid="7466869822418376317">"Recorte de la pantalla"</string>
<string name="display_cutout_emulation_keywords" msgid="4495418317471622562">"recorte de la pantalla, corte"</string>
@@ -4551,6 +4546,8 @@
<string name="network_connection_errorstate_dialog_message" msgid="6953778550775646710">"Se ha producido un error. La aplicación ha cancelado la solicitud para elegir un dispositivo."</string>
<string name="network_connection_connect_successful" msgid="5935510954474494928">"Se ha conectado correctamente"</string>
<string name="network_connection_request_dialog_showall" msgid="6938922880244567521">"Mostrar todo"</string>
+ <string name="network_connection_searching_message" msgid="4638576789450817530">"Buscando dispositivo…"</string>
+ <string name="network_connection_connecting_message" msgid="3740982406609245654">"Conectando con el dispositivo…"</string>
<plurals name="show_bluetooth_devices" formatted="false" msgid="1715020480026568408">
<item quantity="other"><xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> dispositivos conectados</item>
<item quantity="one"><xliff:g id="NUMBER_DEVICE_COUNT_0">%1$d</xliff:g> dispositivo conectado</item>
diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml
index 10768e5..0a455c9 100644
--- a/res/values-et/strings.xml
+++ b/res/values-et/strings.xml
@@ -360,8 +360,6 @@
<string name="security_enable_widgets_disabled_summary" msgid="6392489775303464905">"Administraatori keelatud"</string>
<string name="lockdown_settings_title" msgid="7393790212603280213">"Kuva lukustamise valik"</string>
<string name="lockdown_settings_summary" msgid="4359438673563318171">"Kuvatakse toitenupu valik, mis lülitab funktsiooni Smart Lock, biomeetrilise avamise ja lukustuskuval kuvatavad märguanded välja"</string>
- <string name="trust_agents_extend_unlock_title" msgid="2796555263565097031">"Usaldusväärsed agendid hoiavad kauem avatuna"</string>
- <string name="trust_agents_extend_unlock_summary" msgid="3976344969220255010">"Kui see on lubatud, hoiavad usaldusväärsed agendid teie seadme kauem avatuna, kuid ei saa enam avada lukustatud seadet."</string>
<string name="trust_lost_locks_screen_title" msgid="2992742466966021682">"Lukusta ekraan usalduse kadumisel"</string>
<string name="trust_lost_locks_screen_summary" msgid="693784434582021206">"Kui see on lubatud, lukustub seade, kui viimane usaldusväärne agent kaotab usalduse"</string>
<string name="owner_info_settings_summary" msgid="7472393443779227052">"Puudub"</string>
@@ -937,6 +935,7 @@
<string name="wifi_eap_identity" msgid="4359453783379679103">"Identiteet"</string>
<string name="wifi_eap_anonymous" msgid="2989469344116577955">"Anonüümne identiteet"</string>
<string name="wifi_password" msgid="5948219759936151048">"Parool"</string>
+ <string name="wifi_sae_password_id" msgid="1697832722221765763">"SAE parooli identifikaator"</string>
<string name="wifi_show_password" msgid="6461249871236968884">"Kuva parool"</string>
<string name="wifi_ap_band_config" msgid="1611826705989117930">"AP-riba valimine"</string>
<string name="wifi_ap_choose_auto" msgid="2677800651271769965">"Automaatne"</string>
@@ -957,7 +956,6 @@
<string name="wifi_dpp_share_wifi" msgid="9065890131734833809">"WiFi jagamine"</string>
<string name="wifi_dpp_scan_qr_code_with_another_device" msgid="5854392840857123065">"Skannige see QR-kood, et luua ühendus võrguga „<xliff:g id="SSID">%1$s</xliff:g>” ja jagada parooli"</string>
<string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="4436318319178361543">"Võrguga „<xliff:g id="SSID">%1$s</xliff:g>” ühenduse loomiseks skannige see QR-kood"</string>
- <string name="wifi_dpp_could_not_detect_valid_qr_code" msgid="641893675646330576">"Ei õnnestunud QR-koodi lugeda. Sisestage kood uuesti ja proovige uuesti"</string>
<string name="wifi_dpp_failure_authentication_or_configuration" msgid="3372757783382381044">"Proovige uuesti. Kui see probleem jätkub, võtke ühendust seadme tootjaga"</string>
<string name="wifi_dpp_failure_not_compatible" msgid="2829930473520603740">"Midagi läks valesti"</string>
<string name="wifi_dpp_failure_timeout" msgid="5228320772245820458">"Veenduge, et seade oleks ühendatud, laetud ja sisse lülitatud"</string>
@@ -980,6 +978,7 @@
<string name="wifi_dpp_hotspot_password" msgid="4120419278831581613">"Kuumkoha parool: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
<string name="wifi_dpp_add_device" msgid="4072206063308645677">"Lisa seade"</string>
<string name="wifi_dpp_connect_network_using_qr_code" msgid="3887335309163999665">"Kasutage sellesse võrku seadme lisamiseks QR-koodi"</string>
+ <string name="wifi_dpp_qr_code_is_not_valid_format" msgid="3700087439867692944">"QR-kood ei ole sobilik vorming"</string>
<string name="retry" msgid="6472609612090877557">"Proovi uuesti"</string>
<string name="wifi_shared" msgid="844142443226926070">"Jaga seadme teiste kasutajatega"</string>
<string name="wifi_unchanged" msgid="3410422020930397102">"(muutmata)"</string>
@@ -1129,6 +1128,7 @@
<string name="emergency_address_title" msgid="932729250447887545">"Hädaolukorra aadress"</string>
<string name="emergency_address_summary" msgid="7751971156196115129">"Seda kasutatakse WiFi kaudu hädaabikõne tegemisel teie asukohana"</string>
<string name="private_dns_help_message" msgid="3299567069152568958"><annotation id="url">"Lisateave"</annotation>" privaatse DNS-i funktsioonide kohta"</string>
+ <string name="private_dns_mode_on" msgid="5882613439541371003">"Sees"</string>
<string name="wifi_calling_pref_managed_by_carrier" msgid="6845711858866828986">"Seadet haldab operaator"</string>
<string name="wifi_calling_settings_activation_instructions" msgid="7492509632478260955">"Aktiveerige WiFi-kõned"</string>
<string name="wifi_calling_turn_on" msgid="1171403510313983983">"Lülitage WiFi-kõned sisse"</string>
@@ -1872,7 +1872,7 @@
<string name="default_emergency_app" msgid="1951760659640369980">"Hädaabirakendus"</string>
<string name="reset_app_preferences" msgid="1321050641018356925">"Lähtesta rakenduste eelistused"</string>
<string name="reset_app_preferences_title" msgid="6093179367325336662">"Lähtestada rakenduste eelistused?"</string>
- <string name="reset_app_preferences_desc" msgid="4822447731869201512">"See lähtestab kõik järgmised eelistused:\n\n "<li>"Keelatud rakendused"</li>\n" "<li>"Keelatud rakenduste märguanded"</li>\n" "<li>"Toimingute vaikerakendused"</li>\n" "<li>"Rakenduste taustaandmete piirangud"</li>\n" "<li>"Igasugused lubade piirangud"</li>\n\n"Rakenduste andmed säilivad."</string>
+ <string name="reset_app_preferences_desc" msgid="731757609326016760">"See lähtestab kõik järgmised eelistused.\n\n"<li>"Keelatud rakendused"</li>\n<li>"Keelatud rakenduste märguanded"</li>\n<li>"Toimingute vaikerakendused"</li>\n<li>"Rakenduste taustaandmete piirangud"</li>\n<li>"Mis tahes lubade piirangud"</li>\n\n"Rakenduste andmed säilivad."</string>
<string name="reset_app_preferences_button" msgid="2559089511841281242">"Lähtesta rakendused"</string>
<string name="manage_space_text" msgid="8852711522447794676">"Halda ruumi"</string>
<string name="filter" msgid="2018011724373033887">"Filter"</string>
@@ -2087,7 +2087,7 @@
<string name="accessibility_screen_magnification_short_summary" msgid="3411979839172752057">"Suumimiseks puudutage kolm korda"</string>
<string name="accessibility_screen_magnification_navbar_short_summary" msgid="3693116360267980492">"Suumimiseks puudutage nuppu"</string>
<string name="accessibility_screen_magnification_summary" msgid="5258868553337478505"><b>"Suumimiseks"</b>" puudutage ekraani kiiresti kolm korda.\n"<ul><li>"Kerimiseks lohistage vähemalt kahe sõrmega"</li>\n<li>"Suumi reguleerimiseks suruge vähemalt kaht sõrme kokku"</li></ul>\n\n<b>"Ajutiselt suumimiseks"</b>" puudutage ekraani kiiresti kolm korda ja hoidke pärast kolmandat puudutust sõrme ekraanil.\n"<ul><li>"Lohistage ekraanil liikumiseks"</li>\n<li>"Väljasuumimiseks tõstke sõrm ekraanilt"</li></ul>\n\n"Klaviatuuril ja navigeerimisribal ei saa suumida."</string>
- <string name="accessibility_screen_magnification_navbar_summary" msgid="2272878354599332009">"Kui suurendus on sisse lülitatud, võite oma ekraanil sisse suumida.\n\n"<b>"Suumimiseks"</b>" alustage suurendamist, seejärel puudutage ekraanil mis tahes kohta.\n"<ul><li>"• Lohistage kerimiseks vähemalt kahe sõrmega"</li>\n<li>"• Liigutage suumi reguleerimiseks vähemalt kahte sõrme kokku-lahku"</li></ul>\n\n<b>"Ajutiselt suumimiseks"</b>" alustage suurendamist, seejärel puudutage ekraanil pikalt mis tahes kohta.\n"<ul><li>"• Lohistage ekraanikuval ringi liikumiseks"</li>\n<li>"• Tõstke väljasuumimiseks sõrm üles"</li></ul>\n\n"Te ei saa sisse suumida klaviatuuril ega navigeerimisribal."</string>
+ <string name="accessibility_screen_magnification_navbar_summary" msgid="6700716275347612310">"Kui suurendusfunktsioon on sisse lülitatud, saate oma ekraanikuval sisse suumida.\n\n"<b>"Suumimiseks"</b>" käivitage suurendusfunktsioon ja puudutage siis ekraanikuval mis tahes kohta.\n"<ul><li>"Kerimiseks lohistage kahe või enama sõrmega."</li>\n<li>"Suumi kohandamiseks pigistage kahte või enamat sõrme kokku."</li></ul>\n\n<b>"Ajutiseks suumimiseks"</b>" käivitage suurendusfunktsioon ja puudutage siis ekraanikuval pikalt mis tahes kohta.\n"<ul><li>"Ekraanikuval teisaldamiseks lohistage sõrme."</li>\n<li>"Väljasuumimiseks tõstke sõrm ekraanilt."</li></ul>\n\n"Klaviatuuril ega navigeerimisribal ei saa sisse suumida."</string>
<string name="accessibility_tutorial_dialog_title_button" msgid="3682222614034474845">"Kasutage avamiseks juurdepääsetavuse nuppu"</string>
<string name="accessibility_tutorial_dialog_title_gesture" msgid="1342726230497913398">"Kasutage avamiseks liigutust"</string>
<string name="accessibility_tutorial_dialog_title_gesture_settings" msgid="8539392614235820285">"Kasutage uut juurdepääsetavuse liigutust"</string>
@@ -2140,8 +2140,7 @@
<string name="accessibility_hearingaid_title" msgid="8312145423610648518">"Kuuldeaparaadid"</string>
<string name="accessibility_hearingaid_not_connected_summary" msgid="6240237523789614599">"Ühtegi kuuldeaparaati pole ühendatud"</string>
<string name="accessibility_hearingaid_adding_summary" msgid="2947474468412309778">"Lisa kuuldeaparaate"</string>
- <string name="accessibility_hearingaid_pair_instructions_first_message" msgid="3912093691643131154">"Sidumiseks leidke järgmisel kuval oma seade ja puudutage seda."</string>
- <string name="accessibility_hearingaid_pair_instructions_second_message" msgid="5596683393607650243">"Veenduge, et kuuldeaparaat oleks sidumisrežiimis."</string>
+ <string name="accessibility_hearingaid_pair_instructions_message" msgid="3094382949733435414">"Kuuldeaparaatide sidumiseks leidke järgmisel kuval oma seade ja puudutage seda. Veenduge, et kuuldeaparaat oleks sidumisrežiimis."</string>
<string name="accessibility_hearingaid_active_device_summary" msgid="3924362383258688984">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> on aktiivne"</string>
<plurals name="show_number_hearingaid_count" formatted="false" msgid="3160782397139295486">
<item quantity="other"><xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> salvestatud kuuldeaparaati</item>
@@ -2490,7 +2489,6 @@
<string name="menu_stats_last_unplugged" msgid="5922246077592434526">"Alates viimasest lahutamisest <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
<string name="menu_stats_total" msgid="8973377864854807854">"Kasutus kokku"</string>
<string name="menu_stats_refresh" msgid="1676215433344981075">"Värskenda"</string>
- <string name="process_kernel_label" msgid="3916858646836739323">"Android OS"</string>
<string name="process_mediaserver_label" msgid="6500382062945689285">"Meediumiserver"</string>
<string name="process_dex2oat_label" msgid="2592408651060518226">"Rakenduse optimeerimine"</string>
<string name="battery_saver" msgid="8172485772238572153">"Akusäästja"</string>
@@ -2621,8 +2619,6 @@
<string name="no_device_admins" msgid="4846602835339095768">"Saadaval ei ole ühtki seadme administraatori rakendust"</string>
<string name="personal_device_admin_title" msgid="2849617316347669861">"Isiklik"</string>
<string name="managed_device_admin_title" msgid="7853955652864478435">"Töö"</string>
- <string name="sms_access_restriction_enabled" msgid="7054488078710530278">"SMS-idele ja kõnelogile juurdepääsu piiramine"</string>
- <string name="sms_access_restriction_enabled_summary" msgid="6851339654677842328">"SMS-idele ja kõnelogile pääsevad juurde ainult telefoni ning sõnumside vaikerakendused"</string>
<string name="no_trust_agents" msgid="7450273545568977523">"Saadaval pole ühtegi usaldusväärset agenti"</string>
<string name="add_device_admin_msg" msgid="1501847129819382149">"Kas aktiveerida admin. rakendus?"</string>
<string name="add_device_admin" msgid="4192055385312215731">"Aktiveeri seadme administraatori rakendus"</string>
@@ -3111,7 +3107,7 @@
<string name="keywords_app_default" msgid="5822717006354487071">"Ava rakendusega"</string>
<string name="keywords_applications_settings" msgid="1268353611121497450">"Rakendused"</string>
<string name="keywords_time_zone" msgid="998254736898753085">"ajavöönd"</string>
- <string name="keywords_draw_overlay" msgid="4130899177619041842">"Vestlusmull"</string>
+ <string name="keywords_draw_overlay" msgid="1001120206241401007">"Vestlusmull, süsteem, teatis, aken, dialoog, kuvamine, muude rakenduste peal, joonistamine"</string>
<string name="keywords_flashlight" msgid="6161632177705233710">"Taskulamp, valgus, lamp"</string>
<string name="keywords_change_wifi_state" msgid="627068244033681010">"wifi, WiFi, lüliti, juhtimine"</string>
<string name="keywords_more_mobile_networks" msgid="8995946622054642367">"mobiilne, mobiil, mobiilioperaator, juhtmeta, andmed, 4g,3g, 2g, lte"</string>
@@ -3135,7 +3131,7 @@
<string name="keywords_sounds_and_notifications_interruptions" msgid="5426093074031208917">"mitte segada, katkesta, katkestus, paus"</string>
<string name="keywords_app" msgid="6334757056536837791">"RAM"</string>
<string name="keywords_location" msgid="4132655528196729043">"läheduses, asukoht, ajalugu, aruandlus, GPS"</string>
- <string name="keywords_accounts" msgid="1957925565953357627">"konto"</string>
+ <string name="keywords_accounts" msgid="4479029747403203867">"konto, lisa konto, tööprofiil"</string>
<string name="keywords_users" msgid="3434190133131387942">"piirang, piira, piiratud"</string>
<string name="keywords_keyboard_and_ime" msgid="9143339015329957107">"tekstiparandus, paranda, heli, vibreeri, automaatne, keel, liigutus, soovita, soovitus, teema, solvav, sõna, tüüp, emotikon, rahvusvaheline"</string>
<string name="keywords_reset_apps" msgid="5293291209613191845">"lähtestamine, eelistused, vaikeseade"</string>
@@ -3173,6 +3169,7 @@
<string name="keywords_storage_settings" msgid="297283751968446577">"mälu, vahemälu, andmed, kustutamine, tühjendamine, vaba, ruum"</string>
<string name="keywords_bluetooth_settings" msgid="6804844062789439858">"ühendatud, seade, kõrvaklapid, peakomplekt, kõlar, juhtmeta, sidumine, nööpkõrvaklapid, muusika, meedia"</string>
<string name="keywords_wallpaper" msgid="5058364390917429896">"taust, kuva, lukustuskuva, teema"</string>
+ <string name="keywords_styles" msgid="5828725481814049422">"ikooni kuju, aktsentvärv, font"</string>
<string name="keywords_assist_input" msgid="5017533309492679287">"vaikimisi, assistent"</string>
<string name="keywords_default_payment_app" msgid="3838565809518896799">"makse, vaikeseade"</string>
<string name="keywords_ambient_display" msgid="3103487805748659132">"sissetulev märguanne"</string>
@@ -3182,7 +3179,7 @@
<string name="keywords_notification_vibration" msgid="31924624421190547">"puutepõhine, vibreerimine, tundlikkus"</string>
<string name="keywords_battery_saver_sticky" msgid="5586215686021650278">"akusäästja, kinnitatav, pidev, aku säästmine, aku"</string>
<string name="keywords_battery_saver_schedule" msgid="7358789228486231944">"rutiin, ajakava, akusäästja, toite säästmine, aku, automaatne, protsent"</string>
- <string name="keywords_add_an_account" msgid="6488139919428902434">"tööprofiil"</string>
+ <string name="keywords_enhance_4g_lte" msgid="2273810564244790859">"volte, täiustatud helistamine, 4g-kõned"</string>
<string name="default_sound" msgid="8821684447333687810">"Vaikeheli"</string>
<string name="sound_settings_summary" msgid="4100853606668287965">"Helina helitugevus on <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
<string name="sound_dashboard_summary" msgid="3402435125958012986">"Helitugevus, vibreerimine, režiim Mitte segada"</string>
@@ -3889,7 +3886,6 @@
<string name="permit_draw_overlay" msgid="7456536798718633432">"Luba muude rakenduste peal kuvamine"</string>
<string name="allow_overlay_description" msgid="8961670023925421358">"Lubage see rakendus kuvada muude kasutatavate rakenduste peal. See võib häirida nende rakenduste kasutamist või muuta nende käitumist või kuvamisviisi."</string>
<string name="keywords_vr_listener" msgid="7441221822576384680">"VR virtuaalreaalne kuulaja stereo abiline teenus"</string>
- <string name="keywords_system_alert_window" msgid="5049498015597864850">"süsteem teatis aken dialoog muude rakenduste peal kuvamine"</string>
<string name="overlay_settings" msgid="6930854109449524280">"Muude rakenduste peal kuvamine"</string>
<string name="system_alert_window_summary" msgid="602892301318324492">"<xliff:g id="COUNT_0">%1$d</xliff:g> rakendusel <xliff:g id="COUNT_1">%2$d</xliff:g>-st on lubatud muude rakenduste peal kuvada"</string>
<string name="filter_overlay_apps" msgid="6965969283342557573">"Loaga rakendused"</string>
@@ -4125,7 +4121,6 @@
<string name="notification_log_details_none" msgid="184131801230614059">"puudub"</string>
<string name="notification_log_details_ranking_null" msgid="244660392058720919">"Asetuse objekt puudub."</string>
<string name="notification_log_details_ranking_none" msgid="599607025882587844">"Asetuse objekt ei sisalda seda võtit."</string>
- <string name="theme_customization_category" msgid="1049181544004163283">"Teema määramine"</string>
<string name="theme_customization_device_default" msgid="5058147707906551368">"Seadme vaikeseade"</string>
<string name="display_cutout_emulation" msgid="7466869822418376317">"Ekraani väljalõige"</string>
<string name="display_cutout_emulation_keywords" msgid="4495418317471622562">"ekraani väljalõige, lõige"</string>
@@ -4551,6 +4546,8 @@
<string name="network_connection_errorstate_dialog_message" msgid="6953778550775646710">"Midagi tuli vahele. Rakendus tühistas seadme valimise taotluse."</string>
<string name="network_connection_connect_successful" msgid="5935510954474494928">"Ühendamine õnnestus"</string>
<string name="network_connection_request_dialog_showall" msgid="6938922880244567521">"Kuva kõik"</string>
+ <string name="network_connection_searching_message" msgid="4638576789450817530">"Seadme otsimine …"</string>
+ <string name="network_connection_connecting_message" msgid="3740982406609245654">"Seadmega ühendamine …"</string>
<plurals name="show_bluetooth_devices" formatted="false" msgid="1715020480026568408">
<item quantity="other">Ühendatud on <xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> seadet</item>
<item quantity="one">Ühendatud on <xliff:g id="NUMBER_DEVICE_COUNT_0">%1$d</xliff:g> seade</item>
diff --git a/res/values-eu/arrays.xml b/res/values-eu/arrays.xml
index ff5120f..b14ea41 100644
--- a/res/values-eu/arrays.xml
+++ b/res/values-eu/arrays.xml
@@ -350,7 +350,7 @@
<item msgid="2404067308793740341">"Idatzi memorian"</item>
<item msgid="5832543806893763620">"Aktibatu pantaila"</item>
<item msgid="5258373962467495905">"Lortu kontuak"</item>
- <item msgid="334625385979270703">"Abiarazi atzeko planoan"</item>
+ <item msgid="334625385979270703">"Exekutatu atzeko planoan"</item>
<item msgid="9039213578110332702">"Erabilerraztasun-eginbideen bolumena"</item>
</string-array>
<string-array name="long_press_timeout_selector_titles">
@@ -443,7 +443,7 @@
<item msgid="3396458970745718652">"Garrantzitsua (atzeko planokoa)"</item>
<item msgid="5214825238247511992">"Babeskopiak"</item>
<item msgid="311372689168254967">"Handia"</item>
- <item msgid="7438189122367820362">"Zerbitzua (abian)"</item>
+ <item msgid="7438189122367820362">"Zerbitzua (exekutatzen)"</item>
<item msgid="918687422516982498">"Zerbitzua (berrabiarazten)"</item>
<item msgid="6807727069641853029">"Hargailua"</item>
<item msgid="6782857406100845127">"Hasiera"</item>
diff --git a/res/values-eu/strings.xml b/res/values-eu/strings.xml
index a985be3..0c847eb 100644
--- a/res/values-eu/strings.xml
+++ b/res/values-eu/strings.xml
@@ -360,8 +360,6 @@
<string name="security_enable_widgets_disabled_summary" msgid="6392489775303464905">"Administratzaileak desgaitu du"</string>
<string name="lockdown_settings_title" msgid="7393790212603280213">"Erakutsi blokeatzeko aukera"</string>
<string name="lockdown_settings_summary" msgid="4359438673563318171">"Bistaratu etengailu bat pantaila blokeatuan, Smart Lock, desblokeo biometrikoak eta jakinarazpenak desaktibatzeko aukera ematen duena"</string>
- <string name="trust_agents_extend_unlock_title" msgid="2796555263565097031">"Fidagarritasun-agenteek soilik luzatzen dute desblokeoa"</string>
- <string name="trust_agents_extend_unlock_summary" msgid="3976344969220255010">"Gaitzen bada, fidagarritasun-agenteek denbora luzeagoz mantenduko dute gailua desblokeatuta, baina ezingo dituzte desblokeatu blokeatuta dauden gailuak"</string>
<string name="trust_lost_locks_screen_title" msgid="2992742466966021682">"Blokeatu pantaila fidagarritasuna galtzean"</string>
<string name="trust_lost_locks_screen_summary" msgid="693784434582021206">"Gaitzen bada, gailua blokeatu egingo da azken fidagarritasun-agenteak fidagarritasuna galtzen duenean"</string>
<string name="owner_info_settings_summary" msgid="7472393443779227052">"Bat ere ez"</string>
@@ -937,6 +935,8 @@
<string name="wifi_eap_identity" msgid="4359453783379679103">"Identitatea"</string>
<string name="wifi_eap_anonymous" msgid="2989469344116577955">"Identitate anonimoa"</string>
<string name="wifi_password" msgid="5948219759936151048">"Pasahitza"</string>
+ <!-- no translation found for wifi_sae_password_id (1697832722221765763) -->
+ <skip />
<string name="wifi_show_password" msgid="6461249871236968884">"Erakutsi pasahitza"</string>
<string name="wifi_ap_band_config" msgid="1611826705989117930">"Hautatu AP banda"</string>
<string name="wifi_ap_choose_auto" msgid="2677800651271769965">"Automatikoa"</string>
@@ -957,7 +957,6 @@
<string name="wifi_dpp_share_wifi" msgid="9065890131734833809">"Partekatu wifi-konexioa"</string>
<string name="wifi_dpp_scan_qr_code_with_another_device" msgid="5854392840857123065">"Eskaneatu QR kode hau \"<xliff:g id="SSID">%1$s</xliff:g>\" sarera konektatu eta pasahitza partekatzeko"</string>
<string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="4436318319178361543">"Eskaneatu QR kode hau \"<xliff:g id="SSID">%1$s</xliff:g>\" sarera konektatzeko"</string>
- <string name="wifi_dpp_could_not_detect_valid_qr_code" msgid="641893675646330576">"Ezin izan da irakurri QR kodea. Jarri kodea pantailaren erdian eta saiatu berriro."</string>
<string name="wifi_dpp_failure_authentication_or_configuration" msgid="3372757783382381044">"Saiatu berriro. Arazoak badirau, jarri gailuaren fabrikatzailearekin harremanetan."</string>
<string name="wifi_dpp_failure_not_compatible" msgid="2829930473520603740">"Arazoren bat izan da"</string>
<string name="wifi_dpp_failure_timeout" msgid="5228320772245820458">"Ziurtatu gailua entxufatuta, kargatuta eta piztuta dagoela"</string>
@@ -980,6 +979,7 @@
<string name="wifi_dpp_hotspot_password" msgid="4120419278831581613">"Sare publikoaren pasahitza: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
<string name="wifi_dpp_add_device" msgid="4072206063308645677">"Gehitu gailu bat"</string>
<string name="wifi_dpp_connect_network_using_qr_code" msgid="3887335309163999665">"Erabili QR kode bat sare honetan gailu bat gehitzeko"</string>
+ <string name="wifi_dpp_qr_code_is_not_valid_format" msgid="3700087439867692944">"QR kodearen formatua ez da baliozkoa"</string>
<string name="retry" msgid="6472609612090877557">"Saiatu berriro"</string>
<string name="wifi_shared" msgid="844142443226926070">"Partekatu gailuaren gainerako erabiltzaileekin"</string>
<string name="wifi_unchanged" msgid="3410422020930397102">"(aldatu gabea)"</string>
@@ -1129,6 +1129,7 @@
<string name="emergency_address_title" msgid="932729250447887545">"Larrialdietarako helbidea"</string>
<string name="emergency_address_summary" msgid="7751971156196115129">"Kokapen gisa erabiliko da larrialdi-zerbitzuetara Wi-Fi bidez deituz gero"</string>
<string name="private_dns_help_message" msgid="3299567069152568958"><annotation id="url">"Lortu informazio gehiago"</annotation>" DNS pribatuaren eginbideei buruz"</string>
+ <string name="private_dns_mode_on" msgid="5882613439541371003">"Aktibatuta"</string>
<string name="wifi_calling_pref_managed_by_carrier" msgid="6845711858866828986">"Operadoreak kudeatzen du ezarpen hau"</string>
<string name="wifi_calling_settings_activation_instructions" msgid="7492509632478260955">"Aktibatu Wi-Fi bidezko deiak"</string>
<string name="wifi_calling_turn_on" msgid="1171403510313983983">"Aktibatu Wi-Fi bidezko deiak"</string>
@@ -1872,7 +1873,7 @@
<string name="default_emergency_app" msgid="1951760659640369980">"Larrialdietarako aplikazioa"</string>
<string name="reset_app_preferences" msgid="1321050641018356925">"Berrezarri aplikazioen hobespenak"</string>
<string name="reset_app_preferences_title" msgid="6093179367325336662">"Aplikazioen hobespenak berrezarri nahi dituzu?"</string>
- <string name="reset_app_preferences_desc" msgid="4822447731869201512">"Hauen hobespen guztiak berrezarriko dira:\n\n"<li>"desgaitutako aplikazioak,"</li>\n<li>"desgaitutako aplikazio-jakinarazpenak,"</li>\n<li>"ekintza jakinetarako aplikazio lehenetsiak,"</li>\n<li>"aplikazioen atzeko planoko datuen murriztapenak eta"</li>\n<li>"baimen-murriztapenak."</li>\n\n"Ez dituzu galduko aplikazioetako datuak."</string>
+ <string name="reset_app_preferences_desc" msgid="731757609326016760">"Hauen hobespen guztiak berrezarriko dira:\n\n"<li>"desgaitutako aplikazioak,"</li>\n<li>"desgaitutako aplikazio-jakinarazpenak,"</li>\n<li>"ekintza jakinetarako aplikazio lehenetsiak,"</li>\n<li>"aplikazioen atzeko planoko datuen murriztapenak eta"</li>\n<li>"baimen-murriztapenak."</li>\n\n"Ez dituzu galduko aplikazioetako datuak."</string>
<string name="reset_app_preferences_button" msgid="2559089511841281242">"Berrezarri aplikazioak"</string>
<string name="manage_space_text" msgid="8852711522447794676">"Kudeatu tokia"</string>
<string name="filter" msgid="2018011724373033887">"Iragazi"</string>
@@ -2087,7 +2088,7 @@
<string name="accessibility_screen_magnification_short_summary" msgid="3411979839172752057">"Zooma aplikatzeko, sakatu hirutan"</string>
<string name="accessibility_screen_magnification_navbar_short_summary" msgid="3693116360267980492">"Zooma aplikatzeko, sakatu botoi bat"</string>
<string name="accessibility_screen_magnification_summary" msgid="5258868553337478505"><b>"Zooma aplikatzeko"</b>", sakatu pantaila bizkor hiru aldiz.\n"<ul><li>"Gora edo behera egiteko, arrastatu gutxienez bi hatz."</li>\n<li>"Zooma doitzeko, atximurkatu pantaila gutxienez bi hatzekin."</li></ul>\n\n<b>"Zooma une batez bakarrik aplikatzeko"</b>", sakatu pantaila bizkor hiru aldiz eta, hirugarren aldian, utzi hatza pantailan jarrita.\n"<ul><li>"Pantailan mugitzeko, arrastatu hatza."</li>\n<li>"Zooma aplikatzeari uzteko, altxatu hatza."</li></ul>\n\n"Zooma ezin da aplikatu ez teklatuan ez nabigazio-barran."</string>
- <string name="accessibility_screen_magnification_navbar_summary" msgid="2272878354599332009">"Zooma aktibatuta badago, pantailan aplika dezakezu.\n\n"<b>"Handitzeko"</b>", ireki zooma eta sakatu pantailako edozein puntu.\n"<ul><li>"• Arrastatu bi hatz edo gehiago gora eta behera egiteko."</li>\n<li>"• Atximurkatu bi hatz edo gehiago zooma doitzeko."</li></ul>\n\n<b>"Zooma unetxo batez aplikatzeko"</b>", ireki zooma eta eduki sakatuta pantailako edozein puntu.\n"<ul><li>"• Arrastatu hatza toki batetik bestera joateko."</li>\n<li>"• Altxatu hatza txikitzeko."</li></ul>\n\n"Ezin da aplikatu zooma teklatuan edo nabigazio-barran."</string>
+ <string name="accessibility_screen_magnification_navbar_summary" msgid="6700716275347612310">"Zooma aktibatuta badago, pantailan aplika dezakezu.\n\n"<b>"Handitzeko"</b>", ireki zooma eta sakatu pantailako edozein puntu.\n"<ul><li>"Arrastatu bi hatz edo gehiago gora eta behera egiteko."</li>\n<li>"Atximurkatu bi hatz edo gehiago zooma doitzeko."</li></ul>\n\n<b>"Zooma unetxo batez aplikatzeko"</b>", ireki zooma eta eduki sakatuta pantailako edozein puntu.\n"<ul><li>"Arrastatu hatza toki batetik bestera joateko."</li>\n<li>"Altxatu hatza txikitzeko."</li></ul>\n\n"Ezin da aplikatu zooma teklatuan edo nabigazio-barran."</string>
<string name="accessibility_tutorial_dialog_title_button" msgid="3682222614034474845">"Erabili Erabilerraztasuna botoia irekitzeko"</string>
<string name="accessibility_tutorial_dialog_title_gesture" msgid="1342726230497913398">"Erabili keinua irekitzeko"</string>
<string name="accessibility_tutorial_dialog_title_gesture_settings" msgid="8539392614235820285">"Erabili erabilerraztasun-keinu berria"</string>
@@ -2140,8 +2141,7 @@
<string name="accessibility_hearingaid_title" msgid="8312145423610648518">"Audiofonoak"</string>
<string name="accessibility_hearingaid_not_connected_summary" msgid="6240237523789614599">"Ez dago audiofonorik konektatuta"</string>
<string name="accessibility_hearingaid_adding_summary" msgid="2947474468412309778">"Gehitu audifonoak"</string>
- <string name="accessibility_hearingaid_pair_instructions_first_message" msgid="3912093691643131154">"Audiofonoak parekatzeko, bilatu eta sakatu gailua hurrengo pantailan."</string>
- <string name="accessibility_hearingaid_pair_instructions_second_message" msgid="5596683393607650243">"Ziurtatu audiofonoak parekatze moduan daudela."</string>
+ <string name="accessibility_hearingaid_pair_instructions_message" msgid="3094382949733435414">"Audiofonoak parekatzeko, bilatu eta sakatu gailua hurrengo pantailan. Ziurtatu audiofonoak parekatze moduan daudela."</string>
<string name="accessibility_hearingaid_active_device_summary" msgid="3924362383258688984">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> aktibo dago"</string>
<plurals name="show_number_hearingaid_count" formatted="false" msgid="3160782397139295486">
<item quantity="other"><xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> audifono gorde dira</item>
@@ -2490,7 +2490,6 @@
<string name="menu_stats_last_unplugged" msgid="5922246077592434526">"Azken aldiz entxufea atera ondoren (<xliff:g id="UNPLUGGED">%1$s</xliff:g>)"</string>
<string name="menu_stats_total" msgid="8973377864854807854">"Erabilera, guztira"</string>
<string name="menu_stats_refresh" msgid="1676215433344981075">"Freskatu"</string>
- <string name="process_kernel_label" msgid="3916858646836739323">"Android sistema eragilea"</string>
<string name="process_mediaserver_label" msgid="6500382062945689285">"Multimedia-zerbitzaria"</string>
<string name="process_dex2oat_label" msgid="2592408651060518226">"Aplikazio-optimizazioa"</string>
<string name="battery_saver" msgid="8172485772238572153">"Bateria-aurrezlea"</string>
@@ -2621,8 +2620,6 @@
<string name="no_device_admins" msgid="4846602835339095768">"Ez dago gailua administratzeko aplikaziorik"</string>
<string name="personal_device_admin_title" msgid="2849617316347669861">"Pertsonala"</string>
<string name="managed_device_admin_title" msgid="7853955652864478435">"Lanekoak"</string>
- <string name="sms_access_restriction_enabled" msgid="7054488078710530278">"Mugatu SMSetarako eta deien erregistrorako sarbidea"</string>
- <string name="sms_access_restriction_enabled_summary" msgid="6851339654677842328">"Telefonoak eta mezularitza-aplikazio lehenetsiek soilik dute SMSak eta deien erregistroa atzitzeko baimena"</string>
<string name="no_trust_agents" msgid="7450273545568977523">"Ez dago agente fidagarririk erabilgarri"</string>
<string name="add_device_admin_msg" msgid="1501847129819382149">"Gailua administratzeko aplikazioa aktibatu?"</string>
<string name="add_device_admin" msgid="4192055385312215731">"Aktibatu gailua administratzeko aplikazioa"</string>
@@ -3111,7 +3108,7 @@
<string name="keywords_app_default" msgid="5822717006354487071">"Ireki honekin"</string>
<string name="keywords_applications_settings" msgid="1268353611121497450">"Aplikazioak"</string>
<string name="keywords_time_zone" msgid="998254736898753085">"ordu-zona"</string>
- <string name="keywords_draw_overlay" msgid="4130899177619041842">"Txat-goiburua"</string>
+ <string name="keywords_draw_overlay" msgid="1001120206241401007">"Txateko buruaren ikonoa, sistema, alerta, leihoa, elkarrizketa, pantaila, beste aplikazioen gainean, marraztu"</string>
<string name="keywords_flashlight" msgid="6161632177705233710">"Argia, linterna"</string>
<string name="keywords_change_wifi_state" msgid="627068244033681010">"wifi, wi-fi, aldatu, kontrola"</string>
<string name="keywords_more_mobile_networks" msgid="8995946622054642367">"sare mugikorrak, operadorea, hari gabeko konexioak, datuak, 4g, 3g, 2g, lte"</string>
@@ -3135,7 +3132,7 @@
<string name="keywords_sounds_and_notifications_interruptions" msgid="5426093074031208917">"ez molestatu, eten, etenaldi, atseden"</string>
<string name="keywords_app" msgid="6334757056536837791">"RAM"</string>
<string name="keywords_location" msgid="4132655528196729043">"ingurua, kokapena, historia, hautematea, hauteman, GPSa"</string>
- <string name="keywords_accounts" msgid="1957925565953357627">"kontu"</string>
+ <string name="keywords_accounts" msgid="4479029747403203867">"kontua, gehitu kontu bat, laneko profila"</string>
<string name="keywords_users" msgid="3434190133131387942">"muga, mugatu, murriztu, murriztapen, debekatu, debeku"</string>
<string name="keywords_keyboard_and_ime" msgid="9143339015329957107">"testua, zuzenketa, zuzendu, soinua, dardara, automatikoa, hizkuntza, keinua, iradoki, iradokizuna, gaia, iraingarria, hitza, mota, emojia, nazioartekoa"</string>
<string name="keywords_reset_apps" msgid="5293291209613191845">"berrezarri, hobespen, lehenetsi"</string>
@@ -3173,6 +3170,7 @@
<string name="keywords_storage_settings" msgid="297283751968446577">"memoria, cachea, datuak, ezabatu, garbitu, tokia egin, tokia"</string>
<string name="keywords_bluetooth_settings" msgid="6804844062789439858">"konektatuta, gailua, aurikularrak, entzungailua, bozgorailua, hari gabekoak, parekatu, aurikular euskarridunak, musika, multimedia-edukia"</string>
<string name="keywords_wallpaper" msgid="5058364390917429896">"atzeko planoa, pantaila, pantaila blokeatua, gaia"</string>
+ <string name="keywords_styles" msgid="5828725481814049422">"ikonoaren forma, nabarmentzeko kolorea, letra-tipoa"</string>
<string name="keywords_assist_input" msgid="5017533309492679287">"lehenetsia, laguntzailea"</string>
<string name="keywords_default_payment_app" msgid="3838565809518896799">"ordaindu, lehenetsia"</string>
<string name="keywords_ambient_display" msgid="3103487805748659132">"jasotako jakinarazpena"</string>
@@ -3182,7 +3180,7 @@
<string name="keywords_notification_vibration" msgid="31924624421190547">"ukipena, dardara, sentikortasuna"</string>
<string name="keywords_battery_saver_sticky" msgid="5586215686021650278">"bateria-aurrezlea, finkoa, iraunkorra, energia-aurrezlea, bateria"</string>
<string name="keywords_battery_saver_schedule" msgid="7358789228486231944">"ohitura, ordutegia, programatu, bateria-aurrezlea, aurreztu bateria, bateria automatikoa, ehunekoa"</string>
- <string name="keywords_add_an_account" msgid="6488139919428902434">"laneko profila"</string>
+ <string name="keywords_enhance_4g_lte" msgid="2273810564244790859">"volte, deitzeko aukera aurreratuak, 4G bidezko deiak"</string>
<string name="default_sound" msgid="8821684447333687810">"Soinu lehenetsia"</string>
<string name="sound_settings_summary" msgid="4100853606668287965">"Tonuaren bolumena: <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
<string name="sound_dashboard_summary" msgid="3402435125958012986">"Bolumena, dardara, \"Ez molestatu\" modua"</string>
@@ -3889,7 +3887,6 @@
<string name="permit_draw_overlay" msgid="7456536798718633432">"Baimendu beste aplikazioen gainean bistaratzea"</string>
<string name="allow_overlay_description" msgid="8961670023925421358">"Baimendu aplikazioari erabiltzen ari zaren aplikazioen gainean agertzea. Eginbide honek abian diren aplikazioen erabilera oztopa dezake, edo haien itxura edo portaera aldatu."</string>
<string name="keywords_vr_listener" msgid="7441221822576384680">"eb errealitate birtuala hautemailea estereoa laguntzailea laguntza zerbitzua"</string>
- <string name="keywords_system_alert_window" msgid="5049498015597864850">"sistema alerta leiho koadro bistaratu beste aplikazio gainean"</string>
<string name="overlay_settings" msgid="6930854109449524280">"Bistaratu aplikazioen gainean"</string>
<string name="system_alert_window_summary" msgid="602892301318324492">"<xliff:g id="COUNT_0">%1$d</xliff:g>/<xliff:g id="COUNT_1">%2$d</xliff:g> aplikaziok dute besteen gainean bistaratzeko baimena"</string>
<string name="filter_overlay_apps" msgid="6965969283342557573">"Baimena duten aplikazioak"</string>
@@ -4125,7 +4122,6 @@
<string name="notification_log_details_none" msgid="184131801230614059">"bat ere ez"</string>
<string name="notification_log_details_ranking_null" msgid="244660392058720919">"Sailkapen-objektua falta da."</string>
<string name="notification_log_details_ranking_none" msgid="599607025882587844">"Sailkapen-objektuak ez du gako hau."</string>
- <string name="theme_customization_category" msgid="1049181544004163283">"Gaiak"</string>
<string name="theme_customization_device_default" msgid="5058147707906551368">"Gailuaren balio lehenetsiak"</string>
<string name="display_cutout_emulation" msgid="7466869822418376317">"Pantailaren mozketa"</string>
<string name="display_cutout_emulation_keywords" msgid="4495418317471622562">"pantailaren mozketa, koska"</string>
@@ -4551,6 +4547,8 @@
<string name="network_connection_errorstate_dialog_message" msgid="6953778550775646710">"Arazoren bat izan da. Aplikazioak bertan behera utzi du gailu bat aukeratzeko eskaera."</string>
<string name="network_connection_connect_successful" msgid="5935510954474494928">"Konektatu da"</string>
<string name="network_connection_request_dialog_showall" msgid="6938922880244567521">"Erakutsi guztiak"</string>
+ <string name="network_connection_searching_message" msgid="4638576789450817530">"Gailua bilatzen…"</string>
+ <string name="network_connection_connecting_message" msgid="3740982406609245654">"Gailura konektatzen…"</string>
<plurals name="show_bluetooth_devices" formatted="false" msgid="1715020480026568408">
<item quantity="other"><xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> gailu daude konektatuta</item>
<item quantity="one"><xliff:g id="NUMBER_DEVICE_COUNT_0">%1$d</xliff:g> gailu dago konektatuta</item>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 9094681..f159c30 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -360,8 +360,6 @@
<string name="security_enable_widgets_disabled_summary" msgid="6392489775303464905">"غیرفعالشده توسط سرپرست"</string>
<string name="lockdown_settings_title" msgid="7393790212603280213">"نمایش گزینه «قفل همه»"</string>
<string name="lockdown_settings_summary" msgid="4359438673563318171">"نمایش گزینه دکمه روشن/خاموش که Smart Lock، باز کردن قفل مبتنی بر زیستسنجی و اعلانهای صفحه قفل را خاموش میکند"</string>
- <string name="trust_agents_extend_unlock_title" msgid="2796555263565097031">"نمایندههای معتمد فقط تمدید حالت باز"</string>
- <string name="trust_agents_extend_unlock_summary" msgid="3976344969220255010">"اگر فعال شود، نمایندههای معتمد برای مدت طولانیتری دستگاهتان را باز نگه میدارند اما دیگر نمیتوانند دستگاه قفلی را باز کنند."</string>
<string name="trust_lost_locks_screen_title" msgid="2992742466966021682">"صفحه قفل وقتی اعتماد از بین میرود"</string>
<string name="trust_lost_locks_screen_summary" msgid="693784434582021206">"اگر فعال باشد، وقتی اعتماد آخرین نماینده معتمد دستگاه از بین برود، دستگاه قفل میشود"</string>
<string name="owner_info_settings_summary" msgid="7472393443779227052">"هیچکدام"</string>
@@ -937,6 +935,7 @@
<string name="wifi_eap_identity" msgid="4359453783379679103">"هویت"</string>
<string name="wifi_eap_anonymous" msgid="2989469344116577955">"هویت ناشناس"</string>
<string name="wifi_password" msgid="5948219759936151048">"گذرواژه"</string>
+ <string name="wifi_sae_password_id" msgid="1697832722221765763">"شناسه گذرواژه SAE"</string>
<string name="wifi_show_password" msgid="6461249871236968884">"نمایش گذرواژه"</string>
<string name="wifi_ap_band_config" msgid="1611826705989117930">"انتخاب باند AP"</string>
<string name="wifi_ap_choose_auto" msgid="2677800651271769965">"خودکار"</string>
@@ -957,7 +956,6 @@
<string name="wifi_dpp_share_wifi" msgid="9065890131734833809">"استفاده مشترک از Wi‑Fi"</string>
<string name="wifi_dpp_scan_qr_code_with_another_device" msgid="5854392840857123065">"برای اتصال به «<xliff:g id="SSID">%1$s</xliff:g>»، این کد QR را اسکن کنید و گذرواژه مربوطه را به اشتراک گذارید"</string>
<string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="4436318319178361543">"برای اتصال به «<xliff:g id="SSID">%1$s</xliff:g>»، این کد QR را اسکن کنید"</string>
- <string name="wifi_dpp_could_not_detect_valid_qr_code" msgid="641893675646330576">"کد QR خوانده نشد. کد را در مرکز قرار دهید و دوباره امتحان کنید"</string>
<string name="wifi_dpp_failure_authentication_or_configuration" msgid="3372757783382381044">"دوباره امتحان کنید. اگر مشکل همچنان ادامه دارد، با سازنده دستگاه تماس بگیرید"</string>
<string name="wifi_dpp_failure_not_compatible" msgid="2829930473520603740">"مشکلی رخ داده است"</string>
<string name="wifi_dpp_failure_timeout" msgid="5228320772245820458">"مطمئن شوید دستگاه متصل، شارژ و روشن شده است"</string>
@@ -980,6 +978,7 @@
<string name="wifi_dpp_hotspot_password" msgid="4120419278831581613">"گذرواژه نقطه اتصال: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
<string name="wifi_dpp_add_device" msgid="4072206063308645677">"افزودن دستگاه"</string>
<string name="wifi_dpp_connect_network_using_qr_code" msgid="3887335309163999665">"برای افزودن دستگاه به این شبکه، از کد QR استفاده کنید"</string>
+ <string name="wifi_dpp_qr_code_is_not_valid_format" msgid="3700087439867692944">"کد QR، قالب معتبری نیست"</string>
<string name="retry" msgid="6472609612090877557">"امتحان مجدد"</string>
<string name="wifi_shared" msgid="844142443226926070">"اشتراکگذاری با دیگر استفادهکنندگان از دستگاه"</string>
<string name="wifi_unchanged" msgid="3410422020930397102">"(بدون تغییر)"</string>
@@ -1129,6 +1128,7 @@
<string name="emergency_address_title" msgid="932729250447887545">"نشانی اضطراری"</string>
<string name="emergency_address_summary" msgid="7751971156196115129">"وقتی ازطریق Wi-Fi تماس اضطراری برقرار میکنید بهعنوان مکان شما استفاده میشود"</string>
<string name="private_dns_help_message" msgid="3299567069152568958">"درباره قابلیتهای DNS خصوصی "<annotation id="url">"بیشتر بدانید"</annotation></string>
+ <string name="private_dns_mode_on" msgid="5882613439541371003">"روشن"</string>
<string name="wifi_calling_pref_managed_by_carrier" msgid="6845711858866828986">"تنظیم تحت مدیریت شرکت مخابراتی"</string>
<string name="wifi_calling_settings_activation_instructions" msgid="7492509632478260955">"فعال کردن تماس ازطریق Wi-Fi"</string>
<string name="wifi_calling_turn_on" msgid="1171403510313983983">"روشن کردن تماس ازطریق Wi-Fi"</string>
@@ -1872,7 +1872,7 @@
<string name="default_emergency_app" msgid="1951760659640369980">"برنامه اضطراری"</string>
<string name="reset_app_preferences" msgid="1321050641018356925">"بازنشانی اولویتهای برنامه"</string>
<string name="reset_app_preferences_title" msgid="6093179367325336662">"بازنشانی اولویتهای برنامه؟"</string>
- <string name="reset_app_preferences_desc" msgid="4822447731869201512">"این کار همه اولویتهای موارد زیر را بازنشانی میکند:\n\n "<li>"برنامههای غیرفعالشده"</li>\n" "<li>"اعلانهای برنامه غیرفعالشده"</li>\n" "<li>"برنامههای پیشفرض برای عمل"</li>\n" "<li>"محدودیتهای داده پسزمینه برای برنامهها"</li>\n" "<li>"هرگونه محدودیتهای مجوز"</li>\n\n" هیچ داده برنامهای را از دست نخواهید داد."</string>
+ <string name="reset_app_preferences_desc" msgid="731757609326016760">"با این کار همه اولویتهای مربوط به موارد زیر بازنشانی میشود:\n\n"<li>"برنامههای غیرفعالشده"</li>\n<li>"اعلانهای برنامه غیرفعالشده"</li>\n<li>"برنامههای پیشفرض برای عملکردها"</li>\n<li>"محدودیتهای داده پسزمینه برای برنامهها"</li>\n<li>"هرگونه محدودیت مجوز"</li>\n\n"هیچ داده برنامهای را از دست نخواهید داد."</string>
<string name="reset_app_preferences_button" msgid="2559089511841281242">"بازنشانی برنامهها"</string>
<string name="manage_space_text" msgid="8852711522447794676">"مدیریت فضا"</string>
<string name="filter" msgid="2018011724373033887">"فیلتر"</string>
@@ -2087,7 +2087,7 @@
<string name="accessibility_screen_magnification_short_summary" msgid="3411979839172752057">"برای بزرگنمایی، ۳ بار ضربه بزنید"</string>
<string name="accessibility_screen_magnification_navbar_short_summary" msgid="3693116360267980492">"برای بزرگنمایی، روی دکمهای ضربه بزنید"</string>
<string name="accessibility_screen_magnification_summary" msgid="5258868553337478505"><b>"برای بزرگ کردن"</b>"، ۳ ضربه سریع روی صفحه بزنید.\n"<ul><li>"برای پیمایش، دو یا چند انگشتتان را روی صفحه بکشید"</li>\n<li>"برای تنظیم بزرگنمایی، دو یا چند انگشتتان را نزدیک یا دور کنید"</li></ul>\n\n<b>"برای بزرگنمایی موقت"</b>"، ۳ ضربه سریع روی صفحه بزنید و ضربه سوم انگشتتان را نگهدارید.\n"<ul><li>"برای حرکت در صفحه، روی صفحه بکشید"</li>\n<li>"برای کوچک کردن صفحه، انگشتتان را بردارید"</li></ul>\n\n"برای بزرگ کردن صفحه، نمیتوانید از صفحهکلید و نواز پیمایش استفاده کنید."</string>
- <string name="accessibility_screen_magnification_navbar_summary" msgid="2272878354599332009">"با روشن کردن درشتنمایی، میتوانید روی صفحه بزرگنمایی کنید.\n\n"<b>"برای بزرگنمایی"</b>"، درشتنمایی را روشن کنید و روی جایی از صفحه ضربه بزنید.\n"<ul><li>"• برای پیمایش، دو یا چند انگشتتان را روی صفحه بکشید "</li>\n<li>"• برای تنظیم بزرگنمایی، دو یا چند انگشتتان را بههم نزدیک کنید"</li></ul>\n\n<b>"برای بزرگنمایی موقت"</b>"، درشتنمایی را روشن کنید، سپس جایی از صفحه را لمس کنید و نگهدارید.\n"<ul><li>"• برای حرکت در صفحه، انگشتتان را روی صفحه بکشید"</li>\n<li>"• برای کوچک کردن، انگشتتان را بردارید"</li></ul>\n\n"نمیتوانید صفحهکلید یا نوار پیمایش را کوچک کنید."</string>
+ <string name="accessibility_screen_magnification_navbar_summary" msgid="6700716275347612310">"با روشن کردن درشتنمایی، میتوانید روی صفحه بزرگنمایی کنید.\n\n"<b>"برای بزرگنمایی"</b>"، درشتنمایی را روشن کنید و روی جایی از صفحه ضربه بزنید.\n"<ul><li>"برای پیمایش، دو یا چند انگشتتان را روی صفحه بکشید "</li>\n<li>"برای تنظیم بزرگنمایی، دو یا چند انگشتتان را بههم نزدیک کنید"</li></ul>\n\n<b>"برای بزرگنمایی موقت"</b>"، درشتنمایی را روشن کنید، سپس جایی از صفحه را لمس کنید و نگهدارید.\n"<ul><li>"برای حرکت در صفحه، انگشتتان را روی صفحه بکشید"</li>\n<li>"برای کوچک کردن، انگشتتان را بردارید"</li></ul>\n\n"نمیتوانید صفحهکلید یا نوار پیمایش را کوچک کنید."</string>
<string name="accessibility_tutorial_dialog_title_button" msgid="3682222614034474845">"استفاده از دکمه دسترسپذیری برای باز کردن"</string>
<string name="accessibility_tutorial_dialog_title_gesture" msgid="1342726230497913398">"استفاده از اشاره برای باز کردن"</string>
<string name="accessibility_tutorial_dialog_title_gesture_settings" msgid="8539392614235820285">"استفاده از اشاره دسترسپذیری جدید"</string>
@@ -2140,8 +2140,7 @@
<string name="accessibility_hearingaid_title" msgid="8312145423610648518">"سمعکها"</string>
<string name="accessibility_hearingaid_not_connected_summary" msgid="6240237523789614599">"هیچ سمعکی متصل نشده است"</string>
<string name="accessibility_hearingaid_adding_summary" msgid="2947474468412309778">"افزودن سمعکها"</string>
- <string name="accessibility_hearingaid_pair_instructions_first_message" msgid="3912093691643131154">"برای مرتبطسازی سمعکتان، دستگاهتان را در صفحه بعدی پیدا کنید و روی آن ضربه بزنید."</string>
- <string name="accessibility_hearingaid_pair_instructions_second_message" msgid="5596683393607650243">"مطمئن شوید سمعکتان در حالت مرتبطسازی باشد."</string>
+ <string name="accessibility_hearingaid_pair_instructions_message" msgid="3094382949733435414">"برای مرتبطسازی سمعکتان، دستگاهتان را در صفحه بعدی پیدا کنید و روی آن ضربه بزنید. مطمئن شوید سمعکتان در حالت مرتبطسازی باشد."</string>
<string name="accessibility_hearingaid_active_device_summary" msgid="3924362383258688984">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> فعال"</string>
<plurals name="show_number_hearingaid_count" formatted="false" msgid="3160782397139295486">
<item quantity="one"><xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> سمعک ذخیرهشده</item>
@@ -2490,7 +2489,6 @@
<string name="menu_stats_last_unplugged" msgid="5922246077592434526">"در حین قطع اتصال آخر برای <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
<string name="menu_stats_total" msgid="8973377864854807854">"مقدار کل استفاده"</string>
<string name="menu_stats_refresh" msgid="1676215433344981075">"بازخوانی"</string>
- <string name="process_kernel_label" msgid="3916858646836739323">"سیستم عامل Android"</string>
<string name="process_mediaserver_label" msgid="6500382062945689285">"سرور رسانه"</string>
<string name="process_dex2oat_label" msgid="2592408651060518226">"بهینهسازی برنامه"</string>
<string name="battery_saver" msgid="8172485772238572153">"بهینهسازی باتری"</string>
@@ -2621,8 +2619,6 @@
<string name="no_device_admins" msgid="4846602835339095768">"هیچیک از برنامههای سرپرست دستگاه در دسترس نیستند"</string>
<string name="personal_device_admin_title" msgid="2849617316347669861">"شخصی"</string>
<string name="managed_device_admin_title" msgid="7853955652864478435">"کاری"</string>
- <string name="sms_access_restriction_enabled" msgid="7054488078710530278">"محدود کردن دسترسی به پیامک و گزارش تماس"</string>
- <string name="sms_access_restriction_enabled_summary" msgid="6851339654677842328">"فقط برنامههای پیشفرض تلفن و پیامرسانی مجوز پیامک و گزارش تماس دارند"</string>
<string name="no_trust_agents" msgid="7450273545568977523">"نمایندگان مورداعتماد در دسترس نیست"</string>
<string name="add_device_admin_msg" msgid="1501847129819382149">"برنامه سرپرست دستگاه فعال شود؟"</string>
<string name="add_device_admin" msgid="4192055385312215731">"فعال کردن این برنامه سرپرست دستگاه"</string>
@@ -3111,7 +3107,7 @@
<string name="keywords_app_default" msgid="5822717006354487071">"باز کردن با"</string>
<string name="keywords_applications_settings" msgid="1268353611121497450">"برنامهها"</string>
<string name="keywords_time_zone" msgid="998254736898753085">"منطقه زمانی"</string>
- <string name="keywords_draw_overlay" msgid="4130899177619041842">"حباب گپ"</string>
+ <string name="keywords_draw_overlay" msgid="1001120206241401007">"تصویر گپ، سیستم، هشدار، پنجره، گفتگو، نمایش، روی سایر برنامهها، طراحی"</string>
<string name="keywords_flashlight" msgid="6161632177705233710">"چراغ قوه، چراغ"</string>
<string name="keywords_change_wifi_state" msgid="627068244033681010">"wifi، wi-fi، روشن/خاموش کردن، کنترل کردن"</string>
<string name="keywords_more_mobile_networks" msgid="8995946622054642367">"شبکه همراه، دستگاه همراه، شرکت مخابراتی تلفن همراه، بیسیم، داده 4g، 3g، 2g، lte"</string>
@@ -3135,7 +3131,7 @@
<string name="keywords_sounds_and_notifications_interruptions" msgid="5426093074031208917">"مزاحم نشوید، قطع، وقفه، توقف"</string>
<string name="keywords_app" msgid="6334757056536837791">"RAM"</string>
<string name="keywords_location" msgid="4132655528196729043">"اطراف، مکان، سابقه، گزارش، GPS"</string>
- <string name="keywords_accounts" msgid="1957925565953357627">"حساب"</string>
+ <string name="keywords_accounts" msgid="4479029747403203867">"حساب، افزودن حساب، نمایه کاری"</string>
<string name="keywords_users" msgid="3434190133131387942">"محدودیت، محدود، محدودشده"</string>
<string name="keywords_keyboard_and_ime" msgid="9143339015329957107">"تصحیح نوشتار، تصحیح، صدا، لرزش، خودکار، زبان، اشاره، پیشنهاد دادن، پیشنهاد، طرح زمینه، توهینآمیز، کلمه، نوع، اموجی، بینالمللی"</string>
<string name="keywords_reset_apps" msgid="5293291209613191845">"بازنشانی، اولویتها، پیشفرض"</string>
@@ -3173,6 +3169,7 @@
<string name="keywords_storage_settings" msgid="297283751968446577">"حافظه، حافظه پنهان، داده، حذف، پاک کردن، آزاد، فضا"</string>
<string name="keywords_bluetooth_settings" msgid="6804844062789439858">"متصل، دستگاه، هدفونها، هدستها، بلندگو، بیسیم، مرتبطسازی، هدفونهای توگوشی، موسیقی، رسانه"</string>
<string name="keywords_wallpaper" msgid="5058364390917429896">"پسزمینه، صفحه نمایش، صفحه در حالت قفل، طرح زمینه"</string>
+ <string name="keywords_styles" msgid="5828725481814049422">"شکل نماد، رنگ تأکیدی، قلم"</string>
<string name="keywords_assist_input" msgid="5017533309492679287">"پیشفرض، دستیار"</string>
<string name="keywords_default_payment_app" msgid="3838565809518896799">"پرداخت، پیشفرض"</string>
<string name="keywords_ambient_display" msgid="3103487805748659132">"اعلان ورودی"</string>
@@ -3182,7 +3179,7 @@
<string name="keywords_notification_vibration" msgid="31924624421190547">"لمس، لرزش، حساسیت"</string>
<string name="keywords_battery_saver_sticky" msgid="5586215686021650278">"بهینهسازی باتری، چسبان، باقی ماندن، بهینهسازی نیرو، باتری"</string>
<string name="keywords_battery_saver_schedule" msgid="7358789228486231944">"روال، زمانبندی، بهینهسازی باتری، بهینهسازی نیرو، باتری، خودکار، درصد"</string>
- <string name="keywords_add_an_account" msgid="6488139919428902434">"نمایه کاری"</string>
+ <string name="keywords_enhance_4g_lte" msgid="2273810564244790859">"volte، تماس پیشرفته، تماس 4g"</string>
<string name="default_sound" msgid="8821684447333687810">"صدای پیشفرض"</string>
<string name="sound_settings_summary" msgid="4100853606668287965">"بلندی صدای زنگ <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
<string name="sound_dashboard_summary" msgid="3402435125958012986">"میزان صدا، لرزش، «مزاحم نشوید»"</string>
@@ -3889,7 +3886,6 @@
<string name="permit_draw_overlay" msgid="7456536798718633432">"مجاز کردن نمایش روی سایر برنامهها"</string>
<string name="allow_overlay_description" msgid="8961670023925421358">"به برنامه اجازه میدهد روی سایر برنامههایی که درحال استفاده از آنها هستید نشان داده شود. ممکن است این قابلیت در استفاده شما از آن برنامهها تداخل ایجاد کند یا طرز نمایش یا عملکرد آنها را تغییر دهد."</string>
<string name="keywords_vr_listener" msgid="7441221822576384680">"vr واقعیت مجازی شنونده استریو یاور خدمات"</string>
- <string name="keywords_system_alert_window" msgid="5049498015597864850">"نمایش کادر گفتگوی هشدار سیستم روی سایر برنامهها"</string>
<string name="overlay_settings" msgid="6930854109449524280">"نمایش روی سایر برنامهها"</string>
<string name="system_alert_window_summary" msgid="602892301318324492">"برای نمایش روی سایر برنامهها، <xliff:g id="COUNT_0">%1$d</xliff:g> مورد از <xliff:g id="COUNT_1">%2$d</xliff:g> برنامه مجاز شدهاند"</string>
<string name="filter_overlay_apps" msgid="6965969283342557573">"برنامههای دارای مجوز"</string>
@@ -4125,7 +4121,6 @@
<string name="notification_log_details_none" msgid="184131801230614059">"هیچکدام"</string>
<string name="notification_log_details_ranking_null" msgid="244660392058720919">"شیء رتبهبندی وجود ندارد."</string>
<string name="notification_log_details_ranking_none" msgid="599607025882587844">"شیء رتبهبندی حاوی این کلید نیست."</string>
- <string name="theme_customization_category" msgid="1049181544004163283">"سفارشیسازی طرح زمینه"</string>
<string name="theme_customization_device_default" msgid="5058147707906551368">"پیشفرض دستگاه"</string>
<string name="display_cutout_emulation" msgid="7466869822418376317">"برش نمایشگر"</string>
<string name="display_cutout_emulation_keywords" msgid="4495418317471622562">"بریدگی حاشیه نمایشگر، حاشیه بالای نمایشگر"</string>
@@ -4551,6 +4546,8 @@
<string name="network_connection_errorstate_dialog_message" msgid="6953778550775646710">"مشکلی رخ داد. برنامه درخواست انتخاب دستگاه را لغو کرد."</string>
<string name="network_connection_connect_successful" msgid="5935510954474494928">"اتصال برقرار شد"</string>
<string name="network_connection_request_dialog_showall" msgid="6938922880244567521">"نمایش همه"</string>
+ <string name="network_connection_searching_message" msgid="4638576789450817530">"درحال جستجوی دستگاه…"</string>
+ <string name="network_connection_connecting_message" msgid="3740982406609245654">"درحال اتصال به دستگاه…"</string>
<plurals name="show_bluetooth_devices" formatted="false" msgid="1715020480026568408">
<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>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index 09208db..1d3b4d4 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -360,8 +360,6 @@
<string name="security_enable_widgets_disabled_summary" msgid="6392489775303464905">"Järjestelmänvalvojan estämä"</string>
<string name="lockdown_settings_title" msgid="7393790212603280213">"Näytä lukitusasetus"</string>
<string name="lockdown_settings_summary" msgid="4359438673563318171">"Näytä virtapainikeasetus, joka poistaa käytöstä Smart Lockin, lukituksen biometrisen avaamisen ja lukitusnäytön ilmoitukset."</string>
- <string name="trust_agents_extend_unlock_title" msgid="2796555263565097031">"Luotettavat tahot vain pitävät avattuna"</string>
- <string name="trust_agents_extend_unlock_summary" msgid="3976344969220255010">"Kun tämä on käytössä, luotettavat tahot pitävät puhelimen avattuna pidempään mutta eivät voi enää avata lukittua laitetta."</string>
<string name="trust_lost_locks_screen_title" msgid="2992742466966021682">"Lukitse näyttö ilman luotettavaa tahoa"</string>
<string name="trust_lost_locks_screen_summary" msgid="693784434582021206">"Kun tämä on käytössä ja edellinen luotettava taho lakkaa olemasta luotettava, laite lukitaan."</string>
<string name="owner_info_settings_summary" msgid="7472393443779227052">"Ei mitään"</string>
@@ -937,6 +935,7 @@
<string name="wifi_eap_identity" msgid="4359453783379679103">"Identiteetti"</string>
<string name="wifi_eap_anonymous" msgid="2989469344116577955">"Anonyymi identiteetti"</string>
<string name="wifi_password" msgid="5948219759936151048">"Salasana"</string>
+ <string name="wifi_sae_password_id" msgid="1697832722221765763">"SAE-salasanatunniste"</string>
<string name="wifi_show_password" msgid="6461249871236968884">"Näytä salasana"</string>
<string name="wifi_ap_band_config" msgid="1611826705989117930">"Valitse AP-taajuus"</string>
<string name="wifi_ap_choose_auto" msgid="2677800651271769965">"Automaattinen"</string>
@@ -957,7 +956,6 @@
<string name="wifi_dpp_share_wifi" msgid="9065890131734833809">"Jaa Wi‑Fi"</string>
<string name="wifi_dpp_scan_qr_code_with_another_device" msgid="5854392840857123065">"Yhdistä <xliff:g id="SSID">%1$s</xliff:g> ja jaa salasana lukemalla tämä QR-koodi."</string>
<string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="4436318319178361543">"Yhdistä <xliff:g id="SSID">%1$s</xliff:g> skannaamalla tämä QR-koodi"</string>
- <string name="wifi_dpp_could_not_detect_valid_qr_code" msgid="641893675646330576">"QR-koodin luku epäonnistui. Keskitä koodi ja yritä uudelleen."</string>
<string name="wifi_dpp_failure_authentication_or_configuration" msgid="3372757783382381044">"Yritä uudelleen. Jos ongelma ei ratkea, ota yhteyttä laitteen valmistajaan"</string>
<string name="wifi_dpp_failure_not_compatible" msgid="2829930473520603740">"Jokin meni pieleen"</string>
<string name="wifi_dpp_failure_timeout" msgid="5228320772245820458">"Varmista, että laite on liitetty virtalähteeseen, ladattu ja päällä"</string>
@@ -980,6 +978,7 @@
<string name="wifi_dpp_hotspot_password" msgid="4120419278831581613">"Hotspotin salasana: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
<string name="wifi_dpp_add_device" msgid="4072206063308645677">"Lisää laite"</string>
<string name="wifi_dpp_connect_network_using_qr_code" msgid="3887335309163999665">"Lisää laite tähän verkkoon QR-koodin avulla."</string>
+ <string name="wifi_dpp_qr_code_is_not_valid_format" msgid="3700087439867692944">"QR-koodin muoto ei kelpaa"</string>
<string name="retry" msgid="6472609612090877557">"Yritä uudelleen"</string>
<string name="wifi_shared" msgid="844142443226926070">"Jaa muiden laitteen käyttäjien kanssa"</string>
<string name="wifi_unchanged" msgid="3410422020930397102">"(ei muutettu)"</string>
@@ -1129,6 +1128,7 @@
<string name="emergency_address_title" msgid="932729250447887545">"Hätäosoite"</string>
<string name="emergency_address_summary" msgid="7751971156196115129">"Sijaintisi, kun soitat hätäpuhelun Wi-Fillä"</string>
<string name="private_dns_help_message" msgid="3299567069152568958"><annotation id="url">"Lisätietoja"</annotation>" yksityisistä DNS-ominaisuuksista"</string>
+ <string name="private_dns_mode_on" msgid="5882613439541371003">"Päällä"</string>
<string name="wifi_calling_pref_managed_by_carrier" msgid="6845711858866828986">"Operaattorin ylläpitämä laite"</string>
<string name="wifi_calling_settings_activation_instructions" msgid="7492509632478260955">"Aktivoi Wi-Fi-puhelut"</string>
<string name="wifi_calling_turn_on" msgid="1171403510313983983">"Ota Wi-Fi-puhelut käyttöön"</string>
@@ -1872,7 +1872,7 @@
<string name="default_emergency_app" msgid="1951760659640369980">"Hätäsovellus"</string>
<string name="reset_app_preferences" msgid="1321050641018356925">"Nollaa sovellusasetukset"</string>
<string name="reset_app_preferences_title" msgid="6093179367325336662">"Nollaa sovellusasetukset?"</string>
- <string name="reset_app_preferences_desc" msgid="4822447731869201512">"Tämä palauttaa kaikki asetukset seuraaville:\n\n"<li>"Käytöstä poistetut sovellukset"</li>\n<li>"Käytöstä poistetut sovellusilmoitukset"</li>\n<li>"Toimintojen oletussovellukset"</li>\n<li>"Sovellusten taustatietorajoitukset"</li>\n<li>"Kaikki oikeuksien rajoitukset"</li>\n\n"Et menetä mitään sovellustietoja."</string>
+ <string name="reset_app_preferences_desc" msgid="731757609326016760">"Kaikki seuraavien asetukset nollataan:\n\n"<li>"Käytöstä poistetut sovellukset"</li>\n<li>"Käytöstä poistetut sovellusilmoitukset"</li>\n<li>"Toimintojen oletussovellukset"</li>\n<li>" Sovellusten taustadatan käyttörajoitukset"</li>\n<li>"Käyttöoikeusrajoitukset"</li>\n\n"Et menetä mitään sovellusten dataa."</string>
<string name="reset_app_preferences_button" msgid="2559089511841281242">"Nollaa sovellukset"</string>
<string name="manage_space_text" msgid="8852711522447794676">"Hallinnoi tallennustilaa"</string>
<string name="filter" msgid="2018011724373033887">"Suodata"</string>
@@ -2087,7 +2087,7 @@
<string name="accessibility_screen_magnification_short_summary" msgid="3411979839172752057">"Lähennä napauttamalla kolme kertaa."</string>
<string name="accessibility_screen_magnification_navbar_short_summary" msgid="3693116360267980492">"Zoomaa napauttamalla painiketta."</string>
<string name="accessibility_screen_magnification_summary" msgid="5258868553337478505"><b>"Zoomaa"</b>" napauttamalla näyttöä nopeasti kolme kertaa.\n"<ul><li>"Vieritä näyttöä vetämällä kahta tai useampaa sormea näytöllä."</li>\n<li>"Säädä zoomausta nipistämällä kahdella tai useammalla sormella."</li></ul>\n\n<b>"Zoomaa väliaikaisesti"</b>" napauttamalla näyttöä nopeasti kolme kertaa ja pitämällä sormesi näytöllä kolmannen napautuksen jälkeen.\n"<ul><li>"Siirry eri kohtaan vetämällä sormeasi näytöllä."</li>\n<li>"Zoomaa ulos nostamalla sormesi näytöltä."</li></ul>\n\n"Et voi zoomata näppäimistöön tai navigointipalkkiin."</string>
- <string name="accessibility_screen_magnification_navbar_summary" msgid="2272878354599332009">"Kun suurennus on käytössä, voit suurentaa näytöllä olevia kohteita.\n\n"<b>"Zoomaa:"</b>" käynnistä suurennus ja napauta sitten haluamaasi kohtaa näytöllä\n"<ul><li>"• Vieritä: vedä vähintään kahta sormea näytön poikki"</li>\n<li>"• Säädä zoomausta: nipistä vähintään kaksi sormea yhteen tai levitä ne erilleen"</li></ul>\n\n<b>"Zoomaa väliaikaisesti:"</b>" käynnistä suurennus ja paina pitkään missä tahansa näytöllä\n"<ul><li>"• Liiku näytöllä: vedä sormea eri suuntiin"</li>\n<li>"• Loitonna: nosta sormi"</li></ul>\n\n"Suurennus ei toimi näppäimistöllä tai siirtymispalkissa."</string>
+ <string name="accessibility_screen_magnification_navbar_summary" msgid="6700716275347612310">"Kun suurennus on käytössä, voit suurentaa näytöllä olevia kohteita.\n\n"<b>"Zoomaa:"</b>" käynnistä suurennus ja napauta sitten haluamaasi kohtaa näytöllä\n"<ul><li>"Vieritä: vedä vähintään kahta sormea näytön poikki"</li>\n<li>"Säädä zoomausta: nipistä vähintään kaksi sormea yhteen tai levitä ne erilleen"</li></ul>\n\n<b>"Zoomaa väliaikaisesti:"</b>" käynnistä suurennus ja paina pitkään missä tahansa näytöllä\n"<ul><li>"Liiku näytöllä: vedä sormea eri suuntiin"</li>\n<li>"Loitonna: nosta sormi"</li></ul>\n\n"Suurennus ei toimi näppäimistöllä tai siirtymispalkissa."</string>
<string name="accessibility_tutorial_dialog_title_button" msgid="3682222614034474845">"Avaa esteettömyyspainikkeella"</string>
<string name="accessibility_tutorial_dialog_title_gesture" msgid="1342726230497913398">"Avaa eleellä"</string>
<string name="accessibility_tutorial_dialog_title_gesture_settings" msgid="8539392614235820285">"Käytä uutta esteettömyyselettä"</string>
@@ -2140,8 +2140,7 @@
<string name="accessibility_hearingaid_title" msgid="8312145423610648518">"Kuulolaitteet"</string>
<string name="accessibility_hearingaid_not_connected_summary" msgid="6240237523789614599">"Ei yhdistettyjä kuulolaitteita"</string>
<string name="accessibility_hearingaid_adding_summary" msgid="2947474468412309778">"Lisää kuulolaitteita"</string>
- <string name="accessibility_hearingaid_pair_instructions_first_message" msgid="3912093691643131154">"Muodosta pari kuulolaitteen kanssa etsimällä se seuraavalta näytöltä ja napauttamalla sitä."</string>
- <string name="accessibility_hearingaid_pair_instructions_second_message" msgid="5596683393607650243">"Varmista, että kuulolaitteesi on laiteparin muodostustilassa."</string>
+ <string name="accessibility_hearingaid_pair_instructions_message" msgid="3094382949733435414">"Jos haluat muodostaa parin kuulolaitteen kanssa, etsi laitteesi seuraavalta näytöltä ja napauta sitä. Varmista, että kuulolaitteesi on laiteparin muodostustilassa."</string>
<string name="accessibility_hearingaid_active_device_summary" msgid="3924362383258688984">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> aktiivinen"</string>
<plurals name="show_number_hearingaid_count" formatted="false" msgid="3160782397139295486">
<item quantity="other"><xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> tallennettua kuulolaitetta</item>
@@ -2490,7 +2489,6 @@
<string name="menu_stats_last_unplugged" msgid="5922246077592434526">"Laturin irrottamisen jälkeen (<xliff:g id="UNPLUGGED">%1$s</xliff:g>)"</string>
<string name="menu_stats_total" msgid="8973377864854807854">"Käyttö yhteensä"</string>
<string name="menu_stats_refresh" msgid="1676215433344981075">"Päivitä"</string>
- <string name="process_kernel_label" msgid="3916858646836739323">"Android-käyttöjärjestelmä"</string>
<string name="process_mediaserver_label" msgid="6500382062945689285">"Mediapalvelin"</string>
<string name="process_dex2oat_label" msgid="2592408651060518226">"Sovellusoptimointi"</string>
<string name="battery_saver" msgid="8172485772238572153">"Virransäästö"</string>
@@ -2621,8 +2619,6 @@
<string name="no_device_admins" msgid="4846602835339095768">"Laitteenhallintasovelluksia ei ole saatavilla."</string>
<string name="personal_device_admin_title" msgid="2849617316347669861">"Henkilökohtainen"</string>
<string name="managed_device_admin_title" msgid="7853955652864478435">"Työ"</string>
- <string name="sms_access_restriction_enabled" msgid="7054488078710530278">"Rajoita tekstiviesti- ja puhelulokien käyttöä"</string>
- <string name="sms_access_restriction_enabled_summary" msgid="6851339654677842328">"Vain oletuspuhelin- ja viestisovellukset pääsevät tekstiviestien ja puhelujen lokitietoihin."</string>
<string name="no_trust_agents" msgid="7450273545568977523">"Ei luotettavia tahoja"</string>
<string name="add_device_admin_msg" msgid="1501847129819382149">"Aktivoidaanko laitteenhallintasovellus?"</string>
<string name="add_device_admin" msgid="4192055385312215731">"Aktivoi laitteenhallintasovellus"</string>
@@ -3111,7 +3107,7 @@
<string name="keywords_app_default" msgid="5822717006354487071">"Avaa:"</string>
<string name="keywords_applications_settings" msgid="1268353611121497450">"Sovellukset"</string>
<string name="keywords_time_zone" msgid="998254736898753085">"aikavyöhyke"</string>
- <string name="keywords_draw_overlay" msgid="4130899177619041842">"Chat-kuvake"</string>
+ <string name="keywords_draw_overlay" msgid="1001120206241401007">"Chat-kuvake, järjestelmä, ilmoitus, ikkuna, valintaikkuna, näyttö, näkyminen muiden sovellusten päällä, piirtäminen"</string>
<string name="keywords_flashlight" msgid="6161632177705233710">"Taskulamppu, valo"</string>
<string name="keywords_change_wifi_state" msgid="627068244033681010">"wifi, wi-fi, päälle/pois, hallinta"</string>
<string name="keywords_more_mobile_networks" msgid="8995946622054642367">"matkapuhelin, mobiili, puhelinoperaattori, langaton, tiedonsiirto, 4g, 3g, 2g, lte"</string>
@@ -3135,7 +3131,7 @@
<string name="keywords_sounds_and_notifications_interruptions" msgid="5426093074031208917">"älä häiritse, keskeytä, keskeytys, tauko"</string>
<string name="keywords_app" msgid="6334757056536837791">"RAM"</string>
<string name="keywords_location" msgid="4132655528196729043">"nearby, sijaintihistoria, sijainnin ilmoittaminen, GPS"</string>
- <string name="keywords_accounts" msgid="1957925565953357627">"tili"</string>
+ <string name="keywords_accounts" msgid="4479029747403203867">"tili, lisää tili, työprofiili"</string>
<string name="keywords_users" msgid="3434190133131387942">"rajoitus, rajoittaa, rajoitettu"</string>
<string name="keywords_keyboard_and_ime" msgid="9143339015329957107">"tekstin korjaus, korjaa, ääni, värinä, automaattinen, kieli, ele, ehdottaa, ehdotus, teema, loukkaava, sana, kirjoita, emoji, kansainvälinen"</string>
<string name="keywords_reset_apps" msgid="5293291209613191845">"nollaa, asetukset, oletus"</string>
@@ -3173,6 +3169,7 @@
<string name="keywords_storage_settings" msgid="297283751968446577">"muisti, välimuisti, data, poista, tyhjennä, vapauta, tila"</string>
<string name="keywords_bluetooth_settings" msgid="6804844062789439858">"yhdistetty, laite, kuulokkeet, kuulokemikrofoni, kaiutin, langaton, pari, nappikuulokkeet, musiikki, media"</string>
<string name="keywords_wallpaper" msgid="5058364390917429896">"tausta, näyttö, lukitusnäyttö, teema"</string>
+ <string name="keywords_styles" msgid="5828725481814049422">"kuvakkeen muoto, korostusväri, kirjasin"</string>
<string name="keywords_assist_input" msgid="5017533309492679287">"oletus, assistant"</string>
<string name="keywords_default_payment_app" msgid="3838565809518896799">"maksu, oletus"</string>
<string name="keywords_ambient_display" msgid="3103487805748659132">"saapuva ilmoitus"</string>
@@ -3182,7 +3179,7 @@
<string name="keywords_notification_vibration" msgid="31924624421190547">"haptinen teknologia, värinä, herkkyys"</string>
<string name="keywords_battery_saver_sticky" msgid="5586215686021650278">"virransäästö, kiinnitetty, käytä aina, virran säästäminen, akku"</string>
<string name="keywords_battery_saver_schedule" msgid="7358789228486231944">"ohjelma, aikataulu, virransäästö, virran säästäminen, akku, automaattinen, prosentti"</string>
- <string name="keywords_add_an_account" msgid="6488139919428902434">"työprofiili"</string>
+ <string name="keywords_enhance_4g_lte" msgid="2273810564244790859">"volte, puhelujen lisävaihtoehdot, 4g-puhelut"</string>
<string name="default_sound" msgid="8821684447333687810">"Oletusääni"</string>
<string name="sound_settings_summary" msgid="4100853606668287965">"Soittoäänen voimakkuus: <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
<string name="sound_dashboard_summary" msgid="3402435125958012986">"Äänenvoimakkuus, värinä, Älä häiritse"</string>
@@ -3889,7 +3886,6 @@
<string name="permit_draw_overlay" msgid="7456536798718633432">"Salli näyttäminen muiden sovellusten päällä"</string>
<string name="allow_overlay_description" msgid="8961670023925421358">"Anna sovelluksen näkyä muiden avoimien sovellusten päällä. Se voi häiritä muiden sovellusten käyttöä tai muuttaa niiden ulkoasua tai käyttäytymistä."</string>
<string name="keywords_vr_listener" msgid="7441221822576384680">"VR virtuaalitodellisuus kuuntelija stereo avustinpalvelu"</string>
- <string name="keywords_system_alert_window" msgid="5049498015597864850">"järjestelmäilmoitus ikkuna valintaikkuna näkyy muiden sovellusten päällä"</string>
<string name="overlay_settings" msgid="6930854109449524280">"Näkyminen muiden päällä"</string>
<string name="system_alert_window_summary" msgid="602892301318324492">"<xliff:g id="COUNT_0">%1$d</xliff:g>/<xliff:g id="COUNT_1">%2$d</xliff:g> sovellusta saa näkyä muiden sovellusten päällä."</string>
<string name="filter_overlay_apps" msgid="6965969283342557573">"Sovellukset, joilla on käyttöoikeus"</string>
@@ -4125,7 +4121,6 @@
<string name="notification_log_details_none" msgid="184131801230614059">"ei mitään"</string>
<string name="notification_log_details_ranking_null" msgid="244660392058720919">"Sijoitustiedot puuttuvat."</string>
<string name="notification_log_details_ranking_none" msgid="599607025882587844">"Tätä avainta ei ole sijoitustiedoissa."</string>
- <string name="theme_customization_category" msgid="1049181544004163283">"Teema"</string>
<string name="theme_customization_device_default" msgid="5058147707906551368">"Laitteen oletusasetus"</string>
<string name="display_cutout_emulation" msgid="7466869822418376317">"Näyttölovi"</string>
<string name="display_cutout_emulation_keywords" msgid="4495418317471622562">"näyttölovi, näytön lovi"</string>
@@ -4551,6 +4546,8 @@
<string name="network_connection_errorstate_dialog_message" msgid="6953778550775646710">"Jokin meni vikaan. Sovellus peruutti laitteenvalintapyynnön."</string>
<string name="network_connection_connect_successful" msgid="5935510954474494928">"Yhteyden muodostus onnistui"</string>
<string name="network_connection_request_dialog_showall" msgid="6938922880244567521">"Näytä kaikki"</string>
+ <string name="network_connection_searching_message" msgid="4638576789450817530">"Haetaan laitetta…"</string>
+ <string name="network_connection_connecting_message" msgid="3740982406609245654">"Yhdistetään laitteeseen…"</string>
<plurals name="show_bluetooth_devices" formatted="false" msgid="1715020480026568408">
<item quantity="other"><xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> laitetta yhdistetty</item>
<item quantity="one"><xliff:g id="NUMBER_DEVICE_COUNT_0">%1$d</xliff:g> laite yhdistetty</item>
diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
index 581a3c5..ac300cd 100644
--- a/res/values-fr-rCA/strings.xml
+++ b/res/values-fr-rCA/strings.xml
@@ -360,8 +360,6 @@
<string name="security_enable_widgets_disabled_summary" msgid="6392489775303464905">"Désactivé par l\'administrateur"</string>
<string name="lockdown_settings_title" msgid="7393790212603280213">"Afficher l\'option de verrouillage"</string>
<string name="lockdown_settings_summary" msgid="4359438673563318171">"Afficher l\'option de l\'interrupteur qui désactive Smart Lock, le déverrouillage biométrique et les notifications sur l\'écran de verrouillage"</string>
- <string name="trust_agents_extend_unlock_title" msgid="2796555263565097031">"Déverrouillage prolongé pour les agents confiance"</string>
- <string name="trust_agents_extend_unlock_summary" msgid="3976344969220255010">"Si cette option est activée, les agents de confiance garderont votre appareil déverrouillé pendant plus longtemps, mais ne pourront plus déverrouiller un appareil verrouillé."</string>
<string name="trust_lost_locks_screen_title" msgid="2992742466966021682">"Verr. écran en cas de perte de confiance"</string>
<string name="trust_lost_locks_screen_summary" msgid="693784434582021206">"Si cette fonction est activée, l\'appareil sera verrouillé lorsque le dernier agent de confiance perd sa marque de confiance"</string>
<string name="owner_info_settings_summary" msgid="7472393443779227052">"Aucun"</string>
@@ -937,6 +935,7 @@
<string name="wifi_eap_identity" msgid="4359453783379679103">"Identité"</string>
<string name="wifi_eap_anonymous" msgid="2989469344116577955">"Anonyme"</string>
<string name="wifi_password" msgid="5948219759936151048">"Mot de passe"</string>
+ <string name="wifi_sae_password_id" msgid="1697832722221765763">"Identifiant de mot de passe SAE"</string>
<string name="wifi_show_password" msgid="6461249871236968884">"Afficher le mot de passe"</string>
<string name="wifi_ap_band_config" msgid="1611826705989117930">"Sélectionner la bande du point d\'accès"</string>
<string name="wifi_ap_choose_auto" msgid="2677800651271769965">"Auto"</string>
@@ -957,7 +956,6 @@
<string name="wifi_dpp_share_wifi" msgid="9065890131734833809">"Partager le Wi‑Fi"</string>
<string name="wifi_dpp_scan_qr_code_with_another_device" msgid="5854392840857123065">"Numérisez ce code QR pour établir la connexion au réseau « <xliff:g id="SSID">%1$s</xliff:g> » et partager le mot de passe"</string>
<string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="4436318319178361543">"Numérisez ce code QR pour établir la connexion au réseau « <xliff:g id="SSID">%1$s</xliff:g> »"</string>
- <string name="wifi_dpp_could_not_detect_valid_qr_code" msgid="641893675646330576">"Impossible de lire le code QR. Recentrez le code et réessayez"</string>
<string name="wifi_dpp_failure_authentication_or_configuration" msgid="3372757783382381044">"Réessayez. Si le problème persiste, communiquez avec le fabricant de l\'appareil"</string>
<string name="wifi_dpp_failure_not_compatible" msgid="2829930473520603740">"Un problème s\'est produit"</string>
<string name="wifi_dpp_failure_timeout" msgid="5228320772245820458">"Assurez-vous que l\'appareil a été branché, chargé et allumé"</string>
@@ -980,6 +978,7 @@
<string name="wifi_dpp_hotspot_password" msgid="4120419278831581613">"Mot de passe du point d\'accès : <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
<string name="wifi_dpp_add_device" msgid="4072206063308645677">"Ajouter un appareil"</string>
<string name="wifi_dpp_connect_network_using_qr_code" msgid="3887335309163999665">"Utiliser un code QR pour ajouter un appareil à ce réseau"</string>
+ <string name="wifi_dpp_qr_code_is_not_valid_format" msgid="3700087439867692944">"Le format du code QR est incorrect"</string>
<string name="retry" msgid="6472609612090877557">"Réessayer"</string>
<string name="wifi_shared" msgid="844142443226926070">"Partager avec d\'autres utilisateurs d\'appareils"</string>
<string name="wifi_unchanged" msgid="3410422020930397102">"(aucune modification)"</string>
@@ -1129,6 +1128,7 @@
<string name="emergency_address_title" msgid="932729250447887545">"Adresse d\'urgence"</string>
<string name="emergency_address_summary" msgid="7751971156196115129">"Cette adresse sera définie comme votre position géographique lorsque vous effectuerez des appels d\'urgence par Wi-Fi"</string>
<string name="private_dns_help_message" msgid="3299567069152568958"><annotation id="url">"En savoir plus"</annotation>" sur la fonctionnalité de DNS privé"</string>
+ <string name="private_dns_mode_on" msgid="5882613439541371003">"Activé"</string>
<string name="wifi_calling_pref_managed_by_carrier" msgid="6845711858866828986">"Ce paramètre est géré par votre fournisseur de services"</string>
<string name="wifi_calling_settings_activation_instructions" msgid="7492509632478260955">"Activer les appels Wi-Fi"</string>
<string name="wifi_calling_turn_on" msgid="1171403510313983983">"Activer les appels Wi-Fi"</string>
@@ -1872,7 +1872,7 @@
<string name="default_emergency_app" msgid="1951760659640369980">"Application d\'urgence"</string>
<string name="reset_app_preferences" msgid="1321050641018356925">"Réinitialiser préférences applis"</string>
<string name="reset_app_preferences_title" msgid="6093179367325336662">"Réinitialiser préférences applis?"</string>
- <string name="reset_app_preferences_desc" msgid="4822447731869201512">"Cette opération a pour effet de réinitialiser toutes les préférences relatives aux éléments suivants :\n\n "<li>"Applications désactivées"</li>\n" "<li>"Notifications associées aux applications désactivées"</li>\n" "<li>"Applications par défaut pour les actions"</li>\n" "<li>"Restrictions de données en arrière-plan pour les applications"</li>\n" "<li>"Toutes les restrictions d\'autorisations"</li>\n\n"Vous ne perdrez aucune donnée liée aux applications."</string>
+ <string name="reset_app_preferences_desc" msgid="731757609326016760">"Cette opération réinitialise toutes les préférences relatives aux éléments suivants :\n\n"<li>"Applications désactivées"</li>\n<li>"Notifications associées aux applications désactivées"</li>\n<li>"Applications par défaut pour les actions"</li>\n<li>"Restrictions de données en arrière-plan pour les applications"</li>\n<li>"Toutes les restrictions d\'autorisations"</li>\n\n"Vous ne perdrez aucune donnée liée aux applications."</string>
<string name="reset_app_preferences_button" msgid="2559089511841281242">"Réinitialiser applis"</string>
<string name="manage_space_text" msgid="8852711522447794676">"Gérer l\'espace"</string>
<string name="filter" msgid="2018011724373033887">"Filtre"</string>
@@ -2087,7 +2087,7 @@
<string name="accessibility_screen_magnification_short_summary" msgid="3411979839172752057">"Touchez trois fois pour zoomer vers l\'avant"</string>
<string name="accessibility_screen_magnification_navbar_short_summary" msgid="3693116360267980492">"Touchez un bouton pour zoomer"</string>
<string name="accessibility_screen_magnification_summary" msgid="5258868553337478505"><b>"Pour zoomer,"</b>" touchez rapidement l\'écran trois fois.\n"<ul><li>"Glissez deux doigts ou plus sur l\'écran pour le faire défiler"</li>\n<li>"Pincez deux doigts ou plus pour ajuster le zoom"</li></ul>\n\n<b>"Pour zoomer temporairement,"</b>" touchez rapidement l\'écran trois fois et, au troisième toucher, laissez le doigt sur l\'écran\n"<ul><li>"Glissez votre doigt vous vous déplacer sur l\'écran."</li>\n<li>"Relevez le doigt pour zoomer vers l\'arrière"</li></ul>\n\n"On ne peut pas zoomer sur le clavier ou la barre de navigation."</string>
- <string name="accessibility_screen_magnification_navbar_summary" msgid="2272878354599332009">"Lorsque le zoom est activé, vous pouvez agrandir ce qui est affiché sur l\'écran.\n\n"<b>"Pour effectuer un zoom,"</b>" activez cette fonction, puis touchez une zone de l\'écran.\n"<ul><li>"• Glissez deux doigts ou plus pour faire défiler l\'écran"</li>\n<li>"• Pincez deux doigts ou plus pour ajuster le facteur de zoom"</li></ul>\n\n<b>"Pour effectuer un zoom temporaire,"</b>" activez cette fonction, puis laissez le doigt sur une zone de l\'écran.\n"<ul><li>"• Pour vous déplacer dans l\'écran, glissez le doigt"</li>\n<li>"• Pour rétablir le zoom par défaut, retirez le doigt de l\'écran"</li></ul>\n\n"On ne peut pas effectuer de zoom avant sur le clavier ni sur la barre de navigation."</string>
+ <string name="accessibility_screen_magnification_navbar_summary" msgid="6700716275347612310">"When magnification is turned on, you can zoom in on your screen.\n\n"<b>"Pour effectuer un zoom,"</b>", activez cette fonction, puis touchez une zone de l\'écran.\n"<ul><li>"Glissez deux doigts ou plus sur l\'écran pour le faire défiler"</li>\n<li>"Pincez deux doigts ou plus pour ajuster le zoom"</li></ul>\n\n<b>"Pour zoomer temporairement l\'écran"</b>", touchez le bouton d\'accessibilité, puis maintenez le doigt sur ailleurs sur l\'écran.\n"<ul><li>"Glissez votre doigt sur l\'écran à l\'endroit désiré"</li>\n<li>"Relevez le doigt pour zoomer vers l\'arrière"</li></ul>\n\n"On ne peut pas zoomer sur le clavier ou la barre de navigation."</string>
<string name="accessibility_tutorial_dialog_title_button" msgid="3682222614034474845">"Utiliser le bouton d\'accessibilité pour ouvrir"</string>
<string name="accessibility_tutorial_dialog_title_gesture" msgid="1342726230497913398">"Utiliser un geste pour activer le service"</string>
<string name="accessibility_tutorial_dialog_title_gesture_settings" msgid="8539392614235820285">"Utiliser le nouveau geste d\'accessibilité"</string>
@@ -2140,8 +2140,7 @@
<string name="accessibility_hearingaid_title" msgid="8312145423610648518">"Prothèses auditives"</string>
<string name="accessibility_hearingaid_not_connected_summary" msgid="6240237523789614599">"Aucune prothèse auditive connectée"</string>
<string name="accessibility_hearingaid_adding_summary" msgid="2947474468412309778">"Ajouter des prothèses auditives"</string>
- <string name="accessibility_hearingaid_pair_instructions_first_message" msgid="3912093691643131154">"Pour associer votre prothèse auditive, trouvez-la dans la liste de l\'écran suivant et touchez-la."</string>
- <string name="accessibility_hearingaid_pair_instructions_second_message" msgid="5596683393607650243">"Assurez-vous que votre prothèse auditive est en mode d\'association."</string>
+ <string name="accessibility_hearingaid_pair_instructions_message" msgid="3094382949733435414">"Pour associer votre prothèse auditive, trouvez-la dans la liste de l\'écran suivant et touchez-la. Assurez-vous que votre prothèse auditive est en mode d\'association."</string>
<string name="accessibility_hearingaid_active_device_summary" msgid="3924362383258688984">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> est actif"</string>
<plurals name="show_number_hearingaid_count" formatted="false" msgid="3160782397139295486">
<item quantity="one"><xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> prothèse auditive enregistrée</item>
@@ -2490,7 +2489,6 @@
<string name="menu_stats_last_unplugged" msgid="5922246077592434526">"Depuis le dernier débranchement (<xliff:g id="UNPLUGGED">%1$s</xliff:g>)"</string>
<string name="menu_stats_total" msgid="8973377864854807854">"Utilisation totale"</string>
<string name="menu_stats_refresh" msgid="1676215433344981075">"Actualiser"</string>
- <string name="process_kernel_label" msgid="3916858646836739323">"Système d\'exploitation Android"</string>
<string name="process_mediaserver_label" msgid="6500382062945689285">"Serveur multimédia"</string>
<string name="process_dex2oat_label" msgid="2592408651060518226">"Optimisation des applications"</string>
<string name="battery_saver" msgid="8172485772238572153">"Économie d\'énergie"</string>
@@ -2621,8 +2619,6 @@
<string name="no_device_admins" msgid="4846602835339095768">"Il n\'y a aucune application d\'administration d\'appareil"</string>
<string name="personal_device_admin_title" msgid="2849617316347669861">"Personnel"</string>
<string name="managed_device_admin_title" msgid="7853955652864478435">"Travail"</string>
- <string name="sms_access_restriction_enabled" msgid="7054488078710530278">"Restreindre accès aux journaux mess. texte et appels"</string>
- <string name="sms_access_restriction_enabled_summary" msgid="6851339654677842328">"Seules les applications de téléphonie et de messagerie par défaut sont accès aux journaux des appels et des messages texte"</string>
<string name="no_trust_agents" msgid="7450273545568977523">"Aucun agent de confiance disponible"</string>
<string name="add_device_admin_msg" msgid="1501847129819382149">"Activer l\'appli d\'admin de l\'appareil?"</string>
<string name="add_device_admin" msgid="4192055385312215731">"Activer l\'application d\'administration de l\'appareil"</string>
@@ -3111,7 +3107,7 @@
<string name="keywords_app_default" msgid="5822717006354487071">"Ouvrir avec"</string>
<string name="keywords_applications_settings" msgid="1268353611121497450">"Applications"</string>
<string name="keywords_time_zone" msgid="998254736898753085">"fuseau horaire"</string>
- <string name="keywords_draw_overlay" msgid="4130899177619041842">"Bulle de clavardage"</string>
+ <string name="keywords_draw_overlay" msgid="1001120206241401007">"Bulle de clavardage, système, alerte, fenêtre, boîte de dialogue, écran, superposition autres applis, dessin"</string>
<string name="keywords_flashlight" msgid="6161632177705233710">"Lampe de poche, lumière"</string>
<string name="keywords_change_wifi_state" msgid="627068244033681010">"wifi, wi-fi, activer, désactiver, gestion"</string>
<string name="keywords_more_mobile_networks" msgid="8995946622054642367">"cellulaire, mobile, fournisseur de services, sans fil, données, 4g, 3g, 2g, lte"</string>
@@ -3135,7 +3131,7 @@
<string name="keywords_sounds_and_notifications_interruptions" msgid="5426093074031208917">"ne pas déranger, interrompre, interruption, pause"</string>
<string name="keywords_app" msgid="6334757056536837791">"Mémoire vive"</string>
<string name="keywords_location" msgid="4132655528196729043">"à proximité, position, historique, signalement, GPS"</string>
- <string name="keywords_accounts" msgid="1957925565953357627">"compte"</string>
+ <string name="keywords_accounts" msgid="4479029747403203867">"compte, ajouter un compte, profil professionnel"</string>
<string name="keywords_users" msgid="3434190133131387942">"restriction, restreindre, restreint"</string>
<string name="keywords_keyboard_and_ime" msgid="9143339015329957107">"correction de texte, corriger, son, vibreur, automatique, langue, geste, suggérer, suggestion, thème, choquant, mot, type, emoji, international"</string>
<string name="keywords_reset_apps" msgid="5293291209613191845">"réinitialiser, préférences, par défaut"</string>
@@ -3173,6 +3169,7 @@
<string name="keywords_storage_settings" msgid="297283751968446577">"mémoire, cache, données, supprimer, effacer, libre, espace"</string>
<string name="keywords_bluetooth_settings" msgid="6804844062789439858">"connecté, appareil, casque d\'écoute, casque, haut-parleur, sans fil, associer, écouteurs, musique, médias"</string>
<string name="keywords_wallpaper" msgid="5058364390917429896">"fond d\'écran, écran, écran de verrouillage, thème"</string>
+ <string name="keywords_styles" msgid="5828725481814049422">"forme de l\'icône, couleur d\'accent, police"</string>
<string name="keywords_assist_input" msgid="5017533309492679287">"par défaut, assistant"</string>
<string name="keywords_default_payment_app" msgid="3838565809518896799">"paiement, par défaut"</string>
<string name="keywords_ambient_display" msgid="3103487805748659132">"notification entrante"</string>
@@ -3182,7 +3179,7 @@
<string name="keywords_notification_vibration" msgid="31924624421190547">"haptique, vibration, sensibilité"</string>
<string name="keywords_battery_saver_sticky" msgid="5586215686021650278">"économiseur de pile, fixe, persistant, économie d\'énergie, pile"</string>
<string name="keywords_battery_saver_schedule" msgid="7358789228486231944">"routine, horaire, économiseur de pile, économie d\'énergie, pile, automatique, pour cent"</string>
- <string name="keywords_add_an_account" msgid="6488139919428902434">"profil professionnel"</string>
+ <string name="keywords_enhance_4g_lte" msgid="2273810564244790859">"volte, appels avancés, appels 4g"</string>
<string name="default_sound" msgid="8821684447333687810">"Son par défaut"</string>
<string name="sound_settings_summary" msgid="4100853606668287965">"Le volume de la sonnerie est à <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
<string name="sound_dashboard_summary" msgid="3402435125958012986">"Volume, vibration, Ne pas déranger"</string>
@@ -3889,7 +3886,6 @@
<string name="permit_draw_overlay" msgid="7456536798718633432">"Autoriser la superposition d\'applis"</string>
<string name="allow_overlay_description" msgid="8961670023925421358">"Permet à l\'application d\'afficher des éléments dans d\'autres applications, et cela risque de nuire à l\'utilisation de ces dernières ou de modifier leur apparence ou leur comportement."</string>
<string name="keywords_vr_listener" msgid="7441221822576384680">"vr réalité virtuelle écouteur service de soutien stéréo"</string>
- <string name="keywords_system_alert_window" msgid="5049498015597864850">"afficher des fenêtres d\'alertes système par-dessus d\'autres applications"</string>
<string name="overlay_settings" msgid="6930854109449524280">"Afficher par-dessus autres applis"</string>
<string name="system_alert_window_summary" msgid="602892301318324492">"<xliff:g id="COUNT_0">%1$d</xliff:g> applis sur <xliff:g id="COUNT_1">%2$d</xliff:g> sont autorisées à aff. par-dessus autres applis"</string>
<string name="filter_overlay_apps" msgid="6965969283342557573">"Applications dotées de l\'autorisation"</string>
@@ -4125,7 +4121,6 @@
<string name="notification_log_details_none" msgid="184131801230614059">"aucun(e)"</string>
<string name="notification_log_details_ranking_null" msgid="244660392058720919">"L\'objet de classement est manquant."</string>
<string name="notification_log_details_ranking_none" msgid="599607025882587844">"L\'objet de classement ne contient pas cette touche."</string>
- <string name="theme_customization_category" msgid="1049181544004163283">"Thèmes"</string>
<string name="theme_customization_device_default" msgid="5058147707906551368">"Valeurs par défaut de l\'appareil"</string>
<string name="display_cutout_emulation" msgid="7466869822418376317">"Encoche de l\'écran"</string>
<string name="display_cutout_emulation_keywords" msgid="4495418317471622562">"découpe d\'affichage, encoche"</string>
@@ -4551,6 +4546,8 @@
<string name="network_connection_errorstate_dialog_message" msgid="6953778550775646710">"Une erreur s\'est produite. L\'application a annulé la demande de sélection d\'un appareil."</string>
<string name="network_connection_connect_successful" msgid="5935510954474494928">"Connexion réussie"</string>
<string name="network_connection_request_dialog_showall" msgid="6938922880244567521">"Tout afficher"</string>
+ <string name="network_connection_searching_message" msgid="4638576789450817530">"Recherche d\'appareil en cours…"</string>
+ <string name="network_connection_connecting_message" msgid="3740982406609245654">"Connexion à l\'appareil en cours…"</string>
<plurals name="show_bluetooth_devices" formatted="false" msgid="1715020480026568408">
<item quantity="one"><xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> appareil connecté</item>
<item quantity="other"><xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> appareils connectés</item>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index eff473b..6141292 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -360,8 +360,6 @@
<string name="security_enable_widgets_disabled_summary" msgid="6392489775303464905">"Désactivé par l\'administrateur"</string>
<string name="lockdown_settings_title" msgid="7393790212603280213">"Afficher l\'option de blocage"</string>
<string name="lockdown_settings_summary" msgid="4359438673563318171">"Permet d\'afficher un bouton Marche/Arrêt qui désactive Smart Lock, le déverrouillage à l\'aide de données biométriques et les notifications sur l\'écran de verrouillage"</string>
- <string name="trust_agents_extend_unlock_title" msgid="2796555263565097031">"Déverrouillage prolongé pour les agents de confiance"</string>
- <string name="trust_agents_extend_unlock_summary" msgid="3976344969220255010">"Si cette option est activée, les agents de confiance pourront maintenir votre appareil déverrouillé pendant plus longtemps, mais ne pourront plus déverrouiller un appareil verrouillé"</string>
<string name="trust_lost_locks_screen_title" msgid="2992742466966021682">"Verrouiller l\'écran en l\'absence d\'agent de confiance"</string>
<string name="trust_lost_locks_screen_summary" msgid="693784434582021206">"Si cette option est activée, l\'appareil se verrouille lorsqu\'il n\'existe plus aucun agent de confiance"</string>
<string name="owner_info_settings_summary" msgid="7472393443779227052">"Aucun"</string>
@@ -937,6 +935,7 @@
<string name="wifi_eap_identity" msgid="4359453783379679103">"Identité"</string>
<string name="wifi_eap_anonymous" msgid="2989469344116577955">"Anonyme"</string>
<string name="wifi_password" msgid="5948219759936151048">"Mot de passe"</string>
+ <string name="wifi_sae_password_id" msgid="1697832722221765763">"Identifiant du mot de passe SAE"</string>
<string name="wifi_show_password" msgid="6461249871236968884">"Afficher le mot de passe"</string>
<string name="wifi_ap_band_config" msgid="1611826705989117930">"Sélectionner la bande du point d\'accès"</string>
<string name="wifi_ap_choose_auto" msgid="2677800651271769965">"Automatique"</string>
@@ -957,7 +956,6 @@
<string name="wifi_dpp_share_wifi" msgid="9065890131734833809">"Partager le Wi‑Fi"</string>
<string name="wifi_dpp_scan_qr_code_with_another_device" msgid="5854392840857123065">"Scannez ce code QR pour vous connecter à \"<xliff:g id="SSID">%1$s</xliff:g>\" et partager le mot de passe."</string>
<string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="4436318319178361543">"Scannez ce code QR pour vous connecter à \"<xliff:g id="SSID">%1$s</xliff:g>\"."</string>
- <string name="wifi_dpp_could_not_detect_valid_qr_code" msgid="641893675646330576">"Impossible de lire le code QR. Recentrez le code et réessayez"</string>
<string name="wifi_dpp_failure_authentication_or_configuration" msgid="3372757783382381044">"Réessayez. Si le problème persiste, contactez le fabricant de l\'appareil"</string>
<string name="wifi_dpp_failure_not_compatible" msgid="2829930473520603740">"Un problème est survenu"</string>
<string name="wifi_dpp_failure_timeout" msgid="5228320772245820458">"Assurez-vous que l\'appareil est branché, chargé et allumé"</string>
@@ -980,6 +978,7 @@
<string name="wifi_dpp_hotspot_password" msgid="4120419278831581613">"Mot de passe du point d\'accès : <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
<string name="wifi_dpp_add_device" msgid="4072206063308645677">"Ajouter un appareil"</string>
<string name="wifi_dpp_connect_network_using_qr_code" msgid="3887335309163999665">"Utiliser un code QR pour ajouter un appareil à ce réseau"</string>
+ <string name="wifi_dpp_qr_code_is_not_valid_format" msgid="3700087439867692944">"Le format de code QR n\'est pas valide"</string>
<string name="retry" msgid="6472609612090877557">"Réessayer"</string>
<string name="wifi_shared" msgid="844142443226926070">"Partager avec d\'autres utilisateurs de l\'appareil"</string>
<string name="wifi_unchanged" msgid="3410422020930397102">"(aucune modification)"</string>
@@ -1129,6 +1128,7 @@
<string name="emergency_address_title" msgid="932729250447887545">"Adresse d\'urgence"</string>
<string name="emergency_address_summary" msgid="7751971156196115129">"Adresse utilisée pour votre position si vous effectuez un appel d\'urgence à l\'aide du Wi-Fi"</string>
<string name="private_dns_help_message" msgid="3299567069152568958"><annotation id="url">"En savoir plus"</annotation>" sur les fonctionnalités de DNS privé"</string>
+ <string name="private_dns_mode_on" msgid="5882613439541371003">"Activé"</string>
<string name="wifi_calling_pref_managed_by_carrier" msgid="6845711858866828986">"Paramètre géré par l\'opérateur"</string>
<string name="wifi_calling_settings_activation_instructions" msgid="7492509632478260955">"Activer les appels Wi-Fi"</string>
<string name="wifi_calling_turn_on" msgid="1171403510313983983">"Activer les appels Wi-Fi"</string>
@@ -1872,7 +1872,7 @@
<string name="default_emergency_app" msgid="1951760659640369980">"Application pour les urgences"</string>
<string name="reset_app_preferences" msgid="1321050641018356925">"Réinitialiser les préférences"</string>
<string name="reset_app_preferences_title" msgid="6093179367325336662">"Réinitialiser les préférences ?"</string>
- <string name="reset_app_preferences_desc" msgid="4822447731869201512">"Cette opération a pour effet de réinitialiser toutes les préférences relatives aux éléments suivants :\n\n"<li>"Applications désactivées"</li>\n<li>"Notifications associées aux applications désactivées"</li>\n<li>"Applications par défaut pour les actions"</li>\n<li>"Restrictions de données en arrière-plan pour les applications"</li>\n<li>"Restrictions d\'autorisations"</li>\n\n"Les données liées aux applications seront conservées."</string>
+ <string name="reset_app_preferences_desc" msgid="731757609326016760">"Toutes les préférences relatives aux éléments suivants seront réinitialisées :\n\n"<li>"Applications désactivées"</li>\n<li>"Notifications associées aux applications désactivées"</li>\n<li>"Applications par défaut pour les actions"</li>\n<li>"Restrictions de données en arrière-plan pour les applications"</li>\n<li>"Toutes les restrictions d\'autorisations"</li>\n\n"Vous ne perdrez aucune donnée liée aux applications."</string>
<string name="reset_app_preferences_button" msgid="2559089511841281242">"Réinitialiser"</string>
<string name="manage_space_text" msgid="8852711522447794676">"Gérer l\'espace"</string>
<string name="filter" msgid="2018011724373033887">"Filtrer"</string>
@@ -2087,7 +2087,7 @@
<string name="accessibility_screen_magnification_short_summary" msgid="3411979839172752057">"Appuyer trois fois pour zoomer"</string>
<string name="accessibility_screen_magnification_navbar_short_summary" msgid="3693116360267980492">"Appuyer sur un bouton pour zoomer"</string>
<string name="accessibility_screen_magnification_summary" msgid="5258868553337478505"><b>"Pour zoomer"</b>", appuyez trois fois rapidement sur l\'écran.\n"<ul><li>"Pour faire défiler l\'écran, faites glisser deux doigts ou plus sur l\'écran"</li>\n<li>"Pour régler le niveau de zoom, pincez deux doigts ou plus sur l\'écran"</li></ul>\n\n<b>"Pour faire un zoom temporaire"</b>", appuyez trois fois rapidement sur l\'écran en veillant à appuyer de manière prolongée la troisième fois.\n"<ul><li>"Pour vous déplacer sur l\'écran, faites glisser un doigt dessus"</li>\n<li>"Pour faire un zoom arrière, relevez le doigt"</li></ul>\n\n"Il est impossible de faire un zoom avant sur le clavier et la barre de navigation."</string>
- <string name="accessibility_screen_magnification_navbar_summary" msgid="2272878354599332009">"Lorsque l\'option \"Agrandissement\" est activée, vous pouvez effectuer un zoom avant sur votre écran.\n\n"<b>"Pour zoomer"</b>", activez l\'option \"Agrandissement\", puis appuyez n\'importe où sur l\'écran.\n"<ul><li>"• Faites glisser deux doigts ou plus pour faire défiler la page."</li>\n<li>"• Pincez l\'écran avec deux doigts ou plus pour ajuster le zoom."</li></ul>\n\n<b>"Pour zoomer de manière temporaire"</b>", activez l\'option \"Agrandissement\", puis appuyez de manière prolongée n\'importe où sur l\'écran.\n"<ul><li>"• Faites glisser votre doigt pour vous déplacer sur l\'écran."</li>\n<li>"• Relevez le doigt pour faire un zoom arrière."</li></ul>\n\n"Vous ne pouvez pas zoomer sur le clavier ni sur la barre de navigation."</string>
+ <string name="accessibility_screen_magnification_navbar_summary" msgid="6700716275347612310">"Lorsque l\'option \"Agrandissement\" est activée, vous pouvez effectuer un zoom avant sur votre écran.\n\n"<b>"Pour zoomer"</b>", activez l\'option \"Agrandissement\", puis appuyez n\'importe où sur l\'écran.\n"<ul><li>"Pour faire défiler l\'écran, faites glisser deux doigts ou plus dessus."</li>\n<li>"Pour régler le niveau de zoom, pincez l\'écran avec deux doigts ou plus."</li></ul>\n\n<b>"Pour faire un zoom temporaire"</b>", lancez l\'option \"Agrandissement\", puis appuyez de manière prolongée n\'importe où sur l\'écran.\n"<ul><li>"Pour vous déplacer sur l\'écran, faites glisser un doigt dessus."</li>\n<li>"Pour faire un zoom arrière, relevez le doigt."</li></ul>\n\n"Il est impossible de faire un zoom avant sur le clavier ni sur la barre de navigation."</string>
<string name="accessibility_tutorial_dialog_title_button" msgid="3682222614034474845">"Utiliser le bouton Accessibilité pour ouvrir"</string>
<string name="accessibility_tutorial_dialog_title_gesture" msgid="1342726230497913398">"Utiliser un geste pour ouvrir"</string>
<string name="accessibility_tutorial_dialog_title_gesture_settings" msgid="8539392614235820285">"Utiliser le nouveau geste d\'accessibilité"</string>
@@ -2140,8 +2140,7 @@
<string name="accessibility_hearingaid_title" msgid="8312145423610648518">"Appareils auditifs"</string>
<string name="accessibility_hearingaid_not_connected_summary" msgid="6240237523789614599">"Aucun appareil auditif associé"</string>
<string name="accessibility_hearingaid_adding_summary" msgid="2947474468412309778">"Ajouter des appareils auditifs"</string>
- <string name="accessibility_hearingaid_pair_instructions_first_message" msgid="3912093691643131154">"Pour associer votre appareil auditif, sélectionnez-le sur l\'écran suivant"</string>
- <string name="accessibility_hearingaid_pair_instructions_second_message" msgid="5596683393607650243">"Assurez-vous que vos appareils auditifs sont en mode d\'association."</string>
+ <string name="accessibility_hearingaid_pair_instructions_message" msgid="3094382949733435414">"Pour associer vos appareils auditifs, recherchez-les et appuyez dessus sur l\'écran suivant. Assurez-vous que vos appareils auditifs sont en mode d\'association."</string>
<string name="accessibility_hearingaid_active_device_summary" msgid="3924362383258688984">"Appareil \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\" actif"</string>
<plurals name="show_number_hearingaid_count" formatted="false" msgid="3160782397139295486">
<item quantity="one"><xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> appareil auditif enregistré</item>
@@ -2490,7 +2489,6 @@
<string name="menu_stats_last_unplugged" msgid="5922246077592434526">"Depuis le dernier débranchement (<xliff:g id="UNPLUGGED">%1$s</xliff:g>)"</string>
<string name="menu_stats_total" msgid="8973377864854807854">"Utilisation totale"</string>
<string name="menu_stats_refresh" msgid="1676215433344981075">"Actualiser"</string>
- <string name="process_kernel_label" msgid="3916858646836739323">"Plate-forme Android"</string>
<string name="process_mediaserver_label" msgid="6500382062945689285">"Serveur multimédia"</string>
<string name="process_dex2oat_label" msgid="2592408651060518226">"Optimisation des applications"</string>
<string name="battery_saver" msgid="8172485772238572153">"Économiseur de batterie"</string>
@@ -2621,8 +2619,6 @@
<string name="no_device_admins" msgid="4846602835339095768">"Aucune application d\'administration de l\'appareil n\'est disponible"</string>
<string name="personal_device_admin_title" msgid="2849617316347669861">"Personnel"</string>
<string name="managed_device_admin_title" msgid="7853955652864478435">"Professionnel"</string>
- <string name="sms_access_restriction_enabled" msgid="7054488078710530278">"Restreindre l\'accès aux SMS et au journal d\'appels"</string>
- <string name="sms_access_restriction_enabled_summary" msgid="6851339654677842328">"Seules les applications téléphoniques et de messagerie par défaut disposent des autorisations pour accéder aux SMS et au journal d\'appels"</string>
<string name="no_trust_agents" msgid="7450273545568977523">"Aucun agent de confiance disponible"</string>
<string name="add_device_admin_msg" msgid="1501847129819382149">"Activer l\'appli d\'administration ?"</string>
<string name="add_device_admin" msgid="4192055385312215731">"Activer l\'application d\'administration de cet appareil"</string>
@@ -3111,7 +3107,7 @@
<string name="keywords_app_default" msgid="5822717006354487071">"Ouvrir avec"</string>
<string name="keywords_applications_settings" msgid="1268353611121497450">"Applications"</string>
<string name="keywords_time_zone" msgid="998254736898753085">"fuseau horaire"</string>
- <string name="keywords_draw_overlay" msgid="4130899177619041842">"Chat Head"</string>
+ <string name="keywords_draw_overlay" msgid="1001120206241401007">"Chat Head, système, alerte, fenêtre, boîte de dialogue, écran, superposition autres applis, dessin"</string>
<string name="keywords_flashlight" msgid="6161632177705233710">"lampe de poche, lumière, lampe"</string>
<string name="keywords_change_wifi_state" msgid="627068244033681010">"wifi, wi-fi, activer/désactiver, contrôle"</string>
<string name="keywords_more_mobile_networks" msgid="8995946622054642367">"cellulaire, mobile, opérateur mobile, sans fil, données, 4g, 3g, 2g, lte"</string>
@@ -3135,7 +3131,7 @@
<string name="keywords_sounds_and_notifications_interruptions" msgid="5426093074031208917">"ne pas déranger, interrompre, interruption, pause"</string>
<string name="keywords_app" msgid="6334757056536837791">"RAM"</string>
<string name="keywords_location" msgid="4132655528196729043">"à proximité, historique, position, mise à jour, GPS"</string>
- <string name="keywords_accounts" msgid="1957925565953357627">"compte"</string>
+ <string name="keywords_accounts" msgid="4479029747403203867">"compte, ajouter un compte, profil professionnel"</string>
<string name="keywords_users" msgid="3434190133131387942">"limitation, limiter, limité"</string>
<string name="keywords_keyboard_and_ime" msgid="9143339015329957107">"correction de texte, corriger, son, vibreur, automatique, langue, geste, suggérer, suggestion, thème, choquant, mot, saisir, emoji, international"</string>
<string name="keywords_reset_apps" msgid="5293291209613191845">"réinitialiser, préférences, par défaut"</string>
@@ -3173,6 +3169,7 @@
<string name="keywords_storage_settings" msgid="297283751968446577">"mémoire, cache, données, supprimer, effacer, libérer, espace"</string>
<string name="keywords_bluetooth_settings" msgid="6804844062789439858">"associé, appareil, casque audio, casque, enceinte, sans fil, associer, écouteurs, musique, contenu multimédia"</string>
<string name="keywords_wallpaper" msgid="5058364390917429896">"arrière-plan, écran, écran de verrouillage, thème"</string>
+ <string name="keywords_styles" msgid="5828725481814049422">"forme des icônes, couleur d\'accentuation, police"</string>
<string name="keywords_assist_input" msgid="5017533309492679287">"par défaut, assistant"</string>
<string name="keywords_default_payment_app" msgid="3838565809518896799">"paiement, par défaut"</string>
<string name="keywords_ambient_display" msgid="3103487805748659132">"notification reçue"</string>
@@ -3182,7 +3179,7 @@
<string name="keywords_notification_vibration" msgid="31924624421190547">"technologie tactile, vibreur, sensibilité"</string>
<string name="keywords_battery_saver_sticky" msgid="5586215686021650278">"économiseur de batterie, persistant, persistance, économiseur d\'énergie, batterie"</string>
<string name="keywords_battery_saver_schedule" msgid="7358789228486231944">"routine, planning, économiseur de batterie, économiseur d\'énergie, batterie, automatique, pourcentage"</string>
- <string name="keywords_add_an_account" msgid="6488139919428902434">"profil professionnel"</string>
+ <string name="keywords_enhance_4g_lte" msgid="2273810564244790859">"volte, appel avancé, appel en 4g"</string>
<string name="default_sound" msgid="8821684447333687810">"Son par défaut"</string>
<string name="sound_settings_summary" msgid="4100853606668287965">"Volume de sonnerie à <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
<string name="sound_dashboard_summary" msgid="3402435125958012986">"Volume, vibreur, Ne pas déranger"</string>
@@ -3889,7 +3886,6 @@
<string name="permit_draw_overlay" msgid="7456536798718633432">"Autoriser la superposition d\'applis"</string>
<string name="allow_overlay_description" msgid="8961670023925421358">"Autorisez cette application à se superposer aux autres applications que vous utilisez. Cette autorisation peut avoir un impact sur votre utilisation de ces dernières, ou modifier leur apparence ou leur comportement."</string>
<string name="keywords_vr_listener" msgid="7441221822576384680">"rv réalité virtuelle écouteur service de soutien stéréo"</string>
- <string name="keywords_system_alert_window" msgid="5049498015597864850">"fenêtre alerte système boîte de dialogue superposition autres applis"</string>
<string name="overlay_settings" msgid="6930854109449524280">"Superposition sur d\'autres applis"</string>
<string name="system_alert_window_summary" msgid="602892301318324492">"<xliff:g id="COUNT_0">%1$d</xliff:g> applis sur <xliff:g id="COUNT_1">%2$d</xliff:g> autorisées à se superposer à d\'autres"</string>
<string name="filter_overlay_apps" msgid="6965969283342557573">"Applications disposant de l\'autorisation"</string>
@@ -4125,7 +4121,6 @@
<string name="notification_log_details_none" msgid="184131801230614059">"aucune"</string>
<string name="notification_log_details_ranking_null" msgid="244660392058720919">"Objet de classement manquant."</string>
<string name="notification_log_details_ranking_none" msgid="599607025882587844">"L\'objet de classement ne contient pas cette touche."</string>
- <string name="theme_customization_category" msgid="1049181544004163283">"Personnalisation des thèmes"</string>
<string name="theme_customization_device_default" msgid="5058147707906551368">"Par défaut"</string>
<string name="display_cutout_emulation" msgid="7466869822418376317">"Encoche"</string>
<string name="display_cutout_emulation_keywords" msgid="4495418317471622562">"encoche pour écran, entaille"</string>
@@ -4551,6 +4546,8 @@
<string name="network_connection_errorstate_dialog_message" msgid="6953778550775646710">"Un problème est survenu. L\'application a annulé la demande de sélection d\'un appareil."</string>
<string name="network_connection_connect_successful" msgid="5935510954474494928">"Connexion réussie"</string>
<string name="network_connection_request_dialog_showall" msgid="6938922880244567521">"Tout afficher"</string>
+ <string name="network_connection_searching_message" msgid="4638576789450817530">"Recherche de l\'appareil…"</string>
+ <string name="network_connection_connecting_message" msgid="3740982406609245654">"Connexion à l\'appareil…"</string>
<plurals name="show_bluetooth_devices" formatted="false" msgid="1715020480026568408">
<item quantity="one"><xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> appareil connecté</item>
<item quantity="other"><xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> appareils connectés</item>
diff --git a/res/values-gl/strings.xml b/res/values-gl/strings.xml
index 48b87bf..0a6a42d 100644
--- a/res/values-gl/strings.xml
+++ b/res/values-gl/strings.xml
@@ -360,8 +360,6 @@
<string name="security_enable_widgets_disabled_summary" msgid="6392489775303464905">"Desactivado polo administrador"</string>
<string name="lockdown_settings_title" msgid="7393790212603280213">"Mostrar a opción de bloqueo"</string>
<string name="lockdown_settings_summary" msgid="4359438673563318171">"Mostra a opción do botón de acendido que desactiva Smart Lock, o desbloqueo biométrico e as notificacións da pantalla de bloqueo"</string>
- <string name="trust_agents_extend_unlock_title" msgid="2796555263565097031">"Desbloqueo ampliado axentes de confianza"</string>
- <string name="trust_agents_extend_unlock_summary" msgid="3976344969220255010">"Se se activa, os axentes de confianza manterán o dispositivo desbloqueado durante máis tempo, pero cando se bloquee non se poderá desbloquear"</string>
<string name="trust_lost_locks_screen_title" msgid="2992742466966021682">"Bloquear pantalla ao perder a confianza"</string>
<string name="trust_lost_locks_screen_summary" msgid="693784434582021206">"Se se activa, o dispositivo bloquearase cando o último axente de confianza perda ese privilexio"</string>
<string name="owner_info_settings_summary" msgid="7472393443779227052">"Ningunha"</string>
@@ -937,6 +935,7 @@
<string name="wifi_eap_identity" msgid="4359453783379679103">"Identidade"</string>
<string name="wifi_eap_anonymous" msgid="2989469344116577955">"Identidade anónima"</string>
<string name="wifi_password" msgid="5948219759936151048">"Contrasinal"</string>
+ <string name="wifi_sae_password_id" msgid="1697832722221765763">"Identificador do contrasinal SAE"</string>
<string name="wifi_show_password" msgid="6461249871236968884">"Mostrar contrasinal"</string>
<string name="wifi_ap_band_config" msgid="1611826705989117930">"Seleccionar banda AP"</string>
<string name="wifi_ap_choose_auto" msgid="2677800651271769965">"Automática"</string>
@@ -957,7 +956,6 @@
<string name="wifi_dpp_share_wifi" msgid="9065890131734833809">"Compartir wifi"</string>
<string name="wifi_dpp_scan_qr_code_with_another_device" msgid="5854392840857123065">"Escanea este código QR para conectarte a “<xliff:g id="SSID">%1$s</xliff:g>” e compartir o contrasinal"</string>
<string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="4436318319178361543">"Escanea este código QR para conectarte a “<xliff:g id="SSID">%1$s</xliff:g>”"</string>
- <string name="wifi_dpp_could_not_detect_valid_qr_code" msgid="641893675646330576">"Non se puido ler o código QR. Vólveo centrar e téntao de novo"</string>
<string name="wifi_dpp_failure_authentication_or_configuration" msgid="3372757783382381044">"Téntao de novo. Se o problema continúa, contacta co fabricante do dispositivo"</string>
<string name="wifi_dpp_failure_not_compatible" msgid="2829930473520603740">"Produciuse un erro"</string>
<string name="wifi_dpp_failure_timeout" msgid="5228320772245820458">"Asegúrate de que o dispositivo estea conectado, cargado e activado"</string>
@@ -980,6 +978,7 @@
<string name="wifi_dpp_hotspot_password" msgid="4120419278831581613">"Contrasinal da zona wifi: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
<string name="wifi_dpp_add_device" msgid="4072206063308645677">"Engadir dispositivo"</string>
<string name="wifi_dpp_connect_network_using_qr_code" msgid="3887335309163999665">"Utiliza un código QR para engadir un dispositivo a esta rede"</string>
+ <string name="wifi_dpp_qr_code_is_not_valid_format" msgid="3700087439867692944">"O formato do código QR non é válido"</string>
<string name="retry" msgid="6472609612090877557">"Tentar de novo"</string>
<string name="wifi_shared" msgid="844142443226926070">"Compartir rede con outros usuarios do dispositivo"</string>
<string name="wifi_unchanged" msgid="3410422020930397102">"(non cambiado)"</string>
@@ -1129,6 +1128,7 @@
<string name="emergency_address_title" msgid="932729250447887545">"Enderezo de emerxencia"</string>
<string name="emergency_address_summary" msgid="7751971156196115129">"Utilízase como a túa localización cando fas unha chamada de emerxencia por wifi"</string>
<string name="private_dns_help_message" msgid="3299567069152568958"><annotation id="url">"Máis información"</annotation>" sobre as funcións de DNS privado"</string>
+ <string name="private_dns_mode_on" msgid="5882613439541371003">"Activado"</string>
<string name="wifi_calling_pref_managed_by_carrier" msgid="6845711858866828986">"O operador xestiona esta opción de configuración"</string>
<string name="wifi_calling_settings_activation_instructions" msgid="7492509632478260955">"Activa Chamadas por wifi"</string>
<string name="wifi_calling_turn_on" msgid="1171403510313983983">"Activa Chamadas por wifi"</string>
@@ -1872,7 +1872,7 @@
<string name="default_emergency_app" msgid="1951760659640369980">"Aplicación de emerxencia"</string>
<string name="reset_app_preferences" msgid="1321050641018356925">"Restablecer preferencias das aplicacións"</string>
<string name="reset_app_preferences_title" msgid="6093179367325336662">"Restablecer as preferencias das aplicacións?"</string>
- <string name="reset_app_preferences_desc" msgid="4822447731869201512">"Con esta acción, restableceranse todas as preferencias de:\n\n"<li>"Aplicacións desactivadas"</li>\n<li>"Notificacións de aplicacións desactivadas"</li>\n<li>"Aplicacións predeterminadas para accións"</li>\n<li>"Restricións de datos en segundo plano para aplicacións"</li>\n<li>"Calquera restrición de permisos"</li>\n\n"Non perderás datos de ningunha aplicación."</string>
+ <string name="reset_app_preferences_desc" msgid="731757609326016760">"Con esta acción, restableceranse todas as preferencias de:\n\n"<li>"Aplicacións desactivadas"</li>\n<li>"Notificacións de aplicacións desactivadas"</li>\n" "<li>"Aplicacións predeterminadas para accións"</li>\n<li>"Restricións de datos en segundo plano para aplicacións"</li>\n<li>"Calquera restrición de permisos"</li>\n\n"Non perderás datos de ningunha aplicación."</string>
<string name="reset_app_preferences_button" msgid="2559089511841281242">"Restablecer aplicacións"</string>
<string name="manage_space_text" msgid="8852711522447794676">"Xestionar espazo"</string>
<string name="filter" msgid="2018011724373033887">"Filtro"</string>
@@ -2087,7 +2087,7 @@
<string name="accessibility_screen_magnification_short_summary" msgid="3411979839172752057">"Toca 3 veces para achegar o zoom"</string>
<string name="accessibility_screen_magnification_navbar_short_summary" msgid="3693116360267980492">"Toca un botón para achegar o zoom"</string>
<string name="accessibility_screen_magnification_summary" msgid="5258868553337478505"><b>"Para achegar o zoom"</b>", toca a pantalla 3 veces rapidamente.\n"<ul><li>"Arrastra 2 ou máis dedos para desprazarte"</li>\n<li>"Belisca con 2 ou máis dedos para axustar o zoom"</li></ul>\n\n<b>"Para achegar o zoom temporalmente"</b>", toca a pantalla 3 veces rapidamente e mantén o dedo sobre a pantalla despois do terceiro toque.\n"<ul><li>"Arrastra o dedo para moverte pola pantalla"</li>\n<li>"Levántao para afastar o zoom"</li></ul>\n\n"Non podes achegar o zoom sobre o teclado nin sobre a barra de navegación."</string>
- <string name="accessibility_screen_magnification_navbar_summary" msgid="2272878354599332009">"Ao activar a ampliación, podes achegar o contido da pantalla.\n\n"<b>"Para utilizar o zoom"</b>", inicia a ampliación e toca calquera parte da pantalla.\n"<ul><li>"• Arrastra 2 ou máis dedos para desprazarte."</li>\n<li>"• Belisca con 2 ou máis dedos para axustar o zoom."</li></ul>\n\n<b>"Para utilizar o zoom de forma temporal"</b>", inicia a ampliación e mantén premida calquera parte da pantalla.\n"<ul><li>"• Arrastra o dedo para moverte pola pantalla."</li>\n<li>"• Levanta o dedo para afastar a imaxe ou o texto."</li></ul>\n\n"Ten en conta que non se pode ampliar o teclado nin a barra de navegación."</string>
+ <string name="accessibility_screen_magnification_navbar_summary" msgid="6700716275347612310">"Ao activar a ampliación, podes achegar o contido da pantalla.\n\n"<b>"Para utilizar o zoom"</b>", inicia a ampliación e toca calquera parte da pantalla.\n"<ul><li>"Arrastra 2 ou máis dedos para desprazarte."</li>\n<li>"Belisca con 2 ou máis dedos para axustar o zoom."</li></ul>\n\n<b>"Para utilizar o zoom de forma temporal"</b>", inicia a ampliación e mantén premida calquera parte da pantalla.\n"<ul><li>"Arrastra o dedo para moverte pola pantalla."</li>\n<li>"Levanta o dedo para afastar a imaxe ou o texto."</li></ul>\n\n"Ten en conta que non se pode ampliar o teclado nin a barra de navegación."</string>
<string name="accessibility_tutorial_dialog_title_button" msgid="3682222614034474845">"Utilizar o botón de accesibilidade para abrir"</string>
<string name="accessibility_tutorial_dialog_title_gesture" msgid="1342726230497913398">"Utilizar un xesto para abrir"</string>
<string name="accessibility_tutorial_dialog_title_gesture_settings" msgid="8539392614235820285">"Usar novo xesto de accesibilidade"</string>
@@ -2140,8 +2140,7 @@
<string name="accessibility_hearingaid_title" msgid="8312145423610648518">"Audiófonos"</string>
<string name="accessibility_hearingaid_not_connected_summary" msgid="6240237523789614599">"Non hai ningún audiófono conectado"</string>
<string name="accessibility_hearingaid_adding_summary" msgid="2947474468412309778">"Engade audiófonos"</string>
- <string name="accessibility_hearingaid_pair_instructions_first_message" msgid="3912093691643131154">"Para vincular audiófonos, busca e toca o dispositivo na seguinte pantalla."</string>
- <string name="accessibility_hearingaid_pair_instructions_second_message" msgid="5596683393607650243">"Asegúrate de que os audiófonos estean no modo de sincronización."</string>
+ <string name="accessibility_hearingaid_pair_instructions_message" msgid="3094382949733435414">"Para sincronizar os audiófonos, busca e toca o teu dispositivo na seguinte pantalla. Asegúrate de que os audiófonos estean no modo de vinculación."</string>
<string name="accessibility_hearingaid_active_device_summary" msgid="3924362383258688984">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>: activo"</string>
<plurals name="show_number_hearingaid_count" formatted="false" msgid="3160782397139295486">
<item quantity="other"><xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> audiófonos gardados</item>
@@ -2490,7 +2489,6 @@
<string name="menu_stats_last_unplugged" msgid="5922246077592434526">"Uso da batería desde a última desconexión: <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
<string name="menu_stats_total" msgid="8973377864854807854">"Cifras totais de uso"</string>
<string name="menu_stats_refresh" msgid="1676215433344981075">"Actualizar"</string>
- <string name="process_kernel_label" msgid="3916858646836739323">"SO Android"</string>
<string name="process_mediaserver_label" msgid="6500382062945689285">"Servidor multimedia"</string>
<string name="process_dex2oat_label" msgid="2592408651060518226">"Optimización da aplicación"</string>
<string name="battery_saver" msgid="8172485772238572153">"Aforro de batería"</string>
@@ -2621,8 +2619,6 @@
<string name="no_device_admins" msgid="4846602835339095768">"Non hai ningunha aplicación de administración de dispositivos dispoñible"</string>
<string name="personal_device_admin_title" msgid="2849617316347669861">"Persoal"</string>
<string name="managed_device_admin_title" msgid="7853955652864478435">"Traballo"</string>
- <string name="sms_access_restriction_enabled" msgid="7054488078710530278">"Restrinxir acceso ao rexistro de chamadas e SMS"</string>
- <string name="sms_access_restriction_enabled_summary" msgid="6851339654677842328">"Só as aplicacións de teléfono e mensaxaría predeterminadas teñen permisos de acceso ao rexistro de chamadas e SMS"</string>
<string name="no_trust_agents" msgid="7450273545568977523">"Non hai ningún axente de confianza dispoñible"</string>
<string name="add_device_admin_msg" msgid="1501847129819382149">"Activar aplicación de administración?"</string>
<string name="add_device_admin" msgid="4192055385312215731">"Activar esta aplicación de administración de dispositivos"</string>
@@ -3112,7 +3108,7 @@
<string name="keywords_app_default" msgid="5822717006354487071">"Abrir con"</string>
<string name="keywords_applications_settings" msgid="1268353611121497450">"Aplicacións"</string>
<string name="keywords_time_zone" msgid="998254736898753085">"fuso horario"</string>
- <string name="keywords_draw_overlay" msgid="4130899177619041842">"Cabeceira do chat"</string>
+ <string name="keywords_draw_overlay" msgid="1001120206241401007">"Cabeceira do chat, sistema, alerta, ventá, cadro de diálogo, pantalla, sobre outras aplicacións, debuxar"</string>
<string name="keywords_flashlight" msgid="6161632177705233710">"Flash, luz, lanterna"</string>
<string name="keywords_change_wifi_state" msgid="627068244033681010">"wifi, activar, desactivar, control"</string>
<string name="keywords_more_mobile_networks" msgid="8995946622054642367">"móbil, operador móbil, sen fíos, datos, 4g, 3g, 2g, lte"</string>
@@ -3136,7 +3132,7 @@
<string name="keywords_sounds_and_notifications_interruptions" msgid="5426093074031208917">"non non molestar, interromper, interrupción, pausa"</string>
<string name="keywords_app" msgid="6334757056536837791">"RAM"</string>
<string name="keywords_location" msgid="4132655528196729043">"cerca, localización, historial, informes, GPS"</string>
- <string name="keywords_accounts" msgid="1957925565953357627">"conta"</string>
+ <string name="keywords_accounts" msgid="4479029747403203867">"conta, engadir conta, perfil de traballo"</string>
<string name="keywords_users" msgid="3434190133131387942">"restrición, restrinxir, restrinxido"</string>
<string name="keywords_keyboard_and_ime" msgid="9143339015329957107">"corrección ortográfica, correcto, son, vibrar, automático, idioma, xesto, suxerir, suxestión, tema, ofensivo, palabra, escribir, emoji, internacional"</string>
<string name="keywords_reset_apps" msgid="5293291209613191845">"restablecer, preferencias, predeterminadas"</string>
@@ -3174,6 +3170,7 @@
<string name="keywords_storage_settings" msgid="297283751968446577">"memoria, memoria caché, datos, eliminar, borrar, liberar, libre, espazo"</string>
<string name="keywords_bluetooth_settings" msgid="6804844062789439858">"conectado, dispositivo, auriculares, altofalante, sen fíos, sincronizar, música, contido multimedia"</string>
<string name="keywords_wallpaper" msgid="5058364390917429896">"fondo, pantalla, pantalla de bloqueo, tema"</string>
+ <string name="keywords_styles" msgid="5828725481814049422">"forma das iconas, cor da énfase, tipo de letra"</string>
<string name="keywords_assist_input" msgid="5017533309492679287">"predeterminado, asistente"</string>
<string name="keywords_default_payment_app" msgid="3838565809518896799">"pago, predeterminado"</string>
<string name="keywords_ambient_display" msgid="3103487805748659132">"notificación entrante"</string>
@@ -3183,7 +3180,7 @@
<string name="keywords_notification_vibration" msgid="31924624421190547">"tecnoloxía táctil, vibración, sensibilidade"</string>
<string name="keywords_battery_saver_sticky" msgid="5586215686021650278">"aforro de batería, fixo, persistir, aforro de enerxía, batería"</string>
<string name="keywords_battery_saver_schedule" msgid="7358789228486231944">"rutina, programación, aforro de batería, aforro de enerxía, batería, automático, porcentaxe"</string>
- <string name="keywords_add_an_account" msgid="6488139919428902434">"perfil de traballo"</string>
+ <string name="keywords_enhance_4g_lte" msgid="2273810564244790859">"VoLTE, chamadas avanzadas, chamadas 4G"</string>
<string name="default_sound" msgid="8821684447333687810">"Son predeterminado"</string>
<string name="sound_settings_summary" msgid="4100853606668287965">"Volume do ton ao <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
<string name="sound_dashboard_summary" msgid="3402435125958012986">"Volume, vibración, Non molestar"</string>
@@ -3890,7 +3887,6 @@
<string name="permit_draw_overlay" msgid="7456536798718633432">"Permitir mostrar sobre outras aplicacións"</string>
<string name="allow_overlay_description" msgid="8961670023925421358">"Permite que esta aplicación se mostre enriba doutras aplicacións que estás utilizando. Pode interferir no uso desas aplicacións ou cambiar a forma na que aparecen ou se comportan."</string>
<string name="keywords_vr_listener" msgid="7441221822576384680">"rv realidade virtual axente de escoita estéreo asistente servizo"</string>
- <string name="keywords_system_alert_window" msgid="5049498015597864850">"cadro de diálogo da ventá de alerta do sistema para mostrar sobre outras aplicacións"</string>
<string name="overlay_settings" msgid="6930854109449524280">"Superpoñer sobre aplicacións"</string>
<string name="system_alert_window_summary" msgid="602892301318324492">"Aplicacións con permiso para superpoñerse a outras: <xliff:g id="COUNT_0">%1$d</xliff:g> de <xliff:g id="COUNT_1">%2$d</xliff:g>"</string>
<string name="filter_overlay_apps" msgid="6965969283342557573">"Aplicacións con permiso"</string>
@@ -4126,7 +4122,6 @@
<string name="notification_log_details_none" msgid="184131801230614059">"ningún"</string>
<string name="notification_log_details_ranking_null" msgid="244660392058720919">"Falta o obxecto do ranking."</string>
<string name="notification_log_details_ranking_none" msgid="599607025882587844">"O obxecto do ranking non contén esta clave."</string>
- <string name="theme_customization_category" msgid="1049181544004163283">"Temas"</string>
<string name="theme_customization_device_default" msgid="5058147707906551368">"Configuración predeterminada do dispositivo"</string>
<string name="display_cutout_emulation" msgid="7466869822418376317">"Recorte de pantalla"</string>
<string name="display_cutout_emulation_keywords" msgid="4495418317471622562">"recorte de pantalla, marca"</string>
@@ -4552,6 +4547,8 @@
<string name="network_connection_errorstate_dialog_message" msgid="6953778550775646710">"Produciuse un erro. A aplicación cancelou a solicitude de escoller un dispositivo."</string>
<string name="network_connection_connect_successful" msgid="5935510954474494928">"Conexión correcta"</string>
<string name="network_connection_request_dialog_showall" msgid="6938922880244567521">"Mostrar todo"</string>
+ <string name="network_connection_searching_message" msgid="4638576789450817530">"Buscando dispositivo…"</string>
+ <string name="network_connection_connecting_message" msgid="3740982406609245654">"Conectando co dispositivo…"</string>
<plurals name="show_bluetooth_devices" formatted="false" msgid="1715020480026568408">
<item quantity="other"><xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> dispositivos conectados</item>
<item quantity="one"><xliff:g id="NUMBER_DEVICE_COUNT_0">%1$d</xliff:g> dispositivo conectado</item>
diff --git a/res/values-gu/strings.xml b/res/values-gu/strings.xml
index 780e5ce..f5f2f9c 100644
--- a/res/values-gu/strings.xml
+++ b/res/values-gu/strings.xml
@@ -360,8 +360,6 @@
<string name="security_enable_widgets_disabled_summary" msgid="6392489775303464905">"વ્યવસ્થાપકે અક્ષમ કરેલ"</string>
<string name="lockdown_settings_title" msgid="7393790212603280213">"લોકડાઉનનો વિકલ્પ બતાવો"</string>
<string name="lockdown_settings_summary" msgid="4359438673563318171">"ડિસ્પ્લે પાવર બટનનો વિકલ્પ જે Smart Lock, બાયોમેટ્રિક અનલૉક કરવાનું અને લૉક સ્ક્રીન પર નોટિફિકેશનને બંધ કરે છે"</string>
- <string name="trust_agents_extend_unlock_title" msgid="2796555263565097031">"માત્ર ટ્રસ્ટ એજન્ટ અનલૉક મોડ લંબાવી શકશે"</string>
- <string name="trust_agents_extend_unlock_summary" msgid="3976344969220255010">"જો ચાલુ કરવામાં આવે, તો ટ્રસ્ટ એજન્ટ વધુ લાંબા સમય માટે ડિવાઇસને અનલૉક રાખી શકશે, પરંતુ લૉક થયેલા ડિવાઇસને ફરી અનલૉક કરી શકશે નહીં."</string>
<string name="trust_lost_locks_screen_title" msgid="2992742466966021682">"વિશ્વાસ ગુમાવો, ત્યારે સ્ક્રીન લૉક કરો"</string>
<string name="trust_lost_locks_screen_summary" msgid="693784434582021206">"જો ચાલુ કરવામાં આવે તો જ્યારે છેલ્લો ટ્રસ્ટ એજન્ટ વિશ્વાસ ગુમાવશે, ત્યારે ડિવાઇસ લૉક થઈ જશે"</string>
<string name="owner_info_settings_summary" msgid="7472393443779227052">"કોઈ નહીં"</string>
@@ -937,6 +935,7 @@
<string name="wifi_eap_identity" msgid="4359453783379679103">"ઓળખાણ"</string>
<string name="wifi_eap_anonymous" msgid="2989469344116577955">"અનામ ઓળખાણ"</string>
<string name="wifi_password" msgid="5948219759936151048">"પાસવર્ડ"</string>
+ <string name="wifi_sae_password_id" msgid="1697832722221765763">"SAE પાસવર્ડ ઓળખકર્તા"</string>
<string name="wifi_show_password" msgid="6461249871236968884">"પાસવર્ડ બતાવો"</string>
<string name="wifi_ap_band_config" msgid="1611826705989117930">"AP બેન્ડ પસંદ કરો"</string>
<string name="wifi_ap_choose_auto" msgid="2677800651271769965">"આપમેળે"</string>
@@ -957,7 +956,6 @@
<string name="wifi_dpp_share_wifi" msgid="9065890131734833809">"વાઇ-ફાઇ શેર કરો"</string>
<string name="wifi_dpp_scan_qr_code_with_another_device" msgid="5854392840857123065">"“<xliff:g id="SSID">%1$s</xliff:g>” સાથે કનેક્ટ કરવા માટે આ QR કોડને સ્કૅન કરો અને પાસવર્ડ શેર કરો"</string>
<string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="4436318319178361543">"“<xliff:g id="SSID">%1$s</xliff:g>” સાથે કનેક્ટ કરવા માટે આ QR કોડને સ્કૅન કરો"</string>
- <string name="wifi_dpp_could_not_detect_valid_qr_code" msgid="641893675646330576">"QR કોડ વાંચી શકાયો નથી. કોડ ફરી દાખલ કરો અને ફરીથી પ્રયાસ કરો."</string>
<string name="wifi_dpp_failure_authentication_or_configuration" msgid="3372757783382381044">"ફરી પ્રયાસ કરો. જો સમસ્યા ચાલુ રહે છે, તો ડિવાઇસ નિર્માતાનો સંપર્ક કરો"</string>
<string name="wifi_dpp_failure_not_compatible" msgid="2829930473520603740">"કંઈક ખોટું થયું હતું"</string>
<string name="wifi_dpp_failure_timeout" msgid="5228320772245820458">"ડિવાઇસ બરાબર પ્લગ ઇન કરેલું, ચાર્જ થયેલું અને ચાલુ કરેલું હોવાની ખાતરી કરો"</string>
@@ -980,6 +978,7 @@
<string name="wifi_dpp_hotspot_password" msgid="4120419278831581613">"હૉટસ્પૉટનો પાસવર્ડ: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
<string name="wifi_dpp_add_device" msgid="4072206063308645677">"ડિવાઇસ ઉમેરો"</string>
<string name="wifi_dpp_connect_network_using_qr_code" msgid="3887335309163999665">"આ નેટવર્ક પર ડિવાઇસ ઉમેરવા માટે QR કોડનો ઉપયોગ કરો"</string>
+ <string name="wifi_dpp_qr_code_is_not_valid_format" msgid="3700087439867692944">"QR કોડનું માન્ય ફોર્મેટ નથી"</string>
<string name="retry" msgid="6472609612090877557">"ફરી પ્રયાસ કરો"</string>
<string name="wifi_shared" msgid="844142443226926070">"અન્ય ઉપકરણ વપરાશકર્તાઓ સાથે શેર કરો"</string>
<string name="wifi_unchanged" msgid="3410422020930397102">"(અપરિવર્તિત)"</string>
@@ -1129,6 +1128,7 @@
<string name="emergency_address_title" msgid="932729250447887545">"કટોકટીનું સરનામું"</string>
<string name="emergency_address_summary" msgid="7751971156196115129">"જ્યારે તમે વાઇ-ફાઇનો ઉપયોગ કરીને કોઈ કટોકટીનો કૉલ કરો તો તેનો તમારા સ્થાન તરીકે ઉપયોગ કરવામાં આવશે"</string>
<string name="private_dns_help_message" msgid="3299567069152568958">"ખાનગી DNS સુવિધા વિશે "<annotation id="url">"વધુ જાણો"</annotation></string>
+ <string name="private_dns_mode_on" msgid="5882613439541371003">"ચાલુ"</string>
<string name="wifi_calling_pref_managed_by_carrier" msgid="6845711858866828986">"કૅરિઅર દ્વારા મેનેજ કરવામાં આવતી સેટિંગ"</string>
<string name="wifi_calling_settings_activation_instructions" msgid="7492509632478260955">"વાઇ-ફાઇ કૉલિંગ સક્રિય કરો"</string>
<string name="wifi_calling_turn_on" msgid="1171403510313983983">"વાઇ-ફાઇ કૉલિંગ ચાલુ કરો"</string>
@@ -1872,7 +1872,7 @@
<string name="default_emergency_app" msgid="1951760659640369980">"ઇમર્જન્સી ઍપ્લિકેશન"</string>
<string name="reset_app_preferences" msgid="1321050641018356925">"ઍપ પસંદગીઓને રીસેટ કરો"</string>
<string name="reset_app_preferences_title" msgid="6093179367325336662">"ઍપ પસંદગીઓને રીસેટ કરીએ?"</string>
- <string name="reset_app_preferences_desc" msgid="4822447731869201512">"આ માટેની તમામ પસંદગીઓને ફરીથી સેટ કરશે:\n\n "<li>"બંધ કરેલી ઍપ્લિકેશનો"</li>\n" "<li>"બંધ કરેલ ઍપ્લિકેશનના નોટિફિકેશનો"</li>\n" "<li>"ક્રિયા માટેની ડિફૉલ્ટ ઍપ્લિકેશનો"</li>\n" "<li>"ઍપ્લિકેશનોનાં બૅકગ્રાઉન્ડ ડેટા પ્રતિબંધો"</li>\n" "<li>"કોઈપણ પરવાનગી પ્રતિબંધો"</li>\n\n"તમે કોઈપણ ઍપ્લિકેશન ડેટા ગુમાવશો નહીં."</string>
+ <string name="reset_app_preferences_desc" msgid="731757609326016760">"આમ કરવાથી આ બધી પસંદગીઓ રીસેટ થઈ જશે:\n\n"<li>"બંધ કરેલી ઍપ"</li>\n<li>"ઍપના બંધ કરેલાં નોટિફિકેશન"</li>\n<li>"ક્રિયાઓ માટેની ડિફૉલ્ટ ઍપ્લિકેશનો"</li>\n<li>"ઍપ માટે બૅકગ્રાઉન્ડ ડેટાના પ્રતિબંધો"</li>\n<li>"કોઈપણ પરવાનગીના પ્રતિબંધો"</li>\n\n"તમે કોઈપણ ઍપનો ડેટા ગુમાવશો નહીં."</string>
<string name="reset_app_preferences_button" msgid="2559089511841281242">"ઍપ્લિકેશનો ફરીથી સેટ કરો"</string>
<string name="manage_space_text" msgid="8852711522447794676">"સ્થાન સંચાલિત કરો"</string>
<string name="filter" msgid="2018011724373033887">"ફિલ્ટર"</string>
@@ -2087,7 +2087,7 @@
<string name="accessibility_screen_magnification_short_summary" msgid="3411979839172752057">"ઝૂમ કરવા માટે 3 વખત ટૅપ કરો"</string>
<string name="accessibility_screen_magnification_navbar_short_summary" msgid="3693116360267980492">"ઝૂમ કરવા માટે બટન ટૅપ કરો"</string>
<string name="accessibility_screen_magnification_summary" msgid="5258868553337478505"><b>"ઝૂમ કરવા માટે"</b>", સ્ક્રીનને ઝડપથી 3 વાર ટૅપ કરો.\n"<ul><li>"સ્ક્રોલ કરવા માટે 2 કે વધુ આંગળીઓને ખેંચો"</li>\n<li>"ઝૂમ ગોઠવવા માટે 2 કે વધુ આંગળીથી પિંચ કરો"</li></ul>\n\n<b>"અસ્થાયી રૂપે ઝૂમ કરવા માટે"</b>", સ્ક્રીનને ઝડપથી 3 વાર ટૅપ કરો અને ત્રીજા ટૅપ પર તમારી આંગળીને દબાવી રાખો.\n"<ul><li>"સ્ક્રીન પર આસપાસ ખસેડવા માટે ખેંચો"</li>\n<li>"ઝૂમ ઘટાડવા માટે આંગળી ઉઠાવી લો"</li></ul>\n\n"તમે કીબોર્ડ અને નેવિગેશન બાર પર ઝૂમ વધારી શકતાં નથી."</string>
- <string name="accessibility_screen_magnification_navbar_summary" msgid="2272878354599332009">"જ્યારે મેગ્નિફિકેશન ચાલુ હોય, ત્યારે તમે તમારી સ્ક્રીનને મોટી કરી શકો છો.\n\n"<b>"નાનું-મોટું કરવા માટે"</b>", મેગ્નિફિકેશન શરૂ કરો, પછી સ્ક્રીન પર ક્યાંય પણ ટૅપ કરો.\n"<ul><li>"• સ્ક્રોલ કરવા માટે 2 કે તેથી વધુ આંગળીઓને ખેંચો"</li>\n<li>"• નાના-મોટાની ગોઠવણી માટે 2 કે તેથી વધુ આંગળીઓને પિન્ચ કરો"</li></ul>\n\n<b>"અસ્થાયીરૂપે નાનું-મોટું કરવા માટે"</b>", મેગ્નિફિકેશન શરૂ કરો, પછી સ્ક્રીન પર ક્યાંય પણ ટચ કરીને થોડીવાર દબાવી રાખો.\n"<ul><li>"• સ્ક્રીન પર આજુબાજુ લઈ જવા માટે ખેંચો"</li>\n<li>"• નાનું કરવા માટે આંગળી ઉઠાવી લો"</li></ul>\n\n"તમે કીબોર્ડ અથવા નૅવિગેશન બાર પર મોટું કરી શકતા નથી."</string>
+ <string name="accessibility_screen_magnification_navbar_summary" msgid="6700716275347612310">"જ્યારે મેગ્નિફિકેશન ચાલુ હોય, ત્યારે તમે તમારી સ્ક્રીનને મોટી કરી શકો છો.\n\n"<b>"નાનું-મોટું કરવા માટે"</b>", મેગ્નિફિકેશન શરૂ કરો, પછી સ્ક્રીન પર ક્યાંય પણ ટૅપ કરો.\n"<ul><li>"સ્ક્રોલ કરવા માટે 2 કે તેથી વધુ આંગળી વડે ખેંચો"</li>\n<li>"નાનું-મોટું ગોઠવવા માટે 2 કે તેથી વધુ આંગળીથી પિન્ચ કરો"</li></ul>\n\n<b>"અસ્થાયી રૂપે નાનું-મોટું કરવા માટે"</b>", મેગ્નિફિકેશન શરૂ કરો, પછી સ્ક્રીન પર ગમે ત્યાં ટચ કરીને થોડીવાર દબાવી રાખો.\n"<ul><li>"સમગ્ર સ્ક્રીન પર આવવા-જવા માટે તમારી આંગળીને ખેંચો"</li>\n<li>"નાનું કરવા માટે તમારી આંગળીને ઉઠાવી લો"</li></ul>\n\n"તમે કીબોર્ડ અથવા નૅવિગેશન બાર પર મોટું કરી શકતાં નથી."</string>
<string name="accessibility_tutorial_dialog_title_button" msgid="3682222614034474845">"ખોલવા માટે ઍક્સેસિબિલિટી બટનનો ઉપયોગ કરો"</string>
<string name="accessibility_tutorial_dialog_title_gesture" msgid="1342726230497913398">"ખોલવા માટે સંકેતનો ઉપયોગ કરો"</string>
<string name="accessibility_tutorial_dialog_title_gesture_settings" msgid="8539392614235820285">"નવા ઍક્સેસિબિલિટી સંકેતનો ઉપયોગ કરો"</string>
@@ -2140,8 +2140,7 @@
<string name="accessibility_hearingaid_title" msgid="8312145423610648518">"શ્રવણ યંત્રો"</string>
<string name="accessibility_hearingaid_not_connected_summary" msgid="6240237523789614599">"કોઈ શ્રવણ યંત્ર કનેક્ટ કરેલ નથી"</string>
<string name="accessibility_hearingaid_adding_summary" msgid="2947474468412309778">"શ્રવણ યંત્રો ઉમેરો"</string>
- <string name="accessibility_hearingaid_pair_instructions_first_message" msgid="3912093691643131154">"શ્રવણ યંત્રને જોડવા માટે, તમારા ઉપકરણને આગળની સ્ક્રીન પર શોધો અને ટૅપ કરો."</string>
- <string name="accessibility_hearingaid_pair_instructions_second_message" msgid="5596683393607650243">"ખાતરી કરો કે શ્રવણ યંત્રો જોડી કરવાના મોડમાં છે."</string>
+ <string name="accessibility_hearingaid_pair_instructions_message" msgid="3094382949733435414">"સાંભળવામાં મદદ આપતા યંત્રનું જોડાણ કરવા માટે, આગળની સ્ક્રીન પર તમારા ડિવાઇસને શોધો અને તેના પર ટૅપ કરો. ખાતરી કરો કે સાંભળવામાં મદદ આપતા યંત્રો જોડાણ બનાવવાના મોડમાં છે."</string>
<string name="accessibility_hearingaid_active_device_summary" msgid="3924362383258688984">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> સક્રિય"</string>
<plurals name="show_number_hearingaid_count" formatted="false" msgid="3160782397139295486">
<item quantity="one"><xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> શ્રવણ યંત્રો સાચવ્યા</item>
@@ -2490,7 +2489,6 @@
<string name="menu_stats_last_unplugged" msgid="5922246077592434526">"જ્યારે છેલ્લે <xliff:g id="UNPLUGGED">%1$s</xliff:g> માટે અનપ્લગ કર્યું હતું"</string>
<string name="menu_stats_total" msgid="8973377864854807854">"કુલ વપરાશ"</string>
<string name="menu_stats_refresh" msgid="1676215433344981075">"તાજું કરો"</string>
- <string name="process_kernel_label" msgid="3916858646836739323">"Android OS"</string>
<string name="process_mediaserver_label" msgid="6500382062945689285">"Mediaserver"</string>
<string name="process_dex2oat_label" msgid="2592408651060518226">"ઍપ્લિકેશન ઓપ્ટિમાઇઝેશન"</string>
<string name="battery_saver" msgid="8172485772238572153">"બૅટરી સેવર"</string>
@@ -2621,8 +2619,6 @@
<string name="no_device_admins" msgid="4846602835339095768">"કોઈ ઉપકરણ વ્યવસ્થાપક ઍપ્લિકેશનો ઉપલબ્ધ નથી"</string>
<string name="personal_device_admin_title" msgid="2849617316347669861">"વ્યક્તિગત"</string>
<string name="managed_device_admin_title" msgid="7853955652864478435">"કાર્યાલય"</string>
- <string name="sms_access_restriction_enabled" msgid="7054488078710530278">"SMS અને કૉલ લૉગનો અૅક્સેસ પ્રતિબંધિત કરો"</string>
- <string name="sms_access_restriction_enabled_summary" msgid="6851339654677842328">"માત્ર ડિફૉલ્ટ ફોન અને સંદેશ માટેની અૅપ પાસે SMS અને કૉલ લૉગની પરવાનગીઓ હોય છે"</string>
<string name="no_trust_agents" msgid="7450273545568977523">"કોઈ ઉપલબ્ધ ટ્રસ્ટ એજન્ટ્સ નથી"</string>
<string name="add_device_admin_msg" msgid="1501847129819382149">"ઉપકરણ વ્યવસ્થાપક ઍપ્લિકેશન સક્રિય કરીએ?"</string>
<string name="add_device_admin" msgid="4192055385312215731">"આ ઉપકરણ વ્યવસ્થાપક ઍપ્લિકેશન સક્રિય કરો"</string>
@@ -3111,7 +3107,7 @@
<string name="keywords_app_default" msgid="5822717006354487071">"આના વડે ખોલો"</string>
<string name="keywords_applications_settings" msgid="1268353611121497450">"ઍપ્લિકેશનો"</string>
<string name="keywords_time_zone" msgid="998254736898753085">"સમયઝોન"</string>
- <string name="keywords_draw_overlay" msgid="4130899177619041842">"ચૅટ હેડ"</string>
+ <string name="keywords_draw_overlay" msgid="1001120206241401007">"ચૅટ હેડ, સિસ્ટમ, અલર્ટ, વિંડો, સંવાદ, ડિસ્પ્લે, બીજી ઍપની ઉપર, દોરો"</string>
<string name="keywords_flashlight" msgid="6161632177705233710">"ફ્લેશલાઇટ, લાઇટ, ટોર્ચ"</string>
<string name="keywords_change_wifi_state" msgid="627068244033681010">"વાઇફાઇ, વાઇ-ફાઇ, ટૉગલ કરો, નિયંત્રિત કરો"</string>
<string name="keywords_more_mobile_networks" msgid="8995946622054642367">"સેલ્યુલર, મોબાઇલ, સેલ કૅરિઅર, વાયરલેસ, ડેટા, 4g, 3g, 2g, lte"</string>
@@ -3135,7 +3131,7 @@
<string name="keywords_sounds_and_notifications_interruptions" msgid="5426093074031208917">"ખલેલ પાડવી નહીં ખલેલ પાડશો નહીં, વિક્ષેપ કરો, વિક્ષેપ, વિરામ"</string>
<string name="keywords_app" msgid="6334757056536837791">"RAM"</string>
<string name="keywords_location" msgid="4132655528196729043">"નજીકના, સ્થાન, ઇતિહાસ, જાણ કરવી, GPS"</string>
- <string name="keywords_accounts" msgid="1957925565953357627">"એકાઉન્ટ"</string>
+ <string name="keywords_accounts" msgid="4479029747403203867">"એકાઉન્ટ, એકાઉન્ટ ઉમેરો, કાર્યાલયની પ્રોફાઇલ"</string>
<string name="keywords_users" msgid="3434190133131387942">"પ્રતિબંધ, પ્રતિબંધિત કરો, પ્રતિબંધિત"</string>
<string name="keywords_keyboard_and_ime" msgid="9143339015329957107">"ટેક્સ્ટ સુધારણા, સુધારો, સાઉન્ડ, વાઇબ્રેટ, સ્વતઃ, ભાષા, હાવભાવ, સૂચવો, સૂચન, થીમ, અપમાનકારક, શબ્દ, પ્રકાર, ઇમોજી, આંતરરાષ્ટ્રીય"</string>
<string name="keywords_reset_apps" msgid="5293291209613191845">"ફરીથી સેટ કરો, પસંદગીઓ, ડિફોલ્ટ"</string>
@@ -3173,6 +3169,7 @@
<string name="keywords_storage_settings" msgid="297283751968446577">"મેમરી, કૅશ મેમરી ડેટા, ડિલીટ કરો, સાફ કરો, ફ્રી કરો, સ્પેસ બનાવો"</string>
<string name="keywords_bluetooth_settings" msgid="6804844062789439858">"કનેક્ટ કરેલ, ઉપકરણ, હેડફોન, હેડસેટ, સ્પીકર, વાયરલેસ, જોડી, ઇયરબડ, સંગીત, મીડિયા"</string>
<string name="keywords_wallpaper" msgid="5058364390917429896">"બૅકગ્રાઉન્ડ, સ્ક્રીન, લૉકસ્ક્રીન, થીમ"</string>
+ <string name="keywords_styles" msgid="5828725481814049422">"આઇકનનો આકાર, એક્સેંટનો રંગ, ફોન્ટ"</string>
<string name="keywords_assist_input" msgid="5017533309492679287">"ડિફૉલ્ટ, આસિસ્ટંટ"</string>
<string name="keywords_default_payment_app" msgid="3838565809518896799">"ચુકવણી, ડિફૉલ્ટ"</string>
<string name="keywords_ambient_display" msgid="3103487805748659132">"ઇનકમિંગ નોટિફિકેશન"</string>
@@ -3182,7 +3179,7 @@
<string name="keywords_notification_vibration" msgid="31924624421190547">"સંવેદક, વાઇબ્રેટ, સંવેદિતા"</string>
<string name="keywords_battery_saver_sticky" msgid="5586215686021650278">"બૅટરી સેવર, સ્ટિકી, ચાલુ રહેવું, પાવર સેવર, બૅટરી"</string>
<string name="keywords_battery_saver_schedule" msgid="7358789228486231944">"રૂટિન, શેડ્યૂલ, બૅટરી સેવર, પાવર સેવર, બૅટરી, ઑટોમૅટિક, ટકા"</string>
- <string name="keywords_add_an_account" msgid="6488139919428902434">"કાર્યાલયની પ્રોફાઇલ"</string>
+ <string name="keywords_enhance_4g_lte" msgid="2273810564244790859">"volte, વિગતવાર કૉલિંગ, 4g કૉલિંગ"</string>
<string name="default_sound" msgid="8821684447333687810">"ડિફોલ્ટ ધ્વનિ"</string>
<string name="sound_settings_summary" msgid="4100853606668287965">"રિંગ વૉલ્યુમ <xliff:g id="PERCENTAGE">%1$s</xliff:g> પર છે"</string>
<string name="sound_dashboard_summary" msgid="3402435125958012986">"વૉલ્યૂમ, વાઇબ્રેશન, ખલેલ પાડશો નહીં"</string>
@@ -3889,7 +3886,6 @@
<string name="permit_draw_overlay" msgid="7456536798718633432">"અન્ય ઍપ્સની ટોચે પ્રદર્શિત કરવાની મંજૂરી આપો"</string>
<string name="allow_overlay_description" msgid="8961670023925421358">"આ ઍપ્લિકેશનને તમે ઉપયોગ કરી રહ્યા હોય તેવી અન્ય ઍપ્લિકેશનોમાં સૌથી ઉપર પ્રદર્શિત કરવા માટેની મંજૂરી આપો. તે કદાચ તમારા તે ઍપ્લિકેશનોના ઉપયોગમાં દખલ કરી શકે છે અથવા તેઓ જે રીતે દેખાય અથવા કામ કરે છે તેમાં ફેરફાર કરી શકે છે."</string>
<string name="keywords_vr_listener" msgid="7441221822576384680">"vr વર્ચ્યુઅલ રિયાલિટી સાંભળનાર સ્ટીરિયો સહાયક સેવા"</string>
- <string name="keywords_system_alert_window" msgid="5049498015597864850">"સિસ્ટમ ચેતવણી વિંડો સંવાદનું પ્રદર્શન ટોચે અન્ય ઍપ્લિકેશનો"</string>
<string name="overlay_settings" msgid="6930854109449524280">"અન્ય ઍપથી ઉપર બતાવો"</string>
<string name="system_alert_window_summary" msgid="602892301318324492">"<xliff:g id="COUNT_1">%2$d</xliff:g>માંથી <xliff:g id="COUNT_0">%1$d</xliff:g> ઍપ્સને અન્ય ઍપ્સની ટોચે પ્રદર્શિત થવાની મંજૂરી છે"</string>
<string name="filter_overlay_apps" msgid="6965969283342557573">"પરવાનગી સાથેની ઍપ્લિકેશનો"</string>
@@ -4125,7 +4121,6 @@
<string name="notification_log_details_none" msgid="184131801230614059">"કોઈ નહીં"</string>
<string name="notification_log_details_ranking_null" msgid="244660392058720919">"રેંકિંગ ઑબ્જેક્ટ ખૂટે છે."</string>
<string name="notification_log_details_ranking_none" msgid="599607025882587844">"રેંકિંગ ઑબ્જેક્ટમાં આ કી શામેલ નથી."</string>
- <string name="theme_customization_category" msgid="1049181544004163283">"થીમિંગ"</string>
<string name="theme_customization_device_default" msgid="5058147707906551368">"ડિવાઇસ ડિફૉલ્ટ"</string>
<string name="display_cutout_emulation" msgid="7466869822418376317">"ડિસ્પ્લે કટઆઉટ"</string>
<string name="display_cutout_emulation_keywords" msgid="4495418317471622562">"નૉચ, કટઆઉટ બતાવો"</string>
@@ -4551,6 +4546,8 @@
<string name="network_connection_errorstate_dialog_message" msgid="6953778550775646710">"કંઈક નડ્યું. ઍપ્લિકેશને ડિવાઇસ પસંદ કરવાની વિનંતી રદ કરી છે."</string>
<string name="network_connection_connect_successful" msgid="5935510954474494928">"કનેક્શન સફળ થયું"</string>
<string name="network_connection_request_dialog_showall" msgid="6938922880244567521">"બધા બતાવો"</string>
+ <string name="network_connection_searching_message" msgid="4638576789450817530">"ડિવાઇસ માટે શોધી રહ્યાં છીએ…"</string>
+ <string name="network_connection_connecting_message" msgid="3740982406609245654">"ડિવાઇસ સાથે કનેક્ટ કરી રહ્યાં છીએ…"</string>
<plurals name="show_bluetooth_devices" formatted="false" msgid="1715020480026568408">
<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>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index 01d68ec..7563ff5 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -360,8 +360,6 @@
<string name="security_enable_widgets_disabled_summary" msgid="6392489775303464905">"व्यवस्थापक ने अक्षम किया है"</string>
<string name="lockdown_settings_title" msgid="7393790212603280213">"लॉक करने के विकल्प दिखाएं"</string>
<string name="lockdown_settings_summary" msgid="4359438673563318171">"पावर बटन का विकल्प दिखाएं जिससे Smart Lock, बायोमेट्रिक तरीके से अनलॉक करने, और लॉक स्क्रीन पर सूचनाएं दिखाने की सुविधा बंद की जाती है"</string>
- <string name="trust_agents_extend_unlock_title" msgid="2796555263565097031">"भरोसेमंद एजेंट बस अनलॉक अवधि बढ़ाते हैं"</string>
- <string name="trust_agents_extend_unlock_summary" msgid="3976344969220255010">"इस मोड के चालू होने पर, भरोसेमंद एजेंट आपके डिवाइस को लंबे समय तक अनलॉक रखेंगे. हालांकि, वे अब लॉक किए गए डिवाइस को अनलॉक नहीं कर सकेंगे."</string>
<string name="trust_lost_locks_screen_title" msgid="2992742466966021682">"भरोसा नहीं रह जाने पर स्क्रीन लॉक करें"</string>
<string name="trust_lost_locks_screen_summary" msgid="693784434582021206">"अगर लॉक चालू हो, तो आखिरी भरोसेमंद एजेंट का भरोसा नहीं रह जाने पर डिवाइस लॉक हो जाएगा"</string>
<string name="owner_info_settings_summary" msgid="7472393443779227052">"कोई नहीं"</string>
@@ -937,6 +935,7 @@
<string name="wifi_eap_identity" msgid="4359453783379679103">"पहचान"</string>
<string name="wifi_eap_anonymous" msgid="2989469344116577955">"अनाम पहचान"</string>
<string name="wifi_password" msgid="5948219759936151048">"पासवर्ड"</string>
+ <string name="wifi_sae_password_id" msgid="1697832722221765763">"SAE पासवर्ड पहचानकर्ता"</string>
<string name="wifi_show_password" msgid="6461249871236968884">"पासवर्ड दिखाएं"</string>
<string name="wifi_ap_band_config" msgid="1611826705989117930">"AP बैंड चुनें"</string>
<string name="wifi_ap_choose_auto" msgid="2677800651271769965">"अपने आप"</string>
@@ -957,7 +956,6 @@
<string name="wifi_dpp_share_wifi" msgid="9065890131734833809">"वाई-फ़ाई शेयर करें"</string>
<string name="wifi_dpp_scan_qr_code_with_another_device" msgid="5854392840857123065">"“<xliff:g id="SSID">%1$s</xliff:g>” से जुड़ने के लिए इस QR कोड को स्कैन करें और पासवर्ड शेयर करें"</string>
<string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="4436318319178361543">"“<xliff:g id="SSID">%1$s</xliff:g>” से जुड़ने के लिए इस QR कोड को स्कैन करें"</string>
- <string name="wifi_dpp_could_not_detect_valid_qr_code" msgid="641893675646330576">"QR कोड नहीं पहचाना जा सका. कोड को बीच में रखें और दोबारा कोशिश करें"</string>
<string name="wifi_dpp_failure_authentication_or_configuration" msgid="3372757783382381044">"फिर से कोशिश करें. अगर समस्या ठीक नहीं होती है, तो डिवाइस बनाने वाली कंपनी से संपर्क करें"</string>
<string name="wifi_dpp_failure_not_compatible" msgid="2829930473520603740">"काेई गड़बड़ी हुई"</string>
<string name="wifi_dpp_failure_timeout" msgid="5228320772245820458">"देख लें कि डिवाइस प्लग इन किया हुआ है, चार्ज हो चुका है, और चालू है"</string>
@@ -980,6 +978,7 @@
<string name="wifi_dpp_hotspot_password" msgid="4120419278831581613">"हॉटस्पॉट का पासवर्ड: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
<string name="wifi_dpp_add_device" msgid="4072206063308645677">"डिवाइस जोड़ें"</string>
<string name="wifi_dpp_connect_network_using_qr_code" msgid="3887335309163999665">"इस नेटवर्क से किसी डिवाइस को जोड़ने के लिए एक QR कोड का इस्तेमाल करें"</string>
+ <string name="wifi_dpp_qr_code_is_not_valid_format" msgid="3700087439867692944">"QR कोड का फ़ॉर्मैट गलत है"</string>
<string name="retry" msgid="6472609612090877557">"फिर से कोशिश करें"</string>
<string name="wifi_shared" msgid="844142443226926070">"अन्य डिवाइस उपयोगकर्ताओं से शेयर करें"</string>
<string name="wifi_unchanged" msgid="3410422020930397102">"(अपरिवर्तित)"</string>
@@ -1129,6 +1128,7 @@
<string name="emergency_address_title" msgid="932729250447887545">"आपातकालीन पता"</string>
<string name="emergency_address_summary" msgid="7751971156196115129">"जब आप वाई-फ़ाई पर आपातकालीन कॉल करते हैं, तब आपकी मौजूदा जगह को आपके पते के तौर पर इस्तेमाल किया जाता है"</string>
<string name="private_dns_help_message" msgid="3299567069152568958">"निजी डीएनएस की सुविधाओं के बारे में "<annotation id="url">"ज़्यादा जानें"</annotation></string>
+ <string name="private_dns_mode_on" msgid="5882613439541371003">"चालू है"</string>
<string name="wifi_calling_pref_managed_by_carrier" msgid="6845711858866828986">"यह सेटिंग मोबाइल और इंटरनेट सेवा देने वाली कंपनी प्रबंधित करती है"</string>
<string name="wifi_calling_settings_activation_instructions" msgid="7492509632478260955">"वाई-फ़ाई कॉलिंग की सुविधा शुरू करें"</string>
<string name="wifi_calling_turn_on" msgid="1171403510313983983">"वाई-फ़ाई कॉलिंग की सुविधा चालू करें"</string>
@@ -1872,7 +1872,7 @@
<string name="default_emergency_app" msgid="1951760659640369980">"आपातकालीन ऐप"</string>
<string name="reset_app_preferences" msgid="1321050641018356925">"ऐप्लिकेशन से जुड़ी पसंद रीसेट करें"</string>
<string name="reset_app_preferences_title" msgid="6093179367325336662">"ऐप प्राथमिकताएं रीसेट करें?"</string>
- <string name="reset_app_preferences_desc" msgid="4822447731869201512">"इससे इन सबके लिए पसंद रीसेट हो जाएंगी:\n\n"<li>"बंद किए गए ऐप्लिकेशन"</li>\n<li>"बंद की गई ऐप्लिकेशन सूचनाएं"</li>\n<li>"कार्रवाइयों के लिए डिफ़ॉल्ट ऐप्लिकेशन"</li>\n<li>"ऐप्लिकेशन के लिए बैकग्राउंड डेटा पर रोक"</li>\n<li>"किसी भी मंज़ूरी पर रोक"</li>\n\n"आपका सारा ऐप्लिकेशन डेटा बना रहेगा."</string>
+ <string name="reset_app_preferences_desc" msgid="731757609326016760">"इससे इन सबके लिए प्राथमिकताएं रीसेट हो जाएंगी:\n\n"<li>"बंद किए गए ऐप्लिकेशन"</li>\n<li>"बंद की गई ऐप्लिकेशन सूचनाएं"</li>\n<li>"कार्रवाइयों के लिए डिफ़ॉल्ट ऐप्लिकेशन"</li>\n<li>"ऐप्लिकेशन के लिए बैकग्राउंड डेटा पर रोक"</li>\n<li>"किसी भी मंज़ूरी पर रोक"</li>\n\n"आपका सारा ऐप्लिकेशन डेटा बना रहेगा."</string>
<string name="reset_app_preferences_button" msgid="2559089511841281242">"ऐप्लिकेशन रीसेट करें"</string>
<string name="manage_space_text" msgid="8852711522447794676">"जगह प्रबंधित करें"</string>
<string name="filter" msgid="2018011724373033887">"फ़िल्टर"</string>
@@ -2087,7 +2087,7 @@
<string name="accessibility_screen_magnification_short_summary" msgid="3411979839172752057">"ज़ूम करने के लिए तीन बार टैप करें"</string>
<string name="accessibility_screen_magnification_navbar_short_summary" msgid="3693116360267980492">"ज़ूम करने के लिए किसी बटन पर टैप करें"</string>
<string name="accessibility_screen_magnification_summary" msgid="5258868553337478505"><b>"ज़ूम करने के लिए"</b>", स्क्रीन पर तीन बार जल्दी-जल्दी टैप करें.\n"<ul><li>"स्क्रोल करने के लिए दो या उससे ज़्यादा उंगलियों से स्क्रीन ऊपर-नीचे करें"</li>\n<li>"ज़ूम एडजस्ट करने के लिए दो या उससे ज़्यादा उंगलियों से पिंच करें"</li></ul>\n\n<b>"थोड़ी देर तक ज़ूम करने के लिए"</b>", स्क्रीन पर तीन बार जल्दी-जल्दी टैप करें और तीसरे टैप पर अपनी उंगली दबाए रखें.\n"<ul><li>"स्क्रीन पर यहां-वहां ले जाने के लिए खींचें"</li>\n<li>"ज़ूम आउट करने के लिए अपनी उंगली उठा लें"</li></ul>\n\n"आप कीबोर्ड या नेविगेशन बार पर ज़ूम इन नहीं कर सकते हैं."</string>
- <string name="accessibility_screen_magnification_navbar_summary" msgid="2272878354599332009">"बड़ा करके देखने की सुविधा चालू होने पर, आप स्क्रीन को ज़ूम इन कर सकते हैं.\n\n"<b>"ज़ूम करने के लिए"</b>", बड़ा करके देखने की सुविधा चालू करें और फिर स्क्रीन पर कहीं भी टैप करें.\n"<ul><li>"• स्क्रोल करने के लिए दो या ज़्यादा उंगलियों से खींचें और छोड़ें"</li>\n<li>"• ज़ूम प्रबंधित करने के लिए दो या ज़्यादा उंगलियों से पिंच करें"</li></ul>\n\n<b>"थोड़ी देर तक ज़ूम करने के लिए"</b>", बड़ा करके देखने की सुविधा चालू करें फिर स्क्रीन पर कहीं भी दबाकर रखें.\n"<ul><li>"• स्क्रीन के दूसरे हिस्सों पर जाने के लिए उंगलियों से खींचें और छोड़ें"</li>\n<li>"• ज़ूम घटाने के लिए उंगलियों को स्क्रीन से हटाएं"</li></ul>\n\n"आप कीबोर्ड या नेविगेशन बार को ज़ूम इन नहीं कर सकते."</string>
+ <string name="accessibility_screen_magnification_navbar_summary" msgid="6700716275347612310">"बड़ा करके देखने की सुविधा चालू होने पर, आप स्क्रीन को ज़ूम इन कर सकते हैं.\n\n"<b>"ज़ूम करने के लिए"</b>", बड़ा करके देखने की सुविधा चालू करें और फिर स्क्रीन पर कहीं भी टैप करें.\n"<ul><li>"स्क्रोल करने के लिए दो या ज़्यादा उंगलियों से खींचें और छोड़ें"</li>\n<li>"ज़ूम नियंत्रित करने के लिए दो या ज़्यादा उंगलियों से पिंच करें"</li></ul>\n\n<b>"थोड़ी देर तक ज़ूम करने के लिए"</b>", बड़ा करके देखने की सुविधा चालू करें, फिर स्क्रीन पर कहीं भी दबाकर रखें.\n"<ul><li>"स्क्रीन के दूसरे हिस्सों पर जाने के लिए, उंगलियों से खींचें और छोड़ें"</li>\n<li>"ज़ूम घटाने के लिए उंगलियों को स्क्रीन से हटाएं"</li></ul>\n\n"आप कीबोर्ड या नेविगेशन बार को ज़ूम इन नहीं कर सकते."</string>
<string name="accessibility_tutorial_dialog_title_button" msgid="3682222614034474845">"इसे खोलने के लिए सुलभता बटन का इस्तेमाल करें"</string>
<string name="accessibility_tutorial_dialog_title_gesture" msgid="1342726230497913398">"इसे खोलने के लिए हाथ के जेस्चर का इस्तेमाल करें"</string>
<string name="accessibility_tutorial_dialog_title_gesture_settings" msgid="8539392614235820285">"सुलभता वाले नए जेस्चर इस्तेमाल करें"</string>
@@ -2140,8 +2140,7 @@
<string name="accessibility_hearingaid_title" msgid="8312145423610648518">"सुनने में मदद करने वाला डिवाइस"</string>
<string name="accessibility_hearingaid_not_connected_summary" msgid="6240237523789614599">"सुनने में मददगार कोई भी डिवाइस जुड़ा हुआ नहीं है"</string>
<string name="accessibility_hearingaid_adding_summary" msgid="2947474468412309778">"सुनने में मदद करने वाले डिवाइस जोड़ें"</string>
- <string name="accessibility_hearingaid_pair_instructions_first_message" msgid="3912093691643131154">"सुनने में मदद करने वाला डिवाइस जोड़ने के लिए, अगली स्क्रीन पर अपना डिवाइस ढूंढें और टैप करें."</string>
- <string name="accessibility_hearingaid_pair_instructions_second_message" msgid="5596683393607650243">"यह देख लें कि सुनने में आपकी मदद करने वाला डिवाइस दूसरे डिवाइस से जुड़ने वाले मोड में है."</string>
+ <string name="accessibility_hearingaid_pair_instructions_message" msgid="3094382949733435414">"सुनने में मदद करने वाला डिवाइस जोड़ने के लिए, अगली स्क्रीन पर अपना डिवाइस ढूंढें और उस पर टैप करें. यह देख लें कि सुनने में आपकी मदद करने वाला डिवाइस दूसरे डिवाइस से जुड़ने वाले मोड में है."</string>
<string name="accessibility_hearingaid_active_device_summary" msgid="3924362383258688984">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> चालू है"</string>
<plurals name="show_number_hearingaid_count" formatted="false" msgid="3160782397139295486">
<item quantity="one">सुनने में मददगार <xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> डिवाइस सेव किए गए</item>
@@ -2490,7 +2489,6 @@
<string name="menu_stats_last_unplugged" msgid="5922246077592434526">"जब अंतिम बार <xliff:g id="UNPLUGGED">%1$s</xliff:g> के लिए अनप्लग किया गया"</string>
<string name="menu_stats_total" msgid="8973377864854807854">"कुल उपयोग"</string>
<string name="menu_stats_refresh" msgid="1676215433344981075">"रीफ़्रेश करें"</string>
- <string name="process_kernel_label" msgid="3916858646836739323">"Android OS"</string>
<string name="process_mediaserver_label" msgid="6500382062945689285">"मीडिया सर्वर"</string>
<string name="process_dex2oat_label" msgid="2592408651060518226">"ऐप्स ऑप्टिमाइज़ेशन"</string>
<string name="battery_saver" msgid="8172485772238572153">"बैटरी सेवर"</string>
@@ -2621,8 +2619,6 @@
<string name="no_device_admins" msgid="4846602835339095768">"कोई भी डिवाइस व्यवस्थापक ऐप्लिकेशन उपलब्ध नहीं है"</string>
<string name="personal_device_admin_title" msgid="2849617316347669861">"व्यक्तिगत"</string>
<string name="managed_device_admin_title" msgid="7853955652864478435">"दफ़्तर"</string>
- <string name="sms_access_restriction_enabled" msgid="7054488078710530278">"मैसेज (एसएमएस) और कॉल लॉग ऐक्सेस प्रतिबंधित करें"</string>
- <string name="sms_access_restriction_enabled_summary" msgid="6851339654677842328">"सिर्फ़ डिफ़ॉल्ट फ़ोन और मैसेज-सेवा देने वाले ऐप्लिकेशन के पास मैसेज (एसएमएस) और कॉल लॉग की अनुमतियां होती हैं"</string>
<string name="no_trust_agents" msgid="7450273545568977523">"कोई ट्रस्ट एजेंट उपलब्ध नहीं"</string>
<string name="add_device_admin_msg" msgid="1501847129819382149">"इस डिवाइस एडमिन ऐप्लिकेशन को चालू करें?"</string>
<string name="add_device_admin" msgid="4192055385312215731">"इस डिवाइस एडमिन ऐप्लिकेशन को चालू करें"</string>
@@ -3111,7 +3107,7 @@
<string name="keywords_app_default" msgid="5822717006354487071">"इसके ज़रिए खोलें"</string>
<string name="keywords_applications_settings" msgid="1268353611121497450">"ऐप्लिकेशन"</string>
<string name="keywords_time_zone" msgid="998254736898753085">"समय क्षेत्र"</string>
- <string name="keywords_draw_overlay" msgid="4130899177619041842">"चैट हेड"</string>
+ <string name="keywords_draw_overlay" msgid="1001120206241401007">"चैट हेड, सिस्टम, अलर्ट, विंडो, संवाद, और डिसप्ले को दूसरे ऐप्लिकेशन के ऊपर दिखाएं"</string>
<string name="keywords_flashlight" msgid="6161632177705233710">"फ़्लैशलाइट, लाइट, टॉर्च"</string>
<string name="keywords_change_wifi_state" msgid="627068244033681010">"वाईफ़ाई, वाई-फ़ाई, टॉगल, नियंत्रण"</string>
<string name="keywords_more_mobile_networks" msgid="8995946622054642367">"सेल्युलर, मोबाइल, मोबाइल और इंटरनेट सेवा देने वाली कंपनी, वायरलेस, डेटा, 4g,3g, 2g, lte"</string>
@@ -3135,7 +3131,7 @@
<string name="keywords_sounds_and_notifications_interruptions" msgid="5426093074031208917">"न करें, परेशान न करें, बाधा डालें, बाधा, विराम"</string>
<string name="keywords_app" msgid="6334757056536837791">"RAM"</string>
<string name="keywords_location" msgid="4132655528196729043">"आस-पास, जगह की जानकारी, इतिहास, रिपोर्ट करना, जीपीएस"</string>
- <string name="keywords_accounts" msgid="1957925565953357627">"खाता"</string>
+ <string name="keywords_accounts" msgid="4479029747403203867">"खाता, खाता जोड़ें, वर्क प्रोफ़ाइल"</string>
<string name="keywords_users" msgid="3434190133131387942">"प्रतिबंध, प्रतिबंधित करें, प्रतिबंधित"</string>
<string name="keywords_keyboard_and_ime" msgid="9143339015329957107">"लिखी हुई सामग्री में सुधार, सही आवाज़, वाइब्रेशन (कंपन), अपने आप आने वाले भाषा के सुझाव, हाथ के जेस्चर(स्पर्श) के सुझाव, थीम, आपत्तिजनक शब्द, लिखना, इमोजी, अंतर्राष्ट्रीय"</string>
<string name="keywords_reset_apps" msgid="5293291209613191845">"रीसेट करें, प्राथमिकताएं, डिफ़ॉल्ट"</string>
@@ -3173,6 +3169,7 @@
<string name="keywords_storage_settings" msgid="297283751968446577">"मेमोरी, कैश, डेटा, मिटाएं, हटाएं, खाली करें, जगह"</string>
<string name="keywords_bluetooth_settings" msgid="6804844062789439858">"जुड़ा हुआ है, डिवाइस, हेडफ़ोन, हेडसेट, स्पीकर, वायरलेस, दूसरे डिवाइस से जोड़ें, ईयरबड, संगीत, मीडिया"</string>
<string name="keywords_wallpaper" msgid="5058364390917429896">"बैकग्राउंड, स्क्रीन, लॉकस्क्रीन, थीम"</string>
+ <string name="keywords_styles" msgid="5828725481814049422">"आइकॉन का आकार, एक्सेंट रंग, फ़ॉन्ट"</string>
<string name="keywords_assist_input" msgid="5017533309492679287">"डिफ़ॉल्ट, assistant"</string>
<string name="keywords_default_payment_app" msgid="3838565809518896799">"भुगतान, डिफ़ॉल्ट"</string>
<string name="keywords_ambient_display" msgid="3103487805748659132">"आने वाली सूचना"</string>
@@ -3182,7 +3179,7 @@
<string name="keywords_notification_vibration" msgid="31924624421190547">"हैप्टिक, वाइब्रेशन, संवेदनशीलता"</string>
<string name="keywords_battery_saver_sticky" msgid="5586215686021650278">"बैटरी सेव करने वाला, स्टिकी, लगातार, पावर सेवर, बैटरी"</string>
<string name="keywords_battery_saver_schedule" msgid="7358789228486231944">"रूटीन, शेड्यूल, बैटरी सेवर, पावर सेवर, बैटरी, ऑटोमैटिक, प्रतिशत"</string>
- <string name="keywords_add_an_account" msgid="6488139919428902434">"वर्क प्रोफ़ाइल"</string>
+ <string name="keywords_enhance_4g_lte" msgid="2273810564244790859">"volte, बेहतर कॉलिंग, 4g कॉलिंग"</string>
<string name="default_sound" msgid="8821684447333687810">"डिफ़ॉल्ट ध्वनि"</string>
<string name="sound_settings_summary" msgid="4100853606668287965">"रिंग की आवाज़ <xliff:g id="PERCENTAGE">%1$s</xliff:g> है"</string>
<string name="sound_dashboard_summary" msgid="3402435125958012986">"आवाज़, कंपन (वाइब्रेशन), परेशान न करें"</string>
@@ -3889,7 +3886,6 @@
<string name="permit_draw_overlay" msgid="7456536798718633432">"हमेशा दूसरे ऐप के ऊपर दिखाएं"</string>
<string name="allow_overlay_description" msgid="8961670023925421358">"इस ऐप्लिकेशन को अपने उपयोग किए जा रहे दूसरे सभी ऐप्लिकेशन के ऊपर दिखाई देने दें. यह उन ऐप्लिकेशन के आपके उपयोग में दखल दे सकता है या उनके दिखाई देने या व्यवहार करने के तरीके में बदलाव कर सकता है."</string>
<string name="keywords_vr_listener" msgid="7441221822576384680">"vr आभासी वास्तविकता श्रोता स्टीरियो सहायक सेवा"</string>
- <string name="keywords_system_alert_window" msgid="5049498015597864850">"सिस्टम अलर्ट विंडो संवाद को दूसरे ऐप के ऊपर दिखाएं"</string>
<string name="overlay_settings" msgid="6930854109449524280">"दूसरे ऐप के ऊपर दिखाएं"</string>
<string name="system_alert_window_summary" msgid="602892301318324492">"<xliff:g id="COUNT_1">%2$d</xliff:g> में से <xliff:g id="COUNT_0">%1$d</xliff:g> ऐप को दूसरे ऐप के ऊपर दिखाने की अनुमति है"</string>
<string name="filter_overlay_apps" msgid="6965969283342557573">"अनुमति वाले ऐप्स"</string>
@@ -4125,7 +4121,6 @@
<string name="notification_log_details_none" msgid="184131801230614059">"कोई नहीं"</string>
<string name="notification_log_details_ranking_null" msgid="244660392058720919">"रैंकिंग ऑब्जेक्ट अनुपलब्ध है."</string>
<string name="notification_log_details_ranking_none" msgid="599607025882587844">"रैंकिंग ऑब्जेक्ट में यह कुंजी शामिल नहीं है."</string>
- <string name="theme_customization_category" msgid="1049181544004163283">"थीम बनाई जा रही है"</string>
<string name="theme_customization_device_default" msgid="5058147707906551368">"डिवाइस की डिफ़ॉल्ट सेटिंग"</string>
<string name="display_cutout_emulation" msgid="7466869822418376317">"डिसप्ले कटआउट"</string>
<string name="display_cutout_emulation_keywords" msgid="4495418317471622562">"डिसप्ले कटआउट, नॉच"</string>
@@ -4551,6 +4546,8 @@
<string name="network_connection_errorstate_dialog_message" msgid="6953778550775646710">"कुछ गड़बड़ी हुई है ऐप्लिकेशन ने डिवाइस चुनने का अनुरोध रद्द कर दिया है."</string>
<string name="network_connection_connect_successful" msgid="5935510954474494928">"कनेक्शन कामयाब रहा"</string>
<string name="network_connection_request_dialog_showall" msgid="6938922880244567521">"सभी दिखाएं"</string>
+ <string name="network_connection_searching_message" msgid="4638576789450817530">"डिवाइस खोजा जा रहा है…"</string>
+ <string name="network_connection_connecting_message" msgid="3740982406609245654">"डिवाइस से कनेक्ट किया जा रहा है…"</string>
<plurals name="show_bluetooth_devices" formatted="false" msgid="1715020480026568408">
<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>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index dad5f74..e082427 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -362,8 +362,6 @@
<string name="security_enable_widgets_disabled_summary" msgid="6392489775303464905">"Onemogućio administrator"</string>
<string name="lockdown_settings_title" msgid="7393790212603280213">"Prikaži opciju zaključavanja"</string>
<string name="lockdown_settings_summary" msgid="4359438673563318171">"Prikazuje opciju tipke za uključivanje/isključivanje koja isključuje Smart Lock, biometrijsko otključavanje i obavijesti na zaključanom zaslonu"</string>
- <string name="trust_agents_extend_unlock_title" msgid="2796555263565097031">"Agenti za pouzdanost samo produljuju otključavanje"</string>
- <string name="trust_agents_extend_unlock_summary" msgid="3976344969220255010">"Ako je omogućeno, agenti za pouzdanost zadržat će uređaj otključanim dulje, no više ne mogu otključati zaključani uređaj"</string>
<string name="trust_lost_locks_screen_title" msgid="2992742466966021682">"Zaključan zaslon kad nema pouzdanosti"</string>
<string name="trust_lost_locks_screen_summary" msgid="693784434582021206">"Ako je omogućeno, uređaj će se zaključati kad zadnji agent za pouzdanost više ne bude pouzdan"</string>
<string name="owner_info_settings_summary" msgid="7472393443779227052">"Ništa"</string>
@@ -953,6 +951,7 @@
<string name="wifi_eap_identity" msgid="4359453783379679103">"Identitet"</string>
<string name="wifi_eap_anonymous" msgid="2989469344116577955">"Anoniman identitet"</string>
<string name="wifi_password" msgid="5948219759936151048">"Zaporka"</string>
+ <string name="wifi_sae_password_id" msgid="1697832722221765763">"Identifikator zaporke za SAE"</string>
<string name="wifi_show_password" msgid="6461249871236968884">"Pokaži zaporku"</string>
<string name="wifi_ap_band_config" msgid="1611826705989117930">"Odaberite frekvenciju pristupne točke"</string>
<string name="wifi_ap_choose_auto" msgid="2677800651271769965">"Automatski"</string>
@@ -973,7 +972,6 @@
<string name="wifi_dpp_share_wifi" msgid="9065890131734833809">"Dijeli Wi‑Fi"</string>
<string name="wifi_dpp_scan_qr_code_with_another_device" msgid="5854392840857123065">"Skenirajte ovaj QR kôd da biste se povezali s mrežom \"<xliff:g id="SSID">%1$s</xliff:g>\" i podijelili zaporku"</string>
<string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="4436318319178361543">"Skenirajte ovaj QR kôd da biste se povezali s mrežom \"<xliff:g id="SSID">%1$s</xliff:g>\""</string>
- <string name="wifi_dpp_could_not_detect_valid_qr_code" msgid="641893675646330576">"Čitanje QR koda nije uspjelo. Ponovo centrirajte kôd, a zatim pokušajte opet"</string>
<string name="wifi_dpp_failure_authentication_or_configuration" msgid="3372757783382381044">"Pokušajte ponovo. Ako i dalje imate problema, obratite se proizvođaču uređaja"</string>
<string name="wifi_dpp_failure_not_compatible" msgid="2829930473520603740">"Nešto nije u redu"</string>
<string name="wifi_dpp_failure_timeout" msgid="5228320772245820458">"Provjerite je li uređaj priključen, napunjen i uključen"</string>
@@ -996,6 +994,7 @@
<string name="wifi_dpp_hotspot_password" msgid="4120419278831581613">"Zaporka žarišne točke: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
<string name="wifi_dpp_add_device" msgid="4072206063308645677">"Dodajte uređaj"</string>
<string name="wifi_dpp_connect_network_using_qr_code" msgid="3887335309163999665">"Dodajte uređaj u mrežu pomoću QR koda"</string>
+ <string name="wifi_dpp_qr_code_is_not_valid_format" msgid="3700087439867692944">"QR kôd nije u važećem formatu"</string>
<string name="retry" msgid="6472609612090877557">"Ponovi"</string>
<string name="wifi_shared" msgid="844142443226926070">"Podijeli s drugim korisnicima uređaja"</string>
<string name="wifi_unchanged" msgid="3410422020930397102">"(nepromijenjeno)"</string>
@@ -1148,6 +1147,7 @@
<string name="emergency_address_title" msgid="932729250447887545">"Adresa za hitne pozive"</string>
<string name="emergency_address_summary" msgid="7751971156196115129">"Upotrebljava se kao vaša lokacija kada upućujete hitne pozive putem Wi‑Fi-ja"</string>
<string name="private_dns_help_message" msgid="3299567069152568958"><annotation id="url">"Saznajte više"</annotation>" o značajkama privatnog DNS-a"</string>
+ <string name="private_dns_mode_on" msgid="5882613439541371003">"Uključeno"</string>
<string name="wifi_calling_pref_managed_by_carrier" msgid="6845711858866828986">"Postavkom upravlja mobilni operater"</string>
<string name="wifi_calling_settings_activation_instructions" msgid="7492509632478260955">"Aktivirajte Wi-Fi pozive"</string>
<string name="wifi_calling_turn_on" msgid="1171403510313983983">"Uključite Wi-Fi pozive"</string>
@@ -1894,7 +1894,7 @@
<string name="default_emergency_app" msgid="1951760659640369980">"Aplikacija za hitne slučajeve"</string>
<string name="reset_app_preferences" msgid="1321050641018356925">"Poništi postavke aplikacija"</string>
<string name="reset_app_preferences_title" msgid="6093179367325336662">"Poništiti postavke?"</string>
- <string name="reset_app_preferences_desc" msgid="4822447731869201512">"Sve sljedeće preferencije vratit će se na zadane postavke:\n\n "<li>"onemogućene aplikacije"</li>\n" "<li>"onemogućene obavijesti aplikacija"</li>\n" "<li>"zadane aplikacije za radnje"</li>\n" "<li>"ograničenja pozadinskih podataka za aplikacije"</li>\n" "<li>"sva ograničenja dopuštenja"</li>\n\n"Podatke aplikacija nećete izgubiti."</string>
+ <string name="reset_app_preferences_desc" msgid="731757609326016760">"Sve sljedeće preferencije vratit će se na zadano:\n\n"<li>"onemogućene aplikacije"</li>\n<li>"onemogućene obavijesti aplikacija"</li>\n<li>"zadane aplikacije za radnje"</li>\n<li>"ograničenja pozadinskih podataka za aplikacije"</li>\n<li>"sva ograničenja dopuštenja."</li>\n\n"Nećete izgubiti podatke nijedne aplikacije."</string>
<string name="reset_app_preferences_button" msgid="2559089511841281242">"Poništi aplikacije"</string>
<string name="manage_space_text" msgid="8852711522447794676">"Upravljaj prostorom"</string>
<string name="filter" msgid="2018011724373033887">"Filtar"</string>
@@ -2109,7 +2109,7 @@
<string name="accessibility_screen_magnification_short_summary" msgid="3411979839172752057">"Dodirnite triput za zumiranje"</string>
<string name="accessibility_screen_magnification_navbar_short_summary" msgid="3693116360267980492">"Dodirnite gumb za zumiranje"</string>
<string name="accessibility_screen_magnification_summary" msgid="5258868553337478505"><b>"Da biste zumirali"</b>", brzo dodirnite zaslon tri puta.\n"<ul><li>"Povlačite s dva prsta ili više njih da biste se pomicali"</li>\n<li>"Spojite dva prsta ili više njih da biste prilagodili zumiranje"</li></ul>\n\n<b>"Da biste privremeno zumirali"</b>", brzo dodirnite zaslon tri puta i zadržite prst dolje nakon trećeg dodira.\n"<ul><li>"Povlačite prstom da biste se kretali zaslonom"</li>\n<li>"Podignite prst da biste smanjili prikaz"</li></ul>\n\n"Tipkovnica i navigacijska traka ne mogu se povećati."</string>
- <string name="accessibility_screen_magnification_navbar_summary" msgid="2272878354599332009">"Kad je povećanje uključeno, možete povećati prikaz na zaslonu.\n\n"<b>"Da biste zumirali"</b>", pokrenite povećanje, a zatim dodirnite bilo gdje na zaslonu.\n"<ul><li>"• Povucite s dva ili više prstiju da biste se pomicali."</li>\n<li>"• Spojite dva ili više prstiju da biste prilagodili zumiranje."</li></ul>\n\n<b>"Da biste zumirali samo nekoliko trenutaka"</b>", pokrenite povećanje, a zatim dodirnite i zadržite bilo gdje na zaslonu.\n"<ul><li>"• Povlačite prstom da biste se kretali zaslonom."</li>\n<li>"• Podignite prst da biste smanjili prikaz."</li></ul>\n\n"Prikaz tipkovnice ili navigacijske trake ne može se povećati."</string>
+ <string name="accessibility_screen_magnification_navbar_summary" msgid="6700716275347612310">"Kad je povećanje uključeno, možete povećati prikaz na zaslonu.\n\n"<b>"Da biste zumirali"</b>", pokrenite povećanje, a zatim dodirnite bilo gdje na zaslonu.\n"<ul><li>"Povlačite s dva prsta ili više njih da biste se pomicali."</li>\n<li>"Spojite dva prsta ili više njih da biste prilagodili zumiranje."</li></ul>\n\n<b>"Da biste nešto privremeno zumirali"</b>", pokrenite povećanje, a zatim dodirnite bilo gdje na zaslonu i zadržite pritisak.\n"<ul><li>"Povlačite prstom da biste se kretali zaslonom."</li>\n<li>"Podignite prst da biste smanjili prikaz."</li></ul>\n\n"Tipkovnica i navigacijska traka ne mogu se povećati."</string>
<string name="accessibility_tutorial_dialog_title_button" msgid="3682222614034474845">"Otvaranje pomoću gumba pristupačnosti"</string>
<string name="accessibility_tutorial_dialog_title_gesture" msgid="1342726230497913398">"Otvaranje pokretom"</string>
<string name="accessibility_tutorial_dialog_title_gesture_settings" msgid="8539392614235820285">"Upotreba novog pokreta pristupačnosti"</string>
@@ -2162,8 +2162,7 @@
<string name="accessibility_hearingaid_title" msgid="8312145423610648518">"Slušni aparati"</string>
<string name="accessibility_hearingaid_not_connected_summary" msgid="6240237523789614599">"Nije povezan nijedan slušni aparat"</string>
<string name="accessibility_hearingaid_adding_summary" msgid="2947474468412309778">"Dodaj slušne aparate"</string>
- <string name="accessibility_hearingaid_pair_instructions_first_message" msgid="3912093691643131154">"Da uparite slušni aparat, dodirnite ga na sljedećem zaslonu."</string>
- <string name="accessibility_hearingaid_pair_instructions_second_message" msgid="5596683393607650243">"Provjerite je li slušni aparat u načinu uparivanja."</string>
+ <string name="accessibility_hearingaid_pair_instructions_message" msgid="3094382949733435414">"Da uparite slušni aparat, dodirnite ga na sljedećem zaslonu. Provjerite je li slušni aparat u načinu uparivanja."</string>
<string name="accessibility_hearingaid_active_device_summary" msgid="3924362383258688984">"Aktivno: <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
<plurals name="show_number_hearingaid_count" formatted="false" msgid="3160782397139295486">
<item quantity="one">Spremljen je <xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> slušni aparat</item>
@@ -2527,7 +2526,6 @@
<string name="menu_stats_last_unplugged" msgid="5922246077592434526">"Kod posljednjeg isključivanja za <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
<string name="menu_stats_total" msgid="8973377864854807854">"Ukupno iskorištenje"</string>
<string name="menu_stats_refresh" msgid="1676215433344981075">"Osvježi"</string>
- <string name="process_kernel_label" msgid="3916858646836739323">"Android OS"</string>
<string name="process_mediaserver_label" msgid="6500382062945689285">"Medijski poslužitelj"</string>
<string name="process_dex2oat_label" msgid="2592408651060518226">"Optimizacija aplikacija"</string>
<string name="battery_saver" msgid="8172485772238572153">"Štednja baterije"</string>
@@ -2658,8 +2656,6 @@
<string name="no_device_admins" msgid="4846602835339095768">"Nema dostupnih aplikacija administratora uređaja"</string>
<string name="personal_device_admin_title" msgid="2849617316347669861">"Osobno"</string>
<string name="managed_device_admin_title" msgid="7853955652864478435">"Posao"</string>
- <string name="sms_access_restriction_enabled" msgid="7054488078710530278">"Ograniči pristup SMS-ovima i zapisniku poziva"</string>
- <string name="sms_access_restriction_enabled_summary" msgid="6851339654677842328">"Samo zadane aplikacije za telefon i poruke imaju dopuštenja za SMS i zapisnik poziva"</string>
<string name="no_trust_agents" msgid="7450273545568977523">"Pouzdani predstavnici nisu dostupni"</string>
<string name="add_device_admin_msg" msgid="1501847129819382149">"Aktivirati apl. administratora uređaja?"</string>
<string name="add_device_admin" msgid="4192055385312215731">"Aktiviraj aplikaciju administratora ovog uređaja"</string>
@@ -3153,7 +3149,7 @@
<string name="keywords_app_default" msgid="5822717006354487071">"Otvori u aplikaciji"</string>
<string name="keywords_applications_settings" msgid="1268353611121497450">"Aplikacije"</string>
<string name="keywords_time_zone" msgid="998254736898753085">"vremenska zona"</string>
- <string name="keywords_draw_overlay" msgid="4130899177619041842">"Oblačić za chat"</string>
+ <string name="keywords_draw_overlay" msgid="1001120206241401007">"Oblačić za chat, sustav, upozorenje, prozor, dijalog, zaslon, iznad drugih aplikacija, povući"</string>
<string name="keywords_flashlight" msgid="6161632177705233710">"Svjetiljka, svjetlo, bljeskalica"</string>
<string name="keywords_change_wifi_state" msgid="627068244033681010">"wifi, wi-fi, promjena, upravljanje"</string>
<string name="keywords_more_mobile_networks" msgid="8995946622054642367">"mobilno, mobilna mreža, mobilni operater, bežično, podaci, 4g, 3g, 2g, lte"</string>
@@ -3177,7 +3173,7 @@
<string name="keywords_sounds_and_notifications_interruptions" msgid="5426093074031208917">"ne ometaj, prekinuti, prekid, zaustaviti"</string>
<string name="keywords_app" msgid="6334757056536837791">"RAM"</string>
<string name="keywords_location" msgid="4132655528196729043">"u blizini, lokacija, povijest, izvješćivanje, GPS"</string>
- <string name="keywords_accounts" msgid="1957925565953357627">"račun"</string>
+ <string name="keywords_accounts" msgid="4479029747403203867">"račun, dodavanje računa, radni profil"</string>
<string name="keywords_users" msgid="3434190133131387942">"ograničenje, ograničiti, ograničeno"</string>
<string name="keywords_keyboard_and_ime" msgid="9143339015329957107">"ispravak teksta, ispraviti, zvuk, vibracija, automatski, jezik, pokret, predložiti, prijedlog, tema, uvredljivo, riječ, upisivati, emoji, međunarodno"</string>
<string name="keywords_reset_apps" msgid="5293291209613191845">"poništavanje, vraćanje na zadano, postavke, zadano"</string>
@@ -3215,6 +3211,7 @@
<string name="keywords_storage_settings" msgid="297283751968446577">"memorija, predmemorija, podaci, brisati, čistiti, slobodno, prostor"</string>
<string name="keywords_bluetooth_settings" msgid="6804844062789439858">"povezano, uređaj, slušalice, slušalice s mikrofonom, zvučnik, bežično, uparivanje, slušalice za umetanje u uho, glazba, medij"</string>
<string name="keywords_wallpaper" msgid="5058364390917429896">"pozadina, zaslon, zaključan zaslon, tema"</string>
+ <string name="keywords_styles" msgid="5828725481814049422">"oblik ikone, boja isticanja, font"</string>
<string name="keywords_assist_input" msgid="5017533309492679287">"zadano, pomoćno"</string>
<string name="keywords_default_payment_app" msgid="3838565809518896799">"plaćanje, zadano"</string>
<string name="keywords_ambient_display" msgid="3103487805748659132">"dolazna obavijest"</string>
@@ -3224,7 +3221,7 @@
<string name="keywords_notification_vibration" msgid="31924624421190547">"taktilnost, vibracija, osjetljivost"</string>
<string name="keywords_battery_saver_sticky" msgid="5586215686021650278">"štednja baterije, ljepljiv, zadržati, štednja energije, baterija"</string>
<string name="keywords_battery_saver_schedule" msgid="7358789228486231944">"rutina, raspored, štednja baterije, štednja energije, baterija, automatski, postotak"</string>
- <string name="keywords_add_an_account" msgid="6488139919428902434">"radni profil"</string>
+ <string name="keywords_enhance_4g_lte" msgid="2273810564244790859">"volte, napredno pozivanje, 4g pozivanje"</string>
<string name="default_sound" msgid="8821684447333687810">"Zadani zvuk"</string>
<string name="sound_settings_summary" msgid="4100853606668287965">"Glasnoća zvona na <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
<string name="sound_dashboard_summary" msgid="3402435125958012986">"Glasnoća, vibracija, Ne ometaj"</string>
@@ -3952,7 +3949,6 @@
<string name="permit_draw_overlay" msgid="7456536798718633432">"Dopusti prikaz iznad drugih aplikacija"</string>
<string name="allow_overlay_description" msgid="8961670023925421358">"Aplikaciji omogućuje da se prikazuje iznad drugih aplikacija koje upotrebljavate. To može ometati upotrebu tih aplikacija ili promijeniti njihov izgled ili ponašanje."</string>
<string name="keywords_vr_listener" msgid="7441221822576384680">"vr slušatelj virtualne stvarnosti stereo pomoćna usluga"</string>
- <string name="keywords_system_alert_window" msgid="5049498015597864850">"prikaz prozora upozorenja sustava iznad drugih aplikacija"</string>
<string name="overlay_settings" msgid="6930854109449524280">"Prikaz iznad drugih aplikacija"</string>
<string name="system_alert_window_summary" msgid="602892301318324492">"Broj aplikacija koje se mogu prikazivati iznad drugih: <xliff:g id="COUNT_0">%1$d</xliff:g> od <xliff:g id="COUNT_1">%2$d</xliff:g>"</string>
<string name="filter_overlay_apps" msgid="6965969283342557573">"Aplikacije s dopuštenjem"</string>
@@ -4194,7 +4190,6 @@
<string name="notification_log_details_none" msgid="184131801230614059">"ništa"</string>
<string name="notification_log_details_ranking_null" msgid="244660392058720919">"Objekt rangiranja nedostaje."</string>
<string name="notification_log_details_ranking_none" msgid="599607025882587844">"Objekt rangiranja ne sadrži tu tipku."</string>
- <string name="theme_customization_category" msgid="1049181544004163283">"Teme"</string>
<string name="theme_customization_device_default" msgid="5058147707906551368">"Zadana postavka uređaja"</string>
<string name="display_cutout_emulation" msgid="7466869822418376317">"Urez na zaslonu"</string>
<string name="display_cutout_emulation_keywords" msgid="4495418317471622562">"obrezana slika za zaslon, urez"</string>
@@ -4632,6 +4627,8 @@
<string name="network_connection_errorstate_dialog_message" msgid="6953778550775646710">"Došlo je do pogreške. Aplikacija je otkazala zahtjev za odabir uređaja."</string>
<string name="network_connection_connect_successful" msgid="5935510954474494928">"Povezivanje je uspjelo"</string>
<string name="network_connection_request_dialog_showall" msgid="6938922880244567521">"Pokaži sve"</string>
+ <string name="network_connection_searching_message" msgid="4638576789450817530">"Traženje uređaja…"</string>
+ <string name="network_connection_connecting_message" msgid="3740982406609245654">"Povezivanje s uređajem…"</string>
<plurals name="show_bluetooth_devices" formatted="false" msgid="1715020480026568408">
<item quantity="one"><xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> uređaj povezan</item>
<item quantity="few"><xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> uređaja povezana</item>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index ca5e301..f6e0b2a 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -360,8 +360,6 @@
<string name="security_enable_widgets_disabled_summary" msgid="6392489775303464905">"A rendszergazda kikapcsolta"</string>
<string name="lockdown_settings_title" msgid="7393790212603280213">"A zárolás lehetőség megjelenítése"</string>
<string name="lockdown_settings_summary" msgid="4359438673563318171">"A Smart Lock szolgáltatást, a biometrikus feloldást és a zárolási képernyő értesítéseit kikapcsoló gomb megjelenítése"</string>
- <string name="trust_agents_extend_unlock_title" msgid="2796555263565097031">"A trust agentek kibővítik a feloldást"</string>
- <string name="trust_agents_extend_unlock_summary" msgid="3976344969220255010">"Ha engedélyezve van, a trust agent komponensek tovább tartják feloldva az eszközt, de a zárolt eszközt többé nem tudják feloldani."</string>
<string name="trust_lost_locks_screen_title" msgid="2992742466966021682">"Képernyő zárolása megbízhatóság nélkül"</string>
<string name="trust_lost_locks_screen_summary" msgid="693784434582021206">"Ha engedélyezve van, az eszköz zárolva lesz, ha az utolsó trust agent komponensnél megszűnik a megbízható környezet"</string>
<string name="owner_info_settings_summary" msgid="7472393443779227052">"Nincs"</string>
@@ -937,6 +935,7 @@
<string name="wifi_eap_identity" msgid="4359453783379679103">"Azonosság"</string>
<string name="wifi_eap_anonymous" msgid="2989469344116577955">"Név nélküli identitás"</string>
<string name="wifi_password" msgid="5948219759936151048">"Jelszó"</string>
+ <string name="wifi_sae_password_id" msgid="1697832722221765763">"SAE jelszóazonosító"</string>
<string name="wifi_show_password" msgid="6461249871236968884">"Jelszó megjelenítése"</string>
<string name="wifi_ap_band_config" msgid="1611826705989117930">"AP sáv kiválasztása"</string>
<string name="wifi_ap_choose_auto" msgid="2677800651271769965">"Automatikus"</string>
@@ -957,7 +956,6 @@
<string name="wifi_dpp_share_wifi" msgid="9065890131734833809">"Wi‑Fi megosztása"</string>
<string name="wifi_dpp_scan_qr_code_with_another_device" msgid="5854392840857123065">"A(z) „<xliff:g id="SSID">%1$s</xliff:g>” hálózathoz való csatlakozás érdekében olvassa be ezt a QR-kódot, és ossza meg a jelszót"</string>
<string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="4436318319178361543">"A(z) „<xliff:g id="SSID">%1$s</xliff:g>” hálózathoz való csatlakozás érdekében olvassa be ezt a QR-kódot"</string>
- <string name="wifi_dpp_could_not_detect_valid_qr_code" msgid="641893675646330576">"Nem sikerült beolvasni a QR-kódot. Igazítsa a kódot újra a mező közepére, és próbálja újra."</string>
<string name="wifi_dpp_failure_authentication_or_configuration" msgid="3372757783382381044">"Próbálja újra. Ha a probléma továbbra is fennáll, vegye fel a kapcsolatot az eszköz gyártójával."</string>
<string name="wifi_dpp_failure_not_compatible" msgid="2829930473520603740">"Hiba történt"</string>
<string name="wifi_dpp_failure_timeout" msgid="5228320772245820458">"Gondoskodjon a következőkről: az eszköz legyen áramforráshoz csatlakoztatva, feltöltve és bekapcsolva."</string>
@@ -980,6 +978,7 @@
<string name="wifi_dpp_hotspot_password" msgid="4120419278831581613">"Hotspot jelszava: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
<string name="wifi_dpp_add_device" msgid="4072206063308645677">"Eszköz hozzáadása"</string>
<string name="wifi_dpp_connect_network_using_qr_code" msgid="3887335309163999665">"Használjon QR-kódot, ha új eszközt szeretne hozzáadni a hálózathoz"</string>
+ <string name="wifi_dpp_qr_code_is_not_valid_format" msgid="3700087439867692944">"A QR-kód nem érvényes formátum"</string>
<string name="retry" msgid="6472609612090877557">"Újra"</string>
<string name="wifi_shared" msgid="844142443226926070">"Megosztás az eszköz más felhasználóival"</string>
<string name="wifi_unchanged" msgid="3410422020930397102">"(nem változott)"</string>
@@ -1129,6 +1128,7 @@
<string name="emergency_address_title" msgid="932729250447887545">"Vészhelyzeti cím"</string>
<string name="emergency_address_summary" msgid="7751971156196115129">"A Wi-Fi-n keresztül indított segélyhívások esetében megjelenő tartózkodási hely"</string>
<string name="private_dns_help_message" msgid="3299567069152568958"><annotation id="url">"További információ"</annotation>" a Privát DNS-funkciókról"</string>
+ <string name="private_dns_mode_on" msgid="5882613439541371003">"Be"</string>
<string name="wifi_calling_pref_managed_by_carrier" msgid="6845711858866828986">"A beállítást a szolgáltató kezeli"</string>
<string name="wifi_calling_settings_activation_instructions" msgid="7492509632478260955">"Aktiválja a Wi-Fi-hívást"</string>
<string name="wifi_calling_turn_on" msgid="1171403510313983983">"Kapcsolja be a Wi-Fi-hívásokat"</string>
@@ -1872,7 +1872,7 @@
<string name="default_emergency_app" msgid="1951760659640369980">"Segélyhívó"</string>
<string name="reset_app_preferences" msgid="1321050641018356925">"Alapbeállítások"</string>
<string name="reset_app_preferences_title" msgid="6093179367325336662">"Visszaállítja a beállításokat?"</string>
- <string name="reset_app_preferences_desc" msgid="4822447731869201512">"Ez visszaállítja a következőkre vonatkozó összes beállítást:\n\n"<li>"Letiltott alkalmazások"</li>\n<li>"Letiltott alkalmazásértesítések"</li>\n<li>"Alapértelmezett alkalmazások adott műveletekhez"</li>\n<li>"Alkalmazások háttéradat-korlátozása"</li>\n<li>"Minden engedélykorlátozás"</li>\n\n" Az alkalmazásadatok nem vesznek el."</string>
+ <string name="reset_app_preferences_desc" msgid="731757609326016760">"Ez visszaállítja a következőkre vonatkozó összes beállítást:\n\n"<li>"letiltott alkalmazások;"</li>\n<li>"letiltott alkalmazásértesítések;"</li>\n<li>"alapértelmezett alkalmazások adott műveletekhez;"</li>\n<li>"az alkalmazások háttéradataira vonatkozó korlátozások;"</li>\n<li>"minden engedélykorlátozás."</li>\n\n"Az alkalmazásadatok nem vesznek el."</string>
<string name="reset_app_preferences_button" msgid="2559089511841281242">"Visszaállítás"</string>
<string name="manage_space_text" msgid="8852711522447794676">"Tárhely kezelése"</string>
<string name="filter" msgid="2018011724373033887">"Szűrő"</string>
@@ -2087,7 +2087,7 @@
<string name="accessibility_screen_magnification_short_summary" msgid="3411979839172752057">"A nagyításhoz koppintson háromszor"</string>
<string name="accessibility_screen_magnification_navbar_short_summary" msgid="3693116360267980492">"Nagyításhoz koppintson a gombra"</string>
<string name="accessibility_screen_magnification_summary" msgid="5258868553337478505"><b>"Nagyításhoz"</b>" gyorsan koppintson háromszor a képernyőre.\n"<ul><li>"Görgetéshez húzza legalább két ujját a képernyőn."</li>\n<li>"A nagyítás mértékét két vagy több ujjának össze- vagy széthúzásával módosíthatja."</li></ul>\n\n<b>"Ideiglenes nagyításhoz"</b>" gyorsan koppintson háromszor a képernyőre, és az utolsó koppintást követően ne emelje fel az ujját.\n"<ul><li>"A képernyőn húzással mozoghat"</li>\n<li>"Kicsinyítéshez emelje fel az ujját."</li></ul>\n\n"A billentyűzetre és a navigációs sávra nem lehet ránagyítani."</string>
- <string name="accessibility_screen_magnification_navbar_summary" msgid="2272878354599332009">"Ha be van kapcsolva a nagyítás funkció, ránagyíthat a képernyő tartalmára.\n\nA "<b>"nagyításhoz"</b>" indítsa el a funkciót, majd koppintson a kívánt területre a képernyőn.\n"<ul><li>"• Görgetéshez húzza legalább két ujját a képernyőn."</li>\n<li>"• A nagyítás mértékét két vagy több ujjának össze- vagy széthúzásával módosíthatja."</li></ul>\n\n<b>"Ideiglenes nagyításhoz"</b>" indítsa el a funkciót, majd tartsa lenyomva a kívánt területet a képernyőn.\n"<ul><li>"• Ujját lenyomva tartva mozoghat a képernyőn."</li>\n<li>"• A méret visszaállításához emelje fel ujját a képernyőről."</li></ul>\n\n"A billentyűzeten és a navigációs sávon nem lehetséges a nagyítás."</string>
+ <string name="accessibility_screen_magnification_navbar_summary" msgid="6700716275347612310">"Ha be van kapcsolva a nagyítás funkció, ránagyíthat a képernyő tartalmára.\n\nA "<b>"nagyításhoz"</b>", indítsa el a funkciót, majd koppintson a kívánt területre a képernyőn.\n"<ul><li>"Görgetéshez húzza legalább két ujját a képernyőn."</li>\n<li>"A nagyítás mértékét két vagy több ujjának össze- vagy széthúzásával módosíthatja."</li></ul>\n\n<b>"Ideiglenes nagyításhoz"</b>" indítsa el a funkciót, majd tartsa lenyomva a kívánt területet a képernyőn.\n"<ul><li>"Ujját lenyomva tartva mozoghat a képernyőn."</li>\n<li>"A méret visszaállításához emelje fel ujját a képernyőről."</li></ul>\n\n"A billentyűzeten és a navigációs sávon nem lehetséges a nagyítás."</string>
<string name="accessibility_tutorial_dialog_title_button" msgid="3682222614034474845">"Megnyitás a kisegítő gombbal"</string>
<string name="accessibility_tutorial_dialog_title_gesture" msgid="1342726230497913398">"Megnyitás kézmozdulattal"</string>
<string name="accessibility_tutorial_dialog_title_gesture_settings" msgid="8539392614235820285">"Új kisegítő kézmozdulat használata"</string>
@@ -2140,8 +2140,7 @@
<string name="accessibility_hearingaid_title" msgid="8312145423610648518">"Hallókészülékek"</string>
<string name="accessibility_hearingaid_not_connected_summary" msgid="6240237523789614599">"Nincs csatlakoztatva hallókészülék"</string>
<string name="accessibility_hearingaid_adding_summary" msgid="2947474468412309778">"Hallókészülékek hozzáadása"</string>
- <string name="accessibility_hearingaid_pair_instructions_first_message" msgid="3912093691643131154">"A hallókészülék párosításához keresse meg eszközét a következő képernyőn, majd koppintson rá."</string>
- <string name="accessibility_hearingaid_pair_instructions_second_message" msgid="5596683393607650243">"Győződjön meg arról, hogy hallókészüléke párosítási módban van."</string>
+ <string name="accessibility_hearingaid_pair_instructions_message" msgid="3094382949733435414">"A hallókészülék párosításához keresse meg eszközét a következő képernyőn, majd koppintson rá. Győződjön meg arról, hogy hallókészüléke párosítási módban van."</string>
<string name="accessibility_hearingaid_active_device_summary" msgid="3924362383258688984">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>: aktív"</string>
<plurals name="show_number_hearingaid_count" formatted="false" msgid="3160782397139295486">
<item quantity="other"><xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> mentett hallókészülék</item>
@@ -2490,7 +2489,6 @@
<string name="menu_stats_last_unplugged" msgid="5922246077592434526">"Töltés nélkül eltöltött idő: <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
<string name="menu_stats_total" msgid="8973377864854807854">"Használat összesen"</string>
<string name="menu_stats_refresh" msgid="1676215433344981075">"Frissítés"</string>
- <string name="process_kernel_label" msgid="3916858646836739323">"Android OS"</string>
<string name="process_mediaserver_label" msgid="6500382062945689285">"Médiaszerver"</string>
<string name="process_dex2oat_label" msgid="2592408651060518226">"Alkalmazásoptimalizálás"</string>
<string name="battery_saver" msgid="8172485772238572153">"Akkumulátorkímélő mód"</string>
@@ -2621,8 +2619,6 @@
<string name="no_device_admins" msgid="4846602835339095768">"Nincsenek rendelkezésre álló eszközrendszergazdai alkalmazások"</string>
<string name="personal_device_admin_title" msgid="2849617316347669861">"Személyes"</string>
<string name="managed_device_admin_title" msgid="7853955652864478435">"Munkahely"</string>
- <string name="sms_access_restriction_enabled" msgid="7054488078710530278">"Korlátozott SMS- és hívásnapló-hozzáférés"</string>
- <string name="sms_access_restriction_enabled_summary" msgid="6851339654677842328">"Csak az alapértelmezett telefon- és üzenetküldő alkalmazások rendelkeznek SMS-ekhez és hívásnaplóhoz való hozzáféréssel"</string>
<string name="no_trust_agents" msgid="7450273545568977523">"Nincs elérhető trust agent komponens"</string>
<string name="add_device_admin_msg" msgid="1501847129819382149">"Aktiválja az eszközrendszergazdai alkalmazást?"</string>
<string name="add_device_admin" msgid="4192055385312215731">"Az eszközrendszergazdai alkalmazás aktiválása"</string>
@@ -3111,7 +3107,7 @@
<string name="keywords_app_default" msgid="5822717006354487071">"Társítás"</string>
<string name="keywords_applications_settings" msgid="1268353611121497450">"Alkalmazások"</string>
<string name="keywords_time_zone" msgid="998254736898753085">"időzóna"</string>
- <string name="keywords_draw_overlay" msgid="4130899177619041842">"Csevegési fejléc"</string>
+ <string name="keywords_draw_overlay" msgid="1001120206241401007">"Csevegés fejléce, rendszer, értesítés, ablak, párbeszédpanel, kijelző, más alkalmazások fölött, megjelenítés"</string>
<string name="keywords_flashlight" msgid="6161632177705233710">"Zseblámpa, fény, vaku"</string>
<string name="keywords_change_wifi_state" msgid="627068244033681010">"wifi, wi-fi, kapcsoló, vezérlés"</string>
<string name="keywords_more_mobile_networks" msgid="8995946622054642367">"mobilhálózat, mobil, mobilszolgáltató, vezeték nélküli, adat, 4g, 3g, 2g, lte"</string>
@@ -3135,7 +3131,7 @@
<string name="keywords_sounds_and_notifications_interruptions" msgid="5426093074031208917">"ne zavarjanak, megszakít, megszakítás, szünet"</string>
<string name="keywords_app" msgid="6334757056536837791">"RAM"</string>
<string name="keywords_location" msgid="4132655528196729043">"közeli, hely, előzmények, jelentés, GPS"</string>
- <string name="keywords_accounts" msgid="1957925565953357627">"fiók"</string>
+ <string name="keywords_accounts" msgid="4479029747403203867">"fiók, fiók hozzáadása, munkaprofil"</string>
<string name="keywords_users" msgid="3434190133131387942">"korlátozás, korlátoz, korlátozott"</string>
<string name="keywords_keyboard_and_ime" msgid="9143339015329957107">"szövegjavítás, javítás, hang, rezgés, automatikus, nyelv, kézmozdulat, javasol, javaslat, téma, sértő, szó, gépel, hangulatjel, nemzetközi"</string>
<string name="keywords_reset_apps" msgid="5293291209613191845">"alaphelyzetbe állítás, beállítások, alapértelmezett"</string>
@@ -3173,6 +3169,7 @@
<string name="keywords_storage_settings" msgid="297283751968446577">"memória, gyorsítótár, adatok, törlés, eltávolítás, felszabadítás, tárhely"</string>
<string name="keywords_bluetooth_settings" msgid="6804844062789439858">"csatlakoztatott, eszköz, fejhallgató, headset, hangfal, vezeték nélküli, párosítás, fülhallgató, zene, médiatartalom"</string>
<string name="keywords_wallpaper" msgid="5058364390917429896">"háttér, képernyő, lezárási képernyő, téma"</string>
+ <string name="keywords_styles" msgid="5828725481814049422">"ikon alakja, kiemelés színe, betűtípus"</string>
<string name="keywords_assist_input" msgid="5017533309492679287">"alapértelmezett, Segéd"</string>
<string name="keywords_default_payment_app" msgid="3838565809518896799">"fizetés, alapértelmezett"</string>
<string name="keywords_ambient_display" msgid="3103487805748659132">"bejövő értesítés"</string>
@@ -3182,7 +3179,7 @@
<string name="keywords_notification_vibration" msgid="31924624421190547">"rezgés, vibrálás, érzékenység"</string>
<string name="keywords_battery_saver_sticky" msgid="5586215686021650278">"akkumulátorkímélő mód, ragadós, megőrzés, energiamegtakarítás, akkumulátor"</string>
<string name="keywords_battery_saver_schedule" msgid="7358789228486231944">"rutin, ütemezés, akkumulátorkímélő mód, energiamegtakarítás, akkumulátor, automatikus, százalék"</string>
- <string name="keywords_add_an_account" msgid="6488139919428902434">"munkaprofil"</string>
+ <string name="keywords_enhance_4g_lte" msgid="2273810564244790859">"volte, továbbfejlesztett telefonhívás, 4G-hívás"</string>
<string name="default_sound" msgid="8821684447333687810">"Alapértelmezett hang"</string>
<string name="sound_settings_summary" msgid="4100853606668287965">"Csörgetési hangerő szintje: <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
<string name="sound_dashboard_summary" msgid="3402435125958012986">"Hangerő, rezgés, Ne zavarjanak"</string>
@@ -3889,7 +3886,6 @@
<string name="permit_draw_overlay" msgid="7456536798718633432">"Más alkalmazások fölé helyezés engedélyezése"</string>
<string name="allow_overlay_description" msgid="8961670023925421358">"Lehetővé teszi az adott alkalmazás számára, hogy megjelenjen a többi használatban lévő alkalmazás fölött. Ezzel esetleg akadályozhatja a többi alkalmazás használatát, vagy megváltoztathatja megjelenésüket, illetve viselkedésüket."</string>
<string name="keywords_vr_listener" msgid="7441221822576384680">"vr, virtuális valóság, figyelő, sztereó, segédszolgáltatás"</string>
- <string name="keywords_system_alert_window" msgid="5049498015597864850">"rendszerértesítés párbeszédablak más alkalmazások fölött megjelenítés"</string>
<string name="overlay_settings" msgid="6930854109449524280">"A többi alkalmazás fölött"</string>
<string name="system_alert_window_summary" msgid="602892301318324492">"A(z) <xliff:g id="COUNT_1">%2$d</xliff:g> alkalmazásból <xliff:g id="COUNT_0">%1$d</xliff:g> jelenhet meg más alkalmazások fölött"</string>
<string name="filter_overlay_apps" msgid="6965969283342557573">"Engedéllyel rendelkező alkalmazások"</string>
@@ -4125,7 +4121,6 @@
<string name="notification_log_details_none" msgid="184131801230614059">"semelyik"</string>
<string name="notification_log_details_ranking_null" msgid="244660392058720919">"A rangsortárgy hiányzik."</string>
<string name="notification_log_details_ranking_none" msgid="599607025882587844">"A rangsortárgy nem tartalmazza ezt a kulcsot."</string>
- <string name="theme_customization_category" msgid="1049181544004163283">"Témák"</string>
<string name="theme_customization_device_default" msgid="5058147707906551368">"Alapértelmezett"</string>
<string name="display_cutout_emulation" msgid="7466869822418376317">"Képernyőkivágás"</string>
<string name="display_cutout_emulation_keywords" msgid="4495418317471622562">"képernyőkivágás, sziget"</string>
@@ -4551,6 +4546,8 @@
<string name="network_connection_errorstate_dialog_message" msgid="6953778550775646710">"Valami történt. Az alkalmazás megszakította az eszköz kiválasztására irányuló kérést."</string>
<string name="network_connection_connect_successful" msgid="5935510954474494928">"Sikeres kapcsolódás"</string>
<string name="network_connection_request_dialog_showall" msgid="6938922880244567521">"Összes mutatása"</string>
+ <string name="network_connection_searching_message" msgid="4638576789450817530">"Eszköz keresése…"</string>
+ <string name="network_connection_connecting_message" msgid="3740982406609245654">"Csatlakozás az eszközhöz…"</string>
<plurals name="show_bluetooth_devices" formatted="false" msgid="1715020480026568408">
<item quantity="other"><xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> csatlakoztatott eszköz</item>
<item quantity="one"><xliff:g id="NUMBER_DEVICE_COUNT_0">%1$d</xliff:g> csatlakoztatott eszköz</item>
diff --git a/res/values-hy/strings.xml b/res/values-hy/strings.xml
index 33a3b43..a5d3785 100644
--- a/res/values-hy/strings.xml
+++ b/res/values-hy/strings.xml
@@ -360,8 +360,6 @@
<string name="security_enable_widgets_disabled_summary" msgid="6392489775303464905">"Անջատվել է ադմինիստրատորի կողմից"</string>
<string name="lockdown_settings_title" msgid="7393790212603280213">"Ավելացնել մուտքի արգելափակման ընտրանքը"</string>
<string name="lockdown_settings_summary" msgid="4359438673563318171">"Ցուցադրել սնուցման կոճակի ընտրանքը, որն անջատում է Smart Lock-ը, կենսաչափական տվյալներով ապակողպումը և կողպէկրանին ցուցադրվող ծանուցումները"</string>
- <string name="trust_agents_extend_unlock_title" msgid="2796555263565097031">"Միջանկյալ գործակալները հետաձգում են կողպումը"</string>
- <string name="trust_agents_extend_unlock_summary" msgid="3976344969220255010">"Եթե միացված է, միջանկյալ գործակալները երկար ժամանակ չեն թողնի, որ ձեր սարքը կողպվի, սակայն այլևս չեն կարողանա ապակողպել որևէ կողպված սարք:"</string>
<string name="trust_lost_locks_screen_title" msgid="2992742466966021682">"Վստահության կորստի դեպքում կողպել էկրանը"</string>
<string name="trust_lost_locks_screen_summary" msgid="693784434582021206">"Եթե միացված է, սարքը կկողպվի, երբ վստահության վերջին գործակալը կորցնի վստահությունը:"</string>
<string name="owner_info_settings_summary" msgid="7472393443779227052">"Չկա"</string>
@@ -937,6 +935,7 @@
<string name="wifi_eap_identity" msgid="4359453783379679103">"Ինքնություն"</string>
<string name="wifi_eap_anonymous" msgid="2989469344116577955">"Անանուն ինքնություն"</string>
<string name="wifi_password" msgid="5948219759936151048">"Գաղտնաբառ"</string>
+ <string name="wifi_sae_password_id" msgid="1697832722221765763">"SAE գաղտնաբառի նույնացուցիչ"</string>
<string name="wifi_show_password" msgid="6461249871236968884">"Ցույց տալ գաղտնաբառը"</string>
<string name="wifi_ap_band_config" msgid="1611826705989117930">"Wi-Fi հաճախականությունների դիապազոն"</string>
<string name="wifi_ap_choose_auto" msgid="2677800651271769965">"Ավտոմատ"</string>
@@ -957,7 +956,6 @@
<string name="wifi_dpp_share_wifi" msgid="9065890131734833809">"Կիսվել Wi‑Fi-ով"</string>
<string name="wifi_dpp_scan_qr_code_with_another_device" msgid="5854392840857123065">"«<xliff:g id="SSID">%1$s</xliff:g>» ցանցին միանալու և գաղտնաբառով կիսվելու համար սկանավորեք այս QR կոդը"</string>
<string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="4436318319178361543">"«<xliff:g id="SSID">%1$s</xliff:g>» ցանցին միանալու համար սկանավորեք այս QR կոդը"</string>
- <string name="wifi_dpp_could_not_detect_valid_qr_code" msgid="641893675646330576">"Չհաջողվեց կարդալ QR կոդը։ Նորից կենտրոնական դիրքի բերեք և կրկնեք"</string>
<string name="wifi_dpp_failure_authentication_or_configuration" msgid="3372757783382381044">"Նորից փորձեք: Եթե խնդիրը չվերանա, դիմեք սարքի արտադրողին"</string>
<string name="wifi_dpp_failure_not_compatible" msgid="2829930473520603740">"Սխալ առաջացավ"</string>
<string name="wifi_dpp_failure_timeout" msgid="5228320772245820458">"Համոզվեք, որ սարքը սնուցվում է հոսանքից, լիցքավորված է և միացված"</string>
@@ -980,6 +978,7 @@
<string name="wifi_dpp_hotspot_password" msgid="4120419278831581613">"Թեժ կետի գաղտնաբառ՝ <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
<string name="wifi_dpp_add_device" msgid="4072206063308645677">"Ավելացնել սարք"</string>
<string name="wifi_dpp_connect_network_using_qr_code" msgid="3887335309163999665">"Այս ցանցին սարք ավելացնելու համար օգտագործեք QR կոդ"</string>
+ <string name="wifi_dpp_qr_code_is_not_valid_format" msgid="3700087439867692944">"QR կոդը վավեր ձևաչափ չէ"</string>
<string name="retry" msgid="6472609612090877557">"Կրկնել"</string>
<string name="wifi_shared" msgid="844142443226926070">"Կիսվել այլ սարքերի օգտատերերի հետ"</string>
<string name="wifi_unchanged" msgid="3410422020930397102">"(անփոփոխ)"</string>
@@ -1129,6 +1128,7 @@
<string name="emergency_address_title" msgid="932729250447887545">"Արտակարգ իրավիճակների հասցե"</string>
<string name="emergency_address_summary" msgid="7751971156196115129">"Օգտագործվում է որպես ձեր հասցեն, երբ Wi‑Fi-ի միջոցով շտապ կանչ եք կատարում"</string>
<string name="private_dns_help_message" msgid="3299567069152568958"><annotation id="url">"Մանրամասն"</annotation>" մասնավոր DNS սերվերի մասին"</string>
+ <string name="private_dns_mode_on" msgid="5882613439541371003">"Միացված է"</string>
<string name="wifi_calling_pref_managed_by_carrier" msgid="6845711858866828986">"Կարգավորումը կառավարվում է օպերատորի կողմից"</string>
<string name="wifi_calling_settings_activation_instructions" msgid="7492509632478260955">"Ակտիվացրեք Wi-Fi-ի միջոցով զանգերը"</string>
<string name="wifi_calling_turn_on" msgid="1171403510313983983">"Միացրեք Wi-Fi-ի միջոցով զանգերը"</string>
@@ -1872,7 +1872,7 @@
<string name="default_emergency_app" msgid="1951760659640369980">"Արտակարգ իրավիճակների հավելված"</string>
<string name="reset_app_preferences" msgid="1321050641018356925">"Զրոյացնել հավելվածների կարգավորումները"</string>
<string name="reset_app_preferences_title" msgid="6093179367325336662">"Զրոյացնե՞լ կարգավորումները"</string>
- <string name="reset_app_preferences_desc" msgid="4822447731869201512">"Կզրոյացվեն հետևյալ բոլոր կարգավորումները՝\n\n"<li>"Անջատած հավելվածները"</li>\n<li>"Հավելվածների անջատած ծանուցումները"</li>\n<li>"Կանխադրված հավելվածները"</li>\n<li>"Ֆոնային ռեժիմում տվյալների փոխանցման սահմանափակումները"</li>\n\n<li>"Թույլտվությունների բոլոր սահմանափակումները"</li>\n"Հավելվածների տվյալները չեն կորի։"</string>
+ <string name="reset_app_preferences_desc" msgid="731757609326016760">"Հետևյալ կարգավորումները կզրոյանան՝\n\n"<li>"անջատված հավելվածները,"</li>\n<li>"հավելվածների անջատված ծանուցումները,"</li>\n<li>"կանխադրված հավելվածները,"</li>\n<li>"ֆոնային ռեժիմում տվյալների փոխանցման սահմանափակումները,"</li>\n<li>"թույլտվությունների բոլոր սահմանափակումները։"</li>\n\n"Հավելվածների տվյալները կպահպանվեն։"</string>
<string name="reset_app_preferences_button" msgid="2559089511841281242">"Զրոյացնել"</string>
<string name="manage_space_text" msgid="8852711522447794676">"Կառավարել տարածքը"</string>
<string name="filter" msgid="2018011724373033887">"Զտիչ"</string>
@@ -2087,7 +2087,7 @@
<string name="accessibility_screen_magnification_short_summary" msgid="3411979839172752057">"Հպել 3 անգամ՝ մեծացնելու համար"</string>
<string name="accessibility_screen_magnification_navbar_short_summary" msgid="3693116360267980492">"Հպել որևէ կոճակի՝ մեծացնելու համար"</string>
<string name="accessibility_screen_magnification_summary" msgid="5258868553337478505"><b>"Մասշտաբը փոխելու համար"</b>" 3 անգամ արագ հպեք էկրանին:\n"<ul><li>"Ոլորելու համար 2 կամ ավելի մատները քաշեք էկրանի վրայով"</li>\n<li>"Մասշտաբը փոխելու համար 2 կամ ավելի մատները մոտեցրեք միմյանց"</li></ul>\n\n<b>"Մասշտաբը ժամանակավորապես փոխելու համար"</b>" 3 անգամ արագ հպեք էկրանին և երրորդ հպումից հետո մատը սեղմած պահեք:\n"<ul><li>"Քաշեք՝ էկրանով մեկ շարժելու համար"</li>\n<li>"Բարձրացրեք մատը՝ փոքրացնելու համար"</li></ul>\n\n"Ստեղնաշարի կամ նավարկման գոտու միջոցով հնարավոր չէ մեծացնել:"</string>
- <string name="accessibility_screen_magnification_navbar_summary" msgid="2272878354599332009">"Երբ խոշորացումը միացված է, դուք կարող եք մեծացնել էկրանի մասշտաբը:\n\n"<b>"Մասշտաբը մեծացնելու համար"</b>" միացրեք խոշորացումը և հպեք էկրանի ցանկացած հատվածին:\n"<ul><li>"• Ոլորելու համար 2 կամ ավելի մատները քաշեք էկրանի վրայով:"</li>\n<li>"• Մասշտաբը փոխելու համար 2 կամ ավելի մատները մոտեցրեք միմյանց:"</li></ul>\n\n<b>"Մասշտաբը ժամանակավորապես փոխելու համար"</b>" միացրեք խոշորացումը, ապա հպեք էկրանի ցանկացած հատվածին ու պահեք:\n"<ul><li>"• Քաշեք՝ պատկերն էկրանով մեկ շարժելու համար:"</li>\n<li>"• Բարձրացրեք մատը՝ փոքրացնելու համար:"</li></ul>\n\n"Խոշորացումը գործում է էկրանի ցանկացած հատվածում՝ բացի ստեղնաշարից և նավարկման գոտուց:"</string>
+ <string name="accessibility_screen_magnification_navbar_summary" msgid="6700716275347612310">"Երբ խոշորացումը միացված է, դուք կարող եք մեծացնել էկրանի մասշտաբը:\n\n"<b>"Մասշտաբը մեծացնելու համար"</b>"միացրեք խոշորացումը և հպեք էկրանի ցանկացած հատվածին:\n"<ul><li>"Ոլորելու համար 2 կամ ավելի մատները քաշեք էկրանի վրայով։"</li>\n<li>"Մասշտաբը փոխելու համար 2 կամ ավելի մատները մոտեցրեք միմյանց։"</li></ul>\n\n<b>"Մասշտաբը ժամանակավորապես փոխելու համար"</b>" միացրեք խոշորացումը, ապա հպեք էկրանի ցանկացած հատվածին և պահեք։\n"<ul><li>"Քաշեք՝ էկրանով մեկ շարժելու համար։"</li>\n<li>"Բարձրացրեք մատը՝ փոքրացնելու համար։"</li></ul>\n\n"Ստեղնաշարի կամ նավարկման գոտու միջոցով հնարավոր չէ մեծացնել:"</string>
<string name="accessibility_tutorial_dialog_title_button" msgid="3682222614034474845">"Բացեք «Հատուկ գործառույթներ» կոճակի միջոցով"</string>
<string name="accessibility_tutorial_dialog_title_gesture" msgid="1342726230497913398">"Բացեք ձեռքի շարժումով"</string>
<string name="accessibility_tutorial_dialog_title_gesture_settings" msgid="8539392614235820285">"Օգտագործեք հատուկ գործառույթների նոր ժեստը"</string>
@@ -2140,8 +2140,7 @@
<string name="accessibility_hearingaid_title" msgid="8312145423610648518">"Լսողական ապարատ"</string>
<string name="accessibility_hearingaid_not_connected_summary" msgid="6240237523789614599">"Որևէ լսողական ապարատ միացված չէ"</string>
<string name="accessibility_hearingaid_adding_summary" msgid="2947474468412309778">"Ավելացնել լսողական ապարատ"</string>
- <string name="accessibility_hearingaid_pair_instructions_first_message" msgid="3912093691643131154">"Լսողական ապարատը զուգակցելու համար հաջորդ էկրանին փնտրեք ձեր սարքն ու հպեք դրան։"</string>
- <string name="accessibility_hearingaid_pair_instructions_second_message" msgid="5596683393607650243">"Համոզվեք, որ լսողական ապարատը զուգակցման ռեժիմում է։"</string>
+ <string name="accessibility_hearingaid_pair_instructions_message" msgid="3094382949733435414">"Լսողական ապարատը զուգակցելու համար հաջորդ էկրանին գտեք ձեր սարքն ու հպեք դրան։ Համոզվեք, որ լսողական ապարատը զուգակցման ռեժիմում է։"</string>
<string name="accessibility_hearingaid_active_device_summary" msgid="3924362383258688984">"«<xliff:g id="DEVICE_NAME">%1$s</xliff:g>» սարքը ակտիվ է"</string>
<plurals name="show_number_hearingaid_count" formatted="false" msgid="3160782397139295486">
<item quantity="one"><xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> պահված լսողական ապարատ</item>
@@ -2490,7 +2489,6 @@
<string name="menu_stats_last_unplugged" msgid="5922246077592434526">"Մինչ <xliff:g id="UNPLUGGED">%1$s</xliff:g>-ի վերջին անջատումը"</string>
<string name="menu_stats_total" msgid="8973377864854807854">"Ընդհանուր օգտագործումը"</string>
<string name="menu_stats_refresh" msgid="1676215433344981075">"Թարմացնել"</string>
- <string name="process_kernel_label" msgid="3916858646836739323">"Android OS"</string>
<string name="process_mediaserver_label" msgid="6500382062945689285">"Մեդիասերվեր"</string>
<string name="process_dex2oat_label" msgid="2592408651060518226">"Հավելվածի օպտիմալացում"</string>
<string name="battery_saver" msgid="8172485772238572153">"Մարտկոցի տնտեսում"</string>
@@ -2621,8 +2619,6 @@
<string name="no_device_admins" msgid="4846602835339095768">"Սարքի ադմինիստրատորի հավելվածներ չկան"</string>
<string name="personal_device_admin_title" msgid="2849617316347669861">"Անձնական"</string>
<string name="managed_device_admin_title" msgid="7853955652864478435">"Աշխատանքային"</string>
- <string name="sms_access_restriction_enabled" msgid="7054488078710530278">"Սահմանափակել SMS-ների և զանգերի մատյանի մուտքը"</string>
- <string name="sms_access_restriction_enabled_summary" msgid="6851339654677842328">"SMS-ների և զանգերի մատյանը հասանելի է միայն կանխադրված հեռախոսին և հաղորդագրման հավելվածներին"</string>
<string name="no_trust_agents" msgid="7450273545568977523">"Չկան Trust Agents"</string>
<string name="add_device_admin_msg" msgid="1501847129819382149">"Ակտիվացնե՞լ սարքի ադմինիստրատորի հավելվածը:"</string>
<string name="add_device_admin" msgid="4192055385312215731">"Ակտիվացնել այս սարքի ադմինիստրատորի հավելվածը"</string>
@@ -3111,7 +3107,7 @@
<string name="keywords_app_default" msgid="5822717006354487071">"Բացել հավելվածով"</string>
<string name="keywords_applications_settings" msgid="1268353611121497450">"Հավելվածներ"</string>
<string name="keywords_time_zone" msgid="998254736898753085">"ժամային գոտի"</string>
- <string name="keywords_draw_overlay" msgid="4130899177619041842">"Chat Head"</string>
+ <string name="keywords_draw_overlay" msgid="1001120206241401007">"Զրույցի ամպիկ, համակարգ, ծանուցում, պատուհան, երկխոսություն, ցուցադրել, այլ հավելվածների վրայից"</string>
<string name="keywords_flashlight" msgid="6161632177705233710">"Լուսաթարթիչ, լույս, լապտեր"</string>
<string name="keywords_change_wifi_state" msgid="627068244033681010">"wifi, wi-fi, միացնել/անջատել, կառավարել"</string>
<string name="keywords_more_mobile_networks" msgid="8995946622054642367">"բջջային, շարժական, բջջային օպերատոր, անլար, տվյալներ, 4g, 3g, 2g, lte"</string>
@@ -3135,7 +3131,7 @@
<string name="keywords_sounds_and_notifications_interruptions" msgid="5426093074031208917">"չխանգարել, ընդհատել, ընդհատում, ընդմիջում"</string>
<string name="keywords_app" msgid="6334757056536837791">"RAM"</string>
<string name="keywords_location" msgid="4132655528196729043">"մոտակա, տեղադրություն, պատմություն, հաշվետվություն, GPS"</string>
- <string name="keywords_accounts" msgid="1957925565953357627">"հաշիվ"</string>
+ <string name="keywords_accounts" msgid="4479029747403203867">"հաշիվ, ավելացնել հաշիվ, աշխատանքային պրոֆիլ"</string>
<string name="keywords_users" msgid="3434190133131387942">"սահմանափակում, սահմանափակել, սահմանափակված"</string>
<string name="keywords_keyboard_and_ime" msgid="9143339015329957107">"տեքստի ուղղում, ուղղել, ձայն, թրթռալ, ավտոմատ, լեզու, ժեստ, առաջարկել, առաջարկ, թեմա, վիրավորական, բառ, մուտքագրել, զմայլիկ, միջազգային"</string>
<string name="keywords_reset_apps" msgid="5293291209613191845">"վերակայել, կարգավորումներ, կանխադրված"</string>
@@ -3173,6 +3169,7 @@
<string name="keywords_storage_settings" msgid="297283751968446577">"հիշողություն, քեշ, տվյալներ, ջնջել, մաքրել, ազատել, տարածք"</string>
<string name="keywords_bluetooth_settings" msgid="6804844062789439858">"միացված, սարք, ականջակալ, բարձրախոս, անլար, զուգակցել, ներդիր ականջակալ, երաժշտություն, մեդիա"</string>
<string name="keywords_wallpaper" msgid="5058364390917429896">"հետնապատկեր, էկրան, կողպէկրան, թեմա"</string>
+ <string name="keywords_styles" msgid="5828725481814049422">"պատկերակի ձևը, շեշտի գույնը, տառատեսակը"</string>
<string name="keywords_assist_input" msgid="5017533309492679287">"կանխադրված, օգնական"</string>
<string name="keywords_default_payment_app" msgid="3838565809518896799">"վճարում, կանխադրված"</string>
<string name="keywords_ambient_display" msgid="3103487805748659132">"մուտքային ծանուցում"</string>
@@ -3182,7 +3179,7 @@
<string name="keywords_notification_vibration" msgid="31924624421190547">"հպման արձագանք, թրթռոց, զգայունություն"</string>
<string name="keywords_battery_saver_sticky" msgid="5586215686021650278">"մարտկոցի տնտեսում, մշտական, էներգախնայում, մարտկոց"</string>
<string name="keywords_battery_saver_schedule" msgid="7358789228486231944">"գործողությունների հերթականություն, ժամանակացույց, մարտկոցի տնտեսում, էներգախնայում, մարտկոց, ավտոմատ, տոկոս"</string>
- <string name="keywords_add_an_account" msgid="6488139919428902434">"աշխատանքային պրոֆիլ"</string>
+ <string name="keywords_enhance_4g_lte" msgid="2273810564244790859">"volte, ընդլայնված հնարավորություններով զանգեր, 4g զանգեր"</string>
<string name="default_sound" msgid="8821684447333687810">"Կանխադրված զանգերանգը"</string>
<string name="sound_settings_summary" msgid="4100853606668287965">"Զանգի ուժգնությունը՝ <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
<string name="sound_dashboard_summary" msgid="3402435125958012986">"Ձայնի ուժգնություն, թրթռոց, Չանհանգստացնել ռեժիմ"</string>
@@ -3889,7 +3886,6 @@
<string name="permit_draw_overlay" msgid="7456536798718633432">"Ցուցադրել մյուս հավելվածների վրայից"</string>
<string name="allow_overlay_description" msgid="8961670023925421358">"Թույլ տալ այս հավելվածի ցուցադրումը ձեր օգտագործած այլ հավելվածների վրայից: Դա կարող է խանգարել այդ հավելվածների ձեր կողմից օգտագործմանը կամ փոխել դրանք ցուցադրման կամ աշխատանքի եղանակը:"</string>
<string name="keywords_vr_listener" msgid="7441221822576384680">"vr վիրտուալ իրականություն ունկնդրիչ ստերեո օգնության ծառայություն"</string>
- <string name="keywords_system_alert_window" msgid="5049498015597864850">"համակարգի զգուշացում պատուհան երկխոսություն ցուցադրել այլ հավելվածների վերևում"</string>
<string name="overlay_settings" msgid="6930854109449524280">"Ցուցադրում այլ հավելվածների վրայից"</string>
<string name="system_alert_window_summary" msgid="602892301318324492">"<xliff:g id="COUNT_1">%2$d</xliff:g>-ից <xliff:g id="COUNT_0">%1$d</xliff:g> հավելվածներ կարող են ցուցադրվել այլ հավելվածների վրա"</string>
<string name="filter_overlay_apps" msgid="6965969283342557573">"Թույլտվություն ունեցող հավելվածներ"</string>
@@ -4125,7 +4121,6 @@
<string name="notification_log_details_none" msgid="184131801230614059">"ոչ մեկը"</string>
<string name="notification_log_details_ranking_null" msgid="244660392058720919">"Դասակարգման օբյեկտը բացակայում է:"</string>
<string name="notification_log_details_ranking_none" msgid="599607025882587844">"Դասակարգման օբյեկտը չի պարունակում այս բանալին:"</string>
- <string name="theme_customization_category" msgid="1049181544004163283">"Թեմաներ"</string>
<string name="theme_customization_device_default" msgid="5058147707906551368">"Կանխադրված տարբերակ"</string>
<string name="display_cutout_emulation" msgid="7466869822418376317">"Կտրվածք"</string>
<string name="display_cutout_emulation_keywords" msgid="4495418317471622562">"էկրանի կտրվածք, հատում"</string>
@@ -4551,6 +4546,8 @@
<string name="network_connection_errorstate_dialog_message" msgid="6953778550775646710">"Սխալ առաջացավ: Հավելվածը չեղարկել է սարք ընտրելու հայտը:"</string>
<string name="network_connection_connect_successful" msgid="5935510954474494928">"Կապը հաստատվեց"</string>
<string name="network_connection_request_dialog_showall" msgid="6938922880244567521">"Ցուցադրել բոլորը"</string>
+ <string name="network_connection_searching_message" msgid="4638576789450817530">"Սարքի որոնում…"</string>
+ <string name="network_connection_connecting_message" msgid="3740982406609245654">"Միացում սարքին…"</string>
<plurals name="show_bluetooth_devices" formatted="false" msgid="1715020480026568408">
<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>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index d34d668..4799747 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -360,8 +360,6 @@
<string name="security_enable_widgets_disabled_summary" msgid="6392489775303464905">"Dinonaktifkan oleh admin"</string>
<string name="lockdown_settings_title" msgid="7393790212603280213">"Tampilkan opsi kunci total"</string>
<string name="lockdown_settings_summary" msgid="4359438673563318171">"Tampilkan opsi tombol power yang menonaktifkan Smart Lock, buka kunci biometrik, dan notifikasi di layar kunci"</string>
- <string name="trust_agents_extend_unlock_title" msgid="2796555263565097031">"Perangkat dipercaya memperpanjang buka kunci"</string>
- <string name="trust_agents_extend_unlock_summary" msgid="3976344969220255010">"Jika diaktifkan, perangkat dipercaya akan membuat perangkat tetap tidak terkunci untuk waktu yang lebih lama, namun tidak dapat lagi membuka perangkat yang terkunci."</string>
<string name="trust_lost_locks_screen_title" msgid="2992742466966021682">"Kunci layar saat kepercayaan hilang"</string>
<string name="trust_lost_locks_screen_summary" msgid="693784434582021206">"Jika diaktifkan, perangkat akan terkunci saat perangkat dipercaya terakhir kehilangan kepercayaan"</string>
<string name="owner_info_settings_summary" msgid="7472393443779227052">"Tidak ada"</string>
@@ -937,6 +935,7 @@
<string name="wifi_eap_identity" msgid="4359453783379679103">"Identitas"</string>
<string name="wifi_eap_anonymous" msgid="2989469344116577955">"Identitas anonim"</string>
<string name="wifi_password" msgid="5948219759936151048">"Sandi"</string>
+ <string name="wifi_sae_password_id" msgid="1697832722221765763">"ID sandi SAE"</string>
<string name="wifi_show_password" msgid="6461249871236968884">"Tampilkan sandi"</string>
<string name="wifi_ap_band_config" msgid="1611826705989117930">"Pilih AP Band"</string>
<string name="wifi_ap_choose_auto" msgid="2677800651271769965">"Otomatis"</string>
@@ -957,7 +956,6 @@
<string name="wifi_dpp_share_wifi" msgid="9065890131734833809">"Bagikan Wi‑Fi"</string>
<string name="wifi_dpp_scan_qr_code_with_another_device" msgid="5854392840857123065">"Pindai kode QR ini untuk terhubung ke “<xliff:g id="SSID">%1$s</xliff:g>” dan membagikan sandi"</string>
<string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="4436318319178361543">"Pindai kode QR ini untuk terhubung ke “<xliff:g id="SSID">%1$s</xliff:g>”"</string>
- <string name="wifi_dpp_could_not_detect_valid_qr_code" msgid="641893675646330576">"Tidak dapat membaca kode QR. Tempatkan lagi kode di tengah dan coba lagi"</string>
<string name="wifi_dpp_failure_authentication_or_configuration" msgid="3372757783382381044">"Coba lagi. Jika masalah berlanjut, hubungi produsen perangkat"</string>
<string name="wifi_dpp_failure_not_compatible" msgid="2829930473520603740">"Ada masalah"</string>
<string name="wifi_dpp_failure_timeout" msgid="5228320772245820458">"Pastikan perangkat telah dicolokkan, diisi dayanya, dan diaktifkan"</string>
@@ -980,6 +978,7 @@
<string name="wifi_dpp_hotspot_password" msgid="4120419278831581613">"Sandi hotspot: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
<string name="wifi_dpp_add_device" msgid="4072206063308645677">"Tambahkan perangkat"</string>
<string name="wifi_dpp_connect_network_using_qr_code" msgid="3887335309163999665">"Gunakan kode QR untuk menambahkan perangkat ke jaringan ini"</string>
+ <string name="wifi_dpp_qr_code_is_not_valid_format" msgid="3700087439867692944">"Format kode QR tidak valid"</string>
<string name="retry" msgid="6472609612090877557">"Coba lagi"</string>
<string name="wifi_shared" msgid="844142443226926070">"Berbagi dengan pengguna perangkat lain"</string>
<string name="wifi_unchanged" msgid="3410422020930397102">"(tidak diubah)"</string>
@@ -1129,6 +1128,7 @@
<string name="emergency_address_title" msgid="932729250447887545">"Alamat Darurat"</string>
<string name="emergency_address_summary" msgid="7751971156196115129">"Digunakan sebagai lokasi Anda ketika Anda melakukan panggilan darurat melalui Wi‑Fi"</string>
<string name="private_dns_help_message" msgid="3299567069152568958"><annotation id="url">"Pelajari lebih lanjut"</annotation>" fitur DNS Pribadi"</string>
+ <string name="private_dns_mode_on" msgid="5882613439541371003">"Aktif"</string>
<string name="wifi_calling_pref_managed_by_carrier" msgid="6845711858866828986">"Setelan dikelola oleh operator"</string>
<string name="wifi_calling_settings_activation_instructions" msgid="7492509632478260955">"Aktifkan Panggilan Wi-Fi"</string>
<string name="wifi_calling_turn_on" msgid="1171403510313983983">"Aktifkan panggilan Wi-Fi"</string>
@@ -1872,7 +1872,7 @@
<string name="default_emergency_app" msgid="1951760659640369980">"Aplikasi darurat"</string>
<string name="reset_app_preferences" msgid="1321050641018356925">"Setel ulang preferensi aplikasi"</string>
<string name="reset_app_preferences_title" msgid="6093179367325336662">"Setel ulang pref aplikasi?"</string>
- <string name="reset_app_preferences_desc" msgid="4822447731869201512">"Tindakan ini akan menyetel ulang semua preferensi untuk:\n\n"<li>"Aplikasi yang dinonaktifkan"</li>\n<li>"Notifikasi aplikasi yang dinonaktifkan"</li>\n<li>"Aplikasi default untuk tindakan"</li>\n<li>"Batasan data latar belakang untuk aplikasi"</li>\n<li>"Batasan izin apa pun"</li>\n\n"Data aplikasi tidak akan hilang."</string>
+ <string name="reset_app_preferences_desc" msgid="731757609326016760">"Tindakan ini akan menyetel ulang semua preferensi untuk:\n\n"<li>"Aplikasi yang dinonaktifkan"</li>\n<li>"Notifikasi aplikasi yang dinonaktifkan"</li>\n<li>"Aplikasi default untuk tindakan"</li>\n<li>"Batasan data latar belakang untuk aplikasi"</li>\n<li>"Batasan izin apa pun"</li>\n\n"Data aplikasi Anda tidak akan hilang."</string>
<string name="reset_app_preferences_button" msgid="2559089511841281242">"Setel ulang aplikasi"</string>
<string name="manage_space_text" msgid="8852711522447794676">"Kelola ruang"</string>
<string name="filter" msgid="2018011724373033887">"Filter"</string>
@@ -2087,7 +2087,7 @@
<string name="accessibility_screen_magnification_short_summary" msgid="3411979839172752057">"Ketuk 3 kali untuk memperbesar"</string>
<string name="accessibility_screen_magnification_navbar_short_summary" msgid="3693116360267980492">"Ketuk tombol untuk zoom"</string>
<string name="accessibility_screen_magnification_summary" msgid="5258868553337478505"><b>"Untuk melakukan zoom"</b>", ketuk layar 3 kali dengan cepat.\n"<ul><li>"Tarik menggunakan 2 jari atau lebih untuk men-scroll"</li>\n<li>"Cubit menggunakan 2 jari atau lebih untuk menyesuaikan zoom"</li></ul>\n\n<b>"Untuk melakukan zoom sementara"</b>", ketuk layar 3 kali dengan cepat dan tahan jari pada ketukan ketiga.\n"<ul><li>"Tarik untuk memindahkan zoom ke bagian layar yang lain"</li>\n<li>"Angkat jari untuk memperkecil"</li></ul>\n\n"Anda tidak dapat memperbesar keyboard dan menu navigasi."</string>
- <string name="accessibility_screen_magnification_navbar_summary" msgid="2272878354599332009">"Jika pembesaran diaktifkan, Anda dapat memperbesar di layar.\n\n"<b>"Untuk zoom"</b>", mulai pembesaran, lalu ketuk di bagian mana saja pada layar.\n"<ul><li>"• Tarik 2 jari atau lebih untuk scroll"</li>\n<li>"• Cubit dengan 2 jari atau lebih untuk menyesuaikan zoom"</li></ul>\n\n<b>"Untuk zoom sementara"</b>", mulai pembesaran, lalu sentuh lama di bagian mana saja pada layar.\n"<ul><li>"• Tarik untuk berpindah di layar"</li>\n<li>"• Angkat jari untuk memperkecil"</li></ul>\n\n"Anda tidak dapat memperbesar di keyboard atau menu navigasi."</string>
+ <string name="accessibility_screen_magnification_navbar_summary" msgid="6700716275347612310">"Jika pembesaran diaktifkan, Anda dapat memperbesar di layar.\n\n"<b>"Untuk zoom"</b>", mulai pembesaran, lalu ketuk di bagian mana saja pada layar.\n"<ul><li>"Tarik 2 jari atau lebih untuk scroll"</li>\n<li>"Cubit dengan 2 jari atau lebih untuk menyesuaikan zoom"</li></ul>\n\n<b>"Untuk zoom sementara"</b>", mulai pembesaran, lalu sentuh lama di bagian mana saja pada layar.\n"<ul><li>"• Tarik untuk berpindah di layar"</li>\n<li>"• Angkat jari untuk memperkecil"</li></ul>\n\n"Anda tidak dapat memperbesar di keyboard atau menu navigasi."</string>
<string name="accessibility_tutorial_dialog_title_button" msgid="3682222614034474845">"Menggunakan tombol aksesibilitas untuk membuka"</string>
<string name="accessibility_tutorial_dialog_title_gesture" msgid="1342726230497913398">"Menggunakan gestur untuk membuka"</string>
<string name="accessibility_tutorial_dialog_title_gesture_settings" msgid="8539392614235820285">"Menggunakan gestur aksesibilitas baru"</string>
@@ -2140,8 +2140,7 @@
<string name="accessibility_hearingaid_title" msgid="8312145423610648518">"Alat bantu dengar"</string>
<string name="accessibility_hearingaid_not_connected_summary" msgid="6240237523789614599">"Tidak ada alat bantu dengar yang terhubung"</string>
<string name="accessibility_hearingaid_adding_summary" msgid="2947474468412309778">"Tambahkan alat bantu dengar"</string>
- <string name="accessibility_hearingaid_pair_instructions_first_message" msgid="3912093691643131154">"Untuk menyambungkan alat bantu, temukan dan ketuk perangkat Anda di layar berikutnya."</string>
- <string name="accessibility_hearingaid_pair_instructions_second_message" msgid="5596683393607650243">"Pastikan alat bantu dengar Anda dalam mode penyambungan."</string>
+ <string name="accessibility_hearingaid_pair_instructions_message" msgid="3094382949733435414">"Untuk menyambungkan alat bantu dengar, temukan dan ketuk perangkat Anda di layar berikutnya. Pastikan alat bantu dengar Anda dalam mode penyambungan."</string>
<string name="accessibility_hearingaid_active_device_summary" msgid="3924362383258688984">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> aktif"</string>
<plurals name="show_number_hearingaid_count" formatted="false" msgid="3160782397139295486">
<item quantity="other"><xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> alat bantu dengar yang tersimpan</item>
@@ -2490,7 +2489,6 @@
<string name="menu_stats_last_unplugged" msgid="5922246077592434526">"Ketika terakhir dicabut untuk <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
<string name="menu_stats_total" msgid="8973377864854807854">"Total penggunaan"</string>
<string name="menu_stats_refresh" msgid="1676215433344981075">"Segarkan"</string>
- <string name="process_kernel_label" msgid="3916858646836739323">"OS Android"</string>
<string name="process_mediaserver_label" msgid="6500382062945689285">"Mediaserver"</string>
<string name="process_dex2oat_label" msgid="2592408651060518226">"Pengoptimalan aplikasi"</string>
<string name="battery_saver" msgid="8172485772238572153">"Penghemat Baterai"</string>
@@ -2621,8 +2619,6 @@
<string name="no_device_admins" msgid="4846602835339095768">"Tidak ada aplikasi admin yang tersedia"</string>
<string name="personal_device_admin_title" msgid="2849617316347669861">"Pribadi"</string>
<string name="managed_device_admin_title" msgid="7853955652864478435">"Kantor"</string>
- <string name="sms_access_restriction_enabled" msgid="7054488078710530278">"Batasi akses SMS & log panggilan"</string>
- <string name="sms_access_restriction_enabled_summary" msgid="6851339654677842328">"Hanya aplikasi telepon dan pesan default yang memiliki izin SMS & log panggilan"</string>
<string name="no_trust_agents" msgid="7450273545568977523">"Perangkat tepercaya tidak tersedia"</string>
<string name="add_device_admin_msg" msgid="1501847129819382149">"Aktifkan aplikasi admin perangkat?"</string>
<string name="add_device_admin" msgid="4192055385312215731">"Aktifkan aplikasi admin perangkat ini"</string>
@@ -3111,7 +3107,7 @@
<string name="keywords_app_default" msgid="5822717006354487071">"Buka dengan"</string>
<string name="keywords_applications_settings" msgid="1268353611121497450">"Aplikasi"</string>
<string name="keywords_time_zone" msgid="998254736898753085">"zona waktu"</string>
- <string name="keywords_draw_overlay" msgid="4130899177619041842">"Chat head"</string>
+ <string name="keywords_draw_overlay" msgid="1001120206241401007">"Chat head, sistem, notifikasi, jendela, dialog, tampilan, di atas aplikasi lain, tarik"</string>
<string name="keywords_flashlight" msgid="6161632177705233710">"Senter, Lampu, Flash"</string>
<string name="keywords_change_wifi_state" msgid="627068244033681010">"wifi, wi-fi, beralih, kontrol"</string>
<string name="keywords_more_mobile_networks" msgid="8995946622054642367">"seluler, mobile, operator sel, nirkabel, data, 4g, 3g, 2g, lte"</string>
@@ -3135,7 +3131,7 @@
<string name="keywords_sounds_and_notifications_interruptions" msgid="5426093074031208917">"jangan jangan ganggu, mengganggu, gangguan, putus"</string>
<string name="keywords_app" msgid="6334757056536837791">"RAM"</string>
<string name="keywords_location" msgid="4132655528196729043">"di sekitar, lokasi, histori, pelaporan, GPS"</string>
- <string name="keywords_accounts" msgid="1957925565953357627">"akun"</string>
+ <string name="keywords_accounts" msgid="4479029747403203867">"akun, tambahkan akun, profil kerja"</string>
<string name="keywords_users" msgid="3434190133131387942">"pembatasan, membatasi, dibatasi"</string>
<string name="keywords_keyboard_and_ime" msgid="9143339015329957107">"koreksi teks, benar suara, getar otomatis, bahasa, isyarat, sarankan, saran, tema, menyinggung, kata, jenis, emoji, internasional"</string>
<string name="keywords_reset_apps" msgid="5293291209613191845">"setel ulang, preferensi, default"</string>
@@ -3173,6 +3169,7 @@
<string name="keywords_storage_settings" msgid="297283751968446577">"memori, cache, data, hapus, kosongkan, kosong, ruang penyimpanan"</string>
<string name="keywords_bluetooth_settings" msgid="6804844062789439858">"terhubung, perangkat, headphone, headset, speaker, nirkabel, sambungkan, earbud, musik, media"</string>
<string name="keywords_wallpaper" msgid="5058364390917429896">"background, layar, layar kunci, tema"</string>
+ <string name="keywords_styles" msgid="5828725481814049422">"bentuk ikon, warna aksen, font"</string>
<string name="keywords_assist_input" msgid="5017533309492679287">"default, asisten"</string>
<string name="keywords_default_payment_app" msgid="3838565809518896799">"pembayaran, default"</string>
<string name="keywords_ambient_display" msgid="3103487805748659132">"notifikasi masuk"</string>
@@ -3182,7 +3179,7 @@
<string name="keywords_notification_vibration" msgid="31924624421190547">"sentuhan, getar, sensitivitas"</string>
<string name="keywords_battery_saver_sticky" msgid="5586215686021650278">"penghemat baterai, sticky, tetap, penghemat daya, baterai"</string>
<string name="keywords_battery_saver_schedule" msgid="7358789228486231944">"rutinitas, jadwal, penghemat baterai, penghemat daya, baterai, otomatis, persen"</string>
- <string name="keywords_add_an_account" msgid="6488139919428902434">"profil kerja"</string>
+ <string name="keywords_enhance_4g_lte" msgid="2273810564244790859">"volte, panggilan telepon lanjutan, panggilan telepon 4g"</string>
<string name="default_sound" msgid="8821684447333687810">"Suara default"</string>
<string name="sound_settings_summary" msgid="4100853606668287965">"Volume dering <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
<string name="sound_dashboard_summary" msgid="3402435125958012986">"Volume, getar, Jangan Ganggu"</string>
@@ -3889,7 +3886,6 @@
<string name="permit_draw_overlay" msgid="7456536798718633432">"Izinkan ditampilkan di atas aplikasi lain"</string>
<string name="allow_overlay_description" msgid="8961670023925421358">"Izinkan aplikasi ini ditampilkan di atas aplikasi lain yang sedang digunakan. Setelan ini dapat mengganggu penggunaan aplikasi tersebut atau mengubah tampilan atau perilakunya."</string>
<string name="keywords_vr_listener" msgid="7441221822576384680">"vr pemroses virtual reality stereo layanan bantuan"</string>
- <string name="keywords_system_alert_window" msgid="5049498015597864850">"dialog jendela notifikasi sistem ditampilkan di atas aplikasi lain"</string>
<string name="overlay_settings" msgid="6930854109449524280">"Tampilkan di atas apl lain"</string>
<string name="system_alert_window_summary" msgid="602892301318324492">"<xliff:g id="COUNT_0">%1$d</xliff:g> dari <xliff:g id="COUNT_1">%2$d</xliff:g> aplikasi diizinkan untuk ditampilkan di atas aplikasi lain"</string>
<string name="filter_overlay_apps" msgid="6965969283342557573">"Aplikasi yang memiliki izin"</string>
@@ -4125,7 +4121,6 @@
<string name="notification_log_details_none" msgid="184131801230614059">"tidak ada"</string>
<string name="notification_log_details_ranking_null" msgid="244660392058720919">"Objek peringkat tidak ada."</string>
<string name="notification_log_details_ranking_none" msgid="599607025882587844">"Objek peringkat tidak berisi kunci ini."</string>
- <string name="theme_customization_category" msgid="1049181544004163283">"Tema"</string>
<string name="theme_customization_device_default" msgid="5058147707906551368">"Default perangkat"</string>
<string name="display_cutout_emulation" msgid="7466869822418376317">"Potongan layar"</string>
<string name="display_cutout_emulation_keywords" msgid="4495418317471622562">"potongan tampilan, notch"</string>
@@ -4551,6 +4546,8 @@
<string name="network_connection_errorstate_dialog_message" msgid="6953778550775646710">"Ada masalah. Aplikasi telah membatalkan permintaan untuk memilih perangkat."</string>
<string name="network_connection_connect_successful" msgid="5935510954474494928">"Koneksi berhasil"</string>
<string name="network_connection_request_dialog_showall" msgid="6938922880244567521">"Tampilkan semua"</string>
+ <string name="network_connection_searching_message" msgid="4638576789450817530">"Menelusuri perangkat…"</string>
+ <string name="network_connection_connecting_message" msgid="3740982406609245654">"Menghubungkan ke perangkat…"</string>
<plurals name="show_bluetooth_devices" formatted="false" msgid="1715020480026568408">
<item quantity="other"><xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> perangkat terhubung</item>
<item quantity="one"><xliff:g id="NUMBER_DEVICE_COUNT_0">%1$d</xliff:g> perangkat terhubung</item>
diff --git a/res/values-is/strings.xml b/res/values-is/strings.xml
index 52e6945..aaa6547 100644
--- a/res/values-is/strings.xml
+++ b/res/values-is/strings.xml
@@ -360,8 +360,6 @@
<string name="security_enable_widgets_disabled_summary" msgid="6392489775303464905">"Gert óvirkt af kerfisstjóra"</string>
<string name="lockdown_settings_title" msgid="7393790212603280213">"Sýna valkost fyrir læsingu"</string>
<string name="lockdown_settings_summary" msgid="4359438673563318171">"Sýna valkost fyrir aflrofa sem slekkur á Smart Lock, opnun með lífkennum og tilkynningum á lásskjá"</string>
- <string name="trust_agents_extend_unlock_title" msgid="2796555263565097031">"Aðeins traustfulltrúar geta lengt opnun"</string>
- <string name="trust_agents_extend_unlock_summary" msgid="3976344969220255010">"Ef kveikt er á þessu munu traustfulltrúar halda tækinu opnu í lengri tíma, en þeir geta ekki lengur tekið læst tæki úr lás."</string>
<string name="trust_lost_locks_screen_title" msgid="2992742466966021682">"Læsir skjánum þegar traust vantar"</string>
<string name="trust_lost_locks_screen_summary" msgid="693784434582021206">"Ef kveikt er á þessu læsist tækið þegar síðasti traustfulltrúi missir traust"</string>
<string name="owner_info_settings_summary" msgid="7472393443779227052">"Ekkert"</string>
@@ -937,6 +935,7 @@
<string name="wifi_eap_identity" msgid="4359453783379679103">"Auðkenni"</string>
<string name="wifi_eap_anonymous" msgid="2989469344116577955">"Nafnlaust auðkenni"</string>
<string name="wifi_password" msgid="5948219759936151048">"Aðgangsorð"</string>
+ <string name="wifi_sae_password_id" msgid="1697832722221765763">"SAE-auðkenni aðgangsorðs"</string>
<string name="wifi_show_password" msgid="6461249871236968884">"Sýna aðgangsorð"</string>
<string name="wifi_ap_band_config" msgid="1611826705989117930">"Velja útvarpstíðni"</string>
<string name="wifi_ap_choose_auto" msgid="2677800651271769965">"Sjálfvirkt"</string>
@@ -957,7 +956,6 @@
<string name="wifi_dpp_share_wifi" msgid="9065890131734833809">"Deila Wi‑Fi"</string>
<string name="wifi_dpp_scan_qr_code_with_another_device" msgid="5854392840857123065">"Skannaðu þennan QR-kóða til að tengjast „<xliff:g id="SSID">%1$s</xliff:g>“ og deildu aðgangsorðinu"</string>
<string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="4436318319178361543">"Skannaðu þennan QR-kóða til að tengjast „<xliff:g id="SSID">%1$s</xliff:g>“"</string>
- <string name="wifi_dpp_could_not_detect_valid_qr_code" msgid="641893675646330576">"Ekki tókst að lesa QR-kóða. Sláðu kóðann inn aftur"</string>
<string name="wifi_dpp_failure_authentication_or_configuration" msgid="3372757783382381044">"Reyndu aftur. Ef vandamálið er viðvarandi skaltu hafa samband við framleiðandi tækisins"</string>
<string name="wifi_dpp_failure_not_compatible" msgid="2829930473520603740">"Eitthvað fór úrskeiðis"</string>
<string name="wifi_dpp_failure_timeout" msgid="5228320772245820458">"Gakktu úr skugga um að tækið sé í sambandi, það sé hlaðið og að kveikt sé á því"</string>
@@ -980,6 +978,7 @@
<string name="wifi_dpp_hotspot_password" msgid="4120419278831581613">"Aðgangsorð fyrir heitan reit: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
<string name="wifi_dpp_add_device" msgid="4072206063308645677">"Bæta tæki við"</string>
<string name="wifi_dpp_connect_network_using_qr_code" msgid="3887335309163999665">"Nota QR-kóða til að bæta tæki við þetta net"</string>
+ <string name="wifi_dpp_qr_code_is_not_valid_format" msgid="3700087439867692944">"QR-kóði er ekki gilt snið"</string>
<string name="retry" msgid="6472609612090877557">"Reyna aftur"</string>
<string name="wifi_shared" msgid="844142443226926070">"Deila með öðrum notendum tækisins"</string>
<string name="wifi_unchanged" msgid="3410422020930397102">"(óbreytt)"</string>
@@ -1129,6 +1128,7 @@
<string name="emergency_address_title" msgid="932729250447887545">"Neyðarheimilisfang"</string>
<string name="emergency_address_summary" msgid="7751971156196115129">"Notað sem staðsetningin þín þegar þú hringir neyðarsímtöl í gegnum Wi-Fi"</string>
<string name="private_dns_help_message" msgid="3299567069152568958"><annotation id="url">"Frekari upplýsingar"</annotation>" um eiginleika lokaðs DNS"</string>
+ <string name="private_dns_mode_on" msgid="5882613439541371003">"Kveikt"</string>
<string name="wifi_calling_pref_managed_by_carrier" msgid="6845711858866828986">"Stillt af símafyrirtæki"</string>
<string name="wifi_calling_settings_activation_instructions" msgid="7492509632478260955">"Kveikja á Wi-Fi-símtölum"</string>
<string name="wifi_calling_turn_on" msgid="1171403510313983983">"Kveikja á Wi-Fi símtölum"</string>
@@ -1872,7 +1872,7 @@
<string name="default_emergency_app" msgid="1951760659640369980">"Neyðarforrit"</string>
<string name="reset_app_preferences" msgid="1321050641018356925">"Endurstilla stillingar forrita"</string>
<string name="reset_app_preferences_title" msgid="6093179367325336662">"Endurstilla stillingar forrita?"</string>
- <string name="reset_app_preferences_desc" msgid="4822447731869201512">"Þetta endurstillir allar stillingar fyrir:\n\n"<li>"Óvirk forrit"</li>\n<li>"Óvirkar tilkynningar forrita"</li>\n<li>"Sjálfgefin forrit aðgerða"</li>\n<li>"Gagnatakmarkanir forrita í bakgrunni"</li>\n<li>"Takmarkanir á heimildum"</li>\n\n"Þú glatar engum fyrirliggjandi forritagögnum."</string>
+ <string name="reset_app_preferences_desc" msgid="731757609326016760">"Þetta endurstillir allar kjörstillingar fyrir:\n\n "<li>"Óvirk forrit"</li>\n" "<li>"Óvirkar tilkynningar forrita"</li>\n" "<li>"Sjálfgefin forrit aðgerða"</li>\n" "<li>"Takmarkanir á bakgrunnsgögnum forrita"</li>\n" "<li>"Allar takmarkanir á heimildum"</li>\n\n" Þú glatar engum forritagögnum."</string>
<string name="reset_app_preferences_button" msgid="2559089511841281242">"Endurstilla forrit"</string>
<string name="manage_space_text" msgid="8852711522447794676">"Stjórna plássi"</string>
<string name="filter" msgid="2018011724373033887">"Sía"</string>
@@ -2087,7 +2087,7 @@
<string name="accessibility_screen_magnification_short_summary" msgid="3411979839172752057">"Ýtt þrisvar til að auka aðdrátt"</string>
<string name="accessibility_screen_magnification_navbar_short_summary" msgid="3693116360267980492">"Ýttu á hnapp til að stækka"</string>
<string name="accessibility_screen_magnification_summary" msgid="5258868553337478505"><b>"Til að stækka"</b>" skaltu ýta snögglega þrisvar sinnum á skjáinn.\n"<ul><li>"Dragðu með tveimur eða fleiri fingrum til að fletta"</li>\n<li>"Færðu tvo eða fleiri fingur saman til að stilla aðdrátt"</li></ul>\n\n<b>"Til að stækka tímabundið"</b>" skaltu ýta snögglega þrisvar sinnum á skjáinn og halda fingrinum á skjánum í þriðja skiptið.\n"<ul><li>"Dragðu til að fara um skjáinn"</li>\n<li>"Lyftu fingri til að minnka aðdrátt"</li></ul>\n\n"Þú getur ekki stækkað á lyklaborði eða yfirlitsstiku."</string>
- <string name="accessibility_screen_magnification_navbar_summary" msgid="2272878354599332009">"Þegar kveikt er á stækkun geturðu aukið aðdráttinn á skjánum.\n\n"<b>"Til að stækka"</b>" skaltu hefja stækkun og ýta svo hvar sem er á skjáinn.\n"<ul><li>"• Færðu tvo eða fleiri fingur eftir skjánum til að fletta"</li>\n<li>"• Færðu saman tvo eða fleiri fingur til að breyta aðdrættinum"</li></ul>\n\n<b>"Til að stækka tímabundið"</b>" skaltu hefja stækkun og halda síðan fingri hvar sem er á skjánum.\n"<ul><li>"• Dragðu til að fara um skjáinn"</li>\n<li>"• Lyftu fingrinum til að minnka aðdrátt"</li></ul>\n\n"Þú getur ekki stækkað á lyklaborðinu eða yfirlitsstikunni."</string>
+ <string name="accessibility_screen_magnification_navbar_summary" msgid="6700716275347612310">"Þegar kveikt er á stækkun geturðu aukið aðdráttinn á skjánum.\n\n"<b>"Til að stækka"</b>" skaltu hefja stækkun og ýta svo hvar sem er á skjáinn.\n"<ul><li>"Dragðu með tveimur eða fleiri fingrum til að fletta"</li>\n<li>"Færðu tvo eða fleiri fingur saman til að stilla aðdrátt"</li></ul>\n\n<b>"Til að stækka tímabundið"</b>" skaltu hefja stækkun og halda síðan fingri hvar sem er á skjánum.\n"<ul><li>"Dragðu til að fara um skjáinn"</li>\n<li>"Lyftu fingrinum til að minnka aðdrátt"</li></ul>\n\n"Þú getur ekki stækkað á lyklaborðinu eða yfirlitsstikunni."</string>
<string name="accessibility_tutorial_dialog_title_button" msgid="3682222614034474845">"Notaðu aðgengishnappinn til að opna"</string>
<string name="accessibility_tutorial_dialog_title_gesture" msgid="1342726230497913398">"Nota bendingu til að opna"</string>
<string name="accessibility_tutorial_dialog_title_gesture_settings" msgid="8539392614235820285">"Notaðu nýja aðgengisbendingu"</string>
@@ -2140,8 +2140,7 @@
<string name="accessibility_hearingaid_title" msgid="8312145423610648518">"Heyrnartæki"</string>
<string name="accessibility_hearingaid_not_connected_summary" msgid="6240237523789614599">"Engin heyrnartæki eru tengd"</string>
<string name="accessibility_hearingaid_adding_summary" msgid="2947474468412309778">"Bæta við heyrnartækjum"</string>
- <string name="accessibility_hearingaid_pair_instructions_first_message" msgid="3912093691643131154">"Til að para heyrnartækin þín skaltu finna tækið og síðan ýta á það á næsta skjá."</string>
- <string name="accessibility_hearingaid_pair_instructions_second_message" msgid="5596683393607650243">"Gakktu úr skugga um að heyrnartækin þín séu stillt á pörunarstillingu."</string>
+ <string name="accessibility_hearingaid_pair_instructions_message" msgid="3094382949733435414">"Til að para heyrnartækin þín skaltu finna tækið og síðan ýta á það á næsta skjá. Gakktu úr skugga um að heyrnartækin þín séu stillt á pörunarstillingu."</string>
<string name="accessibility_hearingaid_active_device_summary" msgid="3924362383258688984">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> virkt"</string>
<plurals name="show_number_hearingaid_count" formatted="false" msgid="3160782397139295486">
<item quantity="one"><xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> vistað heyrnartæki</item>
@@ -2490,7 +2489,6 @@
<string name="menu_stats_last_unplugged" msgid="5922246077592434526">"Frá síðustu hleðslu í <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
<string name="menu_stats_total" msgid="8973377864854807854">"Heildarnotkun"</string>
<string name="menu_stats_refresh" msgid="1676215433344981075">"Endurnýja"</string>
- <string name="process_kernel_label" msgid="3916858646836739323">"Android stýrikerfið"</string>
<string name="process_mediaserver_label" msgid="6500382062945689285">"Efnisþjónn"</string>
<string name="process_dex2oat_label" msgid="2592408651060518226">"Fínstilling forrita"</string>
<string name="battery_saver" msgid="8172485772238572153">"Rafhlöðusparnaður"</string>
@@ -2621,8 +2619,6 @@
<string name="no_device_admins" msgid="4846602835339095768">"Engin forrit tækjastjóra tiltæk"</string>
<string name="personal_device_admin_title" msgid="2849617316347669861">"Persónulegt"</string>
<string name="managed_device_admin_title" msgid="7853955652864478435">"Vinna"</string>
- <string name="sms_access_restriction_enabled" msgid="7054488078710530278">"Takmarka aðgang að SMS- og símtalaskrá"</string>
- <string name="sms_access_restriction_enabled_summary" msgid="6851339654677842328">"Aðeins sjálfgefin síma- og skilaboðaforrit hafa heimildir sem gefa aðgang að SMS- og símtalaskrá"</string>
<string name="no_trust_agents" msgid="7450273545568977523">"Engir tiltækir traustfulltrúar"</string>
<string name="add_device_admin_msg" msgid="1501847129819382149">"Virkja forrit tækjastjóra?"</string>
<string name="add_device_admin" msgid="4192055385312215731">"Virkja þetta forrit tækjastjóra"</string>
@@ -3111,7 +3107,7 @@
<string name="keywords_app_default" msgid="5822717006354487071">"Opna með"</string>
<string name="keywords_applications_settings" msgid="1268353611121497450">"Forrit"</string>
<string name="keywords_time_zone" msgid="998254736898753085">"tímabelti"</string>
- <string name="keywords_draw_overlay" msgid="4130899177619041842">"Spjallblaðra"</string>
+ <string name="keywords_draw_overlay" msgid="1001120206241401007">"Spjallblaðra, kerfi, tilkynning, gluggi, svargluggi, skjár, yfir önnur forrit, teikna"</string>
<string name="keywords_flashlight" msgid="6161632177705233710">"Vasaljós, ljós"</string>
<string name="keywords_change_wifi_state" msgid="627068244033681010">"wifi, wi-fi, kveikja, slökkva, stjórna"</string>
<string name="keywords_more_mobile_networks" msgid="8995946622054642367">"farsími, farsímakerfi, þráðlaust, gögn, 4g, 3g, 2g, lte"</string>
@@ -3135,7 +3131,7 @@
<string name="keywords_sounds_and_notifications_interruptions" msgid="5426093074031208917">"ekki trufla, ónáðið ekki, truflun, hlé, pása"</string>
<string name="keywords_app" msgid="6334757056536837791">"Vinnsluminni"</string>
<string name="keywords_location" msgid="4132655528196729043">"í nágrenninu, staðsetning, ferill, tilkynningar,GPS"</string>
- <string name="keywords_accounts" msgid="1957925565953357627">"reikningur"</string>
+ <string name="keywords_accounts" msgid="4479029747403203867">"reikningur, bæta við reikningi, vinnusnið"</string>
<string name="keywords_users" msgid="3434190133131387942">"takmörkun, takmarka, takmarkað"</string>
<string name="keywords_keyboard_and_ime" msgid="9143339015329957107">"textaleiðrétting, leiðrétta, hljóð, titringur, sjálfvirkt, tungumál, bending, uppástunga, tillaga, þema, móðgandi, orð, skrifa, emoji, alþjóðlegt"</string>
<string name="keywords_reset_apps" msgid="5293291209613191845">"endurstilla, stillingar, sjálfgefið"</string>
@@ -3173,6 +3169,7 @@
<string name="keywords_storage_settings" msgid="297283751968446577">"minni, skyndiminni, gögn, eyða, hreinsa, laust, pláss"</string>
<string name="keywords_bluetooth_settings" msgid="6804844062789439858">"tengt, tæki, heyrnartól, höfuðtól, hátalari, þráðlaust, para, heyrnartól, tónlist, efni"</string>
<string name="keywords_wallpaper" msgid="5058364390917429896">"bakgrunnur, skjár, lásskjár, þema"</string>
+ <string name="keywords_styles" msgid="5828725481814049422">"lögun tákns, áherslulitur, leturgerð"</string>
<string name="keywords_assist_input" msgid="5017533309492679287">"sjálfgefið, hjálpari"</string>
<string name="keywords_default_payment_app" msgid="3838565809518896799">"greiðsla, sjálfgefin"</string>
<string name="keywords_ambient_display" msgid="3103487805748659132">"tilkynning berst"</string>
@@ -3182,7 +3179,7 @@
<string name="keywords_notification_vibration" msgid="31924624421190547">"snertisvörun, titringur, næmi"</string>
<string name="keywords_battery_saver_sticky" msgid="5586215686021650278">"rafhlöðusparnaður, fest, halda, sparnaðarstilling, rafhlaða"</string>
<string name="keywords_battery_saver_schedule" msgid="7358789228486231944">"venja, áætlun, rafhlöðusparnaður, orkusparnaður, rafhlaða, sjálfvirkt, prósent"</string>
- <string name="keywords_add_an_account" msgid="6488139919428902434">"vinnusnið"</string>
+ <string name="keywords_enhance_4g_lte" msgid="2273810564244790859">"volte, betri símtöl, 4g-símtöl"</string>
<string name="default_sound" msgid="8821684447333687810">"Sjálfgefið hljóð"</string>
<string name="sound_settings_summary" msgid="4100853606668287965">"Hljóðstyrkur er <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
<string name="sound_dashboard_summary" msgid="3402435125958012986">"Hljóðstyrkur, titringur, ónáðið ekki"</string>
@@ -3889,7 +3886,6 @@
<string name="permit_draw_overlay" msgid="7456536798718633432">"Leyfa að opnað sé ofan á öðrum forritum"</string>
<string name="allow_overlay_description" msgid="8961670023925421358">"Leyfa þessu forriti að opnast ofan á öðrum opnum forritum. Forritið kann að trufla notkun hinna forritanna eða breyta útliti þeirra eða virkni."</string>
<string name="keywords_vr_listener" msgid="7441221822576384680">"sýndarveruleiki vöktun víðóma hjálp þjónusta"</string>
- <string name="keywords_system_alert_window" msgid="5049498015597864850">"viðvörunargluggi kerfis gluggi birta ofan á öðrum forritum"</string>
<string name="overlay_settings" msgid="6930854109449524280">"Opna ofan á öðrum forritum"</string>
<string name="system_alert_window_summary" msgid="602892301318324492">"<xliff:g id="COUNT_0">%1$d</xliff:g> af <xliff:g id="COUNT_1">%2$d</xliff:g> forritum mega opnast ofan á öðrum forritum"</string>
<string name="filter_overlay_apps" msgid="6965969283342557573">"Forrit með heimild"</string>
@@ -4125,7 +4121,6 @@
<string name="notification_log_details_none" msgid="184131801230614059">"ekkert"</string>
<string name="notification_log_details_ranking_null" msgid="244660392058720919">"Uppröðunarhlut vantar."</string>
<string name="notification_log_details_ranking_none" msgid="599607025882587844">"Uppröðunarhlutur inniheldur ekki þennan lykil."</string>
- <string name="theme_customization_category" msgid="1049181544004163283">"Þemu"</string>
<string name="theme_customization_device_default" msgid="5058147707906551368">"Sjálfgefin stilling tækis"</string>
<string name="display_cutout_emulation" msgid="7466869822418376317">"Skjáskurður"</string>
<string name="display_cutout_emulation_keywords" msgid="4495418317471622562">"úrklippa af skjá, hak"</string>
@@ -4551,6 +4546,8 @@
<string name="network_connection_errorstate_dialog_message" msgid="6953778550775646710">"Eitthvað kom upp. Forritið hætti við beiðnina til að velja tæki."</string>
<string name="network_connection_connect_successful" msgid="5935510954474494928">"Tenging tókst"</string>
<string name="network_connection_request_dialog_showall" msgid="6938922880244567521">"Sýna allar"</string>
+ <string name="network_connection_searching_message" msgid="4638576789450817530">"Leitar að tæki…"</string>
+ <string name="network_connection_connecting_message" msgid="3740982406609245654">"Tengist við tæki…"</string>
<plurals name="show_bluetooth_devices" formatted="false" msgid="1715020480026568408">
<item quantity="one"><xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> tæki tengt</item>
<item quantity="other"><xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> tæki tengd</item>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index e923325..94548d8 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -360,8 +360,6 @@
<string name="security_enable_widgets_disabled_summary" msgid="6392489775303464905">"Disattivati dall\'amministratore"</string>
<string name="lockdown_settings_title" msgid="7393790212603280213">"Mostra opzione di blocco"</string>
<string name="lockdown_settings_summary" msgid="4359438673563318171">"Visualizza l\'opzione del tasto di accensione che disattiva Smart Lock, lo sblocco tramite dati biometrici e le notifiche nella schermata di blocco"</string>
- <string name="trust_agents_extend_unlock_title" msgid="2796555263565097031">"Sblocco solo per agenti di attendibilità"</string>
- <string name="trust_agents_extend_unlock_summary" msgid="3976344969220255010">"Se l\'opzione è attiva, gli agenti di attendibilità manterranno sbloccato il tuo dispositivo per più tempo, ma non potranno più sbloccare un dispositivo bloccato."</string>
<string name="trust_lost_locks_screen_title" msgid="2992742466966021682">"Blocco dello schermo quando viene persa l\'attendibilità"</string>
<string name="trust_lost_locks_screen_summary" msgid="693784434582021206">"Se l\'opzione è attiva, il dispositivo si blocca quando l\'ultimo agente di attendibilità perde l\'attendibilità."</string>
<string name="owner_info_settings_summary" msgid="7472393443779227052">"Nessuno"</string>
@@ -937,6 +935,7 @@
<string name="wifi_eap_identity" msgid="4359453783379679103">"Identità"</string>
<string name="wifi_eap_anonymous" msgid="2989469344116577955">"Identità anonima"</string>
<string name="wifi_password" msgid="5948219759936151048">"Password"</string>
+ <string name="wifi_sae_password_id" msgid="1697832722221765763">"Identificatore password SAE"</string>
<string name="wifi_show_password" msgid="6461249871236968884">"Mostra password"</string>
<string name="wifi_ap_band_config" msgid="1611826705989117930">"Seleziona banda AP"</string>
<string name="wifi_ap_choose_auto" msgid="2677800651271769965">"Automatica"</string>
@@ -957,7 +956,6 @@
<string name="wifi_dpp_share_wifi" msgid="9065890131734833809">"Condividi Wi‑Fi"</string>
<string name="wifi_dpp_scan_qr_code_with_another_device" msgid="5854392840857123065">"Esegui la scansione di questo codice QR per collegarti alla rete \"<xliff:g id="SSID">%1$s</xliff:g>\" e condividere la password"</string>
<string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="4436318319178361543">"Esegui la scansione di questo codice QR per collegarti alla rete \"<xliff:g id="SSID">%1$s</xliff:g>\""</string>
- <string name="wifi_dpp_could_not_detect_valid_qr_code" msgid="641893675646330576">"Impossibile leggere il codice QR. Centra di nuovo il codice e riprova"</string>
<string name="wifi_dpp_failure_authentication_or_configuration" msgid="3372757783382381044">"Riprova. Se il problema persiste, contatta il produttore del dispositivo"</string>
<string name="wifi_dpp_failure_not_compatible" msgid="2829930473520603740">"Si è verificato un problema"</string>
<string name="wifi_dpp_failure_timeout" msgid="5228320772245820458">"Assicurati che il dispositivo sia collegato alla corrente, carico e acceso"</string>
@@ -980,6 +978,7 @@
<string name="wifi_dpp_hotspot_password" msgid="4120419278831581613">"Password hotspot: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
<string name="wifi_dpp_add_device" msgid="4072206063308645677">"Aggiungi dispositivo"</string>
<string name="wifi_dpp_connect_network_using_qr_code" msgid="3887335309163999665">"Usa un codice QR per aggiungere un dispositivo a questa rete"</string>
+ <string name="wifi_dpp_qr_code_is_not_valid_format" msgid="3700087439867692944">"Il formato del codice QR non è valido"</string>
<string name="retry" msgid="6472609612090877557">"Riprova"</string>
<string name="wifi_shared" msgid="844142443226926070">"Condividi con altri utenti del dispositivo"</string>
<string name="wifi_unchanged" msgid="3410422020930397102">"(invariata)"</string>
@@ -1129,6 +1128,7 @@
<string name="emergency_address_title" msgid="932729250447887545">"Indirizzo per le emergenze"</string>
<string name="emergency_address_summary" msgid="7751971156196115129">"Viene considerato la tua posizione quando fai una chiamata di emergenza tramite Wi‑Fi"</string>
<string name="private_dns_help_message" msgid="3299567069152568958"><annotation id="url">"Ulteriori informazioni"</annotation>" sulle funzioni di DNS privato"</string>
+ <string name="private_dns_mode_on" msgid="5882613439541371003">"On"</string>
<string name="wifi_calling_pref_managed_by_carrier" msgid="6845711858866828986">"Impostazione gestita dall\'operatore"</string>
<string name="wifi_calling_settings_activation_instructions" msgid="7492509632478260955">"Attiva le chiamate Wi-Fi"</string>
<string name="wifi_calling_turn_on" msgid="1171403510313983983">"Attiva la funzione Chiamate Wi-Fi"</string>
@@ -1872,7 +1872,7 @@
<string name="default_emergency_app" msgid="1951760659640369980">"App di emergenza"</string>
<string name="reset_app_preferences" msgid="1321050641018356925">"Reimposta preferenze app"</string>
<string name="reset_app_preferences_title" msgid="6093179367325336662">"Reimpostare preferenze app?"</string>
- <string name="reset_app_preferences_desc" msgid="4822447731869201512">"Verranno reimpostate tutte le preferenze relative a:\n\n"<li>"App disattivate"</li>\n<li>"Notifiche di app disattivate"</li>\n<li>"Applicazioni predefinite per azioni"</li>\n<li>"Limitazioni di dati in background per app"</li>\n<li>"Eventuali limitazioni di autorizzazioni"</li>\n\n"Non perderai i dati delle app."</string>
+ <string name="reset_app_preferences_desc" msgid="731757609326016760">"Verranno reimpostate tutte le preferenze relative a:\n\n"<li>"App disattivate"</li>\n<li>"Notifiche di app disattivate"</li>\n<li>"Applicazioni predefinite per azioni"</li>\n<li>"Limitazioni di dati in background per app"</li>\n<li>"Eventuali limitazioni di autorizzazione"</li>\n\n"Non perderai i dati delle app."</string>
<string name="reset_app_preferences_button" msgid="2559089511841281242">"Reimposta app"</string>
<string name="manage_space_text" msgid="8852711522447794676">"Gestisci spazio"</string>
<string name="filter" msgid="2018011724373033887">"Filtra"</string>
@@ -2087,7 +2087,7 @@
<string name="accessibility_screen_magnification_short_summary" msgid="3411979839172752057">"Tocca tre volte per eseguire lo zoom"</string>
<string name="accessibility_screen_magnification_navbar_short_summary" msgid="3693116360267980492">"Tocca un pulsante per eseguire lo zoom"</string>
<string name="accessibility_screen_magnification_summary" msgid="5258868553337478505"><b>"Per ingrandire"</b>", tocca velocemente lo schermo per tre volte.\n"<ul><li>"Trascina almeno due dita per scorrere."</li>\n<li>"Pizzica con almeno due dita per regolare lo zoom."</li></ul>\n\n<b>"Per ingrandire temporaneamente"</b>", tocca velocemente per tre volte e tieni il dito premuto all\'ultimo tocco.\n"<ul><li>"Trascina il dito per spostarti sullo schermo."</li>\n<li>"Solleva il dito per ridurre lo zoom."</li></ul>\n\n"Non puoi aumentare lo zoom sulla tastiera e nella barra di navigazione."</string>
- <string name="accessibility_screen_magnification_navbar_summary" msgid="2272878354599332009">"Quando è attivo l\'ingrandimento, puoi aumentare lo zoom sullo schermo.\n\n"<b>"Per eseguire lo zoom"</b>", avvia l\'ingrandimento, quindi tocca un punto qualsiasi sullo schermo.\n"<ul><li>"• Trascina con due o più dita per scorrere."</li>\n<li>"• Pizzica con due o più dita per regolare lo zoom."</li></ul>\n\n<b>"Per eseguire temporaneamente lo zoom"</b>", avvia l\'ingrandimento, quindi tocca e tieni premuto un punto qualsiasi sullo schermo.\n"<ul><li>"• Trascina per spostarti sullo schermo."</li>\n<li>"• Solleva il dito per diminuire lo zoom."</li></ul>\n\n"Non puoi aumentare lo zoom sulla tastiera o nella barra di navigazione."</string>
+ <string name="accessibility_screen_magnification_navbar_summary" msgid="6700716275347612310">"Quando è attivo l\'ingrandimento, puoi aumentare lo zoom sullo schermo.\n\n"<b>"Per eseguire lo zoom"</b>", avvia l\'ingrandimento, quindi tocca un punto qualsiasi sullo schermo.\n"<ul><li>"Trascina almeno due dita per scorrere"</li>\n<li>"Pizzica con almeno due dita per regolare lo zoom."</li></ul>\n\n<b>"Per ingrandire temporaneamente"</b>", avvia l\'ingrandimento, quindi tocca e tieni premuto un punto qualsiasi sullo schermo.\n"<ul><li>"Trascina per spostarti sullo schermo"</li>\n<li>"Solleva il dito per ridurre lo zoom"</li></ul>\n\n"Non puoi aumentare lo zoom sulla tastiera o nella barra di navigazione."</string>
<string name="accessibility_tutorial_dialog_title_button" msgid="3682222614034474845">"Usa il pulsante Accessibilità per aprire"</string>
<string name="accessibility_tutorial_dialog_title_gesture" msgid="1342726230497913398">"Usa un gesto per aprire"</string>
<string name="accessibility_tutorial_dialog_title_gesture_settings" msgid="8539392614235820285">"Usa il nuovo gesto di accessibilità"</string>
@@ -2140,8 +2140,7 @@
<string name="accessibility_hearingaid_title" msgid="8312145423610648518">"Apparecchi acustici"</string>
<string name="accessibility_hearingaid_not_connected_summary" msgid="6240237523789614599">"Nessun apparecchio acustico connesso"</string>
<string name="accessibility_hearingaid_adding_summary" msgid="2947474468412309778">"Aggiungi apparecchi acustici"</string>
- <string name="accessibility_hearingaid_pair_instructions_first_message" msgid="3912093691643131154">"Accoppia gli apparecchi acustici toccandoli nella prossima schermata."</string>
- <string name="accessibility_hearingaid_pair_instructions_second_message" msgid="5596683393607650243">"Assicurati che gli apparecchi acustici siano in modalità di accoppiamento."</string>
+ <string name="accessibility_hearingaid_pair_instructions_message" msgid="3094382949733435414">"Per accoppiare i tuoi apparecchi acustici, cerca e tocca il dispositivo nella prossima schermata. Assicurati che gli apparecchi acustici siano in modalità di accoppiamento."</string>
<string name="accessibility_hearingaid_active_device_summary" msgid="3924362383258688984">"Dispositivo <xliff:g id="DEVICE_NAME">%1$s</xliff:g> attivo"</string>
<plurals name="show_number_hearingaid_count" formatted="false" msgid="3160782397139295486">
<item quantity="other"><xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> apparecchi acustici salvati</item>
@@ -2490,7 +2489,6 @@
<string name="menu_stats_last_unplugged" msgid="5922246077592434526">"Durante ultimo scollegamento per <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
<string name="menu_stats_total" msgid="8973377864854807854">"Totali utilizzo"</string>
<string name="menu_stats_refresh" msgid="1676215433344981075">"Aggiorna"</string>
- <string name="process_kernel_label" msgid="3916858646836739323">"Sistema operativo Android"</string>
<string name="process_mediaserver_label" msgid="6500382062945689285">"MediaServer"</string>
<string name="process_dex2oat_label" msgid="2592408651060518226">"Ottimizzazione delle app"</string>
<string name="battery_saver" msgid="8172485772238572153">"Risparmio energetico"</string>
@@ -2621,8 +2619,6 @@
<string name="no_device_admins" msgid="4846602835339095768">"Nessuna app di amministrazione del dispositivo disponibile"</string>
<string name="personal_device_admin_title" msgid="2849617316347669861">"Personale"</string>
<string name="managed_device_admin_title" msgid="7853955652864478435">"Lavoro"</string>
- <string name="sms_access_restriction_enabled" msgid="7054488078710530278">"Limita l\'accesso a SMS e registro chiamate"</string>
- <string name="sms_access_restriction_enabled_summary" msgid="6851339654677842328">"Solo le app telefoniche e di messaggistica predefinite hanno le autorizzazioni di accesso a SMS e registro chiamate"</string>
<string name="no_trust_agents" msgid="7450273545568977523">"Non sono disponibili agenti di attendibilità"</string>
<string name="add_device_admin_msg" msgid="1501847129819382149">"Attivare l\'app di amministrazione?"</string>
<string name="add_device_admin" msgid="4192055385312215731">"Attiva questa app di amministrazione del dispositivo"</string>
@@ -3111,7 +3107,7 @@
<string name="keywords_app_default" msgid="5822717006354487071">"Apri con"</string>
<string name="keywords_applications_settings" msgid="1268353611121497450">"Applicazioni"</string>
<string name="keywords_time_zone" msgid="998254736898753085">"fuso orario"</string>
- <string name="keywords_draw_overlay" msgid="4130899177619041842">"Chat Head"</string>
+ <string name="keywords_draw_overlay" msgid="1001120206241401007">"Immagine chat, sistema, avviso, finestra, finestra di dialogo, mostra, davanti ad altre app, disegna"</string>
<string name="keywords_flashlight" msgid="6161632177705233710">"Torcia, Luce, Pila"</string>
<string name="keywords_change_wifi_state" msgid="627068244033681010">"wifi, wi-fi, attivazione/disattivazione, controllo"</string>
<string name="keywords_more_mobile_networks" msgid="8995946622054642367">"cellulare, dispositivo mobile, operatore cellulare, wireless, dati, 4g, 3g, 2g, lte"</string>
@@ -3135,7 +3131,7 @@
<string name="keywords_sounds_and_notifications_interruptions" msgid="5426093074031208917">"non disturbare, interrompere, interruzione, pausa"</string>
<string name="keywords_app" msgid="6334757056536837791">"RAM"</string>
<string name="keywords_location" msgid="4132655528196729043">"nelle vicinanze, posizione, cronologia, segnalazione, GPS"</string>
- <string name="keywords_accounts" msgid="1957925565953357627">"account"</string>
+ <string name="keywords_accounts" msgid="4479029747403203867">"account, aggiungere un account, profilo di lavoro"</string>
<string name="keywords_users" msgid="3434190133131387942">"limitazione, limitare, limitato"</string>
<string name="keywords_keyboard_and_ime" msgid="9143339015329957107">"correzione del testo, correggere, suono, vibrazione, auto, lingua, gesto, suggerire, suggerimento, tema, offensivo, parola, digitazione, emoji, internazionale"</string>
<string name="keywords_reset_apps" msgid="5293291209613191845">"reimpostazione, preferenze, predefinite"</string>
@@ -3173,6 +3169,7 @@
<string name="keywords_storage_settings" msgid="297283751968446577">"memoria, cache dati, eliminare, cancellare, liberare, spazio"</string>
<string name="keywords_bluetooth_settings" msgid="6804844062789439858">"connesso, dispositivo, cuffie, auricolari, altoparlante, wireless, accoppiare, musica, contenuti multimediali"</string>
<string name="keywords_wallpaper" msgid="5058364390917429896">"sfondo, schermo, schermata di blocco, tema"</string>
+ <string name="keywords_styles" msgid="5828725481814049422">"forma delle icone, colore intenso, carattere"</string>
<string name="keywords_assist_input" msgid="5017533309492679287">"valore predefinito, assistente"</string>
<string name="keywords_default_payment_app" msgid="3838565809518896799">"pagamenti, predefinita"</string>
<string name="keywords_ambient_display" msgid="3103487805748659132">"notifica in arrivo"</string>
@@ -3182,7 +3179,7 @@
<string name="keywords_notification_vibration" msgid="31924624421190547">"aptica, vibrazione, sensibilità"</string>
<string name="keywords_battery_saver_sticky" msgid="5586215686021650278">"risparmio energetico, fisso, costante, risparmiare batteria, batteria"</string>
<string name="keywords_battery_saver_schedule" msgid="7358789228486231944">"routine, programmazione, risparmio energetico, risparmiare batteria, batteria, automatico, percento"</string>
- <string name="keywords_add_an_account" msgid="6488139919428902434">"profilo di lavoro"</string>
+ <string name="keywords_enhance_4g_lte" msgid="2273810564244790859">"volte, chiamate avanzate, chiamate 4g"</string>
<string name="default_sound" msgid="8821684447333687810">"Suono predefinito"</string>
<string name="sound_settings_summary" msgid="4100853606668287965">"Volume suoneria: <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
<string name="sound_dashboard_summary" msgid="3402435125958012986">"Volume, vibrazione, Non disturbare"</string>
@@ -3889,7 +3886,6 @@
<string name="permit_draw_overlay" msgid="7456536798718633432">"Consenti la visualizzazione sopra altre app"</string>
<string name="allow_overlay_description" msgid="8961670023925421358">"Consenti a quest\'app di essere mostrata sopra le altre app in uso. Potrebbe interferire con il tuo utilizzo di queste app o modificare il modo in cui vengono mostrate o si comportano."</string>
<string name="keywords_vr_listener" msgid="7441221822576384680">"vr realtà virtuale listener stereo helper servizio"</string>
- <string name="keywords_system_alert_window" msgid="5049498015597864850">"finestra di dialogo avviso sistema mostra sopra altre app"</string>
<string name="overlay_settings" msgid="6930854109449524280">"Mostra sopra altre app"</string>
<string name="system_alert_window_summary" msgid="602892301318324492">"<xliff:g id="COUNT_0">%1$d</xliff:g> di <xliff:g id="COUNT_1">%2$d</xliff:g> app visualizzabili sopra le altre app"</string>
<string name="filter_overlay_apps" msgid="6965969283342557573">"App con autorizzazione"</string>
@@ -4125,7 +4121,6 @@
<string name="notification_log_details_none" msgid="184131801230614059">"nessuno"</string>
<string name="notification_log_details_ranking_null" msgid="244660392058720919">"Oggetto di ranking mancante."</string>
<string name="notification_log_details_ranking_none" msgid="599607025882587844">"L\'oggetto di ranking non contiene questa chiave."</string>
- <string name="theme_customization_category" msgid="1049181544004163283">"Applicazione tema"</string>
<string name="theme_customization_device_default" msgid="5058147707906551368">"Predefinita dispositivo"</string>
<string name="display_cutout_emulation" msgid="7466869822418376317">"Ritaglio display"</string>
<string name="display_cutout_emulation_keywords" msgid="4495418317471622562">"ritaglio display, tacca"</string>
@@ -4551,6 +4546,8 @@
<string name="network_connection_errorstate_dialog_message" msgid="6953778550775646710">"Si è verificato un problema. L\'applicazione ha annullato la richiesta di scegliere un dispositivo."</string>
<string name="network_connection_connect_successful" msgid="5935510954474494928">"Connessione riuscita"</string>
<string name="network_connection_request_dialog_showall" msgid="6938922880244567521">"Mostra tutte"</string>
+ <string name="network_connection_searching_message" msgid="4638576789450817530">"Ricerca del dispositivo…"</string>
+ <string name="network_connection_connecting_message" msgid="3740982406609245654">"Connessione al dispositivo…"</string>
<plurals name="show_bluetooth_devices" formatted="false" msgid="1715020480026568408">
<item quantity="other"><xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> dispositivi connessi</item>
<item quantity="one"><xliff:g id="NUMBER_DEVICE_COUNT_0">%1$d</xliff:g> dispositivo connesso</item>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index df54983..1b8b558 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -364,8 +364,6 @@
<string name="security_enable_widgets_disabled_summary" msgid="6392489775303464905">"הושבת על ידי מנהל המכשיר"</string>
<string name="lockdown_settings_title" msgid="7393790212603280213">"הצגת אפשרות סגירה"</string>
<string name="lockdown_settings_summary" msgid="4359438673563318171">"הצגת אפשרות של לחצן ההפעלה שמשבית את Smart Lock, את ביטול הנעילה באמצעות מידע ביומטרי ואת ההתראות המוצגות במסך הנעילה."</string>
- <string name="trust_agents_extend_unlock_title" msgid="2796555263565097031">"סביבות אמינות רק דוחות את הנעילה"</string>
- <string name="trust_agents_extend_unlock_summary" msgid="3976344969220255010">"אם האפשרות מופעלת, סביבות אמינות ימנעו למשך זמן ארוך יותר את נעילת המכשיר, אבל כבר אי אפשר להשתמש בהן לביטול הנעילה של המכשיר."</string>
<string name="trust_lost_locks_screen_title" msgid="2992742466966021682">"נעילת המסך כשאובדת האמינות"</string>
<string name="trust_lost_locks_screen_summary" msgid="693784434582021206">"אם תופעל, המכשיר יינעל כשאובדת האמינות של הסביבה האמינה האחרונה"</string>
<string name="owner_info_settings_summary" msgid="7472393443779227052">"ללא"</string>
@@ -969,6 +967,7 @@
<string name="wifi_eap_identity" msgid="4359453783379679103">"זהות"</string>
<string name="wifi_eap_anonymous" msgid="2989469344116577955">"זהות אנונימית"</string>
<string name="wifi_password" msgid="5948219759936151048">"סיסמה"</string>
+ <string name="wifi_sae_password_id" msgid="1697832722221765763">"מזהה סיסמה מסוג SAE"</string>
<string name="wifi_show_password" msgid="6461249871236968884">"הצגת סיסמה"</string>
<string name="wifi_ap_band_config" msgid="1611826705989117930">"בחר תדר AP"</string>
<string name="wifi_ap_choose_auto" msgid="2677800651271769965">"אוטומטי"</string>
@@ -989,7 +988,6 @@
<string name="wifi_dpp_share_wifi" msgid="9065890131734833809">"שיתוף Wi‑Fi"</string>
<string name="wifi_dpp_scan_qr_code_with_another_device" msgid="5854392840857123065">"כדי להתחבר אל “<xliff:g id="SSID">%1$s</xliff:g>” ולשתף את הסיסמה צריך לסרוק את קוד ה-QR הזה"</string>
<string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="4436318319178361543">"כדי להתחבר אל \"<xliff:g id="SSID">%1$s</xliff:g>\" צריך לסרוק את קוד ה-QR הזה"</string>
- <string name="wifi_dpp_could_not_detect_valid_qr_code" msgid="641893675646330576">"לא ניתן היה לקרוא את קוד ה-QR. יש להציב שוב את הקוד במרכז ולנסות שוב"</string>
<string name="wifi_dpp_failure_authentication_or_configuration" msgid="3372757783382381044">"יש לנסות שוב. אם הבעיה ממשיכה להופיע, יש לפנות ליצרן המכשיר"</string>
<string name="wifi_dpp_failure_not_compatible" msgid="2829930473520603740">"משהו השתבש"</string>
<string name="wifi_dpp_failure_timeout" msgid="5228320772245820458">"יש לוודא שהמכשיר חובר, הוטען והופעל"</string>
@@ -1012,6 +1010,7 @@
<string name="wifi_dpp_hotspot_password" msgid="4120419278831581613">"סיסמה של נקודה לשיתוף אינטרנט: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
<string name="wifi_dpp_add_device" msgid="4072206063308645677">"הוספת מכשיר"</string>
<string name="wifi_dpp_connect_network_using_qr_code" msgid="3887335309163999665">"אפשר להשתמש בקוד QR כדי להוסיף מכשיר לרשת זו"</string>
+ <string name="wifi_dpp_qr_code_is_not_valid_format" msgid="3700087439867692944">"קוד QR אינו בפורמט חוקי"</string>
<string name="retry" msgid="6472609612090877557">"ניסיון נוסף"</string>
<string name="wifi_shared" msgid="844142443226926070">"שתף עם משתמשים אחרים במכשיר"</string>
<string name="wifi_unchanged" msgid="3410422020930397102">"(ללא שינוי)"</string>
@@ -1167,6 +1166,7 @@
<string name="emergency_address_title" msgid="932729250447887545">"כתובת למקרה חירום"</string>
<string name="emergency_address_summary" msgid="7751971156196115129">"משמש כמיקומך בעת ביצוע שיחת חירום באמצעות רשת Wi-Fi"</string>
<string name="private_dns_help_message" msgid="3299567069152568958">""<annotation id="url">"מידע נוסף"</annotation>" על תכונות של DNS פרטי"</string>
+ <string name="private_dns_mode_on" msgid="5882613439541371003">"מופעל"</string>
<string name="wifi_calling_pref_managed_by_carrier" msgid="6845711858866828986">"ההגדרה מנוהלת על ידי הספק הסלולרי"</string>
<string name="wifi_calling_settings_activation_instructions" msgid="7492509632478260955">"הפעלה של שיחות Wi-Fi"</string>
<string name="wifi_calling_turn_on" msgid="1171403510313983983">"הפעלה של שיחות Wi-Fi"</string>
@@ -1916,7 +1916,7 @@
<string name="default_emergency_app" msgid="1951760659640369980">"אפליקציה לשעת חירום"</string>
<string name="reset_app_preferences" msgid="1321050641018356925">"איפוס העדפות אפליקציה"</string>
<string name="reset_app_preferences_title" msgid="6093179367325336662">"האם לאפס העדפות אפליקציה?"</string>
- <string name="reset_app_preferences_desc" msgid="4822447731869201512">"הפעולה תאפס את כל ההעדפות עבור:\n\n"<li>"אפליקציות מושבתות"</li>\n<li>"התראות של אפליקציות מושבתות"</li>\n<li>"אפליקציות שהן ברירת המחדל לביצוע פעולות"</li>\n<li>"הגבלות של נתוני רקע לאפליקציות"</li>\n<li>"הגבלת הרשאות"</li>\n\n"נתוני האפליקציות לא יילכו לאיבוד."</string>
+ <string name="reset_app_preferences_desc" msgid="731757609326016760">"הפעולה תאפס את כל ההעדפות עבור:\n\n"<li>"אפליקציות מושבתות"</li>\n<li>"השבתת התראות של אפליקציות"</li>\n<li>"אפליקציות שהן ברירת המחדל לביצוע פעולות"</li>\n<li>"הגבלות של נתוני רקע לאפליקציות"</li>\n<li>"הגבלת הרשאות"</li>\n\n"נתוני האפליקציות לא יאבדו."</string>
<string name="reset_app_preferences_button" msgid="2559089511841281242">"איפוס אפליקציות"</string>
<string name="manage_space_text" msgid="8852711522447794676">"ניהול שטח אחסון"</string>
<string name="filter" msgid="2018011724373033887">"סינון"</string>
@@ -2131,7 +2131,7 @@
<string name="accessibility_screen_magnification_short_summary" msgid="3411979839172752057">"הקש שלוש פעמים כדי לשנות את המרחק מהתצוגה"</string>
<string name="accessibility_screen_magnification_navbar_short_summary" msgid="3693116360267980492">"הקש על לחצן כדי לשנות את מרחק התצוגה"</string>
<string name="accessibility_screen_magnification_summary" msgid="5258868553337478505"><b>"כדי לשנות את מרחק התצוגה"</b>", הקש על המסך במהירות שלוש פעמים.\n"<ul><li>"גרור שתי אצבעות או יותר כדי לגלול"</li>\n<li>"עשה תנועת צביטה בעזרת שתי אצבעות או יותר כדי להתאים את מרחק התצוגה"</li></ul>\n\n<b>"כדי לשנות את מרחק התצוגה באופן זמני"</b>", הקש במהירות על המסך שלוש פעמים, ובפעם השלישית החזק את האצבע על המסך.\n"<ul><li>"גרור כדי לנוע על פני המסך"</li>\n<li>"הרם את האצבע כדי להתרחק"</li></ul>\n\n"לא ניתן להתקרב בעזרת המקלדת או סרגל הניווט."</string>
- <string name="accessibility_screen_magnification_navbar_summary" msgid="2272878354599332009">"כשההגדלה מופעלת, ניתן להתקרב למסך.\n\n"<b>"כדי להתקרב,"</b>", יש להתחיל בהגדלה ולאחר מכן להקיש במקום כלשהו במסך.\n"<ul><li>"• גוררים שתי אצבעות או יותר כדי לגלול"</li>\n<li>"• עושים תנועת צביטה עם שתי אצבעות או יותר כדי לשנות את מרחק התצוגה"</li></ul>\n\n<b>"כדי להתקרב באופן זמני"</b>", מתחילים בהגדלה ולאחר מכן לוחצים לחיצה ארוכה על מקום כלשהו במסך.\n"<ul><li>"• גוררים כדי לנוע במסך"</li>\n<li>"• מרימים את האצבע כדי להתרחק"</li></ul>\n\n"לא ניתן להתקרב בעזרת המקלדת או סרגל הניווט."</string>
+ <string name="accessibility_screen_magnification_navbar_summary" msgid="6700716275347612310">"כשההגדלה מופעלת, ניתן להתקרב למסך.\n\n"<b>"כדי להתקרב,"</b>", מתחילים בהגדלה ולאחר מכן מקישים במקום כלשהו במסך.\n"<ul><li>"גוררים שתי אצבעות או יותר כדי לגלול"</li>\n<li>"עושים תנועת צביטה עם שתי אצבעות או יותר כדי לשנות את מרחק התצוגה"</li></ul>\n\n<b>"כדי להתקרב באופן זמני"</b>", מתחילים בהגדלה ולאחר מכן, לוחצים לחיצה ארוכה במקום כלשהו במסך.\n"<ul><li>"גוררים כדי לנוע במסך"</li>\n<li>"מרימים את האצבע כדי להתרחק"</li></ul>\n\n"לא ניתן להתקרב באמצעות המקלדת או סרגל הניווט."</string>
<string name="accessibility_tutorial_dialog_title_button" msgid="3682222614034474845">"שימוש בלחצן נגישות לצורך פתיחה"</string>
<string name="accessibility_tutorial_dialog_title_gesture" msgid="1342726230497913398">"שימוש בתנועה לצורך פתיחה"</string>
<string name="accessibility_tutorial_dialog_title_gesture_settings" msgid="8539392614235820285">"שימוש בתנועת נגישות חדשה"</string>
@@ -2184,8 +2184,7 @@
<string name="accessibility_hearingaid_title" msgid="8312145423610648518">"מכשירי שמיעה"</string>
<string name="accessibility_hearingaid_not_connected_summary" msgid="6240237523789614599">"אין מכשירי שמיעה מחוברים"</string>
<string name="accessibility_hearingaid_adding_summary" msgid="2947474468412309778">"הוספת מכשירי שמיעה"</string>
- <string name="accessibility_hearingaid_pair_instructions_first_message" msgid="3912093691643131154">"כדי להתאים את מכשירי השמיעה שלך, יש לחפש את המכשיר ולהקיש עליו במסך הבא."</string>
- <string name="accessibility_hearingaid_pair_instructions_second_message" msgid="5596683393607650243">"צריך לוודא שמכשירי השמיעה במצב התאמה."</string>
+ <string name="accessibility_hearingaid_pair_instructions_message" msgid="3094382949733435414">"כדי להתאים את מכשירי השמיעה שלך, יש לחפש את המכשיר ולהקיש עליו במסך הבא. צריך לוודא שמכשירי השמיעה במצב התאמה."</string>
<string name="accessibility_hearingaid_active_device_summary" msgid="3924362383258688984">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> פעיל"</string>
<plurals name="show_number_hearingaid_count" formatted="false" msgid="3160782397139295486">
<item quantity="two"><xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> מכשירי שמיעה נשמרו</item>
@@ -2564,7 +2563,6 @@
<string name="menu_stats_last_unplugged" msgid="5922246077592434526">"מאז הניתוק האחרון למשך <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
<string name="menu_stats_total" msgid="8973377864854807854">"נתוני שימוש כוללים"</string>
<string name="menu_stats_refresh" msgid="1676215433344981075">"רענון"</string>
- <string name="process_kernel_label" msgid="3916858646836739323">"Android OS"</string>
<string name="process_mediaserver_label" msgid="6500382062945689285">"Mediaserver"</string>
<string name="process_dex2oat_label" msgid="2592408651060518226">"אופטימיזציית אפליקציה"</string>
<string name="battery_saver" msgid="8172485772238572153">"חיסכון בסוללה"</string>
@@ -2695,8 +2693,6 @@
<string name="no_device_admins" msgid="4846602835339095768">"אין אפליקציה זמינה של מנהל מכשיר"</string>
<string name="personal_device_admin_title" msgid="2849617316347669861">"אישי"</string>
<string name="managed_device_admin_title" msgid="7853955652864478435">"עבודה"</string>
- <string name="sms_access_restriction_enabled" msgid="7054488078710530278">"הגבלת גישה ל-SMS וליומן השיחות"</string>
- <string name="sms_access_restriction_enabled_summary" msgid="6851339654677842328">"רק לאפליקציית הטלפון שהוגדרה כברירת המחדל ולאפליקציות להעברת הודעות יש הרשאות ל-SMS וליומן השיחות"</string>
<string name="no_trust_agents" msgid="7450273545568977523">"אין סביבות מהימנות זמינות"</string>
<string name="add_device_admin_msg" msgid="1501847129819382149">"האם להפעיל את אפליקציית מנהל המכשיר?"</string>
<string name="add_device_admin" msgid="4192055385312215731">"הפעל את אפליקציית מנהל המכשיר"</string>
@@ -3197,7 +3193,7 @@
<string name="keywords_app_default" msgid="5822717006354487071">"פתיחה באמצעות"</string>
<string name="keywords_applications_settings" msgid="1268353611121497450">"אפליקציות"</string>
<string name="keywords_time_zone" msgid="998254736898753085">"אזור זמן"</string>
- <string name="keywords_draw_overlay" msgid="4130899177619041842">"בועת צ\'אט"</string>
+ <string name="keywords_draw_overlay" msgid="1001120206241401007">"בועת צ\'אט, מערכת, התראה, חלון, תיבת דו-שיח, הצגה, מעל אפליקציות אחרות, ציור"</string>
<string name="keywords_flashlight" msgid="6161632177705233710">"פנס, אור, לפיד"</string>
<string name="keywords_change_wifi_state" msgid="627068244033681010">"wifi, Wi-Fi, החלפת מצב, שליטה"</string>
<string name="keywords_more_mobile_networks" msgid="8995946622054642367">"סלולרי, נייד, ספק סלולרי, רשת אלחוטית, 4g, 3g, 2g, lte "</string>
@@ -3221,7 +3217,7 @@
<string name="keywords_sounds_and_notifications_interruptions" msgid="5426093074031208917">"לא, לא להפריע, להפריע, הפרעה, הפסקה"</string>
<string name="keywords_app" msgid="6334757056536837791">"RAM"</string>
<string name="keywords_location" msgid="4132655528196729043">"בקרבת מקום, מיקום, היסטוריה, דיווח, GPS"</string>
- <string name="keywords_accounts" msgid="1957925565953357627">"חשבון"</string>
+ <string name="keywords_accounts" msgid="4479029747403203867">"חשבון, הוספת חשבון, פרופיל עבודה"</string>
<string name="keywords_users" msgid="3434190133131387942">"הגבלה, הגבל, מוגבל"</string>
<string name="keywords_keyboard_and_ime" msgid="9143339015329957107">"תיקון טקסט, תיקון, צליל, רטט, אוטומטי, שפה, תנועה, להציע, הצעה, עיצוב, פוגעני, מילה, הקלד, אמוג\'י, בין-לאומי"</string>
<string name="keywords_reset_apps" msgid="5293291209613191845">"לאפס, העדפות, ברירת מחדל"</string>
@@ -3259,6 +3255,7 @@
<string name="keywords_storage_settings" msgid="297283751968446577">"זיכרון, מטמון, נתונים, מחיקה, ניקוי, פינוי, שטח"</string>
<string name="keywords_bluetooth_settings" msgid="6804844062789439858">"מחובר, מכשיר, אוזניות, אוזניות עם מיקרופון, רמקול, אלחוטי, התאמה, אוזניות כפתור, מוזיקה, מדיה"</string>
<string name="keywords_wallpaper" msgid="5058364390917429896">"רקע, מסך, נעילת מסך, עיצוב"</string>
+ <string name="keywords_styles" msgid="5828725481814049422">"צורת הסמל, צבע משני, גופן"</string>
<string name="keywords_assist_input" msgid="5017533309492679287">"ברירת מחדל, אסיסט"</string>
<string name="keywords_default_payment_app" msgid="3838565809518896799">"תשלום, ברירת מחדל"</string>
<string name="keywords_ambient_display" msgid="3103487805748659132">"התראה נכנסת"</string>
@@ -3268,7 +3265,7 @@
<string name="keywords_notification_vibration" msgid="31924624421190547">"מגע, רטט, רגישות"</string>
<string name="keywords_battery_saver_sticky" msgid="5586215686021650278">"חיסכון בסוללה, קבוע, מצב קבוע, חיסכון בחשמל, סוללה"</string>
<string name="keywords_battery_saver_schedule" msgid="7358789228486231944">"תרחיש, לוח זמנים, מצב חיסכון בסוללה, חיסכון בחשמל, סוללה, אוטומטי, אחוז"</string>
- <string name="keywords_add_an_account" msgid="6488139919428902434">"פרופיל עבודה"</string>
+ <string name="keywords_enhance_4g_lte" msgid="2273810564244790859">"volte, שיחות טלפון מתקדמות; שיחות 4g"</string>
<string name="default_sound" msgid="8821684447333687810">"צליל ברירת מחדל"</string>
<string name="sound_settings_summary" msgid="4100853606668287965">"עוצמת צלצול ב-<xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
<string name="sound_dashboard_summary" msgid="3402435125958012986">"עוצמת קול, רטט ומצב \'נא לא להפריע\'"</string>
@@ -4017,7 +4014,6 @@
<string name="permit_draw_overlay" msgid="7456536798718633432">"אפשר הצגה מעל אפליקציות אחרות"</string>
<string name="allow_overlay_description" msgid="8961670023925421358">"הגדרה זו מתירה לאפליקציה להופיע מעל אפליקציות אחרות שנמצאות בשימוש. הפעולה הזאת עשויה להפריע לשימוש שלך באפליקציות האלה או לשנות את האופן שבו הן מוצגות או מתנהגות."</string>
<string name="keywords_vr_listener" msgid="7441221822576384680">"שירות מסייע של מציאות מדומה VR להאזנה סטריאופונית"</string>
- <string name="keywords_system_alert_window" msgid="5049498015597864850">"חלון ההתרעה יוצג מעל אפליקציות אחרות"</string>
<string name="overlay_settings" msgid="6930854109449524280">"תצוגה מעל אפליקציות אחרות"</string>
<string name="system_alert_window_summary" msgid="602892301318324492">"<xliff:g id="COUNT_0">%1$d</xliff:g> מתוך <xliff:g id="COUNT_1">%2$d</xliff:g> אפליקציות מורשות להופיע מעל אפליקציות אחרות"</string>
<string name="filter_overlay_apps" msgid="6965969283342557573">"אפליקציות עם הרשאה"</string>
@@ -4265,7 +4261,6 @@
<string name="notification_log_details_none" msgid="184131801230614059">"ללא"</string>
<string name="notification_log_details_ranking_null" msgid="244660392058720919">"אובייקט הדירוג חסר."</string>
<string name="notification_log_details_ranking_none" msgid="599607025882587844">"אובייקט הדירוג אינו מכיל את המפתח הזה."</string>
- <string name="theme_customization_category" msgid="1049181544004163283">"קביעת עיצוב"</string>
<string name="theme_customization_device_default" msgid="5058147707906551368">"ברירת המחדל של המכשיר"</string>
<string name="display_cutout_emulation" msgid="7466869822418376317">"מגרעת במסך"</string>
<string name="display_cutout_emulation_keywords" msgid="4495418317471622562">"הצגת חיתוך תצוגה, חריץ"</string>
@@ -4715,6 +4710,8 @@
<string name="network_connection_errorstate_dialog_message" msgid="6953778550775646710">"משהו קרה. האפליקציה ביטלה את הבקשה לבחירת מכשיר."</string>
<string name="network_connection_connect_successful" msgid="5935510954474494928">"החיבור הצליח"</string>
<string name="network_connection_request_dialog_showall" msgid="6938922880244567521">"הצגת הכול"</string>
+ <string name="network_connection_searching_message" msgid="4638576789450817530">"מתבצע חיפוש אחר מכשיר…"</string>
+ <string name="network_connection_connecting_message" msgid="3740982406609245654">"מתבצעת התחברות למכשיר…"</string>
<plurals name="show_bluetooth_devices" formatted="false" msgid="1715020480026568408">
<item quantity="two"><xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> מכשירים מחוברים</item>
<item quantity="many"><xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> מכשירים מחוברים</item>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 6c2d745..4b54bb9 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -360,8 +360,6 @@
<string name="security_enable_widgets_disabled_summary" msgid="6392489775303464905">"管理アプリによって無効化"</string>
<string name="lockdown_settings_title" msgid="7393790212603280213">"ロックダウン オプションの表示"</string>
<string name="lockdown_settings_summary" msgid="4359438673563318171">"Smart Lock、生体認証によるロック解除、ロック画面上の通知を無効にする電源ボタン オプションを表示します"</string>
- <string name="trust_agents_extend_unlock_title" msgid="2796555263565097031">"信頼エージェントはロック解除の延長のみ"</string>
- <string name="trust_agents_extend_unlock_summary" msgid="3976344969220255010">"有効にすると、信頼エージェントによりデバイスのロック解除状態が延長されます。ただし、ロック状態のデバイスのロックは解除できなくなります。"</string>
<string name="trust_lost_locks_screen_title" msgid="2992742466966021682">"信頼が失われた場合に画面をロックする"</string>
<string name="trust_lost_locks_screen_summary" msgid="693784434582021206">"有効にすると、前回の信頼エージェントの信頼が失われたときにデバイスがロックされます。"</string>
<string name="owner_info_settings_summary" msgid="7472393443779227052">"なし"</string>
@@ -937,6 +935,7 @@
<string name="wifi_eap_identity" msgid="4359453783379679103">"ID"</string>
<string name="wifi_eap_anonymous" msgid="2989469344116577955">"匿名ID"</string>
<string name="wifi_password" msgid="5948219759936151048">"パスワード"</string>
+ <string name="wifi_sae_password_id" msgid="1697832722221765763">"SAE パスワード ID"</string>
<string name="wifi_show_password" msgid="6461249871236968884">"パスワードを表示する"</string>
<string name="wifi_ap_band_config" msgid="1611826705989117930">"AP帯域幅を選択"</string>
<string name="wifi_ap_choose_auto" msgid="2677800651271769965">"自動"</string>
@@ -957,7 +956,6 @@
<string name="wifi_dpp_share_wifi" msgid="9065890131734833809">"Wi‑Fi の共有"</string>
<string name="wifi_dpp_scan_qr_code_with_another_device" msgid="5854392840857123065">"「<xliff:g id="SSID">%1$s</xliff:g>」に接続してパスワードを共有するには、この QR コードをスキャンしてください"</string>
<string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="4436318319178361543">"「<xliff:g id="SSID">%1$s</xliff:g>」に接続するには、この QR コードをスキャンしてください"</string>
- <string name="wifi_dpp_could_not_detect_valid_qr_code" msgid="641893675646330576">"QR コードを読み取れませんでした。コードを再度中央に捉えて、もう一度お試しください"</string>
<string name="wifi_dpp_failure_authentication_or_configuration" msgid="3372757783382381044">"もう一度お試しください。問題が解決しない場合は、デバイスのメーカーにお問い合わせください"</string>
<string name="wifi_dpp_failure_not_compatible" msgid="2829930473520603740">"エラーが発生しました"</string>
<string name="wifi_dpp_failure_timeout" msgid="5228320772245820458">"デバイスが電源に接続され、充電され、ON になっていることをご確認ください"</string>
@@ -980,6 +978,7 @@
<string name="wifi_dpp_hotspot_password" msgid="4120419278831581613">"アクセス ポイントのパスワード: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
<string name="wifi_dpp_add_device" msgid="4072206063308645677">"デバイスを追加"</string>
<string name="wifi_dpp_connect_network_using_qr_code" msgid="3887335309163999665">"QR コードを使用して、このネットワークにデバイスを追加できます"</string>
+ <string name="wifi_dpp_qr_code_is_not_valid_format" msgid="3700087439867692944">"QR コードの形式が無効です"</string>
<string name="retry" msgid="6472609612090877557">"再試行"</string>
<string name="wifi_shared" msgid="844142443226926070">"他のデバイスユーザーと共有する"</string>
<string name="wifi_unchanged" msgid="3410422020930397102">"（変更なし）"</string>
@@ -1129,6 +1128,7 @@
<string name="emergency_address_title" msgid="932729250447887545">"緊急対応の住所"</string>
<string name="emergency_address_summary" msgid="7751971156196115129">"Wi‑Fi を使用して緊急通報を行った場合に、現在地として使用されます"</string>
<string name="private_dns_help_message" msgid="3299567069152568958">"プライベート DNS 機能の"<annotation id="url">"詳細を見る"</annotation></string>
+ <string name="private_dns_mode_on" msgid="5882613439541371003">"ON"</string>
<string name="wifi_calling_pref_managed_by_carrier" msgid="6845711858866828986">"この設定は携帯通信会社によって管理されています"</string>
<string name="wifi_calling_settings_activation_instructions" msgid="7492509632478260955">"Wi-Fi 通話を有効にしてください"</string>
<string name="wifi_calling_turn_on" msgid="1171403510313983983">"Wi-Fi 通話を ON にしてください"</string>
@@ -1872,7 +1872,7 @@
<string name="default_emergency_app" msgid="1951760659640369980">"緊急アプリ"</string>
<string name="reset_app_preferences" msgid="1321050641018356925">"アプリの設定をリセット"</string>
<string name="reset_app_preferences_title" msgid="6093179367325336662">"アプリの設定をリセットしますか？"</string>
- <string name="reset_app_preferences_desc" msgid="4822447731869201512">"この操作により、次の設定がすべてリセットされます。\n\n"<li>"無効化されているアプリ"</li>\n<li>"無効化されているアプリの通知"</li>\n<li>"特定の操作で使用するデフォルトのアプリ"</li>\n<li>"アプリのバックグラウンドデータの制限"</li>\n<li>"権限のすべての制限"</li>\n\n"アプリのデータが失われることはありません。"</string>
+ <string name="reset_app_preferences_desc" msgid="731757609326016760">"この操作により、次の設定がすべてリセットされます。\n\n"<li>"無効化されているアプリ"</li>\n<li>"無効化されているアプリの通知"</li>\n<li>"特定の操作で使用するデフォルトのアプリ"</li>\n<li>"アプリのバックグラウンド データの制限"</li>\n<li>"権限のすべての制限"</li>\n\n"アプリのデータが失われることはありません。"</string>
<string name="reset_app_preferences_button" msgid="2559089511841281242">"アプリをリセット"</string>
<string name="manage_space_text" msgid="8852711522447794676">"容量を管理"</string>
<string name="filter" msgid="2018011724373033887">"フィルタ"</string>
@@ -2087,7 +2087,7 @@
<string name="accessibility_screen_magnification_short_summary" msgid="3411979839172752057">"ズームするには 3 回タップします"</string>
<string name="accessibility_screen_magnification_navbar_short_summary" msgid="3693116360267980492">"ボタンをタップしてズームします"</string>
<string name="accessibility_screen_magnification_summary" msgid="5258868553337478505"><b>"ズーム"</b>"するには、画面をすばやく 3 回タップします。\n"<ul><li>"2 本以上の指をドラッグしてスクロール"</li>\n<li>"2 本以上の指でピンチ操作してズームを調整"</li></ul>\n\n<b>"一時的にズーム"</b>"するには、画面をすばやく 3 回タップし、3 回目のタップで指を押し続けます。\n"<ul><li>"ドラッグで画面上を移動"</li>\n<li>"指を放してズームアウト"</li></ul>\n\n"キーボードやナビゲーション バーでは拡大できません。"</string>
- <string name="accessibility_screen_magnification_navbar_summary" msgid="2272878354599332009">"拡大機能を ON にすると、画面をズームインできます。\n\n"<b>"ズームするには"</b>"、拡大機能を ON にし、画面上のどこかをタップします。\n"<ul><li>"• スクロールするには 2 本以上の指でドラッグします"</li>\n<li>"• ズームレベルを調整するには 2 本以上の指でピンチします"</li></ul>\n\n<b>"一時的にズームするには"</b>"、拡大機能を ON にし、画面上のどこかを長押しします。\n"<ul><li>"• 拡大領域を移動するにはドラッグします"</li>\n<li>"• 拡大を停止するには指を離します"</li></ul>\n\n"キーボードやナビゲーション バーはズームインできません。"</string>
+ <string name="accessibility_screen_magnification_navbar_summary" msgid="6700716275347612310">"[拡大] を ON にすると、画面で拡大操作を行えます。\n\n"<b>"ズーム"</b>"するには、[拡大] を ON にして画面をタップします。\n"<ul><li>"2 本以上の指をドラッグしてスクロール"</li>\n<li>"2 本以上の指でピンチ操作してズームを調整"</li></ul>\n\n<b>"一時的にズーム"</b>"するには、[拡大] を ON にして画面を長押しします。\n"<ul><li>"ドラッグで画面上を移動"</li>\n<li>"指を放してズームアウト"</li></ul>\n\n"キーボードやナビゲーション バーでは拡大操作は行えません。"</string>
<string name="accessibility_tutorial_dialog_title_button" msgid="3682222614034474845">"ユーザー補助機能ボタンで開く"</string>
<string name="accessibility_tutorial_dialog_title_gesture" msgid="1342726230497913398">"指の動きで開く"</string>
<string name="accessibility_tutorial_dialog_title_gesture_settings" msgid="8539392614235820285">"新しいユーザー補助操作を使用する"</string>
@@ -2140,8 +2140,7 @@
<string name="accessibility_hearingaid_title" msgid="8312145423610648518">"補聴器"</string>
<string name="accessibility_hearingaid_not_connected_summary" msgid="6240237523789614599">"接続されている補聴器なし"</string>
<string name="accessibility_hearingaid_adding_summary" msgid="2947474468412309778">"補聴器を追加する"</string>
- <string name="accessibility_hearingaid_pair_instructions_first_message" msgid="3912093691643131154">"補聴器とペア設定するには、次の画面でデバイスを探してタップしてください。"</string>
- <string name="accessibility_hearingaid_pair_instructions_second_message" msgid="5596683393607650243">"補聴器がペア設定モードであることをご確認ください。"</string>
+ <string name="accessibility_hearingaid_pair_instructions_message" msgid="3094382949733435414">"補聴器とペア設定するには、次の画面でデバイスを探してタップしてください。補聴器がペア設定モードであることをご確認ください。"</string>
<string name="accessibility_hearingaid_active_device_summary" msgid="3924362383258688984">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>（有効）"</string>
<plurals name="show_number_hearingaid_count" formatted="false" msgid="3160782397139295486">
<item quantity="other"><xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> 台の保存済み補聴器</item>
@@ -2490,7 +2489,6 @@
<string name="menu_stats_last_unplugged" msgid="5922246077592434526">"電池使用時間: <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
<string name="menu_stats_total" msgid="8973377864854807854">"合計使用量"</string>
<string name="menu_stats_refresh" msgid="1676215433344981075">"更新"</string>
- <string name="process_kernel_label" msgid="3916858646836739323">"Android OS"</string>
<string name="process_mediaserver_label" msgid="6500382062945689285">"メディアサーバー"</string>
<string name="process_dex2oat_label" msgid="2592408651060518226">"アプリの最適化"</string>
<string name="battery_saver" msgid="8172485772238572153">"バッテリーセーバー"</string>
@@ -2621,8 +2619,6 @@
<string name="no_device_admins" msgid="4846602835339095768">"利用可能なデバイス管理アプリはありません"</string>
<string name="personal_device_admin_title" msgid="2849617316347669861">"個人用"</string>
<string name="managed_device_admin_title" msgid="7853955652864478435">"職場"</string>
- <string name="sms_access_restriction_enabled" msgid="7054488078710530278">"SMS と通話履歴へのアクセスを制限"</string>
- <string name="sms_access_restriction_enabled_summary" msgid="6851339654677842328">"デフォルトの電話アプリとメッセージ アプリにのみ、SMS と通話履歴の権限が付与されます"</string>
<string name="no_trust_agents" msgid="7450273545568977523">"使用可能な信頼できるエージェントがありません"</string>
<string name="add_device_admin_msg" msgid="1501847129819382149">"デバイス管理アプリの有効化"</string>
<string name="add_device_admin" msgid="4192055385312215731">"このデバイス管理アプリを有効にする"</string>
@@ -3111,7 +3107,7 @@
<string name="keywords_app_default" msgid="5822717006354487071">"アプリで開く"</string>
<string name="keywords_applications_settings" msgid="1268353611121497450">"アプリ"</string>
<string name="keywords_time_zone" msgid="998254736898753085">"タイムゾーン"</string>
- <string name="keywords_draw_overlay" msgid="4130899177619041842">"チャットヘッド"</string>
+ <string name="keywords_draw_overlay" msgid="1001120206241401007">"チャットヘッド, システム, 通知, ウィンドウ, ダイアログ, 表示, 他のアプリの上, 描画"</string>
<string name="keywords_flashlight" msgid="6161632177705233710">"ライト, フラッシュ"</string>
<string name="keywords_change_wifi_state" msgid="627068244033681010">"wifi, wi-fi, 切り替え, 管理"</string>
<string name="keywords_more_mobile_networks" msgid="8995946622054642367">"モバイル、携帯通信会社、無線、データ、4G、3G、2G、LTE"</string>
@@ -3135,7 +3131,7 @@
<string name="keywords_sounds_and_notifications_interruptions" msgid="5426093074031208917">"着信拒否、通知を非表示、表示しない、非表示、邪魔"</string>
<string name="keywords_app" msgid="6334757056536837791">"RAM"</string>
<string name="keywords_location" msgid="4132655528196729043">"付近の, 場所, 履歴, レポート, GPS"</string>
- <string name="keywords_accounts" msgid="1957925565953357627">"アカウント"</string>
+ <string name="keywords_accounts" msgid="4479029747403203867">"アカウント、アカウントの追加、仕事用プロファイル"</string>
<string name="keywords_users" msgid="3434190133131387942">"制限、制限する、制限された"</string>
<string name="keywords_keyboard_and_ime" msgid="9143339015329957107">"テキスト修正、修正、音、バイブレーション、自動、言語、ジェスチャー、候補、アドバイス、テーマ、不適切、語句、入力、絵文字、国際"</string>
<string name="keywords_reset_apps" msgid="5293291209613191845">"リセット、設定、デフォルト"</string>
@@ -3173,6 +3169,7 @@
<string name="keywords_storage_settings" msgid="297283751968446577">"メモリ, キャッシュ, データ, 削除, 消去, 解放, 空き容量"</string>
<string name="keywords_bluetooth_settings" msgid="6804844062789439858">"接続済み, デバイス, ヘッドフォン, ヘッドセット, スピーカー, ワイヤレス, ペア設定, イヤフォン, 音楽, メディア"</string>
<string name="keywords_wallpaper" msgid="5058364390917429896">"背景, 画面, ロック画面, テーマ"</string>
+ <string name="keywords_styles" msgid="5828725481814049422">"アイコンの形、アクセント カラー、フォント"</string>
<string name="keywords_assist_input" msgid="5017533309492679287">"デフォルト, アシスタント"</string>
<string name="keywords_default_payment_app" msgid="3838565809518896799">"お支払い, デフォルト"</string>
<string name="keywords_ambient_display" msgid="3103487805748659132">"通知の着信"</string>
@@ -3182,7 +3179,7 @@
<string name="keywords_notification_vibration" msgid="31924624421190547">"ハプティクス, バイブレーション, 感度"</string>
<string name="keywords_battery_saver_sticky" msgid="5586215686021650278">"バッテリー セーバー, 固定, 永続, パワー セーバー, 電池"</string>
<string name="keywords_battery_saver_schedule" msgid="7358789228486231944">"ルーティン, スケジュール, バッテリー セーバー, パワーセーバー, 電池, 自動, パーセント, 繰り返し, 定型, 消費電力, 節約, パワー, バッテリー"</string>
- <string name="keywords_add_an_account" msgid="6488139919428902434">"仕事用プロファイル"</string>
+ <string name="keywords_enhance_4g_lte" msgid="2273810564244790859">"VoLTE、拡張モードでの通話、4G 回線による通話"</string>
<string name="default_sound" msgid="8821684447333687810">"デフォルトの通知音"</string>
<string name="sound_settings_summary" msgid="4100853606668287965">"着信音の音量: <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
<string name="sound_dashboard_summary" msgid="3402435125958012986">"音量、バイブレーション、サイレント モード"</string>
@@ -3889,7 +3886,6 @@
<string name="permit_draw_overlay" msgid="7456536798718633432">"他のアプリの上に重ねて表示できるようにする"</string>
<string name="allow_overlay_description" msgid="8961670023925421358">"使用中の他のアプリの上にこのアプリを重ねて表示できるようになります。他のアプリを使用する際に邪魔になったり、他のアプリの表示や動作が変わったりする場合があります。"</string>
<string name="keywords_vr_listener" msgid="7441221822576384680">"vr バーチャル リアリティ リスナー ステレオ ヘルパー サービス"</string>
- <string name="keywords_system_alert_window" msgid="5049498015597864850">"システムの警告ウィンドウ ダイアログ 上に重ねて表示 他のアプリ"</string>
<string name="overlay_settings" msgid="6930854109449524280">"他のアプリの上に重ねて表示"</string>
<string name="system_alert_window_summary" msgid="602892301318324492">"他のアプリの上に重ねて表示できるアプリの数: <xliff:g id="COUNT_0">%1$d</xliff:g> / <xliff:g id="COUNT_1">%2$d</xliff:g> 個"</string>
<string name="filter_overlay_apps" msgid="6965969283342557573">"権限のあるアプリ"</string>
@@ -4125,7 +4121,6 @@
<string name="notification_log_details_none" msgid="184131801230614059">"なし"</string>
<string name="notification_log_details_ranking_null" msgid="244660392058720919">"ランキング オブジェクトがありません。"</string>
<string name="notification_log_details_ranking_none" msgid="599607025882587844">"ランキング オブジェクトにこのキーが含まれていません。"</string>
- <string name="theme_customization_category" msgid="1049181544004163283">"テーマ設定"</string>
<string name="theme_customization_device_default" msgid="5058147707906551368">"デバイスのデフォルト"</string>
<string name="display_cutout_emulation" msgid="7466869822418376317">"ディスプレイ カットアウト"</string>
<string name="display_cutout_emulation_keywords" msgid="4495418317471622562">"ディスプレイ カットアウト, ノッチ"</string>
@@ -4551,6 +4546,8 @@
<string name="network_connection_errorstate_dialog_message" msgid="6953778550775646710">"エラーが発生しました。アプリはデバイス選択リクエストをキャンセルしました。"</string>
<string name="network_connection_connect_successful" msgid="5935510954474494928">"接続しました"</string>
<string name="network_connection_request_dialog_showall" msgid="6938922880244567521">"すべて表示"</string>
+ <string name="network_connection_searching_message" msgid="4638576789450817530">"デバイスを検索しています…"</string>
+ <string name="network_connection_connecting_message" msgid="3740982406609245654">"デバイスに接続しています…"</string>
<plurals name="show_bluetooth_devices" formatted="false" msgid="1715020480026568408">
<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>
diff --git a/res/values-ka/strings.xml b/res/values-ka/strings.xml
index 2af9ece..43d7d20 100644
--- a/res/values-ka/strings.xml
+++ b/res/values-ka/strings.xml
@@ -360,8 +360,6 @@
<string name="security_enable_widgets_disabled_summary" msgid="6392489775303464905">"გათიშულია ადმინისტრატორის მიერ"</string>
<string name="lockdown_settings_title" msgid="7393790212603280213">"დაბლოკვის ვარიანტის ჩვენება"</string>
<string name="lockdown_settings_summary" msgid="4359438673563318171">"ჩართვის ღილაკის ვარიანტის ჩვენება, რომლითაც შესაძლებელია ჩაკეტილ ეკრანზე Smart Lock-ის, ბიომეტრიული განბლოკვის და შეტყობინებების გამორთვა"</string>
- <string name="trust_agents_extend_unlock_title" msgid="2796555263565097031">"ნდობის აგენტები მხოლოდ ახანგრძლივებს დაბლოკვას"</string>
- <string name="trust_agents_extend_unlock_summary" msgid="3976344969220255010">"ჩართვის შემთხვევაში, ნდობის აგენტები უფრო ხანგრძლივი პერიოდის განმავლობაში შეინარჩუნებს თქვენს მოწყობილობას განბლოკილ მდგომარეობაში, თუმცა ვეღარ განბლოკავს ჩაკეტილ მოწყობილობას."</string>
<string name="trust_lost_locks_screen_title" msgid="2992742466966021682">"ეკრანის ჩაკეტვა ნდობის დაკარგვის შემდეგ"</string>
<string name="trust_lost_locks_screen_summary" msgid="693784434582021206">"ჩართვის შემთხვევაში, მოწყობილობა ჩაიკეტება, როცა ბოლო აგენტი დაკარგავს ნდობას."</string>
<string name="owner_info_settings_summary" msgid="7472393443779227052">"არცერთი"</string>
@@ -937,6 +935,7 @@
<string name="wifi_eap_identity" msgid="4359453783379679103">"იდენტობა"</string>
<string name="wifi_eap_anonymous" msgid="2989469344116577955">"უცნობი"</string>
<string name="wifi_password" msgid="5948219759936151048">"პაროლი"</string>
+ <string name="wifi_sae_password_id" msgid="1697832722221765763">"SAE პაროლის იდენტიფიკატორი"</string>
<string name="wifi_show_password" msgid="6461249871236968884">"პაროლის გამოჩენა"</string>
<string name="wifi_ap_band_config" msgid="1611826705989117930">"აირჩიეთ AP Band"</string>
<string name="wifi_ap_choose_auto" msgid="2677800651271769965">"ავტომატური"</string>
@@ -957,7 +956,6 @@
<string name="wifi_dpp_share_wifi" msgid="9065890131734833809">"Wi‑Fi კავშირის გაზიარება"</string>
<string name="wifi_dpp_scan_qr_code_with_another_device" msgid="5854392840857123065">"„<xliff:g id="SSID">%1$s</xliff:g>“-თან დასაკავშირებლად დაასკანერეთ ეს QR კოდი და გააზიარეთ პაროლი"</string>
<string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="4436318319178361543">"„<xliff:g id="SSID">%1$s</xliff:g>“-თან დასაკავშირებლად დაასკანერეთ ეს QR კოდი"</string>
- <string name="wifi_dpp_could_not_detect_valid_qr_code" msgid="641893675646330576">"QR კოდის წაკითხვა ვერ მოხერხდა. ხელახლა მოაქციეთ კოდი ცენტრში და ცადეთ ხელახლა."</string>
<string name="wifi_dpp_failure_authentication_or_configuration" msgid="3372757783382381044">"ცადეთ ხელახლა. თუ პრობლემა არ მოგვარდება, დაუკავშირდით მოწყობილობის მწარმოებელს."</string>
<string name="wifi_dpp_failure_not_compatible" msgid="2829930473520603740">"წარმოიქმნა შეფერხება"</string>
<string name="wifi_dpp_failure_timeout" msgid="5228320772245820458">"დარწმუნდით, რომ თქვენი მოწყობილობა მიერთებული, დატენილი და ჩართულია"</string>
@@ -980,6 +978,7 @@
<string name="wifi_dpp_hotspot_password" msgid="4120419278831581613">"უსადენო ქსელის პაროლი: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
<string name="wifi_dpp_add_device" msgid="4072206063308645677">"მოწყობილობის დამატება"</string>
<string name="wifi_dpp_connect_network_using_qr_code" msgid="3887335309163999665">"ამ ქსელზე მოწყობილობის დასამატებლად გამოიყენეთ QR კოდი"</string>
+ <string name="wifi_dpp_qr_code_is_not_valid_format" msgid="3700087439867692944">"QR კოდის ფორმატი არასწორია"</string>
<string name="retry" msgid="6472609612090877557">"ხელახლა ცდა"</string>
<string name="wifi_shared" msgid="844142443226926070">"მოწყობილობის სხვა მომხმარებლებთან გაზიარება"</string>
<string name="wifi_unchanged" msgid="3410422020930397102">"(უცვლელი)"</string>
@@ -1129,6 +1128,7 @@
<string name="emergency_address_title" msgid="932729250447887545">"საგანგებო მისამართი"</string>
<string name="emergency_address_summary" msgid="7751971156196115129">"მდებარეობა, რომელიც გადაუდებელი ზარის Wi-Fi-ს მეშვეობით განხორციელებისას თქვენს მდებარეობად გამოიყენება"</string>
<string name="private_dns_help_message" msgid="3299567069152568958"><annotation id="url">"შეიტყვეთ მეტი"</annotation>" პირადი DNS-ის ფუნქციების შესახებ"</string>
+ <string name="private_dns_mode_on" msgid="5882613439541371003">"ჩართულია"</string>
<string name="wifi_calling_pref_managed_by_carrier" msgid="6845711858866828986">"პარამეტრს ოპერატორი მართავს"</string>
<string name="wifi_calling_settings_activation_instructions" msgid="7492509632478260955">"Wi-Fi დარეკვის გააქტიურება"</string>
<string name="wifi_calling_turn_on" msgid="1171403510313983983">"Wi-Fi დარეკვის ჩართვა"</string>
@@ -1872,7 +1872,7 @@
<string name="default_emergency_app" msgid="1951760659640369980">"საგანგებო სიტუაციების აპი"</string>
<string name="reset_app_preferences" msgid="1321050641018356925">"აპის პარამეტრების აღდგენა"</string>
<string name="reset_app_preferences_title" msgid="6093179367325336662">"დაბრუნდეს აპის პარამეტრები?"</string>
- <string name="reset_app_preferences_desc" msgid="4822447731869201512">"ამგვარად საწყის მდგომარეობას დაუბრუნდება შემდეგი კომპონენტების ყველა პარამეტრი:\n\n"<li>"გაუქმებული აპები"</li>\n<li>"გაუქმებული აპის შეტყობინებები"</li>\n<li>"ქმედებების ნაგულისხმევი აპლიკაციები"</li>\n<li>"ფონური მონაცემების შეზღუდვები აპებისთვის"</li>\n<li>"ნებართვის ნებისმიერი შეზღუდვები"</li>\n\n" აპების მონაცემები არ დაიკარგება."</string>
+ <string name="reset_app_preferences_desc" msgid="731757609326016760">"ეს ქმედება გადააყენებს ყველა პარამეტრს, რომელიც ეხება:\n\n"<li>"გათიშულ აპებს"</li>\n<li>"აპების გათიშულ შეტყობინებებს"</li>\n<li>"ქმედებებზე მიმაგრებულ ნაგულისხმევ აპლიკაციებს"</li>\n<li>"ფონურ რეჟიმში მონაცემთა გამოყენების შეზღუდვებს აპებისთვის"</li>\n<li>"ნებისმიერი ნებართვის შეზღუდვას"</li>\n\n"აპების მონაცემები არ დაიკარგება."</string>
<string name="reset_app_preferences_button" msgid="2559089511841281242">"აპების საწყისი მდგომარეობის აღდგენა"</string>
<string name="manage_space_text" msgid="8852711522447794676">"სივრცის მართვა"</string>
<string name="filter" msgid="2018011724373033887">"გაფილტვრა"</string>
@@ -2087,7 +2087,7 @@
<string name="accessibility_screen_magnification_short_summary" msgid="3411979839172752057">"მასშტაბის გასაზრდელად, შეეხეთ 3-ჯერ"</string>
<string name="accessibility_screen_magnification_navbar_short_summary" msgid="3693116360267980492">"მასშტაბირება ღილაკზე შეხებით"</string>
<string name="accessibility_screen_magnification_summary" msgid="5258868553337478505"><b>"მასშტაბის გასადიდებლად"</b>" სწრაფად შეეხეთ ეკრანს სამჯერ ზედიზედ.\n"<ul><li>"გადასაადგილებლად გადაატარეთ ეკრანს ორი ან მეტი თითი"</li>\n<li>"მასშტაბის დონის დასარეგულირებლად ეკრანზევე შეაერთეთ ორი ან მეტი თითი"</li></ul>\n\n<b>"მასშტაბის დროებით გასადიდებლად"</b>" სწრაფად შეეხეთ ეკრანს სამჯერ ზედიზედ და შეაყოვნეთ თითი მესამე შეხებისას.\n"<ul><li>"გადაატარეთ თითი ეკრანს მისი სხვადასხვა ნაწილის დასათვალიერებლად"</li>\n<li>"მასშტაბის შესამცირებლად აუშვით თითი"</li></ul>\n\n"კლავიატურისა და ნავიგაციის ზოლის მასშტაბის გაზრდა ვერ მოხერხდება."</string>
- <string name="accessibility_screen_magnification_navbar_summary" msgid="2272878354599332009">"როდესაც გადიდება ჩართულია, შეგიძლიათ გაადიდოთ მასშტაბი თქვენს ეკრანზე.\n\n"<b>"მასშტაბირებისთვის"</b>", დაიწყეთ გადიდება, შემდეგ შეეხეთ ეკრანის ნებისმიერ ადგილს.\n"<ul><li>"• გადასაადგილებლად ჩაავლეთ 2 ან მეტი თითი"</li>\n<li>"• მასშტაბის კორექტირება მოახდინეთ 2 ან მეტი თითით"</li></ul>\n\n<b>"დროებით მასშტაბირებისთვის"</b>", დაიწყეთ გადიდება, შემდეგ ხანგრძლივად შეეხეთ ეკრანის ნებისმიერ ადგილს.\n"<ul><li>"• ეკრანზე გადასატანად ჩაავლეთ"</li>\n<li>"• მასშტაბის შესამცირებლად აწიეთ თითი"</li></ul>\n\n"კლავიატურაზე ან ნავიგაციის ზოლზე მასშტაბის გადიდება შეუძლებელია."</string>
+ <string name="accessibility_screen_magnification_navbar_summary" msgid="6700716275347612310">"როდესაც გადიდება ჩართულია, შეგიძლიათ გაადიდოთ მასშტაბი თქვენს ეკრანზე.\n\n"<b>"მასშტაბირებისთვის"</b>", დაიწყეთ გადიდება, შემდეგ შეეხეთ ეკრანის ნებისმიერ ადგილს.\n"<ul><li>"გადასაადგილებლად გადაატარეთ ეკრანს 2 ან მეტი თითი"</li>\n<li>"მასშტაბის დასარეგულირებლად ეკრანზე შეაერთეთ 2 ან მეტი თითი"</li></ul>\n\n<b>"მასშტაბის დროებით გასადიდებლად"</b>", დაიწყეთ გადიდება, შემდეგ ხანგრძლივად შეეხეთ ეკრანის ნებისმიერ ნაწილს.\n"<ul><li>"გადაატარეთ თითი ეკრანს მისი სხვადასხვა ნაწილის დასათვალიერებლად"</li>\n<li>"მასშტაბის შესამცირებლად ასწიეთ თითი"</li></ul>\n\n"კლავიატურისა და ნავიგაციის ზოლის მასშტაბის გაზრდა ვერ მოხერხდება."</string>
<string name="accessibility_tutorial_dialog_title_button" msgid="3682222614034474845">"გასახსნელად გამოიყენეთ მარტივი წვდომის ღილაკი"</string>
<string name="accessibility_tutorial_dialog_title_gesture" msgid="1342726230497913398">"გასახსნელად გამოიყენეთ ჟესტი"</string>
<string name="accessibility_tutorial_dialog_title_gesture_settings" msgid="8539392614235820285">"მარტივი წვდომის ახალი ჟესტის გამოყენება"</string>
@@ -2140,8 +2140,7 @@
<string name="accessibility_hearingaid_title" msgid="8312145423610648518">"სმენის დახმარებები"</string>
<string name="accessibility_hearingaid_not_connected_summary" msgid="6240237523789614599">"სმენის აპარატები არაა დაკავშირებული"</string>
<string name="accessibility_hearingaid_adding_summary" msgid="2947474468412309778">"სმენის მოწყობილობების დამატება"</string>
- <string name="accessibility_hearingaid_pair_instructions_first_message" msgid="3912093691643131154">"თქვენი სმენის აპარატების დასაწყვილებლად, იპოვეთ და შეეხეთ თქვენს მოწყობილობას მომდევნო ეკრანზე."</string>
- <string name="accessibility_hearingaid_pair_instructions_second_message" msgid="5596683393607650243">"დარწმუნდით, რომ თქვენი სმენის აპარატები დაწყვილების რეჟიმშია."</string>
+ <string name="accessibility_hearingaid_pair_instructions_message" msgid="3094382949733435414">"თქვენი სმენის აპარატების დასაწყვილებლად, იპოვეთ და შეეხეთ თქვენს მოწყობილობას შემდეგ ეკრანზე. დარწმუნდით, რომ თქვენი სმენის აპარატები დაწყვილების რეჟიმშია."</string>
<string name="accessibility_hearingaid_active_device_summary" msgid="3924362383258688984">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> აქტიურია"</string>
<plurals name="show_number_hearingaid_count" formatted="false" msgid="3160782397139295486">
<item quantity="other"><xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> შენახული სმენის აპარატი</item>
@@ -2490,7 +2489,6 @@
<string name="menu_stats_last_unplugged" msgid="5922246077592434526">"ელკვებიდან გამოერთების შემდეგ <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
<string name="menu_stats_total" msgid="8973377864854807854">"სულ გამოყენებული"</string>
<string name="menu_stats_refresh" msgid="1676215433344981075">"განახლება"</string>
- <string name="process_kernel_label" msgid="3916858646836739323">"Android OS"</string>
<string name="process_mediaserver_label" msgid="6500382062945689285">"მედია სერვერი"</string>
<string name="process_dex2oat_label" msgid="2592408651060518226">"აპის ოპტიმიზაცია"</string>
<string name="battery_saver" msgid="8172485772238572153">"ბატარეის დამზოგი"</string>
@@ -2621,8 +2619,6 @@
<string name="no_device_admins" msgid="4846602835339095768">"მოწყობილობის ადმინისტრატორების აპები მიუწვდომელია"</string>
<string name="personal_device_admin_title" msgid="2849617316347669861">"პირადი"</string>
<string name="managed_device_admin_title" msgid="7853955652864478435">"სამსახური"</string>
- <string name="sms_access_restriction_enabled" msgid="7054488078710530278">"SMS-ებსა და ზარების ჟურნალზე წვდომის შეზღუდვა"</string>
- <string name="sms_access_restriction_enabled_summary" msgid="6851339654677842328">"SMS-ებსა და ზარების ჟურნალზე წვდომის ნებართვა აქვს მხოლოდ ზარებისა და შეტყობინებათა მიმოცვლის ნაგულისხმევ აპებს"</string>
<string name="no_trust_agents" msgid="7450273545568977523">"სანდო აგენტები ხელმისაწვდომი არ არის"</string>
<string name="add_device_admin_msg" msgid="1501847129819382149">"გააქტიურდეს მოწყ-ის ადმინისტრატორის აპი?"</string>
<string name="add_device_admin" msgid="4192055385312215731">"მოწყობილობის ადმინისტრატორის ამ აპის გააქტიურება"</string>
@@ -3111,7 +3107,7 @@
<string name="keywords_app_default" msgid="5822717006354487071">"გახსნა აპით"</string>
<string name="keywords_applications_settings" msgid="1268353611121497450">"აპლიკაციები"</string>
<string name="keywords_time_zone" msgid="998254736898753085">"სასაათო სარტყელი"</string>
- <string name="keywords_draw_overlay" msgid="4130899177619041842">"ჩეთის თავი"</string>
+ <string name="keywords_draw_overlay" msgid="1001120206241401007">"ჩეთის ფანჯარა, სისტემა, გაფრთხილება, ფანჯარა, დიალოგი, ჩვენება, სხვა აპების ზემოთ, ხატვა"</string>
<string name="keywords_flashlight" msgid="6161632177705233710">"ფარანი, შუქი, ჩირაღდანი"</string>
<string name="keywords_change_wifi_state" msgid="627068244033681010">"WiFi, Wi-Fi, გადართვა, მართვა"</string>
<string name="keywords_more_mobile_networks" msgid="8995946622054642367">"ფიჭური კავშირი, მობილური ინტერნეტი, უსადენო კავშირი, მონაცემები, 4g, 3g, 2g, lte"</string>
@@ -3135,7 +3131,7 @@
<string name="keywords_sounds_and_notifications_interruptions" msgid="5426093074031208917">"არ შემაწუხოთ, შეშლა, შეფერხება, შესვენება"</string>
<string name="keywords_app" msgid="6334757056536837791">"RAM"</string>
<string name="keywords_location" msgid="4132655528196729043">"ახლომახლო, მდებარეობა, ისტორია, შეტყობინება, GPS"</string>
- <string name="keywords_accounts" msgid="1957925565953357627">"ანგარიში"</string>
+ <string name="keywords_accounts" msgid="4479029747403203867">"ანგარიში, ანგარიშის დამატება, სამსახურის პროფილი"</string>
<string name="keywords_users" msgid="3434190133131387942">"შეზღუდვა, შეზღუდვა, შეზღუდული"</string>
<string name="keywords_keyboard_and_ime" msgid="9143339015329957107">"ტექსტის შესწორება, კორექცია, ხმა, ვიბრაცია, ავტომატური, ენა, ჟესტი, შეთავაზება, შემოთავაზება, თემა, შეურაცხმყოფელი, სიტყვა, აკრეფა, emoji, საერთაშორისო"</string>
<string name="keywords_reset_apps" msgid="5293291209613191845">"გადაყენება, პარამეტრები, ნაგულისხმევი"</string>
@@ -3173,6 +3169,7 @@
<string name="keywords_storage_settings" msgid="297283751968446577">"მეხსიერება, ქეში, მონაცემები, წაშლა, გასუფთავება, ცარიელი, სივრცე"</string>
<string name="keywords_bluetooth_settings" msgid="6804844062789439858">"დაკავშირებული, მოწყობილობა, ყურსასმენები, ყურსაცვამი, დინამიკი, უსადენო, წყვილი, საყურისები, მუსიკა, მედია"</string>
<string name="keywords_wallpaper" msgid="5058364390917429896">"ფონი, ეკრანი, ჩაკეტილი ეკრანი, თემა"</string>
+ <string name="keywords_styles" msgid="5828725481814049422">"ხატულის ფორმა, ფერის ხაზგასმა, შრიფტი"</string>
<string name="keywords_assist_input" msgid="5017533309492679287">"ნაგულისხმევი, ასისტენტი"</string>
<string name="keywords_default_payment_app" msgid="3838565809518896799">"გადახდა, ნაგულისხმევი"</string>
<string name="keywords_ambient_display" msgid="3103487805748659132">"შემომავალი შეტყობინება"</string>
@@ -3182,7 +3179,7 @@
<string name="keywords_notification_vibration" msgid="31924624421190547">"ჰაპტიკა, ვიბრაცია, მგრძნობიარობა"</string>
<string name="keywords_battery_saver_sticky" msgid="5586215686021650278">"ბატარეის დამზოგი, ფიქსირებული, მუდმივობა, ენერგიის დამზოგი, ბატარეა"</string>
<string name="keywords_battery_saver_schedule" msgid="7358789228486231944">"რუტინა, განრიგი, ბატარეის დამზოგი, ენერგიის დამზოგი, ბატარეა, ავტომატური, პროცენტი"</string>
- <string name="keywords_add_an_account" msgid="6488139919428902434">"სამსახურის პროფილი"</string>
+ <string name="keywords_enhance_4g_lte" msgid="2273810564244790859">"volte, გაუმჯობესებული დარეკვა, 4g დარეკვა"</string>
<string name="default_sound" msgid="8821684447333687810">"ნაგულისხმევი ხმა"</string>
<string name="sound_settings_summary" msgid="4100853606668287965">"ზარის სიმძლავრე: <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
<string name="sound_dashboard_summary" msgid="3402435125958012986">"ხმა, ვიბრაცია, არ შემაწუხოთ"</string>
@@ -3889,7 +3886,6 @@
<string name="permit_draw_overlay" msgid="7456536798718633432">"სხვა აპების ზემოდან გამოჩენის დაშვება"</string>
<string name="allow_overlay_description" msgid="8961670023925421358">"ეს საშუალებას მისცემს აპს, გამოჩნდეს სხვა აპების ზემოდან. ამან შეიძლება გავლენა იქონიოს სხვა აპებით სარგებლობის პროცესზე, ან შეცვალოს მათი იერსახე თუ ქცევა."</string>
<string name="keywords_vr_listener" msgid="7441221822576384680">"vr ვირტუალური რეალობა მსმენელი სტერეო დამხმარე სერვისი"</string>
- <string name="keywords_system_alert_window" msgid="5049498015597864850">"სისტემა გაფრთხილება ფანჯარა დიალოგი ჩვენება ზემოდან სხვა აპები"</string>
<string name="overlay_settings" msgid="6930854109449524280">"სხვა აპების ზემოდან გამოჩენა"</string>
<string name="system_alert_window_summary" msgid="602892301318324492">"სხვა აპების ზემოდან გამოჩენა <xliff:g id="COUNT_1">%2$d</xliff:g>-დან <xliff:g id="COUNT_0">%1$d</xliff:g> აპს შეუძლია"</string>
<string name="filter_overlay_apps" msgid="6965969283342557573">"ნებართვის მქონე აპები"</string>
@@ -4125,7 +4121,6 @@
<string name="notification_log_details_none" msgid="184131801230614059">"არაფერი"</string>
<string name="notification_log_details_ranking_null" msgid="244660392058720919">"აკლია კლასიფიკაციის ობიექტი."</string>
<string name="notification_log_details_ranking_none" msgid="599607025882587844">"კლასიფიკაციის ობიექტი ამ გასაღებს არ შეიცავს."</string>
- <string name="theme_customization_category" msgid="1049181544004163283">"თემები"</string>
<string name="theme_customization_device_default" msgid="5058147707906551368">"მოწყობილობის ნაგულისხმევი"</string>
<string name="display_cutout_emulation" msgid="7466869822418376317">"ეკრანის ამოჭრა"</string>
<string name="display_cutout_emulation_keywords" msgid="4495418317471622562">"ეკრანის ამოჭრა, ჭრილი"</string>
@@ -4551,6 +4546,8 @@
<string name="network_connection_errorstate_dialog_message" msgid="6953778550775646710">"წარმოიქმნა შეფერხება. აპლიკაციამ გააუქმა მოწყობილობის არჩევის მოთხოვნა."</string>
<string name="network_connection_connect_successful" msgid="5935510954474494928">"წარმატებით დაკავშირდა"</string>
<string name="network_connection_request_dialog_showall" msgid="6938922880244567521">"ყველას ჩვენება"</string>
+ <string name="network_connection_searching_message" msgid="4638576789450817530">"მიმდინარეობს მოწყობილობის ძიება…"</string>
+ <string name="network_connection_connecting_message" msgid="3740982406609245654">"უკავშირდება მოწყობილობას…"</string>
<plurals name="show_bluetooth_devices" formatted="false" msgid="1715020480026568408">
<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>
diff --git a/res/values-kk/strings.xml b/res/values-kk/strings.xml
index 2f53cb5..1aaa6bb 100644
--- a/res/values-kk/strings.xml
+++ b/res/values-kk/strings.xml
@@ -360,8 +360,6 @@
<string name="security_enable_widgets_disabled_summary" msgid="6392489775303464905">"Әкімші өшірген"</string>
<string name="lockdown_settings_title" msgid="7393790212603280213">"Құлыптау опциясын көрсету"</string>
<string name="lockdown_settings_summary" msgid="4359438673563318171">"Smart Lock функциясын, биометрикалық құлыпты ашу функциясын және құлыптаулы экрандағы хабарландыруларды өшіретін қуат түймесі опциясын көрсету"</string>
- <string name="trust_agents_extend_unlock_title" msgid="2796555263565097031">"Тек сенімді агент құлыпты ашық ұстайды"</string>
- <string name="trust_agents_extend_unlock_summary" msgid="3976344969220255010">"Режим қосулы болса, сенімді агенттер құрылғыңыздың құлпын ұзақ уақыт ашық ұстайды, бірақ құлыпталған құрылғының құлпын аша алмайды."</string>
<string name="trust_lost_locks_screen_title" msgid="2992742466966021682">"Сенім жоғалған кезде, экранды құлыптау"</string>
<string name="trust_lost_locks_screen_summary" msgid="693784434582021206">"Егер қосулы болса және соңғы агент сенімді жоғалтқан жағдайда, құрылғы құлыпталады."</string>
<string name="owner_info_settings_summary" msgid="7472393443779227052">"Ешқандай"</string>
@@ -937,6 +935,7 @@
<string name="wifi_eap_identity" msgid="4359453783379679103">"Бірлік"</string>
<string name="wifi_eap_anonymous" msgid="2989469344116577955">"Анонимді бірлік"</string>
<string name="wifi_password" msgid="5948219759936151048">"Құпия сөз"</string>
+ <string name="wifi_sae_password_id" msgid="1697832722221765763">"SAE құпия сөз идентификаторы"</string>
<string name="wifi_show_password" msgid="6461249871236968884">"Құпия сөзді көрсету"</string>
<string name="wifi_ap_band_config" msgid="1611826705989117930">"Wi-Fi жиілік ауқымын таңдау"</string>
<string name="wifi_ap_choose_auto" msgid="2677800651271769965">"Авто"</string>
@@ -957,7 +956,6 @@
<string name="wifi_dpp_share_wifi" msgid="9065890131734833809">"Wi‑Fi желісін бөлісу"</string>
<string name="wifi_dpp_scan_qr_code_with_another_device" msgid="5854392840857123065">"\"<xliff:g id="SSID">%1$s</xliff:g>\" желісіне жалғану үшін QR кодын сканерлеңіз және құпия сөзді бөлісіңіз."</string>
<string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="4436318319178361543">"\"<xliff:g id="SSID">%1$s</xliff:g>\" желісіне жалғану үшін осы QR кодын сканерлеңіз."</string>
- <string name="wifi_dpp_could_not_detect_valid_qr_code" msgid="641893675646330576">"QR коды оқылмады. Кодты ортаға туралап, әрекетті қайталаңыз."</string>
<string name="wifi_dpp_failure_authentication_or_configuration" msgid="3372757783382381044">"Қайталап көріңіз. Ақау жойылмаса, құрылғы өндірушісіне хабарласыңыз."</string>
<string name="wifi_dpp_failure_not_compatible" msgid="2829930473520603740">"Бірдеңе дұрыс болмады."</string>
<string name="wifi_dpp_failure_timeout" msgid="5228320772245820458">"Құрылғының жалғанғанын, зарядталғанын және қосылғанын тексеріңіз."</string>
@@ -980,6 +978,7 @@
<string name="wifi_dpp_hotspot_password" msgid="4120419278831581613">"Хотспот құпия сөзі: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
<string name="wifi_dpp_add_device" msgid="4072206063308645677">"Құрылғы енгізу"</string>
<string name="wifi_dpp_connect_network_using_qr_code" msgid="3887335309163999665">"Желіге құрылғы енгізу үшін QR кодын пайдаланыңыз."</string>
+ <string name="wifi_dpp_qr_code_is_not_valid_format" msgid="3700087439867692944">"QR кодының форматы жарамсыз."</string>
<string name="retry" msgid="6472609612090877557">"Қайталау"</string>
<string name="wifi_shared" msgid="844142443226926070">"Басқа құрылғы пайдаланушыларымен бөлісу"</string>
<string name="wifi_unchanged" msgid="3410422020930397102">"(өзгермеген)"</string>
@@ -1129,6 +1128,7 @@
<string name="emergency_address_title" msgid="932729250447887545">"Төтенше жағдайда пайдаланылатын мекенжай"</string>
<string name="emergency_address_summary" msgid="7751971156196115129">"Wi‑Fi арқылы жедел қызметке қоңырау шалғанда орналасқан орныңыз ретінде пайдаланылады"</string>
<string name="private_dns_help_message" msgid="3299567069152568958">"Жеке DNS функциялары туралы "<annotation id="url">"толығырақ"</annotation></string>
+ <string name="private_dns_mode_on" msgid="5882613439541371003">"Қосулы"</string>
<string name="wifi_calling_pref_managed_by_carrier" msgid="6845711858866828986">"Параметрді оператор басқарады"</string>
<string name="wifi_calling_settings_activation_instructions" msgid="7492509632478260955">"Wi-Fi қоңырауын іске қосу"</string>
<string name="wifi_calling_turn_on" msgid="1171403510313983983">"Wi-Fi қоңырауларын қосу"</string>
@@ -1872,7 +1872,7 @@
<string name="default_emergency_app" msgid="1951760659640369980">"Төтенше жағдай қолданбасы"</string>
<string name="reset_app_preferences" msgid="1321050641018356925">"Қолданба реттеуін бастапқы күйге қайтару"</string>
<string name="reset_app_preferences_title" msgid="6093179367325336662">"Қолданба реттеулері бастапқы күйге қайтарылсын ба?"</string>
- <string name="reset_app_preferences_desc" msgid="4822447731869201512">"Төмендегі реттеулер бастапқы күйге қайтарылады:\n\n"<li>"Өшірілген қолданбалар"</li>\n<li>"Өшірілген қолданба хабарландырулары"</li>\n<li>"Әрекеттерге арналған әдепкі қолданбалар"</li>\n<li>"Фондық режимдегі дерек тасымалын шектеу"</li>\n<li>"Қандай да бір рұқсат шектеулері"</li>\n\n"Қолданба деректері жоғалмайды."</string>
+ <string name="reset_app_preferences_desc" msgid="731757609326016760">"Келесілердің параметрлері бастапқы күйіне қайтарылады:\n\n"<li>"өшірілген қолданбалар;"</li>\n<li>"қолданбалардың өшірілген хабарландырулары;"</li>\n<li>"әрекеттерге арналған әдепкі қолданбалар;"</li>\n<li>"фондық режимдегі дерек тасымалын шектеу;"</li>\n<li>"барлық рұқсат шектеулері."</li>\n\n"Қолданба деректері жоғалмайды."</string>
<string name="reset_app_preferences_button" msgid="2559089511841281242">"Бастапқы күйге қайтару"</string>
<string name="manage_space_text" msgid="8852711522447794676">"Кеңістікті басқару"</string>
<string name="filter" msgid="2018011724373033887">"Сүзгі"</string>
@@ -2087,7 +2087,7 @@
<string name="accessibility_screen_magnification_short_summary" msgid="3411979839172752057">"Масштабтау үшін 3 рет түртіңіз"</string>
<string name="accessibility_screen_magnification_navbar_short_summary" msgid="3693116360267980492">"Масштабтау үшін түймені түртіңіз"</string>
<string name="accessibility_screen_magnification_summary" msgid="5258868553337478505"><b>"Масштабтау үшін"</b>" экранды 3 рет жылдам түртіңіз.\n"<ul><li>"Айналдыру үшін бірнеше саусақты пайдаланыңыз"</li>\n<li>"Масштабты реттеу үшін бірнеше саусақты бір-біріне жақындатыңыз"</li></ul>\n\n<b>"Уақытша масштабтау үшін"</b>" экранды 3 рет жылдам түртіңіз, сосын үшінші түрткен кезде саусақты ұстап тұрыңыз.\n"<ul><li>"Экранда саусақты жылжытыңыз"</li>\n<li>"Кішірейту үшін саусақты көтеріңіз"</li></ul>\n\n"Пернетақтада және шарлау тақтасында ұлғайту мүмкін емес."</string>
- <string name="accessibility_screen_magnification_navbar_summary" msgid="2272878354599332009">"Үлкейту функциясы қосулы кезде, экраныңыздың масштабын ұлғайта аласыз.\n\n"<b>"Масштабтау үшін"</b>" үлкейту функциясын іске қосып, экранның кез келген жерін басыңыз.\n"<ul><li>"• Айналдыру үшін бірнеше саусағыңызды экран бетінде сүйреңіз."</li>\n<li>"• Масштабты реттеу үшін бірнеше саусақты бір-біріне жақындатыңыз немесе алшақтатыңыз."</li></ul>\n\n<b>"Масштабты уақытша өзгерту үшін"</b>" үлкейту функциясын іске қосып, экранның кез келген жерін түртіп, оны ұстап тұрыңыз.\n"<ul><li>"• Экранды жылжыту үшін сүйреңіз."</li>\n<li>"• Кішірейту үшін саусақты көтеріңіз."</li></ul>\n\n"Пернетақтада немесе навигация жолағында ұлғайту мүмкін болмайды."</string>
+ <string name="accessibility_screen_magnification_navbar_summary" msgid="6700716275347612310">"Ұлғайту функциясы қосулы тұрғанда, экраныңызды ұлғайта аласыз.\n\n"<b>"Масштабтау үшін"</b>" ұлғайту функциясын іске қосып, экранның кез келген жерін түртіңіз.\n"<ul><li>"Айналдыру үшін екі немесе бірнеше саусақпен сүйреңіз."</li>\n<li>"Масштабтауды реттеу үшін екі немесе бірнеше саусақты жақындатыңыз."</li></ul>\n\n<b>"Уақытша масштабтау үшін"</b>" ұлғайту функциясын іске қосыңыз, содан кейін экранның кез келген жерін түртіп ұстап тұрыңыз.\n"<ul><li>"Жылжыту үшін саусағыңызды экранның бір жерінен екінші жеріне сүйреңіз."</li>\n<li>"Кішірейту үшін саусағыңызды көтеріңіз."</li></ul>\n\n"Пернетақтада және навигация жолағында ұлғайту мүмкін емес."</string>
<string name="accessibility_tutorial_dialog_title_button" msgid="3682222614034474845">"Ашу үшін арнайы мүмкіндіктер түймесін қолдану"</string>
<string name="accessibility_tutorial_dialog_title_gesture" msgid="1342726230497913398">"Ашу үшін қол қимылын пайдалану"</string>
<string name="accessibility_tutorial_dialog_title_gesture_settings" msgid="8539392614235820285">"Арнайы мүмкіндіктер үшін жаңа қимылды қолдану"</string>
@@ -2140,8 +2140,7 @@
<string name="accessibility_hearingaid_title" msgid="8312145423610648518">"Есту аппараттары"</string>
<string name="accessibility_hearingaid_not_connected_summary" msgid="6240237523789614599">"Есту аппараты жалғанбаған"</string>
<string name="accessibility_hearingaid_adding_summary" msgid="2947474468412309778">"Есту аппараттарын енгізу"</string>
- <string name="accessibility_hearingaid_pair_instructions_first_message" msgid="3912093691643131154">"Жұптау үшін құрылғыны келесі экраннан тауып басыңыз."</string>
- <string name="accessibility_hearingaid_pair_instructions_second_message" msgid="5596683393607650243">"Есту аппараттары жұптау режимінде болуы керек."</string>
+ <string name="accessibility_hearingaid_pair_instructions_message" msgid="3094382949733435414">"Есту аппараттарын жұптау үшін құрылғыңызды келесі экраннан тауып, оны түртіңіз. Есту аппараттары жұптау режимінде болуы керек."</string>
<string name="accessibility_hearingaid_active_device_summary" msgid="3924362383258688984">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> қосулы"</string>
<plurals name="show_number_hearingaid_count" formatted="false" msgid="3160782397139295486">
<item quantity="other"><xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> есту аппараты сақталды</item>
@@ -2490,7 +2489,6 @@
<string name="menu_stats_last_unplugged" msgid="5922246077592434526">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> үшін соңғы ажыратылғанда"</string>
<string name="menu_stats_total" msgid="8973377864854807854">"Барлық қолданысы"</string>
<string name="menu_stats_refresh" msgid="1676215433344981075">"Жаңарту"</string>
- <string name="process_kernel_label" msgid="3916858646836739323">"Android операциялық жүйесі"</string>
<string name="process_mediaserver_label" msgid="6500382062945689285">"Meдиасервері"</string>
<string name="process_dex2oat_label" msgid="2592408651060518226">"Қолданбаны оңтайландыру"</string>
<string name="battery_saver" msgid="8172485772238572153">"Battery Saver"</string>
@@ -2621,8 +2619,6 @@
<string name="no_device_admins" msgid="4846602835339095768">"Құрылғы әкімшісі қолданбалары жоқ"</string>
<string name="personal_device_admin_title" msgid="2849617316347669861">"Жеке"</string>
<string name="managed_device_admin_title" msgid="7853955652864478435">"Жұмыс"</string>
- <string name="sms_access_restriction_enabled" msgid="7054488078710530278">"SMS және қоңыраулар журналына шектеу қою"</string>
- <string name="sms_access_restriction_enabled_summary" msgid="6851339654677842328">"Қоңырау шалуға және хабар алмасуға арналған әдепкі қолданбалар ғана SMS хабарлары мен қоңыраулар журналына кіре алады"</string>
<string name="no_trust_agents" msgid="7450273545568977523">"Қол жетімді сенімді агенттер жоқ"</string>
<string name="add_device_admin_msg" msgid="1501847129819382149">"Құрылғы әкімші қолданбасы іске қосылсын ба?"</string>
<string name="add_device_admin" msgid="4192055385312215731">"Осы құрылғы әкімшісі қолданбасын қосу"</string>
@@ -3111,7 +3107,7 @@
<string name="keywords_app_default" msgid="5822717006354487071">"Ашатын қолданба"</string>
<string name="keywords_applications_settings" msgid="1268353611121497450">"Қолданбалар"</string>
<string name="keywords_time_zone" msgid="998254736898753085">"уақыт белдеуі"</string>
- <string name="keywords_draw_overlay" msgid="4130899177619041842">"Chat Head"</string>
+ <string name="keywords_draw_overlay" msgid="1001120206241401007">"Чат тақырыбы, жүйе, ескерту, терезе, диалогтік терезе, көрсету, басқа қолданбалардың үстінен, cурет салу"</string>
<string name="keywords_flashlight" msgid="6161632177705233710">"Қолшам, шам, алау"</string>
<string name="keywords_change_wifi_state" msgid="627068244033681010">"wifi, wi-fi, қосу/өшіру, басқару"</string>
<string name="keywords_more_mobile_networks" msgid="8995946622054642367">"ұялы байланыс, мобильдік, ұялы байланыс операторы, сымсыз, деректер, 4g,3g, 2g, lte"</string>
@@ -3135,7 +3131,7 @@
<string name="keywords_sounds_and_notifications_interruptions" msgid="5426093074031208917">"мазаламау үзу, үзу, үзіліс"</string>
<string name="keywords_app" msgid="6334757056536837791">"ЖЖҚ"</string>
<string name="keywords_location" msgid="4132655528196729043">"маңай, орын, тарих, есеп жіберу, GPS"</string>
- <string name="keywords_accounts" msgid="1957925565953357627">"есептік жазба"</string>
+ <string name="keywords_accounts" msgid="4479029747403203867">"есептік жазба, есептік жазбаны енгізу, жұмыс профилі"</string>
<string name="keywords_users" msgid="3434190133131387942">"шектеу, шектелген"</string>
<string name="keywords_keyboard_and_ime" msgid="9143339015329957107">"мәтінді түзету, түзету, дыбыс, дірілдету, авто, тіл, қимыл, ұсыну, ұсыныс, тақырып, тіл тигізетін, сөз, түрі, эмодзи, халықаралық"</string>
<string name="keywords_reset_apps" msgid="5293291209613191845">"ысыру, параметрлер, әдепкі"</string>
@@ -3173,6 +3169,7 @@
<string name="keywords_storage_settings" msgid="297283751968446577">"жад, кэш, дерек, жою, тазалау, бос, орын"</string>
<string name="keywords_bluetooth_settings" msgid="6804844062789439858">"жалғанды, құрылғы, құлаққаптар, гарнитура, динамик, сымсыз, жұптау, құлақаспап, музыка, мультимедиа"</string>
<string name="keywords_wallpaper" msgid="5058364390917429896">"фон, экран, құлыптау экраны, тақырып"</string>
+ <string name="keywords_styles" msgid="5828725481814049422">"белгіше пішіні, ерекшелеу түсі, қаріп"</string>
<string name="keywords_assist_input" msgid="5017533309492679287">"әдепкі, көмекші"</string>
<string name="keywords_default_payment_app" msgid="3838565809518896799">"төлем, әдепкі"</string>
<string name="keywords_ambient_display" msgid="3103487805748659132">"кіріс хабарландыру"</string>
@@ -3182,7 +3179,7 @@
<string name="keywords_notification_vibration" msgid="31924624421190547">"сенсорлар, діріл, сезгіштік"</string>
<string name="keywords_battery_saver_sticky" msgid="5586215686021650278">"battery saver, бекітілген, тұрақты, power saver, батарея"</string>
<string name="keywords_battery_saver_schedule" msgid="7358789228486231944">"әрекеттер тізімі, кесте, battery saver, қуат үнемдеу, батарея, автоматты, пайыз"</string>
- <string name="keywords_add_an_account" msgid="6488139919428902434">"жұмыс профилі"</string>
+ <string name="keywords_enhance_4g_lte" msgid="2273810564244790859">"VoLTE, жетілдірілген қоңырау, 4g қоңырауы"</string>
<string name="default_sound" msgid="8821684447333687810">"Әдепкі дыбыс"</string>
<string name="sound_settings_summary" msgid="4100853606668287965">"Қоңыраудың дыбыс деңгейі: <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
<string name="sound_dashboard_summary" msgid="3402435125958012986">"Дыбыс деңгейі, діріл, \"Мазаламау\" режимі"</string>
@@ -3889,7 +3886,6 @@
<string name="permit_draw_overlay" msgid="7456536798718633432">"Басқа қолданбалардың үстінен көрсетуге рұқсат беру"</string>
<string name="allow_overlay_description" msgid="8961670023925421358">"Қолданбаның пайдаланылып жатқан басқа қолданбалардың үстінен көрсетілуіне рұқсат беріңіз. Ол аталған қолданбаларды пайдалануыңызға кедергі келтіріп, олардың көрсетілуін не жұмыс әдісін өзгертуі ықтимал."</string>
<string name="keywords_vr_listener" msgid="7441221822576384680">"виртуалды шындық тыңдаушысының стерео көмекші қызметі"</string>
- <string name="keywords_system_alert_window" msgid="5049498015597864850">"жүйе ескертуі терезесі дилогтық терезені басқа қолданбалардың үстінен көрсету"</string>
<string name="overlay_settings" msgid="6930854109449524280">"Басқа қолданбалардың үстінен көрсету"</string>
<string name="system_alert_window_summary" msgid="602892301318324492">"<xliff:g id="COUNT_1">%2$d</xliff:g> қолданбаның <xliff:g id="COUNT_0">%1$d</xliff:g>-на(не) басқа қолданбалардың үстінен шығуға рұқсат берілген"</string>
<string name="filter_overlay_apps" msgid="6965969283342557573">"Рұқсаты бар қолданбалар"</string>
@@ -4125,7 +4121,6 @@
<string name="notification_log_details_none" msgid="184131801230614059">"ешқайсысы"</string>
<string name="notification_log_details_ranking_null" msgid="244660392058720919">"Рейтинг нысаны жоқ."</string>
<string name="notification_log_details_ranking_none" msgid="599607025882587844">"Рейтинг нысанында бұл кілт табылмады."</string>
- <string name="theme_customization_category" msgid="1049181544004163283">"Тақырып"</string>
<string name="theme_customization_device_default" msgid="5058147707906551368">"Құрылғының әдепкі параметрлері"</string>
<string name="display_cutout_emulation" msgid="7466869822418376317">"Экран ойығы"</string>
<string name="display_cutout_emulation_keywords" msgid="4495418317471622562">"экран кесіндісі, кесік"</string>
@@ -4551,6 +4546,8 @@
<string name="network_connection_errorstate_dialog_message" msgid="6953778550775646710">"Байланыс қатесі шықты. Қолданба құрылғыны таңдау сұрауынан бас тартты."</string>
<string name="network_connection_connect_successful" msgid="5935510954474494928">"Байланыс орнатылды."</string>
<string name="network_connection_request_dialog_showall" msgid="6938922880244567521">"Барлығын көрсету"</string>
+ <string name="network_connection_searching_message" msgid="4638576789450817530">"Құрылғы ізделуде…"</string>
+ <string name="network_connection_connecting_message" msgid="3740982406609245654">"Құрылғыға қосылуда…"</string>
<plurals name="show_bluetooth_devices" formatted="false" msgid="1715020480026568408">
<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>
diff --git a/res/values-km/strings.xml b/res/values-km/strings.xml
index b9428a3..c854075 100644
--- a/res/values-km/strings.xml
+++ b/res/values-km/strings.xml
@@ -360,8 +360,6 @@
<string name="security_enable_widgets_disabled_summary" msgid="6392489775303464905">"បិទដោយអ្នកគ្រប់គ្រង"</string>
<string name="lockdown_settings_title" msgid="7393790212603280213">"បង្ហាញជម្រើសចាក់សោ"</string>
<string name="lockdown_settings_summary" msgid="4359438673563318171">"បង្ហាញជម្រើសប៊ូតុងថាមពលដែលបិទ Smart Lock, ការដោះសោដោយប្រើជីវមាត្រ និងការជូនដំណឹងនៅលើអេក្រង់ចាក់សោ"</string>
- <string name="trust_agents_extend_unlock_title" msgid="2796555263565097031">"ការដោះសោបន្ថែមសម្រាប់ភ្នាក់ងារទុកចិត្តប៉ុណ្ណោះ"</string>
- <string name="trust_agents_extend_unlock_summary" msgid="3976344969220255010">"ប្រសិនបើបើក នោះភ្នាក់ងារទុកចិត្តនឹងបន្តដោះសោឧបករណ៍របស់អ្នកយូរជាងនេះ ប៉ុន្តែមិនអាចដោះសោឧបករណ៍ដែលជាប់សោបានទៀតទេ។"</string>
<string name="trust_lost_locks_screen_title" msgid="2992742466966021682">"ចាក់សោអេក្រង់ នៅពេលដែលលែងទុកចិត្ត"</string>
<string name="trust_lost_locks_screen_summary" msgid="693784434582021206">"ប្រសិនបើបើក នោះឧបករណ៍នឹងចាក់សោ នៅពេលដែលភ្នាក់ងារទុកចិត្តចុងក្រោយលែងទុកចិត្ត"</string>
<string name="owner_info_settings_summary" msgid="7472393443779227052">"គ្មាន"</string>
@@ -937,6 +935,7 @@
<string name="wifi_eap_identity" msgid="4359453783379679103">"អត្តសញ្ញាណ"</string>
<string name="wifi_eap_anonymous" msgid="2989469344116577955">"អត្តសញ្ញាណអនាមិក"</string>
<string name="wifi_password" msgid="5948219759936151048">"ពាក្យសម្ងាត់"</string>
+ <string name="wifi_sae_password_id" msgid="1697832722221765763">"ព័ត៌មានសម្គាល់ពាក្យសម្ងាត់ SAE"</string>
<string name="wifi_show_password" msgid="6461249871236968884">"បង្ហាញពាក្យសម្ងាត់"</string>
<string name="wifi_ap_band_config" msgid="1611826705989117930">"ជ្រើសរើសរលកសញ្ញា AP"</string>
<string name="wifi_ap_choose_auto" msgid="2677800651271769965">"ស្វ័យប្រវត្តិ"</string>
@@ -957,7 +956,6 @@
<string name="wifi_dpp_share_wifi" msgid="9065890131734833809">"ចែករំលែក Wi‑Fi"</string>
<string name="wifi_dpp_scan_qr_code_with_another_device" msgid="5854392840857123065">"ស្កេនកូដ QR នេះដើម្បីភ្ជាប់ “<xliff:g id="SSID">%1$s</xliff:g>” និងចែករំលែកពាក្យសម្ងាត់"</string>
<string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="4436318319178361543">"ស្កេន QR កូដនេះ ដើម្បីភ្ជាប់ជាមួយ “<xliff:g id="SSID">%1$s</xliff:g>”"</string>
- <string name="wifi_dpp_could_not_detect_valid_qr_code" msgid="641893675646330576">"មិនអាចអានកូដ QR បានទេ។ ដាក់កូដឱ្យនៅចំកណ្ដាលវិញ រួចព្យាយាមម្ដងទៀត"</string>
<string name="wifi_dpp_failure_authentication_or_configuration" msgid="3372757783382381044">"សូមព្យាយាមម្ដងទៀត។ ប្រសិនបើបញ្ហានៅតែបន្តកើតឡើង សូមទាក់ទងក្រុមហ៊ុនផលិតឧបករណ៍"</string>
<string name="wifi_dpp_failure_not_compatible" msgid="2829930473520603740">"មានអ្វីមួយខុសប្រក្រតី"</string>
<string name="wifi_dpp_failure_timeout" msgid="5228320772245820458">"សូមប្រាកដថាឧបករណ៍ត្រូវបានបើក និងសាកថ្មចូលហើយ"</string>
@@ -980,6 +978,7 @@
<string name="wifi_dpp_hotspot_password" msgid="4120419278831581613">"ពាក្យសម្ងាត់ហតស្ប៉ត៖ <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
<string name="wifi_dpp_add_device" msgid="4072206063308645677">"បញ្ចូលឧបករណ៍"</string>
<string name="wifi_dpp_connect_network_using_qr_code" msgid="3887335309163999665">"ប្រើកូដ QR ដើម្បីបញ្ចូលឧបករណ៍ទៅបណ្តាញនេះ"</string>
+ <string name="wifi_dpp_qr_code_is_not_valid_format" msgid="3700087439867692944">"កូដ QR មិនមែនជាទម្រង់ដែលត្រឹមត្រូវទេ"</string>
<string name="retry" msgid="6472609612090877557">"ព្យាយាមម្ដងទៀត"</string>
<string name="wifi_shared" msgid="844142443226926070">"ចែករំលែកជាមួយអ្នកប្រើឧបករណ៍ផ្សេងទៀត"</string>
<string name="wifi_unchanged" msgid="3410422020930397102">"(មិនផ្លាស់ប្ដូរ)"</string>
@@ -1129,6 +1128,7 @@
<string name="emergency_address_title" msgid="932729250447887545">"អាសយដ្ឋានគ្រាអាសន្ន"</string>
<string name="emergency_address_summary" msgid="7751971156196115129">"ត្រូវបានប្រើជាទីតាំងរបស់អ្នក នៅពេលដែលអ្នកហៅទូរសព្ទសង្គ្រោះបន្ទាន់តាមរយៈ Wi‑Fi"</string>
<string name="private_dns_help_message" msgid="3299567069152568958"><annotation id="url">"ស្វែងយល់បន្ថែម"</annotation>"អំពីមុខងារ DNS ឯកជន"</string>
+ <string name="private_dns_mode_on" msgid="5882613439541371003">"បើក"</string>
<string name="wifi_calling_pref_managed_by_carrier" msgid="6845711858866828986">"ការកំណត់ត្រូវបានគ្រប់គ្រងដោយក្រុមហ៊ុនសេវាទូរសព្ទ"</string>
<string name="wifi_calling_settings_activation_instructions" msgid="7492509632478260955">"បើកដំណើរការការហៅតាម Wi-Fi"</string>
<string name="wifi_calling_turn_on" msgid="1171403510313983983">"បើកការហៅតាម Wi‑Fi"</string>
@@ -1872,7 +1872,7 @@
<string name="default_emergency_app" msgid="1951760659640369980">"កម្មវិធីអាសន្ន"</string>
<string name="reset_app_preferences" msgid="1321050641018356925">"កំណត់ចំណូលចិត្តកម្មវិធីឡើងវិញ"</string>
<string name="reset_app_preferences_title" msgid="6093179367325336662">"កំណត់ចំណូលចិត្តកម្មវិធីឡើងវិញ?"</string>
- <string name="reset_app_preferences_desc" msgid="4822447731869201512">"វានឹងកំណត់ចំណូលចិត្តទាំងអស់ឡើងវិញសម្រាប់៖\n\n"<li>"កម្មវិធីដែលបានបិទ"</li>\n<li>"ការជូនដំណឹងកម្មវិធីដែលបានបិទ"</li>\n<li>"កម្មវិធីលំនាំដើមសម្រាប់សកម្មភាព"</li>\n<li>"ការដាក់កម្រិតទិន្នន័យផ្ទៃខាងក្រោយសម្រាប់កម្មវិធី"</li>\n<li>"ការដាក់កម្រិតសិទ្ធិណាមួយ"</li>\n\n"អ្នកនឹងមិនបាត់បង់ទិន្នន័យកម្មវិធីណាមួយទេ។"</string>
+ <string name="reset_app_preferences_desc" msgid="731757609326016760">"ការធ្វើបែបនេះនឹងកំណត់ចំណូលចិត្តទាំងអស់ឡើងវិញសម្រាប់៖\n\n"<li>"កម្មវិធីដែលបានបិទ"</li>\n<li>"ការជូនដំណឹងកម្មវិធីដែលបានបិទ"</li>\n<li>"កម្មវិធីលំនាំដើមសម្រាប់សកម្មភាពផ្សេងៗ"</li>\n<li>"ការដាក់កំហិតទិន្នន័យផ្ទៃខាងក្រោយលើកម្មវិធីផ្សេងៗ"</li>\n<li>"ការដាក់កំហិតលើការអនុញ្ញាតទាំងឡាយ"</li>\n\n"អ្នកនឹងមិនបាត់បង់ទិន្នន័យកម្មវិធីណាមួយឡើយ។"</string>
<string name="reset_app_preferences_button" msgid="2559089511841281242">"កំណត់កម្មវិធីឡើងវិញ"</string>
<string name="manage_space_text" msgid="8852711522447794676">"គ្រប់គ្រងទំហំ"</string>
<string name="filter" msgid="2018011724373033887">"តម្រង"</string>
@@ -2087,7 +2087,7 @@
<string name="accessibility_screen_magnification_short_summary" msgid="3411979839172752057">"ប៉ះ 3 ដងដើម្បីពង្រីក"</string>
<string name="accessibility_screen_magnification_navbar_short_summary" msgid="3693116360267980492">"ចុចប៊ូតុងដើម្បីពង្រីក ឬបង្រួម"</string>
<string name="accessibility_screen_magnification_summary" msgid="5258868553337478505"><b>"ដើម្បីពង្រីក ឬបង្រួម"</b>" សូមចុចឲ្យរហ័សចំនួន 3 ដងនៅលើអេក្រង់។\n"<ul><li>"អូសដោយប្រើម្រាមដៃ 2 ឬច្រើនដើម្បីរំកិល"</li>\n<li>"ច្បិចដោយប្រើម្រាមដៃ 2 ឬច្រើន ដើម្បីកែសម្រួលការពង្រីក ឬបង្រួម"</li></ul>\n\n<b>"ដើម្បីពង្រីក ឬបង្រួមជាបណ្តោះអាសន្ន"</b>" សូមចុចឲ្យរហ័សចំនួន 3 ដងនៅលើអេក្រង់ ហើយចុចឲ្យជាប់នៅពេលចុចលើកទីបី។\n"<ul><li>"អូសដើម្បីផ្លាស់ទីនៅលើអេក្រង់"</li>\n<li>"លើកម្រាមដៃឡើងដើម្បីបង្រួម"</li></ul>\n\n"អ្នកមិនអាចពង្រីកនៅលើក្តារចុច ឬរបាររុករកបានទេ។"</string>
- <string name="accessibility_screen_magnification_navbar_summary" msgid="2272878354599332009">"នៅពេលបើកការពង្រីក អ្នកអាចពង្រីកនៅលើអេក្រង់របស់អ្នក។\n\n"<b>"ដើម្បីពង្រីកបង្រួម"</b>" សូមចាប់ផ្ដើមការពង្រីក រួចចុចលើកន្លែងណាមួយនៅលើអេក្រង់។\n"<ul><li>"• អូសដោយប្រើម្រាមដៃ 2 ឬច្រើនជាងនេះ ដើម្បីរំកិល"</li>\n<li>"• ច្បិចដោយប្រើម្រាមដៃ 2 ឬច្រើនជាងនេះ ដើម្បីកែតម្រូវការពង្រីកបង្រួម"</li></ul>\n\n<b>"ដើម្បីពង្រីកបង្រួមជាបណ្ដោះអាសន្ន"</b>" សូមចាប់ផ្ដើមការពង្រីក រួចចុចលើកន្លែងណាមួយនៅលើអេក្រង់ឱ្យជាប់។\n"<ul><li>"• អូសដើម្បីផ្លាស់ទីនៅជុំវិញអេក្រង់"</li>\n<li>"• លើកម្រាមដៃ ដើម្បីបង្រួម"</li></ul>\n\n"អ្នកមិនអាចពង្រីកនៅលើក្ដារចុច ឬរបាររុករកបានទេ។"</string>
+ <string name="accessibility_screen_magnification_navbar_summary" msgid="6700716275347612310">"នៅពេលបើកការពង្រីក អ្នកអាចពង្រីកនៅលើអេក្រង់របស់អ្នកបាន។\n\n"<b>"ដើម្បីពង្រីកបង្រួម"</b>" សូមចាប់ផ្ដើមការពង្រីក រួចចុចលើកន្លែងណាមួយនៅលើអេក្រង់។\n"<ul><li>"អូសដោយប្រើម្រាមដៃ 2 ឬច្រើនដើម្បីរំកិល"</li>\n<li>"ច្បិចដោយប្រើម្រាមដៃ 2 ឬច្រើន ដើម្បីកែតម្រូវការពង្រីកបង្រួម"</li></ul>\n\n<b>"ដើម្បីពង្រីកបង្រួមជាបណ្តោះអាសន្ន"</b>" ចាប់ផ្តើមការពង្រីក បន្ទាប់មកចុចសង្កត់កន្លែងណាមួយនៅលើអេក្រង់ឱ្យជាប់។\n"<ul><li>"អូសដើម្បីផ្លាស់ទីនៅលើអេក្រង់"</li>\n<li>"លើកម្រាមដៃឡើងដើម្បីបង្រួម"</li></ul>\n\n"អ្នកមិនអាចពង្រីកនៅលើក្តារចុច ឬរបាររុករកបានទេ។"</string>
<string name="accessibility_tutorial_dialog_title_button" msgid="3682222614034474845">"ប្រើប៊ូតុងភាពងាយស្រួល ដើម្បីបើក"</string>
<string name="accessibility_tutorial_dialog_title_gesture" msgid="1342726230497913398">"ប្រើចលនា ដើម្បីបើក"</string>
<string name="accessibility_tutorial_dialog_title_gesture_settings" msgid="8539392614235820285">"ប្រើចលនាភាពងាយស្រួលថ្មី"</string>
@@ -2140,8 +2140,7 @@
<string name="accessibility_hearingaid_title" msgid="8312145423610648518">"ឧបករណ៍ជំនួយការស្ដាប់"</string>
<string name="accessibility_hearingaid_not_connected_summary" msgid="6240237523789614599">"មិនបានភ្ជាប់ឧបករណ៍ជំនួយការស្តាប់ទេ"</string>
<string name="accessibility_hearingaid_adding_summary" msgid="2947474468412309778">"បញ្ចូលឧបករណ៍ជំនួយការស្ដាប់"</string>
- <string name="accessibility_hearingaid_pair_instructions_first_message" msgid="3912093691643131154">"ដើម្បីផ្គូផ្គងជាមួយឧបករណ៍ជំនួយការស្តាប់ សូមស្វែងរក រួចចុចឧបករណ៍របស់អ្នកនៅលើអេក្រង់បន្ទាប់។"</string>
- <string name="accessibility_hearingaid_pair_instructions_second_message" msgid="5596683393607650243">"សូមប្រាកដថាឧបករណ៍ជំនួយការស្តាប់របស់អ្នកស្ថិតក្នុងមុខងារផ្គូផ្គង។"</string>
+ <string name="accessibility_hearingaid_pair_instructions_message" msgid="3094382949733435414">"ដើម្បីផ្គូផ្គងជាមួយឧបករណ៍ជំនួយការស្តាប់ សូមស្វែងរក រួចចុចឧបករណ៍របស់អ្នកនៅលើអេក្រង់បន្ទាប់។ សូមប្រាកដថាឧបករណ៍ជំនួយការស្តាប់របស់អ្នកស្ថិតក្នុងមុខងារផ្គូផ្គង។"</string>
<string name="accessibility_hearingaid_active_device_summary" msgid="3924362383258688984">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> កំពុងដំណើរការ"</string>
<plurals name="show_number_hearingaid_count" formatted="false" msgid="3160782397139295486">
<item quantity="other">ឧបករណ៍ជំនួយការស្តាប់ <xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> ដែលបានរក្សាទុក</item>
@@ -2490,7 +2489,6 @@
<string name="menu_stats_last_unplugged" msgid="5922246077592434526">"ពេលបានដកឧបករណ៍បញ្ចូលថ្មចុងក្រោយសម្រាប់ <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
<string name="menu_stats_total" msgid="8973377864854807854">"ការប្រើសរុប"</string>
<string name="menu_stats_refresh" msgid="1676215433344981075">"ផ្ទុកឡើងវិញ"</string>
- <string name="process_kernel_label" msgid="3916858646836739323">"ប្រព័ន្ធប្រតិបត្តិការ Android"</string>
<string name="process_mediaserver_label" msgid="6500382062945689285">"Mediaserver"</string>
<string name="process_dex2oat_label" msgid="2592408651060518226">"បង្កើនប្រសិទ្ធិភាពកម្មវិធី"</string>
<string name="battery_saver" msgid="8172485772238572153">"កម្មវិធីសន្សំថ្ម"</string>
@@ -2621,8 +2619,6 @@
<string name="no_device_admins" msgid="4846602835339095768">"មិនមានកម្មរិធីអ្នកគ្រប់គ្រងឧបករណ៍ទេ"</string>
<string name="personal_device_admin_title" msgid="2849617316347669861">"ផ្ទាល់ខ្លួន"</string>
<string name="managed_device_admin_title" msgid="7853955652864478435">"ការងារ"</string>
- <string name="sms_access_restriction_enabled" msgid="7054488078710530278">"ដាក់កំហិតសិទ្ធិចូលប្រើកំណត់ហេតុហៅទូរសព្ទ និងសារ SMS"</string>
- <string name="sms_access_restriction_enabled_summary" msgid="6851339654677842328">"មានតែទូរសព្ទលំនាំដើម និងកម្មវិធីផ្ញើសារប៉ុណ្ណោះដែលអាចប្រើកំណត់ហេតុហៅទូរសព្ទ និងសារ SMS បាន"</string>
<string name="no_trust_agents" msgid="7450273545568977523">"មិនមានភ្នាក់ងារដែលទុកចិត្ត"</string>
<string name="add_device_admin_msg" msgid="1501847129819382149">"បើកដំណើរការកម្មវិធីអ្នកគ្រប់គ្រងឧបករណ៍?"</string>
<string name="add_device_admin" msgid="4192055385312215731">"បើកដំណើរការកម្មវិធីអ្នកគ្រប់គ្រងឧបករណ៍នេះ"</string>
@@ -3111,7 +3107,7 @@
<string name="keywords_app_default" msgid="5822717006354487071">"បើកជាមួយ"</string>
<string name="keywords_applications_settings" msgid="1268353611121497450">"កម្មវិធី"</string>
<string name="keywords_time_zone" msgid="998254736898753085">"ល្វែងម៉ោង"</string>
- <string name="keywords_draw_overlay" msgid="4130899177619041842">"ក្បាលនៃការជជែក"</string>
+ <string name="keywords_draw_overlay" msgid="1001120206241401007">"ក្បាលនៃការជជែក, ប្រព័ន្ធ, ការជូនដំណឹង, វិនដូ, ប្រអប់បញ្ចូល, ផ្ទាំងអេក្រង់, នៅលើកម្មវិធីផ្សេងទៀត, ទាញ"</string>
<string name="keywords_flashlight" msgid="6161632177705233710">"ពិល, ពន្លឺ"</string>
<string name="keywords_change_wifi_state" msgid="627068244033681010">"wifi, wi-fi, បិទ/បើក, គ្រប់គ្រង"</string>
<string name="keywords_more_mobile_networks" msgid="8995946622054642367">"ចល័ត ឧបករណ៍ចល័ត ក្រុមហ៊ុនបម្រើសេវាទូរសព្ទ ឥតខ្សែ ទិន្នន័យ 4g, 3g, 2g, lte"</string>
@@ -3135,7 +3131,7 @@
<string name="keywords_sounds_and_notifications_interruptions" msgid="5426093074031208917">"កុំ កុំ រំខាន, ផ្អាក, ការផ្អាក, បំបែក"</string>
<string name="keywords_app" msgid="6334757056536837791">"RAM"</string>
<string name="keywords_location" msgid="4132655528196729043">"នៅជិត, ទីតាំង, ប្រវត្តិ, ការរាយការណ៍, GPS"</string>
- <string name="keywords_accounts" msgid="1957925565953357627">"គណនី"</string>
+ <string name="keywords_accounts" msgid="4479029747403203867">"គណនី បញ្ចូលគណនី កម្រងព័ត៌មានការងារ"</string>
<string name="keywords_users" msgid="3434190133131387942">"ការដាក់កម្រិត, ដាក់កម្រិត, បានដាក់កម្រិត"</string>
<string name="keywords_keyboard_and_ime" msgid="9143339015329957107">"ការកែអត្ថបទ, កែ, សំឡេង, ញ័រ, ស្វ័យប្រវត្តិ, ភាសា, កាយវិការ, ផ្តល់យោបល់, ការផ្តល់យោបល់, ធីម, បំពាន, ពាក្យ, វាយបញ្ចូល, សញ្ញាអារម្មណ៍, អន្តរជាតិ"</string>
<string name="keywords_reset_apps" msgid="5293291209613191845">"កំណត់ឡើងវិញ, ចំណូលចិត្ត, លំនាំដើម"</string>
@@ -3173,6 +3169,7 @@
<string name="keywords_storage_settings" msgid="297283751968446577">"អង្គចងចាំ ឃ្លាំងផ្ទុកទិន្នន័យ ទិន្នន័យ លុប សម្អាត ទំនេរ ទំហំផ្ទុក"</string>
<string name="keywords_bluetooth_settings" msgid="6804844062789439858">"បានភ្ជាប់ ឧបករណ៍ កាសស្តាប់ កាសស្តាប់និងនិយាយ ឧបករណ៍បំពងសំឡេង ឥតខ្សែ ភ្ជាប់ កាសដោតរន្ធត្រចៀក តន្ត្រី មេឌៀ"</string>
<string name="keywords_wallpaper" msgid="5058364390917429896">"ផ្ទៃខាងក្រោយ អេក្រង់ អេក្រង់ចាក់សោ រចនាប័ទ្ម"</string>
+ <string name="keywords_styles" msgid="5828725481814049422">"រូបរាងរូបតំណាង ពណ៌រំលេច ពុម្ពអក្សរ"</string>
<string name="keywords_assist_input" msgid="5017533309492679287">"លំនាំដើម ជំនួយការ"</string>
<string name="keywords_default_payment_app" msgid="3838565809518896799">"ការបង់ប្រាក់ លំនាំដើម"</string>
<string name="keywords_ambient_display" msgid="3103487805748659132">"ការជូនដំណឹងដែលនឹងមកដល់"</string>
@@ -3182,7 +3179,7 @@
<string name="keywords_notification_vibration" msgid="31924624421190547">"ការប៉ះ ការញ័រ រំញោច"</string>
<string name="keywords_battery_saver_sticky" msgid="5586215686021650278">"កម្មវិធីសន្សំថ្ម ស្អិត នៅតែកើតឡើងដដែល កម្មវិធីសន្សំថាមពល ថ្ម"</string>
<string name="keywords_battery_saver_schedule" msgid="7358789228486231944">"ទម្លាប់ កាលវិភាគ កម្មវិធីសន្សំថ្ម កម្មវិធីសន្សំថាមពល ថ្ម ស្វ័យប្រវត្តិ ភាគរយ"</string>
- <string name="keywords_add_an_account" msgid="6488139919428902434">"កម្រងព័ត៌មានការងារ"</string>
+ <string name="keywords_enhance_4g_lte" msgid="2273810564244790859">"volte, ការហៅទូរសព្ទកម្រិតខ្ពស់, ការហៅទូរសព្ទតាមរយៈប្រព័ន្ធ 4g"</string>
<string name="default_sound" msgid="8821684447333687810">"សំឡេងលំនាំដើម"</string>
<string name="sound_settings_summary" msgid="4100853606668287965">"កម្រិតសំឡេងរោទ៍ត្រឹម <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
<string name="sound_dashboard_summary" msgid="3402435125958012986">"កម្រិតសំឡេង ការញ័រ កុំរំខាន"</string>
@@ -3889,7 +3886,6 @@
<string name="permit_draw_overlay" msgid="7456536798718633432">"អនុញ្ញាតឲ្យបង្ហាញនៅលើកម្មវិធីផ្សេងទៀត"</string>
<string name="allow_overlay_description" msgid="8961670023925421358">"អនុញ្ញាតឲ្យកម្មវិធីនេះបង្ហាញខ្លួនពីលើកម្មវិធីផ្សេងទៀតដែលអ្នកកំពុងប្រើប្រាស់។ វាអាចនឹងមានការរំខានដល់ការប្រើប្រាស់កម្មវិធីទាំងនោះ ឬផ្លាស់ប្តូររបៀបដែលពួកវាត្រូវបង្ហាញ ឬដំណើរការ។"</string>
<string name="keywords_vr_listener" msgid="7441221822576384680">"សេវាកម្មជំនួយសំឡេងស្តេរ៉េអូកម្មវិធីស្តាប់ក្នុងភាពពិតជាក់ស្ដែង vr"</string>
- <string name="keywords_system_alert_window" msgid="5049498015597864850">"ផ្ទាំងវិនដូព្រមានក្នុងប្រព័ន្ធបង្ហាញនៅលើកម្មវិធីផ្សេងទៀត"</string>
<string name="overlay_settings" msgid="6930854109449524280">"បង្ហាញនៅលើកម្មវិធីផ្សេងទៀត"</string>
<string name="system_alert_window_summary" msgid="602892301318324492">"កម្មវិធី <xliff:g id="COUNT_0">%1$d</xliff:g> ក្នុងចំណោម <xliff:g id="COUNT_1">%2$d</xliff:g> ត្រូវបានអនុញ្ញាតឲ្យបង្ហាញនៅលើកម្មវិធីផ្សេងទៀត"</string>
<string name="filter_overlay_apps" msgid="6965969283342557573">"កម្មវិធីដែលមានសិទ្ធិអនុញ្ញាត"</string>
@@ -4125,7 +4121,6 @@
<string name="notification_log_details_none" msgid="184131801230614059">"គ្មាន"</string>
<string name="notification_log_details_ranking_null" msgid="244660392058720919">"បានបាត់វត្ថុដាក់ចំណាត់ថ្នាក់"</string>
<string name="notification_log_details_ranking_none" msgid="599607025882587844">"វត្ថុដាក់ចំណាត់ថ្នាក់មិនផ្ទុកគន្លឹះនេះទេ"</string>
- <string name="theme_customization_category" msgid="1049181544004163283">"ការកំណត់រចនាប័ទ្ម"</string>
<string name="theme_customization_device_default" msgid="5058147707906551368">"លំនាំដើមរបស់ឧបករណ៍"</string>
<string name="display_cutout_emulation" msgid="7466869822418376317">"ក្បាលឆក"</string>
<string name="display_cutout_emulation_keywords" msgid="4495418317471622562">"ឆក, ក្បាលឆក"</string>
@@ -4551,6 +4546,8 @@
<string name="network_connection_errorstate_dialog_message" msgid="6953778550775646710">"មានបញ្ហាអ្វីមួយ។ កម្មវិធីបានបោះបង់សំណើក្នុងការជ្រើសរើសឧបករណ៍។"</string>
<string name="network_connection_connect_successful" msgid="5935510954474494928">"ការតភ្ជាប់ទទួលបានជោគជ័យហើយ"</string>
<string name="network_connection_request_dialog_showall" msgid="6938922880244567521">"បង្ហាញទាំងអស់"</string>
+ <string name="network_connection_searching_message" msgid="4638576789450817530">"កំពុងស្វែងរកឧបករណ៍…"</string>
+ <string name="network_connection_connecting_message" msgid="3740982406609245654">"កំពុងភ្ជាប់ឧបករណ៍…"</string>
<plurals name="show_bluetooth_devices" formatted="false" msgid="1715020480026568408">
<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>
diff --git a/res/values-kn/strings.xml b/res/values-kn/strings.xml
index df1446c..5221b0c 100644
--- a/res/values-kn/strings.xml
+++ b/res/values-kn/strings.xml
@@ -360,8 +360,6 @@
<string name="security_enable_widgets_disabled_summary" msgid="6392489775303464905">"ನಿರ್ವಾಹಕರು ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಿದ್ದಾರೆ"</string>
<string name="lockdown_settings_title" msgid="7393790212603280213">"ಲಾಕ್ಡೌನ್ ಆಯ್ಕೆಯನ್ನು ತೋರಿಸಿ"</string>
<string name="lockdown_settings_summary" msgid="4359438673563318171">"ಡಿಸ್ಪ್ಲೇ ಪವರ್ ಬಟನ್ ಆಯ್ಕೆಯು ಸ್ಮಾರ್ಟ್ ಲಾಕ್, ಬಯೋಮೆಟ್ರಿಕ್ ಅನ್ಲಾಕ್ ಮಾಡುವಿಕೆ ಮತ್ತು ಲಾಕ್ ಸ್ಕ್ರೀನ್ ಮೇಲಿರುವ ಅಧಿಸೂಚನೆಗಳನ್ನು ಆಫ್ ಮಾಡುತ್ತದೆ"</string>
- <string name="trust_agents_extend_unlock_title" msgid="2796555263565097031">"ವಿಶ್ವಾಸಾರ್ಹ ಏಜೆಂಟ್ ಅನ್ಲಾಕ್ ಅವಧಿಯನ್ನು ಮಾತ್ರ ವಿಸ್ತರಿಸುತ್ತಾರೆ"</string>
- <string name="trust_agents_extend_unlock_summary" msgid="3976344969220255010">"ಸಕ್ರಿಯಗೊಳಿಸಿದರೆ, ವಿಶ್ವಾಸಾರ್ಹ ಏಜೆಂಟ್ಗಳು ನಿಮ್ಮ ಸಾಧನವನ್ನು ದೀರ್ಘ ಕಾಲದವರೆಗೆ ಅನ್ಲಾಕ್ ಮಾಡಿ ಇರಿಸುತ್ತಾರೆ ಆದರೆ ಲಾಕ್ ಆದ ಸಾಧನವನ್ನು ಇನ್ನು ಮುಂದೆ ಅನ್ಲಾಕ್ ಮಾಡಲು ಸಾಧ್ಯವಿಲ್ಲ."</string>
<string name="trust_lost_locks_screen_title" msgid="2992742466966021682">"ವಿಶ್ವಾಸ ಕಳೆದುಕೊಂಡಾಗ ಸ್ಕ್ರೀನ್ ಲಾಕ್ ಮಾಡಿ"</string>
<string name="trust_lost_locks_screen_summary" msgid="693784434582021206">"ಸಕ್ರಿಯಗೊಳಿಸಿದರೆ, ಕೊನೆಯ ವಿಶ್ವಾಸಾರ್ಹ ಏಜೆಂಟ್ ವಿಶ್ವಾಸವನ್ನು ಕಳೆದುಕೊಂಡಾಗ ಸಾಧನವು ಲಾಕ್ ಆಗುತ್ತದೆ"</string>
<string name="owner_info_settings_summary" msgid="7472393443779227052">"ಯಾವುದೂ ಇಲ್ಲ"</string>
@@ -937,6 +935,8 @@
<string name="wifi_eap_identity" msgid="4359453783379679103">"ಗುರುತಿಸುವಿಕೆ"</string>
<string name="wifi_eap_anonymous" msgid="2989469344116577955">"ಅನಾಮಧೇಯ ಗುರುತಿಸುವಿಕೆ"</string>
<string name="wifi_password" msgid="5948219759936151048">"ಪಾಸ್ವರ್ಡ್"</string>
+ <!-- no translation found for wifi_sae_password_id (1697832722221765763) -->
+ <skip />
<string name="wifi_show_password" msgid="6461249871236968884">"ಪಾಸ್ವರ್ಡ್ ತೋರಿಸು"</string>
<string name="wifi_ap_band_config" msgid="1611826705989117930">"AP ಬ್ಯಾಂಡ್ ಆಯ್ಕೆಮಾಡಿ"</string>
<string name="wifi_ap_choose_auto" msgid="2677800651271769965">"ಸ್ವಯಂ"</string>
@@ -957,7 +957,6 @@
<string name="wifi_dpp_share_wifi" msgid="9065890131734833809">"ವೈ-ಫೈ ಹಂಚಿಕೊಳ್ಳಿ"</string>
<string name="wifi_dpp_scan_qr_code_with_another_device" msgid="5854392840857123065">"“<xliff:g id="SSID">%1$s</xliff:g>” ಗೆ ಸಂಪರ್ಕಪಡಿಸಲು ಮತ್ತು ಪಾಸ್ವರ್ಡ್ ಹಂಚಿಕೊಳ್ಳಲು ಈ QR ಕೋಡ್ ಅನ್ನು ಸ್ಕ್ಯಾನ್ ಮಾಡಿ"</string>
<string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="4436318319178361543">"“<xliff:g id="SSID">%1$s</xliff:g>” ಗೆ ಸಂಪರ್ಕಪಡಿಸಲು ಈ QR ಕೋಡ್ ಅನ್ನು ಸ್ಕ್ಯಾನ್ ಮಾಡಿ"</string>
- <string name="wifi_dpp_could_not_detect_valid_qr_code" msgid="641893675646330576">"QR ಕೋಡ್ ಅನ್ನು ಓದಲು ಸಾಧ್ಯವಾಗುತ್ತಿಲ್ಲ. ಕೋಡ್ ಮರುನಮೂದಿಸಿ ಅಥವಾ ಪುನಃ ಪ್ರಯತ್ನಿಸಿ"</string>
<string name="wifi_dpp_failure_authentication_or_configuration" msgid="3372757783382381044">"ಪುನಃ ಪ್ರಯತ್ನಿಸಿ. ಸಮಸ್ಯೆ ಮುಂದುವರಿದರೆ, ಸಾಧನ ತಯಾರಕರನ್ನು ಸಂಪರ್ಕಿಸಿ"</string>
<string name="wifi_dpp_failure_not_compatible" msgid="2829930473520603740">"ಏನೋ ದೋಷ ಸಂಭವಿಸಿದೆ"</string>
<string name="wifi_dpp_failure_timeout" msgid="5228320772245820458">"ಸಾಧನವನ್ನು ಪ್ಲಗಿನ್ ಮಾಡಲಾಗಿದೆ ಮತ್ತು ಆನ್ ಮಾಡಲಾಗಿದೆ ಎಂಬುದನ್ನು ಖಚಿತಪಡಿಸಿಕೊಳ್ಳಿ"</string>
@@ -980,6 +979,7 @@
<string name="wifi_dpp_hotspot_password" msgid="4120419278831581613">"ಹಾಟ್ಸ್ಪಾಟ್ ಪಾಸ್ವರ್ಡ್: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
<string name="wifi_dpp_add_device" msgid="4072206063308645677">"ಸಾಧನವನ್ನು ಸೇರಿಸಿ"</string>
<string name="wifi_dpp_connect_network_using_qr_code" msgid="3887335309163999665">"ಈ ನೆಟ್ವರ್ಕ್ಗೆ ಸಾಧನವನ್ನು ಸೇರಿಸಲು QR ಕೋಡ್ ಅನ್ನು ಬಳಸಿ"</string>
+ <string name="wifi_dpp_qr_code_is_not_valid_format" msgid="3700087439867692944">"QR ಕೋಡ್ ಮಾನ್ಯ ಫಾರ್ಮ್ಯಾಟ್ನಲ್ಲಿ ಇಲ್ಲ"</string>
<string name="retry" msgid="6472609612090877557">"ಮರುಪ್ರಯತ್ನಿಸು"</string>
<string name="wifi_shared" msgid="844142443226926070">"ಇತರ ಸಾಧನ ಬಳಕೆದಾರರ ಜೊತೆಗೆ ಹಂಚಿಕೊಳ್ಳಿ"</string>
<string name="wifi_unchanged" msgid="3410422020930397102">"(ಬದಲಾವಣೆಯಾಗದ)"</string>
@@ -1129,6 +1129,7 @@
<string name="emergency_address_title" msgid="932729250447887545">"ತುರ್ತು ವಿಳಾಸ"</string>
<string name="emergency_address_summary" msgid="7751971156196115129">"ವೈ-ಫೈ ಮೂಲಕ ತುರ್ತು ಕರೆಯನ್ನು ನೀವು ಮಾಡಿದಾಗ ನಿಮ್ಮ ಸ್ಥಳದಂತೆ ಬಳಸಲಾಗುತ್ತದೆ"</string>
<string name="private_dns_help_message" msgid="3299567069152568958">"ಖಾಸಗಿ DNS ವೈಶಿಷ್ಟ್ಯಗಳನ್ನು ಕುರಿತು "<annotation id="url">"ಇನ್ನಷ್ಟು ತಿಳಿಯಿರಿ"</annotation></string>
+ <string name="private_dns_mode_on" msgid="5882613439541371003">"ಆನ್ ಆಗಿದೆ"</string>
<string name="wifi_calling_pref_managed_by_carrier" msgid="6845711858866828986">"ವಾಹಕದಿಂದ ಸೆಟ್ಟಿಂಗ್ ನಿರ್ವಹಿಸಲ್ಪಡುತ್ತದೆ"</string>
<string name="wifi_calling_settings_activation_instructions" msgid="7492509632478260955">"ವೈ-ಫೈ ಕರೆ ಮಾಡುವಿಕೆಯನ್ನು ಸಕ್ರಿಯಗೊಳಿಸಿ"</string>
<string name="wifi_calling_turn_on" msgid="1171403510313983983">"ವೈ-ಫೈ ಕರೆ ಮಾಡುವಿಕೆ ಆನ್ ಮಾಡಿ"</string>
@@ -1872,7 +1873,7 @@
<string name="default_emergency_app" msgid="1951760659640369980">"ತುರ್ತು ಅಪ್ಲಿಕೇಶನ್"</string>
<string name="reset_app_preferences" msgid="1321050641018356925">"ಆ್ಯಪ್ ಆದ್ಯತೆಗಳನ್ನು ಮರುಹೊಂದಿಸಿ"</string>
<string name="reset_app_preferences_title" msgid="6093179367325336662">"ಆ್ಯಪ್ ಆದ್ಯತೆಗಳನ್ನು ಮರುಹೊಂದಿಸುವುದೇ?"</string>
- <string name="reset_app_preferences_desc" msgid="4822447731869201512">"ಈ ಕೆಳಗಿನ ಎಲ್ಲದಕ್ಕೂ ಇದು ಪ್ರಾಶಸ್ತ್ಯ ಮರುಹೊಂದಿಸುತ್ತದೆ:\n\n"<li>"ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾದ ಅಪ್ಲಿಕೇಶನ್ಗಳು"</li>\n<li>"ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾದ ಅಪ್ಲಿಕೇಶನ್ ಅಧಿಸೂಚನೆಗಳು"</li>\n<li>"ಕಾರ್ಯಗಳಿಗೆ ಡೀಫಾಲ್ಟ್ ಅಪ್ಲಿಕೇಶನ್ಗಳು"</li>\n<li>"ಅಪ್ಲಿಕೇಶನ್ಗಳಿಗಾಗಿ ಹಿನ್ನೆಲೆ ಡೇಟಾ ನಿರ್ಬಂಧಗಳು"</li>\n<li>"ಯಾವುದೇ ಅನುಮತಿ ನಿರ್ಬಂಧಗಳು"</li>\n\n"ನೀವು ಯಾವುದೇ ಅಪ್ಲಿಕೇಶನ್ ಡೇಟಾವನ್ನು ಕಳೆದುಕೊಳ್ಳುವುದಿಲ್ಲ."</string>
+ <string name="reset_app_preferences_desc" msgid="731757609326016760">"ಇದು ಕೆಳಗಿನ ಎಲ್ಲಾ ಆದ್ಯತೆಗಳಿಗಾಗಿ ಮರುಹೊಂದಿಸುತ್ತದೆ:\n\n"<li>"ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಿದ ಆ್ಯಪ್ಗಳು"</li>\n<li>"ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಿದ ಆ್ಯಪ್ ಅಧಿಸೂಚನೆಗಳು"</li>\n<li>"ಕ್ರಿಯೆಗಳಿಗಾಗಿ ಡೀಫಾಲ್ಟ್ ಆ್ಯಪ್ಗಳು"</li>\n<li>"ಆ್ಯಪ್ ಹಿನ್ನೆಲೆ ಡೇಟಾ ನಿರ್ಬಂಧಗಳು"</li>\n<li>"ಯಾವುದೇ ಅನುಮತಿ ನಿರ್ಬಂಧಗಳು"</li>\n\n"ಯಾವುದೇ ಆ್ಯಪ್ ಡೇಟಾವನ್ನು ನೀವು ಕಳೆದುಕೊಳ್ಳುವುದಿಲ್ಲ."</string>
<string name="reset_app_preferences_button" msgid="2559089511841281242">"ಆ್ಯಪ್ಗಳನ್ನು ಮರುಹೊಂದಿಸಿ"</string>
<string name="manage_space_text" msgid="8852711522447794676">"ಸ್ಥಳ ನಿರ್ವಹಿಸಿ"</string>
<string name="filter" msgid="2018011724373033887">"ಫಿಲ್ಟರ್"</string>
@@ -2087,7 +2088,7 @@
<string name="accessibility_screen_magnification_short_summary" msgid="3411979839172752057">"ಝೂಮ್ ಮಾಡಲು 3 ಬಾರಿ ಟ್ಯಾಪ್ ಮಾಡಿ"</string>
<string name="accessibility_screen_magnification_navbar_short_summary" msgid="3693116360267980492">"ಝೂಮ್ ಮಾಡಲು ಒಂದು ಬಟನ್ ಟ್ಯಾಪ್ ಮಾಡಿ"</string>
<string name="accessibility_screen_magnification_summary" msgid="5258868553337478505"><b>"ಝೂಮ್ ಮಾಡಲು"</b>", ಪರದೆಯನ್ನು ತ್ವರಿತವಾಗಿ 3 ಬಾರಿ ಟ್ಯಾಪ್ ಮಾಡಿ.\n"<ul><li>"ಸ್ಕ್ರಾಲ್ ಮಾಡಲು 2 ಅಥವಾ ಹೆಚ್ಚು ಬೆರಳುಗಳನ್ನು ಡ್ರ್ಯಾಗ್ ಮಾಡಿ"</li>\n<li>"ಝೂಮ್ ಹೊಂದಿಸಲು 2 ಅಥವಾ ಹೆಚ್ಚು ಬೆರಳುಗಳ ಜೊತೆ ಚಿವುಟಿ"</li></ul>\n\n<b>"ತಾತ್ಕಾಲಿಕವಾಗಿ ಝೂಮ್ ಮಾಡಲು"</b>", ಪರದೆಯನ್ನು ತ್ವರಿತವಾಗಿ 3 ಬಾರಿ ಟ್ಯಾಪ್ ಮಾಡಿ ಮತ್ತು ಮೂರನೇ ಬಾರಿ ಟ್ಯಾಪ್ ಮಾಡುವಾಗ ನಿಮ್ಮ ಬೆರಳನ್ನು ಒತ್ತಿ ಹಿಡಿಯಿರಿ.\n"<ul><li>"ಪರದೆಯಲ್ಲಿ ಅತ್ತಿತ್ತ ಸರಿಸಲು ಟ್ಯಾಪ್ ಮಾಡಿ"</li>\n<li>"ಝೂಮ್ ಔಟ್ ಮಾಡಲು ಬೆರಳನ್ನು ಎತ್ತಿ"</li></ul>\n\n"ನೀವು ಕೀಬೋರ್ಡ್ ಮತ್ತು ನ್ಯಾವಿಗೇಶನ್ ಬಾರ್ನಲ್ಲಿ ಝೂಮ್ ಇನ್ ಮಾಡಲು ಸಾಧ್ಯವಿಲ್ಲ."</string>
- <string name="accessibility_screen_magnification_navbar_summary" msgid="2272878354599332009">"ಹಿಗ್ಗಿಸುವಿಕೆ ಅನ್ನು ಆನ್ ಮಾಡಿದಾಗ, ನಿಮ್ಮ ಪರದೆಯಲ್ಲಿ ನೀವು ಝೂಮ್ ಇನ್ ಮಾಡಬಹುದು.\n\n"<b>"ಝೂಮ್ ಮಾಡಲು"</b>", ಹಿಗ್ಗಿಸುವಿಕೆ ಅನ್ನು ಪ್ರಾರಂಭಿಸಿ, ನಂತರ ಪರದೆಯ ಮೇಲೆ ಎಲ್ಲಿಯಾದರೂ ಟ್ಯಾಪ್ ಮಾಡಿ.\n"<ul><li>"• ಸ್ಕ್ರಾಲ್ ಮಾಡಲು 2 ಅಥವಾ ಹೆಚ್ಚು ಬೆರಳುಗಳಿಂದ ಡ್ರ್ಯಾಗ್ ಮಾಡಿ"</li>\n<li>"• ಝೂಮ್ ಹೊಂದಿಸಲು, 2 ಅಥವಾ ಹೆಚ್ಚು ಬೆರಳುಗಳಿಂದ ಪಿಂಚ್ ಮಾಡಿ"</li></ul>\n\n<b>"ತಾತ್ಕಾಲಿಕವಾಗಿ ಝೂಮ್ ಮಾಡಲು"</b>", ಹಿಗ್ಗಿಸುವಿಕೆ ಅನ್ನು ಪ್ರಾರಂಭಿಸಿ, ನಂತರ ಸ್ಪರ್ಶಿಸಿ ಮತ್ತು ಪರದೆಯ ಮೇಲೆ ಎಲ್ಲಿಯಾದರೂ ಒತ್ತಿ ಹಿಡಿಯಿರಿ.\n"<ul><li>"• ಪರದೆಯ ಸುತ್ತ ಚಲಿಸಲು ಡ್ರ್ಯಾಗ್ ಮಾಡಿ"</li>\n<li>"• ಝೂಮ್ ಔಟ್ ಮಾಡಲು ಬೆರಳನ್ನು ಮೇಲಕ್ಕೆತ್ತಿ"</li></ul>\n\n"ಕೀಬೋರ್ಡ್ ಅಥವಾ ನ್ಯಾವಿಗೇಶನ್ ಬಾರ್ನಲ್ಲಿ ನಿಮಗೆ ಝೂಮ್ ಇನ್ ಮಾಡಲು ಸಾಧ್ಯವಾಗುವುದಿಲ್ಲ."</string>
+ <string name="accessibility_screen_magnification_navbar_summary" msgid="6700716275347612310">"ಹಿಗ್ಗಿಸುವಿಕೆ ಅನ್ನು ಆನ್ ಮಾಡಿದಾಗ, ನಿಮ್ಮ ಪರದೆಯಲ್ಲಿ ನೀವು ಝೂಮ್ ಇನ್ ಮಾಡಬಹುದು.\n\n"<b>"ಝೂಮ್ ಮಾಡಲು"</b>", ಹಿಗ್ಗಿಸುವಿಕೆ ಅನ್ನು ಪ್ರಾರಂಭಿಸಿ, ನಂತರ ಪರದೆಯ ಮೇಲೆ ಎಲ್ಲಿಯಾದರೂ ಟ್ಯಾಪ್ ಮಾಡಿ.\n"<ul><li>"ಸ್ಕ್ರಾಲ್ ಮಾಡಲು 2 ಅಥವಾ ಹೆಚ್ಚು ಬೆರಳುಗಳನ್ನು ಡ್ರ್ಯಾಗ್ ಮಾಡಿ"</li>\n<li>"ಝೂಮ್ ಹೊಂದಿಸಲು, 2 ಅಥವಾ ಹೆಚ್ಚು ಬೆರಳುಗಳಿಂದ ಪಿಂಚ್ ಮಾಡಿ"</li></ul>\n\n<b>"ತಾತ್ಕಾಲಿಕವಾಗಿ ಝೂಮ್ ಮಾಡಲು"</b>", ಮ್ಯಾಗ್ನಿಫಿಕೇಶನ್ ಅನ್ನು ಪ್ರಾಂಭಿಸಿ, ನಂತರ ಪರದೆಯ ಮೇಲೆ ಎಲ್ಲಾದರೂ ಸ್ಪರ್ಶಿಸಿ, ಒತ್ತಿಹಿಡಿಯಿರಿ.\n"<ul><li>"ಪರದೆಯಲ್ಲಿ ಅತ್ತಿತ್ತ ಸರಿಸಲು, ಡ್ರ್ಯಾಗ್ ಮಾಡಿ"</li>\n<li>"ಝೂಮ್ ಔಟ್ ಮಾಡಲು ಬೆರಳನ್ನು ಎತ್ತಿ"</li></ul>\n\n"ನೀವು ಕೀಬೋರ್ಡ್ ಅಥವಾ ನ್ಯಾವಿಗೇಶನ್ ಬಾರ್ನಲ್ಲಿ ಝೂಮ್ ಇನ್ ಮಾಡಲು ಸಾಧ್ಯವಿಲ್ಲ."</string>
<string name="accessibility_tutorial_dialog_title_button" msgid="3682222614034474845">"ತೆರೆಯಲು ಪ್ರವೇಶಿಸುವಿಕೆ ಬಟನ್ ಬಳಸಿ"</string>
<string name="accessibility_tutorial_dialog_title_gesture" msgid="1342726230497913398">"ತೆರೆಯಲು ಗೆಸ್ಚರ್ ಬಳಸಿ"</string>
<string name="accessibility_tutorial_dialog_title_gesture_settings" msgid="8539392614235820285">"ಹೊಸ ಪ್ರವೇಶಿಸುವಿಕೆ ಗೆಸ್ಚರ್ ಬಳಸಿ"</string>
@@ -2140,8 +2141,7 @@
<string name="accessibility_hearingaid_title" msgid="8312145423610648518">"ಶ್ರವಣ ಸಾಧನಗಳು"</string>
<string name="accessibility_hearingaid_not_connected_summary" msgid="6240237523789614599">"ಯಾವುದೇ ಶ್ರವಣ ಸಾಧನ ಸಂಪರ್ಕಗೊಂಡಿಲ್ಲ"</string>
<string name="accessibility_hearingaid_adding_summary" msgid="2947474468412309778">"ಶ್ರವಣ ಸಾಧನಗಳನ್ನು ಸೇರಿಸಿ"</string>
- <string name="accessibility_hearingaid_pair_instructions_first_message" msgid="3912093691643131154">"ನಿಮ್ಮ ಶ್ರವಣ ಸಾಧನಗಳನ್ನು ಜೋಡಿಸಲು, ಮುಂದಿನ ಪರದೆಯಲ್ಲಿರುವ ನಿಮ್ಮ ಸಾಧನವನ್ನು ಹುಡುಕಿ ಮತ್ತು ಟ್ಯಾಪ್ ಮಾಡಿ."</string>
- <string name="accessibility_hearingaid_pair_instructions_second_message" msgid="5596683393607650243">"ನಿಮ್ಮ ಶ್ರವಣ ಸಾಧನಗಳು ಜೋಡಿಸುವಿಕೆ ಮೋಡ್ನಲ್ಲಿವೆ ಎಂಬುದನ್ನು ಖಚಿತಪಡಿಸಿಕೊಳ್ಳಿ."</string>
+ <string name="accessibility_hearingaid_pair_instructions_message" msgid="3094382949733435414">"ನಿಮ್ಮ ಶ್ರವಣ ಸಾಧನಗಳನ್ನು ಜೋಡಿಸಲು, ಮುಂದಿನ ಪರದೆಯಲ್ಲಿ ನಿಮ್ಮ ಸಾಧನವನ್ನು ಹುಡುಕಿ ಮತ್ತು ಟ್ಯಾಪ್ ಮಾಡಿ. ನಿಮ್ಮ ಶ್ರವಣ ಸಾಧನಗಳು ಜೋಡಿಸುವಿಕೆ ಮೋಡ್ನಲ್ಲಿದೆ ಎಂದು ಖಚಿತಪಡಿಸಿಕೊಳ್ಳಿ."</string>
<string name="accessibility_hearingaid_active_device_summary" msgid="3924362383258688984">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ಸಕ್ರಿಯ"</string>
<plurals name="show_number_hearingaid_count" formatted="false" msgid="3160782397139295486">
<item quantity="one"><xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> ಶ್ರವಣ ಸಾಧನಗಳನ್ನು ಉಳಿಸಲಾಗಿದೆ</item>
@@ -2490,7 +2490,6 @@
<string name="menu_stats_last_unplugged" msgid="5922246077592434526">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> ಗೆ ಕಳೆದ ಬಾರಿ ಅನ್ಪ್ಲಗ್ ಮಾಡಿದಾಗ"</string>
<string name="menu_stats_total" msgid="8973377864854807854">"ಬಳಕೆಯ ಮೊತ್ತ"</string>
<string name="menu_stats_refresh" msgid="1676215433344981075">"ರಿಫ್ರೆಶ್ ಮಾಡಿ"</string>
- <string name="process_kernel_label" msgid="3916858646836739323">"Android OS"</string>
<string name="process_mediaserver_label" msgid="6500382062945689285">"ಮಾಧ್ಯಮಸರ್ವರ್"</string>
<string name="process_dex2oat_label" msgid="2592408651060518226">"ಅಪ್ಲಿಕೇಶನ್ ಆಪ್ಟಿಮೈಸೇಷನ್"</string>
<string name="battery_saver" msgid="8172485772238572153">"ಬ್ಯಾಟರಿ ಸೇವರ್"</string>
@@ -2621,8 +2620,6 @@
<string name="no_device_admins" msgid="4846602835339095768">"ಸಾಧನ ನಿರ್ವಹಣಾ ಅಪ್ಲಿಕೇಶನ್ಗಳು ಲಭ್ಯವಿಲ್ಲ"</string>
<string name="personal_device_admin_title" msgid="2849617316347669861">"ವೈಯಕ್ತಿಕ"</string>
<string name="managed_device_admin_title" msgid="7853955652864478435">"ಕೆಲಸ"</string>
- <string name="sms_access_restriction_enabled" msgid="7054488078710530278">"ಎಸ್ಎಂಎಸ್ ಮತ್ತು ಕರೆ ಲಾಗ್ ಪ್ರವೇಶವನ್ನು ನಿರ್ಬಂಧಿಸಿ"</string>
- <string name="sms_access_restriction_enabled_summary" msgid="6851339654677842328">"ಡೀಫಾಲ್ಟ್ ಫೋನ್ ಮತ್ತು ಸಂದೇಶ ಕಳುಹಿಸುವಿಕೆ ಆ್ಯಪ್ಗಳು ಎಸ್ಎಂಎಸ್ ಮತ್ತು ಕರೆ ಲಾಗ್ ಅನುಮತಿಗಳನ್ನು ಹೊಂದಿವೆ"</string>
<string name="no_trust_agents" msgid="7450273545568977523">"ಯಾವುದೇ ವಿಶ್ವಾಸಾರ್ಹ ಏಜೆಂಟ್ಗಳು ಲಭ್ಯವಿಲ್ಲ"</string>
<string name="add_device_admin_msg" msgid="1501847129819382149">"ಸಾಧನ ನಿರ್ವಹಣೆ ಅಪ್ಲಿಕೇಶನ್ ಸಕ್ರಿಯ ಮಾಡಬೇಕೇ?"</string>
<string name="add_device_admin" msgid="4192055385312215731">"ಈ ಸಾಧನ ನಿರ್ವಹಣೆ ಅಪ್ಲಿಕೇಶನ್ ಸಕ್ರಿಯಗೊಳಿಸಿ"</string>
@@ -3111,7 +3108,7 @@
<string name="keywords_app_default" msgid="5822717006354487071">"ಇವುಗಳನ್ನು ಬಳಸಿಕೊಂಡು ತೆರೆಯಿರಿ"</string>
<string name="keywords_applications_settings" msgid="1268353611121497450">"ಆ್ಯಪ್ಗಳು"</string>
<string name="keywords_time_zone" msgid="998254736898753085">"ಸಮಯ ವಲಯ"</string>
- <string name="keywords_draw_overlay" msgid="4130899177619041842">"ಚಾಟ್ ಹೆಡ್"</string>
+ <string name="keywords_draw_overlay" msgid="1001120206241401007">"ಚಾಟ್ ಹೆಡ್, ಸಿಸ್ಟಮ್, ಎಚ್ಚರಿಕೆ, ವಿಂಡೋ, ಡೈಲಾಗ್, ಪ್ರದರ್ಶನ, ಇತರ ಉನ್ನತ ಅಪ್ಲಿಕೇಶನ್ಗಳಲ್ಲಿ, ಎಳೆಯಿರಿ"</string>
<string name="keywords_flashlight" msgid="6161632177705233710">"ಫ್ಲಾಶ್ಲೈಟ್, ಲೈಟ್, ಟಾರ್ಚ್"</string>
<string name="keywords_change_wifi_state" msgid="627068244033681010">"ವೈಫೈ, ವೈ-ಫೈ, ಟಾಗಲ್, ನಿಯಂತ್ರಣ"</string>
<string name="keywords_more_mobile_networks" msgid="8995946622054642367">"ಸೆಲ್ಯುಲಾರ್, ಸೆಲ್ ವಾಹಕ, ವೈರ್ಲೆಸ್, ಡೇಟಾ, 4g, 3g, 2g, ಎಲ್ಟಿಇ"</string>
@@ -3135,7 +3132,7 @@
<string name="keywords_sounds_and_notifications_interruptions" msgid="5426093074031208917">"ತೊಂದರೆ ಮಾಡಬೇಡ, ತಡೆ, ತೊಂದರೆ, ವಿರಾಮ"</string>
<string name="keywords_app" msgid="6334757056536837791">"RAM"</string>
<string name="keywords_location" msgid="4132655528196729043">"ಸಮೀಪದ, ಸ್ಥಳ, ಇತಿಹಾಸ, ವರದಿ ಮಾಡುವಿಕೆ, GPS"</string>
- <string name="keywords_accounts" msgid="1957925565953357627">"ಖಾತೆ"</string>
+ <string name="keywords_accounts" msgid="4479029747403203867">"ಖಾತೆ, ಖಾತೆಯನ್ನು ಸೇರಿಸಿ, ಉದ್ಯೋಗ ಪ್ರೊಫೈಲ್"</string>
<string name="keywords_users" msgid="3434190133131387942">"ನಿರ್ಬಂಧ, ನಿರ್ಬಂಧಿಸು, ನಿರ್ಬಂಧಿಸಲಾಗಿದೆ"</string>
<string name="keywords_keyboard_and_ime" msgid="9143339015329957107">"ಪಠ್ಯ ತಿದ್ದುಪಡಿ, ಸರಿಪಡಿಸು, ಶಬ್ದ, ವೈಬ್ರೇಟ್, ಸ್ವಯಂ, ಭಾಷೆ, ಗೆಸ್ಚರ್, ಸಲಹೆ ನೀಡಿ, ಸಲಹೆ, ಥೀಮ್, ಆಕ್ಷೇಪಾರ್ಹ, ಪದ, ಪ್ರಕಾರ, ಎಮೊಜಿ, ಅಂತರರಾಷ್ಟ್ರೀಯ"</string>
<string name="keywords_reset_apps" msgid="5293291209613191845">"ಮರುಹೊಂದಿಸಿ, ಪ್ರಾಶಸ್ತ್ಯಗಳು, ಡಿಫಾಲ್ಟ್"</string>
@@ -3173,6 +3170,7 @@
<string name="keywords_storage_settings" msgid="297283751968446577">"ಮೆಮೊರಿ, ಕ್ಯಾಷ್, ಡೇಟಾ, ಅಳಿಸಿ, ತೆರವುಗೊಳಿಸಿ, ಮುಕ್ತಗೊಳಿಸಿ, ಸ್ಥಳಾವಕಾಶ"</string>
<string name="keywords_bluetooth_settings" msgid="6804844062789439858">"ಸಂಪರ್ಕಿತ, ಸಾಧನ, ಹೆಡ್ಫೋನ್ಗಳು, ಹೆಡ್ಸೆಟ್, ಸ್ಪೀಕರ್, ವಯರ್ಲೆಸ್, ಜೋಡಿಸಿ, ಇಯರ್ಬಡ್ಸ್, ಸಂಗೀತ, ಮಾಧ್ಯಮ"</string>
<string name="keywords_wallpaper" msgid="5058364390917429896">"ಹಿನ್ನೆಲೆ, ಪರದೆ, ಲಾಕ್ಪರದೆ, ಥೀಮ್"</string>
+ <string name="keywords_styles" msgid="5828725481814049422">"ಐಕಾನ್ ಆಕಾರ, ವರ್ಣವರ್ಗ, ಫಾಂಟ್"</string>
<string name="keywords_assist_input" msgid="5017533309492679287">"ಡಿಫಾಲ್ಟ್, ಸಹಾಯಕ"</string>
<string name="keywords_default_payment_app" msgid="3838565809518896799">"ಪಾವತಿ, ಡಿಫಾಲ್ಟ್"</string>
<string name="keywords_ambient_display" msgid="3103487805748659132">"ಒಳಬರುವ ಅಧಿಸೂಚನೆ"</string>
@@ -3182,7 +3180,7 @@
<string name="keywords_notification_vibration" msgid="31924624421190547">"ಹ್ಯಾಪ್ಟಿಕ್ಸ್, ವೈಬ್ರೇಟ್, ಸೂಕ್ಷ್ಮತೆ"</string>
<string name="keywords_battery_saver_sticky" msgid="5586215686021650278">"ಬ್ಯಾಟರಿ ಸೇವರ್, ಸ್ಟಿಕಿ, ತಡೆ ಹಿಡಿ, ಪವರ್ ಸೇವರ್, ಬ್ಯಾಟರಿ"</string>
<string name="keywords_battery_saver_schedule" msgid="7358789228486231944">"ದಿನಚರಿ, ವೇಳಾಪಟ್ಟಿ, ಬ್ಯಾಟರಿ ಸೇವರ್, ಪವರ್ ಸೇವರ್, ಬ್ಯಾಟರಿ, ಸ್ವಯಂಚಾಲಿತ, ಶೇಕಡಾ"</string>
- <string name="keywords_add_an_account" msgid="6488139919428902434">"ಉದ್ಯೋಗ ಪ್ರೊಫೈಲ್"</string>
+ <string name="keywords_enhance_4g_lte" msgid="2273810564244790859">"volte, ಸುಧಾರಿತ ಕರೆ, 4g ಕರೆ"</string>
<string name="default_sound" msgid="8821684447333687810">"ಡಿಫಾಲ್ಟ್ ಧ್ವನಿ"</string>
<string name="sound_settings_summary" msgid="4100853606668287965">"<xliff:g id="PERCENTAGE">%1$s</xliff:g> ರಷ್ಟು ರಿಂಗ್ ವಾಲ್ಯೂಮ್"</string>
<string name="sound_dashboard_summary" msgid="3402435125958012986">"ವಾಲ್ಯೂಮ್, ವೈಬ್ರೇಶನ್, ಅಡಚಣೆ ಮಾಡಬೇಡಿ"</string>
@@ -3889,7 +3887,6 @@
<string name="permit_draw_overlay" msgid="7456536798718633432">"ಇತರ ಅಪ್ಲಿಕೇಶನ್ ಮೇಲೆ ಡಿಸ್ಪ್ಲೇ ಮಾಡಲು ಅನುಮತಿಸಿ"</string>
<string name="allow_overlay_description" msgid="8961670023925421358">"ನೀವು ಬಳಸುತ್ತಿರುವ ಇತರ ಅಪ್ಲಿಕೇಶನ್ಗಳ ಮೇಲೆ ಪ್ರದರ್ಶಿಸಲು ಈ ಅಪ್ಲಿಕೇಶನ್ಗೆ ಅನುಮತಿ ನೀಡಿ. ನೀವು ಆ ಅಪ್ಲಿಕೇಶನ್ಗಳನ್ನು ಬಳಸುವುದರ ಮೇಲೆ ಇದು ಪರಿಣಾಮ ಬೀರಬಹುದು ಅಥವಾ ಅವು ಕಾಣಿಸುವ ಅಥವಾ ವರ್ತಿಸುವ ರೀತಿಯನ್ನು ಬದಲಾಯಿಸಬಹುದು."</string>
<string name="keywords_vr_listener" msgid="7441221822576384680">"ವಿಆರ್ ವರ್ಚುವಲ್ ರಿಯಾಲಿಟಿ ಕೇಳುವಿಕೆ ಸ್ಟೀರಿಯೊ ಸಹಾಯ ಸೇವೆ"</string>
- <string name="keywords_system_alert_window" msgid="5049498015597864850">"ಸಿಸ್ಟಂ ಅಲರ್ಟ್ ವಿಂಡೋ ಡಯಲಾಗ್ ಡಿಸ್ಪ್ಲೇ ಇತರ ಅಪ್ಲಿಕೇಶನ್ಗಳ ಮೇಲೆ"</string>
<string name="overlay_settings" msgid="6930854109449524280">"ಇತರ ಅಪ್ಲಿಕೇಶನ್ ಮೇಲೆ ಡಿಸ್ಪ್ಲೇ"</string>
<string name="system_alert_window_summary" msgid="602892301318324492">"<xliff:g id="COUNT_1">%2$d</xliff:g> ರಲ್ಲಿ <xliff:g id="COUNT_0">%1$d</xliff:g> ಅಪ್ಲಿಗಳಿಗೆ ಇತರ ಅಪ್ಲಿಗಳ ಮೇಲೆ ಪ್ರದರ್ಶಿಸಲು ಅನುಮತಿಯಿದೆ"</string>
<string name="filter_overlay_apps" msgid="6965969283342557573">"ಅನುಮತಿಯೊಂದಿಗೆ ಅಪ್ಲಿಕೇಶನ್ಗಳು"</string>
@@ -4125,7 +4122,6 @@
<string name="notification_log_details_none" msgid="184131801230614059">"ಯಾವುದೂ ಇಲ್ಲ"</string>
<string name="notification_log_details_ranking_null" msgid="244660392058720919">"ದರ್ಜೆ ನೀಡುವಿಕೆ ಆಬ್ಜೆಕ್ಟ್ ಕಾಣೆಯಾಗಿದೆ."</string>
<string name="notification_log_details_ranking_none" msgid="599607025882587844">"ದರ್ಜೆ ನೀಡುವಿಕೆ ಆಬ್ಜೆಕ್ಟ್ ಈ ಕೀ ಒಳಗೊಂಡಿಲ್ಲ."</string>
- <string name="theme_customization_category" msgid="1049181544004163283">"ಥೀಮ್"</string>
<string name="theme_customization_device_default" msgid="5058147707906551368">"ಸಾಧನದ ಡೀಫಾಲ್ಟ್"</string>
<string name="display_cutout_emulation" msgid="7466869822418376317">"ಡಿಸ್ಪ್ಲೇ ಕಟ್ಔಟ್"</string>
<string name="display_cutout_emulation_keywords" msgid="4495418317471622562">"ಕಟ್ಔಟ್ ಪ್ರದರ್ಶನ, ನಾಚ್"</string>
@@ -4551,6 +4547,8 @@
<string name="network_connection_errorstate_dialog_message" msgid="6953778550775646710">"ಏನೋ ಬಂದಿದೆ. ಸಾಧನವನ್ನು ಆರಿಸಲು ಆ್ಯಪ್ ವಿನಂತಿಯನ್ನು ರದ್ದುಗೊಳಿಸಿದೆ."</string>
<string name="network_connection_connect_successful" msgid="5935510954474494928">"ಸಂಪರ್ಕ ಯಶಸ್ವಿಯಾಗಿದೆ"</string>
<string name="network_connection_request_dialog_showall" msgid="6938922880244567521">"ಎಲ್ಲವನ್ನೂ ತೋರಿಸಿ"</string>
+ <string name="network_connection_searching_message" msgid="4638576789450817530">"ಸಾಧನವನ್ನು ಹುಡುಕಲಾಗುತ್ತಿದೆ…"</string>
+ <string name="network_connection_connecting_message" msgid="3740982406609245654">"ಸಾಧನವನ್ನು ಸಂಪರ್ಕಿಸಲಾಗುತ್ತಿದೆ…"</string>
<plurals name="show_bluetooth_devices" formatted="false" msgid="1715020480026568408">
<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>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index d2e6536..6474e6f 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -360,8 +360,6 @@
<string name="security_enable_widgets_disabled_summary" msgid="6392489775303464905">"관리자가 사용 중지함"</string>
<string name="lockdown_settings_title" msgid="7393790212603280213">"잠금 옵션 표시"</string>
<string name="lockdown_settings_summary" msgid="4359438673563318171">"잠금 화면에 Smart Lock, 생체 인식 잠금 해제, 알림을 사용 중지하는 전원 버튼 옵션 표시"</string>
- <string name="trust_agents_extend_unlock_title" msgid="2796555263565097031">"Trust Agent는 잠금 해제 연장만 가능"</string>
- <string name="trust_agents_extend_unlock_summary" msgid="3976344969220255010">"이 옵션을 사용 설정하면 Trust Agent가 기기를 더 오랫동안 잠금 해제된 상태로 유지하지만, 더 이상 기기의 잠금을 해제할 수는 없습니다."</string>
<string name="trust_lost_locks_screen_title" msgid="2992742466966021682">"신뢰를 잃었을 때 화면 잠금"</string>
<string name="trust_lost_locks_screen_summary" msgid="693784434582021206">"이 옵션을 사용 설정하면 마지막 Trust Agent가 신뢰를 잃었을 때 기기가 잠깁니다."</string>
<string name="owner_info_settings_summary" msgid="7472393443779227052">"없음"</string>
@@ -937,6 +935,7 @@
<string name="wifi_eap_identity" msgid="4359453783379679103">"ID"</string>
<string name="wifi_eap_anonymous" msgid="2989469344116577955">"익명 ID"</string>
<string name="wifi_password" msgid="5948219759936151048">"비밀번호"</string>
+ <string name="wifi_sae_password_id" msgid="1697832722221765763">"SAE 비밀번호 식별자"</string>
<string name="wifi_show_password" msgid="6461249871236968884">"비밀번호 표시"</string>
<string name="wifi_ap_band_config" msgid="1611826705989117930">"AP 대역 선택"</string>
<string name="wifi_ap_choose_auto" msgid="2677800651271769965">"자동"</string>
@@ -957,7 +956,6 @@
<string name="wifi_dpp_share_wifi" msgid="9065890131734833809">"Wi‑Fi 공유"</string>
<string name="wifi_dpp_scan_qr_code_with_another_device" msgid="5854392840857123065">"이 QR 코드를 스캔하여 \'<xliff:g id="SSID">%1$s</xliff:g>\'에 연결하고 비밀번호를 공유하세요."</string>
<string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="4436318319178361543">"이 QR 코드를 스캔하여 \'<xliff:g id="SSID">%1$s</xliff:g>\'에 연결"</string>
- <string name="wifi_dpp_could_not_detect_valid_qr_code" msgid="641893675646330576">"QR 코드를 읽을 수 없습니다. 코드를 재입력하고 다시 시도해 보세요."</string>
<string name="wifi_dpp_failure_authentication_or_configuration" msgid="3372757783382381044">"다시 시도해 보세요. 문제가 계속되면 기기 제조업체에 문의하세요."</string>
<string name="wifi_dpp_failure_not_compatible" msgid="2829930473520603740">"문제 발생"</string>
<string name="wifi_dpp_failure_timeout" msgid="5228320772245820458">"기기가 연결되어 있고 충전되어 있으며 전원이 켜져 있는지 확인합니다."</string>
@@ -980,6 +978,7 @@
<string name="wifi_dpp_hotspot_password" msgid="4120419278831581613">"핫스팟 비밀번호: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
<string name="wifi_dpp_add_device" msgid="4072206063308645677">"기기 추가"</string>
<string name="wifi_dpp_connect_network_using_qr_code" msgid="3887335309163999665">"QR 코드를 사용하여 네트워크에 기기 추가"</string>
+ <string name="wifi_dpp_qr_code_is_not_valid_format" msgid="3700087439867692944">"QR 코드가 유효한 형식이 아닙니다."</string>
<string name="retry" msgid="6472609612090877557">"재시도"</string>
<string name="wifi_shared" msgid="844142443226926070">"다른 기기 사용자와 공유"</string>
<string name="wifi_unchanged" msgid="3410422020930397102">"(변경 안함)"</string>
@@ -1129,6 +1128,7 @@
<string name="emergency_address_title" msgid="932729250447887545">"긴급 주소"</string>
<string name="emergency_address_summary" msgid="7751971156196115129">"Wi‑Fi를 통해 긴급 전화를 걸 때 내 위치로 사용됨"</string>
<string name="private_dns_help_message" msgid="3299567069152568958">"비공개 DNS 기능에 관해 "<annotation id="url">"자세히 알아보기"</annotation></string>
+ <string name="private_dns_mode_on" msgid="5882613439541371003">"사용"</string>
<string name="wifi_calling_pref_managed_by_carrier" msgid="6845711858866828986">"이동통신사에서 관리하는 설정"</string>
<string name="wifi_calling_settings_activation_instructions" msgid="7492509632478260955">"Wi-Fi 통화 활성화"</string>
<string name="wifi_calling_turn_on" msgid="1171403510313983983">"Wi-Fi 통화 사용 설정"</string>
@@ -1872,7 +1872,7 @@
<string name="default_emergency_app" msgid="1951760659640369980">"긴급 앱"</string>
<string name="reset_app_preferences" msgid="1321050641018356925">"앱 환경설정 초기화"</string>
<string name="reset_app_preferences_title" msgid="6093179367325336662">"앱 환경설정을 초기화하시겠습니까?"</string>
- <string name="reset_app_preferences_desc" msgid="4822447731869201512">"이 작업을 수행하면 다음 환경설정이 초기화됩니다.\n\n"<li>"사용 중지된 앱"</li>\n<li>"사용 중지된 앱 알림"</li>\n<li>"작업에 사용하는 기본 애플리케이션"</li>\n<li>"앱에 대한 백그라운드 데이터 제한"</li>\n<li>"그 밖의 권한 제한"</li>\n\n"앱 데이터는 손실되지 않습니다."</string>
+ <string name="reset_app_preferences_desc" msgid="731757609326016760">"이렇게 하면 다음 환경설정이 모두 재설정됩니다.\n\n"<li>"사용 중지된 앱"</li>\n<li>"사용 중지된 앱 알림"</li>\n<li>"작업에 사용되는 기본 애플리케이션"</li>\n<li>"앱의 백그라운드 데이터 제한"</li>\n<li>"모든 권한 제한"</li>\n\n"앱 데이터는 손실되지 않습니다."</string>
<string name="reset_app_preferences_button" msgid="2559089511841281242">"앱 초기화"</string>
<string name="manage_space_text" msgid="8852711522447794676">"공간 관리"</string>
<string name="filter" msgid="2018011724373033887">"필터"</string>
@@ -2087,7 +2087,7 @@
<string name="accessibility_screen_magnification_short_summary" msgid="3411979839172752057">"3번 탭하여 확대"</string>
<string name="accessibility_screen_magnification_navbar_short_summary" msgid="3693116360267980492">"버튼을 탭하여 확대/축소"</string>
<string name="accessibility_screen_magnification_summary" msgid="5258868553337478505"><b>"확대/축소하려면"</b>" 화면을 빠르게 세 번 탭합니다.\n"<ul><li>"스크롤하려면 2개 이상의 손가락으로 드래그합니다."</li>\n<li>"확대/축소 수준을 조정하려면 2개 이상의 손가락을 오므립니다."</li></ul>\n\n<b>"일시적으로 확대/축소하려면"</b>" 화면을 빠르게 세 번 탭하고 세 번째 탭에서 길게 누릅니다.\n"<ul><li>"화면에서 이동하려면 드래그합니다."</li>\n<li>"축소하려면 손가락을 뗍니다."</li></ul>\n\n"키보드나 탐색 메뉴는 확대할 수 없습니다."</string>
- <string name="accessibility_screen_magnification_navbar_summary" msgid="2272878354599332009">"확대 서비스를 사용 설정하면 화면을 확대할 수 있습니다.\n\n"<b>"화면을 확대하려면"</b>" 확대를 시작한 다음 화면에서 아무 곳이나 탭합니다.\n"<ul><li>"• 스크롤하려면 2개 이상의 손가락으로 드래그합니다."</li>\n<li>"• 확대/축소를 조정하려면 2개 이상의 손가락을 모읍니다."</li></ul>\n\n<b>"화면을 일시적으로 확대하려면"</b>" 확대를 시작한 다음 화면에서 아무 곳이나 길게 터치합니다.\n"<ul><li>"• 화면에서 이동하려면 드래그합니다."</li>\n<li>"• 축소하려면 손가락을 뗍니다."</li></ul>\n\n"키보드 또는 탐색 메뉴는 확대할 수 없습니다."</string>
+ <string name="accessibility_screen_magnification_navbar_summary" msgid="6700716275347612310">"확대 기능을 사용 설정하면 화면을 확대할 수 있습니다.\n\n"<b>"화면을 확대하려면"</b>" 확대 기능을 시작한 다음 화면에서 아무 곳이나 탭합니다.\n"<ul><li>"스크롤하려면 2개 이상의 손가락으로 드래그합니다."</li>\n<li>"확대/축소 수준을 조정하려면 2개 이상의 손가락을 모읍니다."</li></ul>\n\n<b>"화면을 일시적으로 확대하려면"</b>" 확대를 시작한 다음 화면에서 아무 곳이나 길게 터치합니다.\n"<ul><li>"화면에서 이동하려면 드래그합니다."</li>\n<li>"축소하려면 손가락을 뗍니다."</li></ul>\n\n"키보드 또는 탐색 메뉴는 확대할 수 없습니다."</string>
<string name="accessibility_tutorial_dialog_title_button" msgid="3682222614034474845">"접근성 버튼을 사용하여 열기"</string>
<string name="accessibility_tutorial_dialog_title_gesture" msgid="1342726230497913398">"동작을 사용해 열기"</string>
<string name="accessibility_tutorial_dialog_title_gesture_settings" msgid="8539392614235820285">"새로운 접근성 동작 사용"</string>
@@ -2140,8 +2140,7 @@
<string name="accessibility_hearingaid_title" msgid="8312145423610648518">"보청기"</string>
<string name="accessibility_hearingaid_not_connected_summary" msgid="6240237523789614599">"연결된 보청기가 없음"</string>
<string name="accessibility_hearingaid_adding_summary" msgid="2947474468412309778">"보청기 추가"</string>
- <string name="accessibility_hearingaid_pair_instructions_first_message" msgid="3912093691643131154">"보청기를 페어링하려면 다음 화면에서 기기를 찾아 탭하세요."</string>
- <string name="accessibility_hearingaid_pair_instructions_second_message" msgid="5596683393607650243">"보청기가 페어링 모드로 설정되어 있는지 확인하세요."</string>
+ <string name="accessibility_hearingaid_pair_instructions_message" msgid="3094382949733435414">"보청기를 페어링하려면 다음 화면에서 기기를 찾아 탭하세요. 보청기가 페어링 모드로 설정되어 있는지 확인하세요."</string>
<string name="accessibility_hearingaid_active_device_summary" msgid="3924362383258688984">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> 활성화됨"</string>
<plurals name="show_number_hearingaid_count" formatted="false" msgid="3160782397139295486">
<item quantity="other">보청기 <xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g>개가 저장되어 있습니다.</item>
@@ -2490,7 +2489,6 @@
<string name="menu_stats_last_unplugged" msgid="5922246077592434526">"마지막으로 플러그를 뽑은 이후 <xliff:g id="UNPLUGGED">%1$s</xliff:g> 동안"</string>
<string name="menu_stats_total" msgid="8973377864854807854">"총 사용량"</string>
<string name="menu_stats_refresh" msgid="1676215433344981075">"새로고침"</string>
- <string name="process_kernel_label" msgid="3916858646836739323">"Android OS"</string>
<string name="process_mediaserver_label" msgid="6500382062945689285">"미디어 서버"</string>
<string name="process_dex2oat_label" msgid="2592408651060518226">"앱 최적화"</string>
<string name="battery_saver" msgid="8172485772238572153">"절전 모드"</string>
@@ -2621,8 +2619,6 @@
<string name="no_device_admins" msgid="4846602835339095768">"사용할 수 있는 기기 관리자 앱이 없습니다."</string>
<string name="personal_device_admin_title" msgid="2849617316347669861">"개인"</string>
<string name="managed_device_admin_title" msgid="7853955652864478435">"직장"</string>
- <string name="sms_access_restriction_enabled" msgid="7054488078710530278">"SMS 및 통화 기록 액세스 제한"</string>
- <string name="sms_access_restriction_enabled_summary" msgid="6851339654677842328">"기본 전화 및 메시지 앱에만 SMS 및 통화 기록 권한 부여"</string>
<string name="no_trust_agents" msgid="7450273545568977523">"사용 가능한 Trust Agent 없음"</string>
<string name="add_device_admin_msg" msgid="1501847129819382149">"기기 관리자 앱을 활성화하시겠습니까?"</string>
<string name="add_device_admin" msgid="4192055385312215731">"이 기기 관리자 앱 활성화"</string>
@@ -3111,7 +3107,7 @@
<string name="keywords_app_default" msgid="5822717006354487071">"연결 앱"</string>
<string name="keywords_applications_settings" msgid="1268353611121497450">"애플리케이션"</string>
<string name="keywords_time_zone" msgid="998254736898753085">"시간대"</string>
- <string name="keywords_draw_overlay" msgid="4130899177619041842">"채팅 헤드"</string>
+ <string name="keywords_draw_overlay" msgid="1001120206241401007">"채팅 헤드, 시스템, 알림, 창, 대화상자, 디스플레이, 다른 앱 위에, 그리기"</string>
<string name="keywords_flashlight" msgid="6161632177705233710">"손전등, 빛, 토치"</string>
<string name="keywords_change_wifi_state" msgid="627068244033681010">"WiFi, Wi-Fi, 전환, 제어"</string>
<string name="keywords_more_mobile_networks" msgid="8995946622054642367">"셀룰러, 모바일, 이동통신사, 무선, 데이터, 4G, 3G, 2G, LTE"</string>
@@ -3135,7 +3131,7 @@
<string name="keywords_sounds_and_notifications_interruptions" msgid="5426093074031208917">"알림 일시중지, 방해, 중단, 중지"</string>
<string name="keywords_app" msgid="6334757056536837791">"RAM"</string>
<string name="keywords_location" msgid="4132655528196729043">"주변, 위치, 기록, 보고, GPS"</string>
- <string name="keywords_accounts" msgid="1957925565953357627">"계정"</string>
+ <string name="keywords_accounts" msgid="4479029747403203867">"계정, 계정 추가, 직장 프로필"</string>
<string name="keywords_users" msgid="3434190133131387942">"제한, 제한하다, 제한됨"</string>
<string name="keywords_keyboard_and_ime" msgid="9143339015329957107">"텍스트 수정, 수정, 사운드, 진동, 자동, 언어, 제스처, 제안, 추천, 테마, 불쾌감을 주는, 단어, 입력, 그림 이모티콘, 전 세계"</string>
<string name="keywords_reset_apps" msgid="5293291209613191845">"재설정, 환경설정, 기본값"</string>
@@ -3173,6 +3169,7 @@
<string name="keywords_storage_settings" msgid="297283751968446577">"메모리, 캐시, 데이터, 삭제, 지우기, 공간 확보, 공간"</string>
<string name="keywords_bluetooth_settings" msgid="6804844062789439858">"연결됨, 기기, 헤드폰, 헤드셋, 스피커, 무선, 페어링, 이어폰, 음악, 미디어"</string>
<string name="keywords_wallpaper" msgid="5058364390917429896">"백그라운드, 화면, 잠금 화면, 테마"</string>
+ <string name="keywords_styles" msgid="5828725481814049422">"아이콘 모양, 강조 색상, 글꼴"</string>
<string name="keywords_assist_input" msgid="5017533309492679287">"기본, 지원"</string>
<string name="keywords_default_payment_app" msgid="3838565809518896799">"결제, 기본"</string>
<string name="keywords_ambient_display" msgid="3103487805748659132">"수신 알림"</string>
@@ -3182,7 +3179,7 @@
<string name="keywords_notification_vibration" msgid="31924624421190547">"햅틱, 진동, 민감도"</string>
<string name="keywords_battery_saver_sticky" msgid="5586215686021650278">"절전 모드, 고정, 지속, 절전, 배터리"</string>
<string name="keywords_battery_saver_schedule" msgid="7358789228486231944">"루틴, 일정, 절전 모드, 전력 절약 모드, 배터리, 자동, 퍼센트"</string>
- <string name="keywords_add_an_account" msgid="6488139919428902434">"직장 프로필"</string>
+ <string name="keywords_enhance_4g_lte" msgid="2273810564244790859">"VoLTE, 고급 통화, 4G 통화"</string>
<string name="default_sound" msgid="8821684447333687810">"기본 사운드"</string>
<string name="sound_settings_summary" msgid="4100853606668287965">"벨소리 볼륨 <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
<string name="sound_dashboard_summary" msgid="3402435125958012986">"볼륨, 진동, 방해 금지 모드"</string>
@@ -3889,7 +3886,6 @@
<string name="permit_draw_overlay" msgid="7456536798718633432">"다른 앱 위에 표시 허용"</string>
<string name="allow_overlay_description" msgid="8961670023925421358">"이 앱이 사용 중인 다른 앱 위에 표시되도록 허용합니다. 이로 인해 다른 앱 사용에 방해를 받거나 앱의 표시 또는 작동 방식이 변경될 수도 있습니다."</string>
<string name="keywords_vr_listener" msgid="7441221822576384680">"VR 가상 현실 리스너 스테레오 도우미 서비스"</string>
- <string name="keywords_system_alert_window" msgid="5049498015597864850">"다른 앱 위에 표시 시스템 경고 대화상자 창"</string>
<string name="overlay_settings" msgid="6930854109449524280">"다른 앱 위에 표시"</string>
<string name="system_alert_window_summary" msgid="602892301318324492">"<xliff:g id="COUNT_1">%2$d</xliff:g>개 앱 중 다른 앱 위에 표시하도록 허용된 앱 <xliff:g id="COUNT_0">%1$d</xliff:g>개"</string>
<string name="filter_overlay_apps" msgid="6965969283342557573">"권한을 가진 앱"</string>
@@ -4125,7 +4121,6 @@
<string name="notification_log_details_none" msgid="184131801230614059">"없음"</string>
<string name="notification_log_details_ranking_null" msgid="244660392058720919">"순위 개체가 없습니다."</string>
<string name="notification_log_details_ranking_none" msgid="599607025882587844">"순위 개체가 이 키를 포함하지 않습니다."</string>
- <string name="theme_customization_category" msgid="1049181544004163283">"테마 설정"</string>
<string name="theme_customization_device_default" msgid="5058147707906551368">"기기 기본값"</string>
<string name="display_cutout_emulation" msgid="7466869822418376317">"디스플레이 컷아웃"</string>
<string name="display_cutout_emulation_keywords" msgid="4495418317471622562">"디스플레이 컷아웃, 노치"</string>
@@ -4551,6 +4546,8 @@
<string name="network_connection_errorstate_dialog_message" msgid="6953778550775646710">"문제가 발생했습니다. 애플리케이션에서 기기 선택 요청을 취소했습니다."</string>
<string name="network_connection_connect_successful" msgid="5935510954474494928">"연결되었습니다."</string>
<string name="network_connection_request_dialog_showall" msgid="6938922880244567521">"모두 표시"</string>
+ <string name="network_connection_searching_message" msgid="4638576789450817530">"기기 검색 중…"</string>
+ <string name="network_connection_connecting_message" msgid="3740982406609245654">"기기에 연결하는 중…"</string>
<plurals name="show_bluetooth_devices" formatted="false" msgid="1715020480026568408">
<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>
diff --git a/res/values-ky/strings.xml b/res/values-ky/strings.xml
index 56a90b1..dc818d5 100644
--- a/res/values-ky/strings.xml
+++ b/res/values-ky/strings.xml
@@ -359,8 +359,6 @@
<string name="security_enable_widgets_disabled_summary" msgid="6392489775303464905">"Администратор өчүрүп койгон"</string>
<string name="lockdown_settings_title" msgid="7393790212603280213">"Кулпулоо опциясын көрсөтүү"</string>
<string name="lockdown_settings_summary" msgid="4359438673563318171">"Күйгүзүү/өчүрүү баскычынын менюсуна Smart Lock\'ту, кулпуну биометрикалык ыкма менен ачуу параметрин жана кулпуланган экрандагы билдирмелерди өчүрө турган функция кошулат"</string>
- <string name="trust_agents_extend_unlock_title" msgid="2796555263565097031">"Ишенимдүү агенттиктерге гана кулпу ачуу"</string>
- <string name="trust_agents_extend_unlock_summary" msgid="3976344969220255010">"Эгер иштетилсе, ишенимдүү агенттиктер түзмөгүңүздү узагыраак убакытка кулпулабай сактап турат, бирок кулпуланган түзмөктү ача албайт."</string>
<string name="trust_lost_locks_screen_title" msgid="2992742466966021682">"Ишеним жоготулганда экранды кулпулоо"</string>
<string name="trust_lost_locks_screen_summary" msgid="693784434582021206">"Эгер иштетилсе, акыркы ишеним агенти ишеничин жоготкондо, түзмөк кулпуланып калат"</string>
<string name="owner_info_settings_summary" msgid="7472393443779227052">"Жок"</string>
@@ -936,6 +934,7 @@
<string name="wifi_eap_identity" msgid="4359453783379679103">"Идентификация"</string>
<string name="wifi_eap_anonymous" msgid="2989469344116577955">"Аныктыгы жашыруун"</string>
<string name="wifi_password" msgid="5948219759936151048">"Сырсөз"</string>
+ <string name="wifi_sae_password_id" msgid="1697832722221765763">"Сырсөздөрдүн аныктыгын бир убакта текшерүү (SAE) идентификатору"</string>
<string name="wifi_show_password" msgid="6461249871236968884">"Сырсөздү көрсөтүү"</string>
<string name="wifi_ap_band_config" msgid="1611826705989117930">"Wi-Fi жыштыгынын диапазону"</string>
<string name="wifi_ap_choose_auto" msgid="2677800651271769965">"Авто"</string>
@@ -956,7 +955,6 @@
<string name="wifi_dpp_share_wifi" msgid="9065890131734833809">"Wi‑Fi\'ды бөлүшүү"</string>
<string name="wifi_dpp_scan_qr_code_with_another_device" msgid="5854392840857123065">"\"<xliff:g id="SSID">%1$s</xliff:g>\" тармагына туташып, сырсөз менен бөлүшүү үчүн, бул QR кодун скандаңыз"</string>
<string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="4436318319178361543">"\"<xliff:g id="SSID">%1$s</xliff:g>\" тармагына туташуу үчүн, бул QR кодун скандаңыз"</string>
- <string name="wifi_dpp_could_not_detect_valid_qr_code" msgid="641893675646330576">"QR коду окулган жок. Кодду кайра киргизип, кайталаңыз"</string>
<string name="wifi_dpp_failure_authentication_or_configuration" msgid="3372757783382381044">"Кайра аракет кылыңыз. Эгер маселе чечилбесе, түзмөктү өндүрүүчүгө кайрылыңыз"</string>
<string name="wifi_dpp_failure_not_compatible" msgid="2829930473520603740">"Бир жерден ката кетти"</string>
<string name="wifi_dpp_failure_timeout" msgid="5228320772245820458">"Түзмөк розеткага сайылып, кубатталып жана күйүп турганын текшериңиз"</string>
@@ -979,6 +977,7 @@
<string name="wifi_dpp_hotspot_password" msgid="4120419278831581613">"Байланыш түйүнүнүн сырсөзү: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
<string name="wifi_dpp_add_device" msgid="4072206063308645677">"Түзмөк кошуу"</string>
<string name="wifi_dpp_connect_network_using_qr_code" msgid="3887335309163999665">"Түзмөктү бул тармакка кошуу үчүн, QR кодун колдонуңуз"</string>
+ <string name="wifi_dpp_qr_code_is_not_valid_format" msgid="3700087439867692944">"QR кодунун форматы жараксыз"</string>
<string name="retry" msgid="6472609612090877557">"Кайталоо"</string>
<string name="wifi_shared" msgid="844142443226926070">"Түзмөктүн башка колдонуучулары менен бөлүшүлсүн"</string>
<string name="wifi_unchanged" msgid="3410422020930397102">"(өзгөрбөгөн)"</string>
@@ -1128,6 +1127,7 @@
<string name="emergency_address_title" msgid="932729250447887545">"Өзгөчө кырдаалда кайрыла турган дарек"</string>
<string name="emergency_address_summary" msgid="7751971156196115129">"WiFi аркылуу өзгөчө кырдаалдар кызматынын номерине чалганыңызда куткаруучуларга жайгашкан жериңиз катары көрсөтүлөт"</string>
<string name="private_dns_help_message" msgid="3299567069152568958">"Жеке DNS функциялары жөнүндө "<annotation id="url">"кененирээк маалымат"</annotation>" алыңыз"</string>
+ <string name="private_dns_mode_on" msgid="5882613439541371003">"Күйүк"</string>
<string name="wifi_calling_pref_managed_by_carrier" msgid="6845711858866828986">"Жөндөө байланыш оператору тарабынан башкарылат"</string>
<string name="wifi_calling_settings_activation_instructions" msgid="7492509632478260955">"Wi-Fi аркылуу чалууну жандыруу"</string>
<string name="wifi_calling_turn_on" msgid="1171403510313983983">"Wi-Fi аркылуу чалууну күйгүзүү"</string>
@@ -1871,7 +1871,7 @@
<string name="default_emergency_app" msgid="1951760659640369980">"Өзгөчө кырдаал колдонмосу"</string>
<string name="reset_app_preferences" msgid="1321050641018356925">"Колдонмонун жөндөөлөрүн кайра коюу"</string>
<string name="reset_app_preferences_title" msgid="6093179367325336662">"Колдонмо кайра баштан жөндөлсүнбү?"</string>
- <string name="reset_app_preferences_desc" msgid="4822447731869201512">"Ушуну менен төмөнкү жөндөөлөр жоюлат:\n\n"<li>"Өчүрүлгөн колдонмолор"</li>\n<li>"Өчүрүлгөн колдонмолордун билдирмелери"</li>\n<li>"Демейки колдонмолор"</li>\n<li>"Фондук дайындарга коюлган чектөөлөр"</li>\n<li>"Бардык уруксат чектөөлөрү"</li>\n\n"Колдонмолордун дайындары жоголбойт."</string>
+ <string name="reset_app_preferences_desc" msgid="731757609326016760">"Ушуну менен төмөнкүлөр үчүн бардык жөндөөлөр баштапкы абалына келтирилет:\n\n"<li>"Өчүрүлгөн колдонмолор"</li>\n<li>"Өчүрүлгөн колдонмолордун билдирмелери"</li>\n<li>"Демейки колдонмолордун аракеттери"</li>\n<li>"Колдонмолордун Фондук режиминдеги чектөөлөрү"</li>\n<li>"Бардык уруксаттарды чектөөлөр"</li>\n\n"Колдонмонун бардык дайындары сакталып калат."</string>
<string name="reset_app_preferences_button" msgid="2559089511841281242">"Баштапкы абалга келтирүү"</string>
<string name="manage_space_text" msgid="8852711522447794676">"Бош орунду башкаруу"</string>
<string name="filter" msgid="2018011724373033887">"Чыпка"</string>
@@ -2086,7 +2086,7 @@
<string name="accessibility_screen_magnification_short_summary" msgid="3411979839172752057">"Өлчөмүн өзгөртүү үчүн 3 жолу таптаңыз"</string>
<string name="accessibility_screen_magnification_navbar_short_summary" msgid="3693116360267980492">"Чоңойтуп/кичирейтүү үчүн баскычты басыңыз"</string>
<string name="accessibility_screen_magnification_summary" msgid="5258868553337478505"><b>"Чоңойтуу үчүн"</b>" экранды бир манжаңыз менен 3 жолу бат-бат таптаңыз.\n"<ul><li>"Эки манжаңыз менен сыдырып карасаңыз болот."</li>\n<li>"Масштабын тууралоо үчүн эки манжаңызды бириктирип жана ажыратыңыз."</li></ul>\n\n<b>"Ал эми убактылуу чоңойтуу үчүн"</b>" экранды 3 жолу бат-бат таптап, үчүнчүсүндө манжаңызды басып туруңуз.\n"<ul><li>"Көрүнүштүн экранга батпаган жерлерин ары-бери сүйрөп карасаңыз болот."</li>\n<li>"Кичирейтүү үчүн манжаңызды көтөрүп коюңуз."</li></ul>\n\n"Баскычтоптон же чабыттоо тилкесинен чоңойто албайсыз."</string>
- <string name="accessibility_screen_magnification_navbar_summary" msgid="2272878354599332009">"Бул функциянын жардамы менен, экрандагы нерсени чоңойтуп, кичирейте аласыз.\n\n"<b>"Чоңойткуңуз келсе"</b>", кызматты иштетип туруп, экрандын бир жерин басыңыз.\n"<ul><li>"• Чоңойгон жерди ары-бери жылдырып көргүңүз келсе, экранды эки же үч манжаңыз менен сүрүңүз."</li>\n<li>"• Чоңойтуп/кичирейтүү үчүн эки же үч манжаңызды бириктирип/ажыратыңыз."</li></ul>\n\n<b>"Убактылуу чоңойтуп/кичирейтүү үчүн"</b>" кызматты иштетип, экрандын бир жерин коё бербей басып туруңуз.\n"<ul><li>"• Экранды жылдырып көрүү үчүн аны манжаңыз менен сүрүңүз."</li>\n<li>"• Кызматты өчүрүү үчүн манжаңызды көтөрүңүз."</li></ul>\n\n"Баскычтопто же чабыттоо тилкесинде көрүнүш чоңойбойт."</string>
+ <string name="accessibility_screen_magnification_navbar_summary" msgid="6700716275347612310">"Бул функциянын жардамы менен, экрандагы нерсени чоңойтуп, кичирейте аласыз.\n\n"<b>"Чоңойткуңуз келсе"</b>", кызматты иштетип туруп, экрандын бир жерин басыңыз.\n"<ul><li>"Чоңойгон жерди ары-бери жылдырып көргүңүз келсе, экранды эки же үч манжаңыз менен сүрүңүз."</li>\n<li>"Чоңойтуп/кичирейтүү үчүн эки же үч манжаңызды бириктирип/ажыратыңыз."</li></ul>\n\n<b>"Убактылуу чоңойтуп/кичирейтүү үчүн"</b>" кызматты иштетип, экрандын бир жерин коё бербей басып туруңуз.\n"<ul><li>"Экранды жылдырып көрүү үчүн аны манжаңыз менен сүрүңүз."</li>\n<li>"Кызматты өчүрүү үчүн манжаңызды көтөрүңүз."</li></ul>\n\n"Баскычтопто же чабыттоо тилкесинде көрүнүш чоңойбойт."</string>
<string name="accessibility_tutorial_dialog_title_button" msgid="3682222614034474845">"Ачуу үчүн Атайын мүмкүнчүлүктөр баскычын басыңыз"</string>
<string name="accessibility_tutorial_dialog_title_gesture" msgid="1342726230497913398">"Ачуу үчүн жаңсаңыз"</string>
<string name="accessibility_tutorial_dialog_title_gesture_settings" msgid="8539392614235820285">"Жаңы атайын мүмкүнчүлүктөр жаңсоосун колдонуңуз"</string>
@@ -2139,8 +2139,7 @@
<string name="accessibility_hearingaid_title" msgid="8312145423610648518">"Угуу аппараттары"</string>
<string name="accessibility_hearingaid_not_connected_summary" msgid="6240237523789614599">"Бир да угуу аппараты туташкан эмес"</string>
<string name="accessibility_hearingaid_adding_summary" msgid="2947474468412309778">"Угуу аппараттарын кошуу"</string>
- <string name="accessibility_hearingaid_pair_instructions_first_message" msgid="3912093691643131154">"Угуу аппаратыңызды туташтыруу үчүн кийинки экранда аталышын басыңыз."</string>
- <string name="accessibility_hearingaid_pair_instructions_second_message" msgid="5596683393607650243">"Угуу аппараттарыңыз жупташтыруу режиминде экенин текшериңиз."</string>
+ <string name="accessibility_hearingaid_pair_instructions_message" msgid="3094382949733435414">"Угуу аппаратыңызды туташтыруу үчүн кийинки экранда аталышын басыңыз. Угуу аппараттарыңыз туташуу режиминде болушу керек."</string>
<string name="accessibility_hearingaid_active_device_summary" msgid="3924362383258688984">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> жандырылган"</string>
<plurals name="show_number_hearingaid_count" formatted="false" msgid="3160782397139295486">
<item quantity="other"><xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> угуу аппараты сакталган</item>
@@ -2489,7 +2488,6 @@
<string name="menu_stats_last_unplugged" msgid="5922246077592434526">"Акыркы жолу суурулгандан бери <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
<string name="menu_stats_total" msgid="8973377864854807854">"Жалпы колдонулушу"</string>
<string name="menu_stats_refresh" msgid="1676215433344981075">"Жаңылоо"</string>
- <string name="process_kernel_label" msgid="3916858646836739323">"Android OS"</string>
<string name="process_mediaserver_label" msgid="6500382062945689285">"Медиа сервер"</string>
<string name="process_dex2oat_label" msgid="2592408651060518226">"Колдонмону оптималдаштыруу"</string>
<string name="battery_saver" msgid="8172485772238572153">"Батареяны үнөмдөгүч"</string>
@@ -2620,8 +2618,6 @@
<string name="no_device_admins" msgid="4846602835339095768">"Түзмөктү башкарган колдонмолор жок"</string>
<string name="personal_device_admin_title" msgid="2849617316347669861">"Жеке"</string>
<string name="managed_device_admin_title" msgid="7853955652864478435">"Жумуш"</string>
- <string name="sms_access_restriction_enabled" msgid="7054488078710530278">"SMS жана чалуулар таржымалын колдонууну чектөө"</string>
- <string name="sms_access_restriction_enabled_summary" msgid="6851339654677842328">"SMS жана чалуулар таржамалын телефондогу демейки чалуу жана жазышуу колдонмолору гана колдоно алышат"</string>
<string name="no_trust_agents" msgid="7450273545568977523">"Учурда ишеним агенттери жок"</string>
<string name="add_device_admin_msg" msgid="1501847129819382149">"Түзмөктү башкарган колдонмо"</string>
<string name="add_device_admin" msgid="4192055385312215731">"Түзмөктү башкарган колдонмону иштетүү"</string>
@@ -3110,7 +3106,7 @@
<string name="keywords_app_default" msgid="5822717006354487071">"Төмөнкү менен ачуу:"</string>
<string name="keywords_applications_settings" msgid="1268353611121497450">"Колдонмолор"</string>
<string name="keywords_time_zone" msgid="998254736898753085">"убакыт алкагы"</string>
- <string name="keywords_draw_overlay" msgid="4130899177619041842">"Chat колдонмосун биринчи көрсөтүү"</string>
+ <string name="keywords_draw_overlay" msgid="1001120206241401007">"Chat колдонмосун биринчи көрсөтүү, тутум, эскертүү, терезе, диалог, дисплей, башка колдонмолордун үстүндө, тартуу"</string>
<string name="keywords_flashlight" msgid="6161632177705233710">"Жарк этме , Жарык, Колчырак"</string>
<string name="keywords_change_wifi_state" msgid="627068244033681010">"wifi, wi-fi, өчүрүү/күйгүзүү, көзөмөлдөө"</string>
<string name="keywords_more_mobile_networks" msgid="8995946622054642367">"уюлдук, мобилдик түзмөк, байланыш оператору, зымсыз, дайындар, 4g, 3g, 2g, lte"</string>
@@ -3134,7 +3130,7 @@
<string name="keywords_sounds_and_notifications_interruptions" msgid="5426093074031208917">"тынчымды алба, үзүү, үзгүлтүккө учуроо, тыныгуу"</string>
<string name="keywords_app" msgid="6334757056536837791">"RAM"</string>
<string name="keywords_location" msgid="4132655528196729043">"жакын, жайгашкан жер, таржымал, кабар берүү, GPS"</string>
- <string name="keywords_accounts" msgid="1957925565953357627">"аккаунт"</string>
+ <string name="keywords_accounts" msgid="4479029747403203867">"аккаунт, аккаунт кошуу, жумуш профили"</string>
<string name="keywords_users" msgid="3434190133131387942">"чектөө, чектөө, чектелген"</string>
<string name="keywords_keyboard_and_ime" msgid="9143339015329957107">"текст тууралоо, туура, добуш, дирилдөө, авто, тил, жаңсоо, сунуштоо, сунуш, тема, адепсиз, сөз, түрү, быйтыкча, эларалык"</string>
<string name="keywords_reset_apps" msgid="5293291209613191845">"баштапкы абалга келтирүү, жеке жөндөөлөр, демейки"</string>
@@ -3172,6 +3168,7 @@
<string name="keywords_storage_settings" msgid="297283751968446577">"эстутум, кеш, дайындар, жок кылуу, тазалоо, акысыз, орун"</string>
<string name="keywords_bluetooth_settings" msgid="6804844062789439858">"туташкан, түзмөк, гарнитура, гарнитура, динамик, зымсыз, жупташтыруу, кулаккаптар, музыка, медиа"</string>
<string name="keywords_wallpaper" msgid="5058364390917429896">"фон, экран, кулпуланган экран, тема"</string>
+ <string name="keywords_styles" msgid="5828725481814049422">"сүрөтчөнүн формасы, басымдуу түс, арип"</string>
<string name="keywords_assist_input" msgid="5017533309492679287">"демейки, жардамчы"</string>
<string name="keywords_default_payment_app" msgid="3838565809518896799">"төлөм, демейки"</string>
<string name="keywords_ambient_display" msgid="3103487805748659132">"кирүүчү эскертме"</string>
@@ -3181,7 +3178,7 @@
<string name="keywords_notification_vibration" msgid="31924624421190547">"сенсорлор, дирилдөө, сезгичтик"</string>
<string name="keywords_battery_saver_sticky" msgid="5586215686021650278">"батареяны үнөмдөгүч, кадалган, үнөмдөө, кубатты үнөмдөгүч, батарея"</string>
<string name="keywords_battery_saver_schedule" msgid="7358789228486231944">"тартип, ырааттама, батареяны үнөмдөгүч режими, батареяны үнөмдөгүч, батаеря, автоматтык түрдө, пайыз"</string>
- <string name="keywords_add_an_account" msgid="6488139919428902434">"жумуш профили"</string>
+ <string name="keywords_enhance_4g_lte" msgid="2273810564244790859">"volte, өркүндөтүлгөн чалуу, 4g чалуу"</string>
<string name="default_sound" msgid="8821684447333687810">"Демейки үн"</string>
<string name="sound_settings_summary" msgid="4100853606668287965">"Шыңгырдын катуулугу <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
<string name="sound_dashboard_summary" msgid="3402435125958012986">"Үн деңгээли, дирилдөө, \"Тынчымды алба\" режими"</string>
@@ -3888,7 +3885,6 @@
<string name="permit_draw_overlay" msgid="7456536798718633432">"Башка терезелердин үстүнөн көрсөтүүгө уруксат"</string>
<string name="allow_overlay_description" msgid="8961670023925421358">"Бул колдонмону башка терезелердин үстүнөн көрсөтүүгө уруксат бериңиз. Бирок башка колдонмолорду пайдаланууга тоскоол болуп же алардын интерфейсин бузуп салышы мүмкүн."</string>
<string name="keywords_vr_listener" msgid="7441221822576384680">"vr виртуалдык дүйнө режими көмөкчү кызмат"</string>
- <string name="keywords_system_alert_window" msgid="5049498015597864850">"системдик шашылыш билдирүүлөр башка колдонмолордун үстүнөн көрүнөт"</string>
<string name="overlay_settings" msgid="6930854109449524280">"Башка терезел-н үст-н көрсөтүү"</string>
<string name="system_alert_window_summary" msgid="602892301318324492">"<xliff:g id="COUNT_1">%2$d</xliff:g> колдонмодон <xliff:g id="COUNT_0">%1$d</xliff:g> колдонмо башка терезелердин үстүнөн көрсөтүлөт"</string>
<string name="filter_overlay_apps" msgid="6965969283342557573">"Уруксаты бар колдонмолор"</string>
@@ -4124,7 +4120,6 @@
<string name="notification_log_details_none" msgid="184131801230614059">"эч бири"</string>
<string name="notification_log_details_ranking_null" msgid="244660392058720919">"Баалануучу объект жок болуп жатат."</string>
<string name="notification_log_details_ranking_none" msgid="599607025882587844">"Баалануучу объектте мындай ачкыч жок."</string>
- <string name="theme_customization_category" msgid="1049181544004163283">"Теманы ыңгайлаштыруу"</string>
<string name="theme_customization_device_default" msgid="5058147707906551368">"Түзмөктүн демейки параметри"</string>
<string name="display_cutout_emulation" msgid="7466869822418376317">"Экрандагы кесинди"</string>
<string name="display_cutout_emulation_keywords" msgid="4495418317471622562">"дисплейдин кесиндиси, кетик"</string>
@@ -4550,6 +4545,8 @@
<string name="network_connection_errorstate_dialog_message" msgid="6953778550775646710">"Бир нерсе болду. Колдонмо түзмөктү тандоо сурамын жокко чыгарды."</string>
<string name="network_connection_connect_successful" msgid="5935510954474494928">"Ийгиликтүү туташты"</string>
<string name="network_connection_request_dialog_showall" msgid="6938922880244567521">"Баарын көрсөтүү"</string>
+ <string name="network_connection_searching_message" msgid="4638576789450817530">"Түзмөк изделүүдө…"</string>
+ <string name="network_connection_connecting_message" msgid="3740982406609245654">"Түзмөккө туташууда…"</string>
<plurals name="show_bluetooth_devices" formatted="false" msgid="1715020480026568408">
<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>
diff --git a/res/values-lo/strings.xml b/res/values-lo/strings.xml
index dd6d53c..9ff1917 100644
--- a/res/values-lo/strings.xml
+++ b/res/values-lo/strings.xml
@@ -360,8 +360,6 @@
<string name="security_enable_widgets_disabled_summary" msgid="6392489775303464905">"ຖືກຜູ້ເບິ່ງແຍງລະບົບປິດໄວ້"</string>
<string name="lockdown_settings_title" msgid="7393790212603280213">"ສະແດງຕົວເລືອກການລັອກ"</string>
<string name="lockdown_settings_summary" msgid="4359438673563318171">"ສະແດງຕົວເລືອກປຸ່ມເປີດ/ປິດທີ່ປິດ Smart Lock, ການປົດລອກດ້ວຍລະບົບຊີວະມິຕິ ແລະ ການແຈ້ງເຕືອນຢູ່ໜ້າຈໍລັອກ"</string>
- <string name="trust_agents_extend_unlock_title" msgid="2796555263565097031">"ຕົວແທນທີ່ເຊື່ອຖືໄດ້ຈະຂະຫຍາຍການປົດລັອກເທົ່ານັ້ນ"</string>
- <string name="trust_agents_extend_unlock_summary" msgid="3976344969220255010">"ຫາກເປີດໃຊ້, ຕົວແທນທີ່ເຊື່ອຖືໄດ້ຈະປົດລັອກອຸປະກອນຂອງທ່ານໄວ້ດົນຂຶ້ນ, ແຕ່ຈະບໍ່ສາມາດປົດລັອກອຸປະກອນທີ່ຖືກລັອກໄປແລ້ວໄດ້."</string>
<string name="trust_lost_locks_screen_title" msgid="2992742466966021682">"ລັອກໜ້າຈໍເມື່ອສູນເສຍຄວາມເຊື່ອຖື"</string>
<string name="trust_lost_locks_screen_summary" msgid="693784434582021206">"ຫາກເປີດໃຊ້, ອຸປະກອນຈະລັອກເມື່ອເອເຈນທີ່ເຊື່ອຖືຫຼ້າສຸດສູນເສຍຄວາມເຊື່ອຖືໄປ"</string>
<string name="owner_info_settings_summary" msgid="7472393443779227052">"ບໍ່ມີ"</string>
@@ -937,6 +935,8 @@
<string name="wifi_eap_identity" msgid="4359453783379679103">"ການລະບຸໂຕຕົນ"</string>
<string name="wifi_eap_anonymous" msgid="2989469344116577955">"ໂຕຕົນທີ່ບໍ່ລະບຸຊື່"</string>
<string name="wifi_password" msgid="5948219759936151048">"ລະຫັດຜ່ານ"</string>
+ <!-- no translation found for wifi_sae_password_id (1697832722221765763) -->
+ <skip />
<string name="wifi_show_password" msgid="6461249871236968884">"ສະແດງລະຫັດຜ່ານ"</string>
<string name="wifi_ap_band_config" msgid="1611826705989117930">"ເລືອກຄື້ນ AP"</string>
<string name="wifi_ap_choose_auto" msgid="2677800651271769965">"ອັດຕະໂນມັດ"</string>
@@ -957,7 +957,6 @@
<string name="wifi_dpp_share_wifi" msgid="9065890131734833809">"ແບ່ງປັນ Wi‑Fi"</string>
<string name="wifi_dpp_scan_qr_code_with_another_device" msgid="5854392840857123065">"ສະແກນລະຫັດ QR ນີ້ເພື່ອເຊື່ອມຕໍ່ຫາ “<xliff:g id="SSID">%1$s</xliff:g>” ແລະ ແບ່ງປັນລະຫັດຜ່ານ"</string>
<string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="4436318319178361543">"ສະແກນລະຫັດ QR ນີ້ເພື່ອເຊື່ອມຕໍ່ຫາ “<xliff:g id="SSID">%1$s</xliff:g>”"</string>
- <string name="wifi_dpp_could_not_detect_valid_qr_code" msgid="641893675646330576">"ບໍ່ສາມາດອ່ານລະຫັດ QR ໄດ້. ໃສ່ລະຫັດອີກເທື່ອໜຶ່ງແລ້ວລອງໃໝ່."</string>
<string name="wifi_dpp_failure_authentication_or_configuration" msgid="3372757783382381044">"ລອງໃໝ່ອີກເທື່ອໜຶ່ງ. ຫາກຍັງຄົງພົບບັນຫາຢູ່, ກະລຸນາຕິດຕໍ່ຜູ້ຜະລິດອຸປະກອນ"</string>
<string name="wifi_dpp_failure_not_compatible" msgid="2829930473520603740">"ມີບາງຢ່າງຜິດພາດ"</string>
<string name="wifi_dpp_failure_timeout" msgid="5228320772245820458">"ກະລຸນາກວດສອບວ່າສຽບສາຍອຸປະກອນແລ້ວ, ສາກເຕັມແລ້ວ ແລະ ເປີດໃຊ້ແລ້ວ"</string>
@@ -980,6 +979,7 @@
<string name="wifi_dpp_hotspot_password" msgid="4120419278831581613">"ລະຫັດຜ່ານຮັອດສະປອດ: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
<string name="wifi_dpp_add_device" msgid="4072206063308645677">"ເພີ່ມອຸປະກອນ"</string>
<string name="wifi_dpp_connect_network_using_qr_code" msgid="3887335309163999665">"ໃຊ້ລະຫັດ QR ເພື່ອເພີ່ມອຸປະກອນໃສ່ເຄືອຂ່າຍນີ້"</string>
+ <string name="wifi_dpp_qr_code_is_not_valid_format" msgid="3700087439867692944">"ຮູບແບບລະຫັດ QR ບໍ່ຖືກຕ້ອງ"</string>
<string name="retry" msgid="6472609612090877557">"ລອງໃໝ່"</string>
<string name="wifi_shared" msgid="844142443226926070">"ແບ່ງປັນກັບຜູ້ໃຊ້ອຸປະກອນອື່ນ"</string>
<string name="wifi_unchanged" msgid="3410422020930397102">"(ບໍ່ມີການປ່ຽນແປງ)"</string>
@@ -1129,6 +1129,7 @@
<string name="emergency_address_title" msgid="932729250447887545">"ທີ່ຢູ່ສຸກເສີນ"</string>
<string name="emergency_address_summary" msgid="7751971156196115129">"ໃຊ້ເປັນສະຖານທີ່ຂອງທ່ານເມື່ອທ່ານໂທສຸກເສີນຜ່ານທາງ Wi‑Fi"</string>
<string name="private_dns_help_message" msgid="3299567069152568958"><annotation id="url">"ສຶກສາເພີ່ມເຕີມ"</annotation>" ກ່ຽວກັບຄຸນສົມບັດ DNS ສ່ວນຕົວ"</string>
+ <string name="private_dns_mode_on" msgid="5882613439541371003">"ເປີດ"</string>
<string name="wifi_calling_pref_managed_by_carrier" msgid="6845711858866828986">"ການຕັ້ງຄ່າຖືກຈັດການໂດຍຜູ້ໃຫ້ບໍລິການເຄືອຂ່າຍ"</string>
<string name="wifi_calling_settings_activation_instructions" msgid="7492509632478260955">"ກຳລັງເປີດໃຊ້ການໂທ Wi-Fi"</string>
<string name="wifi_calling_turn_on" msgid="1171403510313983983">"ເປີດໃຊ້ການໂທ Wi-Fi"</string>
@@ -1872,7 +1873,7 @@
<string name="default_emergency_app" msgid="1951760659640369980">"ແອັບສຸກເສີນ"</string>
<string name="reset_app_preferences" msgid="1321050641018356925">"ຣີເຊັດການຕັ້ງຄ່າແອັບ"</string>
<string name="reset_app_preferences_title" msgid="6093179367325336662">"ຣີເຊັດການຕັ້ງຄ່າຕ່າງໆຂອງແອັບບໍ?"</string>
- <string name="reset_app_preferences_desc" msgid="4822447731869201512">"ຂັ້ນຕອນນີ້ຈະຣີເຊັດການຕັ້ງຄ່າທັງໝົດຂອງ:\n\n"<li>"ແອັບທີ່ປິດການນຳໃຊ້"</li>\n<li>"ການແຈ້ງເຕືອນແອັບທີ່ປິດການນຳໃຊ້"</li>\n<li>"ແອັບພລິເຄຊັນເລີ່ມຕົ້ນສຳລັບການເຮັດວຽກຕ່າງໆ"</li>\n<li>"ການຈຳກັດຂໍ້ມູນພື້ນຫຼັງສຳລັບແອັບ"</li>\n<li>"ການຈຳກັດອະນຸຍາດໃດໆທີ່ຕັ້ງໄວ້"</li>\n\n"ຂໍ້ມູນແອັບໃດໆທີ່ມີຢູ່ຈະຍັງຄົງມີຢູ່ຄືເກົ່າ."</string>
+ <string name="reset_app_preferences_desc" msgid="731757609326016760">"ນີ້ຈະຣີເຊັດການຕັ້ງຄ່າທັງໝົດສຳລັບ:\n\n"<li>"ແອັບທີ່ປິດນຳໃຊ້"</li>\n<li>"ການແຈ້ງເຕືອນແອັບທີ່ປິດນຳໃຊ້"</li>\n<li>"ແອັບພລິເຄຊັນເລີ່ມຕົ້ນສຳລັບຄຳສັ່ງຕ່າງໆ"</li>\n<li>"ການຈຳກັດຂໍ້ມູນໃນພື້ນຫຼັງສຳລັບແອັບ"</li>\n<li>"ການຈຳກັດການອະນຸຍາດຕ່າງໆ"</li>\n\n"ທ່ານຈະບໍ່ເສຍຂໍ້ມູນແອັບໃດໆ."</string>
<string name="reset_app_preferences_button" msgid="2559089511841281242">"ຣີເຊັດແອັບ"</string>
<string name="manage_space_text" msgid="8852711522447794676">"ຈັດການພື້ນທີ່"</string>
<string name="filter" msgid="2018011724373033887">"ໂຕກັ່ນຕອງ"</string>
@@ -2087,7 +2088,7 @@
<string name="accessibility_screen_magnification_short_summary" msgid="3411979839172752057">"ແຕະ 3 ຄັ້ງເພື່ອຊູມ"</string>
<string name="accessibility_screen_magnification_navbar_short_summary" msgid="3693116360267980492">"ແຕະປຸ່ມເພື່ອຊູມ"</string>
<string name="accessibility_screen_magnification_summary" msgid="5258868553337478505"><b>"ເພື່ອຊູມ"</b>", ໃຫ້ແຕະໃສ່ໜ້າຈໍໄວໆ 3 ເທື່ອ.\n"<ul><li>"ລາກສອງນິ້ວຂຶ້ນໄປເພື່ອເລື່ອນ"</li>\n<li>"ຖ່າງສອງນິ້ວຂຶ້ນໄປເພື່ອປັບແຕ່ງລະດັບການຊູມ"</li></ul>\n\n<b>"ເພື່ອຊູມຊົ່ວຄາວ"</b>", ໃຫ້ແຕະໃສ່ໜ້າຈໍໄວໆ 3 ເທື່ອ ແລ້ວກົດນິ້ວຂອງທ່ານລົງຄ້າງໄວ້ໃນເທື່ອທີສາມ.\n"<ul><li>"ລາກເພື່ອເລື່ອນໄປມາຢູ່ໜ້າຈໍ"</li>\n<li>"ຍົກນິ້ວຂຶ້ນເພື່ອຊູມອອກ"</li></ul>\n\n"ທ່ານບໍ່ສາມາດຊູມໃສ່ແປ້ນພິມ ຫຼື ແຖບການນຳທາງໄດ້."</string>
- <string name="accessibility_screen_magnification_navbar_summary" msgid="2272878354599332009">"ເມື່ອເປີດໃຊ້ການຂະຫຍາຍແລ້ວ, ທ່ານຈະສາມາດຊູມເຂົ້າຢູ່ໜ້າຈໍຂອງທ່ານໄດ້.\n\n"<b>"ເພື່ອຊູມ"</b>", ໃຫ້ເລີ່ມການຂະຫຍາຍກ່ອນ, ຈາກນັ້ນແຕະໃສ່ບ່ອນໃດກໍໄດ້ຢູ່ໜ້າຈໍ.\n"<ul><li>"• ລາກ 2 ນິ້ວຂຶ້ນໄປເພື່ອເລື່ອນ"</li>\n<li>"• ຖ່າງ 2 ນິ້ວຂຶ້ນໄປເພື່ອປັບແຕ່ງການຊູມ"</li></ul>\n\n<b>"ເພື່ອຊູມຊົ່ວຄາວ"</b>", ໃຫ້ເລີ່ມການຂະຫຍາຍ, ຈາກນັ້ນແຕະບ່ອນໃດກໍໄດ້ຢູ່ໜ້າຈໍຄ້າງໄວ້.\n"<ul><li>"• ລາກເພື່ອຍ້າຍໄປມາຢູ່ໜ້າຈໍ"</li>\n<li>"• ຍົກນິ້ວເພື່ອຊູມອອກ"</li></ul>\n\n"ທ່ານບໍ່ສາມາດຊູມເຂົ້າຢູ່ແປ້ນພິມ ຫຼື ແຖບການນຳທາງໄດ້."</string>
+ <string name="accessibility_screen_magnification_navbar_summary" msgid="6700716275347612310">"ເມື່ອເປີດໃຊ້ການຂະຫຍາຍແລ້ວ, ທ່ານສາມາດຊູມເຂົ້າຢູ່ໜ້າຈໍຂອງທ່ານໄດ້.\n\n"<b>"ເພື່ອຊູມ"</b>", ໃຫ້ເລີ່ມການຂະຫຍາຍ, ຈາກນັ້ນແຕະໃສ່ບ່ອນໃດກໍໄດ້ຢູ່ໜ້າຈໍ.\n"<ul><li>"ລາກ 2 ນິ້ວ ຫຼື ຫຼາຍກວ່ານັ້ນເພື່ອເລື່ອນ"</li>\n<li>"ຖ່າງ 2 ນິ້ວ ຫຼື ຫຼາຍກວ່ານັ້ນເພື່ອປັບແຕ່ງການຊູມ"</li></ul>\n\n<b>"ເພື່ອຊູມຊົ່ວຄາວ"</b>", ໃຫ້ເລີ່ມການຂະຫຍາຍ, ຈາກນັ້ນແຕະໃສ່ບ່ອນໃດກໍໄດ້ຢູ່ໜ້າຈໍຄ້າງໄວ້.\n"<ul><li>"ລາກເພື່ອຍ້າຍໄປມາຢູ່ໜ້າຈໍ"</li>\n<li>"ຍົກນິ້ວຂຶ້ນເພື່ອຊູມອອກ"</li></ul>\n\n"ທ່ານບໍ່ສາມາດຊູມໃສ່ແປ້ນພິມ ຫຼື ແຖບການນຳທາງໄດ້."</string>
<string name="accessibility_tutorial_dialog_title_button" msgid="3682222614034474845">"ໃຊ້ປຸ່ມການຊ່ວຍເຂົ້າເຖິງເພື່ອເປີດ"</string>
<string name="accessibility_tutorial_dialog_title_gesture" msgid="1342726230497913398">"ໃຊ້ທ່າທາງເພື່ອເປີດ"</string>
<string name="accessibility_tutorial_dialog_title_gesture_settings" msgid="8539392614235820285">"ໃຊ້ທ່າທາງການຊ່ວຍເຂົ້າເຖິງໃໝ່"</string>
@@ -2140,8 +2141,7 @@
<string name="accessibility_hearingaid_title" msgid="8312145423610648518">"ເຄື່ອງຊ່ວຍຟັງ"</string>
<string name="accessibility_hearingaid_not_connected_summary" msgid="6240237523789614599">"ບໍ່ໄດ້ເຊື່ອມຕໍ່ການຊ່ວຍຟັງ"</string>
<string name="accessibility_hearingaid_adding_summary" msgid="2947474468412309778">"ເພີ່ມອຸປະກອນຊ່ວຍຟັງ"</string>
- <string name="accessibility_hearingaid_pair_instructions_first_message" msgid="3912093691643131154">"ເພື່ອຈັບຄູ່ອຸປະກອນຊ່ວຍຟັງຂອງທ່ານ, ໃຫ້ຊອກຫາ ແລ້ວແຕະໃສ່ອຸປະກອນຂອງທ່ານຢູ່ໜ້າຈໍຖັດໄປ."</string>
- <string name="accessibility_hearingaid_pair_instructions_second_message" msgid="5596683393607650243">"ກະລຸນາກວດສອບວ່າອຸປະກອນຊ່ວຍຟັງຂອງທ່ານຢູ່ໃນໂໝດຈັບຄູ່ແລ້ວ."</string>
+ <string name="accessibility_hearingaid_pair_instructions_message" msgid="3094382949733435414">"ເພື່ອຈັບຄູ່ອຸປະກອນຊ່ວຍຟັງຂອງທ່ານ, ໃຫ້ຊອກຫາແລ້ວແຕະໃສ່ອຸປະກອນຂອງທ່ານຢູ່ໜ້າຈໍຖັດໄປ. ກະລຸນາກວດສອບວ່າອຸປະກອນຊ່ວຍຟັງຂອງທ່ານຢູ່ໃນໂໝດຈັບຄູ່ແລ້ວ."</string>
<string name="accessibility_hearingaid_active_device_summary" msgid="3924362383258688984">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ໃຊ້ຢູ່"</string>
<plurals name="show_number_hearingaid_count" formatted="false" msgid="3160782397139295486">
<item quantity="other">ບັນທຶກ <xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> ການຊ່ວຍຟັງແລ້ວ</item>
@@ -2490,7 +2490,6 @@
<string name="menu_stats_last_unplugged" msgid="5922246077592434526">"ການນຳໃຊ້ຕັ້ງແຕ່ຖອດສາຍໄຟອອກ <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
<string name="menu_stats_total" msgid="8973377864854807854">"ໃຊ້ທັງໝົດ"</string>
<string name="menu_stats_refresh" msgid="1676215433344981075">"ດຶງຂໍ້ມູນໃໝ່"</string>
- <string name="process_kernel_label" msgid="3916858646836739323">"Android OS"</string>
<string name="process_mediaserver_label" msgid="6500382062945689285">"Mediaserver"</string>
<string name="process_dex2oat_label" msgid="2592408651060518226">"ການປັບແອັບໃຫ້ເໝາະສົມ"</string>
<string name="battery_saver" msgid="8172485772238572153">"ຕົວປະຢັດແບັດເຕີຣີ"</string>
@@ -2621,8 +2620,6 @@
<string name="no_device_admins" msgid="4846602835339095768">"ບໍ່ມີແອັບຜູ້ເບິ່ງແຍງລະບົບອຸປະກອນທີ່ສາມາດໃຊ້ໄດ້"</string>
<string name="personal_device_admin_title" msgid="2849617316347669861">"ສ່ວນໂຕ"</string>
<string name="managed_device_admin_title" msgid="7853955652864478435">"ບ່ອນເຮັດວຽກ"</string>
- <string name="sms_access_restriction_enabled" msgid="7054488078710530278">"ຈຳກັດການເຂົ້າເຖິງບັນທຶກ SMS ແລະ ການໂທ"</string>
- <string name="sms_access_restriction_enabled_summary" msgid="6851339654677842328">"ມີພຽງແອັບໂທລະສັບ ແລະ ແອັບສົ່ງຂໍ້ຄວາມເລີ່ມຕົ້ນທີ່ມີສິດອະນຸຍາດບັນທຶກການໂທ ແລະ SMS"</string>
<string name="no_trust_agents" msgid="7450273545568977523">"ບໍ່ມີຕົວແທນການເຊື່ອຖືທີ່ໃຊ້ໄດ້"</string>
<string name="add_device_admin_msg" msgid="1501847129819382149">"ເປີດການນຳໃຊ້ແອັບຜູ້ເບິ່ງແຍງລະບົບອຸປະກອນບໍ?"</string>
<string name="add_device_admin" msgid="4192055385312215731">"ເປີດນຳໃຊ້ແອັບຜູ້ເບິ່ງແຍງລະບົບອຸປະກອນນີ້"</string>
@@ -3111,7 +3108,7 @@
<string name="keywords_app_default" msgid="5822717006354487071">"ເປີດກັບ"</string>
<string name="keywords_applications_settings" msgid="1268353611121497450">"ແອັບພລິເຄຊັນ"</string>
<string name="keywords_time_zone" msgid="998254736898753085">"ເຂດເວລາ"</string>
- <string name="keywords_draw_overlay" msgid="4130899177619041842">"ສ່ວນຫົວການສົນທະນາ"</string>
+ <string name="keywords_draw_overlay" msgid="1001120206241401007">"ຫົວການສົນທະນາ, ລະບົບ, ການເຕືອນ, ໜ້າຈໍ, ກ່ອງຂໍ້ຄວາມ, ການສະແດງຜົນ, ຢູ່ບັງແອັບອື່ນ, ແຕ້ມ"</string>
<string name="keywords_flashlight" msgid="6161632177705233710">"ໄຟຍສາຍ, ໄຟ, ໄຟສ່ອງ"</string>
<string name="keywords_change_wifi_state" msgid="627068244033681010">"wifi, wi-fi, ເປີດ/ປິດ, ຄວບຄຸມ"</string>
<string name="keywords_more_mobile_networks" msgid="8995946622054642367">"ເຄືອຂ່າຍມືຖື, ມືຖື, ຜູ້ໃຫ້ບໍລິການມືຖື, ໄຮ້ສາຍ, ຂໍ້ມູນ, 4g, 3g, 2g, lte"</string>
@@ -3135,7 +3132,7 @@
<string name="keywords_sounds_and_notifications_interruptions" msgid="5426093074031208917">"ຫ້າມ ຫ້າມລົບກວນ, ຂັດຈັງຫວະ, ການຂັດຈັງຫວະ, ຢຸດເຊົາ"</string>
<string name="keywords_app" msgid="6334757056536837791">"RAM"</string>
<string name="keywords_location" msgid="4132655528196729043">"ໃກ້ຄຽງ, ສະຖານທີ່, ປະຫວັດ, ການລາຍງານ, GPS"</string>
- <string name="keywords_accounts" msgid="1957925565953357627">"ບັນຊີ"</string>
+ <string name="keywords_accounts" msgid="4479029747403203867">"ບັນຊີ, ເພີ່ມບັນຊີ, ໂປຣໄຟລ໌ບ່ອນເຮັດວຽກ"</string>
<string name="keywords_users" msgid="3434190133131387942">"ຂໍ້ຈຳກັດ, ຈຳກັດ, ຈຳກັດແລ້ວ"</string>
<string name="keywords_keyboard_and_ime" msgid="9143339015329957107">"ການແກ້ໄຂຂໍ້ຄວາມໃຫ້ຖືກຕ້ອງ, ຖືກຕ້ອງ, ສຽງດັງ, ສັ່ນ, ສຽງ, ພາສາ, ທ່າທາງ, ແນະນຳ, ຄຳແນະນຳ, ຊຸດຮູບແບບ, ຫຍາບຄາຍ, ຄຳສັບ, ພິມ, ອີໂມຈິ, ສາກົນ"</string>
<string name="keywords_reset_apps" msgid="5293291209613191845">"ຣີເຊັດ, ຄວາມມັກ, ຄ່າເລີ່ມຕົ້ນ"</string>
@@ -3173,6 +3170,7 @@
<string name="keywords_storage_settings" msgid="297283751968446577">"ໜ່ວຍຄວາມຈຳ, ແຄສ, ຂໍ້ມູນ, ລຶບ, ລຶບລ້າງ, ຫວ່າງ, ພື້ນທີ່"</string>
<string name="keywords_bluetooth_settings" msgid="6804844062789439858">"ເຊື່ອມຕໍ່ແລ້ວ, ອຸປະກອນ, ຫູຟັງ, ລຳໂພງ, ໄຮ້ສາຍ, ຈັບຄູ່, ເພງ, ມີເດຍ"</string>
<string name="keywords_wallpaper" msgid="5058364390917429896">"ພື້ນຫຼັງ, ໜ້າຈໍ, ໜ້າຈໍລັອກ, ຮູບແບບສີສັນ"</string>
+ <string name="keywords_styles" msgid="5828725481814049422">"ຮູບຮ່າງໄອຄອນ, ສີຍ່ອຍ, ຟອນ"</string>
<string name="keywords_assist_input" msgid="5017533309492679287">"ຄ່າເລີ່ມຕົ້ນ, ຜູ້ຊ່ວຍ"</string>
<string name="keywords_default_payment_app" msgid="3838565809518896799">"ການຈ່າຍເງິນ, ຄ່າເລີ່ມຕົ້ນ"</string>
<string name="keywords_ambient_display" msgid="3103487805748659132">"ການແຈ້ງເຕືອນເຂົ້າ"</string>
@@ -3182,7 +3180,7 @@
<string name="keywords_notification_vibration" msgid="31924624421190547">"ສຳຜັດ, ສັ່ນເຕືອນ, ຄວາມລະອຽດອ່ອນ"</string>
<string name="keywords_battery_saver_sticky" msgid="5586215686021650278">"ຕົວປະຢັດແບັດເຕີຣີ, ຕິດໄວ້, ຕໍ່ເນື່ອງ, ປະຢັດໄຟ, ແບັດເຕີຣີ"</string>
<string name="keywords_battery_saver_schedule" msgid="7358789228486231944">"ກິດຈະກັດ, ກຳນົດການ, ຕົວປະຢັດແບັດເຕີຣີ, ຕົວປະຢັດໄຟ, ແບັດເຕີຣີ, ອັດຕະໂນມັດ, ເປີເຊັນ"</string>
- <string name="keywords_add_an_account" msgid="6488139919428902434">"ໂປຣໄຟລ໌ບ່ອນເຮັດວຽກ"</string>
+ <string name="keywords_enhance_4g_lte" msgid="2273810564244790859">"volte, ການໂທຂັ້ນສູງ, ການໂທ 4g"</string>
<string name="default_sound" msgid="8821684447333687810">"ສຽງເລີ່ມຕົ້ນ"</string>
<string name="sound_settings_summary" msgid="4100853606668287965">"ສຽງໂທລະສັບທີ່ <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
<string name="sound_dashboard_summary" msgid="3402435125958012986">"ລະດັບສຽງ, ການສັ່ນເຕືອນ, ຫ້າມລົບກວນ"</string>
@@ -3889,7 +3887,6 @@
<string name="permit_draw_overlay" msgid="7456536798718633432">"ອະນຸຍາດໃຫ້ສະແດງແອັບບັງແອັບອື່ນ"</string>
<string name="allow_overlay_description" msgid="8961670023925421358">"ອະນຸຍາດໃຫ້ແອັບນີ້ສະແດງບັງໜ້າແອັບອື່ນທີ່ທ່ານກຳລັງໃຊ້ຢູ່. ມັນອາດລົບກວນການນຳໃຊ້ແອັບເຫຼົ່ານັ້ນຂອງທ່ານ."</string>
<string name="keywords_vr_listener" msgid="7441221822576384680">"vr virtual reality ຕົວຟັງ ສະເຕຣິໂອ ຕົວຊ່ວຍ ບໍລິການ"</string>
- <string name="keywords_system_alert_window" msgid="5049498015597864850">"ໜ້າຈໍການແຈ້ງເຕືອນລະບົບສະແດງບັງໜ້າແອັບອື່ນ"</string>
<string name="overlay_settings" msgid="6930854109449524280">"ສະແດງແອັບບັງແອັບອື່ນ"</string>
<string name="system_alert_window_summary" msgid="602892301318324492">"<xliff:g id="COUNT_0">%1$d</xliff:g> ຈາກທັງໝົດ <xliff:g id="COUNT_1">%2$d</xliff:g> ແອັບແມ່ນອະນຸຍາດໃຫ້ສະແດງຜົນບັງແອັບອື່ນໄດ້"</string>
<string name="filter_overlay_apps" msgid="6965969283342557573">"ແອັບທີ່ມີການອະນຸຍາດ"</string>
@@ -4125,7 +4122,6 @@
<string name="notification_log_details_none" msgid="184131801230614059">"ບໍ່ມີ"</string>
<string name="notification_log_details_ranking_null" msgid="244660392058720919">"ບໍ່ມີອອບເຈັກການຈັດອັນດັບ."</string>
<string name="notification_log_details_ranking_none" msgid="599607025882587844">"ອອບເຈັກການຈັດອັນດັບບໍ່ມີກະແຈນີ້."</string>
- <string name="theme_customization_category" msgid="1049181544004163283">"ການໃຊ້ຮູບແບບສີສັນ"</string>
<string name="theme_customization_device_default" msgid="5058147707906551368">"ຄ່າເລີ່ມຕົ້ນອຸປະກອນ"</string>
<string name="display_cutout_emulation" msgid="7466869822418376317">"ຮອຍບາກຈໍສະແດງຜົນ"</string>
<string name="display_cutout_emulation_keywords" msgid="4495418317471622562">"ສ່ວນຕັດການສະແດງຜົນ, ຮອຍບາກ"</string>
@@ -4551,6 +4547,8 @@
<string name="network_connection_errorstate_dialog_message" msgid="6953778550775646710">"ມີບາງຢ່າງເກີດຂຶ້ນ. ແອັບພລິເຄຊັນໄດ້ຍົກເລີກຄຳຮ້ອງຂໍເພື່ອເລືອກອຸປະກອນແລ້ວ."</string>
<string name="network_connection_connect_successful" msgid="5935510954474494928">"ການເຊື່ອມຕໍ່ສຳເລັດແລ້ວ"</string>
<string name="network_connection_request_dialog_showall" msgid="6938922880244567521">"ສະແດງທັງໝົດ"</string>
+ <string name="network_connection_searching_message" msgid="4638576789450817530">"ກຳລັງຊອກຫາອຸປະກອນ…"</string>
+ <string name="network_connection_connecting_message" msgid="3740982406609245654">"ກຳລັງເຊື່ອມຕໍ່ຫາອຸປະກອນ…"</string>
<plurals name="show_bluetooth_devices" formatted="false" msgid="1715020480026568408">
<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>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index 626e226..6cd08ec 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -364,8 +364,6 @@
<string name="security_enable_widgets_disabled_summary" msgid="6392489775303464905">"Išjungė administratorius"</string>
<string name="lockdown_settings_title" msgid="7393790212603280213">"Rodyti užrakinimo parinktį"</string>
<string name="lockdown_settings_summary" msgid="4359438673563318171">"Rodyti maitinimo mygtuko parinktį, kuri išjungia „Smart Lock“, atrakinimą naudojant biometrines sistemas ir užrakinimo ekrano pranešimus"</string>
- <string name="trust_agents_extend_unlock_title" msgid="2796555263565097031">"Patikimos priem. tik pailgina atrakinimą"</string>
- <string name="trust_agents_extend_unlock_summary" msgid="3976344969220255010">"Jei parinktis bus įgalinta, patikimos priemonės laikys įrenginį neužrakintą ilgiau, bet nebegalės atrakinti užrakinto įrenginio."</string>
<string name="trust_lost_locks_screen_title" msgid="2992742466966021682">"Užrakinti ekraną, kai pasitikėjimas bus prarastas"</string>
<string name="trust_lost_locks_screen_summary" msgid="693784434582021206">"Jei parinktis bus įgalinta, įrenginys užsirakins, kai paskutinė patikima priemonė praras pasitikėjimą"</string>
<string name="owner_info_settings_summary" msgid="7472393443779227052">"Nėra"</string>
@@ -969,6 +967,7 @@
<string name="wifi_eap_identity" msgid="4359453783379679103">"Tapatybė"</string>
<string name="wifi_eap_anonymous" msgid="2989469344116577955">"Anoniminė tapatybė"</string>
<string name="wifi_password" msgid="5948219759936151048">"Slaptažodis"</string>
+ <string name="wifi_sae_password_id" msgid="1697832722221765763">"SAE slaptaž. identifikatorius"</string>
<string name="wifi_show_password" msgid="6461249871236968884">"Rodyti slaptažodį"</string>
<string name="wifi_ap_band_config" msgid="1611826705989117930">"Pasirinkti prieigos taško juostą"</string>
<string name="wifi_ap_choose_auto" msgid="2677800651271769965">"Automatinė"</string>
@@ -989,7 +988,6 @@
<string name="wifi_dpp_share_wifi" msgid="9065890131734833809">"„Wi‑Fi“ bendrinimas"</string>
<string name="wifi_dpp_scan_qr_code_with_another_device" msgid="5854392840857123065">"Nuskaitykite šį QR kodą, kad prisijungtumėte prie „<xliff:g id="SSID">%1$s</xliff:g>” ir galėtumėte bendrinti slaptažodį"</string>
<string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="4436318319178361543">"Nuskaitykite šį QR kodą, kad prisijungtumėte prie „<xliff:g id="SSID">%1$s</xliff:g>“"</string>
- <string name="wifi_dpp_could_not_detect_valid_qr_code" msgid="641893675646330576">"Nepavyko nuskaityti QR kodo. Iš naujo įveskite kodą ir bandykite dar kartą"</string>
<string name="wifi_dpp_failure_authentication_or_configuration" msgid="3372757783382381044">"Bandykite dar kartą. Jei problema išlieka, susisiekite su įrenginio gamintoju"</string>
<string name="wifi_dpp_failure_not_compatible" msgid="2829930473520603740">"Iškilo problema"</string>
<string name="wifi_dpp_failure_timeout" msgid="5228320772245820458">"Įsitikinkite, kad įrenginys įjungtas į maitinimo lizdą, įkrautas ir įjungtas jo maitinimas"</string>
@@ -1012,6 +1010,7 @@
<string name="wifi_dpp_hotspot_password" msgid="4120419278831581613">"Viešosios interneto prieigos taško slaptažodis: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
<string name="wifi_dpp_add_device" msgid="4072206063308645677">"Pridėti įrenginį"</string>
<string name="wifi_dpp_connect_network_using_qr_code" msgid="3887335309163999665">"Naudokite QR kodą, kad galėtumėte pridėti įrenginį prie šio tinklo"</string>
+ <string name="wifi_dpp_qr_code_is_not_valid_format" msgid="3700087439867692944">"QR kodas netinkamo formato"</string>
<string name="retry" msgid="6472609612090877557">"Bandyti dar kartą"</string>
<string name="wifi_shared" msgid="844142443226926070">"Bendrinti su kitais įrenginio naudotojais"</string>
<string name="wifi_unchanged" msgid="3410422020930397102">"(nepakeista)"</string>
@@ -1167,6 +1166,7 @@
<string name="emergency_address_title" msgid="932729250447887545">"Adresas prireikus pagalbos"</string>
<string name="emergency_address_summary" msgid="7751971156196115129">"Naudojama kaip vietos informacija, kai skambinate pagalbos numeriu naudodami „Wi-Fi“"</string>
<string name="private_dns_help_message" msgid="3299567069152568958"><annotation id="url">"Sužinokite daugiau"</annotation>" apie privataus DNS funkcijas"</string>
+ <string name="private_dns_mode_on" msgid="5882613439541371003">"Įjungta"</string>
<string name="wifi_calling_pref_managed_by_carrier" msgid="6845711858866828986">"Nustatymą tvarko operatorius"</string>
<string name="wifi_calling_settings_activation_instructions" msgid="7492509632478260955">"Suaktyvinti „Wi-Fi“ skambinimo funkciją"</string>
<string name="wifi_calling_turn_on" msgid="1171403510313983983">"Įjungti „Wi-Fi“ skambinimo funkciją"</string>
@@ -1916,7 +1916,7 @@
<string name="default_emergency_app" msgid="1951760659640369980">"Avarinė programa"</string>
<string name="reset_app_preferences" msgid="1321050641018356925">"Iš naujo nustat. nuostat."</string>
<string name="reset_app_preferences_title" msgid="6093179367325336662">"Iš naujo nust. nuostat.?"</string>
- <string name="reset_app_preferences_desc" msgid="4822447731869201512">"Bus iš naujo nustatytos visos toliau nurodytų objektų nuostatos:\n\n "<li>"išjungtos programos;"</li>\n" "<li>"išjungtų programų pranešimai;"</li>\n" "<li>"numatytosios veiksmų programos;"</li>\n" "<li>"programų foninių duomenų apribojimai;"</li>\n" "<li>"visi leidimų apribojimai."</li>\n\n"Neprarasite jokių programų duomenų."</string>
+ <string name="reset_app_preferences_desc" msgid="731757609326016760">"Bus iš naujo nustatytos visos nurodytų elementų nuostatos:\n\n"<li>"išjungtos programos;"</li>\n<li>"išjungti programų pranešimai;"</li>\n<li>"numatytosios veiksmų programos;"</li>\n<li>"programų foninių duomenų apribojimai;"</li>\n<li>"visi leidimų apribojimai."</li>\n\n"Neprarasite jokių programų duomenų."</string>
<string name="reset_app_preferences_button" msgid="2559089511841281242">"Iš naujo nustat. program."</string>
<string name="manage_space_text" msgid="8852711522447794676">"Valdyti vietą"</string>
<string name="filter" msgid="2018011724373033887">"Filtruoti"</string>
@@ -2131,7 +2131,7 @@
<string name="accessibility_screen_magnification_short_summary" msgid="3411979839172752057">"Palieskite 3 kartus, kad keistumėte mastelį."</string>
<string name="accessibility_screen_magnification_navbar_short_summary" msgid="3693116360267980492">"Palieskite mygtuką, kad keistumėte mastelį"</string>
<string name="accessibility_screen_magnification_summary" msgid="5258868553337478505"><b>"Jei norite keisti mastelį"</b>", greitai palieskite ekraną 3 kartus.\n"<ul><li>"Vilkite 2 ar daugiau pirštų, kad slinktumėte."</li>\n<li>"Suimkite 2 ar daugiau pirštų, kad koreguotumėte mastelio keitimą."</li></ul>\n\n<b>"Jei norite laikinai keisti mastelį"</b>", greitai palieskite ekraną 3 kartus ir laikykite palietę pirštu po trečio palietimo.\n"<ul><li>"Vilkite pirštą, kad judėtumėte ekranu."</li>\n<li>"Atkelkite pirštą, kad tolintumėte."</li></ul>\n\n"Negalite artinti klaviatūroje ir naršymo juostoje."</string>
- <string name="accessibility_screen_magnification_navbar_summary" msgid="2272878354599332009">"Kai didinimas įjungtas, galite artinti ekraną.\n\n"<b>"Norėdami keisti mastelį"</b>", įjunkite didinimą, tada palieskite bet kurioje ekrano vietoje.\n"<ul><li>"• Vilkite 2 ar daugiau pirštų, kad slinktumėte."</li>\n<li>"• Suimkite 2 ar daugiau pirštų, kad koreguotumėte mastelį."</li></ul>\n\n<b>"Norėdami laikinai pakeisti mastelį"</b>", įjunkite didinimą, tada palieskite ir palaikykite bet kurioje ekrano vietoje.\n"<ul><li>"• Vilkite pirštą, kad judėtumėte ekranu."</li>\n<li>"• Pakelkite pirštą, kad tolintumėte."</li></ul>\n\n"Negalite artinti naudodami klaviatūrą ar naršymo juostą."</string>
+ <string name="accessibility_screen_magnification_navbar_summary" msgid="6700716275347612310">"Kai didinimas įjungtas, galite artinti ekraną.\n\n"<b>"Jei norite keisti mastelį,"</b>", įjunkite didinimą, tada palieskite bet kurioje ekrano vietoje.\n"<ul><li>"Slinkite vilkdami dviem ar daugiau pirštų"</li>\n<li>"Koreguokite mastelį suimdami dviem ar daugiau pirštų"</li></ul>\n\n<b>"Jei norite laikinai pakeisti mastelį"</b>", įjunkite didinimą, tada palieskite ir palaikykite bet kurioje ekrano vietoje.\n"<ul><li>"Naršykite ekraną vilkdami pirštu"</li>\n<li>"Pakelkite pirštą, kad tolintumėte"</li></ul>\n\n"Negalite artinti naudodami klaviatūrą ar naršymo juostą."</string>
<string name="accessibility_tutorial_dialog_title_button" msgid="3682222614034474845">"Naudokite pritaikomumo mygtuką, kad atidarytumėte"</string>
<string name="accessibility_tutorial_dialog_title_gesture" msgid="1342726230497913398">"Naudokite gestą, kad atidarytumėte"</string>
<string name="accessibility_tutorial_dialog_title_gesture_settings" msgid="8539392614235820285">"Naudokite naują pritaikomumo gestą"</string>
@@ -2184,8 +2184,7 @@
<string name="accessibility_hearingaid_title" msgid="8312145423610648518">"Klausos aparatai"</string>
<string name="accessibility_hearingaid_not_connected_summary" msgid="6240237523789614599">"Prijungtų klausos aparatų nėra"</string>
<string name="accessibility_hearingaid_adding_summary" msgid="2947474468412309778">"Pridėti klausos aparatų"</string>
- <string name="accessibility_hearingaid_pair_instructions_first_message" msgid="3912093691643131154">"Norėdami susieti klausos aparatus, suraskite ir palieskite savo įrenginį kitame ekrane."</string>
- <string name="accessibility_hearingaid_pair_instructions_second_message" msgid="5596683393607650243">"Įsitikinkite, kad jūsų klausos aparatai veikia susiejimo režimu."</string>
+ <string name="accessibility_hearingaid_pair_instructions_message" msgid="3094382949733435414">"Norėdami susieti klausos aparatus, suraskite ir palieskite savo įrenginį kitame ekrane. Įsitikinkite, kad jūsų klausos aparatai veikia susiejimo režimu."</string>
<string name="accessibility_hearingaid_active_device_summary" msgid="3924362383258688984">"„<xliff:g id="DEVICE_NAME">%1$s</xliff:g>“ įrenginys aktyvus"</string>
<plurals name="show_number_hearingaid_count" formatted="false" msgid="3160782397139295486">
<item quantity="one"><xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> išsaugotas klausos aparatas</item>
@@ -2564,7 +2563,6 @@
<string name="menu_stats_last_unplugged" msgid="5922246077592434526">"Kai paskutinį kartą buvo ištrauktas iš lizdo <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
<string name="menu_stats_total" msgid="8973377864854807854">"Visas naudojimas"</string>
<string name="menu_stats_refresh" msgid="1676215433344981075">"Atnaujinti"</string>
- <string name="process_kernel_label" msgid="3916858646836739323">"„Android“ OS"</string>
<string name="process_mediaserver_label" msgid="6500382062945689285">"Medijos serveris"</string>
<string name="process_dex2oat_label" msgid="2592408651060518226">"Programų optimizavimas"</string>
<string name="battery_saver" msgid="8172485772238572153">"Akumuliator. tausoj. priem."</string>
@@ -2695,8 +2693,6 @@
<string name="no_device_admins" msgid="4846602835339095768">"Nėra pasiekiamų įrenginio administravimo programų"</string>
<string name="personal_device_admin_title" msgid="2849617316347669861">"Asmeninis"</string>
<string name="managed_device_admin_title" msgid="7853955652864478435">"Darbas"</string>
- <string name="sms_access_restriction_enabled" msgid="7054488078710530278">"Apriboti SMS ir skambučių žurnalo prieigą"</string>
- <string name="sms_access_restriction_enabled_summary" msgid="6851339654677842328">"Tik numatytosios telefono ir susirašinėjimo programos turi SMS ir skambučių žurnalo leidimus"</string>
<string name="no_trust_agents" msgid="7450273545568977523">"Nėra jokių galimų „trust agents“"</string>
<string name="add_device_admin_msg" msgid="1501847129819382149">"Suaktyvinti įrenginio administravimo programą?"</string>
<string name="add_device_admin" msgid="4192055385312215731">"Suaktyvinti šio įrenginio administravimo programą"</string>
@@ -3195,7 +3191,7 @@
<string name="keywords_app_default" msgid="5822717006354487071">"Atidaryti naudojant"</string>
<string name="keywords_applications_settings" msgid="1268353611121497450">"Programos"</string>
<string name="keywords_time_zone" msgid="998254736898753085">"laiko juosta"</string>
- <string name="keywords_draw_overlay" msgid="4130899177619041842">"Pokalbio antraštė"</string>
+ <string name="keywords_draw_overlay" msgid="1001120206241401007">"Pokalbio antraštė, sistema, įspėjimas, langas, dialogo langas, ekranas, virš kitų programų, piešti"</string>
<string name="keywords_flashlight" msgid="6161632177705233710">"Žibintuvėlis, šviesa, prožektorius"</string>
<string name="keywords_change_wifi_state" msgid="627068244033681010">"wifi, wi-fi, perjungimas, valdymas"</string>
<string name="keywords_more_mobile_networks" msgid="8995946622054642367">"mobilusis, mobiliojo ryšio operatorius, belaidis, duomenys, 4G, 3G, 2G, LTE"</string>
@@ -3219,7 +3215,7 @@
<string name="keywords_sounds_and_notifications_interruptions" msgid="5426093074031208917">"netrukdyti, pertraukti, pertraukimas, pertrauka"</string>
<string name="keywords_app" msgid="6334757056536837791">"Laisvosios prieigos atmintis"</string>
<string name="keywords_location" msgid="4132655528196729043">"netoliese, vietovė, istorija, ataskaitų teikimas, GPS"</string>
- <string name="keywords_accounts" msgid="1957925565953357627">"paskyra"</string>
+ <string name="keywords_accounts" msgid="4479029747403203867">"paskyra, pridėti paskyrą, darbo profilis"</string>
<string name="keywords_users" msgid="3434190133131387942">"apribojimas, riboti, ribotas"</string>
<string name="keywords_keyboard_and_ime" msgid="9143339015329957107">"teksto taisymas, taisyti, garsas, vibruoti, automatinis, kalba, gestas, pasiūlyti, pasiūlymas, tema, įžeidžiantis, žodis, tipas, jaustukai, tarptautinis"</string>
<string name="keywords_reset_apps" msgid="5293291209613191845">"nustatyti iš naujo, nuostatos, numatytosios"</string>
@@ -3257,6 +3253,7 @@
<string name="keywords_storage_settings" msgid="297283751968446577">"atmintis, talpykla, duomenys, ištrinti, išvalyti, atlaisvinti, vieta"</string>
<string name="keywords_bluetooth_settings" msgid="6804844062789439858">"prijungtas, įrenginys, ausinės, virtualiosios realybės įrenginys, garsiakalbis, belaidis, susieti, ausinukas, muzika, medija"</string>
<string name="keywords_wallpaper" msgid="5058364390917429896">"fonas, ekranas, užrakinimo ekranas, tema"</string>
+ <string name="keywords_styles" msgid="5828725481814049422">"piktogramos forma, paryškinimo spalva, šriftas"</string>
<string name="keywords_assist_input" msgid="5017533309492679287">"numatytasis, padėjėjas"</string>
<string name="keywords_default_payment_app" msgid="3838565809518896799">"mokėjimas, numatytoji"</string>
<string name="keywords_ambient_display" msgid="3103487805748659132">"gaunamas pranešimas"</string>
@@ -3266,7 +3263,7 @@
<string name="keywords_notification_vibration" msgid="31924624421190547">"lietimo technologija, vibruoti, jautrumas"</string>
<string name="keywords_battery_saver_sticky" msgid="5586215686021650278">"akumuliatoriaus tausojimo priemonė, fiksuotas, išlaikyti, energijos tausojimo priemonė, akumuliatorius"</string>
<string name="keywords_battery_saver_schedule" msgid="7358789228486231944">"veiksmų seka, tvarkaraštis, akumuliatoriaus tausojimo priemonė, energijos tausojimo priemonė, akumuliatorius, automatinis, procentai"</string>
- <string name="keywords_add_an_account" msgid="6488139919428902434">"darbo profilis"</string>
+ <string name="keywords_enhance_4g_lte" msgid="2273810564244790859">"„VoLTE“, išplėstinės skambinimo parinktys, 4G skambinimas"</string>
<string name="default_sound" msgid="8821684447333687810">"Numatytasis garsas"</string>
<string name="sound_settings_summary" msgid="4100853606668287965">"Skambučio garsumas – <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
<string name="sound_dashboard_summary" msgid="3402435125958012986">"Garsumas, vibravimas, netrukdymo režimas"</string>
@@ -4015,7 +4012,6 @@
<string name="permit_draw_overlay" msgid="7456536798718633432">"Leisti rodyti virš kitų programų"</string>
<string name="allow_overlay_description" msgid="8961670023925421358">"Leisti šią programą pateikti virš kitų naudojamų programų. Tai gali trukdyti naudoti tas programas arba pakeisti, kaip jos atrodo ar veikia."</string>
<string name="keywords_vr_listener" msgid="7441221822576384680">"vr virtualiosios realybės apdorojimo priemonė stereofoninis garsas pagalbinė paslauga"</string>
- <string name="keywords_system_alert_window" msgid="5049498015597864850">"sistemos įspėjimo dialogo langas dėl rodymo virš kitų programų"</string>
<string name="overlay_settings" msgid="6930854109449524280">"Rodyti virš kitų programų"</string>
<string name="system_alert_window_summary" msgid="602892301318324492">"<xliff:g id="COUNT_0">%1$d</xliff:g> iš <xliff:g id="COUNT_1">%2$d</xliff:g> progr. leidžiama rodyti virš kitų programų"</string>
<string name="filter_overlay_apps" msgid="6965969283342557573">"Leidimą turinčios programos"</string>
@@ -4263,7 +4259,6 @@
<string name="notification_log_details_none" msgid="184131801230614059">"nėra"</string>
<string name="notification_log_details_ranking_null" msgid="244660392058720919">"Trūksta reitingavimo objekto."</string>
<string name="notification_log_details_ranking_none" msgid="599607025882587844">"Reitingavimo objekte nėra šio rakto."</string>
- <string name="theme_customization_category" msgid="1049181544004163283">"Temos nustatymas"</string>
<string name="theme_customization_device_default" msgid="5058147707906551368">"Numatytasis įrenginio nustatymas"</string>
<string name="display_cutout_emulation" msgid="7466869822418376317">"Ekrano išpjova"</string>
<string name="display_cutout_emulation_keywords" msgid="4495418317471622562">"ekrano išpjova, įranta"</string>
@@ -4713,6 +4708,8 @@
<string name="network_connection_errorstate_dialog_message" msgid="6953778550775646710">"Kažkas nutiko. Programa atšaukė įrenginio pasirinkimo užklausą."</string>
<string name="network_connection_connect_successful" msgid="5935510954474494928">"Sėkmingai prisijungta"</string>
<string name="network_connection_request_dialog_showall" msgid="6938922880244567521">"Rodyti viską"</string>
+ <string name="network_connection_searching_message" msgid="4638576789450817530">"Ieškoma įrenginio…"</string>
+ <string name="network_connection_connecting_message" msgid="3740982406609245654">"Prisijungiama prie įrenginio…"</string>
<plurals name="show_bluetooth_devices" formatted="false" msgid="1715020480026568408">
<item quantity="one"><xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> prijungtas įrenginys</item>
<item quantity="few"><xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> prijungti įrenginiai</item>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index 555efbe..a88b24a 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -362,8 +362,6 @@
<string name="security_enable_widgets_disabled_summary" msgid="6392489775303464905">"Atspējoja administrators"</string>
<string name="lockdown_settings_title" msgid="7393790212603280213">"Rādīt bloķēšanas opciju"</string>
<string name="lockdown_settings_summary" msgid="4359438673563318171">"Rādīt barošanas pogas opciju, kas izslēdz Smart Lock, biometrisko atbloķēšanu un paziņojumus bloķēšanas ekrānā"</string>
- <string name="trust_agents_extend_unlock_title" msgid="2796555263565097031">"Uzt. pārb. progr. paildzina atbloķēšanu"</string>
- <string name="trust_agents_extend_unlock_summary" msgid="3976344969220255010">"Ja šis režīms ir iespējots, uzticamības pārbaudes programmas nebloķēs ierīci ilgāku laiku, taču vairs nevarēs atbloķēt bloķētu ierīci."</string>
<string name="trust_lost_locks_screen_title" msgid="2992742466966021682">"Ekrāna bloķēšana, zaudējot uzticamību"</string>
<string name="trust_lost_locks_screen_summary" msgid="693784434582021206">"Ja šis iestatījums ir iespējots, ierīce tiks bloķēta, kad pēdējā uzticamības pārbaudes programma zaudēs uzticamību."</string>
<string name="owner_info_settings_summary" msgid="7472393443779227052">"Nav"</string>
@@ -953,6 +951,7 @@
<string name="wifi_eap_identity" msgid="4359453783379679103">"Identifikācijas dati"</string>
<string name="wifi_eap_anonymous" msgid="2989469344116577955">"Anonīmi identifikācijas dati"</string>
<string name="wifi_password" msgid="5948219759936151048">"Parole"</string>
+ <string name="wifi_sae_password_id" msgid="1697832722221765763">"SAE paroles identifikators"</string>
<string name="wifi_show_password" msgid="6461249871236968884">"Rādīt paroli"</string>
<string name="wifi_ap_band_config" msgid="1611826705989117930">"Atlasīt piekļuves punkta joslu"</string>
<string name="wifi_ap_choose_auto" msgid="2677800651271769965">"Automātiski"</string>
@@ -973,7 +972,6 @@
<string name="wifi_dpp_share_wifi" msgid="9065890131734833809">"Wi‑Fi tīkla koplietošana"</string>
<string name="wifi_dpp_scan_qr_code_with_another_device" msgid="5854392840857123065">"Lai izveidotu savienojumu ar tīklu “<xliff:g id="SSID">%1$s</xliff:g>” un kopīgotu paroli, skenējiet šo QR kodu"</string>
<string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="4436318319178361543">"Lai izveidotu savienojumu ar tīklu <xliff:g id="SSID">%1$s</xliff:g>, skenējiet šo QR kodu"</string>
- <string name="wifi_dpp_could_not_detect_valid_qr_code" msgid="641893675646330576">"Nevarēja nolasīt QR kodu. Atkārtoti centrējiet kodu un mēģiniet vēlreiz."</string>
<string name="wifi_dpp_failure_authentication_or_configuration" msgid="3372757783382381044">"Mēģiniet vēlreiz. Ja problēma joprojām pastāv, sazinieties ar ierīces ražotāju."</string>
<string name="wifi_dpp_failure_not_compatible" msgid="2829930473520603740">"Radās problēma"</string>
<string name="wifi_dpp_failure_timeout" msgid="5228320772245820458">"Ierīcei ir jābūt pievienotai, uzlādētai un ieslēgtai"</string>
@@ -996,6 +994,7 @@
<string name="wifi_dpp_hotspot_password" msgid="4120419278831581613">"Tīklāja parole: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
<string name="wifi_dpp_add_device" msgid="4072206063308645677">"Pievienot ierīci"</string>
<string name="wifi_dpp_connect_network_using_qr_code" msgid="3887335309163999665">"Izmantojiet ātrās atbildes kodu, lai pievienotu ierīci šim tīklam"</string>
+ <string name="wifi_dpp_qr_code_is_not_valid_format" msgid="3700087439867692944">"Ātrās atbildes koda formāts nav derīgs."</string>
<string name="retry" msgid="6472609612090877557">"Mēģināt vēlreiz"</string>
<string name="wifi_shared" msgid="844142443226926070">"Koplietot ar citiem ierīces lietotājiem"</string>
<string name="wifi_unchanged" msgid="3410422020930397102">"(bez izmaiņām)"</string>
@@ -1148,6 +1147,7 @@
<string name="emergency_address_title" msgid="932729250447887545">"Ārkārtas adrese"</string>
<string name="emergency_address_summary" msgid="7751971156196115129">"Tiks izmantota kā jūsu atrašanās vieta, ja zvanīsiet uz ārkārtas numuru, lietojot Wi‑Fi."</string>
<string name="private_dns_help_message" msgid="3299567069152568958"><annotation id="url">"Uzziniet vairāk"</annotation>" par privātām DNS funkcijām"</string>
+ <string name="private_dns_mode_on" msgid="5882613439541371003">"Ieslēgts"</string>
<string name="wifi_calling_pref_managed_by_carrier" msgid="6845711858866828986">"Iestatījumu pārvalda mobilo sakaru operators"</string>
<string name="wifi_calling_settings_activation_instructions" msgid="7492509632478260955">"Aktivizējiet Wi-Fi zvanus"</string>
<string name="wifi_calling_turn_on" msgid="1171403510313983983">"Ieslēdziet Wi-Fi zvanus"</string>
@@ -1894,7 +1894,7 @@
<string name="default_emergency_app" msgid="1951760659640369980">"Ārkārtas izsaukumu lietotne"</string>
<string name="reset_app_preferences" msgid="1321050641018356925">"Atiest. lietotnes prefer."</string>
<string name="reset_app_preferences_title" msgid="6093179367325336662">"Vai atiest. liet. pref.?"</string>
- <string name="reset_app_preferences_desc" msgid="4822447731869201512">"Tādējādi tiks atiestatītas visas preferences, kas saistītas ar:\n\n"<li>"atspējotām lietotnēm;"</li>\n<li>"atspējotu lietotņu paziņojumiem;"</li>\n<li>"darbībām paredzētām noklusējuma lietojumprogrammām;"</li>\n<li>"lietotņu fona datu ierobežojumiem;"</li>\n<li>"visiem atļauju ierobežojumiem."</li>\n\n"Jūs nezaudēsiet nekādus lietotņu datus."</string>
+ <string name="reset_app_preferences_desc" msgid="731757609326016760">"Šādi tiks atiestatītas visas preferences, kas saistītas ar:\n\n"<li>"atspējotām lietotnēm;"</li>\n<li>"atspējotu lietotņu paziņojumiem;"</li>\n<li>"darbībām paredzētām noklusējuma lietojumprogrammām;"</li>\n<li>"lietotņu fona datu ierobežojumiem;"</li>\n<li>"visiem atļauju ierobežojumiem."</li>\n\n"Jūs nezaudēsiet lietotņu datus."</string>
<string name="reset_app_preferences_button" msgid="2559089511841281242">"Atiestatīt lietotnes"</string>
<string name="manage_space_text" msgid="8852711522447794676">"Vietas pārvaldība"</string>
<string name="filter" msgid="2018011724373033887">"Filtrs"</string>
@@ -2109,7 +2109,7 @@
<string name="accessibility_screen_magnification_short_summary" msgid="3411979839172752057">"Pieskarieties 3 reizes, lai veiktu tālummaiņu"</string>
<string name="accessibility_screen_magnification_navbar_short_summary" msgid="3693116360267980492">"Pieskarieties pogai, lai palielinātu"</string>
<string name="accessibility_screen_magnification_summary" msgid="5258868553337478505"><b>"Lai veiktu tālummaiņu"</b>", trīsreiz ātri pieskarieties ekrānam.\n"<ul><li>"Velciet ar vismaz diviem pirkstiem, lai ritinātu."</li>\n<li>"Savelciet kopā vismaz 2 pirkstus, lai pielāgotu tālummaiņu."</li></ul>\n\n<b>"Lai īslaicīgi veiktu tālummaiņu"</b>", trīsreiz ātri pieskarieties ekrānam un ar trešo pieskārienu turiet pirkstu nospiestu.\n"<ul><li>"Velciet pirkstus, lai pārvietotos ekrānā."</li>\n<li>"Paceliet pirkstu, lai tālinātu."</li></ul>\n\n"Tastatūrā vai navigācijas joslā nevarat veikt tuvināšanu."</string>
- <string name="accessibility_screen_magnification_navbar_summary" msgid="2272878354599332009">"Kad ir ieslēgts palielinājums, ekrānā varat izmantot tuvināšanu.\n\n"<b>"Lai izmantotu tālummaiņu"</b>", aktivizējiet palielinājumu un pēc tam pieskarieties jebkur ekrānā.\n"<ul><li>"• Velciet vismaz 2 pirkstus, lai ritinātu saturu."</li>\n<li>"• Savelciet vismaz 2 pirkstus, lai pielāgotu tālummaiņu."</li></ul>\n\n<b>"Lai īslaicīgi izmantotu tālummaiņu"</b>", aktivizējiet palielinājumu, pēc tam pieskarieties jebkur ekrānā un turiet.\n"<ul><li>"• Velciet ar pirkstu, lai pārvietotos ekrānā."</li>\n<li>"• Paceliet pirkstu, lai tālinātu saturu."</li></ul>\n\n"Tuvināšanu nevar izmantot tastatūrā vai navigācijas joslā."</string>
+ <string name="accessibility_screen_magnification_navbar_summary" msgid="6700716275347612310">"Kad ir ieslēgts palielinājums, ekrānā varat izmantot tuvināšanu.\n\n"<b>"Lai izmantotu tālummaiņu"</b>", aktivizējiet palielinājumu un pēc tam pieskarieties jebkur ekrānā.\n"<ul><li>"Velciet ar vismaz 2 pirkstiem, lai ritinātu."</li>\n<li>"Savelciet kopā vismaz 2 pirkstus, lai pielāgotu tālummaiņu."</li></ul>\n\n<b>"Lai veiktu īslaicīgu tālummaiņu"</b>", aktivizējiet palielinājumu un pēc tam pieskarieties jebkurai vietai ekrānā un turiet to.\n"<ul><li>"Velciet ar pirkstu, lai pārvietotos pa ekrānu."</li>\n<li>"Paceliet pirkstu, lai veiktu tālināšanu."</li></ul>\n\n"Tastatūrā vai navigācijas joslā nevarat veikt tuvināšanu."</string>
<string name="accessibility_tutorial_dialog_title_button" msgid="3682222614034474845">"Pieejamības pogas izmantošana atvēršanai"</string>
<string name="accessibility_tutorial_dialog_title_gesture" msgid="1342726230497913398">"Žesta izmantošana atvēršanai"</string>
<string name="accessibility_tutorial_dialog_title_gesture_settings" msgid="8539392614235820285">"Jaunā pieejamības žesta izmantošana"</string>
@@ -2162,8 +2162,7 @@
<string name="accessibility_hearingaid_title" msgid="8312145423610648518">"Dzirdes aparāti"</string>
<string name="accessibility_hearingaid_not_connected_summary" msgid="6240237523789614599">"Nav pievienots neviens dzirdes aparāts."</string>
<string name="accessibility_hearingaid_adding_summary" msgid="2947474468412309778">"Pievienot dzirdes aparātus"</string>
- <string name="accessibility_hearingaid_pair_instructions_first_message" msgid="3912093691643131154">"Lai savienotu pārī dzirdes aparātus, nākamajā ekrānā atrodiet savas ierīces nosaukumu un pieskarieties tam."</string>
- <string name="accessibility_hearingaid_pair_instructions_second_message" msgid="5596683393607650243">"Dzirdes aparātiem ir jābūt ieslēgtam savienošanas pārī režīmam."</string>
+ <string name="accessibility_hearingaid_pair_instructions_message" msgid="3094382949733435414">"Lai savienotu pārī dzirdes aparātus, nākamajā ekrānā atrodiet savas ierīces nosaukumu un pieskarieties tam. Dzirdes aparātos ir jābūt ieslēgtam savienošanas pārī režīmam."</string>
<string name="accessibility_hearingaid_active_device_summary" msgid="3924362383258688984">"Ierīce <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ir aktīva"</string>
<plurals name="show_number_hearingaid_count" formatted="false" msgid="3160782397139295486">
<item quantity="zero">Saglabāti <xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> dzirdes aparāti</item>
@@ -2527,7 +2526,6 @@
<string name="menu_stats_last_unplugged" msgid="5922246077592434526">"Pēdējās atslēgšanas laikā <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
<string name="menu_stats_total" msgid="8973377864854807854">"Kopējais patēriņš"</string>
<string name="menu_stats_refresh" msgid="1676215433344981075">"Atsvaidzināt"</string>
- <string name="process_kernel_label" msgid="3916858646836739323">"Android OS"</string>
<string name="process_mediaserver_label" msgid="6500382062945689285">"Mediaserver"</string>
<string name="process_dex2oat_label" msgid="2592408651060518226">"Lietotnes optimizācija"</string>
<string name="battery_saver" msgid="8172485772238572153">"Akumulatora jaudas taupīšanas režīms"</string>
@@ -2658,8 +2656,6 @@
<string name="no_device_admins" msgid="4846602835339095768">"Nav pieejama neviena ierīces administratora lietotne."</string>
<string name="personal_device_admin_title" msgid="2849617316347669861">"Privāts"</string>
<string name="managed_device_admin_title" msgid="7853955652864478435">"Darba"</string>
- <string name="sms_access_restriction_enabled" msgid="7054488078710530278">"Ierobežota piekļuve īsziņu un zvanu žurnālam"</string>
- <string name="sms_access_restriction_enabled_summary" msgid="6851339654677842328">"Atļauja piekļūt īsziņu un zvanu žurnālam tiek piešķirta tikai noklusējuma tālruņa un ziņojumapmaiņas lietotnēm."</string>
<string name="no_trust_agents" msgid="7450273545568977523">"Nav pieejama neviena uzticamības pārbaudes programma"</string>
<string name="add_device_admin_msg" msgid="1501847129819382149">"Vai aktivizēt administratora lietotni?"</string>
<string name="add_device_admin" msgid="4192055385312215731">"Aktivizēt šo ierīces administratora lietotni"</string>
@@ -3153,7 +3149,7 @@
<string name="keywords_app_default" msgid="5822717006354487071">"Atvērt lietotnē"</string>
<string name="keywords_applications_settings" msgid="1268353611121497450">"Lietojumprogrammas"</string>
<string name="keywords_time_zone" msgid="998254736898753085">"laika josla"</string>
- <string name="keywords_draw_overlay" msgid="4130899177619041842">"Tērzēšanas galva"</string>
+ <string name="keywords_draw_overlay" msgid="1001120206241401007">"Tērzēšanas galva, sistēma, brīdinājums, logs, dialoglodziņš, displejs, virs citām lietotnēm, vilkt"</string>
<string name="keywords_flashlight" msgid="6161632177705233710">"Lukturis, lukturītis, apgaismojums"</string>
<string name="keywords_change_wifi_state" msgid="627068244033681010">"Wifi, Wi-Fi, pārslēgt, pārvaldība"</string>
<string name="keywords_more_mobile_networks" msgid="8995946622054642367">"mobilais, mobilo sakaru operators, bezvadu, dati, 4g, 3g, 2g, lte"</string>
@@ -3177,7 +3173,7 @@
<string name="keywords_sounds_and_notifications_interruptions" msgid="5426093074031208917">"netraucēt, pārtraukt, pārtraukums, pauze"</string>
<string name="keywords_app" msgid="6334757056536837791">"RAM"</string>
<string name="keywords_location" msgid="4132655528196729043">"tuvumā, atrašanās vieta, vēsture, ziņošana, GPS"</string>
- <string name="keywords_accounts" msgid="1957925565953357627">"konts"</string>
+ <string name="keywords_accounts" msgid="4479029747403203867">"konts, pievienot kontu, darba profils"</string>
<string name="keywords_users" msgid="3434190133131387942">"ierobežojums, ierobežot, ierobežots"</string>
<string name="keywords_keyboard_and_ime" msgid="9143339015329957107">"teksta labojums, labot, skaņa, vibrācija, automātisks, valoda, žests, ieteikt, ieteikums, motīvs, aizvainojošs, vārds, rakstīt, emocijzīmes, starptautisks"</string>
<string name="keywords_reset_apps" msgid="5293291209613191845">"atiestatīt, preferences, noklusējums"</string>
@@ -3215,6 +3211,7 @@
<string name="keywords_storage_settings" msgid="297283751968446577">"atmiņa, kešatmiņa, dati, dzēst, notīrīt, atbrīvot, vieta"</string>
<string name="keywords_bluetooth_settings" msgid="6804844062789439858">"pievienots, ierīce, austiņas, ieauši, skaļrunis, bezvadu, pārī, ieausis, mūzika, multivide"</string>
<string name="keywords_wallpaper" msgid="5058364390917429896">"fons, ekrāns, bloķēšanas ekrāns, motīvs"</string>
+ <string name="keywords_styles" msgid="5828725481814049422">"ikonas forma, izcēluma krāsa, fonts"</string>
<string name="keywords_assist_input" msgid="5017533309492679287">"noklusējuma, palīgs"</string>
<string name="keywords_default_payment_app" msgid="3838565809518896799">"maksājums, noklusējuma"</string>
<string name="keywords_ambient_display" msgid="3103487805748659132">"ienākošs paziņojums"</string>
@@ -3224,7 +3221,7 @@
<string name="keywords_notification_vibration" msgid="31924624421190547">"skārienjutīgs, vibrācija, jutīgums"</string>
<string name="keywords_battery_saver_sticky" msgid="5586215686021650278">"akumulatora jaudas taupīšanas režīms, fiksēts, saglabāties, jaudas taupīšanas režīms, akumulators"</string>
<string name="keywords_battery_saver_schedule" msgid="7358789228486231944">"darbību secība, grafiks, akumulatora jaudas taupīšanas režīms, jaudas taupīšanas režīms, akumulators, automātiski, procenti"</string>
- <string name="keywords_add_an_account" msgid="6488139919428902434">"darba profils"</string>
+ <string name="keywords_enhance_4g_lte" msgid="2273810564244790859">"VoLTE, paplašinātas zvanu iespējas, 4G zvani"</string>
<string name="default_sound" msgid="8821684447333687810">"Noklusējuma skaņa"</string>
<string name="sound_settings_summary" msgid="4100853606668287965">"Zvana skaļums: <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
<string name="sound_dashboard_summary" msgid="3402435125958012986">"Skaļums, vibrācija, režīms “Netraucēt”"</string>
@@ -3952,7 +3949,6 @@
<string name="permit_draw_overlay" msgid="7456536798718633432">"Atļaut rādīt pāri citām lietotnēm"</string>
<string name="allow_overlay_description" msgid="8961670023925421358">"Atļaut rādīt šo lietotni pāri citām jūsu izmantotajām lietotnēm. Šī lietotne var traucēt izmantot citas lietotnes vai mainīt šo lietotņu attēlojumu vai darbību."</string>
<string name="keywords_vr_listener" msgid="7441221822576384680">"vr virtuālā realitāte klausītājs stereo palīgs pakalpojums"</string>
- <string name="keywords_system_alert_window" msgid="5049498015597864850">"sistēma brīdinājums logs dialoglodziņš rādīt pāri citām lietotnēm"</string>
<string name="overlay_settings" msgid="6930854109449524280">"Rādīt pāri citām lietotnēm"</string>
<string name="system_alert_window_summary" msgid="602892301318324492">"<xliff:g id="COUNT_0">%1$d</xliff:g> lietotnes no <xliff:g id="COUNT_1">%2$d</xliff:g> drīkst rādīt pāri citām lietotnēm"</string>
<string name="filter_overlay_apps" msgid="6965969283342557573">"Lietotnes ar atļauju"</string>
@@ -4194,7 +4190,6 @@
<string name="notification_log_details_none" msgid="184131801230614059">"nav"</string>
<string name="notification_log_details_ranking_null" msgid="244660392058720919">"Trūkst ranžēšanas objekta."</string>
<string name="notification_log_details_ranking_none" msgid="599607025882587844">"Ranžēšanas objektā nav ietverta šī atslēga."</string>
- <string name="theme_customization_category" msgid="1049181544004163283">"Tēmu pielāgošana"</string>
<string name="theme_customization_device_default" msgid="5058147707906551368">"Ierīces noklusējuma iestatījums"</string>
<string name="display_cutout_emulation" msgid="7466869822418376317">"Ekrāna izgriezums"</string>
<string name="display_cutout_emulation_keywords" msgid="4495418317471622562">"ekrāna izgriezums"</string>
@@ -4632,6 +4627,8 @@
<string name="network_connection_errorstate_dialog_message" msgid="6953778550775646710">"Radās kļūda. Lietojumprogramma atsauca ierīces atlases pieprasījumu."</string>
<string name="network_connection_connect_successful" msgid="5935510954474494928">"Savienojums izveidots"</string>
<string name="network_connection_request_dialog_showall" msgid="6938922880244567521">"Rādīt visu"</string>
+ <string name="network_connection_searching_message" msgid="4638576789450817530">"Notiek ierīces meklēšana…"</string>
+ <string name="network_connection_connecting_message" msgid="3740982406609245654">"Notiek savienojuma izveide ar ierīci…"</string>
<plurals name="show_bluetooth_devices" formatted="false" msgid="1715020480026568408">
<item quantity="zero">Pievienotas <xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> ierīces</item>
<item quantity="one">Pievienota <xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> ierīce</item>
diff --git a/res/values-mk/strings.xml b/res/values-mk/strings.xml
index 55865f5..632b16f 100644
--- a/res/values-mk/strings.xml
+++ b/res/values-mk/strings.xml
@@ -360,8 +360,6 @@
<string name="security_enable_widgets_disabled_summary" msgid="6392489775303464905">"Оневозможено од администраторот"</string>
<string name="lockdown_settings_title" msgid="7393790212603280213">"Приказ на опцијата за заклучување"</string>
<string name="lockdown_settings_summary" msgid="4359438673563318171">"Опција на копчето за вклучување на екранот што ги исклучува Smart Lock, биометриското отклучување и известувањата на заклучениот екран"</string>
- <string name="trust_agents_extend_unlock_title" msgid="2796555263565097031">"Продолжено отклуч. за агенти од доверба"</string>
- <string name="trust_agents_extend_unlock_summary" msgid="3976344969220255010">"Ако се овозможени, агентите од доверба ќе го држат уредот отклучен подолго време, но веќе нема да може да отклучат заклучен уред."</string>
<string name="trust_lost_locks_screen_title" msgid="2992742466966021682">"Заклучен екран кога довербата е загубена"</string>
<string name="trust_lost_locks_screen_summary" msgid="693784434582021206">"Ако е овозможено, уредот ќе се заклучи кога последниот агент од доверба ќе ја загуби довербата"</string>
<string name="owner_info_settings_summary" msgid="7472393443779227052">"Нема"</string>
@@ -937,6 +935,7 @@
<string name="wifi_eap_identity" msgid="4359453783379679103">"Идентитет"</string>
<string name="wifi_eap_anonymous" msgid="2989469344116577955">"Анонимен идентитет"</string>
<string name="wifi_password" msgid="5948219759936151048">"Лозинка"</string>
+ <string name="wifi_sae_password_id" msgid="1697832722221765763">"Идентификатор на лозинка за SAE"</string>
<string name="wifi_show_password" msgid="6461249871236968884">"Прикажи лозинка"</string>
<string name="wifi_ap_band_config" msgid="1611826705989117930">"Изберете појас на АП"</string>
<string name="wifi_ap_choose_auto" msgid="2677800651271769965">"Автоматски"</string>
@@ -957,7 +956,6 @@
<string name="wifi_dpp_share_wifi" msgid="9065890131734833809">"Сподели Wi‑Fi"</string>
<string name="wifi_dpp_scan_qr_code_with_another_device" msgid="5854392840857123065">"Скенирајте го овој QR-код за да се поврзете со „<xliff:g id="SSID">%1$s</xliff:g>“ и споделете ја лозинката"</string>
<string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="4436318319178361543">"Скенирајте го овој QR-код за да се поврзете со „<xliff:g id="SSID">%1$s</xliff:g>“"</string>
- <string name="wifi_dpp_could_not_detect_valid_qr_code" msgid="641893675646330576">"Не можеше да се прочита QR-кодот. Центрирајте го кодот и обидете се повторно"</string>
<string name="wifi_dpp_failure_authentication_or_configuration" msgid="3372757783382381044">"Обидете се повторно. Ако проблемот продолжи, контактирајте со производителот на уредот"</string>
<string name="wifi_dpp_failure_not_compatible" msgid="2829930473520603740">"Нешто тргна наопаку"</string>
<string name="wifi_dpp_failure_timeout" msgid="5228320772245820458">"Проверете дали уредот е приклучен, наполнет и вклучен"</string>
@@ -980,6 +978,7 @@
<string name="wifi_dpp_hotspot_password" msgid="4120419278831581613">"Лозинка за точка на пристап: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
<string name="wifi_dpp_add_device" msgid="4072206063308645677">"Додајте уред"</string>
<string name="wifi_dpp_connect_network_using_qr_code" msgid="3887335309163999665">"Користете QR-код за да додадете уред на мрежава"</string>
+ <string name="wifi_dpp_qr_code_is_not_valid_format" msgid="3700087439867692944">"QR-кодот не е во важечки формат"</string>
<string name="retry" msgid="6472609612090877557">"Обиди се повторно"</string>
<string name="wifi_shared" msgid="844142443226926070">"Сподели со други корисници на уредот"</string>
<string name="wifi_unchanged" msgid="3410422020930397102">"(непроменети)"</string>
@@ -1129,6 +1128,7 @@
<string name="emergency_address_title" msgid="932729250447887545">"Адреса за итни случаи"</string>
<string name="emergency_address_summary" msgid="7751971156196115129">"Се користи како ваша локација кога остварувате итен повик преку Wi-Fi"</string>
<string name="private_dns_help_message" msgid="3299567069152568958"><annotation id="url">"Дознајте повеќе"</annotation>" за функциите на приватен DNS"</string>
+ <string name="private_dns_mode_on" msgid="5882613439541371003">"Вклучено"</string>
<string name="wifi_calling_pref_managed_by_carrier" msgid="6845711858866828986">"Операторот управува со поставката"</string>
<string name="wifi_calling_settings_activation_instructions" msgid="7492509632478260955">"Активирајте ги „Повиците преку Wi-Fi“"</string>
<string name="wifi_calling_turn_on" msgid="1171403510313983983">"Вклучете ги „Повиците преку Wi-Fi“"</string>
@@ -1872,7 +1872,7 @@
<string name="default_emergency_app" msgid="1951760659640369980">"Апликација за итност"</string>
<string name="reset_app_preferences" msgid="1321050641018356925">"Ресет. парам. на аплик."</string>
<string name="reset_app_preferences_title" msgid="6093179367325336662">"Ресетирај параметри на апликација?"</string>
- <string name="reset_app_preferences_desc" msgid="4822447731869201512">"Со ова се ресетираат сите параметри за:\n\n"<li>"оневозможени апликации"</li>\n<li>"оневозможени известувања на апликација"</li>\n<li>"стандардни апликации за дејства"</li>\n<li>"ограничувања за податоци во заднина за апликации"</li>\n<li>"сите ограничувања за дозволи"</li>\n\n"Нема да изгубите никакви податоци од апликациите."</string>
+ <string name="reset_app_preferences_desc" msgid="731757609326016760">"Со ова ќе се ресетираат сите поставки за:\n\n"<li>"оневозможените апликации;"</li>\n<li>"оневозможените известувања за апликации;"</li>\n<li>"стандардните апликации за дејства;"</li>\n<li>"ограничувањата за податоци од заднина за апликациите;"</li>\n<li>"сите ограничувања за дозволите."</li>\n\n"Нема да изгубите никакви податоци на апликациите."</string>
<string name="reset_app_preferences_button" msgid="2559089511841281242">"Ресетирај апликации"</string>
<string name="manage_space_text" msgid="8852711522447794676">"Управувај со простор"</string>
<string name="filter" msgid="2018011724373033887">"Филтер"</string>
@@ -2087,7 +2087,7 @@
<string name="accessibility_screen_magnification_short_summary" msgid="3411979839172752057">"Допрете три пати за да зумирате"</string>
<string name="accessibility_screen_magnification_navbar_short_summary" msgid="3693116360267980492">"Допрете копче за зумирање"</string>
<string name="accessibility_screen_magnification_summary" msgid="5258868553337478505"><b>"За да зумирате"</b>", брзо допрете го екранот трипати.\n"<ul><li>"Повлечете со два или повеќе прсти за да се движите"</li>\n<li>"Штипнете со два или повеќе прсти за да го приспособите зумот"</li></ul>\n\n<b>"За привремено зумирање"</b>", брзо допрете го екранот трипати и задржете го прстот на третиот допир.\n"<ul><li>"Повлечете за да се движите околу екранот"</li>\n<li>"Подигнете го екранот за да одзумирате"</li></ul>\n\n"Не може да зумирате на тастатурата или на лентата за навигација."</string>
- <string name="accessibility_screen_magnification_navbar_summary" msgid="2272878354599332009">"Кога е вклучено зумирањето, може да зумирате на екранот.\n\n"<b>"За да зумирате"</b>", стартувајте го зголемувањето, па допрете каде било на екранот.\n"<ul><li>"• Повлечете 2 или повеќе прста за да лизгате"</li>\n<li>"• Штипнете со 2 или повеќе прста за да го приспособите зумирањето"</li></ul>\n\n<b>"За да зумирате привремено"</b>", стартувајте го зголемувањето, а потоа допрете и задржете каде било на екранот.\n"<ul><li>"• Повлечете за да се движите низ екранот"</li>\n<li>"• Подигнете го прстот за да одзумирате"</li></ul>\n\n"Не може да зумирате на тастатурата или навигациската лента."</string>
+ <string name="accessibility_screen_magnification_navbar_summary" msgid="6700716275347612310">"Кога е вклучено зумирањето, може да зумирате на екранот.\n\n"<b>"За да зумирате"</b>", стартувајте го зголемувањето, па допрете каде било на екранот.\n"<ul><li>"Повлечете со два или повеќе прсти за да лизгате"</li>\n<li>"Штипнете со два или повеќе прсти за да го приспособите зумот"</li></ul>\n\n<b>"За да зумирате привремено"</b>", стартувајте го зголемувањето, а потоа допрете и задржете каде било на екранот.\n"<ul><li>"Повлечете за да се движите околу екранот"</li>\n<li>"Подигнете го прстот за да одзумирате"</li></ul>\n\n"Не може да зумирате на тастатурата или на лентата за навигација."</string>
<string name="accessibility_tutorial_dialog_title_button" msgid="3682222614034474845">"Користете го копчето за пристапност за да отворите"</string>
<string name="accessibility_tutorial_dialog_title_gesture" msgid="1342726230497913398">"Користете движење за да отворите"</string>
<string name="accessibility_tutorial_dialog_title_gesture_settings" msgid="8539392614235820285">"Користете го новото движење за пристапност"</string>
@@ -2140,8 +2140,7 @@
<string name="accessibility_hearingaid_title" msgid="8312145423610648518">"Слушни помагала"</string>
<string name="accessibility_hearingaid_not_connected_summary" msgid="6240237523789614599">"Нема поврзани слушни помагала"</string>
<string name="accessibility_hearingaid_adding_summary" msgid="2947474468412309778">"Додајте слушни помагала"</string>
- <string name="accessibility_hearingaid_pair_instructions_first_message" msgid="3912093691643131154">"За да ги спарите слушните помагала, најдете го и допрете го уредот на следниот екран."</string>
- <string name="accessibility_hearingaid_pair_instructions_second_message" msgid="5596683393607650243">"Проверете дали слушните помагала се во режим на спарување."</string>
+ <string name="accessibility_hearingaid_pair_instructions_message" msgid="3094382949733435414">"За да ги спарите слушните помагала, најдете го и допрете го уредот на следниот екран. Проверете дали слушните помагала се во режим на спарување."</string>
<string name="accessibility_hearingaid_active_device_summary" msgid="3924362383258688984">"Слушното помагало <xliff:g id="DEVICE_NAME">%1$s</xliff:g> е активно"</string>
<plurals name="show_number_hearingaid_count" formatted="false" msgid="3160782397139295486">
<item quantity="one"><xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> зачувано слушно помагало</item>
@@ -2490,7 +2489,6 @@
<string name="menu_stats_last_unplugged" msgid="5922246077592434526">"Додека последен пат бил исклучен за <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
<string name="menu_stats_total" msgid="8973377864854807854">"Вкупна употреба"</string>
<string name="menu_stats_refresh" msgid="1676215433344981075">"Освежи"</string>
- <string name="process_kernel_label" msgid="3916858646836739323">"Оперативен систем Android"</string>
<string name="process_mediaserver_label" msgid="6500382062945689285">"Mediaserver"</string>
<string name="process_dex2oat_label" msgid="2592408651060518226">"Оптимизација на апликација"</string>
<string name="battery_saver" msgid="8172485772238572153">"Штедач на батерија"</string>
@@ -2621,8 +2619,6 @@
<string name="no_device_admins" msgid="4846602835339095768">"Не се достапни апликации за администраторот на уредот"</string>
<string name="personal_device_admin_title" msgid="2849617316347669861">"Лични"</string>
<string name="managed_device_admin_title" msgid="7853955652864478435">"Работа"</string>
- <string name="sms_access_restriction_enabled" msgid="7054488078710530278">"Ограничи пристап до SMS и евиденцијата на повици"</string>
- <string name="sms_access_restriction_enabled_summary" msgid="6851339654677842328">"Само стандардните апликации за телефон и пораки имаат дозволи за SMS и евиденција на повици"</string>
<string name="no_trust_agents" msgid="7450273545568977523">"Нема достапни агенти од доверба"</string>
<string name="add_device_admin_msg" msgid="1501847129819382149">"Да се активира аплик. на администратор?"</string>
<string name="add_device_admin" msgid="4192055385312215731">"Активирај ја апликацијата на администраторот на уредот"</string>
@@ -3111,7 +3107,7 @@
<string name="keywords_app_default" msgid="5822717006354487071">"Отворај со"</string>
<string name="keywords_applications_settings" msgid="1268353611121497450">"Апликации"</string>
<string name="keywords_time_zone" msgid="998254736898753085">"временска зона"</string>
- <string name="keywords_draw_overlay" msgid="4130899177619041842">"Глава од разговор"</string>
+ <string name="keywords_draw_overlay" msgid="1001120206241401007">"Глава од разговор, систем, предупредување, прозорец, дијалог, приказ, врз други апликации, цртај"</string>
<string name="keywords_flashlight" msgid="6161632177705233710">"Светилка, светло, лампа"</string>
<string name="keywords_change_wifi_state" msgid="627068244033681010">"wifi, wi-fi, префрли, контрола"</string>
<string name="keywords_more_mobile_networks" msgid="8995946622054642367">"мобилна мрежа, мобилен, мобилен оператор, безжичен, податоци, 4g, 3g, 2g, lte"</string>
@@ -3135,7 +3131,7 @@
<string name="keywords_sounds_and_notifications_interruptions" msgid="5426093074031208917">"не вознемирувај, прекини, прекинување, пауза"</string>
<string name="keywords_app" msgid="6334757056536837791">"РАМ"</string>
<string name="keywords_location" msgid="4132655528196729043">"во близина, локација, историја, пријавување, GPS"</string>
- <string name="keywords_accounts" msgid="1957925565953357627">"сметка"</string>
+ <string name="keywords_accounts" msgid="4479029747403203867">"сметка, додај сметка, додавање сметка, додајте сметка, работен профил"</string>
<string name="keywords_users" msgid="3434190133131387942">"ограничување, ограничи, ограничено"</string>
<string name="keywords_keyboard_and_ime" msgid="9143339015329957107">"поправка на текст, поправи, звук, вибрирај, автоматски, јазик, движење, предложи, предлог, тема, навредлив, збор, напиши, емотикон, меѓународно"</string>
<string name="keywords_reset_apps" msgid="5293291209613191845">"ресетирај, претпочитања, стандардни"</string>
@@ -3173,6 +3169,7 @@
<string name="keywords_storage_settings" msgid="297283751968446577">"меморија, кеш, податоци, избриши, бесплатно, простор"</string>
<string name="keywords_bluetooth_settings" msgid="6804844062789439858">"поврзан, уред, слушалки, слушалка, звучници, безжични уреди, спари, слушалки, музика, аудиовизуелни содржини"</string>
<string name="keywords_wallpaper" msgid="5058364390917429896">"заднина, екран, заклучен екран, тема"</string>
+ <string name="keywords_styles" msgid="5828725481814049422">"облик на икона, боја за нагласување, фонт"</string>
<string name="keywords_assist_input" msgid="5017533309492679287">"стандарден, помошник"</string>
<string name="keywords_default_payment_app" msgid="3838565809518896799">"плаќање, стандарден"</string>
<string name="keywords_ambient_display" msgid="3103487805748659132">"дојдовно известување"</string>
@@ -3182,7 +3179,7 @@
<string name="keywords_notification_vibration" msgid="31924624421190547">"повратни информации со допир, вибрации, чувствителност"</string>
<string name="keywords_battery_saver_sticky" msgid="5586215686021650278">"штедач на батерија, леплив, упорен, штедач на енергија, батерија"</string>
<string name="keywords_battery_saver_schedule" msgid="7358789228486231944">"рутина, распоред, штедач на батерија, штедач на енергија, батерија, автоматски, процент"</string>
- <string name="keywords_add_an_account" msgid="6488139919428902434">"работен профил"</string>
+ <string name="keywords_enhance_4g_lte" msgid="2273810564244790859">"volte, напредно повикување, повикување преку 4G"</string>
<string name="default_sound" msgid="8821684447333687810">"Стандарден звук"</string>
<string name="sound_settings_summary" msgid="4100853606668287965">"Јачината на звукот на ѕвонењето е на <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
<string name="sound_dashboard_summary" msgid="3402435125958012986">"Јачина на звук, вибрации и „Не вознемирувај“"</string>
@@ -3889,7 +3886,6 @@
<string name="permit_draw_overlay" msgid="7456536798718633432">"Дозволи прикажување врз други апликации"</string>
<string name="allow_overlay_description" msgid="8961670023925421358">"Дозволете ѝ на апликација да се прикажува врз другите апликации што ги користите. Тоа може да го попречи користењето на другите апликации или да го промени начинот на кој се појавуваат или однесуваат."</string>
<string name="keywords_vr_listener" msgid="7441221822576384680">"vr виртуелна реалност слушател стерео помошна услуга"</string>
- <string name="keywords_system_alert_window" msgid="5049498015597864850">"дијалог прозорец системски предупредувања прикажување врз други апликации"</string>
<string name="overlay_settings" msgid="6930854109449524280">"Приказ врз други апликации"</string>
<string name="system_alert_window_summary" msgid="602892301318324492">"<xliff:g id="COUNT_0">%1$d</xliff:g> од <xliff:g id="COUNT_1">%2$d</xliff:g> аплик. имаат дозвола за прикажување врз други апликации"</string>
<string name="filter_overlay_apps" msgid="6965969283342557573">"Апликации со дозвола"</string>
@@ -4125,7 +4121,6 @@
<string name="notification_log_details_none" msgid="184131801230614059">"нема"</string>
<string name="notification_log_details_ranking_null" msgid="244660392058720919">"Рангираниот објект недостастасува."</string>
<string name="notification_log_details_ranking_none" msgid="599607025882587844">"Рангираниот објект не го содржи овој клуч."</string>
- <string name="theme_customization_category" msgid="1049181544004163283">"Тематски прекривки"</string>
<string name="theme_customization_device_default" msgid="5058147707906551368">"Стандардни поставки за уредот"</string>
<string name="display_cutout_emulation" msgid="7466869822418376317">"Исечок на екранот"</string>
<string name="display_cutout_emulation_keywords" msgid="4495418317471622562">"исечок на екранот, сензор за носење"</string>
@@ -4551,6 +4546,8 @@
<string name="network_connection_errorstate_dialog_message" msgid="6953778550775646710">"Нешто се случи. Апликацијата го откажа барањето за избор на уред."</string>
<string name="network_connection_connect_successful" msgid="5935510954474494928">"Поврзувањето е успешно"</string>
<string name="network_connection_request_dialog_showall" msgid="6938922880244567521">"Прикажи ги сите"</string>
+ <string name="network_connection_searching_message" msgid="4638576789450817530">"Се бара уредот…"</string>
+ <string name="network_connection_connecting_message" msgid="3740982406609245654">"Се поврзува со уредот…"</string>
<plurals name="show_bluetooth_devices" formatted="false" msgid="1715020480026568408">
<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>
diff --git a/res/values-ml/strings.xml b/res/values-ml/strings.xml
index b3723ac..db77543 100644
--- a/res/values-ml/strings.xml
+++ b/res/values-ml/strings.xml
@@ -360,8 +360,6 @@
<string name="security_enable_widgets_disabled_summary" msgid="6392489775303464905">"അഡ്മിൻ പ്രവർത്തനരഹിതമാക്കി"</string>
<string name="lockdown_settings_title" msgid="7393790212603280213">"ലോക്ക്ഡൗൺ ഓപ്ഷൻ കാണിക്കുക"</string>
<string name="lockdown_settings_summary" msgid="4359438673563318171">"ലോക്ക് സ്ക്രീനിലെ Smart Lock, ബയോമെട്രിക് അൺലോക്കിംഗ്, അറിയിപ്പുകൾ എന്നിവ ഓഫാക്കുന്ന പവർ ബട്ടൺ ഓപ്ഷൻ പ്രദർശിപ്പിക്കുക"</string>
- <string name="trust_agents_extend_unlock_title" msgid="2796555263565097031">"വിശ്വസ്ത ഏജൻ്റുമാർക്കേ അൺലോക്ക് വിപുലീകരിക്കാനാവൂ"</string>
- <string name="trust_agents_extend_unlock_summary" msgid="3976344969220255010">"പ്രവർത്തനക്ഷമമാക്കിയാൽ, വിശ്വസ്ത ഏജൻ്റുമാർ നിങ്ങളുടെ ഉപകരണം കൂടുതൽ നേരം അൺലോക്ക് ചെയ്ത നിലയിൽ സൂക്ഷിക്കും, പക്ഷെ ലോക്ക് ചെയ്ത ഉപകരണം അൺലോക്ക് ചെയ്യാനാവില്ല."</string>
<string name="trust_lost_locks_screen_title" msgid="2992742466966021682">"വിശ്വാസം നഷ്ടപ്പെടുമ്പോൾ, സ്ക്രീൻ ലോക്കാവുന്നു"</string>
<string name="trust_lost_locks_screen_summary" msgid="693784434582021206">"പ്രവർത്തനക്ഷമമാക്കിയാൽ, അവസാനത്തെ വിശ്വസ്ത ഏജന്റിന് വിശ്വാസം നഷ്ടപ്പെടുമ്പോൾ, ഉപകരണം ലോക്കാവും"</string>
<string name="owner_info_settings_summary" msgid="7472393443779227052">"ഒന്നുമില്ല"</string>
@@ -937,6 +935,7 @@
<string name="wifi_eap_identity" msgid="4359453783379679103">"ഐഡന്റിറ്റി"</string>
<string name="wifi_eap_anonymous" msgid="2989469344116577955">"അജ്ഞാത ഐഡന്റിറ്റി"</string>
<string name="wifi_password" msgid="5948219759936151048">"പാസ്വേഡ്"</string>
+ <string name="wifi_sae_password_id" msgid="1697832722221765763">"SAE പാസ്വേഡ് ഐഡന്റിഫയർ"</string>
<string name="wifi_show_password" msgid="6461249871236968884">"പാസ്വേഡ് കാണിക്കുക"</string>
<string name="wifi_ap_band_config" msgid="1611826705989117930">"AP ബാൻഡ് തിരഞ്ഞെടുക്കുക"</string>
<string name="wifi_ap_choose_auto" msgid="2677800651271769965">"സ്വമേധയാ"</string>
@@ -957,7 +956,6 @@
<string name="wifi_dpp_share_wifi" msgid="9065890131734833809">"വൈഫൈ പങ്കിടുക"</string>
<string name="wifi_dpp_scan_qr_code_with_another_device" msgid="5854392840857123065">"“<xliff:g id="SSID">%1$s</xliff:g>” എന്നതിലേക്ക് കണക്റ്റ് ചെയ്യാൻ ഈ QR കോഡ് സ്കാൻ ചെയ്യുകയും പാസ്വേഡ് പങ്കിടുകയും ചെയ്യുക"</string>
<string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="4436318319178361543">"“<xliff:g id="SSID">%1$s</xliff:g>\" എന്നതിലേക്ക് കണക്റ്റ് ചെയ്യാൻ ഈ QR കോഡ് സ്കാൻ ചെയ്യുക"</string>
- <string name="wifi_dpp_could_not_detect_valid_qr_code" msgid="641893675646330576">"QR കോഡ് റീഡ് ചെയ്യാനായില്ല. കോഡ് വീണ്ടും മധ്യത്തിലാക്കി വീണ്ടും ശ്രമിക്കുക"</string>
<string name="wifi_dpp_failure_authentication_or_configuration" msgid="3372757783382381044">"വീണ്ടും ശ്രമിക്കുക. പ്രശ്നം തുടരുകയാണെങ്കിൽ, ഉപകരണ നിർമ്മാതാവിനെ ബന്ധപ്പെടുക"</string>
<string name="wifi_dpp_failure_not_compatible" msgid="2829930473520603740">"എന്തോ കുഴപ്പമുണ്ടായി"</string>
<string name="wifi_dpp_failure_timeout" msgid="5228320772245820458">"ഉപകരണം പ്ലഗിൻ ചെയ്തെന്നും, ചാർജ്ജ് ചെയ്തെന്നും, ഓണാണെന്നും ഉറപ്പാക്കുക"</string>
@@ -980,6 +978,7 @@
<string name="wifi_dpp_hotspot_password" msgid="4120419278831581613">"ഹോട്ട്സ്പോട്ടിന്റെ പാസ്വേഡ്: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
<string name="wifi_dpp_add_device" msgid="4072206063308645677">"ഉപകരണം ചേർക്കുക"</string>
<string name="wifi_dpp_connect_network_using_qr_code" msgid="3887335309163999665">"ഈ നെറ്റ്വർക്കിലേക്ക് ഒരു ഉപകരണം ചേർക്കാൻ ഒരു QR കോഡ് ഉപയോഗിക്കൂ"</string>
+ <string name="wifi_dpp_qr_code_is_not_valid_format" msgid="3700087439867692944">"QR കോഡ് സാധുവായ ഫോർമാറ്റിലല്ല"</string>
<string name="retry" msgid="6472609612090877557">"വീണ്ടും ശ്രമിക്കുക"</string>
<string name="wifi_shared" msgid="844142443226926070">"മറ്റ് ഉപകരണ ഉപയോക്താക്കളുമായി പങ്കിടുക"</string>
<string name="wifi_unchanged" msgid="3410422020930397102">"(മാറ്റം വരുത്തിയിട്ടില്ല)"</string>
@@ -1129,6 +1128,7 @@
<string name="emergency_address_title" msgid="932729250447887545">"അടിയന്തര വിലാസം"</string>
<string name="emergency_address_summary" msgid="7751971156196115129">"വൈഫൈ ഉപയോഗിച്ച് നിങ്ങളൊരു അടിയന്തര കോൾ ചെയ്യുമ്പോൾ, നിങ്ങളുടെ ലൊക്കേഷനായി ഉപയോഗിക്കപ്പെടും"</string>
<string name="private_dns_help_message" msgid="3299567069152568958">"സ്വകാര്യ DNS ഫീച്ചറുകളെ കുറിച്ച് "<annotation id="url">"കൂടുതലറിയുക"</annotation></string>
+ <string name="private_dns_mode_on" msgid="5882613439541371003">"ഓൺ ആണ്"</string>
<string name="wifi_calling_pref_managed_by_carrier" msgid="6845711858866828986">"ക്രമീകരണം, കാരിയർ മാനേജ് ചെയ്യുന്നു"</string>
<string name="wifi_calling_settings_activation_instructions" msgid="7492509632478260955">"വൈഫൈ കോളിംഗ് സജീവമാക്കുക"</string>
<string name="wifi_calling_turn_on" msgid="1171403510313983983">"വൈഫൈ കോളിംഗ് ഓണാക്കുക"</string>
@@ -1872,7 +1872,7 @@
<string name="default_emergency_app" msgid="1951760659640369980">"അടിയന്തിര അപ്ലിക്കേഷൻ"</string>
<string name="reset_app_preferences" msgid="1321050641018356925">"ആപ്പ് മുൻഗണന റീസെറ്റ് ചെയ്യൂ"</string>
<string name="reset_app_preferences_title" msgid="6093179367325336662">"ആപ്പ് മുൻഗണനകൾ റീസെറ്റ് ചെയ്യണോ?"</string>
- <string name="reset_app_preferences_desc" msgid="4822447731869201512">"ഇത് ഇനിപ്പറയുന്നവയ്ക്കുള്ള എല്ലാ മുൻഗണനകളും റീസെറ്റ് ചെയ്യും:\n\n"<li>"പ്രവർത്തനരഹിതമാക്കിയ ആപ്പുകൾ"</li>\n<li>"പ്രവർത്തനരഹിതമാക്കിയ ആപ്പ് അറിയിപ്പുകൾ"</li>\n<li>"പ്രവർത്തനങ്ങൾക്കുള്ള ഡിഫോൾട്ട് ആപ്പുകൾ"</li>\n<li>"ആപ്പുകൾക്കുള്ള പശ്ചാത്തല ഡാറ്റാ നിയന്ത്രണങ്ങൾ"</li>\n<li>" ഏതെങ്കിലും അനുമതി നിയന്ത്രണങ്ങൾ"</li>\n\n" നിങ്ങൾക്ക് ആപ്പ് ഡാറ്റയൊന്നും നഷ്ടമാകില്ല."</string>
+ <string name="reset_app_preferences_desc" msgid="731757609326016760">"ഇത് ഇനിപ്പറയുന്നവയ്ക്കുള്ള എല്ലാ മുൻഗണനകളും റീസെറ്റ് ചെയ്യും:\n\n"<li>"പ്രവർത്തനരഹിതമാക്കിയ ആപ്പുകൾ"</li>\n<li>"പ്രവർത്തനരഹിതമാക്കിയ ആപ്പ് അറിയിപ്പുകൾ"</li>\n<li>"പ്രവർത്തനങ്ങൾക്കുള്ള ഡിഫോൾട്ട് ആപ്പുകൾ"</li>\n<li>"ആപ്പുകൾക്കുള്ള പശ്ചാത്തല ഡാറ്റാ നിയന്ത്രണങ്ങൾ"</li>\n<li>" ഏതെങ്കിലും അനുമതി നിയന്ത്രണങ്ങൾ"</li>\n\n" നിങ്ങൾക്ക് ആപ്പ് ഡാറ്റയൊന്നും നഷ്ടമാകില്ല."</string>
<string name="reset_app_preferences_button" msgid="2559089511841281242">"ആപ്പുകൾ റീസെറ്റ് ചെയ്യുക"</string>
<string name="manage_space_text" msgid="8852711522447794676">"സ്പെയ്സ് നിയന്ത്രിക്കുക"</string>
<string name="filter" msgid="2018011724373033887">"ഫിൽട്ടർ ചെയ്യുക"</string>
@@ -2087,7 +2087,7 @@
<string name="accessibility_screen_magnification_short_summary" msgid="3411979839172752057">"സൂം ചെയ്യാൻ 3 തവണ ടാപ്പ് ചെയ്യുക"</string>
<string name="accessibility_screen_magnification_navbar_short_summary" msgid="3693116360267980492">"സൂം ചെയ്യുന്നതിന് ബട്ടണിൽ ടാപ്പ് ചെയ്യുക"</string>
<string name="accessibility_screen_magnification_summary" msgid="5258868553337478505"><b>"സൂം ചെയ്യാൻ"</b>", വേഗത്തിൽ 3 തവണ സ്ക്രീൻ ടാപ്പുചെയ്യുക.\n"<ul><li>"സ്ക്രോൾ ചെയ്യാൻ രണ്ടോ അതിലധികമോ വിരലുകൾ ഇഴയ്ക്കുക"</li>\n<li>"സൂം ക്രമീകരിക്കാൻ രണ്ടോ അതിലധികമോ വിരലുകൾ പിഞ്ചുചെയ്യുക"</li></ul>\n\n<b>"താൽക്കാലികമായി സൂം ചെയ്യാൻ"</b>", സ്ക്രീനിൽ 3 തവണ വേഗത്തിൽ ടാപ്പുചെയ്യുകയും മൂന്നാമത്തെ ടാപ്പിൽ വിരൽ താഴേക്ക് അമർത്തിപ്പിടിക്കുകയും ചെയ്യുക.\n"<ul><li>"സ്ക്രീനിന് ചുറ്റും നീങ്ങുന്നതിന് നിങ്ങളുടെ വിരൽ ഇഴയ്ക്കുക"</li>\n<li>"സൂം ഔട്ട് ചെയ്യുന്നതിന് വിരൽ എടുക്കുക"</li></ul>\n\n"കീബോർഡിലും നാവിഗേഷൻ ബാറിലും നിങ്ങൾക്ക് സൂം ഇൻ ചെയ്യാൻ കഴിയില്ല."</string>
- <string name="accessibility_screen_magnification_navbar_summary" msgid="2272878354599332009">"മാഗ്നിഫിക്കേഷൻ ഓണാക്കിയിരിക്കുമ്പോൾ, നിങ്ങളുടെ സ്ക്രീനിൽ സൂം ഇൻ ചെയ്യാവുന്നതാണ്.\n\n"<b>"സൂം ചെയ്യാൻ"</b>", മാഗ്നിഫിക്കേഷൻ ആരംഭിച്ച ശേഷം നിങ്ങളുടെ സ്ക്രീനിൽ എവിടെയെങ്കിലും ടാപ്പ് ചെയ്യുക.\n"<ul><li>"• സ്ക്രോൾ ചെയ്യാൻ രണ്ടോ അതിലധികമോ വിരലുകൾ കൊണ്ട് വലിച്ചിടുക"</li>\n<li>"• സൂം ക്രമീകരിക്കാൻ രണ്ടോ അതിലധികമോ വിരലുകൾ കൊണ്ട് പിഞ്ച് ചെയ്യുക"</li></ul>\n\n<b>"താൽക്കാലികമായി സൂം ചെയ്യാൻ"</b>", മാഗ്നിഫിക്കേഷൻ ആരംഭിച്ച ശേഷം സ്ക്രീനിൽ എവിടെയെങ്കിലും സ്പർശിച്ച് പിടിക്കുക.\n"<ul><li>"• സ്ക്രീനിന് ചുറ്റും നീക്കാൻ വലിച്ചിടുക"</li>\n<li>"• സൂം ഔട്ട് ചെയ്യാൻ വിരൽ ഉയർത്തുക"</li></ul>\n\n"നിങ്ങൾക്ക് കീബോർഡിലോ നാവിഗേഷൻ ബാറിലോ സൂം ഇൻ ചെയ്യാനാവില്ല."</string>
+ <string name="accessibility_screen_magnification_navbar_summary" msgid="6700716275347612310">"മാഗ്നിഫിക്കേഷൻ ഓണാക്കിയിരിക്കുമ്പോൾ, നിങ്ങളുടെ സ്ക്രീനിൽ സൂം ഇൻ ചെയ്യാവുന്നതാണ്.\n\n"<b>"സൂം ചെയ്യാൻ"</b>", മാഗ്നിഫിക്കേഷൻ ആരംഭിച്ച ശേഷം നിങ്ങളുടെ സ്ക്രീനിൽ എവിടെയെങ്കിലും ടാപ്പ് ചെയ്യുക.\n"<ul><li>"സ്ക്രോൾ ചെയ്യാൻ രണ്ടോ അതിലധികമോ വിരലുകൾ ഇഴയ്ക്കുക"</li>\n<li>"സൂം ക്രമീകരിക്കാൻ രണ്ടോ അതിലധികമോ വിരലുകൾ പിഞ്ച് ചെയ്യുക"</li></ul>\n\n<b>"താൽക്കാലികമായി സൂം ചെയ്യാൻ"</b>", മാഗ്നിഫിക്കേഷൻ ആരംഭിച്ച ശേഷം സ്ക്രീനിൽ എവിടെയെങ്കിലും സ്പർശിച്ചുപിടിക്കുക.\n"<ul><li>"സ്ക്രീനിന് ചുറ്റും നീക്കാൻ വലിച്ചിടുക"</li>\n<li>"സൂം ഔട്ട് ചെയ്യാൻ വിരൽ എടുക്കുക"</li></ul>\n\n"കീബോർഡിലും നാവിഗേഷൻ ബാറിലും നിങ്ങൾക്ക് സൂം ഇൻ ചെയ്യാനാവില്ല."</string>
<string name="accessibility_tutorial_dialog_title_button" msgid="3682222614034474845">"തുറക്കാൻ ഉപയോഗസഹായി ബട്ടൺ ഉപയോഗിക്കുക"</string>
<string name="accessibility_tutorial_dialog_title_gesture" msgid="1342726230497913398">"തുറക്കാൻ വിരൽചലനം ഉപയോഗിക്കുക"</string>
<string name="accessibility_tutorial_dialog_title_gesture_settings" msgid="8539392614235820285">"പുതിയ ഉപയോഗസഹായി വിരൽചലനം ഉപയോഗിക്കുക"</string>
@@ -2140,8 +2140,7 @@
<string name="accessibility_hearingaid_title" msgid="8312145423610648518">"ശ്രവണ സഹായികൾ"</string>
<string name="accessibility_hearingaid_not_connected_summary" msgid="6240237523789614599">"ശ്രവണ സഹായികളൊന്നും കണക്റ്റ് ചെയ്തിട്ടില്ല"</string>
<string name="accessibility_hearingaid_adding_summary" msgid="2947474468412309778">"ശ്രവണ സഹായികൾ ചേർക്കുക"</string>
- <string name="accessibility_hearingaid_pair_instructions_first_message" msgid="3912093691643131154">"നിങ്ങളുടെ ശ്രവണ സഹായികൾ ജോടിയാക്കണമെങ്കിൽ, അടുത്ത സ്ക്രീനിൽ നിങ്ങളുടെ ഉപകരണം കണ്ടെത്തി ടാപ്പ് ചെയ്യുക."</string>
- <string name="accessibility_hearingaid_pair_instructions_second_message" msgid="5596683393607650243">"നിങ്ങളുടെ ശ്രവണ സഹായികൾ, ജോടിയാക്കൽ മോഡിലാണെന്ന് ഉറപ്പ് വരുത്തുക."</string>
+ <string name="accessibility_hearingaid_pair_instructions_message" msgid="3094382949733435414">"നിങ്ങളുടെ ശ്രവണ സഹായികൾ ജോടിയാക്കണമെങ്കിൽ, അടുത്ത സ്ക്രീനിൽ നിങ്ങളുടെ ഉപകരണം കണ്ടെത്തി ടാപ്പ് ചെയ്യുക. നിങ്ങളുടെ ശ്രവണ സഹായികൾ, ജോടിയാക്കൽ മോഡിലാണെന്ന് ഉറപ്പ് വരുത്തുക."</string>
<string name="accessibility_hearingaid_active_device_summary" msgid="3924362383258688984">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> സജീവമാണ്"</string>
<plurals name="show_number_hearingaid_count" formatted="false" msgid="3160782397139295486">
<item quantity="other"><xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> ശ്രവണ സഹായികൾ സംരക്ഷിച്ചു</item>
@@ -2490,7 +2489,6 @@
<string name="menu_stats_last_unplugged" msgid="5922246077592434526">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> എന്നതിനായി അവസാനം പ്ലഗുചെയ്തത് മാറ്റിയപ്പോൾ"</string>
<string name="menu_stats_total" msgid="8973377864854807854">"ആകെ ഉപയോഗങ്ങൾ"</string>
<string name="menu_stats_refresh" msgid="1676215433344981075">"പുതുക്കുക"</string>
- <string name="process_kernel_label" msgid="3916858646836739323">"Android OS"</string>
<string name="process_mediaserver_label" msgid="6500382062945689285">"മീഡിയ സെർവർ"</string>
<string name="process_dex2oat_label" msgid="2592408651060518226">"ആപ്പ് ഓപ്റ്റിമൈസേഷന്"</string>
<string name="battery_saver" msgid="8172485772238572153">"ബാറ്ററി ലാഭിക്കൽ"</string>
@@ -2621,8 +2619,6 @@
<string name="no_device_admins" msgid="4846602835339095768">"ഉപകരണ അഡ്മിൻ ആപ്പുകളൊന്നും ലഭ്യമല്ല"</string>
<string name="personal_device_admin_title" msgid="2849617316347669861">"വ്യക്തിഗതം"</string>
<string name="managed_device_admin_title" msgid="7853955652864478435">"ഔദ്യോഗികം"</string>
- <string name="sms_access_restriction_enabled" msgid="7054488078710530278">"SMS, കോള് ചരിത്ര ആക്സസ് നിയന്ത്രിക്കുക"</string>
- <string name="sms_access_restriction_enabled_summary" msgid="6851339654677842328">"ഡിഫോൾട്ട് ഫോണിനും സന്ദേശമയയ്ക്കൽ ആപ്പുകൾക്കും മാത്രമേ SMS, കോൾ ചരിത്ര അനുമതികൾ ഉള്ളൂ"</string>
<string name="no_trust_agents" msgid="7450273545568977523">"ലഭ്യമായ പരിചിത ഏജന്റുകളൊന്നുമില്ല"</string>
<string name="add_device_admin_msg" msgid="1501847129819382149">"ഉപകരണ അഡ്മിൻ ആപ്പ് സജീവമാക്കണോ?"</string>
<string name="add_device_admin" msgid="4192055385312215731">"ഈ ഉപകരണ അഡ്മിൻ ആപ്പ് സജീവമാക്കുക"</string>
@@ -3111,7 +3107,7 @@
<string name="keywords_app_default" msgid="5822717006354487071">"ഇത് ഉപയോഗിച്ച് തുറക്കുക"</string>
<string name="keywords_applications_settings" msgid="1268353611121497450">"ആപ്പുകൾ"</string>
<string name="keywords_time_zone" msgid="998254736898753085">"സമയ മേഖല"</string>
- <string name="keywords_draw_overlay" msgid="4130899177619041842">"ചാറ്റ് ഹെഡ്"</string>
+ <string name="keywords_draw_overlay" msgid="1001120206241401007">"ചാറ്റ് ഹെഡ്, സിസ്റ്റം, മുന്നറിയിപ്പ്, വിൻഡോ, ഡയലോഗ്, ഡിസ്പ്ലേ, മറ്റ് ആപ്പുകൾക്ക് മുകളിൽ, ഡ്രോ"</string>
<string name="keywords_flashlight" msgid="6161632177705233710">"ഫ്ലാഷ് ലൈറ്റ്, ലൈറ്റ്, ടോർച്ച്"</string>
<string name="keywords_change_wifi_state" msgid="627068244033681010">"വൈഫൈ, വൈ-ഫൈ, ടോഗിൾ, നിയന്ത്രണം"</string>
<string name="keywords_more_mobile_networks" msgid="8995946622054642367">"സെല്ലുലാർ, മൊബൈൽ, സെൽ കാരിയർ, വയർലെസ്, ഡാറ്റ, 4g,3g, 2g, lte"</string>
@@ -3135,7 +3131,7 @@
<string name="keywords_sounds_and_notifications_interruptions" msgid="5426093074031208917">"അരുത് ശല്യപ്പെടുത്തരുത്, തടസപ്പെടുത്തുക, തടസം, ബ്രേക്ക്"</string>
<string name="keywords_app" msgid="6334757056536837791">"RAM"</string>
<string name="keywords_location" msgid="4132655528196729043">"സമീപമുള്ളവ, ലൊക്കേഷന്, ചരിത്രം, റിപ്പോര്ട്ട് ചെയ്യൽ, GPS"</string>
- <string name="keywords_accounts" msgid="1957925565953357627">"അക്കൗണ്ട്"</string>
+ <string name="keywords_accounts" msgid="4479029747403203867">"അക്കൗണ്ട്, അക്കൗണ്ട് ചേർക്കുക, ഔദ്യോഗിക പ്രൊഫൈൽ"</string>
<string name="keywords_users" msgid="3434190133131387942">"നിയന്ത്രണം, നിയന്ത്രിക്കുക, നിയന്ത്രിച്ചു"</string>
<string name="keywords_keyboard_and_ime" msgid="9143339015329957107">"ടെക്സ്റ്റ് ചെയ്യൽ തിരുത്തൽ, തിരുത്തുക, ശബ്ദം, വൈബ്രേറ്റ് ചെയ്യുക, സ്വമേധയാ, ഭാഷ, വിരൽചലനം, നിർദ്ദേശിക്കുക, നിർദ്ദേശം, തീം, നിന്ദ്യം, പദം, ടൈപ്പുചെയ്യുക, ഇമോജി, അന്തർദ്ദേശീയം"</string>
<string name="keywords_reset_apps" msgid="5293291209613191845">"പുനഃക്രമീകരിക്കുക, മുൻഗണനകൾ, ഡിഫോൾട്ട്"</string>
@@ -3173,6 +3169,7 @@
<string name="keywords_storage_settings" msgid="297283751968446577">"മെമ്മറി, കാഷെ, ഡാറ്റ, ഇല്ലാതാക്കുക, മായ്ക്കുക, സൗജന്യം, സ്പെയ്സ്"</string>
<string name="keywords_bluetooth_settings" msgid="6804844062789439858">"കണക്റ്റ് ചെയ്തു, ഉപകരണം, ഹെഡ്ഫോണുകൾ, ഹെഡ്സെറ്റ്, സ്പീക്കർ, വയര്ലെസ്സ്, ജോടി, ഇയർ ബഡുകൾ, സംഗീതം, മീഡിയ"</string>
<string name="keywords_wallpaper" msgid="5058364390917429896">"പശ്ചാത്തലം, സ്ക്രീൻ, ലോക്ക്സ്ക്രീൻ, തീം"</string>
+ <string name="keywords_styles" msgid="5828725481814049422">"ഐക്കണിന്റെ രൂപം, ആക്സന്റ് വര്ണ്ണം, ഫോണ്ട്"</string>
<string name="keywords_assist_input" msgid="5017533309492679287">"ഡിഫോൾട്ട്, സഹായി"</string>
<string name="keywords_default_payment_app" msgid="3838565809518896799">"പേയ്മെന്റ്, ഡിഫോൾട്ട്"</string>
<string name="keywords_ambient_display" msgid="3103487805748659132">"ഇൻകമിംഗ് അറിയിപ്പ്"</string>
@@ -3182,7 +3179,7 @@
<string name="keywords_notification_vibration" msgid="31924624421190547">"സ്പര്ശനങ്ങൾ, വൈബ്രേറ്റ് ചെയ്യൽ, സെൻസിറ്റിവിറ്റി"</string>
<string name="keywords_battery_saver_sticky" msgid="5586215686021650278">"ബാറ്ററി ലാഭിക്കൽ, സ്റ്റിക്കി, നിലനിൽക്കുക, പവർ സേവർ, ബാറ്ററി"</string>
<string name="keywords_battery_saver_schedule" msgid="7358789228486231944">"ദിനചര്യ, ഷെഡ്യൂൾ, ബാറ്ററി ലാഭിക്കൽ, പവർ സേവർ, ബാറ്ററി, സ്വയമേവ, ശതമാനം"</string>
- <string name="keywords_add_an_account" msgid="6488139919428902434">"ഔദ്യോഗിക പ്രൊഫൈൽ"</string>
+ <string name="keywords_enhance_4g_lte" msgid="2273810564244790859">"volte, വിപുലമായ കോളിംഗ്, 4g കോളിംഗ്"</string>
<string name="default_sound" msgid="8821684447333687810">"സ്ഥിര ശബ്ദം"</string>
<string name="sound_settings_summary" msgid="4100853606668287965">"റിംഗ് വോളിയം: <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
<string name="sound_dashboard_summary" msgid="3402435125958012986">"ശബ്ദം, വൈബ്രേഷൻ, ശല്യപ്പെടുത്തരുത്"</string>
@@ -3889,7 +3886,6 @@
<string name="permit_draw_overlay" msgid="7456536798718633432">"മറ്റ് ആപ്സിന് മുകളിൽ പ്രദർശിക്കുന്നത് അനുവദിക്കുക"</string>
<string name="allow_overlay_description" msgid="8961670023925421358">"നിങ്ങൾ ഉപയോഗിക്കുന്ന മറ്റ് ആപ്പുകൾക്ക് മുകളിൽ ഒരു ആപ്പിനെ ദൃശ്യമാക്കുന്നതിന് ഈ ആപ്പിനെ അനുവദിക്കുക. നിങ്ങൾ ആ ആപ്പുകൾ ഉപയോഗിക്കുന്നതിനെ ഇത് തടസ്സപ്പെടുത്തുകയോ അവ കാണപ്പെടുന്ന അല്ലെങ്കിൽ പെരുമാറുന്ന രീതിയെ മാറ്റുകയോ ചെയ്തേക്കാം."</string>
<string name="keywords_vr_listener" msgid="7441221822576384680">"vr വെർച്വൽ റിയാലിറ്റി ലിസണർ സ്റ്റീരിയോ സഹായി സേവനം"</string>
- <string name="keywords_system_alert_window" msgid="5049498015597864850">"മറ്റ് ആപ്സിന് മുകളിൽ സിസ്റ്റം അലേർട്ട് വിൻഡോ ഡയലോഗ് പ്രദർശിപ്പിക്കുക"</string>
<string name="overlay_settings" msgid="6930854109449524280">"മറ്റ് ആപ്പുകൾക്ക് മുകളിൽ കാണിക്കൂ"</string>
<string name="system_alert_window_summary" msgid="602892301318324492">"മറ്റ് ആപ്സിന് മുകളിൽ പ്രദർശിപ്പിക്കാൻ <xliff:g id="COUNT_0">%1$d</xliff:g> / <xliff:g id="COUNT_1">%2$d</xliff:g> ആപ്സിനെ അനുവദിച്ചു"</string>
<string name="filter_overlay_apps" msgid="6965969283342557573">"അനുമതിയുള്ള ആപ്സ്"</string>
@@ -4125,7 +4121,6 @@
<string name="notification_log_details_none" msgid="184131801230614059">"ഒന്നുമില്ല"</string>
<string name="notification_log_details_ranking_null" msgid="244660392058720919">"റാങ്കിംഗ് ഒബ്ജക്റ്റ് വിട്ടുപോയിരിക്കുന്നു."</string>
<string name="notification_log_details_ranking_none" msgid="599607025882587844">"റാങ്കിംഗ് ഒബ്ജക്റ്റിൽ ഈ കീ അടങ്ങിയിട്ടില്ല."</string>
- <string name="theme_customization_category" msgid="1049181544004163283">"തീമിംഗ്"</string>
<string name="theme_customization_device_default" msgid="5058147707906551368">"ഉപകരണ ഡിഫോള്ട്ട്"</string>
<string name="display_cutout_emulation" msgid="7466869822418376317">"ഡിസ്പ്ലേ കട്ട്ഔട്ട്"</string>
<string name="display_cutout_emulation_keywords" msgid="4495418317471622562">"ഡിസ്പ്ലേ കട്ടൗട്ട്, നോച്ച്"</string>
@@ -4551,6 +4546,8 @@
<string name="network_connection_errorstate_dialog_message" msgid="6953778550775646710">"എന്തോ സംഭവിച്ചു. ഒരു ഉപകരണം തിരഞ്ഞെടുക്കാനുള്ള അഭ്യർത്ഥന ആപ്പ് റദ്ദാക്കിയിരിക്കുന്നു."</string>
<string name="network_connection_connect_successful" msgid="5935510954474494928">"കണക്ഷൻ വിജയകരം"</string>
<string name="network_connection_request_dialog_showall" msgid="6938922880244567521">"എല്ലാം കാണിക്കുക"</string>
+ <string name="network_connection_searching_message" msgid="4638576789450817530">"ഉപകരണത്തിനായി തിരയുന്നു…"</string>
+ <string name="network_connection_connecting_message" msgid="3740982406609245654">"ഉപകരണത്തിലേക്ക് കണക്റ്റ് ചെയ്യുന്നു…"</string>
<plurals name="show_bluetooth_devices" formatted="false" msgid="1715020480026568408">
<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>
diff --git a/res/values-mn/strings.xml b/res/values-mn/strings.xml
index 34253f2..0451a4a 100644
--- a/res/values-mn/strings.xml
+++ b/res/values-mn/strings.xml
@@ -360,8 +360,6 @@
<string name="security_enable_widgets_disabled_summary" msgid="6392489775303464905">"Админ цуцалсан"</string>
<string name="lockdown_settings_title" msgid="7393790212603280213">"Аюулгүйгээр түгжих (lockdown) сонголтыг харуулах"</string>
<string name="lockdown_settings_summary" msgid="4359438673563318171">"Ухаалаг түгжээ, биометрээр түгжээ тайлах онцлог болон мэдэгдлийг түгжигдсэн дэлгэц дээр унтраадаг дэлгэцийн асаах/унтраах товчлуурын сонголт"</string>
- <string name="trust_agents_extend_unlock_title" msgid="2796555263565097031">"Итгэмжлэгдсэн агент зөвхөн түгжээгүй байлгадаг"</string>
- <string name="trust_agents_extend_unlock_summary" msgid="3976344969220255010">"Хэрэв идэвхжүүлсэн бол итгэмжлэгдсэн агент таны төхөөрөмжийг илүү удаан хугацаагаар түгжээгүй байлгах хэдий ч түгжигдсэн төхөөрөмжийн түгжээг цаашид тайлах боломжгүй болно."</string>
<string name="trust_lost_locks_screen_title" msgid="2992742466966021682">"Итгэмжлэлийг алдах үед дэлгэцийг түгжинэ"</string>
<string name="trust_lost_locks_screen_summary" msgid="693784434582021206">"Хэрэв идэвхжүүлсэн бол төхөөрөмж хамгийн сүүлийн итгэмжлэгдсэн агент итгэмжлэлээ алдах үед түгжигдэнэ"</string>
<string name="owner_info_settings_summary" msgid="7472393443779227052">"Байхгүй"</string>
@@ -937,6 +935,7 @@
<string name="wifi_eap_identity" msgid="4359453783379679103">"Таниулбар"</string>
<string name="wifi_eap_anonymous" msgid="2989469344116577955">"Нэргүй таниулбар"</string>
<string name="wifi_password" msgid="5948219759936151048">"Нууц үг"</string>
+ <string name="wifi_sae_password_id" msgid="1697832722221765763">"SAE-н нууц үгийн таниулбар"</string>
<string name="wifi_show_password" msgid="6461249871236968884">"Нууц үгийг харуулах"</string>
<string name="wifi_ap_band_config" msgid="1611826705989117930">"AP Band сонгох"</string>
<string name="wifi_ap_choose_auto" msgid="2677800651271769965">"Автомат"</string>
@@ -957,7 +956,6 @@
<string name="wifi_dpp_share_wifi" msgid="9065890131734833809">"Wi‑Fi-г хуваалцах"</string>
<string name="wifi_dpp_scan_qr_code_with_another_device" msgid="5854392840857123065">"“<xliff:g id="SSID">%1$s</xliff:g>”-д холбогдохын тулд энэ хурдан хариу үйлдлийн кодыг скан хийж, нууц үгийг хуваалцана уу"</string>
<string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="4436318319178361543">"“<xliff:g id="SSID">%1$s</xliff:g>”-д холбогдохын тулд энэ хурдан хариу үйлдлийн кодыг скан хийнэ үү"</string>
- <string name="wifi_dpp_could_not_detect_valid_qr_code" msgid="641893675646330576">"Хурдан хариу үйлдлийн кодыг уншиж чадсангүй. Кодыг дахин голлуулаад дахин оролдоно уу"</string>
<string name="wifi_dpp_failure_authentication_or_configuration" msgid="3372757783382381044">"Дахин оролдоно уу. Хэрэв асуудал үргэлжилсээр байвал төхөөрөмжийн үйлдвэрлэгчтэй холбогдоно уу"</string>
<string name="wifi_dpp_failure_not_compatible" msgid="2829930473520603740">"Алдаа гарлаа"</string>
<string name="wifi_dpp_failure_timeout" msgid="5228320772245820458">"Төхөөрөмжийг залгасан, цэнэглэсэн бөгөөд асаасан эсэхийг шалгана уу"</string>
@@ -980,6 +978,7 @@
<string name="wifi_dpp_hotspot_password" msgid="4120419278831581613">"Сүлжээний цэгийн нууц үг: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
<string name="wifi_dpp_add_device" msgid="4072206063308645677">"Төхөөрөмж нэмэх"</string>
<string name="wifi_dpp_connect_network_using_qr_code" msgid="3887335309163999665">"Энэ сүлжээнд төхөөрөмж нэмэхийн тулд хурдан хариу үйлдлийн код ашиглах"</string>
+ <string name="wifi_dpp_qr_code_is_not_valid_format" msgid="3700087439867692944">"Хурдан хариу үйлдлийн код буруу форматтай байна"</string>
<string name="retry" msgid="6472609612090877557">"Дахин оролдох"</string>
<string name="wifi_shared" msgid="844142443226926070">"Төхөөрөмжийн бусад хэрэглэгчтэй хуваалцах"</string>
<string name="wifi_unchanged" msgid="3410422020930397102">"(өөрчлөгдөөгүй)"</string>
@@ -1129,6 +1128,7 @@
<string name="emergency_address_title" msgid="932729250447887545">"Яаралтай тусламжийн хаяг"</string>
<string name="emergency_address_summary" msgid="7751971156196115129">"Та Wi‑Fi-р яаралтай дуудлага хийх үед таны байршил болгон ашиглана"</string>
<string name="private_dns_help_message" msgid="3299567069152568958">"Хувийн DNS онцлогийн талаар "<annotation id="url">"дэлгэрэнгүй үзнэ үү"</annotation></string>
+ <string name="private_dns_mode_on" msgid="5882613439541371003">"Асаалттай"</string>
<string name="wifi_calling_pref_managed_by_carrier" msgid="6845711858866828986">"Оператор компаниас удирддаг тохиргоо"</string>
<string name="wifi_calling_settings_activation_instructions" msgid="7492509632478260955">"Wi-Fi Дуудлагыг идэвхжүүлэх"</string>
<string name="wifi_calling_turn_on" msgid="1171403510313983983">"Wi-Fi дуудлагыг асаах"</string>
@@ -1872,7 +1872,7 @@
<string name="default_emergency_app" msgid="1951760659640369980">"Яаралтай тусламжийн апп"</string>
<string name="reset_app_preferences" msgid="1321050641018356925">"Апп тохируулгыг дахин шинэчлэх"</string>
<string name="reset_app_preferences_title" msgid="6093179367325336662">"Апп тохируулгыг дахин шинэчлэх үү?"</string>
- <string name="reset_app_preferences_desc" msgid="4822447731869201512">"Энэ нь дараах бүх тохиргоог шинэчлэх болно:\n\n"<li>"Идэвхгүй аппууд"</li>\n<li>"Идэвхгүй апп мэдэгдлүүд"</li>\n<li>"Үйлдлүүдийн үндсэн аппликейшнүүд"</li>\n<li>"Аппуудын далд дата хязгаарлалтууд"</li>\n<li>"Ямар нэг зөвшөөрлийн хязгаарлалтууд"</li>\n\n"Та ямар нэг апп дата алдахгүй."</string>
+ <string name="reset_app_preferences_desc" msgid="731757609326016760">"Энэ нь дараахын бүх тохиргоог шинэчилнэ:\n\n "<li>"Идэвхгүй болгосон хэрэглээний программууд"</li>\n" "<li>"Идэвхгүй болгосон хэрэглээний программын мэдэгдлүүд"</li>\n" "<li>"Үйлдэл хийх өгөгдмөл хэрэглээний программууд"</li>\n" "<li>"Хэрэглээний программуудын арын дата хязгаарлалт"</li>\n" "<li>"Зөвшөөрлийн аливаа хязгаарлалт"</li>\n\n" Та хэрэглээний программын ямар ч өгөгдлөө алдахгүй."</string>
<string name="reset_app_preferences_button" msgid="2559089511841281242">"Апп-г дахин шинэчлэх"</string>
<string name="manage_space_text" msgid="8852711522447794676">"Эзэлсэн зайг удирдах"</string>
<string name="filter" msgid="2018011724373033887">"Шүүлтүүр"</string>
@@ -2087,7 +2087,7 @@
<string name="accessibility_screen_magnification_short_summary" msgid="3411979839172752057">"Томруулахын тулд 3 удаа дар"</string>
<string name="accessibility_screen_magnification_navbar_short_summary" msgid="3693116360267980492">"Томруулахын тулд товчлуурыг товшино уу"</string>
<string name="accessibility_screen_magnification_summary" msgid="5258868553337478505"><b>"Томруулахын тулд"</b>" дэлгэцийг 3 удаа хурдан товшино уу.\n"<ul><li>"Гүйлгэхийн тулд 2 эсвэл олон хуруугаараа чирнэ үү"</li>\n<li>"Томруулах хэмжээг тохируулахын тулд 2 эсвэл олон хуруугаараа чимхэнэ үү"</li></ul>\n\n<b>"Түр хугацаанд томруулахын тулд"</b>" дэлгэцийг 3 удаа товшиж, сүүлийн товшилтыг удаан дарна уу.\n"<ul><li>"Дэлгэцийг судлахын тулд чирнэ үү"</li>\n<li>"Жижигрүүлэхийн тулд хуруугаа өргөнө үү"</li></ul>\n\n"Та гар, навигацийн самбарт томруулах боломжгүй."</string>
- <string name="accessibility_screen_magnification_navbar_summary" msgid="2272878354599332009">"Та томруулалт асаалттай үед дэлгэц дээрээ томруулах боломжтой.\n\n"<b>"Томруулахын тулд"</b>" томруулалтыг эхлүүлээд дэлгэц дээрээ дурын газраа товшино уу.\n"<ul><li>"• Гүйлгэхийн тулд 2 эсвэл түүнээс дээш хуруугаараа чирнэ үү"</li>\n<li>"• Томруулах хэмжээг тохируулахын тулд 2 эсвэл түүнээс дээш хуруугаараа чимхэнэ үү"</li></ul>\n\n<b>"Түр хугацаанд томруулахын тулд"</b>" томруулалтыг эхлүүлээд дэлгэц дээр дурын газраа хүрээд удаан дарна уу.\n"<ul><li>"• Дэлгэц дээр зөөхийн тулд чирнэ үү "</li>\n<li>"• Жижгэрүүлэхийн тулд хуруугаа авна уу"</li></ul>\n\n"Та гар эсвэл навигацийн самбар дээр томруулах боломжгүй."</string>
+ <string name="accessibility_screen_magnification_navbar_summary" msgid="6700716275347612310">"Томруулах сонголт асаалттай үед та дэлгэцээ томруулж болно.\n\n"<b>"Томруулахын тулд "</b>" томруулах сонголтыг эхлүүлж, дэлгэцийн аль нэг хэсгийг товшино уу.\n"<ul><li>"Гүйлгэхийн тулд 2 эсвэл түүнээс дээш хуруугаараа чирнэ үү"</li>\n<li>"Томруулах хэмжээг тохируулахын тулд 2 эсвэл түүнээс дээш хуруугаараа чимхэнэ үү"</li></ul>\n\n<b>"Түр хугацаанд томруулахын тулд "</b>" томруулах сонголтыг эхлүүлээд, дэлгэцийн аль нэг хэсэг дээр удаан дарна уу.\n"<ul><li>"Дэлгэцийн эргэн тойронд очихын тулд чирнэ үү"</li>\n<li>"Жижигрүүлэхийн тулд хуруугаа авна уу"</li></ul>\n\n"Та гар эсвэл навигацийн самбарт томруулах боломжгүй."</string>
<string name="accessibility_tutorial_dialog_title_button" msgid="3682222614034474845">"Нээхийн тулд хандалтын товчлуурыг ашиглах"</string>
<string name="accessibility_tutorial_dialog_title_gesture" msgid="1342726230497913398">"Нээхийн тулд зангааг ашиглах"</string>
<string name="accessibility_tutorial_dialog_title_gesture_settings" msgid="8539392614235820285">"Хандалтын шинэ зангаа ашиглах"</string>
@@ -2140,8 +2140,7 @@
<string name="accessibility_hearingaid_title" msgid="8312145423610648518">"Сонсголын төхөөрөмжүүд"</string>
<string name="accessibility_hearingaid_not_connected_summary" msgid="6240237523789614599">"Холбогдсон сонсголын төхөөрөмжүүд алга"</string>
<string name="accessibility_hearingaid_adding_summary" msgid="2947474468412309778">"Сонсголын төхөөрөмж нэмэх"</string>
- <string name="accessibility_hearingaid_pair_instructions_first_message" msgid="3912093691643131154">"Сонсголын төхөөрөмжүүдээ холбохын тулд төхөөрөмжөө дараагийн дэлгэцээс олж товшино уу."</string>
- <string name="accessibility_hearingaid_pair_instructions_second_message" msgid="5596683393607650243">"Таны сонсголын төхөөрөмжүүд холболтын горимд байгаа эсэхийг шалгана уу."</string>
+ <string name="accessibility_hearingaid_pair_instructions_message" msgid="3094382949733435414">"Сонсголын төхөөрөмжүүдээ хослуулахын тулд төхөөрөмжөө дараагийн дэлгэцээс олж, товшино уу. Таны сонсголын төхөөрөмжүүд хослуулалтын горимд байгаа эсэхийг шалгана уу."</string>
<string name="accessibility_hearingaid_active_device_summary" msgid="3924362383258688984">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> идэвхтэй байна"</string>
<plurals name="show_number_hearingaid_count" formatted="false" msgid="3160782397139295486">
<item quantity="other">Хадгалсан <xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> сонсголын төхөөрөмжүүд</item>
@@ -2490,7 +2489,6 @@
<string name="menu_stats_last_unplugged" msgid="5922246077592434526">"Хамгийн сүүлд тэжээлээс салгаснаас хойш <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
<string name="menu_stats_total" msgid="8973377864854807854">"Нийт ашиглалт"</string>
<string name="menu_stats_refresh" msgid="1676215433344981075">"Дахин шинэчлэх"</string>
- <string name="process_kernel_label" msgid="3916858646836739323">"Андройд OS"</string>
<string name="process_mediaserver_label" msgid="6500382062945689285">"Медиасервер"</string>
<string name="process_dex2oat_label" msgid="2592408651060518226">"Aпп-ийн оновчлол"</string>
<string name="battery_saver" msgid="8172485772238572153">"Батарей хэмнэгч"</string>
@@ -2621,8 +2619,6 @@
<string name="no_device_admins" msgid="4846602835339095768">"Төхөөрөмжийн админ апп алга"</string>
<string name="personal_device_admin_title" msgid="2849617316347669861">"Хувийн"</string>
<string name="managed_device_admin_title" msgid="7853955652864478435">"Ажил"</string>
- <string name="sms_access_restriction_enabled" msgid="7054488078710530278">"SMS & дуудлагын жагсаалтын хандалтыг хязгаарлах"</string>
- <string name="sms_access_restriction_enabled_summary" msgid="6851339654677842328">"Зөвхөн утас болон мессежийн өгөгдмөл апп SMS & дуудлагын жагсаалтын зөвшөөрөлтэй байдаг"</string>
<string name="no_trust_agents" msgid="7450273545568977523">"Ашиглах боломжтой итгэмжлэгдсэн төлөөлөгч байхгүй байна"</string>
<string name="add_device_admin_msg" msgid="1501847129819382149">"Төхөөрөмжийн админ аппыг идэвхжүүлэх үү?"</string>
<string name="add_device_admin" msgid="4192055385312215731">"Энэ төхөөрөмжийн админ аппыг идэвхжүүлэх"</string>
@@ -3111,7 +3107,7 @@
<string name="keywords_app_default" msgid="5822717006354487071">"Дараахаар нээх"</string>
<string name="keywords_applications_settings" msgid="1268353611121497450">"Аппууд"</string>
<string name="keywords_time_zone" msgid="998254736898753085">"цагийн бүс"</string>
- <string name="keywords_draw_overlay" msgid="4130899177619041842">"Чатны толгой"</string>
+ <string name="keywords_draw_overlay" msgid="1001120206241401007">"Чатны толгой, систем, сэрэмжлүүлэг, цонх, харилцах цонх, дэлгэц, бусад хэрэглээний программ дээр, нээх"</string>
<string name="keywords_flashlight" msgid="6161632177705233710">"Гэрэлтүүлэгч, Гэрэл, Гар чийдэн"</string>
<string name="keywords_change_wifi_state" msgid="627068244033681010">"wifi, wi-fi, унтраах/асаах, хяналт"</string>
<string name="keywords_more_mobile_networks" msgid="8995946622054642367">"үүрэн холбоо, үүрэн холбооны оператор, утасгүй интернэт, дата, 4g, 3g, 2g, lte"</string>
@@ -3135,7 +3131,7 @@
<string name="keywords_sounds_and_notifications_interruptions" msgid="5426093074031208917">"бүү саад бол, саад болох, тасалдах, таслах"</string>
<string name="keywords_app" msgid="6334757056536837791">"RAM"</string>
<string name="keywords_location" msgid="4132655528196729043">"ойролцоох, байршил, түүх, тайлан, GPS"</string>
- <string name="keywords_accounts" msgid="1957925565953357627">"бүртгэл"</string>
+ <string name="keywords_accounts" msgid="4479029747403203867">"бүртгэл, бүртгэл нэмэх, ажлын профайл"</string>
<string name="keywords_users" msgid="3434190133131387942">"хязгаарлалт, хязгаарлах, хязгаарласан"</string>
<string name="keywords_keyboard_and_ime" msgid="9143339015329957107">"текст засварлах, зөв, дуу, чичиргээ, авто, хэл, дохио, зөвлөмж, зөвлөгөө, загвар, доромжилсон, үг, төрөл, эможи, олон улсын"</string>
<string name="keywords_reset_apps" msgid="5293291209613191845">"шинэчлэх, тохиргоо, өгөгдмөл"</string>
@@ -3173,6 +3169,7 @@
<string name="keywords_storage_settings" msgid="297283751968446577">"санах ой, завсрын санах ойд хадгалах, өгөгдөл, устгах, арилгах, сул, зай"</string>
<string name="keywords_bluetooth_settings" msgid="6804844062789439858">"холбогдсон, төхөөрөмж, чихэвч, микрофонтой чихэвч, чанга яригч, утасгүй сүлжээ, холболт, чихэнд тогтдог чихэвч, хөгжим, медиа"</string>
<string name="keywords_wallpaper" msgid="5058364390917429896">"цаана, дэлгэц, түгжигдсэн дэлгэц, загвар"</string>
+ <string name="keywords_styles" msgid="5828725481814049422">"дүрс тэмдгийн хэлбэр, өргөлтийн өнгө, фонт"</string>
<string name="keywords_assist_input" msgid="5017533309492679287">"өгөгдмөл, туслах"</string>
<string name="keywords_default_payment_app" msgid="3838565809518896799">"төлбөр, өгөгдмөл"</string>
<string name="keywords_ambient_display" msgid="3103487805748659132">"ирж буй мэдэгдэл"</string>
@@ -3182,7 +3179,7 @@
<string name="keywords_notification_vibration" msgid="31924624421190547">"хүртэхүй, чичиргээ, мэдрэг"</string>
<string name="keywords_battery_saver_sticky" msgid="5586215686021650278">"батарей хэмнэгч, бэхлэгдсэн, үргэлжлэх, эрчим хүч хэмнэгч, батарей"</string>
<string name="keywords_battery_saver_schedule" msgid="7358789228486231944">"хэвшил, хуваарь, батарей хэмнэгч, цахилгаан хэмнэгч, батарей, автомат, хувь"</string>
- <string name="keywords_add_an_account" msgid="6488139919428902434">"ажлын профайл"</string>
+ <string name="keywords_enhance_4g_lte" msgid="2273810564244790859">"volte, дэвшилтэт дуудлага, 4g дуудлага"</string>
<string name="default_sound" msgid="8821684447333687810">"Үндсэн дуу"</string>
<string name="sound_settings_summary" msgid="4100853606668287965">"Хонх дуугарах түвшин <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
<string name="sound_dashboard_summary" msgid="3402435125958012986">"Түвшин, чичиргээ, Бүү саад бол"</string>
@@ -3887,7 +3884,6 @@
<string name="permit_draw_overlay" msgid="7456536798718633432">"Бусад апп дээр харуулахыг зөвшөөрөх"</string>
<string name="allow_overlay_description" msgid="8961670023925421358">"Энэ аппыг ашиглаж буй бусад аппын дээр харуулахыг зөвшөөрнө үү. Ингэснээр таны бусад аппын ашиглалт эсвэл тэдгээрийн харагдац, ажиллагаанд өөрчлөлт орж болзошгүй."</string>
<string name="keywords_vr_listener" msgid="7441221822576384680">"vr виртуал бодит сонсогч стерео туслагч үйлчилгээ"</string>
- <string name="keywords_system_alert_window" msgid="5049498015597864850">"системийн дохиоллын цонхны харилцан үйлдлийг бусад апп дээр харуулах"</string>
<string name="overlay_settings" msgid="6930854109449524280">"Бусад апп дээр харуулах"</string>
<string name="system_alert_window_summary" msgid="602892301318324492">"<xliff:g id="COUNT_1">%2$d</xliff:g> аппын <xliff:g id="COUNT_0">%1$d</xliff:g>-г бусад апп дээр харуулахыг зөвшөөрсөн"</string>
<string name="filter_overlay_apps" msgid="6965969283342557573">"Зөвшөөрөлтэй Апп"</string>
@@ -4123,7 +4119,6 @@
<string name="notification_log_details_none" msgid="184131801230614059">"байхгүй"</string>
<string name="notification_log_details_ranking_null" msgid="244660392058720919">"Зэрэглэх объект байхгүй байна."</string>
<string name="notification_log_details_ranking_none" msgid="599607025882587844">"Зэрэглэх объектод энэ түлхүүр байхгүй."</string>
- <string name="theme_customization_category" msgid="1049181544004163283">"Загвар"</string>
<string name="theme_customization_device_default" msgid="5058147707906551368">"Төхөөрөмжийн өгөгдмөл"</string>
<string name="display_cutout_emulation" msgid="7466869822418376317">"Дэлгэцийг таслах"</string>
<string name="display_cutout_emulation_keywords" msgid="4495418317471622562">"дэлгэцийн хайчилбар, хэрчлээс"</string>
@@ -4549,6 +4544,8 @@
<string name="network_connection_errorstate_dialog_message" msgid="6953778550775646710">"Ямар нэг асуудал гарлаа. Энэ апп төхөөрөмж сонгох хүсэлтийг цуцаллаа."</string>
<string name="network_connection_connect_successful" msgid="5935510954474494928">"Амжилттай холбогдлоо"</string>
<string name="network_connection_request_dialog_showall" msgid="6938922880244567521">"Бүгдийг харуулах"</string>
+ <string name="network_connection_searching_message" msgid="4638576789450817530">"Төхөөрөмж хайж байна…"</string>
+ <string name="network_connection_connecting_message" msgid="3740982406609245654">"Төхөөрөмжид холбогдож байна…"</string>
<plurals name="show_bluetooth_devices" formatted="false" msgid="1715020480026568408">
<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>
diff --git a/res/values-mr/strings.xml b/res/values-mr/strings.xml
index 42df3a4..01f43ca 100644
--- a/res/values-mr/strings.xml
+++ b/res/values-mr/strings.xml
@@ -360,8 +360,6 @@
<string name="security_enable_widgets_disabled_summary" msgid="6392489775303464905">"प्रशासकाने अक्षम केलेले"</string>
<string name="lockdown_settings_title" msgid="7393790212603280213">"लॉकडाउन पर्याय दाखवा"</string>
<string name="lockdown_settings_summary" msgid="4359438673563318171">"Smart Lock, बायोमेट्रिक अनलॉकिंग आणि लॉक स्क्रीनवरील सूचना बंद करणार्या पॉवर बटणाचा पर्याय दाखवा"</string>
- <string name="trust_agents_extend_unlock_title" msgid="2796555263565097031">"विश्वासू एजंट फक्त अनलॉक विस्तारीत करतात"</string>
- <string name="trust_agents_extend_unlock_summary" msgid="3976344969220255010">"सुरू केल्यास, विश्वासू एजंट तुमचे डिव्हाइस आणखी जास्त काळ अनलॉक ठेवतील, पण लॉक केलेले डिव्हाइस यापुढे अनलॉक करू शकणार नाहीत."</string>
<string name="trust_lost_locks_screen_title" msgid="2992742466966021682">"विश्वास गमावेल तेव्हा स्क्रीन लॉक करा"</string>
<string name="trust_lost_locks_screen_summary" msgid="693784434582021206">"सुरू असल्यास, शेवटचा विश्वसनीय एजंट विश्वास गमावेल तेव्हा डिव्हाइस लॉक होईल"</string>
<string name="owner_info_settings_summary" msgid="7472393443779227052">"काहीही नाही"</string>
@@ -937,6 +935,8 @@
<string name="wifi_eap_identity" msgid="4359453783379679103">"ओळख"</string>
<string name="wifi_eap_anonymous" msgid="2989469344116577955">"अनामित ओळख"</string>
<string name="wifi_password" msgid="5948219759936151048">"पासवर्ड"</string>
+ <!-- no translation found for wifi_sae_password_id (1697832722221765763) -->
+ <skip />
<string name="wifi_show_password" msgid="6461249871236968884">"पासवर्ड दाखवा"</string>
<string name="wifi_ap_band_config" msgid="1611826705989117930">"AP बँड निवडा"</string>
<string name="wifi_ap_choose_auto" msgid="2677800651271769965">"आपोआप"</string>
@@ -957,7 +957,6 @@
<string name="wifi_dpp_share_wifi" msgid="9065890131734833809">"वाय-फाय शेअर करा"</string>
<string name="wifi_dpp_scan_qr_code_with_another_device" msgid="5854392840857123065">"“<xliff:g id="SSID">%1$s</xliff:g>” शी कनेक्ट करण्यासाठी हा QR कोड स्कॅन करा आणि पासवर्ड शेअर करा"</string>
<string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="4436318319178361543">"“<xliff:g id="SSID">%1$s</xliff:g>” शी कनेक्ट करण्यासाठी हा QR कोड स्कॅन करा"</string>
- <string name="wifi_dpp_could_not_detect_valid_qr_code" msgid="641893675646330576">"QR कोड वाचू शकलो नाही. कोड पुन्हा एंटर करा आणि पुन्हा प्रयत्न करा"</string>
<string name="wifi_dpp_failure_authentication_or_configuration" msgid="3372757783382381044">"पुन्हा प्रयत्न करा. समस्या कायम राहिल्यास, डिव्हाइस निर्मात्याशी संपर्क साधा"</string>
<string name="wifi_dpp_failure_not_compatible" msgid="2829930473520603740">"काहीतरी चूक झाली"</string>
<string name="wifi_dpp_failure_timeout" msgid="5228320772245820458">"डिव्हाइस प्लग इन केलेले, चार्ज केलेले आणि सुरू केले गेलेले असल्याची खात्री करा"</string>
@@ -980,6 +979,7 @@
<string name="wifi_dpp_hotspot_password" msgid="4120419278831581613">"हॉटस्पॉट पासवर्ड: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
<string name="wifi_dpp_add_device" msgid="4072206063308645677">"डिव्हाइस जोडा"</string>
<string name="wifi_dpp_connect_network_using_qr_code" msgid="3887335309163999665">"या नेटवर्कमध्ये डिव्हाइस जोडण्यासाठी QR कोड वापरा"</string>
+ <string name="wifi_dpp_qr_code_is_not_valid_format" msgid="3700087439867692944">"QR कोडचा फॉरमॅट चुकीचा आहे"</string>
<string name="retry" msgid="6472609612090877557">"पुन्हा प्रयत्न करा"</string>
<string name="wifi_shared" msgid="844142443226926070">"इतर डिव्हाइस वापरकर्त्यांसह शेअर करा"</string>
<string name="wifi_unchanged" msgid="3410422020930397102">"(अजून तेच आहे)"</string>
@@ -1129,6 +1129,7 @@
<string name="emergency_address_title" msgid="932729250447887545">"संकटकालीन पत्ता"</string>
<string name="emergency_address_summary" msgid="7751971156196115129">"तुम्ही वाय-फाय वरून आणीबाणी कॉल केल्यावर हे तुमचे स्थान असल्याचे दाखवले जाते"</string>
<string name="private_dns_help_message" msgid="3299567069152568958">"खाजगी DNS वैशिष्ट्यांबद्दल "<annotation id="url">"अधिक जाणून घ्या"</annotation></string>
+ <string name="private_dns_mode_on" msgid="5882613439541371003">"सुरू करा"</string>
<string name="wifi_calling_pref_managed_by_carrier" msgid="6845711858866828986">"सेटिंग वाहकाद्वारे व्यवस्थापित केले आहे"</string>
<string name="wifi_calling_settings_activation_instructions" msgid="7492509632478260955">"वाय-फाय कॉलिंग सुरू करा"</string>
<string name="wifi_calling_turn_on" msgid="1171403510313983983">"वाय-फाय कॉलिंग सुरू करा"</string>
@@ -1873,7 +1874,7 @@
<string name="default_emergency_app" msgid="1951760659640369980">"आणीबाणी अॅप"</string>
<string name="reset_app_preferences" msgid="1321050641018356925">"अॅप प्राधान्ये रीसेट करा"</string>
<string name="reset_app_preferences_title" msgid="6093179367325336662">"अॅप प्राधान्ये रीसेट करायचे?"</string>
- <string name="reset_app_preferences_desc" msgid="4822447731869201512">"हे यासाठी सर्व प्राधान्ये रीसेट करेल:\n\n"<li>"बंद केलेली अॅप्स"</li>\n<li>"बंद केलेल्या अॅप्स सूचना"</li>\n<li>"क्रियांसाठी डीफॉल्ट अॅप्लिकेशन्स"</li>\n<li>"अॅप्ससाठी पार्श्वभूमीवरील डेटा प्रतिबंध"</li>\n<li>"कोणतेही परवानगी प्रतिबंध"</li>\n\n" तुम्ही कोणताही अॅप डेटा गमावणार नाही."</string>
+ <string name="reset_app_preferences_desc" msgid="731757609326016760">"हे यासाठी सर्व प्राधान्ये रीसेट करेल:\n\n"<li>"बंद केलेली अॅप्स"</li>\n<li>"बंद केलेल्या अॅप्स सूचना"</li>\n<li>"क्रियांसाठी डीफॉल्ट अॅप्लिकेशन"</li>\n<li>"अॅप्ससाठी बॅकग्राउंड डेटा प्रतिबंध"</li>\n<li>"कोणतेही परवानगी प्रतिबंध"</li>\n\n"तुम्ही कोणताही अॅप डेटा गमावणार नाही."</string>
<string name="reset_app_preferences_button" msgid="2559089511841281242">"अॅप्स रीसेट करा"</string>
<string name="manage_space_text" msgid="8852711522447794676">"जागा व्यवस्थापित करा"</string>
<string name="filter" msgid="2018011724373033887">"फिल्टर"</string>
@@ -2088,7 +2089,7 @@
<string name="accessibility_screen_magnification_short_summary" msgid="3411979839172752057">"झूम करण्यासाठी 3 वेळा टॅप करा"</string>
<string name="accessibility_screen_magnification_navbar_short_summary" msgid="3693116360267980492">"झूम करण्यासाठी बटणावर टॅप करा"</string>
<string name="accessibility_screen_magnification_summary" msgid="5258868553337478505"><b>"झूम करण्यासाठी"</b>", स्क्रीनवर 3 वेळा पटपट टॅप करा.\n"<ul><li>"स्क्रोल करण्यासाठी 2 किंवा अधिक बोटांनी ड्रॅग करा"</li>\n<li>"झूम अॅडजस्ट करण्यासाठी 2 किंवा अधिक बोटांनी पिंच करा"</li></ul>\n\n<b>"तात्पुरते झूम करण्यासाठी"</b>", स्क्रीनवर 3 वेळा पटपट टॅप करा आणि तिसर्या टॅपवर तुमचे बोट धरून ठेवा.\n"<ul><li>"स्क्रीनवर इथेतिथे जाण्यासाठी ड्रॅग करा"</li>\n<li>"झूम कमी करण्यासाठी बोट उचला"</li></ul>\n\n"तुम्ही कीबोर्ड किंवा नेव्हिगेशन बारचा झूम वाढवू शकत नाही."</string>
- <string name="accessibility_screen_magnification_navbar_summary" msgid="2272878354599332009">"मॅग्निफिकेशन सुरू असेल तेव्हा, तुम्ही तुमची स्क्रीन झूम इन करू शकता.\n\n"<b>"झूम करण्यासाठी"</b>", मॅग्निफिकेशन सुरू करा आणि त्यानंतर स्क्रीनवर कुठेही टॅप करा.\n"<ul><li>"• स्क्रोल करण्यासाठी दोन किंवा अधिक बोटांनी ड्रॅग करा."</li>\n<li>"• झूम अॅडजस्ट करण्यासाठी दोन किंवा अधिक बोटांनी पिंच करा"</li></ul>\n\n<b>"तात्पुरते झूम करण्यासाठी "</b>", मॅग्निफिकेशन सुरू करा आणि स्क्रीनवर कुठेही धरून ठेवा.\n"<ul><li>"• स्क्रीनमध्ये कुठेही ड्रॅग करण्यासाठी "</li>\n<li>"• झूम आउट करण्यासाठी बोट उचला"</li></ul>\n\n"तुम्ही कीबोर्ड किंवा नेव्हिगेशन बार वर झूम इन करू शकत नाही."</string>
+ <string name="accessibility_screen_magnification_navbar_summary" msgid="6700716275347612310">"मॅग्निफिकेशन सुरू असल्यास, तुम्ही तुमची स्क्रीन झूम इन करू शकता.\n\n"<b>"झूम करण्यासाठी"</b>", मॅग्निफिकेशन सुरू करा आणि त्यानंतर स्क्रीनवर कुठेही टॅप करा.\n"<ul><li>"स्क्रोल करण्यासाठी दोन किंवा अधिक बोटांनी ड्रॅग करा."</li>\n<li>"झूम अॅडजस्ट करण्यासाठी दोन किंवा अधिक बोटांनी पिंच करा"</li></ul>\n\n<b>"तात्पुरते झूम करण्यासाठी "</b>", मॅग्निफिकेशन सुरू करा आणि स्क्रीनवर कुठेही धरून ठेवा.\n"<ul><li>"स्क्रीनमध्ये कुठेही ड्रॅग करण्यासाठी "</li>\n<li>"झूम आउट करण्यासाठी बोट उचला"</li></ul>\n\n"तुम्ही कीबोर्ड किंवा नेव्हिगेशन बार वर झूम इन करू शकत नाही."</string>
<string name="accessibility_tutorial_dialog_title_button" msgid="3682222614034474845">"उघडण्यासाठी अॅक्सेसिबिलिटी बटण वापरा"</string>
<string name="accessibility_tutorial_dialog_title_gesture" msgid="1342726230497913398">"उघडण्यासाठी जेश्चर वापरा"</string>
<string name="accessibility_tutorial_dialog_title_gesture_settings" msgid="8539392614235820285">"नवीन अॅक्सेसिबिलिटी जेश्चर वापरा"</string>
@@ -2141,8 +2142,7 @@
<string name="accessibility_hearingaid_title" msgid="8312145423610648518">"श्रवण यंत्रे"</string>
<string name="accessibility_hearingaid_not_connected_summary" msgid="6240237523789614599">"कोणतीही श्रवण यंत्रे जोडलेली नाहीत"</string>
<string name="accessibility_hearingaid_adding_summary" msgid="2947474468412309778">"श्रवण यंत्रे जोडा"</string>
- <string name="accessibility_hearingaid_pair_instructions_first_message" msgid="3912093691643131154">"तुमची श्रवण यंत्रे पेअर करण्यासाठी पुढील स्क्रीनवर तुमचे डिव्हाइस शोधा आणि त्यावर टॅप करा."</string>
- <string name="accessibility_hearingaid_pair_instructions_second_message" msgid="5596683393607650243">"तुमची श्रवण यंत्रे पेअरिंग मोडमध्ये असल्याची खात्री करा."</string>
+ <string name="accessibility_hearingaid_pair_instructions_message" msgid="3094382949733435414">"तुमची श्रवणयंत्रे पेअर करण्यासाठी पुढील स्क्रीनवर तुमचे डिव्हाइस शोधा आणि त्यावर टॅप करा. तुमची श्रवणयंत्रे पेअरिंग मोडमध्ये असल्याची खात्री करा."</string>
<string name="accessibility_hearingaid_active_device_summary" msgid="3924362383258688984">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> सुरू आहे"</string>
<plurals name="show_number_hearingaid_count" formatted="false" msgid="3160782397139295486">
<item quantity="other"> सेव्ह केलेली <xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> श्रवण यंत्रे</item>
@@ -2491,7 +2491,6 @@
<string name="menu_stats_last_unplugged" msgid="5922246077592434526">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> साठी अंतिम अनप्लग केलेले असताना"</string>
<string name="menu_stats_total" msgid="8973377864854807854">"वापर एकूण"</string>
<string name="menu_stats_refresh" msgid="1676215433344981075">"रिफ्रेश करा"</string>
- <string name="process_kernel_label" msgid="3916858646836739323">"Android OS"</string>
<string name="process_mediaserver_label" msgid="6500382062945689285">"मीडियासर्व्हर"</string>
<string name="process_dex2oat_label" msgid="2592408651060518226">"अॅप ऑप्टिमायझेशन"</string>
<string name="battery_saver" msgid="8172485772238572153">"बॅटरी सेव्हर"</string>
@@ -2622,8 +2621,6 @@
<string name="no_device_admins" msgid="4846602835339095768">"कोणतेही डिव्हाइस प्रशासक अॅप्स उपलब्ध नाहीत"</string>
<string name="personal_device_admin_title" msgid="2849617316347669861">"वैयक्तिक"</string>
<string name="managed_device_admin_title" msgid="7853955652864478435">"कार्य"</string>
- <string name="sms_access_restriction_enabled" msgid="7054488078710530278">"एसएमएस आणि कॉल लॉग अॅक्सेस प्रतिबंधित करा"</string>
- <string name="sms_access_restriction_enabled_summary" msgid="6851339654677842328">"फक्त डीफॉल्ट फोन आणि मेसेजिंग अॅप्सना एसएमएस आणि कॉल लॉग परवानग्या आहेत"</string>
<string name="no_trust_agents" msgid="7450273545568977523">"कोणतेही विश्वासू एजंट उपलब्ध नाहीत"</string>
<string name="add_device_admin_msg" msgid="1501847129819382149">"डिव्हाइस प्रशासक अॅप अॅक्टिव्हेट करायचे?"</string>
<string name="add_device_admin" msgid="4192055385312215731">"हे डिव्हाइस प्रशासक अॅप अॅक्टिव्हेट करा"</string>
@@ -3112,7 +3109,7 @@
<string name="keywords_app_default" msgid="5822717006354487071">"याने उघडा"</string>
<string name="keywords_applications_settings" msgid="1268353611121497450">"अॅप्लिकेशन"</string>
<string name="keywords_time_zone" msgid="998254736898753085">"टाइमझोन"</string>
- <string name="keywords_draw_overlay" msgid="4130899177619041842">"चॅट हेड"</string>
+ <string name="keywords_draw_overlay" msgid="1001120206241401007">"चॅट हेड, सिस्टम, सूचना, विंडो, डायलॉग, डिस्प्ले, इतर अॅप्सच्या टॉपवर, ड्रॉ"</string>
<string name="keywords_flashlight" msgid="6161632177705233710">"फ्लॅशलाइट, लाइट, टॉर्च"</string>
<string name="keywords_change_wifi_state" msgid="627068244033681010">"वायफाय, वाय-फाय, टॉगल, कंट्रोल"</string>
<string name="keywords_more_mobile_networks" msgid="8995946622054642367">"सेल्युलर, मोबाइल, सेल वाहक, वायरलेस, डेटा, 4g, 3g, 2g, lte"</string>
@@ -3136,7 +3133,7 @@
<string name="keywords_sounds_and_notifications_interruptions" msgid="5426093074031208917">"व्यत्यय आणू नका, व्यत्यय आणा, व्यत्यय, खंडित करा"</string>
<string name="keywords_app" msgid="6334757056536837791">"RAM"</string>
<string name="keywords_location" msgid="4132655528196729043">"जवळपासचे, स्थान, इतिहास, अहवाल देणे, GPS"</string>
- <string name="keywords_accounts" msgid="1957925565953357627">"खाते"</string>
+ <string name="keywords_accounts" msgid="4479029747403203867">"खाते, खाते जोडा, कार्य प्रोफाइल"</string>
<string name="keywords_users" msgid="3434190133131387942">"प्रतिबंध, प्रतिबंधित करा, प्रतिबंधित"</string>
<string name="keywords_keyboard_and_ime" msgid="9143339015329957107">"मजकूर सुधारणा, योग्य, ध्वनी, व्हायब्रेट, अॉटो, भाषा, जेश्चर, सुचवा, सूचना, थीम, आक्षेपार्ह, शब्द, प्रकार, ईमोजी, आंतरराष्ट्रीय"</string>
<string name="keywords_reset_apps" msgid="5293291209613191845">"रीसेट करा, प्राधान्ये, डीफॉल्ट"</string>
@@ -3174,6 +3171,7 @@
<string name="keywords_storage_settings" msgid="297283751968446577">"मेमरी, कॅशे, डेटा, हटवा, साफ करा, मोकळी करा, जागा"</string>
<string name="keywords_bluetooth_settings" msgid="6804844062789439858">"कनेक्ट केलेले, डिव्हाइस, हेडफोन, हेडसेट, स्पीकर, वायरलेस, पेअर, इयरबड, संगीत, मीडिया"</string>
<string name="keywords_wallpaper" msgid="5058364390917429896">"पार्श्वभूमी, स्क्रीन, लॉकस्क्रीन, थीम"</string>
+ <string name="keywords_styles" msgid="5828725481814049422">"आयकनचा आकार, अॅक्सेंटचा रंग, फॉन्ट"</string>
<string name="keywords_assist_input" msgid="5017533309492679287">"डीफॉल्ट, सहाय्यक"</string>
<string name="keywords_default_payment_app" msgid="3838565809518896799">"पेमेंट, डीफॉल्ट"</string>
<string name="keywords_ambient_display" msgid="3103487805748659132">"येणारी सूचना"</string>
@@ -3183,7 +3181,7 @@
<string name="keywords_notification_vibration" msgid="31924624421190547">"हॅप्टीक्स, कंपन, संवेदनशीलता"</string>
<string name="keywords_battery_saver_sticky" msgid="5586215686021650278">"बॅटरी सेव्हर, चिकट, सततचे, पॉवर सेव्हर, बॅटरी"</string>
<string name="keywords_battery_saver_schedule" msgid="7358789228486231944">"दिनक्रम, शेड्युल, बॅटरी सेव्हर, पॉवर सेव्हर, बॅटरी, ऑटोमॅटिक, टक्के"</string>
- <string name="keywords_add_an_account" msgid="6488139919428902434">"कार्य प्रोफाइल"</string>
+ <string name="keywords_enhance_4g_lte" msgid="2273810564244790859">"volte, प्रगत कॉलिंग, 4G कॉलिंग"</string>
<string name="default_sound" msgid="8821684447333687810">"डीफॉल्ट ध्वनी"</string>
<string name="sound_settings_summary" msgid="4100853606668287965">"रिंग व्हॉल्यूम <xliff:g id="PERCENTAGE">%1$s</xliff:g> वर"</string>
<string name="sound_dashboard_summary" msgid="3402435125958012986">"आवाज, व्हायब्रेट, व्यत्यय आणू नका"</string>
@@ -3890,7 +3888,6 @@
<string name="permit_draw_overlay" msgid="7456536798718633432">"इतर अॅप्सच्या वर प्रदर्शित करू द्या"</string>
<string name="allow_overlay_description" msgid="8961670023925421358">"या अॅपला तुम्ही वापरत असलेल्या इतर अॅप्सच्या शीर्षस्थानी प्रदर्शित होण्याची अनुमती द्या. ते आपल्या त्या अॅप्सच्या वापरात हस्तक्षेप करू शकते किंवा त्यांच्या दिसण्यात किंवा वर्तणुकीत बदल करू शकते."</string>
<string name="keywords_vr_listener" msgid="7441221822576384680">"vr आभासी वास्तविकता श्रोता स्टीरीओ मदतकर्ता सेवा"</string>
- <string name="keywords_system_alert_window" msgid="5049498015597864850">"इतर अॅप्सच्या शीर्षस्थानी सिस्टम सूचना विंडो संवाद डिस्प्ले"</string>
<string name="overlay_settings" msgid="6930854109449524280">"इतर अॅप्सच्या वर प्रदर्शित करा"</string>
<string name="system_alert_window_summary" msgid="602892301318324492">"<xliff:g id="COUNT_1">%2$d</xliff:g> पैकी <xliff:g id="COUNT_0">%1$d</xliff:g> अॅप्सना इतर अॅप्सच्या वर प्रदर्शित होण्याची अनुमती"</string>
<string name="filter_overlay_apps" msgid="6965969283342557573">"परवानगी असलेले अॅप्स"</string>
@@ -4126,7 +4123,6 @@
<string name="notification_log_details_none" msgid="184131801230614059">"काहीही नाही"</string>
<string name="notification_log_details_ranking_null" msgid="244660392058720919">"रँकिंग ऑब्जेक्ट गहाळ आहे."</string>
<string name="notification_log_details_ranking_none" msgid="599607025882587844">"रँकिंग ऑब्जेक्ट मध्ये ही की असू शकत नाही."</string>
- <string name="theme_customization_category" msgid="1049181544004163283">"थीमिंग"</string>
<string name="theme_customization_device_default" msgid="5058147707906551368">"डिव्हाइस डीफॉल्ट"</string>
<string name="display_cutout_emulation" msgid="7466869822418376317">"डिस्प्ले कटआउट"</string>
<string name="display_cutout_emulation_keywords" msgid="4495418317471622562">"कटआउट, नॉच डिस्प्ले करा"</string>
@@ -4552,6 +4548,8 @@
<string name="network_connection_errorstate_dialog_message" msgid="6953778550775646710">"काहीतरी गडबड झाली. अॅप्लिकेशनने डिव्हाइस निवडण्याची विनंती रद्द केली."</string>
<string name="network_connection_connect_successful" msgid="5935510954474494928">"कनेक्शन यशस्वी"</string>
<string name="network_connection_request_dialog_showall" msgid="6938922880244567521">"सर्व दाखवा"</string>
+ <string name="network_connection_searching_message" msgid="4638576789450817530">"डिव्हाइस शोधत आहे…"</string>
+ <string name="network_connection_connecting_message" msgid="3740982406609245654">"डिव्हाइसशी कनेक्ट करत आहे…"</string>
<plurals name="show_bluetooth_devices" formatted="false" msgid="1715020480026568408">
<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>
diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml
index 924cf5b..601402d 100644
--- a/res/values-ms/strings.xml
+++ b/res/values-ms/strings.xml
@@ -360,8 +360,6 @@
<string name="security_enable_widgets_disabled_summary" msgid="6392489775303464905">"Dilumpuhkan oleh pentadbir"</string>
<string name="lockdown_settings_title" msgid="7393790212603280213">"Tunjukkan pilihan kunci semua"</string>
<string name="lockdown_settings_summary" msgid="4359438673563318171">"Paparkan pilihan butang kuasa yang mematikan Smart Lock, ciri buka kunci biometrik dan pemberitahuan pada skrin kunci"</string>
- <string name="trust_agents_extend_unlock_title" msgid="2796555263565097031">"Ejen amanah hnya pnjgkn tmpoh tak brknci"</string>
- <string name="trust_agents_extend_unlock_summary" msgid="3976344969220255010">"Jika didayakan, ejen amanah akan memastikan peranti anda tidak dikunci untuk tempoh yang lebih lama tetapi tidak lagi dapat membuka kunci peranti yang berkunci."</string>
<string name="trust_lost_locks_screen_title" msgid="2992742466966021682">"Kunci skrin apabila kepercayaan hilang"</string>
<string name="trust_lost_locks_screen_summary" msgid="693784434582021206">"Jika didayakan, peranti akan dikunci apabila ejen amanah terakhir hilang kepercayaan"</string>
<string name="owner_info_settings_summary" msgid="7472393443779227052">"Tiada"</string>
@@ -937,6 +935,7 @@
<string name="wifi_eap_identity" msgid="4359453783379679103">"Identiti"</string>
<string name="wifi_eap_anonymous" msgid="2989469344116577955">"Identiti tanpa nama"</string>
<string name="wifi_password" msgid="5948219759936151048">"Kata laluan"</string>
+ <string name="wifi_sae_password_id" msgid="1697832722221765763">"Pengecam kata laluan SAE"</string>
<string name="wifi_show_password" msgid="6461249871236968884">"Tunjukkan kata laluan"</string>
<string name="wifi_ap_band_config" msgid="1611826705989117930">"Pilih Jalur AP"</string>
<string name="wifi_ap_choose_auto" msgid="2677800651271769965">"Automatik"</string>
@@ -957,7 +956,6 @@
<string name="wifi_dpp_share_wifi" msgid="9065890131734833809">"Kongsi Wi‑Fi"</string>
<string name="wifi_dpp_scan_qr_code_with_another_device" msgid="5854392840857123065">"Imbas kod QR ini untuk menyambung ke “<xliff:g id="SSID">%1$s</xliff:g>” dan kongsikan kata laluan"</string>
<string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="4436318319178361543">"Imbas kod QR ini untuk menyambung ke “<xliff:g id="SSID">%1$s</xliff:g>”"</string>
- <string name="wifi_dpp_could_not_detect_valid_qr_code" msgid="641893675646330576">"Tidak dapat membaca kod QR. Tengahkan semula kod, kemudian cuba lagi"</string>
<string name="wifi_dpp_failure_authentication_or_configuration" msgid="3372757783382381044">"Cuba lagi. Jika isu berterusan, hubungi pengilang peranti"</string>
<string name="wifi_dpp_failure_not_compatible" msgid="2829930473520603740">"Kesilapan telah berlaku"</string>
<string name="wifi_dpp_failure_timeout" msgid="5228320772245820458">"Pastikan peranti sudah dipalamkan, dicas dan dihidupkan"</string>
@@ -980,6 +978,7 @@
<string name="wifi_dpp_hotspot_password" msgid="4120419278831581613">"Kata laluan tempat liputan: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
<string name="wifi_dpp_add_device" msgid="4072206063308645677">"Tambah peranti"</string>
<string name="wifi_dpp_connect_network_using_qr_code" msgid="3887335309163999665">"Gunakan kod QR untuk menambahkan peranti pada rangkaian ini"</string>
+ <string name="wifi_dpp_qr_code_is_not_valid_format" msgid="3700087439867692944">"Kod QR bukan dalam format yang sah"</string>
<string name="retry" msgid="6472609612090877557">"Cuba semula"</string>
<string name="wifi_shared" msgid="844142443226926070">"Kongsi dengan pengguna peranti yang lain"</string>
<string name="wifi_unchanged" msgid="3410422020930397102">"(tidak berubah)"</string>
@@ -1129,6 +1128,7 @@
<string name="emergency_address_title" msgid="932729250447887545">"Alamat Kecemasan"</string>
<string name="emergency_address_summary" msgid="7751971156196115129">"Digunakan sebagai lokasi anda apabila anda membuat panggilan kecemasan melalui Wi-Fi"</string>
<string name="private_dns_help_message" msgid="3299567069152568958"><annotation id="url">"Ketahui lebih lanjut"</annotation>" tentang ciri DNS Peribadi"</string>
+ <string name="private_dns_mode_on" msgid="5882613439541371003">"Hidup"</string>
<string name="wifi_calling_pref_managed_by_carrier" msgid="6845711858866828986">"Tetapan diurus oleh pembawa"</string>
<string name="wifi_calling_settings_activation_instructions" msgid="7492509632478260955">"Aktifkan Panggilan Wi-Fi"</string>
<string name="wifi_calling_turn_on" msgid="1171403510313983983">"Hidupkan panggilan Wi-Fi"</string>
@@ -1872,7 +1872,7 @@
<string name="default_emergency_app" msgid="1951760659640369980">"Apl kecemasan"</string>
<string name="reset_app_preferences" msgid="1321050641018356925">"Tetapkan semula pilihan apl"</string>
<string name="reset_app_preferences_title" msgid="6093179367325336662">"Tetapkan semula pilihan apl?"</string>
- <string name="reset_app_preferences_desc" msgid="4822447731869201512">"Ini akan menetapkan semula semua pilihan untuk:\n\n"<li>"Apl dilumpuhkan"</li>\n<li>"Pemberitahuan apl dilumpuhkan"</li>\n<li>"Aplikasi lalai untuk tindakan"</li>\n<li>"Sekatan data latar belakang untuk apl"</li>\n<li>"Sebarang sekatan kebenaran"</li>\n\n"Anda tidak akan kehilangan apa-apa data apl."</string>
+ <string name="reset_app_preferences_desc" msgid="731757609326016760">"Tindakan ini akan menetapkan semula semua pilihan untuk:\n\n"<li>"Apl yang dilumpuhkan"</li>\n<li>"Pemberitahuan untuk apl yang dilumpuhkan"</li>\n<li>"Aplikasi lalai untuk tindakan"</li>\n<li>"Sekatan data latar belakang untuk apl"</li>\n<li>"Sebarang sekatan kebenaran"</li>\n\n"Anda tidak akan kehilangan sebarang data apl."</string>
<string name="reset_app_preferences_button" msgid="2559089511841281242">"Tetapkan semula apl"</string>
<string name="manage_space_text" msgid="8852711522447794676">"Urus ruang"</string>
<string name="filter" msgid="2018011724373033887">"Tapis"</string>
@@ -2087,7 +2087,7 @@
<string name="accessibility_screen_magnification_short_summary" msgid="3411979839172752057">"Ketik 3 kali untuk mengezum"</string>
<string name="accessibility_screen_magnification_navbar_short_summary" msgid="3693116360267980492">"Ketik butang untuk mengezum"</string>
<string name="accessibility_screen_magnification_summary" msgid="5258868553337478505"><b>"Untuk mengezum"</b>", ketik skrin 3 kali dengan cepat.\n"<ul><li>"Seret sekurang-kurangnya 2 jari untuk menatal"</li>\n<li>"Cubit menggunakan sekurang-kurangnya 2 jari untuk melaraskan zum"</li></ul>\n\n<b>"Untuk mengezum sementara"</b>", ketik skrin 3 kali dengan cepat dan tahan jari anda pada ketikan yang ketiga.\n"<ul><li>"Seret untuk beralih-alih di sekitar skrin"</li>\n<li>"Angkat jari untuk mengezum keluar"</li></ul>\n\n"Anda tidak boleh mengezum masuk pada papan kekunci dan bar navigasi."</string>
- <string name="accessibility_screen_magnification_navbar_summary" msgid="2272878354599332009">"Apabila pembesaran dihidupkan, anda boleh mengezum masuk pada skrin.\n\n"<b>"Untuk mengezum"</b>", mulakan pembesaran, kemudian ketik di mana-mana pada skrin.\n"<ul><li>"• Seret sekurang-kurangnya 2 jari untuk menatal"</li>\n<li>"• Cubit menggunakan sekurang-kurangnya 2 jari untuk melaraskan zum"</li></ul>\n\n<b>"Untuk mengezum sementara"</b>", mulakan pembesaran, kemudian sentuh & tahan di mana-mana pada skrin.\n"<ul><li>"• Seret untuk bergerak di sekitar skrin"</li>\n<li>"• Angkat jari untuk mengezum keluar"</li></ul>\n\n"Anda tidak boleh mengezum masuk pada papan kekunci atau bar navigasi."</string>
+ <string name="accessibility_screen_magnification_navbar_summary" msgid="6700716275347612310">"Apabila pembesaran dihidupkan, anda boleh mengezum masuk pada skrin.\n\n"<b>"Untuk mengezum"</b>", mulakan pembesaran, kemudian ketik di mana-mana pada skrin.\n"<ul><li>"Seret sekurang-kurangnya 2 jari untuk menatal"</li>\n<li>"Cubit menggunakan sekurang-kurangnya 2 jari untuk melaraskan zum"</li></ul>\n\n<b>"Untuk mengezum sementara"</b>", mulakan pembesaran, kemudian sentuh & tahan di mana-mana pada skrin.\n"<ul><li>"Seret untuk beralih-alih di sekitar skrin"</li>\n<li>"Angkat jari untuk mengezum keluar"</li></ul>\n\n"Anda tidak boleh mengezum masuk pada papan kekunci atau bar navigasi."</string>
<string name="accessibility_tutorial_dialog_title_button" msgid="3682222614034474845">"Gunakan butang kebolehaksesan untuk buka"</string>
<string name="accessibility_tutorial_dialog_title_gesture" msgid="1342726230497913398">"Gunakan gerak isyarat untuk buka"</string>
<string name="accessibility_tutorial_dialog_title_gesture_settings" msgid="8539392614235820285">"Gunakan gerak isyarat kebolehaksesan baharu"</string>
@@ -2140,8 +2140,7 @@
<string name="accessibility_hearingaid_title" msgid="8312145423610648518">"Alat bantu pendengaran"</string>
<string name="accessibility_hearingaid_not_connected_summary" msgid="6240237523789614599">"Tiada alat bantu pendengaran disambungkan"</string>
<string name="accessibility_hearingaid_adding_summary" msgid="2947474468412309778">"Tambah alat bantu dengar"</string>
- <string name="accessibility_hearingaid_pair_instructions_first_message" msgid="3912093691643131154">"Untuk menggandingkan alat bantu pendengaran anda, cari dan ketik peranti anda pada skrin seterusnya."</string>
- <string name="accessibility_hearingaid_pair_instructions_second_message" msgid="5596683393607650243">"Pastikan alat bantu pendengaran berada dalam mod gandingan."</string>
+ <string name="accessibility_hearingaid_pair_instructions_message" msgid="3094382949733435414">"Untuk menggandingkan alat bantu pendengaran anda, cari dan ketik peranti anda pada skrin seterusnya. Pastikan alat bantu pendengaran berada dalam mod gandingan."</string>
<string name="accessibility_hearingaid_active_device_summary" msgid="3924362383258688984">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> aktif"</string>
<plurals name="show_number_hearingaid_count" formatted="false" msgid="3160782397139295486">
<item quantity="other"><xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> alat bantu pendengaran disimpan</item>
@@ -2490,7 +2489,6 @@
<string name="menu_stats_last_unplugged" msgid="5922246077592434526">"Semasa kali terakhir palam dicabut untuk <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
<string name="menu_stats_total" msgid="8973377864854807854">"Jumlah penggunaan"</string>
<string name="menu_stats_refresh" msgid="1676215433344981075">"Muat semula"</string>
- <string name="process_kernel_label" msgid="3916858646836739323">"OS Android"</string>
<string name="process_mediaserver_label" msgid="6500382062945689285">"Pelayan media"</string>
<string name="process_dex2oat_label" msgid="2592408651060518226">"Pengoptimuman apl"</string>
<string name="battery_saver" msgid="8172485772238572153">"Penjimat Bateri"</string>
@@ -2621,8 +2619,6 @@
<string name="no_device_admins" msgid="4846602835339095768">"Tiada apl pentabir peranti yang tersedia"</string>
<string name="personal_device_admin_title" msgid="2849617316347669861">"Peribadi"</string>
<string name="managed_device_admin_title" msgid="7853955652864478435">"Tempat Kerja"</string>
- <string name="sms_access_restriction_enabled" msgid="7054488078710530278">"Hadkan akses log SMS & panggilan"</string>
- <string name="sms_access_restriction_enabled_summary" msgid="6851339654677842328">"Hanya apl telefon dan pemesejan lalai yang mempunyai kebenaran log SMS & panggilan"</string>
<string name="no_trust_agents" msgid="7450273545568977523">"Tiada ejen amanah tersedia"</string>
<string name="add_device_admin_msg" msgid="1501847129819382149">"Aktifkan apl pentadbir peranti?"</string>
<string name="add_device_admin" msgid="4192055385312215731">"Aktifkan apl pentadbir peranti ini"</string>
@@ -3111,7 +3107,7 @@
<string name="keywords_app_default" msgid="5822717006354487071">"Buka dengan"</string>
<string name="keywords_applications_settings" msgid="1268353611121497450">"Aplikasi"</string>
<string name="keywords_time_zone" msgid="998254736898753085">"zon waktu"</string>
- <string name="keywords_draw_overlay" msgid="4130899177619041842">"Tajuk sembang"</string>
+ <string name="keywords_draw_overlay" msgid="1001120206241401007">"Kepala sembang, sistem, makluman, tetingkap, dialog, paparan, di atas apl lain, lukis"</string>
<string name="keywords_flashlight" msgid="6161632177705233710">"Lampu suluh, Lampu, Lampu picit"</string>
<string name="keywords_change_wifi_state" msgid="627068244033681010">"wifi, wi-fi, togol, kawalan"</string>
<string name="keywords_more_mobile_networks" msgid="8995946622054642367">"selular, mudah alih, pembawa selular, wayarles, data, 4g, 3g, 2g, lte"</string>
@@ -3135,7 +3131,7 @@
<string name="keywords_sounds_and_notifications_interruptions" msgid="5426093074031208917">"jangan, jangan ganggu, ganggu, gangguan, putus"</string>
<string name="keywords_app" msgid="6334757056536837791">"RAM"</string>
<string name="keywords_location" msgid="4132655528196729043">"berdekatan, lokasi, sejarah, pelaporan, GPS"</string>
- <string name="keywords_accounts" msgid="1957925565953357627">"akaun"</string>
+ <string name="keywords_accounts" msgid="4479029747403203867">"akaun, tambah akaun, profil kerja"</string>
<string name="keywords_users" msgid="3434190133131387942">"sekatan, sekat, terhad"</string>
<string name="keywords_keyboard_and_ime" msgid="9143339015329957107">"pembetulan teks, betul, bunyi, getaran, auto, bahasa, gerak isyarat, cadang, cadangan, tema, menyinggung, perkataan, taip, emoji, antarabangsa"</string>
<string name="keywords_reset_apps" msgid="5293291209613191845">"tetapan semula, pilihan, lalai"</string>
@@ -3173,6 +3169,7 @@
<string name="keywords_storage_settings" msgid="297283751968446577">"memori, cache, data, padam, kosongkan, bebaskan, ruang"</string>
<string name="keywords_bluetooth_settings" msgid="6804844062789439858">"disambungkan, peranti, fon kepala, set kepala, pembesar suara, wayarles, gandingan, fon telinga, muzik, media"</string>
<string name="keywords_wallpaper" msgid="5058364390917429896">"latar belakang, skrin, skrin kunci, tema"</string>
+ <string name="keywords_styles" msgid="5828725481814049422">"bentuk ikon, warna aksen, fon"</string>
<string name="keywords_assist_input" msgid="5017533309492679287">"lalai, assistant"</string>
<string name="keywords_default_payment_app" msgid="3838565809518896799">"pembayaran, lalai"</string>
<string name="keywords_ambient_display" msgid="3103487805748659132">"pemberitahuan masuk"</string>
@@ -3182,7 +3179,7 @@
<string name="keywords_notification_vibration" msgid="31924624421190547">"haptik, getaran, kepekaan"</string>
<string name="keywords_battery_saver_sticky" msgid="5586215686021650278">"penjimat bateri, lekit, gigih, penjimat kuasa, bateri"</string>
<string name="keywords_battery_saver_schedule" msgid="7358789228486231944">"rutin, jadual, penjimat bateri, penjimat kuasa, bateri, automatik, peratus"</string>
- <string name="keywords_add_an_account" msgid="6488139919428902434">"profil kerja"</string>
+ <string name="keywords_enhance_4g_lte" msgid="2273810564244790859">"volte, panggilan lanjutan, panggilan 4g"</string>
<string name="default_sound" msgid="8821684447333687810">"Bunyi lalai"</string>
<string name="sound_settings_summary" msgid="4100853606668287965">"Kelantangan deringan pada <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
<string name="sound_dashboard_summary" msgid="3402435125958012986">"Kelantangan, getaran, Jangan Ganggu"</string>
@@ -3889,7 +3886,6 @@
<string name="permit_draw_overlay" msgid="7456536798718633432">"Benarkan pemaparan di atas apl lain"</string>
<string name="allow_overlay_description" msgid="8961670023925421358">"Benarkan apl ini dipaparkan di atas apl lain yang sedang digunakan. Hal ini mungkin mengganggu penggunaan apl itu atau mengubah penampilan atau gelagat apl tersebut."</string>
<string name="keywords_vr_listener" msgid="7441221822576384680">"perkhidmatan pembantu stereo pendengar realiti maya vr"</string>
- <string name="keywords_system_alert_window" msgid="5049498015597864850">"makluman sistem dialog tetingkap paparkan di atas apl lain"</string>
<string name="overlay_settings" msgid="6930854109449524280">"Paparkan di atas apl lain"</string>
<string name="system_alert_window_summary" msgid="602892301318324492">"<xliff:g id="COUNT_0">%1$d</xliff:g> daripada <xliff:g id="COUNT_1">%2$d</xliff:g> apl dibenarkan untuk dipaparkan di atas apl lain"</string>
<string name="filter_overlay_apps" msgid="6965969283342557573">"Apl dengan kebenaran"</string>
@@ -4125,7 +4121,6 @@
<string name="notification_log_details_none" msgid="184131801230614059">"tiada"</string>
<string name="notification_log_details_ranking_null" msgid="244660392058720919">"Tiada objek kedudukan."</string>
<string name="notification_log_details_ranking_none" msgid="599607025882587844">"Objek kedudukan tidak mengandungi kunci ini."</string>
- <string name="theme_customization_category" msgid="1049181544004163283">"Membuat Tema"</string>
<string name="theme_customization_device_default" msgid="5058147707906551368">"Lalai peranti"</string>
<string name="display_cutout_emulation" msgid="7466869822418376317">"Potongan paparan"</string>
<string name="display_cutout_emulation_keywords" msgid="4495418317471622562">"potongan paparan, takuk"</string>
@@ -4551,6 +4546,8 @@
<string name="network_connection_errorstate_dialog_message" msgid="6953778550775646710">"Sesuatu telah berlaku. Aplikasi telah membatalkan permintaan untuk memilih peranti."</string>
<string name="network_connection_connect_successful" msgid="5935510954474494928">"Sambungan berjaya"</string>
<string name="network_connection_request_dialog_showall" msgid="6938922880244567521">"Tunjukkan semua"</string>
+ <string name="network_connection_searching_message" msgid="4638576789450817530">"Mencari peranti…"</string>
+ <string name="network_connection_connecting_message" msgid="3740982406609245654">"Menyambung ke peranti…"</string>
<plurals name="show_bluetooth_devices" formatted="false" msgid="1715020480026568408">
<item quantity="other"><xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> peranti dihubungkan</item>
<item quantity="one"><xliff:g id="NUMBER_DEVICE_COUNT_0">%1$d</xliff:g> peranti dihubungkan</item>
diff --git a/res/values-my/strings.xml b/res/values-my/strings.xml
index 556197d..970b8e0 100644
--- a/res/values-my/strings.xml
+++ b/res/values-my/strings.xml
@@ -360,8 +360,6 @@
<string name="security_enable_widgets_disabled_summary" msgid="6392489775303464905">"စီမံခန့်ခွဲသူက ပိတ်ထားသည်"</string>
<string name="lockdown_settings_title" msgid="7393790212603280213">"ပိတ်ရန် ရွေးချယ်စရာများကို ပြခြင်း"</string>
<string name="lockdown_settings_summary" msgid="4359438673563318171">"Smart Lock၊ ဇီဝဗေဒဆိုင်ရာ အချက်အလက်များဖြင့် လော့ခ်ဖွင့်ခြင်းနှင့် လော့ခ်ချထားချိန် ဖန်သားပြင်ရှိ အကြောင်းကြားချက်များကို ပိတ်သည့် ဖန်သားပြင်ပြသမှု ပါဝါခလုတ်"</string>
- <string name="trust_agents_extend_unlock_title" msgid="2796555263565097031">"သတ်မှတ်အေးဂျင့်များ လော့ခ်ဆက်ဖွင့်နိုင်သည်"</string>
- <string name="trust_agents_extend_unlock_summary" msgid="3976344969220255010">"ဖွင့်ထားသည့်အခါ ယုံကြည်မှု အေးဂျင့်များက သင့်စက်ပစ္စည်းကို ဆက်လက်လော့ခ်ဖွင့်ထားမည် ဖြစ်သော်လည်း လော့ခ်ချထားသည့် စက်ပစ္စည်းကိုမူ ဖွင့်၍ရတော့မည် မဟုတ်ပါ။"</string>
<string name="trust_lost_locks_screen_title" msgid="2992742466966021682">"မယုံကြည်တော့သည့်အခါ စကရင်ကိုလော့ခ်ချရန်"</string>
<string name="trust_lost_locks_screen_summary" msgid="693784434582021206">"စနစ်ကိုဖွင့်ထားပါက ယုံကြည်ရသည့် နောက်ဆုံးကိုယ်စားလှယ်အား ယုံကြည်၍မရတော့သည့်အခါ စက်ပစ္စည်းကို လော့ခ်ချသွားပါမည်"</string>
<string name="owner_info_settings_summary" msgid="7472393443779227052">"မရှိ"</string>
@@ -937,6 +935,7 @@
<string name="wifi_eap_identity" msgid="4359453783379679103">"တစ်ဦးတစ်ယောက်"</string>
<string name="wifi_eap_anonymous" msgid="2989469344116577955">"အမည်မသိသူ"</string>
<string name="wifi_password" msgid="5948219759936151048">"စကားဝှက်"</string>
+ <string name="wifi_sae_password_id" msgid="1697832722221765763">"SAE စကားဝှက် သတ်မှတ်မှုစနစ်"</string>
<string name="wifi_show_password" msgid="6461249871236968884">"စကားဝှက်ကို ပြသရန်"</string>
<string name="wifi_ap_band_config" msgid="1611826705989117930">"AP လှိုင်း ရွေးရန်"</string>
<string name="wifi_ap_choose_auto" msgid="2677800651271769965">"အလိုအလျောက်"</string>
@@ -957,7 +956,6 @@
<string name="wifi_dpp_share_wifi" msgid="9065890131734833809">"Wi‑Fi မျှဝေပါ"</string>
<string name="wifi_dpp_scan_qr_code_with_another_device" msgid="5854392840857123065">"“<xliff:g id="SSID">%1$s</xliff:g>” နှင့် ချိတ်ဆက်ရန် ဤ QR ကုဒ်ကို စကင်ဖတ်ပြီး စကားဝှက် မျှဝေပါ"</string>
<string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="4436318319178361543">"“<xliff:g id="SSID">%1$s</xliff:g>” နှင့်ချိတ်ဆက်ရန် ဤ QR ကုဒ်ကို စကင်ဖတ်ပါ"</string>
- <string name="wifi_dpp_could_not_detect_valid_qr_code" msgid="641893675646330576">"QR ကုဒ်ကို ဖတ်၍မရပါ။ ကုဒ်ပြန်ထည့်ပြီး ထပ်စမ်းကြည့်ပါ"</string>
<string name="wifi_dpp_failure_authentication_or_configuration" msgid="3372757783382381044">"ထပ်စမ်းကြည့်ပါ။ ပြဿနာဆက်ရှိနေလျှင် စက်ပစ္စည်းထုတ်လုပ်သူကို ဆက်သွယ်ပါ"</string>
<string name="wifi_dpp_failure_not_compatible" msgid="2829930473520603740">"တစ်ခုခု မှားသွားသည်"</string>
<string name="wifi_dpp_failure_timeout" msgid="5228320772245820458">"စက်ပစ္စည်းကို ပလပ်တပ်ထားခြင်း၊ အားသွင်းထားပြီး ဖွင့်ထားခြင်း ရှိမရှိ စစ်ဆေးပါ"</string>
@@ -980,6 +978,7 @@
<string name="wifi_dpp_hotspot_password" msgid="4120419278831581613">"ဟော့စပေါ့စကားဝှက်− <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
<string name="wifi_dpp_add_device" msgid="4072206063308645677">"စက်ပစ္စည်း ထည့်ရန်"</string>
<string name="wifi_dpp_connect_network_using_qr_code" msgid="3887335309163999665">"ဤကွန်ရက်သို့ စက်တစ်ခုထည့်ရန် QR ကုဒ်ကို အသုံးပြုပါ"</string>
+ <string name="wifi_dpp_qr_code_is_not_valid_format" msgid="3700087439867692944">"QR ကုဒ်သည် မှန်ကန်သောဖော်မက် မဟုတ်ပါ"</string>
<string name="retry" msgid="6472609612090877557">"ထပ်စမ်းကြည့်ရန်"</string>
<string name="wifi_shared" msgid="844142443226926070">"အခြားစက်ပစ္စည်းအသုံးပြုသူများဖြင့် မျှဝေ"</string>
<string name="wifi_unchanged" msgid="3410422020930397102">"(ပြောင်းလဲခြင်းမရှိ)"</string>
@@ -1129,6 +1128,7 @@
<string name="emergency_address_title" msgid="932729250447887545">"အရေးပေါ်လိပ်စာ"</string>
<string name="emergency_address_summary" msgid="7751971156196115129">"Wi‑Fi သုံး၍ အရေးပေါ်ဖုန်းခေါ်သောအခါ အသုံးပြုသည့် သင့်တည်နေရာ"</string>
<string name="private_dns_help_message" msgid="3299567069152568958">"သီးသန့် DNS ဝန်ဆောင်မှုများအကြောင်း "<annotation id="url">"ပိုမိုလေ့လာရန်"</annotation></string>
+ <string name="private_dns_mode_on" msgid="5882613439541371003">"ပွင့်"</string>
<string name="wifi_calling_pref_managed_by_carrier" msgid="6845711858866828986">"ဆက်တင်များကို ဝန်ဆောင်မှုပေးသူက ကြီးကြပ်ထားသည်"</string>
<string name="wifi_calling_settings_activation_instructions" msgid="7492509632478260955">"Wi-Fi ခေါ်ဆိုမှုကို စသုံးရန်ဖွင့်ပါ"</string>
<string name="wifi_calling_turn_on" msgid="1171403510313983983">"Wi-Fi ခေါ်ဆိုမှုဖွင့်ပါ"</string>
@@ -1872,7 +1872,7 @@
<string name="default_emergency_app" msgid="1951760659640369980">"အရေးပေါ်အပ်ဖ်"</string>
<string name="reset_app_preferences" msgid="1321050641018356925">"အက်ပ်သတ်မှတ်ချက်များ ပြန်လုပ်ရန်"</string>
<string name="reset_app_preferences_title" msgid="6093179367325336662">"အက်ပ်သတ်မှတ်ချက်များကို ပြန်လုပ်မလား။"</string>
- <string name="reset_app_preferences_desc" msgid="4822447731869201512">"၎င်းသည် အောက်ပါတို့အားလုံးကို ပြန်လည်သတ်မှတ်ပါမည်-\n\n"<li>"အက်ပ်များ ပိတ်ခြင်း"</li>\n<li>"အက်ပ်အကြောင်းကြားချက်များ ပိတ်ခြင်း"</li>\n<li>"လုပ်ဆောင်ချက်အတွက် မူရင်းအက်ပ်သတ်မှတ်ခြင်း"</li>\n<li>"အက်ပ်များအတွက် နောက်ခံဒေတာအသုံးပြုမှုကန့်သတ်ခြင်းများ"</li>\n<li>"ခွင့်ပြုမှု ကန့်သတ်ချက်များအားလုံး"</li>\n\n"သင်၏ အက်ပ်ဒေတာများ ဆုံးရှုံးမှု မရှိပါ။"</string>
+ <string name="reset_app_preferences_desc" msgid="731757609326016760">"၎င်းက အောက်ပါတို့အတွက် သတ်မှတ်ချက်အားလုံးကို ပြင်ဆင်သတ်မှတ်ပါမည်-\n\n"<li>"ပိတ်ထားသော အက်ပ်များ"</li>\n<li>"ပိတ်ထားသော အက်ပ် အကြောင်းကြားချက်များ"</li>\n<li>"လုပ်ဆောင်ချက်များအတွက် မူရင်းအပလီကေးရှင်းများ"</li>\n<li>"အက်ပ်များအတွက် နောက်ခံဒေတာ ကန့်သတ်မှုများ"</li>\n<li>"မည်သည့် ခွင့်ပြုချက် ကန့်သတ်မှုများမဆို"</li>\n\n"မည်သည့်အက်ပ်ဒေတာကိုမျှ ဆုံးရှုံးမည်မဟုတ်ပါ။"</string>
<string name="reset_app_preferences_button" msgid="2559089511841281242">"အက်ပ်ပြန်လည်သတ်မှတ်ရန်"</string>
<string name="manage_space_text" msgid="8852711522447794676">"နေရာလွတ်အား စီမံနေသည်"</string>
<string name="filter" msgid="2018011724373033887">"စီစစ်ရန်"</string>
@@ -2087,7 +2087,7 @@
<string name="accessibility_screen_magnification_short_summary" msgid="3411979839172752057">"ဇူးမ်အသုံးပြုရန် ၃ ကြိမ်တို့ပါ"</string>
<string name="accessibility_screen_magnification_navbar_short_summary" msgid="3693116360267980492">"ဇူးမ်အသုံးပြုရန် ခလုတ်ကို တို့ပါ"</string>
<string name="accessibility_screen_magnification_summary" msgid="5258868553337478505"><b>"ဇူးမ်ချဲ့ရန်"</b>" မျက်နှာပြင်ကို သုံးချက် အမြန်တို့ပါ။\n"<ul><li>"အပေါ်အောက် လှိမ့်ကြည့်ရန် လက်ချောင်း ၂ ချောင်းနှင့် အထက်ကို အသုံးပြု၍ဖိဆွဲပါ"</li>\n<li>"ဇူးမ်ကို ချိန်ရန် လက်ချောင်း ၂ ချောင်းနှင့် အထက်ကို အသုံးပြု၍ဆွဲကပ်ပါ"</li></ul>\n\n<b>"ယာယီ ဇူးမ်ပြုလုပ်ရန်"</b>" မျက်နှာပြင်ကို သုံးချက်တို့ပြီး တတိယမြောက်အချက်တွင် သင့်လက်ချောင်းကို ဖိထားပါ။\n"<ul><li>"မျက်နှာပြင်ပေါ်တွင် ရွှေ့ကြည့်ရန် ဖိဆွဲပါ"</li>\n<li>"ဇူးမ်ဖြုတ်ရန် လက်ချောင်းကို မ လိုက်ပါ"</li></ul>\n\n"ကီးဘုတ် သို့မဟုတ် လမ်းညွှန်ဘားတန်းပေါ်တွင် ဇူးမ်ချဲ့၍ မရပါ။"</string>
- <string name="accessibility_screen_magnification_navbar_summary" msgid="2272878354599332009">"ချဲ့ခြင်း ဖွင့်ထားသည့်အခါ ဖန်သားပြင်ပေါ်တွင် ဇူးမ်ဆွဲနိုင်ပါသည်။\n\n"<b>"ဇူးမ်ဆွဲရန်"</b>" ချဲ့ခြင်းကို စလုပ်ပါ၊ ထို့နောက် မျက်နှာပြင်တစ်နေရာရာကို တို့ပါ။\n"<ul><li>"• လှိမ့်ရန် လက်နှစ်ချောင်းနှင့်အထက်ဖြင့် ဖိဆွဲပါ"</li>\n<li>"• ဇူးမ်ကို ချိန်ညှိရန် လက်နှစ်ချောင်းနှင့်အထက်ဖြင့် ချဲ့ချုံ့ပါ"</li></ul>\n\n<b>"ယာယီဇူးမ်ဆွဲရန်"</b>" ချဲ့ခြင်းကို စလုပ်ပါ၊ ထို့နောက် ဖန်သားပြင်တစ်နေရာရာတွင် ဖိ၍နှိပ်ထားပါ။\n"<ul><li>"• ဖန်သားပြင်ပေါ်တွင် ရွေ့လျားရန် ဖိဆွဲပါ"</li>\n<li>"• ဇူးမ်ဖြုတ်ရန် လက်ချောင်းကို လွှတ်ပါ"</li></ul>\n\n"ကီးဘုတ် (သို့) လမ်းညွှန်ဘားပေါ်တွင် ဇူးမ်ဆွဲ၍ မရပါ။"</string>
+ <string name="accessibility_screen_magnification_navbar_summary" msgid="6700716275347612310">"မှန်ဘီလူးကို ဖွင့်ထားသည့်အခါ သင့်မျက်နှာပြင်ပေါ်တွင် ဇူးမ်ဆွဲနိုင်ပါသည်။\n\n"<b>"ဇူးမ်ဆွဲရန်"</b>" မှန်ဘီလူးကို ဖွင့်ပြီး မျက်နှာပြင်ပေါ်ရှိ တစ်နေနေရာတွင် တို့ပါ။\n"<ul><li>"လှိမ့်ရွှေ့ရန် လက်ချောင်း ၂ ချောင်း သို့မဟုတ် များစွာဖြင့် ဖိဆွဲပါ"</li>\n<li>"ဇူးမ်ကို ချိန်ညှိရန် လက်ချောင်း ၂ ချောင်း သို့မဟုတ် များစွာဖြင့် ဆွဲကပ်ပါ"</li></ul>\n\n<b>"ယာယီဇူးမ်ဆွဲရန်"</b>" မှန်ဘီလူးကို ဖွင့်ပြီး မျက်နှာပြင်ပေါ်ရှိ တစ်နေနေရာတွင် ဖိထားပါ။\n"<ul><li>"မျက်နှာပြင်တစ်လျှောက် ရွှေ့ကြည့်ရန် ဖိဆွဲပါ"</li>\n<li>"ဇူးမ်ဖြုတ်ရန် လက်ချောင်းကို မ လိုက်ပါ"</li></ul>\n\n"ကီးဘုတ် သို့မဟုတ် လမ်းညွှန်ဘားကို ဇူးမ်ဆွဲ၍ မရပါ။"</string>
<string name="accessibility_tutorial_dialog_title_button" msgid="3682222614034474845">"ဖွင့်ရန် အသုံးလွယ်မှုခလုတ်ကို သုံးပါ"</string>
<string name="accessibility_tutorial_dialog_title_gesture" msgid="1342726230497913398">"ဖွင့်ရန် လက်ဟန်ကို အသုံးပြုပါ"</string>
<string name="accessibility_tutorial_dialog_title_gesture_settings" msgid="8539392614235820285">"အများသုံးစွဲနိုင်မှု လက်ဟန်အသစ်ကို အသုံးပြုရန်"</string>
@@ -2140,8 +2140,7 @@
<string name="accessibility_hearingaid_title" msgid="8312145423610648518">"နားကြားကိရိယာ"</string>
<string name="accessibility_hearingaid_not_connected_summary" msgid="6240237523789614599">"မည်သည့် နားကြားကိရိယာကိုမျှ ချိတ်ဆက်မထားပါ"</string>
<string name="accessibility_hearingaid_adding_summary" msgid="2947474468412309778">"နားကြားကိရိယာအား ထည့်သွင်းသည်"</string>
- <string name="accessibility_hearingaid_pair_instructions_first_message" msgid="3912093691643131154">"သင်၏ နားကြားကိရိယာကို တွဲချိတ်ရန် နောက်စာမျက်နှာတွင် သင်၏ စက်ပစ္စည်းကို ရှာပြီး တို့ပါ။"</string>
- <string name="accessibility_hearingaid_pair_instructions_second_message" msgid="5596683393607650243">"သင်၏ နားကြားကိရိယာများကို တွဲချိတ်ခြင်းမုဒ်တွင် ဖွင့်ထားရပါမည်။"</string>
+ <string name="accessibility_hearingaid_pair_instructions_message" msgid="3094382949733435414">"သင်၏ နားကြားကိရိယာကို တွဲချိတ်ရန် နောက်စာမျက်နှာတွင် သင်၏ စက်ပစ္စည်းကို ရှာပြီး တို့ပါ။ သင်၏ နားကြားကိရိယာများကို တွဲချိတ်ခြင်းမုဒ်တွင် ဖွင့်ထားရပါမည်။"</string>
<string name="accessibility_hearingaid_active_device_summary" msgid="3924362383258688984">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ပွင့်နေပါသည်"</string>
<plurals name="show_number_hearingaid_count" formatted="false" msgid="3160782397139295486">
<item quantity="other">သိမ်းဆည်းထားသည့် နားကြားကိရိယာ <xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> ခု</item>
@@ -2490,7 +2489,6 @@
<string name="menu_stats_last_unplugged" msgid="5922246077592434526">"<xliff:g id="UNPLUGGED">%1$s</xliff:g>မှ ကြိုးဖြုတ်ထားသည်"</string>
<string name="menu_stats_total" msgid="8973377864854807854">"အသုံးပြုမှု စုစုပေါင်း"</string>
<string name="menu_stats_refresh" msgid="1676215433344981075">"ပြန်လည်ဆန်းသစ်ရန်"</string>
- <string name="process_kernel_label" msgid="3916858646836739323">"Android OS"</string>
<string name="process_mediaserver_label" msgid="6500382062945689285">"မီဒီယာဆာဗာ"</string>
<string name="process_dex2oat_label" msgid="2592408651060518226">"အက်ပ်ပိုမိုကောင်းအောင်ပြုခြင်း"</string>
<string name="battery_saver" msgid="8172485772238572153">"ဘက်ထရီ အားထိန်း"</string>
@@ -2621,8 +2619,6 @@
<string name="no_device_admins" msgid="4846602835339095768">"စက်ပစ္စည်းကို စီမံခန့်ခွဲရန်အတွက် အက်ပ်များ မရနိုင်ပါ"</string>
<string name="personal_device_admin_title" msgid="2849617316347669861">"ကိုယ်ရေး"</string>
<string name="managed_device_admin_title" msgid="7853955652864478435">"အလုပ်"</string>
- <string name="sms_access_restriction_enabled" msgid="7054488078710530278">"SMS နှင့် ခေါ်ဆိုမှတ်တမ်း ဝင်သုံးခွင့် ကန့်သတ်ခြင်း"</string>
- <string name="sms_access_restriction_enabled_summary" msgid="6851339654677842328">"မူရင်း ဖုန်းနှင့် မက်ဆေ့ဂျ်အက်ပ်များသာ SMS နှင့် ခေါ်ဆိုမှတ်တမ်း ခွင့်ပြုချက်များ ရရှိပါသည်"</string>
<string name="no_trust_agents" msgid="7450273545568977523">"သတ်မှတ်အေးဂျင့်များ မရှိ"</string>
<string name="add_device_admin_msg" msgid="1501847129819382149">"စက်စီမံခန့်ခွဲသူအက်ပ် အသက်သွင်းလိုသလား။"</string>
<string name="add_device_admin" msgid="4192055385312215731">"ဤစက်စီမံအက်ပ်ကို စတင်ရန်"</string>
@@ -3111,7 +3107,7 @@
<string name="keywords_app_default" msgid="5822717006354487071">"ဤအက်ပ်ဖြင့်ဖွင့်မည်-"</string>
<string name="keywords_applications_settings" msgid="1268353611121497450">"အပလီကေးရှင်းများ"</string>
<string name="keywords_time_zone" msgid="998254736898753085">"စံတော်ချိန်"</string>
- <string name="keywords_draw_overlay" msgid="4130899177619041842">"မျက်နှာ ချတ်အကွက်"</string>
+ <string name="keywords_draw_overlay" msgid="1001120206241401007">"ချတ်မျက်နှာ၊ စနစ်၊ သတိပေးချက်၊ ဝင်းဒိုး၊ စကားပြော၊ ဖန်သားပြင်ပြသမှု၊ အခြားအက်ပ်များအပေါ်၊ ဆွဲရန်"</string>
<string name="keywords_flashlight" msgid="6161632177705233710">"ဖလက်ရှ်မီး၊ အလင်း၊ ဓာတ်မီး"</string>
<string name="keywords_change_wifi_state" msgid="627068244033681010">"wifi၊ wi-fi၊ ဖွင့်ပိတ်၊ ထိန်းချုပ်မှု"</string>
<string name="keywords_more_mobile_networks" msgid="8995946622054642367">"ဆယ်လူလာ၊ မိုဘိုင်းဆက်သွယ်ရေး ဝန်ဆောင်မှု၊ ကြိုးမဲ့၊ ဒေတာ၊ 4g၊ 3g၊ 2g၊ lte"</string>
@@ -3135,7 +3131,7 @@
<string name="keywords_sounds_and_notifications_interruptions" msgid="5426093074031208917">"မနှောင့်ယှက်ပါနှင့်၊ ကြားဝင်စွတ်ဖက်သည်၊ ကြားဝင်စွတ်ဖက်ခြင်း၊ အနားယူခြင်း"</string>
<string name="keywords_app" msgid="6334757056536837791">"RAM"</string>
<string name="keywords_location" msgid="4132655528196729043">"အနီးအနား၊ တည်နေရာ၊ မှတ်တမ်း၊ အစီရင်ခံခြင်း၊ GPS"</string>
- <string name="keywords_accounts" msgid="1957925565953357627">"အကောင့်"</string>
+ <string name="keywords_accounts" msgid="4479029747403203867">"အကောင့်၊ အကောင့်ထည့်ရန်၊ အလုပ်ပရိုဖိုင်"</string>
<string name="keywords_users" msgid="3434190133131387942">"ကန့်သတ်ခြင်း၊ ကန့်သတ်မှု၊ ကန့်သတ်ထားသည်"</string>
<string name="keywords_keyboard_and_ime" msgid="9143339015329957107">"စာသားအမှားပြင်ဆင်ခြင်း၊ မှန်သည်၊ အသံ၊ တုန်ခါမှု၊ အလိုအလျောက်၊ ဘာသာစကား၊ အမူအယာ၊ အကြံပြုရန်၊ အချက်ပြုချက်၊ အပြင်အဆင်၊ စိတ်အနှောင့်အယှက်ဖြစ်စေသော၊ စကားလုံး၊ စာရိုက်ခြင်း၊ စိတ်ခံစားမှုရုပ်ပုံလေးများ၊ အပြည်ပြည်ဆိုင်ရာ"</string>
<string name="keywords_reset_apps" msgid="5293291209613191845">"ပြန်လည်သတ်မှတ်ရန်၊ စိတ်ကြိုက်ပြင်ဆင်မှုများ၊ မူရင်း"</string>
@@ -3173,6 +3169,7 @@
<string name="keywords_storage_settings" msgid="297283751968446577">"မှတ်ဉာဏ်၊ ကက်ရှ်၊ ဒေတာ၊ ဖျက်ရန်၊ ရှင်းရန်၊ အလွတ်၊ နေရာ"</string>
<string name="keywords_bluetooth_settings" msgid="6804844062789439858">"ချိတ်ဆက်ထားသည်၊ စက်ပစ္စည်း၊ နားကြပ်များ၊ မိုက်ခွက်ပါနားကြပ်၊ စပီကာ၊ ကြိုးမဲ့၊ တွဲချိတ်ရန်၊ နားကြပ်၊ တေးဂီတ၊ မီဒီယာ"</string>
<string name="keywords_wallpaper" msgid="5058364390917429896">"နောက်ခံပုံ၊ မျက်နှာပြင်၊ လော့ခ်မျက်နှာပြင်၊ အပြင်အဆင်"</string>
+ <string name="keywords_styles" msgid="5828725481814049422">"သင်္ကေတပုံစံ၊ အားဖြည့် အရောင်၊ ဖောင့်"</string>
<string name="keywords_assist_input" msgid="5017533309492679287">"မူရင်း၊ assistant"</string>
<string name="keywords_default_payment_app" msgid="3838565809518896799">"ငွေပေးချေမှု၊ မူရင်း"</string>
<string name="keywords_ambient_display" msgid="3103487805748659132">"အဝင် အကြောင်းကြားချက်"</string>
@@ -3182,7 +3179,7 @@
<string name="keywords_notification_vibration" msgid="31924624421190547">"တုန်ခါ၍ တုံ့ပြန်မှု၊ တုန်ခါမှု၊ အာရုံခံနိုင်မှု"</string>
<string name="keywords_battery_saver_sticky" msgid="5586215686021650278">"ဘက်ထရီ အားထိန်း၊ ကပ်ခွာ၊ အမြဲရှိသည်၊ ပါဝါချွေတာစနစ်၊ ဘက်ထရီ"</string>
<string name="keywords_battery_saver_schedule" msgid="7358789228486231944">"ပုံမှန်အစီအစဉ်၊ အချိန်ဇယား၊ ဘက်ထရီအားထိန်း၊ ပါဝါချွေတာစနစ်၊ ဘက်ထရီ၊ အလိုအလျောက်၊ ရာခိုင်နှုန်း"</string>
- <string name="keywords_add_an_account" msgid="6488139919428902434">"အလုပ်ပရိုဖိုင်"</string>
+ <string name="keywords_enhance_4g_lte" msgid="2273810564244790859">"volte၊ အဆင့်မြင့် ခေါ်ဆိုခြင်း၊ 4g ခေါ်ဆိုခြင်း"</string>
<string name="default_sound" msgid="8821684447333687810">"ပုံသေ အသံ"</string>
<string name="sound_settings_summary" msgid="4100853606668287965">"ဖုန်းမြည်သံ အတိုးအကျယ် <xliff:g id="PERCENTAGE">%1$s</xliff:g> ဖြစ်သည်"</string>
<string name="sound_dashboard_summary" msgid="3402435125958012986">"အသံအတိုးအကျယ်၊ တုန်ခါမှု၊ မနှောင့်ယှက်ရ"</string>
@@ -3889,7 +3886,6 @@
<string name="permit_draw_overlay" msgid="7456536798718633432">"အခြားအက်ပ်များ အပေါ်မှ ပြသခွင့်ပြုရန်"</string>
<string name="allow_overlay_description" msgid="8961670023925421358">"ဤအက်ပ်အား သင်သုံးနေသော အခြားအက်ပ်များအပေါ်တွင် ပြသခွင့်ပြုပါ။ ၎င်းသည် ထိုအက်ပ်များအသုံးပြုရာ၌ အနှောင့်အယှက်ဖြစ်စေနိုင်ပါသည် သို့မဟုတ် ၎င်းတို့၏ အသွင်အပြင် သို့မဟုတ် အပြုအမူတို့ကို ပြောင်းလဲစေနိုင်ပါသည်။"</string>
<string name="keywords_vr_listener" msgid="7441221822576384680">"vr ပကတိအသွင် နားထောင်မှုစနစ် စတီရီယိုအထောက်အကူပြု ဝန်ဆောင်မှု"</string>
- <string name="keywords_system_alert_window" msgid="5049498015597864850">"စနစ်သတိပေးချက် ဝင်းဒိုး အကွက် အခြားအက်ပ်များအပေါ် ပြသ"</string>
<string name="overlay_settings" msgid="6930854109449524280">"အခြားအက်ပ်များပေါ်မှ ပြသခြင်း"</string>
<string name="system_alert_window_summary" msgid="602892301318324492">"အက်ပ် <xliff:g id="COUNT_1">%2$d</xliff:g> ခုအနက်မှ <xliff:g id="COUNT_0">%1$d</xliff:g> ခုသည် အခြားအက်ပ်များပေါ်တွင် ပြသခွင့်ပြုသည်"</string>
<string name="filter_overlay_apps" msgid="6965969283342557573">"ခွင့်ပြုချက်များဖြင့် အပ်ဖ်များ"</string>
@@ -4125,7 +4121,6 @@
<string name="notification_log_details_none" msgid="184131801230614059">"မရှိ"</string>
<string name="notification_log_details_ranking_null" msgid="244660392058720919">"အဆင့်သတ်မှတ်သည့် အကြောင်းအရာ လိုအပ်နေသည်။"</string>
<string name="notification_log_details_ranking_none" msgid="599607025882587844">"အဆင့်သတ်မှတ်သည့် အကြောင်းအရာတွင် ဤကီးမပါဝင်ပါ"</string>
- <string name="theme_customization_category" msgid="1049181544004163283">"အပြင်အဆင်"</string>
<string name="theme_customization_device_default" msgid="5058147707906551368">"စက်ပစ္စည်းမူရင်း"</string>
<string name="display_cutout_emulation" msgid="7466869822418376317">"မျက်နှာပြင် ဖြတ်ညှပ်ပြသမှု"</string>
<string name="display_cutout_emulation_keywords" msgid="4495418317471622562">"မျက်နှာပြင် ဖြတ်ညှပ်ပြသမှု၊ အမှတ်အသား"</string>
@@ -4551,6 +4546,8 @@
<string name="network_connection_errorstate_dialog_message" msgid="6953778550775646710">"တစ်ခုခု ဖြစ်သွားသည်။ အပလီကေးရှင်းက ကိရိယာရွေးရန် တောင်းဆိုချက်ကို ပယ်ဖျက်လိုက်သည်။"</string>
<string name="network_connection_connect_successful" msgid="5935510954474494928">"ချိတ်ဆက်ပြီးပါပြီ"</string>
<string name="network_connection_request_dialog_showall" msgid="6938922880244567521">"အားလုံးပြရန်"</string>
+ <string name="network_connection_searching_message" msgid="4638576789450817530">"စက်ပစ္စည်းကို ရှာဖွေနေသည်…"</string>
+ <string name="network_connection_connecting_message" msgid="3740982406609245654">"စက်ပစ္စည်းကို ချိတ်ဆက်နေသည်…"</string>
<plurals name="show_bluetooth_devices" formatted="false" msgid="1715020480026568408">
<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>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 9d518f7..b90ac7a 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -360,8 +360,6 @@
<string name="security_enable_widgets_disabled_summary" msgid="6392489775303464905">"Avslått av administratoren"</string>
<string name="lockdown_settings_title" msgid="7393790212603280213">"Vis alternativet for låsing"</string>
<string name="lockdown_settings_summary" msgid="4359438673563318171">"Vis alternativet for av/på-knappen som slår av Smart Lock, biometrisk opplåsing og varsler på låseskjermen"</string>
- <string name="trust_agents_extend_unlock_title" msgid="2796555263565097031">"Pålitelig agent forlenger bare opplåsing"</string>
- <string name="trust_agents_extend_unlock_summary" msgid="3976344969220255010">"Hvis pålitelige agenter er slått på, er enheten låst opp i lengre tid, men funksjonen kan ikke låse opp en låst enhet lenger."</string>
<string name="trust_lost_locks_screen_title" msgid="2992742466966021682">"Låseskjerm ved tapt pålitelighet"</string>
<string name="trust_lost_locks_screen_summary" msgid="693784434582021206">"Hvis alternativet er slått på, låses enheten når den siste pålitelige agenten ikke anses som pålitelig lenger"</string>
<string name="owner_info_settings_summary" msgid="7472393443779227052">"Ingen"</string>
@@ -937,6 +935,7 @@
<string name="wifi_eap_identity" msgid="4359453783379679103">"Identitet"</string>
<string name="wifi_eap_anonymous" msgid="2989469344116577955">"Anonym identitet"</string>
<string name="wifi_password" msgid="5948219759936151048">"Passord"</string>
+ <string name="wifi_sae_password_id" msgid="1697832722221765763">"Identifikator for SAE-passord"</string>
<string name="wifi_show_password" msgid="6461249871236968884">"Vis passord"</string>
<string name="wifi_ap_band_config" msgid="1611826705989117930">"Velg AP-bånd"</string>
<string name="wifi_ap_choose_auto" msgid="2677800651271769965">"Automatisk"</string>
@@ -957,7 +956,6 @@
<string name="wifi_dpp_share_wifi" msgid="9065890131734833809">"Del Wi‑Fi"</string>
<string name="wifi_dpp_scan_qr_code_with_another_device" msgid="5854392840857123065">"Skann denne QR-koden for å koble til «<xliff:g id="SSID">%1$s</xliff:g>» og dele passordet"</string>
<string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="4436318319178361543">"Skann denne QR-koden for å koble til «<xliff:g id="SSID">%1$s</xliff:g>»"</string>
- <string name="wifi_dpp_could_not_detect_valid_qr_code" msgid="641893675646330576">"Kunne ikke lese QR-koden. Sentrer koden på nytt og prøv igjen"</string>
<string name="wifi_dpp_failure_authentication_or_configuration" msgid="3372757783382381044">"Prøv igjen. Hvis problemet vedvarer, kan du kontakte enhetsprodusenten."</string>
<string name="wifi_dpp_failure_not_compatible" msgid="2829930473520603740">"Noe gikk galt"</string>
<string name="wifi_dpp_failure_timeout" msgid="5228320772245820458">"Sørg for at enheten er tilkoblet, ladet og slått på"</string>
@@ -980,6 +978,7 @@
<string name="wifi_dpp_hotspot_password" msgid="4120419278831581613">"Passord for Wi-Fi-sone: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
<string name="wifi_dpp_add_device" msgid="4072206063308645677">"Legg til en enhet"</string>
<string name="wifi_dpp_connect_network_using_qr_code" msgid="3887335309163999665">"Bruk en QR-kode for å legge til en enhet på dette nettverket"</string>
+ <string name="wifi_dpp_qr_code_is_not_valid_format" msgid="3700087439867692944">"QR-kode er ikke et gyldig format"</string>
<string name="retry" msgid="6472609612090877557">"Prøv på nytt"</string>
<string name="wifi_shared" msgid="844142443226926070">"Del med andre brukere av enheten"</string>
<string name="wifi_unchanged" msgid="3410422020930397102">"(uendret)"</string>
@@ -1129,6 +1128,7 @@
<string name="emergency_address_title" msgid="932729250447887545">"Adresse for nødssituasjoner"</string>
<string name="emergency_address_summary" msgid="7751971156196115129">"Brukes som posisjonen din når du gjør et nødanrop over Wi-Fi"</string>
<string name="private_dns_help_message" msgid="3299567069152568958"><annotation id="url">"Finn ut mer"</annotation>" om funksjoner for privat DNS"</string>
+ <string name="private_dns_mode_on" msgid="5882613439541371003">"På"</string>
<string name="wifi_calling_pref_managed_by_carrier" msgid="6845711858866828986">"Innstillingen administreres av operatøren"</string>
<string name="wifi_calling_settings_activation_instructions" msgid="7492509632478260955">"Aktivér Wi-Fi-anrop"</string>
<string name="wifi_calling_turn_on" msgid="1171403510313983983">"Slå på Wi-Fi-anrop"</string>
@@ -1872,7 +1872,7 @@
<string name="default_emergency_app" msgid="1951760659640369980">"Nødapp"</string>
<string name="reset_app_preferences" msgid="1321050641018356925">"Tilbakestill app-innstillingene"</string>
<string name="reset_app_preferences_title" msgid="6093179367325336662">"Vil du tilbakestille app-innstillingene?"</string>
- <string name="reset_app_preferences_desc" msgid="4822447731869201512">"Dette tilbakestiller alle innstillinger for\n\n"<li>"avslåtte apper"</li>\n<li>"avslåtte appvarsler"</li>\n<li>"standardapper for handlinger"</li>\n<li>"begrensninger på bakgrunnsdata for apper"</li>\n<li>"begrensninger på tillatelser"</li>\n\n"Du mister ingen appdata."</string>
+ <string name="reset_app_preferences_desc" msgid="731757609326016760">"Dette tilbakestiller alle innstillinger for\n\n"<li>"deaktiverte apper"</li>\n<li>"deaktiverte appvarsler"</li>\n<li>"standardapper for handlinger"</li>\n<li>"begrensninger for bakgrunnsdata for apper"</li>\n<li>"eventuelle tillatelsesbegrensninger"</li>\n\n"Du kommer ikke til å miste appdata."</string>
<string name="reset_app_preferences_button" msgid="2559089511841281242">"Tilbakestill apper"</string>
<string name="manage_space_text" msgid="8852711522447794676">"Styr plass"</string>
<string name="filter" msgid="2018011724373033887">"Filter"</string>
@@ -2087,7 +2087,7 @@
<string name="accessibility_screen_magnification_short_summary" msgid="3411979839172752057">"Trykk tre ganger for å zoome"</string>
<string name="accessibility_screen_magnification_navbar_short_summary" msgid="3693116360267980492">"Trykk på en knapp for å zoome"</string>
<string name="accessibility_screen_magnification_summary" msgid="5258868553337478505"><b>"For å zoome"</b>", trykk raskt på skjermen tre ganger.\n"<ul><li>"Dra to eller flere fingre for å rulle"</li>\n<li>"Knip to eller flere fingre for å justere zoom"</li></ul>\n\n<b>"For å zoome midlertidig"</b>", trykk raskt på skjermen tre ganger, og hold fingeren nede på det tredje trykket.\n"<ul><li>"Dra for å bevege deg rundt på skjermen"</li>\n<li>"Løft fingeren for å zoome ut"</li></ul>\n\n"Du kan ikke zoome inn på tastaturet eller navigasjonsraden."</string>
- <string name="accessibility_screen_magnification_navbar_summary" msgid="2272878354599332009">"Når forstørring er slått på, kan du zoome inn på skjermen.\n\n"<b>"For å zoome"</b>", start forstørring og trykk hvor som helst på skjermen.\n"<ul><li>"• Dra to eller flere fingre for å rulle"</li>\n<li>"• Klyp to eller flere fingre for å justere zoom"</li></ul>\n\n<b>"For å zoome midlertidig"</b>", start forstørring og trykk og hold hvor som helst på skjermen.\n"<ul><li>"• Dra for å flytte deg rundt på skjermen"</li>\n<li>"• Løft fingeren for å zoome ut"</li></ul>\n\n"Du kan ikke zoome inn på tastaturet eller navigasjonsraden."</string>
+ <string name="accessibility_screen_magnification_navbar_summary" msgid="6700716275347612310">"Når forstørrelse er slått på, kan du zoome inn på skjermen.\n\n"<b>"For å zoome"</b>", start forstørring og trykk hvor som helst på skjermen.\n"<ul><li>"Dra to eller flere fingre for å rulle"</li>\n<li>"Knip to eller flere fingre for å justere zoomen"</li></ul>\n\n<b>"For å zoome midlertidig"</b>", start forstørring og trykk og hold hvor som helst på skjermen.\n"<ul><li>"Dra for å bevege deg rundt på skjermen"</li>\n<li>"Løft fingeren for å zoome ut"</li></ul>\n\n"Du kan ikke zoome inn på tastaturet eller navigasjonsraden."</string>
<string name="accessibility_tutorial_dialog_title_button" msgid="3682222614034474845">"Bruk Tilgjengelighet-knappen for å åpne"</string>
<string name="accessibility_tutorial_dialog_title_gesture" msgid="1342726230497913398">"Bruk bevegelse for å åpne"</string>
<string name="accessibility_tutorial_dialog_title_gesture_settings" msgid="8539392614235820285">"Bruk den nye tilgjengelighetsbevegelsen"</string>
@@ -2140,8 +2140,7 @@
<string name="accessibility_hearingaid_title" msgid="8312145423610648518">"Høreapparater"</string>
<string name="accessibility_hearingaid_not_connected_summary" msgid="6240237523789614599">"Ingen høreapparater er tilkoblet"</string>
<string name="accessibility_hearingaid_adding_summary" msgid="2947474468412309778">"Legg til høreapparater"</string>
- <string name="accessibility_hearingaid_pair_instructions_first_message" msgid="3912093691643131154">"For å koble til høreapparatet ditt, finn og trykk på enheten på neste skjerm."</string>
- <string name="accessibility_hearingaid_pair_instructions_second_message" msgid="5596683393607650243">"Sørg for at høreapparatet er i tilkoblingsmodus."</string>
+ <string name="accessibility_hearingaid_pair_instructions_message" msgid="3094382949733435414">"For å koble til høreapparatet ditt, finn og trykk på enheten på neste skjerm. Sørg for at høreapparatet er i tilkoblingsmodus."</string>
<string name="accessibility_hearingaid_active_device_summary" msgid="3924362383258688984">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> er aktiv"</string>
<plurals name="show_number_hearingaid_count" formatted="false" msgid="3160782397139295486">
<item quantity="other"><xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> lagrede høreapparater</item>
@@ -2490,7 +2489,6 @@
<string name="menu_stats_last_unplugged" msgid="5922246077592434526">"Siste gang uten strøm i <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
<string name="menu_stats_total" msgid="8973377864854807854">"Total bruk"</string>
<string name="menu_stats_refresh" msgid="1676215433344981075">"Oppdater"</string>
- <string name="process_kernel_label" msgid="3916858646836739323">"Android-operativsystem"</string>
<string name="process_mediaserver_label" msgid="6500382062945689285">"Medietjener"</string>
<string name="process_dex2oat_label" msgid="2592408651060518226">"Appoptimalisering"</string>
<string name="battery_saver" msgid="8172485772238572153">"Batterisparing"</string>
@@ -2621,8 +2619,6 @@
<string name="no_device_admins" msgid="4846602835339095768">"Ingen apper for enhetsadministrator er tilgjengelige"</string>
<string name="personal_device_admin_title" msgid="2849617316347669861">"Personlig"</string>
<string name="managed_device_admin_title" msgid="7853955652864478435">"Jobb"</string>
- <string name="sms_access_restriction_enabled" msgid="7054488078710530278">"Begrens tilgang til SMS og samtalelogg"</string>
- <string name="sms_access_restriction_enabled_summary" msgid="6851339654677842328">"Bare standardapper for telefon og meldinger har tilgang til SMS og samtalelogg"</string>
<string name="no_trust_agents" msgid="7450273545568977523">"Ingen tilgjengelige pålitelige agenter"</string>
<string name="add_device_admin_msg" msgid="1501847129819382149">"Vil du aktivere administratorappen?"</string>
<string name="add_device_admin" msgid="4192055385312215731">"Aktiver administratorappen på denne enheten"</string>
@@ -3111,7 +3107,7 @@
<string name="keywords_app_default" msgid="5822717006354487071">"Åpne med"</string>
<string name="keywords_applications_settings" msgid="1268353611121497450">"Apper"</string>
<string name="keywords_time_zone" msgid="998254736898753085">"tidssone"</string>
- <string name="keywords_draw_overlay" msgid="4130899177619041842">"Chathode"</string>
+ <string name="keywords_draw_overlay" msgid="1001120206241401007">"Chathode, system, varsel, vindu, dialog, skjerm, over andre apper, vis"</string>
<string name="keywords_flashlight" msgid="6161632177705233710">"Lommelykt, lys, lykt"</string>
<string name="keywords_change_wifi_state" msgid="627068244033681010">"wifi, Wi-Fi, slå av/på, kontroll"</string>
<string name="keywords_more_mobile_networks" msgid="8995946622054642367">"mobilnett, mobil, mobiloperatør, trådløs, data, 4G, 3G, 2G, LTE"</string>
@@ -3135,7 +3131,7 @@
<string name="keywords_sounds_and_notifications_interruptions" msgid="5426093074031208917">"ikke, ikke forstyrr, forstyrr, avbrudd, pause"</string>
<string name="keywords_app" msgid="6334757056536837791">"RAM"</string>
<string name="keywords_location" msgid="4132655528196729043">"i nærheten, posisjon, logg, rapportering, GPS"</string>
- <string name="keywords_accounts" msgid="1957925565953357627">"konto"</string>
+ <string name="keywords_accounts" msgid="4479029747403203867">"konto, legg til en konto, jobbprofil"</string>
<string name="keywords_users" msgid="3434190133131387942">"begrensning, begrens, begrenset"</string>
<string name="keywords_keyboard_and_ime" msgid="9143339015329957107">"tekstkorrigering, korrekt, lyd, vibrer, automatisk, språk, bevegelse, foreslå, forslag, tema, støtende, ord, type, emoji, internasjonal"</string>
<string name="keywords_reset_apps" msgid="5293291209613191845">"tilbakestill, innstillinger, standard"</string>
@@ -3173,6 +3169,7 @@
<string name="keywords_storage_settings" msgid="297283751968446577">"minne, buffer, data, slett, fjern, frigjør, lagringsplass"</string>
<string name="keywords_bluetooth_settings" msgid="6804844062789439858">"tilkoblet, enhet, hodetelefoner, trådløs, koble til, øreplugger, musikk, media"</string>
<string name="keywords_wallpaper" msgid="5058364390917429896">"bakgrunn, skjerm, låseskjema, tema"</string>
+ <string name="keywords_styles" msgid="5828725481814049422">"ikonform, markeringsfarge, skrifttype"</string>
<string name="keywords_assist_input" msgid="5017533309492679287">"standard, assistent"</string>
<string name="keywords_default_payment_app" msgid="3838565809518896799">"betaling, standard"</string>
<string name="keywords_ambient_display" msgid="3103487805748659132">"innkommende varsel"</string>
@@ -3182,7 +3179,7 @@
<string name="keywords_notification_vibration" msgid="31924624421190547">"haptisk, vibrer, følsomhet"</string>
<string name="keywords_battery_saver_sticky" msgid="5586215686021650278">"batterisparing, festet, vedvarende, strømsparing, batteri"</string>
<string name="keywords_battery_saver_schedule" msgid="7358789228486231944">"rutine, tidsplan, batterisparing, strømsparing, batteri, automatisk, prosent"</string>
- <string name="keywords_add_an_account" msgid="6488139919428902434">"jobbprofil"</string>
+ <string name="keywords_enhance_4g_lte" msgid="2273810564244790859">"volte, avansert ringing, 4g-ringing"</string>
<string name="default_sound" msgid="8821684447333687810">"Standardlyd"</string>
<string name="sound_settings_summary" msgid="4100853606668287965">"Ringevolumet er satt til <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
<string name="sound_dashboard_summary" msgid="3402435125958012986">"Volum, vibrasjon, ikke forstyrr"</string>
@@ -3889,7 +3886,6 @@
<string name="permit_draw_overlay" msgid="7456536798718633432">"Tillat visning over andre apper"</string>
<string name="allow_overlay_description" msgid="8961670023925421358">"Tillat at denne appen vises over andre apper du bruker. Den kan kanskje virke forstyrrende for andre apper eller endre måten de vises eller fungerer på."</string>
<string name="keywords_vr_listener" msgid="7441221822576384680">"vr, lyttetjeneste for virtuell virkelighet, stereo, hjelpetjenester"</string>
- <string name="keywords_system_alert_window" msgid="5049498015597864850">"vindusdialogboks for systemvarsel vises over andre apper"</string>
<string name="overlay_settings" msgid="6930854109449524280">"Vis over andre apper"</string>
<string name="system_alert_window_summary" msgid="602892301318324492">"<xliff:g id="COUNT_0">%1$d</xliff:g> av <xliff:g id="COUNT_1">%2$d</xliff:g> apper kan vises over andre apper"</string>
<string name="filter_overlay_apps" msgid="6965969283342557573">"Apper med tillatelse"</string>
@@ -4125,7 +4121,6 @@
<string name="notification_log_details_none" msgid="184131801230614059">"ingen"</string>
<string name="notification_log_details_ranking_null" msgid="244660392058720919">"Rangeringsobjektet mangler."</string>
<string name="notification_log_details_ranking_none" msgid="599607025882587844">"Rangeringsobjektet inneholder ikke denne tasten."</string>
- <string name="theme_customization_category" msgid="1049181544004163283">"Angivelse av tema"</string>
<string name="theme_customization_device_default" msgid="5058147707906551368">"Standard for enheten"</string>
<string name="display_cutout_emulation" msgid="7466869822418376317">"Skjermutklipp"</string>
<string name="display_cutout_emulation_keywords" msgid="4495418317471622562">"skjermutklipp, hakk"</string>
@@ -4551,6 +4546,8 @@
<string name="network_connection_errorstate_dialog_message" msgid="6953778550775646710">"Noe dukket opp. Appen har kansellert forespørselen om å velge en enhet."</string>
<string name="network_connection_connect_successful" msgid="5935510954474494928">"Tilkoblingen var vellykket"</string>
<string name="network_connection_request_dialog_showall" msgid="6938922880244567521">"Vis alle"</string>
+ <string name="network_connection_searching_message" msgid="4638576789450817530">"Søker etter enheten …"</string>
+ <string name="network_connection_connecting_message" msgid="3740982406609245654">"Kobler til enheten …"</string>
<plurals name="show_bluetooth_devices" formatted="false" msgid="1715020480026568408">
<item quantity="other"><xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> enheter er tilkoblet</item>
<item quantity="one"><xliff:g id="NUMBER_DEVICE_COUNT_0">%1$d</xliff:g> enhet er tilkoblet</item>
diff --git a/res/values-ne/arrays.xml b/res/values-ne/arrays.xml
index e6ac03c..bd35c42fc 100644
--- a/res/values-ne/arrays.xml
+++ b/res/values-ne/arrays.xml
@@ -473,7 +473,7 @@
</string-array>
<string-array name="wifi_metered_entries">
<item msgid="5200910605264415911">"स्वतः पत्ता लगाउनुहोस्"</item>
- <item msgid="8745603368609022803">"सशुल्क वाइफाइका रूपमा लिनुहोस्"</item>
+ <item msgid="8745603368609022803">"मिटर गरिएको रूपमा व्यवहार गर्नुहोस्"</item>
<item msgid="2266114985518865625">"मिटर नगरिएको रूपमा व्यवहार गर्नुहोस्"</item>
</string-array>
<string-array name="wifi_privacy_entries">
diff --git a/res/values-ne/strings.xml b/res/values-ne/strings.xml
index a490470..557fb74 100644
--- a/res/values-ne/strings.xml
+++ b/res/values-ne/strings.xml
@@ -360,8 +360,6 @@
<string name="security_enable_widgets_disabled_summary" msgid="6392489775303464905">"प्रशासकद्वारा असक्षम पारिएको छ"</string>
<string name="lockdown_settings_title" msgid="7393790212603280213">"लकडाउन गर्ने विकल्प देखाउनुहोस्"</string>
<string name="lockdown_settings_summary" msgid="4359438673563318171">"Smart Lock, फिंगरप्रिन्टमार्फत अनलक गर्ने र लक स्क्रिनसम्बन्धी सूचनाहरू दिने सेवा निस्क्रिय पार्ने पावर बटनसम्बन्धी विकल्प देखाउनुहोस्"</string>
- <string name="trust_agents_extend_unlock_title" msgid="2796555263565097031">"विश्वस्त एजेन्टहरूले अनलक मोडको विकल्पलाई मात्र विस्तार गर्छन्"</string>
- <string name="trust_agents_extend_unlock_summary" msgid="3976344969220255010">"सक्षम परिएका खण्डमा विश्वस्त एजेन्टहरूले तपाईंको यन्त्र धेरै बेरसम्म अनलक रूपमा राख्छन् तर लक भएको यन्त्रलाई भने अब उप्रान्त अनलक गर्न सक्दैनन्।"</string>
<string name="trust_lost_locks_screen_title" msgid="2992742466966021682">"विश्वास गुमाइँदा स्क्रिन लक गर्नुहोस्"</string>
<string name="trust_lost_locks_screen_summary" msgid="693784434582021206">"यो सुविधा सक्षम पारियो भने अन्तिम विश्वस्त एजेन्टले विश्वास गुमाउँदा यन्त्र लक हुने छ"</string>
<string name="owner_info_settings_summary" msgid="7472393443779227052">"कुनै पनि होइन"</string>
@@ -937,6 +935,8 @@
<string name="wifi_eap_identity" msgid="4359453783379679103">"पहिचान गर्नुहोस्"</string>
<string name="wifi_eap_anonymous" msgid="2989469344116577955">"अज्ञात पहिचान"</string>
<string name="wifi_password" msgid="5948219759936151048">"पासवर्ड:"</string>
+ <!-- no translation found for wifi_sae_password_id (1697832722221765763) -->
+ <skip />
<string name="wifi_show_password" msgid="6461249871236968884">"पासवर्ड देखाउनुहोस्"</string>
<string name="wifi_ap_band_config" msgid="1611826705989117930">"AP ब्यान्ड चयन गर्नुहोस्"</string>
<string name="wifi_ap_choose_auto" msgid="2677800651271769965">"स्वतः निर्धारित"</string>
@@ -957,7 +957,6 @@
<string name="wifi_dpp_share_wifi" msgid="9065890131734833809">"Wi‑Fi साझा रूपमा प्रयोग गर्नुहोस्"</string>
<string name="wifi_dpp_scan_qr_code_with_another_device" msgid="5854392840857123065">"“<xliff:g id="SSID">%1$s</xliff:g>” मा जडान गर्न यो QR कोड स्क्यान गर्नुहोस् र पासवर्ड आदान प्रदान गर्नुहोस्"</string>
<string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="4436318319178361543">"“<xliff:g id="SSID">%1$s</xliff:g>” मा जडान गर्न QR कोड स्क्यान गर्नुहोस्"</string>
- <string name="wifi_dpp_could_not_detect_valid_qr_code" msgid="641893675646330576">"QR कोड पढ्न सकिएन। कोडलाई पुनः केन्द्रमा ल्याउनुहोस् र फेरि प्रयास गर्नुहोस्"</string>
<string name="wifi_dpp_failure_authentication_or_configuration" msgid="3372757783382381044">"फेरि प्रयास गर्नुहोस्। समस्या यथावत् रहिरहेमा यन्त्रका निर्मातासँग सम्पर्क गर्नुहोस्"</string>
<string name="wifi_dpp_failure_not_compatible" msgid="2829930473520603740">"केही चिज गडबड भयो"</string>
<string name="wifi_dpp_failure_timeout" msgid="5228320772245820458">"यन्त्र प्लग इन गरिएको, चार्ज भएको र सक्रिय पारिएको कुरा सुनिश्चित गर्नुहोस्"</string>
@@ -980,6 +979,7 @@
<string name="wifi_dpp_hotspot_password" msgid="4120419278831581613">"हटस्पटको पासवर्ड: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
<string name="wifi_dpp_add_device" msgid="4072206063308645677">"यन्त्र थप्नुहोस्"</string>
<string name="wifi_dpp_connect_network_using_qr_code" msgid="3887335309163999665">"यो नेटवर्कमा थप्नका ला्गि कुनै QR प्रयोग गर्नुहोस्"</string>
+ <string name="wifi_dpp_qr_code_is_not_valid_format" msgid="3700087439867692944">"QR कोडको ढाँचा मान्य छैन"</string>
<string name="retry" msgid="6472609612090877557">"पुनः प्रयास गर्नु…"</string>
<string name="wifi_shared" msgid="844142443226926070">"अन्य यन्त्र प्रयोगकर्ताहरूसँग साझेदारी गर्नुहोस्"</string>
<string name="wifi_unchanged" msgid="3410422020930397102">"(अपरिवर्तित)"</string>
@@ -1129,6 +1129,7 @@
<string name="emergency_address_title" msgid="932729250447887545">"आपतकालीन ठेगाना"</string>
<string name="emergency_address_summary" msgid="7751971156196115129">"तपाईंले Wi‑Fi मार्फत आपतकालीन कल गर्दा उक्त ठेगानालाई तपाईंको स्थानको रूपमा प्रयोग गरिन्छ"</string>
<string name="private_dns_help_message" msgid="3299567069152568958">"DNS का सुविधाहरूबारे "<annotation id="url">"थप जान्नुहोस्"</annotation></string>
+ <string name="private_dns_mode_on" msgid="5882613439541371003">"सक्रिय गर्नुहोस्"</string>
<string name="wifi_calling_pref_managed_by_carrier" msgid="6845711858866828986">"सेवा प्रदायकद्वारा व्यवस्थापन गरिएको सेटिङ"</string>
<string name="wifi_calling_settings_activation_instructions" msgid="7492509632478260955">"Wi-Fi कलिङ सक्रिय गर्नुहोस्"</string>
<string name="wifi_calling_turn_on" msgid="1171403510313983983">"Wi-Fi कलिङ सक्रिय गर्नुहोस्"</string>
@@ -1872,7 +1873,7 @@
<string name="default_emergency_app" msgid="1951760659640369980">"आपतकालीन अनुप्रयोग"</string>
<string name="reset_app_preferences" msgid="1321050641018356925">"अनुप्रयोग प्राथमिकताहरू पुनःसेट गर्नुहोस्"</string>
<string name="reset_app_preferences_title" msgid="6093179367325336662">"अनुप्रयोगका प्राथमिकताहरू पुनःसेट गर्ने हो?"</string>
- <string name="reset_app_preferences_desc" msgid="4822447731869201512">"यसले सबै प्राथमिकताहरूलाई पुनःसेट गर्ने छ:\n\n"<li>"असक्षम पारिएका अनुप्रयोगहरू"</li>\n<li>"असक्षम पारिएका अनुप्रयोग सूचनाहरू"</li>\n<li>"कार्यका लागि पूर्वनिर्धारित अनुप्रयोगहरू"</li>\n<li>"अनुप्रयोगहरूको लागि पृष्ठभूमि डेटा प्रतिबन्धहरू"</li>\n<li>"कुनै अनुमति प्रतिबन्धहरू"</li>\n\n"तपाईँले कुनै पनि अनुप्रयोग डेटा गुमाउनु हुने छैन।"</string>
+ <string name="reset_app_preferences_desc" msgid="731757609326016760">"यस कार्यले निम्न सुविधाहरूका सबै प्राथमिकताहरूलाई रिसेट गर्ने छ:\n\n"<li>"असक्षम पारिएका अनुप्रयोगहरू"</li>\n<li>"असक्षम पारिएका अनुप्रयोगसम्बन्धी सूचनाहरू"</li>\n<li>"कारबाहीका लागि पूर्वनिर्धारित अनुप्रयोगहरू"</li>\n<li>"अनुप्रयोगका लागि पृष्ठभूमिका डेटासम्बन्धी बन्देजहरू"</li>\n<li>"अनुमतिसम्बन्धी सबै बन्देजहरू"</li>\n\n"तपाईं अनुप्रयोगको कुनै पनि डेटा गुमाउनु हुने छैन।"</string>
<string name="reset_app_preferences_button" msgid="2559089511841281242">"अनुप्रयोगहरू पुनःसेट गर्नुहोस्"</string>
<string name="manage_space_text" msgid="8852711522447794676">"ठाउँको प्रबन्ध गर्नुहोस्"</string>
<string name="filter" msgid="2018011724373033887">"फिल्टर गर्नुहोस्"</string>
@@ -2087,7 +2088,7 @@
<string name="accessibility_screen_magnification_short_summary" msgid="3411979839172752057">"जुम गर्न ३ पटक ट्याप गर्नुहोस्"</string>
<string name="accessibility_screen_magnification_navbar_short_summary" msgid="3693116360267980492">"जुम गर्न बटनमा ट्याप गर्नुहोस्"</string>
<string name="accessibility_screen_magnification_summary" msgid="5258868553337478505"><b>"जुम गर्नाका लागि"</b>", स्क्रिनलाई तीन पटक छिटो-छिटो ट्याप गर्नुहोस्।\n"<ul><li>"स्क्रोल गर्नाका लागि दुई वा सो भन्दा बढी औंलाले ड्र्याग गर्नुहोस्"</li>\n<li>"जुम समायोजन गर्नाका लागि २ वा सो भन्दा बढी औंलाले पिन्च गर्नुहोस्"</li></ul>\n\n<b>"अस्थायी रूपमा जुम गर्नाका लागि"</b>", स्क्रिनमा ३ पटक छिटो-छिटो ट्याप गर्नुहोस् र तेस्रो ट्यापमा आफ्नो औंलालाई तलतिर होल्ड गर्नुहोस्।\n"<ul><li>"स्क्रिनमा यताउता जान ड्र्याग गर्नुहोस्"</li>\n<li>"जुम आउट गर्नाका लागि औंला उचाल्नुहोस्"</li></ul>\n\n"तपाईं किबोर्ड वा नेभिगेसन बारमा जुम इन गर्न सक्नुहुन्न।"</string>
- <string name="accessibility_screen_magnification_navbar_summary" msgid="2272878354599332009">"म्याग्निफिकेसन सुविधा सक्रिय पारिएका बेला तपाईं आफ्नो स्क्रिनमा जुम इन गर्न सक्नुहुन्छ। \n\n"<b></b>" लाई जुम गर्न म्याग्निफिकेसन सेवा सुरु गर्नुहोस् त्यसपछि स्क्रिनमा कतैतिर ट्याप गर्नुहोस्।\n"<ul><li>"• स्क्रोल गर्न २ वा २ भन्दा बढी औँलाले ड्र्याग गर्नुहोस्"</li>\n<li>"• जुम समायोजन गर्नका लागि २ वा २ भन्दा बढी औँलाले पिन्च गर्नुहोस्"</li></ul>\n\n<b>"अस्थायी रूपमा जुम गर्न"</b>", म्याग्निफिकेसन सुरु गर्नुहोस् त्यसपछि स्क्रिनमा कतैतिर ट्याप गर्नुहोस्।\n"<ul><li>"• स्क्रिनमा यताउता सार्न ड्र्याग गर्नुहोस्"</li>\n<li>"• जुम आउट गर्न औँला झिक्नुहोस्"</li></ul>\n\n"तपाईं किबोर्ड वा नेभिगेसन बारमा जुम इन गर्न सक्नुहुन्न।"</string>
+ <string name="accessibility_screen_magnification_navbar_summary" msgid="6700716275347612310">"म्याग्निफिकेसन सुविधा सक्रिय गरेपछि, तपाईं आफ्नो स्क्रिनमा जुम इन गर्न सक्नुहुन्छ।\n\n"<b>"जुम गर्न"</b>", म्याग्निफिकेसन सुविधा सुरु गर्नुहोस्, त्यसपछि स्क्रिनको कुनै पनि भागमा ट्याप गर्नुहोस्।\n"<ul><li>"स्क्रोल गर्न २ वा सोभन्दा बढी औँलाले ड्र्याग गर्नुहोस्"</li>\n<li>"जुम समायोजन गर्न २ वा सोभन्दा बढी औँलाले पिन्च गर्नुहोस्"</li></ul>\n\n<b>"केहीबेरका लागि जुम गर्न"</b>", म्याग्निफिकेसन सुविधा सुरु गर्नुहोस्, त्यसपछि स्क्रिनको कुनै पनि भागमा केहीबेर छोइरहनुहोस्।\n"<ul><li>"स्क्रिनमा यताउता जान ड्र्याग गर्नुहोस्"</li>\n<li>"जुम आउट गर्न औँला उचाल्नुहोस्"</li></ul>\n\n"तपाईं किबोर्ड वा नेभिगेसन पट्टीमा जुम इन गर्न सक्नुहुन्न।"</string>
<string name="accessibility_tutorial_dialog_title_button" msgid="3682222614034474845">"खोल्नका लागि पहुँचसम्बन्धी बटनको प्रयोग गर्नुहोस्"</string>
<string name="accessibility_tutorial_dialog_title_gesture" msgid="1342726230497913398">"खोल्नका लागि इसाराको प्रयोग गर्नुहोस्"</string>
<string name="accessibility_tutorial_dialog_title_gesture_settings" msgid="8539392614235820285">"पहुँचसम्बन्धी नयाँ इसारा प्रयोग गर्नुहोस्"</string>
@@ -2140,8 +2141,7 @@
<string name="accessibility_hearingaid_title" msgid="8312145423610648518">"श्रवण यन्त्रहरू"</string>
<string name="accessibility_hearingaid_not_connected_summary" msgid="6240237523789614599">"कुनै पनि श्रवण यन्त्र जडान गरिएको छैन"</string>
<string name="accessibility_hearingaid_adding_summary" msgid="2947474468412309778">"श्रवण यन्त्रहरू थप्नुहोस्"</string>
- <string name="accessibility_hearingaid_pair_instructions_first_message" msgid="3912093691643131154">"आफ्ना श्रवण यन्त्रहरूसँग जोडा बनाउन आगामी स्क्रिनमा आफ्नो यन्त्र फेला पारी तिनमा ट्याप गर्नुहोस्।"</string>
- <string name="accessibility_hearingaid_pair_instructions_second_message" msgid="5596683393607650243">"आफ्ना श्रवण यन्त्रहरू जोडा बनाउने मोडमा भएको कुरा सुनिश्चित गर्नुहोस्।"</string>
+ <string name="accessibility_hearingaid_pair_instructions_message" msgid="3094382949733435414">"आफ्ना श्रवण यन्त्रहरूसँग जोडा बनाउन आगामी स्क्रिनमा आफ्नो यन्त्र फेला पारी तिनमा ट्याप गर्नुहोस्। आफ्ना श्रवण यन्त्रहरू जोडा बनाउने मोडमा भएको कुरा सुनिश्चित गर्नुहोस्।"</string>
<string name="accessibility_hearingaid_active_device_summary" msgid="3924362383258688984">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> सक्रिय"</string>
<plurals name="show_number_hearingaid_count" formatted="false" msgid="3160782397139295486">
<item quantity="other">सुरक्षित गरिएका <xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> श्रवण यन्त्रहरू</item>
@@ -2490,7 +2490,6 @@
<string name="menu_stats_last_unplugged" msgid="5922246077592434526">"पछिल्लो पटक <xliff:g id="UNPLUGGED">%1$s</xliff:g>का लागि अनप्लग गरिँदा"</string>
<string name="menu_stats_total" msgid="8973377864854807854">"उपयोग कूलहरू"</string>
<string name="menu_stats_refresh" msgid="1676215433344981075">"पुनःताजा गर्नुहोस्"</string>
- <string name="process_kernel_label" msgid="3916858646836739323">"एन्ड्रोइड OS"</string>
<string name="process_mediaserver_label" msgid="6500382062945689285">"मिडिया सर्भर"</string>
<string name="process_dex2oat_label" msgid="2592408651060518226">"अनुप्रयोग आफू अनुकूल"</string>
<string name="battery_saver" msgid="8172485772238572153">"ब्याट्री सेभर"</string>
@@ -2621,8 +2620,6 @@
<string name="no_device_admins" msgid="4846602835339095768">"यन्त्रका प्रशासकीय अनुप्रयोगहरू उपलब्ध छैनन्"</string>
<string name="personal_device_admin_title" msgid="2849617316347669861">"व्यक्तिगत"</string>
<string name="managed_device_admin_title" msgid="7853955652864478435">"काम"</string>
- <string name="sms_access_restriction_enabled" msgid="7054488078710530278">"Restrict SMS तथा कलका लगहरूमाथिका पहुँचमा प्रतिबन्ध लगाउनुहोस्"</string>
- <string name="sms_access_restriction_enabled_summary" msgid="6851339654677842328">"पूर्वनिर्धारित फोन र सन्देश अनुप्रयोगहरूसँग मात्र SMS र कल लग अनुमति हुन्छ"</string>
<string name="no_trust_agents" msgid="7450273545568977523">"विश्वस्त प्रतिनिधि उपलब्ध छैन"</string>
<string name="add_device_admin_msg" msgid="1501847129819382149">"यन्त्रको प्रशासन सम्बन्धी अनुप्रयोगलाई सक्रिय गर्ने हो?"</string>
<string name="add_device_admin" msgid="4192055385312215731">"यन्त्रको प्रशासन सम्बन्धी यो अनुप्रयोगलाई सक्रिय गर्नुहोस्"</string>
@@ -3111,7 +3108,7 @@
<string name="keywords_app_default" msgid="5822717006354487071">"निम्नमार्फत खोल्नुहोस्"</string>
<string name="keywords_applications_settings" msgid="1268353611121497450">"अनुप्रयोगहरू"</string>
<string name="keywords_time_zone" msgid="998254736898753085">"समय क्षेत्र"</string>
- <string name="keywords_draw_overlay" msgid="4130899177619041842">"कुराकानीको हेड"</string>
+ <string name="keywords_draw_overlay" msgid="1001120206241401007">"कुराकानीको शीर्ष, प्रणाली, अलर्ट, विन्डो, संवाद, प्रदशर्न, अन्य शीर्ष अनुप्रयोगहरू, रेखाचित्र"</string>
<string name="keywords_flashlight" msgid="6161632177705233710">"फ्ल्यासलाइट, बत्ती, टर्च"</string>
<string name="keywords_change_wifi_state" msgid="627068244033681010">"wifi, wi-fi, टगल, नियन्त्रण"</string>
<string name="keywords_more_mobile_networks" msgid="8995946622054642367">"सेलुलर, मोबाइल, सेल वाहक, वायरलेस, डेटा, 4G, 3G, 2G, lte"</string>
@@ -3135,7 +3132,7 @@
<string name="keywords_sounds_and_notifications_interruptions" msgid="5426093074031208917">"बाधा नपुर्याउनुहोस्, हस्तक्षेप गर्नुहोस्, हस्तक्षेप, ब्रेक"</string>
<string name="keywords_app" msgid="6334757056536837791">"RAM"</string>
<string name="keywords_location" msgid="4132655528196729043">"वरपर, स्थान, इतिहास, रिपोर्टिङ, GPS"</string>
- <string name="keywords_accounts" msgid="1957925565953357627">"खाता"</string>
+ <string name="keywords_accounts" msgid="4479029747403203867">"खाता, कुनै खाता थप्नुहोस्, कार्य प्रोफाइल"</string>
<string name="keywords_users" msgid="3434190133131387942">"प्रतिबन्ध, प्रतिबन्ध लगाउनुहोस्, प्रतिबन्धित"</string>
<string name="keywords_keyboard_and_ime" msgid="9143339015329957107">"पाठ सच्याइ, सही, ध्वनि, कम्पन, स्वतः, भाषा, इसारा, सुझाव दिनु, सुझाव, विषयवस्तु, अपमानजनक, शब्द, प्रकार, इमोजी, अन्तर्राष्ट्रिय"</string>
<string name="keywords_reset_apps" msgid="5293291209613191845">"रिसेट गर्नुहोस्, प्राथमिकताहरू, पूर्वनिर्धारित"</string>
@@ -3173,6 +3170,7 @@
<string name="keywords_storage_settings" msgid="297283751968446577">"मेमोरी, क्यास, डेटा, मेट्नुहोस्, खाली गर्नुहोस्, खाली, ठाउँ"</string>
<string name="keywords_bluetooth_settings" msgid="6804844062789439858">"जडान, यन्त्र, हेडफोन, हेडसेट, स्पिकर, वायरलेस, जोडा, इयरबड, सङ्गीत, मिडिया"</string>
<string name="keywords_wallpaper" msgid="5058364390917429896">"पृष्ठभूमि, स्क्रिन, लकस्क्रिन, विषयवस्तु"</string>
+ <string name="keywords_styles" msgid="5828725481814049422">"आइकनको आकार, एक्सेन्टको रङ, फन्ट"</string>
<string name="keywords_assist_input" msgid="5017533309492679287">"पूर्वनिर्धारित, सहायक"</string>
<string name="keywords_default_payment_app" msgid="3838565809518896799">"भुक्तानी, पूर्वनिर्धारित"</string>
<string name="keywords_ambient_display" msgid="3103487805748659132">"आगमन सूचना"</string>
@@ -3182,7 +3180,7 @@
<string name="keywords_notification_vibration" msgid="31924624421190547">"अनुभूतिमूलक, कम्पन, संवेदनशीलता"</string>
<string name="keywords_battery_saver_sticky" msgid="5586215686021650278">"ब्याट्री सेभर, स्टिकी, पर्सिस्ट, पावर सेभर, ब्याट्री"</string>
<string name="keywords_battery_saver_schedule" msgid="7358789228486231944">"दिनचर्या, समयतालिका, ब्याट्री सेभर, पावर सेभर, ब्याट्री, स्वचालित, प्रतिशत"</string>
- <string name="keywords_add_an_account" msgid="6488139919428902434">"कार्य प्रोफाइल"</string>
+ <string name="keywords_enhance_4g_lte" msgid="2273810564244790859">"volte, कल गर्ने उन्नत सुविधा, 4g मार्फत कल गर्ने सुविधा"</string>
<string name="default_sound" msgid="8821684447333687810">"पूर्वनिर्धारित ध्वनि"</string>
<string name="sound_settings_summary" msgid="4100853606668287965">"<xliff:g id="PERCENTAGE">%1$s</xliff:g> मा सेट गरिँदा घन्टीको भोल्युम"</string>
<string name="sound_dashboard_summary" msgid="3402435125958012986">"भोल्युम, कम्पन, बाधा नपुर्याउनुहोस्"</string>
@@ -3889,7 +3887,6 @@
<string name="permit_draw_overlay" msgid="7456536798718633432">"अन्य एपहरूको माथिपट्टि देखिने अनुमति दिनुहोस्"</string>
<string name="allow_overlay_description" msgid="8961670023925421358">"यो अनुप्रयोगलाई तपाईंले प्रयोग गरिरहनुभएका अन्य अनुप्रयोगहरूको माथिपट्टि देखिन अनुमति दिनुहोस्। यसले तपाईंले गर्ने ती अनुप्रयोगहरूको प्रयोगमा हस्तक्षेप गर्न वा तिनीहरू देखा पर्ने वा तिनीहरूले काम गर्ने तरिकालाई परिवर्तन गर्न सक्छ।"</string>
<string name="keywords_vr_listener" msgid="7441221822576384680">"vr भर्चुअल रियालिटी श्रोता स्टेरियो सहायक सेवा"</string>
- <string name="keywords_system_alert_window" msgid="5049498015597864850">"प्रणाली अलर्ट विन्डो संवाद माथिपट्टि देखिने अन्य अनुप्रयोगहरू"</string>
<string name="overlay_settings" msgid="6930854109449524280">"अन्य एपहरूको माथिपट्टि देखाउनु"</string>
<string name="system_alert_window_summary" msgid="602892301318324492">"<xliff:g id="COUNT_1">%2$d</xliff:g> मध्ये <xliff:g id="COUNT_0">%1$d</xliff:g> एपहरूलाई अन्य एपको माथिपट्टि देखिने अनुमति दिइएको छ"</string>
<string name="filter_overlay_apps" msgid="6965969283342557573">"अनुमतिसहित अनुप्रयोगहरू"</string>
@@ -4125,7 +4122,6 @@
<string name="notification_log_details_none" msgid="184131801230614059">"कुनै पनि होइन"</string>
<string name="notification_log_details_ranking_null" msgid="244660392058720919">"वर्गीकरण सम्बन्धी वस्तु उपलब्ध छैन।"</string>
<string name="notification_log_details_ranking_none" msgid="599607025882587844">"वर्गीकरण सम्बन्धी वस्तुमा यो साँचो छैन।"</string>
- <string name="theme_customization_category" msgid="1049181544004163283">"विषयवस्तु"</string>
<string name="theme_customization_device_default" msgid="5058147707906551368">"पूर्वनिर्धारित यन्त्र"</string>
<string name="display_cutout_emulation" msgid="7466869822418376317">"प्रदर्शनसम्बन्धी कटआउट"</string>
<string name="display_cutout_emulation_keywords" msgid="4495418317471622562">"प्रदर्शनसम्बन्धी कटआउट, नच"</string>
@@ -4551,6 +4547,8 @@
<string name="network_connection_errorstate_dialog_message" msgid="6953778550775646710">"केही चिज गडबड भयो। यो अनुप्रयोगले कुनै यन्त्र छनौट गर्नेसम्बन्धी अनुरोध रद्द गरेको छ।"</string>
<string name="network_connection_connect_successful" msgid="5935510954474494928">"सफलतापूर्वक जोडियो"</string>
<string name="network_connection_request_dialog_showall" msgid="6938922880244567521">"सबै देखाउनुहोस्"</string>
+ <string name="network_connection_searching_message" msgid="4638576789450817530">"यन्त्र खोज्दै…"</string>
+ <string name="network_connection_connecting_message" msgid="3740982406609245654">"यन्त्रसँग जोडिँदै…"</string>
<plurals name="show_bluetooth_devices" formatted="false" msgid="1715020480026568408">
<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>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index b3f8e7b4..20717f8 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -360,8 +360,6 @@
<string name="security_enable_widgets_disabled_summary" msgid="6392489775303464905">"Uitgeschakeld door beheerder"</string>
<string name="lockdown_settings_title" msgid="7393790212603280213">"Lockdown-optie weergeven"</string>
<string name="lockdown_settings_summary" msgid="4359438673563318171">"Optie voor aan/uit-knop weergeven waarmee Smart Lock, biometrische ontgrendeling en meldingen op het vergrendelingsscherm worden uitgeschakeld"</string>
- <string name="trust_agents_extend_unlock_title" msgid="2796555263565097031">"Ontgrendelen verlengen voor trust agents"</string>
- <string name="trust_agents_extend_unlock_summary" msgid="3976344969220255010">"Indien ingeschakeld houden trust agents je apparaat langer ontgrendeld, maar hiermee kan een vergrendeld apparaat niet meer worden ontgrendeld."</string>
<string name="trust_lost_locks_screen_title" msgid="2992742466966021682">"Scherm vergr. als vertrouwen kwijt is"</string>
<string name="trust_lost_locks_screen_summary" msgid="693784434582021206">"Indien ingeschakeld, wordt het apparaat vergrendeld wanneer de laatste trust agent het vertrouwen kwijtraakt"</string>
<string name="owner_info_settings_summary" msgid="7472393443779227052">"Geen"</string>
@@ -937,6 +935,7 @@
<string name="wifi_eap_identity" msgid="4359453783379679103">"Identiteit"</string>
<string name="wifi_eap_anonymous" msgid="2989469344116577955">"Anonieme identiteit"</string>
<string name="wifi_password" msgid="5948219759936151048">"Wachtwoord"</string>
+ <string name="wifi_sae_password_id" msgid="1697832722221765763">"SAE-wachtwoord-ID"</string>
<string name="wifi_show_password" msgid="6461249871236968884">"Wachtwoord weergeven"</string>
<string name="wifi_ap_band_config" msgid="1611826705989117930">"Frequentieband voor toegangspunt selecteren"</string>
<string name="wifi_ap_choose_auto" msgid="2677800651271769965">"Automatisch"</string>
@@ -957,7 +956,6 @@
<string name="wifi_dpp_share_wifi" msgid="9065890131734833809">"Wifi delen"</string>
<string name="wifi_dpp_scan_qr_code_with_another_device" msgid="5854392840857123065">"Scan deze QR-code om verbinding te maken met \'<xliff:g id="SSID">%1$s</xliff:g>\' en het wachtwoord te delen"</string>
<string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="4436318319178361543">"Scan deze QR-code om verbinding te maken met \'<xliff:g id="SSID">%1$s</xliff:g>\'"</string>
- <string name="wifi_dpp_could_not_detect_valid_qr_code" msgid="641893675646330576">"Kan QR-code niet lezen. Centreer de code en probeer het opnieuw."</string>
<string name="wifi_dpp_failure_authentication_or_configuration" msgid="3372757783382381044">"Probeer het nog eens. Als het probleem zich blijft voordoen, neem je contact op met de fabrikant van het apparaat."</string>
<string name="wifi_dpp_failure_not_compatible" msgid="2829930473520603740">"Er is iets misgegaan"</string>
<string name="wifi_dpp_failure_timeout" msgid="5228320772245820458">"Controleer of het apparaat is aangesloten, opgeladen en ingeschakeld"</string>
@@ -980,6 +978,7 @@
<string name="wifi_dpp_hotspot_password" msgid="4120419278831581613">"Wachtwoord hotspot: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
<string name="wifi_dpp_add_device" msgid="4072206063308645677">"Apparaat toevoegen"</string>
<string name="wifi_dpp_connect_network_using_qr_code" msgid="3887335309163999665">"Gebruik een QR-code om een apparaat aan dit netwerk toe te voegen"</string>
+ <string name="wifi_dpp_qr_code_is_not_valid_format" msgid="3700087439867692944">"QR-code heeft geen geldige indeling"</string>
<string name="retry" msgid="6472609612090877557">"Opnieuw proberen"</string>
<string name="wifi_shared" msgid="844142443226926070">"Delen met andere apparaatgebruikers"</string>
<string name="wifi_unchanged" msgid="3410422020930397102">"(ongewijzigd)"</string>
@@ -1129,6 +1128,7 @@
<string name="emergency_address_title" msgid="932729250447887545">"Adres bij noodgevallen"</string>
<string name="emergency_address_summary" msgid="7751971156196115129">"Dit adres wordt gebruikt als je locatie wanneer je het noodnummer belt via wifi"</string>
<string name="private_dns_help_message" msgid="3299567069152568958"><annotation id="url">"Meer informatie"</annotation>" over privé-DNS-functies"</string>
+ <string name="private_dns_mode_on" msgid="5882613439541371003">"Aan"</string>
<string name="wifi_calling_pref_managed_by_carrier" msgid="6845711858866828986">"Instelling beheerd door provider"</string>
<string name="wifi_calling_settings_activation_instructions" msgid="7492509632478260955">"Bellen via wifi activeren"</string>
<string name="wifi_calling_turn_on" msgid="1171403510313983983">"Bellen via wifi inschakelen"</string>
@@ -1872,7 +1872,7 @@
<string name="default_emergency_app" msgid="1951760659640369980">"Nood-app"</string>
<string name="reset_app_preferences" msgid="1321050641018356925">"App-voorkeuren resetten"</string>
<string name="reset_app_preferences_title" msgid="6093179367325336662">"App-voorkeuren resetten?"</string>
- <string name="reset_app_preferences_desc" msgid="4822447731869201512">"Hiermee worden alle voorkeuren gereset voor:\n\n"<li>"Uitgeschakelde apps"</li>\n<li>"Uitgeschakelde app-meldingen"</li>\n<li>"Standaardapps voor acties"</li>\n<li>"Beperkingen voor achtergrondgegevens voor apps"</li>\n<li>"Rechtenbeperkingen"</li>\n\n"Je verliest geen app-gegevens."</string>
+ <string name="reset_app_preferences_desc" msgid="731757609326016760">"Hiermee worden alle voorkeuren gereset voor:\n\n"<li>"Uitgeschakelde apps"</li>\n<li>"Uitgeschakelde app-meldingen"</li>\n<li>"Standaardapps voor acties"</li>\n<li>"Beperkingen voor achtergrondgegevens voor apps"</li>\n<li>"Rechtenbeperkingen"</li>\n\n"Je verliest geen app-gegevens."</string>
<string name="reset_app_preferences_button" msgid="2559089511841281242">"Apps resetten"</string>
<string name="manage_space_text" msgid="8852711522447794676">"Ruimte beheren"</string>
<string name="filter" msgid="2018011724373033887">"Filter"</string>
@@ -2087,7 +2087,7 @@
<string name="accessibility_screen_magnification_short_summary" msgid="3411979839172752057">"Tik drie keer om te zoomen"</string>
<string name="accessibility_screen_magnification_navbar_short_summary" msgid="3693116360267980492">"Zoomen door te tikken op een knop"</string>
<string name="accessibility_screen_magnification_summary" msgid="5258868553337478505"><b>"Als je wilt inzoomen"</b>", tik je drie keer snel achter elkaar op het scherm.\n"<ul><li>"Veeg met twee of meer vingers om te scrollen"</li>\n<li>"Knijp twee of meer vingers samen om te zoomen"</li></ul>\n\n<b>"Als je tijdelijk wilt zoomen"</b>", tik je drie keer snel achter elkaar op het scherm en houd je het scherm vast bij de derde tik.\n"<ul><li>"Sleep om een ander deel van het scherm weer te geven"</li>\n<li>"Haal je vinger van het scherm om uit te zoomen"</li></ul>\n\n"Je kunt niet inzoomen op het toetsenbord of de navigatiebalk."</string>
- <string name="accessibility_screen_magnification_navbar_summary" msgid="2272878354599332009">"Wanneer vergroting is ingeschakeld, kun je inzoomen op het scherm.\n\n"<b>"Als je wilt zoomen"</b>", start je de vergroting en tik je ergens op het scherm.\n"<ul><li>"• Sleep met twee of meer vingers om te scrollen"</li>\n<li>"• Knijp twee of meer vingers samen om het zoomniveau aan te passen"</li></ul>\n\n<b>"Als je tijdelijk wilt zoomen"</b>", start je de vergroting, tik je ergens op het scherm en houd je dit vast.\n"<ul><li>"• Sleep om over het scherm te bewegen"</li>\n<li>"• Til je vinger op om uit te zoomen"</li></ul>\n\n"Je kunt niet inzoomen op het toetsenbord of de navigatiebalk."</string>
+ <string name="accessibility_screen_magnification_navbar_summary" msgid="6700716275347612310">"Wanneer vergroting is ingeschakeld, kun je op je scherm het beeld vergroten.\n\n"<b>"Als je wilt inzoomen"</b>", start je de vergroting en tik je waar dan ook op het scherm.\n"<ul><li>"Veeg met twee of meer vingers om te scrollen."</li>\n<li>"Knijp twee of meer vingers samen om de zoom aan te passen."</li></ul>\n\n<b>"Als je tijdelijk wilt zoomen"</b>", start je de vergroting, waarna je ergens op het scherm tikt en vasthoudt.\n"<ul><li>"Sleep om een ander deel van het scherm weer te geven."</li>\n<li>"Haal je vinger van het scherm om uit te zoomen."</li></ul>\n\n"Je kunt niet inzoomen op het toetsenbord of de navigatiebalk."</string>
<string name="accessibility_tutorial_dialog_title_button" msgid="3682222614034474845">"Toegankelijkheidsknop gebruiken om te openen"</string>
<string name="accessibility_tutorial_dialog_title_gesture" msgid="1342726230497913398">"Gebaar gebruiken om te openen"</string>
<string name="accessibility_tutorial_dialog_title_gesture_settings" msgid="8539392614235820285">"Nieuw toegankelijkheidsgebaar gebruiken"</string>
@@ -2140,8 +2140,7 @@
<string name="accessibility_hearingaid_title" msgid="8312145423610648518">"Gehoorapparaten"</string>
<string name="accessibility_hearingaid_not_connected_summary" msgid="6240237523789614599">"Geen gehoorapparaten verbonden"</string>
<string name="accessibility_hearingaid_adding_summary" msgid="2947474468412309778">"Gehoorapparaten toevoegen"</string>
- <string name="accessibility_hearingaid_pair_instructions_first_message" msgid="3912093691643131154">"Tik op het volgende scherm op je gehoorapparaat om dit te koppelen."</string>
- <string name="accessibility_hearingaid_pair_instructions_second_message" msgid="5596683393607650243">"Controleer of je gehoorapparaat zich in de koppelingsmodus bevindt."</string>
+ <string name="accessibility_hearingaid_pair_instructions_message" msgid="3094382949733435414">"Als je je gehoorapparaten wilt koppelen, zoek je op het volgende scherm naar je apparaat en tik je erop. Controleer of je gehoorapparaat zich in de koppelingsmodus bevindt."</string>
<string name="accessibility_hearingaid_active_device_summary" msgid="3924362383258688984">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> actief"</string>
<plurals name="show_number_hearingaid_count" formatted="false" msgid="3160782397139295486">
<item quantity="other"><xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> opgeslagen gehoorapparaten</item>
@@ -2490,7 +2489,6 @@
<string name="menu_stats_last_unplugged" msgid="5922246077592434526">"Sinds laatst losgekoppeld voor <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
<string name="menu_stats_total" msgid="8973377864854807854">"Gebruikstotalen"</string>
<string name="menu_stats_refresh" msgid="1676215433344981075">"Vernieuwen"</string>
- <string name="process_kernel_label" msgid="3916858646836739323">"Android-besturingssysteem"</string>
<string name="process_mediaserver_label" msgid="6500382062945689285">"Mediaserver"</string>
<string name="process_dex2oat_label" msgid="2592408651060518226">"App-optimalisatie"</string>
<string name="battery_saver" msgid="8172485772238572153">"Batterijbesparing"</string>
@@ -2621,8 +2619,6 @@
<string name="no_device_admins" msgid="4846602835339095768">"Geen apparaatbeheer-apps beschikbaar"</string>
<string name="personal_device_admin_title" msgid="2849617316347669861">"Persoonlijk"</string>
<string name="managed_device_admin_title" msgid="7853955652864478435">"Werk"</string>
- <string name="sms_access_restriction_enabled" msgid="7054488078710530278">"Toegang tot sms- en gesprekslijst beperken"</string>
- <string name="sms_access_restriction_enabled_summary" msgid="6851339654677842328">"Alleen standaard telefoon- en berichten-apps beschikken over rechten voor de sms- en gesprekslijst"</string>
<string name="no_trust_agents" msgid="7450273545568977523">"Geen beschikbare trust-agents"</string>
<string name="add_device_admin_msg" msgid="1501847129819382149">"Apparaatbeheer-app activeren?"</string>
<string name="add_device_admin" msgid="4192055385312215731">"Deze apparaatbeheer-app activeren"</string>
@@ -3111,7 +3107,7 @@
<string name="keywords_app_default" msgid="5822717006354487071">"Openen met"</string>
<string name="keywords_applications_settings" msgid="1268353611121497450">"Apps"</string>
<string name="keywords_time_zone" msgid="998254736898753085">"tijdzone"</string>
- <string name="keywords_draw_overlay" msgid="4130899177619041842">"Chat vooraan"</string>
+ <string name="keywords_draw_overlay" msgid="1001120206241401007">"Chathead, systeem, melding, venster, dialoogvenster, weergeven, over andere apps, tekenen"</string>
<string name="keywords_flashlight" msgid="6161632177705233710">"Zaklamp, lamp, licht, lampje"</string>
<string name="keywords_change_wifi_state" msgid="627068244033681010">"wifi, wi-fi, schakelen, inschakelen, uitschakelen, beheren"</string>
<string name="keywords_more_mobile_networks" msgid="8995946622054642367">"mobiel, gsm, provider, draadloos, gegevens, data, 4g, 3g, 2g, lte"</string>
@@ -3135,7 +3131,7 @@
<string name="keywords_sounds_and_notifications_interruptions" msgid="5426093074031208917">"niet storen, verstoren, onderbreking, storing"</string>
<string name="keywords_app" msgid="6334757056536837791">"RAM"</string>
<string name="keywords_location" msgid="4132655528196729043">"in de buurt, locatie, geschiedenis, rapportage, gps"</string>
- <string name="keywords_accounts" msgid="1957925565953357627">"account"</string>
+ <string name="keywords_accounts" msgid="4479029747403203867">"account, account toevoegen, werkprofiel"</string>
<string name="keywords_users" msgid="3434190133131387942">"beperking, beperken, beperkt"</string>
<string name="keywords_keyboard_and_ime" msgid="9143339015329957107">"tekstcorrectie, corrigeren, geluid, trillen, automatisch, taal, gebaar, voorstellen, suggestie, thema, aanstootgevend, woord, typen, emoji, internationaal"</string>
<string name="keywords_reset_apps" msgid="5293291209613191845">"resetten, herstellen, voorkeuren, standaard"</string>
@@ -3173,6 +3169,7 @@
<string name="keywords_storage_settings" msgid="297283751968446577">"geheugen, cache, gegevens, wissen, verwijderen, vrij, vrijmaken, ruimte"</string>
<string name="keywords_bluetooth_settings" msgid="6804844062789439858">"verbonden, apparaat, hoofdtelefoon, koptelefoon, headset, speaker, luidspreker, draadloos, koppelen, oordoppen, oordopjes, muziek, media"</string>
<string name="keywords_wallpaper" msgid="5058364390917429896">"achtergrond, scherm, vergrendelingsscherm, thema"</string>
+ <string name="keywords_styles" msgid="5828725481814049422">"pictogramvorm, accentkleur, lettertype"</string>
<string name="keywords_assist_input" msgid="5017533309492679287">"standaard, assistent"</string>
<string name="keywords_default_payment_app" msgid="3838565809518896799">"betaling, standaard"</string>
<string name="keywords_ambient_display" msgid="3103487805748659132">"binnenkomende melding"</string>
@@ -3182,7 +3179,7 @@
<string name="keywords_notification_vibration" msgid="31924624421190547">"haptische feedback, trillen, gevoeligheid"</string>
<string name="keywords_battery_saver_sticky" msgid="5586215686021650278">"batterijbesparing, sticky, actief blijven, energiebesparing, batterij"</string>
<string name="keywords_battery_saver_schedule" msgid="7358789228486231944">"routine, planning, batterijbesparing, energiebesparing, batterij, automatisch, procent"</string>
- <string name="keywords_add_an_account" msgid="6488139919428902434">"werkprofiel"</string>
+ <string name="keywords_enhance_4g_lte" msgid="2273810564244790859">"volte, geavanceerd bellen, bellen via 4G"</string>
<string name="default_sound" msgid="8821684447333687810">"Standaardgeluid"</string>
<string name="sound_settings_summary" msgid="4100853606668287965">"Ringtonevolume op <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
<string name="sound_dashboard_summary" msgid="3402435125958012986">"Volume, trillen, niet storen"</string>
@@ -3889,7 +3886,6 @@
<string name="permit_draw_overlay" msgid="7456536798718633432">"Weergeven vóór andere apps toestaan"</string>
<string name="allow_overlay_description" msgid="8961670023925421358">"Deze app toestaan op de voorgrond te worden weergegeven vóór andere apps die je gebruikt. Dit kan je gebruik van die apps verstoren of de manier wijzigen waarop die apps worden weergegeven of zich gedragen."</string>
<string name="keywords_vr_listener" msgid="7441221822576384680">"vr virtual reality listener stereo helperservice"</string>
- <string name="keywords_system_alert_window" msgid="5049498015597864850">"systeemmelding venster dialoogvenster weergeven over andere apps"</string>
<string name="overlay_settings" msgid="6930854109449524280">"Weergeven vóór andere apps"</string>
<string name="system_alert_window_summary" msgid="602892301318324492">"<xliff:g id="COUNT_0">%1$d</xliff:g> van <xliff:g id="COUNT_1">%2$d</xliff:g> apps mogen worden weergegeven vóór andere apps"</string>
<string name="filter_overlay_apps" msgid="6965969283342557573">"Apps met toestemming"</string>
@@ -4125,7 +4121,6 @@
<string name="notification_log_details_none" msgid="184131801230614059">"geen"</string>
<string name="notification_log_details_ranking_null" msgid="244660392058720919">"Rangschikkingsobject ontbreekt"</string>
<string name="notification_log_details_ranking_none" msgid="599607025882587844">"Rangschikkingsobject bevat deze sleutel niet."</string>
- <string name="theme_customization_category" msgid="1049181544004163283">"Thema\'s"</string>
<string name="theme_customization_device_default" msgid="5058147707906551368">"Apparaatstandaard"</string>
<string name="display_cutout_emulation" msgid="7466869822418376317">"Display-cutout"</string>
<string name="display_cutout_emulation_keywords" msgid="4495418317471622562">"display-cutout, inkeping"</string>
@@ -4551,6 +4546,8 @@
<string name="network_connection_errorstate_dialog_message" msgid="6953778550775646710">"Er is een probleem opgetreden. De app heeft het verzoek om een apparaat te kiezen geannuleerd."</string>
<string name="network_connection_connect_successful" msgid="5935510954474494928">"Verbinding gemaakt"</string>
<string name="network_connection_request_dialog_showall" msgid="6938922880244567521">"Alles tonen"</string>
+ <string name="network_connection_searching_message" msgid="4638576789450817530">"Zoeken naar apparaat…"</string>
+ <string name="network_connection_connecting_message" msgid="3740982406609245654">"Verbinding maken met apparaat…"</string>
<plurals name="show_bluetooth_devices" formatted="false" msgid="1715020480026568408">
<item quantity="other"><xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> verbonden apparaten</item>
<item quantity="one"><xliff:g id="NUMBER_DEVICE_COUNT_0">%1$d</xliff:g> verbonden apparaat</item>
diff --git a/res/values-or/strings.xml b/res/values-or/strings.xml
index d961e6b..17b200e 100644
--- a/res/values-or/strings.xml
+++ b/res/values-or/strings.xml
@@ -359,8 +359,6 @@
<string name="security_enable_widgets_disabled_summary" msgid="6392489775303464905">"ଆଡମିନଙ୍କ ଦ୍ଵାରା ଅକ୍ଷମ କରାଯାଇଛି"</string>
<string name="lockdown_settings_title" msgid="7393790212603280213">"ଲକ୍ କରିବା ବିକଳ୍ପକୁ ଦେଖାନ୍ତୁ"</string>
<string name="lockdown_settings_summary" msgid="4359438673563318171">"ପାୱର୍ ବଟନ୍ ବିକଳ୍ପକୁ ଡିସପ୍ଲେ କରନ୍ତୁ ଯାହା ସ୍ମାର୍ଟ ଲକ୍, ବାୟୋମେଟ୍ରିକ୍ ସାହାଯ୍ୟରେ ଅନ୍ଲକ୍ କରିବା ଓ ଲକ୍ ସ୍କ୍ରିନ୍ରେ ବିଜ୍ଞପ୍ତିର ପ୍ରଦର୍ଶନକୁ ବନ୍ଦ କରିବ"</string>
- <string name="trust_agents_extend_unlock_title" msgid="2796555263565097031">"କେବଳ ଟ୍ରଷ୍ଟ୍ ଏଜେଣ୍ଟଙ୍କ ପାଇଁ ଏକ୍ସଟେଣ୍ଡ୍ ଅନଲକ୍"</string>
- <string name="trust_agents_extend_unlock_summary" msgid="3976344969220255010">"ଯଦି ସକ୍ଷମ କରାଯାଇଥାଏ, ଟ୍ରଷ୍ଟ ଏଜେଣ୍ଟ ଆପଣଙ୍କ ଡିଭାଇସ୍କୁ ବେଶୀ ସମୟ ପାଇଁ ଅନ୍ଲକ୍ ରଖିବ, କିନ୍ତୁ ଏକ ଲକ୍ କରାଯାଇଥିବା ଡିଭାଇସ୍କୁ ଆଉ ଅନ୍ଲକ୍ କରିପାରିବ ନାହିଁ।"</string>
<string name="trust_lost_locks_screen_title" msgid="2992742466966021682">"ବିଶ୍ୱାସ ହରାଇଲେ ସ୍କ୍ରିନ୍ ଲକ୍ ହୋଇଯିବ"</string>
<string name="trust_lost_locks_screen_summary" msgid="693784434582021206">"ଯଦି ସକ୍ଷମ କରାଯାଇଥାଏ,ଗତଥରର ଟ୍ରଷ୍ଟ ଏଜେଣ୍ଟ ବିଶ୍ୱାସ ହରାଇଲେ ଡିଭାଇସ୍ଟି ଲକ୍ ହୋଇଯିବ"</string>
<string name="owner_info_settings_summary" msgid="7472393443779227052">"କିଛି ନୁହେଁ"</string>
@@ -936,6 +934,8 @@
<string name="wifi_eap_identity" msgid="4359453783379679103">"ପରିଚୟ"</string>
<string name="wifi_eap_anonymous" msgid="2989469344116577955">"ଅଜ୍ଞାତ ପରିଚୟ"</string>
<string name="wifi_password" msgid="5948219759936151048">"ପାସ୍ୱର୍ଡ"</string>
+ <!-- no translation found for wifi_sae_password_id (1697832722221765763) -->
+ <skip />
<string name="wifi_show_password" msgid="6461249871236968884">"ପାସ୍ୱର୍ଡ ଦେଖାନ୍ତୁ"</string>
<string name="wifi_ap_band_config" msgid="1611826705989117930">"AP ବ୍ୟାଣ୍ଡ ବାଛନ୍ତୁ"</string>
<string name="wifi_ap_choose_auto" msgid="2677800651271769965">"ସ୍ୱତଃ"</string>
@@ -956,7 +956,6 @@
<string name="wifi_dpp_share_wifi" msgid="9065890131734833809">"ୱାଇ-ଫାଇ ସେୟାର୍ କରନ୍ତୁ"</string>
<string name="wifi_dpp_scan_qr_code_with_another_device" msgid="5854392840857123065">"“<xliff:g id="SSID">%1$s</xliff:g>” ସହ ସଂଯୋଗ କରିବାକୁ ଏହି QR କୋଡ୍ ସ୍କାନ୍ କରନ୍ତୁ ଏବଂ ପାସୱାର୍ଡ ସେୟାର୍ କରନ୍ତୁ"</string>
<string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="4436318319178361543">"“<xliff:g id="SSID">%1$s</xliff:g>”କୁ ସଂଯୋଗ କରିବାକୁ ଏହି QR କୋଡ୍ ସ୍କାନ୍ କରନ୍ତୁ"</string>
- <string name="wifi_dpp_could_not_detect_valid_qr_code" msgid="641893675646330576">"QR କୋଡ୍କୁ ପଢ଼ି ପାରୁ ନାହିଁ। କୋଡ୍ ପୁନଃ-କେନ୍ଦ୍ରିତ କରି ପୁଣି ଚେଷ୍ଟା କରନ୍ତୁ"</string>
<string name="wifi_dpp_failure_authentication_or_configuration" msgid="3372757783382381044">"ପୁଣି ଚେଷ୍ଟା କରନ୍ତୁ। ଯଦି ସମସ୍ୟା ଜାରି ରୁହେ, ଡିଭାଇସ୍ର ନିର୍ମାତାଙ୍କୁ ଯୋଗାଯୋଗ କରନ୍ତୁ"</string>
<string name="wifi_dpp_failure_not_compatible" msgid="2829930473520603740">"କିଛି ଭୁଲ ହୋଇଗଲା"</string>
<string name="wifi_dpp_failure_timeout" msgid="5228320772245820458">"ଡିଭାଇସ୍ ପ୍ଲଗ୍ ଇନ୍, ଚାର୍ଜ, ଏବଂ ଚାଲୁ ରହିଥିବା ସୁନିଶ୍ଚିତ ହୁଅନ୍ତୁ"</string>
@@ -979,6 +978,7 @@
<string name="wifi_dpp_hotspot_password" msgid="4120419278831581613">"ହଟସ୍ପଟ୍ ପାସ୍ୱର୍ଡ: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
<string name="wifi_dpp_add_device" msgid="4072206063308645677">"ଡିଭାଇସ୍ ଯୋଗ କରନ୍ତୁ"</string>
<string name="wifi_dpp_connect_network_using_qr_code" msgid="3887335309163999665">"ଏହି ନେଟ୍ୱାର୍କରେ ଏକ ଡିଭାଇସ୍ ଯୋଗ କରିବା ପାଇଁ ଏକ QR କୋଡ୍ ବ୍ୟବହାର କରନ୍ତୁ"</string>
+ <string name="wifi_dpp_qr_code_is_not_valid_format" msgid="3700087439867692944">"QR କୋଡ୍ ଏକ ବୈଧ ଫର୍ମାଟ୍ ନୁହେଁ"</string>
<string name="retry" msgid="6472609612090877557">"ପୁନଃଚେଷ୍ଟା କରନ୍ତୁ"</string>
<string name="wifi_shared" msgid="844142443226926070">"ଅନ୍ୟାନ୍ୟ ଡିଭାଇସ୍ ଉପଯୋଗକର୍ତ୍ତାଙ୍କ ସହ ସେୟାର୍ କରନ୍ତୁ"</string>
<string name="wifi_unchanged" msgid="3410422020930397102">"(ଅପରିବର୍ତ୍ତିତ)"</string>
@@ -1128,6 +1128,7 @@
<string name="emergency_address_title" msgid="932729250447887545">"ଜରୁରୀକାଳୀନ ଠିକଣା"</string>
<string name="emergency_address_summary" msgid="7751971156196115129">"ୱାଇ-ଫାଇ ମାଧ୍ୟମରେ ଆପଣ କୌଣସି ଆପାତକାଳୀନ କଲ୍ କରିବା ବେଳେ ଆପଣଙ୍କ ଲୋକେସନ୍ ରୂପେ ବ୍ୟବହୃତ ହୋଇଥାଏ"</string>
<string name="private_dns_help_message" msgid="3299567069152568958"><annotation id="url">"ବ୍ୟକ୍ତିଗତ DNS ବୈଶିଷ୍ଟ୍ୟ ବିଷୟରେ"</annotation>" ଅଧିକ ଜାଣନ୍ତୁ"</string>
+ <string name="private_dns_mode_on" msgid="5882613439541371003">"ଚାଲୁ ଅଛି"</string>
<string name="wifi_calling_pref_managed_by_carrier" msgid="6845711858866828986">"ସେଟିଙ୍ଗ, କେରିଅର୍ଙ୍କ ଦ୍ଵାରା ପରିଚାଳିତ ହେଉଛି"</string>
<string name="wifi_calling_settings_activation_instructions" msgid="7492509632478260955">"ୱାଇ-ଫାଇ କଲିଙ୍ଗକୁ ସକ୍ରିୟ କରନ୍ତୁ"</string>
<string name="wifi_calling_turn_on" msgid="1171403510313983983">"ୱାଇ-ଫାଇ କଲିଙ୍ଗ ଚାଲୁ କରନ୍ତୁ"</string>
@@ -1871,7 +1872,7 @@
<string name="default_emergency_app" msgid="1951760659640369980">"ଜରୁରୀକାଳୀନ ଆପ୍"</string>
<string name="reset_app_preferences" msgid="1321050641018356925">"ଆପ୍ ପସନ୍ଦ ରିସେଟ୍ କରନ୍ତୁ"</string>
<string name="reset_app_preferences_title" msgid="6093179367325336662">"ଆପ୍ ପସନ୍ଦଗୁଡ଼ିକୁ ରିସେଟ୍ କରିବେ?"</string>
- <string name="reset_app_preferences_desc" msgid="4822447731869201512">"ଏହା ନିମ୍ନରେ ଥିବା ସମସ୍ତ ପସନ୍ଦକୁ ରିସେଟ୍ କରିବ:\n\n"<li>"ଅକ୍ଷମ କରାଯାଇଥିବା ଆପ୍"</li>\n<li>"ଅକ୍ଷମ କରାଯାଇଥିବା ଆପ୍ ବିଜ୍ଞପ୍ତି"</li>\n<li>"କାର୍ଯ୍ୟ କରିବା ପାଇଁ ଡିଫଲ୍ଟ ଆପ୍ଲିକେସନ୍"</li>\n<li>"ଆପ୍ ପାଇଁ ବ୍ୟାକ୍ଗ୍ରାଉଣ୍ଡ ଡାଟା ପ୍ରତିବନ୍ଧକ"</li>\n<li>"ଯେକୌଣସି ଅନୁମତି ପ୍ରତିବନ୍ଧକ"</li>\n\n"ଆପଣ କୌଣସି ଆପ୍ ଡାଟା ହରାଇବେ ନାହିଁ।"</string>
+ <string name="reset_app_preferences_desc" msgid="731757609326016760">"ଏଥି ପାଇଁ ଏହା ଆପଣଙ୍କ ସମସ୍ତ ଅଗ୍ରାଧିକାରଗୁଡ଼ିକୁ ରିସେଟ୍ କରିବ:\n\n"<li>" ଅକ୍ଷମ କରାଯାଇଥିବା ଆପ୍ସ"</li>\n<li>" ଅକ୍ଷମ କରାଯାଇଥିବା ଆପ୍ ବିଜ୍ଞପ୍ତିଗୁଡ଼ିକ"</li>\n<li>" କାର୍ଯ୍ୟ ପାଇଁ ଡିଫଲ୍ଟ ଆପ୍ଲିକେସନ୍ଗୁଡ଼ିକ"</li>\n<li>"ଆପ୍ସ ପାଇଁ ପୃଷ୍ଠଭୂମି ଡାଟା ପ୍ରତିବନ୍ଧଗୁଡ଼ିକ"</li>\n<li>"ଯେ କୌଣସି ଅନୁମତି ପ୍ରତିବନ୍ଧ"</li>\n\n"ଆପଣ କୌଣସି ଆପ୍ ଡାଟା ହରାଇବେ ନାହିଁ।"</string>
<string name="reset_app_preferences_button" msgid="2559089511841281242">"ଆପ୍ଗୁଡ଼ିକୁ ରିସେଟ୍ କରନ୍ତୁ"</string>
<string name="manage_space_text" msgid="8852711522447794676">"ସ୍ଥାନ ପରିଚାଳନା କରନ୍ତୁ"</string>
<string name="filter" msgid="2018011724373033887">"ଫିଲ୍ଟର୍"</string>
@@ -2086,7 +2087,7 @@
<string name="accessibility_screen_magnification_short_summary" msgid="3411979839172752057">"ଜୁମ୍ କରିବାକୁ 3ଥର ଟାପ୍ କରନ୍ତୁ"</string>
<string name="accessibility_screen_magnification_navbar_short_summary" msgid="3693116360267980492">"ଜୁମ୍ କରିବା ପାଇଁ ଗୋଟିଏ ବଟନ୍ ଉପରେ ଟାପ୍ କରନ୍ତୁ"</string>
<string name="accessibility_screen_magnification_summary" msgid="5258868553337478505"><b>"ଜୁମ୍ କରିବାକୁ"</b>", ସ୍କ୍ରିନ୍ 3 ଥର ଦ୍ରୁତ ଭାବେ ଟାପ୍ କରନ୍ତୁ।\n"<ul><li>"ସ୍କ୍ରୋଲ୍ କରିବାକୁ 2 କିମ୍ବା ଅଧିକ ଆଙ୍ଗୁଠି ଟାଣନ୍ତୁ"</li>\n<li>"ଜୁମ୍ ଆଡଜଷ୍ଟ କରିବାକୁ 2 କିମ୍ବା ଅଧିକ ଆଙ୍ଗୁଠି ଚିମୁଟା ପରି ବ୍ୟବହାର କରନ୍ତୁ"</li></ul>\n\n<b>"ସାମୟିକ ଭାବେ ଜୁମ୍ କରିବାକୁ"</b>", ସ୍କ୍ରିନ୍ 3 ଥର ଦ୍ରୁତ ଭାବେ ଟାପ୍ କରନ୍ତୁ ଏବଂ 3 ନମ୍ବର ଟାପ୍ରେ ଆପଣଙ୍କ ଆଙ୍ଗୁଠିକୁ ତଳକୁ କରି ରଖନ୍ତୁ।\n"<ul><li>"ସ୍କ୍ରିନ୍ ଚାରିପାଖେ ବୁଲିବାକୁ ଡ୍ରାଗ୍ କରନ୍ତୁ"</li>\n<li>"ଜୁମ୍ ଆଉଟ୍ କରିବାକୁ ଆଙ୍ଗୁଠି ବାହାର କରି ଦିଅନ୍ତୁ"</li></ul>\n\n"କୀବୋର୍ଡ କିମ୍ବା ନେଭିଗେସନ୍ ବାର୍ରେ ଆପଣ ଜୁମ୍ ଇନ୍ କରିପାରିବେ ନାହିଁ।"</string>
- <string name="accessibility_screen_magnification_navbar_summary" msgid="2272878354599332009">"ଯେତେବେଳେ ମ୍ୟାଗ୍ନିଫିକେସନ୍ ଚାଲୁ କରାଯାଏ, ସେତେବେଳେ ଆପଣ ଆପଣଙ୍କର ସ୍କ୍ରିନ୍ର ଜୁମ୍ ଇନ୍ କରିପାରିବେ।\n\n"<b>"ଜୁମ୍ କରିବା ପାଇଁ"</b>", ମ୍ୟାଗ୍ନିଫିକେସନ୍ ଆରମ୍ଭ କରନ୍ତୁ, ଏହା ପରେ ସ୍କ୍ରିନ୍ର ଯେ କୌଣସି ସ୍ଥାନରେ ଟାପ୍ କରନ୍ତୁ।\n"<ul><li>"• ସ୍କ୍ରୋଲ୍ କରିବା ପାଇଁ 2 ବା ଅଧିକ ଆଙ୍ଗୁଠିରେ ଟାଣନ୍ତୁ"</li>\n<li>"• ଜୁମ୍ ଆଡ୍ଜଷ୍ଟ କରିବା ପାଇଁ 2 ବା ଅଧିକ ଆଙ୍ଗୁଠିରେ ପିଞ୍ଚ କରନ୍ତୁ"</li></ul>\n\n<b>"ଅସ୍ଥାୟୀ ଭାବେ ଜୁମ୍ କରିବା ପାଇଁ"</b>", ମ୍ୟାଗ୍ନିଫିକେସନ୍ ଆରମ୍ଭ କରନ୍ତୁ, ଏହା ପରେ ସ୍କ୍ରିନ୍ର ଯେ କୌଣସି ସ୍ଥାନରେ ଦାବି ଧରନ୍ତୁ \n"<ul><li>"• ସ୍କ୍ରିନ୍ର ସବୁ ଆଡେ ଯିବା ପାଇଁ ଟାଣନ୍ତୁ"</li>\n<li>"• ଜୁମ୍ ଆଉଟ୍ କରିବା ପାଇଁ ଆଙ୍ଗୁଠି ଉଠାନ୍ତୁ"</li></ul>\n\n"ଆପଣ କୀବୋର୍ଡ ବା ନାଭିଗେସନ୍ ବାର୍ରେ ଜୁମ୍ ଇନ୍ କରିପାରିବେ ନାହିଁ।"</string>
+ <string name="accessibility_screen_magnification_navbar_summary" msgid="6700716275347612310">"ମ୍ୟାଗ୍ନିଫିକେସନ୍ ଚାଲୁଥିବା ସମୟରେ, ଆପଣଙ୍କ ସ୍କ୍ରିନ୍ର ଜୁମ୍ ବଢ଼ାଇ ପାରିବେ।\n\n"<b>"ଜୁମ୍ କରିବାକୁ"</b>", ମ୍ୟାଗ୍ନିଫିକେସନ୍ ଆରମ୍ଭ କରନ୍ତୁ, ତା’ପରେ ସ୍କ୍ରିନ୍ର ଯେ କୌଣସି ସ୍ଥାନରେ ଟାପ୍ କରନ୍ତୁ।\n"<ul><li>"ସ୍କ୍ରୋଲ୍ କରିବାକୁ 2 ବା ଅଧିକ ଆଙ୍ଗୁଠିରେ ଟାଣନ୍ତୁ"</li>\n<li>"ଜୁମ୍ ଆଡ୍ଜଷ୍ଟ କରିବାକୁ 2 ବା ଅଧିକ ଆଙ୍ଗୁଠିରେ ପିଞ୍ଚ୍ କରନ୍ତୁ"</li></ul>\n\n<b>"ଅସ୍ଥାୟୀ ଭାବେ ଜୁମ୍ କରିବାକୁ"</b>", ମ୍ୟାଗ୍ନିଫିକେସନ୍ ଆରମ୍ଭ କରନ୍ତୁ, ତା’ପରେ ସ୍କ୍ରିନ୍ର ଯେ କୌଣସି ସ୍ଥାନରେ ସ୍ପର୍ଶ କରି ଧରି ରଖନ୍ତୁ।\n"<ul><li>"ସ୍କ୍ରିନ୍ର ଚାରିପଟରେ ଘୁଞ୍ଚାଇବାକୁ ଟାଣନ୍ତୁ"</li>\n<li>"ଜୁମ୍ କମାଇବାକୁ ଆଙ୍ଗୁଠି ବାହାର କରି ଦିଅନ୍ତୁ"</li></ul>\n\n"ଆପଣ କୀବୋର୍ଡ ବା ନେଭିଗେସନ୍ ବାର୍ ଉପରେ ଜୁମ୍ ବଢ଼ାଇ ପାରିବେ ନାହିଁ।"</string>
<string name="accessibility_tutorial_dialog_title_button" msgid="3682222614034474845">"ଖୋଲିବା ପାଇଁ ଆକ୍ସେସିବିଲିଟୀ ବଟନ୍ ବ୍ୟବହାର କରନ୍ତୁ"</string>
<string name="accessibility_tutorial_dialog_title_gesture" msgid="1342726230497913398">"ଖୋଲିବା ପାଇଁ ଜେଶ୍ଚର୍ ବ୍ୟବହାର କରନ୍ତୁ"</string>
<string name="accessibility_tutorial_dialog_title_gesture_settings" msgid="8539392614235820285">"ନୂଆ ଆକ୍ସେସିବିଲିଟୀ ଜେଶ୍ଚର୍ ବ୍ୟବହାର କରନ୍ତୁ"</string>
@@ -2139,8 +2140,7 @@
<string name="accessibility_hearingaid_title" msgid="8312145423610648518">"ଶ୍ରବଣ ଯନ୍ତ୍ର"</string>
<string name="accessibility_hearingaid_not_connected_summary" msgid="6240237523789614599">"କୌଣସି ଶ୍ରବଣ ଯନ୍ତ୍ର ସଂଯୋଗ ହୋଇନାହିଁ"</string>
<string name="accessibility_hearingaid_adding_summary" msgid="2947474468412309778">"ଶ୍ରବଣ ଯନ୍ତ୍ର ଯୋଗ କରନ୍ତୁ"</string>
- <string name="accessibility_hearingaid_pair_instructions_first_message" msgid="3912093691643131154">"ନିଜର ଶ୍ରବଣ ଯନ୍ତ୍ର ପେୟାର୍ କରିବା ପାଇଁ ପରବର୍ତ୍ତୀ ସ୍କ୍ରୀନ୍ରେ ଆପଣଙ୍କ ଡିଭାଇସ୍କୁ ଖୋଜି ତାହା ଉପରେ ଟାପ୍ କରନ୍ତୁ।"</string>
- <string name="accessibility_hearingaid_pair_instructions_second_message" msgid="5596683393607650243">"ଆପଣଙ୍କର ଶ୍ରବଣ ଯନ୍ତ୍ର ପେୟାରିଙ୍ଗ ମୋଡ୍ରେ ଥିବାର ସୁନିଶ୍ଚିତ କରନ୍ତୁ।"</string>
+ <string name="accessibility_hearingaid_pair_instructions_message" msgid="3094382949733435414">"ଆପଣଙ୍କର ଶ୍ରବଣ ଯନ୍ତ୍ର ପେୟାର୍ କରିବା ପାଇଁ ପରବର୍ତ୍ତୀ ସ୍କ୍ରିନ୍ରେ ଆପଣଙ୍କର ଡିଭାଇସ୍କୁ ଖୋଜି ତାହା ଉପରେ ଟାପ୍ କରନ୍ତୁ। ଆପଣଙ୍କର ଶ୍ରବଣ ଯନ୍ତ୍ର ପେଆରିଂ ମୋଡ୍ରେ ଥିବାର ସୁନିଶ୍ଚିତ କରନ୍ତୁ।"</string>
<string name="accessibility_hearingaid_active_device_summary" msgid="3924362383258688984">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ସକ୍ରିୟ ଅଛି"</string>
<plurals name="show_number_hearingaid_count" formatted="false" msgid="3160782397139295486">
<item quantity="other"><xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g>ଟି ସେଭ୍ ହୋଇଥିବା ଶ୍ରବଣ ଯନ୍ତ୍ର</item>
@@ -2489,7 +2489,6 @@
<string name="menu_stats_last_unplugged" msgid="5922246077592434526">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> ପାଇଁ ଶେଷଥର ପ୍ଲଗ୍ କଢାଯାଇଥିବାବେଳେ"</string>
<string name="menu_stats_total" msgid="8973377864854807854">"ସମୁଦାୟ ବ୍ୟବହାର"</string>
<string name="menu_stats_refresh" msgid="1676215433344981075">"ସତେଜ"</string>
- <string name="process_kernel_label" msgid="3916858646836739323">"Android OS"</string>
<string name="process_mediaserver_label" msgid="6500382062945689285">"ମିଡିଆ ସର୍ଭର୍"</string>
<string name="process_dex2oat_label" msgid="2592408651060518226">"ଆପ୍ ଅନୁକୁଳତା"</string>
<string name="battery_saver" msgid="8172485772238572153">"ବ୍ୟାଟେରୀ ସେଭର୍"</string>
@@ -2620,8 +2619,6 @@
<string name="no_device_admins" msgid="4846602835339095768">"କୌଣସି ଡିଭାଇସ୍ ଆଡମିନ୍ ଆପ୍ ଉପଲବ୍ଧ ନାହିଁ"</string>
<string name="personal_device_admin_title" msgid="2849617316347669861">"ବ୍ୟକ୍ତିଗତ"</string>
<string name="managed_device_admin_title" msgid="7853955652864478435">"କାର୍ଯ୍ୟ"</string>
- <string name="sms_access_restriction_enabled" msgid="7054488078710530278">"SMS ଏବଂ କଲ୍ ଲଗ୍ ଆକ୍ସେସ୍ ପ୍ରତିବନ୍ଧିତ କରନ୍ତୁ"</string>
- <string name="sms_access_restriction_enabled_summary" msgid="6851339654677842328">"କେବଳ ଡିଫଲ୍ଟ ଫୋନ୍ ଏବଂ ମେସେଜିଂ ଆପ୍ସରେ SMS ଏବଂ କଲ୍ ଲଗ୍ ଅନୁମତିଗୁଡ଼ିକ ରହିଛି"</string>
<string name="no_trust_agents" msgid="7450273545568977523">"କୌଣସି ବିଶ୍ୱସ୍ତ ଏଜେଣ୍ଟ ଉପଲବ୍ଧ ନାହିଁ"</string>
<string name="add_device_admin_msg" msgid="1501847129819382149">"ଡିଭାଇସ୍ ଆଡମିନ୍ ଆପ୍ ସକ୍ରିୟ କରିବେ?"</string>
<string name="add_device_admin" msgid="4192055385312215731">"ଏହି ଡିଭାଇସ୍ ଆଡ୍ମିନ୍ ଆପ୍ ସକ୍ରିୟ କରନ୍ତୁ"</string>
@@ -3110,7 +3107,7 @@
<string name="keywords_app_default" msgid="5822717006354487071">"ଏଥିରେ ଖୋଲନ୍ତୁ"</string>
<string name="keywords_applications_settings" msgid="1268353611121497450">"ଆପ୍ଲିକେସନ୍ଗୁଡ଼ିକ"</string>
<string name="keywords_time_zone" msgid="998254736898753085">"ଟାଇମ୍ଜୋନ୍"</string>
- <string name="keywords_draw_overlay" msgid="4130899177619041842">"ଚାଟ୍ ହେଡ୍"</string>
+ <string name="keywords_draw_overlay" msgid="1001120206241401007">"ଚାଟ୍ ହେଡ୍, ସିଷ୍ଟମ୍, ଆଲର୍ଟ, ୱିଣ୍ଡୋ, ଡାୟଲଗ୍, ଡିସ୍ପ୍ଲେ, ତାହା ସହ ଅନ୍ୟ ଆପ୍ସ, ଅଙ୍କନ"</string>
<string name="keywords_flashlight" msgid="6161632177705233710">"ଫ୍ଲାସ୍ଲାଇଟ୍, ଲାଇଟ୍, ଟର୍ଚ୍ଚ"</string>
<string name="keywords_change_wifi_state" msgid="627068244033681010">"ୱାଇଫାଇ, ୱାଇ-ଫାଇ, ଟୋଗଲ୍, ନିୟନ୍ତ୍ରଣ"</string>
<string name="keywords_more_mobile_networks" msgid="8995946622054642367">"ସେଲ୍ୟୁଲାର୍, ମୋବାଇଲ୍, ସେଲ୍ କ୍ୟାରିଅର୍, ୱେୟାରଲେସ୍, ଡାଟା, 4g,3g, 2g, lte"</string>
@@ -3134,7 +3131,7 @@
<string name="keywords_sounds_and_notifications_interruptions" msgid="5426093074031208917">"ବିରକ୍ତ କରନ୍ତୁ ନାହିଁ, ଅବରୋଧ, ବାଧା, ବିରତି"</string>
<string name="keywords_app" msgid="6334757056536837791">"RAM"</string>
<string name="keywords_location" msgid="4132655528196729043">"ଆଖପାଖ, ଲୋକେସନ୍, ଇତିବୃତ୍ତି, ରିପୋଟିଂ, GPS"</string>
- <string name="keywords_accounts" msgid="1957925565953357627">"ଆକାଉଣ୍ଟ"</string>
+ <string name="keywords_accounts" msgid="4479029747403203867">"ଆକାଉଣ୍ଟ, ଏକ ଆକାଉଣ୍ଟ ଯୋଗ କରନ୍ତୁ, କାର୍ଯ୍ୟସ୍ଥଳୀ ପ୍ରୋଫାଇଲ୍"</string>
<string name="keywords_users" msgid="3434190133131387942">"ପ୍ରତିବନ୍ଧ, ବାଧା, ପ୍ରତିବନ୍ଧିତ"</string>
<string name="keywords_keyboard_and_ime" msgid="9143339015329957107">"ଟେକ୍ସଟ୍ ସଂଶୋଧନ, ଠିକ, ଧ୍ୱନୀ, କମ୍ପନ, ସ୍ୱତଃ, ଭାଷା, ଜେଶ୍ଚର୍, ପରାମର୍ଶ ଦେବା, ପରାମର୍ଶ, ଥିମ୍, ଅପବାଦଜନକ, ଶବ୍ଦ, ପ୍ରକାର, ଇମୋଜି, ଆନ୍ତର୍ଜାତୀୟ"</string>
<string name="keywords_reset_apps" msgid="5293291209613191845">"ରିସେଟ୍, ଆଗ୍ରହ, ପୂର୍ବ-ନିର୍ଦ୍ଧାରିତ"</string>
@@ -3172,6 +3169,7 @@
<string name="keywords_storage_settings" msgid="297283751968446577">"ମେମୋରୀ, କେଚ୍, ଡାଟା, ଡିଲିଟ୍ କରନ୍ତୁ, ଖାଲି କରନ୍ତୁ, ଖାଲି, ସ୍ପେସ୍"</string>
<string name="keywords_bluetooth_settings" msgid="6804844062789439858">"କନେକ୍ଟ ହୋଇଥିବା, ଡିଭାଇସ୍, ହେଡଫୋନ୍, ହେଡସେଟ୍, ସ୍ପିକର୍, ୱାୟରଲେସ୍, ପେୟାର୍, ଇୟର୍ବଡ୍ସ, ମ୍ୟୁଜିକ୍, ମିଡିଆ"</string>
<string name="keywords_wallpaper" msgid="5058364390917429896">"ବ୍ୟାକ୍ଗ୍ରାଉଣ୍ଡ, ସ୍କ୍ରୀନ୍, ଲକ୍ ସ୍କ୍ରୀନ୍, ଥିମ୍"</string>
+ <string name="keywords_styles" msgid="5828725481814049422">"ଆଇକନ୍ ଆକୃତି, ଆସେଣ୍ଟ ରଙ୍ଗ, ଫଣ୍ଟ"</string>
<string name="keywords_assist_input" msgid="5017533309492679287">"ଡିଫଲ୍ଟ, ସହାୟକ"</string>
<string name="keywords_default_payment_app" msgid="3838565809518896799">"ପେମେଣ୍ଟ, ଡିଫଲ୍ଟ"</string>
<string name="keywords_ambient_display" msgid="3103487805748659132">"ଆଗତ ବିଜ୍ଞପ୍ତି"</string>
@@ -3181,7 +3179,7 @@
<string name="keywords_notification_vibration" msgid="31924624421190547">"ହାପ୍ଟିକ୍ସ, ଭାଇବ୍ରେଟ୍, ସମ୍ୱେଦନଶୀଳତା"</string>
<string name="keywords_battery_saver_sticky" msgid="5586215686021650278">"ବ୍ୟାଟେରୀ ସେଭର୍, ଷ୍ଟିକି, ପର୍ସିଷ୍ଟ, ପାୱର୍ ସେଭର୍, ବ୍ୟାଟେରୀ"</string>
<string name="keywords_battery_saver_schedule" msgid="7358789228486231944">"ରୁଟିନ୍, ସମୟ ସୂଚୀ, ବ୍ୟାଟେରୀ ସେଭର୍, ପାୱର୍ ସେଭର୍, ବ୍ୟାଟେରୀ, ସ୍ୱତଃ, ଶତକଡ଼ା"</string>
- <string name="keywords_add_an_account" msgid="6488139919428902434">"ୱାର୍କ ପ୍ରୋଫାଇଲ୍"</string>
+ <string name="keywords_enhance_4g_lte" msgid="2273810564244790859">"volte, ଉନ୍ନତ କଲିଂ, 4g କଲିଂ"</string>
<string name="default_sound" msgid="8821684447333687810">"ପୂର୍ବ-ନିର୍ଦ୍ଧାରିତ ଶବ୍ଦ"</string>
<string name="sound_settings_summary" msgid="4100853606668287965">"ରିଙ୍ଗ ଭଲ୍ୟୁମ <xliff:g id="PERCENTAGE">%1$s</xliff:g> ରେ ଅଛି"</string>
<string name="sound_dashboard_summary" msgid="3402435125958012986">"ଭଲ୍ୟୁମ୍, ଭାଇବ୍ରେଶନ୍, ବିରକ୍ତ କରନ୍ତୁ ନାହିଁ"</string>
@@ -3888,7 +3886,6 @@
<string name="permit_draw_overlay" msgid="7456536798718633432">"ଅନ୍ୟ ଆପ୍ଗୁଡ଼ିକ ଉପରେ ପ୍ରଦର୍ଶନ ଅନୁମତି ଦିଅନ୍ତୁ"</string>
<string name="allow_overlay_description" msgid="8961670023925421358">"ଆପଣ ବ୍ୟବହାର କରୁଥିବା ଅନ୍ୟ ଆପ୍ଗୁଡ଼ିକ ଉପରେ ଏହି ଆପ୍କୁ ରହିବାକୁ ଦିଅନ୍ତୁ। ସେହି ଆପ୍ଗୁଡ଼ିକର ବ୍ୟବହାରରେ ଏହା ବାଧା ସୃଷ୍ଟି କରିପାରେ କିମ୍ୱା ସେଗୂଡ଼ିକର କାମ କରିବା ଶୈଳୀକୁ ବଦଳାଇଦେଇପାରେ।"</string>
<string name="keywords_vr_listener" msgid="7441221822576384680">"vr ଭର୍ଚୁଆଲ୍ ରିଅଲିଟୀ ଲିସ୍ନର୍ ଷ୍ଟେରିଓ ସାହାଯ୍ୟକାରୀ ସେବା"</string>
- <string name="keywords_system_alert_window" msgid="5049498015597864850">"ଅନ୍ୟ ଆପ୍ଗୁଡ଼ିକରେ ସିଷ୍ଟମ୍ ଆଲର୍ଟ ଡାୟଲଗ୍ ଡିସ୍ପ୍ଲେ"</string>
<string name="overlay_settings" msgid="6930854109449524280">"ଅନ୍ୟ ଆପ୍ଗୁଡ଼ିକ ଉପରେ ଦେଖାଦେଉ"</string>
<string name="system_alert_window_summary" msgid="602892301318324492">"<xliff:g id="COUNT_1">%2$d</xliff:g> ଟି ଆପ୍ରୁ <xliff:g id="COUNT_0">%1$d</xliff:g> ଅନ୍ୟ ଆପ୍ଗୁଡ଼ିକରେ ଡିସପ୍ଲେ କରିବାକୁ ଅନୁମୋଦିତ"</string>
<string name="filter_overlay_apps" msgid="6965969283342557573">"ଅନୁମତି ସହ ଆପ୍ଗୁଡ଼ିକ"</string>
@@ -4124,7 +4121,6 @@
<string name="notification_log_details_none" msgid="184131801230614059">"କିଛି ନାହିଁ"</string>
<string name="notification_log_details_ranking_null" msgid="244660392058720919">"ର୍ୟାଙ୍କିଙ୍ଗର ବସ୍ତୁ ଉପଲବ୍ଧ ନାହିଁ।"</string>
<string name="notification_log_details_ranking_none" msgid="599607025882587844">"ମୂଲ୍ୟାୟନ ଅବଜେକ୍ଟରେ ଏହି କୀ ନଥାଏ।"</string>
- <string name="theme_customization_category" msgid="1049181544004163283">"ଥିମିଂ"</string>
<string name="theme_customization_device_default" msgid="5058147707906551368">"ଡିଭାଇସ୍ ଡିଫଲ୍ଟ"</string>
<string name="display_cutout_emulation" msgid="7466869822418376317">"ପ୍ରଦର୍ଶନ ଫଳକ"</string>
<string name="display_cutout_emulation_keywords" msgid="4495418317471622562">"ଡିସ୍ପ୍ଲେ କଟଆଉଟ୍, ନଚ୍"</string>
@@ -4550,6 +4546,8 @@
<string name="network_connection_errorstate_dialog_message" msgid="6953778550775646710">"କିଛି ଗୋଟିଏ ବାହାରିଛି ଏକ ଡିଭାଇସ୍କୁ ବାଛିବାକୁ, ଆପ୍ଲିକେସନ୍ ଅନୁରୋଧ ବାତିଲ୍ କରିଛି।"</string>
<string name="network_connection_connect_successful" msgid="5935510954474494928">"ସଫଳତାର ସହ ସଂଯୋଗ ହୋଇଛି"</string>
<string name="network_connection_request_dialog_showall" msgid="6938922880244567521">"ସମସ୍ତ ଦେଖାନ୍ତୁ"</string>
+ <string name="network_connection_searching_message" msgid="4638576789450817530">"ଡିଭାଇସ୍ ପାଇଁ ସନ୍ଧାନ କରୁଛି…"</string>
+ <string name="network_connection_connecting_message" msgid="3740982406609245654">"ଡିଭାଇସ୍ ସଂଯୋଗ ହେଉଛି…"</string>
<plurals name="show_bluetooth_devices" formatted="false" msgid="1715020480026568408">
<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>
diff --git a/res/values-pa/strings.xml b/res/values-pa/strings.xml
index d3fe16b..d585925 100644
--- a/res/values-pa/strings.xml
+++ b/res/values-pa/strings.xml
@@ -360,8 +360,6 @@
<string name="security_enable_widgets_disabled_summary" msgid="6392489775303464905">"ਪ੍ਰਸ਼ਾਸਕ ਦੁਆਰਾ ਅਯੋਗ ਬਣਾਇਆ ਗਿਆ"</string>
<string name="lockdown_settings_title" msgid="7393790212603280213">"ਲਾਕਡਾਊਨ ਵਿਕਲਪ ਦਿਖਾਓ"</string>
<string name="lockdown_settings_summary" msgid="4359438673563318171">"ਪਾਵਰ ਬਟਨ ਵਿਕਲਪ ਦਿਖਾਓ ਜੋ ਸਮਾਰਟ ਲਾਕ, ਬਾਇਓਮੈਟ੍ਰਿਕ ਅਣਲਾਕ ਅਤੇ ਲਾਕ ਸਕ੍ਰੀਨ \'ਤੇ ਸੂਚਨਾਵਾਂ ਨੂੰ ਬੰਦ ਕਰਦਾ ਹੈ"</string>
- <string name="trust_agents_extend_unlock_title" msgid="2796555263565097031">"ਭਰੋਸੇਯੋਗ ਏਜੰਟਾਂ ਲਈ ਵਿਸਤ੍ਰਿਤ ਅਣਲਾਕ"</string>
- <string name="trust_agents_extend_unlock_summary" msgid="3976344969220255010">"ਚਾਲੂ ਹੋਣ \'ਤੇ, ਭਰੋਸੇਯੋਗ ਏਜੰਟ ਤੁਹਾਡੇ ਡੀਵਾਈਸ ਨੂੰ ਲੰਮੇ ਸਮੇਂ ਤੱਕ ਅਣਲਾਕ ਰੱਖਣਗੇ, ਪਰ ਹੁਣ ਕਿਸੇ ਲਾਕ ਕੀਤੇ ਡੀਵਾਈਸ ਨੂੰ ਅਣਲਾਕ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ।"</string>
<string name="trust_lost_locks_screen_title" msgid="2992742466966021682">"ਭਰੋਸਾ ਗੁਆਉਣ \'ਤੇ ਸਕ੍ਰੀਨ ਲਾਕ ਕਰੋ"</string>
<string name="trust_lost_locks_screen_summary" msgid="693784434582021206">"ਚਾਲੂ ਹੋਣ \'ਤੇ, ਆਖਰੀ ਭਰੋਸੇਯੋਗ ਏਜੰਟ ਵੱਲੋਂ ਭਰੋਸਾ ਗੁਆਉਣ \'ਤੇ ਡੀਵਾਈਸ ਲਾਕ ਹੋ ਜਾਵੇਗਾ।"</string>
<string name="owner_info_settings_summary" msgid="7472393443779227052">"ਕੋਈ ਨਹੀਂ"</string>
@@ -937,6 +935,8 @@
<string name="wifi_eap_identity" msgid="4359453783379679103">"ਪਛਾਣ"</string>
<string name="wifi_eap_anonymous" msgid="2989469344116577955">"ਅਨਾਮ ਪਛਾਣ"</string>
<string name="wifi_password" msgid="5948219759936151048">"ਪਾਸਵਰਡ"</string>
+ <!-- no translation found for wifi_sae_password_id (1697832722221765763) -->
+ <skip />
<string name="wifi_show_password" msgid="6461249871236968884">"ਪਾਸਵਰਡ ਦਿਖਾਓ"</string>
<string name="wifi_ap_band_config" msgid="1611826705989117930">"AP ਬੈਂਡ ਦੀ ਚੋਣ ਕਰੋ"</string>
<string name="wifi_ap_choose_auto" msgid="2677800651271769965">"ਸਵੈਚਲਿਤ"</string>
@@ -957,7 +957,6 @@
<string name="wifi_dpp_share_wifi" msgid="9065890131734833809">"ਵਾਈ-ਫਾਈ ਸਾਂਝਾ ਕਰੋ"</string>
<string name="wifi_dpp_scan_qr_code_with_another_device" msgid="5854392840857123065">"“<xliff:g id="SSID">%1$s</xliff:g>” ਨਾਲ ਕਨੈਕਟ ਕਰਨ ਲਈ ਇਹ QR ਕੋਡ ਸਕੈਨ ਕਰਕੇ ਪਾਸਵਰਡ ਸਾਂਝਾ ਕਰੋ"</string>
<string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="4436318319178361543">"“<xliff:g id="SSID">%1$s</xliff:g>” ਨਾਲ ਕਨੈਕਟ ਕਰਨ ਲਈ ਇਹ QR ਕੋਡ ਸਕੈਨ ਕਰੋ"</string>
- <string name="wifi_dpp_could_not_detect_valid_qr_code" msgid="641893675646330576">"QR ਕੋਡ ਪੜ੍ਹਿਆ ਨਹੀਂ ਜਾ ਸਕਿਆ। ਕੋਡ ਮੁੜ-ਕੇਂਦਰਿਤ ਕਰਕੇ ਦੁਬਾਰਾ ਕੋਸ਼ਿਸ਼ ਕਰੋ"</string>
<string name="wifi_dpp_failure_authentication_or_configuration" msgid="3372757783382381044">"ਦੁਬਾਰਾ ਕੋਸ਼ਿਸ਼ ਕਰੋ। ਜੇ ਸਮੱਸਿਆ ਜਾਰੀ ਰਹਿੰਦੀ ਹੈ, ਤਾਂ ਡੀਵਾਈਸ ਉਤਪਾਦਕ ਨੂੰ ਸੰਪਰਕ ਕਰੋ"</string>
<string name="wifi_dpp_failure_not_compatible" msgid="2829930473520603740">"ਕੋਈ ਗੜਬੜ ਹੋਈ"</string>
<string name="wifi_dpp_failure_timeout" msgid="5228320772245820458">"ਪੱਕਾ ਕਰੋ ਕਿ ਡੀਵਾਈਸ ਦਾ ਪਲੱਗ ਲੱਗਾ ਹੋਇਆ ਹੈ, ਚਾਰਜ ਕੀਤਾ ਹੋਇਆ ਅਤੇ ਚਾਲੂ ਹੈ"</string>
@@ -980,6 +979,7 @@
<string name="wifi_dpp_hotspot_password" msgid="4120419278831581613">"ਹੌਟਸਪੌਟ ਪਾਸਵਰਡ: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
<string name="wifi_dpp_add_device" msgid="4072206063308645677">"ਡੀਵਾਈਸ ਸ਼ਾਮਲ ਕਰੋ"</string>
<string name="wifi_dpp_connect_network_using_qr_code" msgid="3887335309163999665">"ਇਸ ਨੈੱਟਵਰਕ \'ਤੇ ਡੀਵਾਈਸ ਸ਼ਾਮਲ ਕਰਨ ਲਈ QR ਕੋਡ ਵਰਤੋ"</string>
+ <string name="wifi_dpp_qr_code_is_not_valid_format" msgid="3700087439867692944">"QR ਕੋਡ ਵੈਧ ਫਾਰਮੈਟ ਨਹੀਂ ਹੈ"</string>
<string name="retry" msgid="6472609612090877557">"ਮੁੜ-ਕੋਸ਼ਿਸ਼ ਕਰੋ"</string>
<string name="wifi_shared" msgid="844142443226926070">"ਹੋਰ ਡੀਵਾਈਸ ਵਰਤੋਂਕਾਰਾਂ ਨਾਲ ਸਾਂਝਾ ਕਰੋ"</string>
<string name="wifi_unchanged" msgid="3410422020930397102">"(ਬਿਨਾਂ ਬਦਲਿਆ)"</string>
@@ -1129,6 +1129,7 @@
<string name="emergency_address_title" msgid="932729250447887545">"ਸੰਕਟਕਾਲੀਨ ਪਤਾ"</string>
<string name="emergency_address_summary" msgid="7751971156196115129">"ਤੁਹਾਡੇ ਵੱਲੋਂ ਕੀਤੀ ਜਾਣ ਵਾਲੀ ਕਿਸੇ ਸੰਕਟਕਾਲੀਨ ਕਾਲ ਵੇਲੇ ਇਹ ਪਤਾ ਵਰਤਿਆ ਜਾਂਦਾ ਹੈ"</string>
<string name="private_dns_help_message" msgid="3299567069152568958">"ਨਿੱਜੀ DNS ਵਿਸ਼ੇਸ਼ਤਾਵਾਂ ਬਾਰੇ "<annotation id="url">"ਹੋਰ ਜਾਣੋ"</annotation></string>
+ <string name="private_dns_mode_on" msgid="5882613439541371003">"ਚਾਲੂ"</string>
<string name="wifi_calling_pref_managed_by_carrier" msgid="6845711858866828986">"ਸੈਟਿੰਗ ਦਾ ਪ੍ਰਬੰਧਨ ਕੈਰੀਅਰ ਵੱਲੋਂ ਕੀਤਾ ਗਿਆ ਹੈ"</string>
<string name="wifi_calling_settings_activation_instructions" msgid="7492509632478260955">"ਵਾਈ-ਫਾਈ ਕਾਲਿੰਗ ਕਿਰਿਆਸ਼ੀਲ ਕਰੋ"</string>
<string name="wifi_calling_turn_on" msgid="1171403510313983983">"ਵਾਈ-ਫਾਈ ਕਾਲਿੰਗ ਚਾਲੂ ਕਰੋ"</string>
@@ -1872,7 +1873,7 @@
<string name="default_emergency_app" msgid="1951760659640369980">"ਆਪਾਤਕਾਲ ਐਪ"</string>
<string name="reset_app_preferences" msgid="1321050641018356925">"ਐਪ ਤਰਜੀਹਾਂ ਰੀਸੈੱਟ ਕਰੋ"</string>
<string name="reset_app_preferences_title" msgid="6093179367325336662">"ਕੀ ਐਪ ਤਰਜੀਹਾਂ ਰੀਸੈੱਟ ਕਰਨੀਆਂ ਹਨ?"</string>
- <string name="reset_app_preferences_desc" msgid="4822447731869201512">"ਇਹ ਹੇਠਲੀਆਂ ਸਾਰੀਆਂ ਤਰਜੀਹਾਂ ਨੂੰ ਰੀਸੈੱਟ ਕਰ ਦੇਵੇਗਾ:\n\n"<li>"ਬੰਦ ਕੀਤੀਆਂ ਐਪਾਂ"</li>\n<li>"ਬੰਦ ਕੀਤੀਆਂ ਐਪ ਸੂਚਨਾਵਾਂ"</li>\n<li>"ਕਿਰਿਆਵਾਂ ਲਈ ਪੂਰਵ-ਨਿਰਧਾਰਤ ਐਪਲੀਕੇਸ਼ਨਾਂ"</li>\n<li>"ਐਪਾਂ ਲਈ ਬੈਕਗ੍ਰਾਊਂਡ ਡਾਟਾ ਪਾਬੰਦੀਆਂ"</li>\n<li>"ਕੋਈ ਵੀ ਇਜਾਜ਼ਤ ਪਾਬੰਦੀਆਂ"</li>\n\n"ਤੁਸੀਂ ਕੋਈ ਵੀ ਐਪ ਡਾਟਾ ਨਹੀਂ ਗੁਆਓਗੇ।"</string>
+ <string name="reset_app_preferences_desc" msgid="731757609326016760">"ਇੰਝ ਕਰਨ ਨਾਲ ਇਹ ਇਹਨਾਂ ਲਈ ਸਾਰੀਆਂ ਤਰਜੀਹਾਂ ਰੀਸੈੱਟ ਕਰ ਦੇਵੇਗਾ:\n\n"<li>" ਬੰਦ ਕੀਤੀਆਂ ਐਪਾਂ"</li>\n<li>"ਬੰਦ ਕੀਤੀਆਂ ਐਪ ਸੂਚਨਾਵਾਂ"</li>\n<li>"ਕਾਰਵਾਈਆਂ ਲਈ ਪੂਰਵ-ਨਿਰਧਾਰਤ ਐਪਲੀਕੇਸ਼ਨਾਂ"</li>\n<li>" ਐਪਾਂ ਲਈ ਬੈਕਗ੍ਰਾਊਂਡ ਡਾਟੇ ਸੰਬੰਧੀ ਪਾਬੰਦੀਆਂ"</li>\n<li>"ਕੋਈ ਵੀ ਇਜਾਜ਼ਤ ਸੰਬੰਧੀ ਪਾਬੰਦੀਆਂ"</li>\n\n"ਤੁਸੀਂ ਕੋਈ ਵੀ ਐਪ ਡਾਟਾ ਨਹੀਂ ਗੁਆਓਗੇ।"</string>
<string name="reset_app_preferences_button" msgid="2559089511841281242">"ਐਪਾਂ ਰੀਸੈੱਟ ਕਰੋ"</string>
<string name="manage_space_text" msgid="8852711522447794676">"ਸਪੇਸ ਵਿਵਸਥਿਤ ਕਰੋ"</string>
<string name="filter" msgid="2018011724373033887">"ਫਿਲਟਰ"</string>
@@ -2087,7 +2088,7 @@
<string name="accessibility_screen_magnification_short_summary" msgid="3411979839172752057">"ਜ਼ੂਮ ਕਰਨ ਲਈ 3 ਵਾਰ ਟੈਪ ਕਰੋ"</string>
<string name="accessibility_screen_magnification_navbar_short_summary" msgid="3693116360267980492">"ਜ਼ੂਮ ਕਰਨ ਲਈ ਬਟਨ \'ਤੇ ਟੈਪ ਕਰੋ"</string>
<string name="accessibility_screen_magnification_summary" msgid="5258868553337478505"><b>"ਜ਼ੂਮ ਕਰਨ ਲਈ"</b>", ਸਕ੍ਰੀਨ \'ਤੇ ਤੇਜ਼ੀ ਨਾਲ 3 ਵਾਰ ਟੈਪ ਕਰੋ।\n"<ul><li>"ਸਕ੍ਰੋਲ ਕਰਨ ਲਈ 2 ਜਾਂ ਜ਼ਿਆਦਾ ਉਂਗਲਾਂ ਘਸੀਟੋ"</li>\n<li>"ਜ਼ੂਮ ਨੂੰ ਵਿਵਸਥਿਤ ਕਰਨ ਲਈ 2 ਜਾਂ ਜ਼ਿਆਦਾ ਉਂਗਲਾਂ ਨਾਲ ਚੂੰਢੀ ਭਰੋ"</li></ul>\n\n<b>"ਅਸਥਾਈ ਤੌਰ \'ਤੇ ਜ਼ੂਮ ਕਰਨ ਲਈ"</b>", ਸਕ੍ਰੀਨ \'ਤੇ 3 ਵਾਰ ਟੈਪ ਕਰੋ, ਅਤੇ ਆਪਣੀ ਉਂਗਲ ਨੂੰ ਤੀਜੇ ਟੈਪ \'ਤੇ ਦਬਾਈ ਰੱਖੋ।\n"<ul><li>"ਸਕ੍ਰੀਨ \'ਤੇ ਆਲੇ-ਦੁਆਲੇ ਜਾਣ ਲਈ ਘਸੀਟੋ"</li>\n<li>"ਜ਼ੂਮ ਘਟਾਉਣ ਲਈ ਉਂਗਲ ਚੁੱਕੋ"</li></ul>\n\n"ਤੁਸੀਂ ਕੀ-ਬੋਰਡ ਜਾਂ ਦਿਸ਼ਾ-ਨਿਰਦੇਸ਼ ਪੱਟੀ \'ਤੇ ਜ਼ੂਮ ਵਧਾ ਨਹੀਂ ਸਕਦੇ।"</string>
- <string name="accessibility_screen_magnification_navbar_summary" msgid="2272878354599332009">"ਜਦੋਂ ਵੱਡਦਰਸ਼ੀਕਰਨ ਚਾਲੂ ਹੋਵੇ, ਤੁਸੀਂ ਸਕ੍ਰੀਨ \'ਤੇ ਜ਼ੂਮ ਵਧਾ ਸਕਦੇ ਹੋ।\n\n"<b>"ਜ਼ੂਮ ਕਰਨ ਲਈ"</b>", ਵੱਡਦਰਸ਼ੀਕਰਨ ਸ਼ੁਰੂ ਕਰੋ, ਫਿਰ ਸਕ੍ਰੀਨ \'ਤੇ ਕਿਤੇ ਵੀ ਟੈਪ ਕਰੋ।\n"<ul><li>"• ਸਕ੍ਰੋਲ ਕਰਨ ਲਈ 2 ਜਾਂ ਜ਼ਿਆਦਾ ਉਂਗਲਾਂ ਘਸੀਟੋ"</li>\n<li>"• ਜ਼ੂਮ ਨੂੰ ਵਿਵਸਥਿਤ ਕਰਨ ਲਈ 2 ਜਾਂ ਜ਼ਿਆਦਾ ਉਂਗਲਾਂ ਨਾਲ ਚੂੰਢੀ ਭਰੋ"</li></ul>\n\n<b>"ਅਸਥਾਈ ਤੌਰ \'ਤੇ ਜ਼ੂਮ ਕਰਨ ਲਈ"</b>", ਵੱਡਦਰਸ਼ੀਕਰਨ ਸ਼ੁਰੂ ਕਰੋ, ਫਿਰ ਸਕ੍ਰੀਨ \'ਤੇ ਕੀਤੇ ਵੀ ਸਪਰਸ਼ ਕਰਕੇ ਰੱਖੋ।\n"<ul><li>"• ਸਕ੍ਰੀਨ \'ਤੇ ਆਲੇ-ਦੁਆਲੇ ਜਾਣ ਲਈ ਘਸੀਟੋ"</li>\n<li>"• ਜ਼ੂਮ ਘਟਾਉਣ ਲਈ ਉਂਗਲ ਚੁੱਕੋ"</li></ul>\n\n"ਤੁਸੀਂ ਕੀ-ਬੋਰਡ ਜਾਂ ਦਿਸ਼ਾ-ਨਿਰਦੇਸ਼ ਪੱਟੀ \'ਤੇ ਜ਼ੂਮ ਵਧਾ ਨਹੀਂ ਸਕਦੇ।"</string>
+ <string name="accessibility_screen_magnification_navbar_summary" msgid="6700716275347612310">"ਜਦੋਂ ਵੱਡਦਰਸ਼ੀਕਰਨ ਚਾਲੂ ਹੋਵੇ, ਤੁਸੀਂ ਸਕ੍ਰੀਨ \'ਤੇ ਜ਼ੂਮ ਵਧਾ ਸਕਦੇ ਹੋ।\n\n"<b>"ਜ਼ੂਮ ਕਰਨ ਲਈ"</b>", ਵੱਡਦਰਸ਼ੀਕਰਨ ਸ਼ੁਰੂ ਕਰੋ, ਫਿਰ ਸਕ੍ਰੀਨ \'ਤੇ ਕਿਤੇ ਵੀ ਟੈਪ ਕਰੋ।\n"<ul><li>"ਸਕ੍ਰੋਲ ਕਰਨ ਲਈ 2 ਜਾਂ ਜ਼ਿਆਦਾ ਉਂਗਲਾਂ ਘਸੀਟੋ"</li>\n<li>" ਜ਼ੂਮ ਨੂੰ ਵਿਵਸਥਿਤ ਕਰਨ ਲਈ 2 ਜਾਂ ਜ਼ਿਆਦਾ ਉਂਗਲਾਂ ਨਾਲ ਚੂੰਢੀ ਭਰੋ"</li></ul>\n\n<b>"ਅਸਥਾਈ ਤੌਰ \'ਤੇ ਜ਼ੂਮ ਕਰਨ ਲਈ"</b>", ਵੱਡਦਰਸ਼ੀਕਰਨ ਸ਼ੁਰੂ ਕਰੋ, ਫਿਰ ਸਕ੍ਰੀਨ \'ਤੇ ਕੀਤੇ ਵੀ ਸਪਰਸ਼ ਕਰਕੇ ਰੱਖੋ।\n"<ul><li>"ਸਕ੍ਰੀਨ \'ਤੇ ਆਲੇ-ਦੁਆਲੇ ਜਾਣ ਲਈ ਘਸੀਟੋ"</li>\n<li>"ਜ਼ੂਮ ਘਟਾਉਣ ਲਈ ਉਂਗਲ ਚੁੱਕੋ"</li></ul>\n\n"ਤੁਸੀਂ ਕੀ-ਬੋਰਡ ਜਾਂ ਦਿਸ਼ਾ-ਨਿਰਦੇਸ਼ ਪੱਟੀ \'ਤੇ ਜ਼ੂਮ ਵਧਾ ਨਹੀਂ ਸਕਦੇ।"</string>
<string name="accessibility_tutorial_dialog_title_button" msgid="3682222614034474845">"ਖੋਲ੍ਹਣ ਲਈ ਪਹੁੰਚਯੋਗਤਾ ਬਟਨ ਵਰਤੋ"</string>
<string name="accessibility_tutorial_dialog_title_gesture" msgid="1342726230497913398">"ਖੋਲ੍ਹਣ ਲਈ ਸੰਕੇਤ ਵਰਤੋ"</string>
<string name="accessibility_tutorial_dialog_title_gesture_settings" msgid="8539392614235820285">"ਨਵਾਂ ਪਹੁੰਚਯੋਗਤਾ ਸੰਕੇਤ ਵਰਤੋ"</string>
@@ -2140,8 +2141,7 @@
<string name="accessibility_hearingaid_title" msgid="8312145423610648518">"ਸੁਣਨ ਦੇ ਸਾਧਨ"</string>
<string name="accessibility_hearingaid_not_connected_summary" msgid="6240237523789614599">"ਸੁਣਨ ਦਾ ਕੋਈ ਸਾਧਨ ਕਨੈਕਟ ਨਹੀਂ ਕੀਤਾ ਹੋਇਆ"</string>
<string name="accessibility_hearingaid_adding_summary" msgid="2947474468412309778">"ਸੁਣਨ ਦੇ ਸਾਧਨ ਸ਼ਾਮਲ ਕਰੋ"</string>
- <string name="accessibility_hearingaid_pair_instructions_first_message" msgid="3912093691643131154">"ਸੁਣਨ ਦੇ ਸਾਧਨਾਂ ਨੂੰ ਜੋੜਾਬੱਧ ਕਰਨ ਲਈ, ਅਗਲੀ ਸਕ੍ਰੀਨ \'ਤੇ ਆਪਣਾ ਡੀਵਾਈਸ ਲੱਭ ਕੇ ਟੈਪ ਕਰੋ।"</string>
- <string name="accessibility_hearingaid_pair_instructions_second_message" msgid="5596683393607650243">"ਪੱਕਾ ਕਰੋ ਕਿ ਤੁਹਾਡੇ ਸੁਣਨ ਦੇ ਸਾਧਨ ਜੋੋੜਾਬੱਧ ਕਰਨ ਦੇ ਮੋਡ ਵਿੱਚ ਹਨ।"</string>
+ <string name="accessibility_hearingaid_pair_instructions_message" msgid="3094382949733435414">"ਸੁਣਨ ਦੇ ਸਾਧਨਾਂ ਨੂੰ ਜੋੜਾਬੱਧ ਕਰਨ ਲਈ, ਅਗਲੀ ਸਕ੍ਰੀਨ \'ਤੇ ਆਪਣਾ ਡੀਵਾਈਸ ਲੱਭ ਕੇ ਟੈਪ ਕਰੋ। ਪੱਕਾ ਕਰੋ ਕਿ ਤੁਹਾਡੇ ਸੁਣਨ ਦੇ ਸਾਧਨ ਜੋੋੜਾਬੱਧ ਕਰਨ ਦੇ ਮੋਡ ਵਿੱਚ ਹਨ।"</string>
<string name="accessibility_hearingaid_active_device_summary" msgid="3924362383258688984">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ਕਿਰਿਆਸ਼ੀਲ"</string>
<plurals name="show_number_hearingaid_count" formatted="false" msgid="3160782397139295486">
<item quantity="one">ਰੱਖਿਅਤ ਕੀਤਾ <xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> ਸੁਣਨ ਦਾ ਸਾਧਨ</item>
@@ -2490,7 +2490,6 @@
<string name="menu_stats_last_unplugged" msgid="5922246077592434526">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> ਲਈ ਪਿਛਲੀ ਵਾਰ ਅਨਪਲਗ ਕੀਤੇ ਜਾਣ ਵੇਲੇ"</string>
<string name="menu_stats_total" msgid="8973377864854807854">"ਕੁੱਲ ਵਰਤੋਂ"</string>
<string name="menu_stats_refresh" msgid="1676215433344981075">"ਤਾਜ਼ਾ"</string>
- <string name="process_kernel_label" msgid="3916858646836739323">"Android OS"</string>
<string name="process_mediaserver_label" msgid="6500382062945689285">"Mediaserver"</string>
<string name="process_dex2oat_label" msgid="2592408651060518226">"ਐਪ ਅਨੁਕੂਲਨ"</string>
<string name="battery_saver" msgid="8172485772238572153">"ਬੈਟਰੀ ਸੇਵਰ"</string>
@@ -2621,8 +2620,6 @@
<string name="no_device_admins" msgid="4846602835339095768">"ਕੋਈ ਵੀ ਡੀਵਾਈਸ ਪ੍ਰਸ਼ਾਸਕ ਐਪਾਂ ਉਪਲਬਧ ਨਹੀਂ ਹਨ"</string>
<string name="personal_device_admin_title" msgid="2849617316347669861">"ਨਿੱਜੀ"</string>
<string name="managed_device_admin_title" msgid="7853955652864478435">"ਦਫ਼ਤਰ"</string>
- <string name="sms_access_restriction_enabled" msgid="7054488078710530278">"SMS ਅਤੇ ਕਾਲ ਲੌਗ ਤੱਕ ਪਹੁੰਚ \'ਤੇ ਪਾਬੰਦੀ ਲਗਾਓ"</string>
- <string name="sms_access_restriction_enabled_summary" msgid="6851339654677842328">"ਸਿਰਫ਼ ਪੂਰਵ-ਨਿਰਧਾਰਤ ਫ਼ੋਨ ਅਤੇ ਸੁਨੇਹੇ ਐਪਾਂ ਨੂੰ SMS ਅਤੇ ਕਾਲ ਲੌਗ ਇਜਾਜ਼ਤਾਂ ਹਨ"</string>
<string name="no_trust_agents" msgid="7450273545568977523">"ਕੋਈ ਉਪਲਬਧ ਭਰੋਸੇਯੋਗ ਏਜੰਟ ਨਹੀਂ"</string>
<string name="add_device_admin_msg" msgid="1501847129819382149">"ਡੀਵਾਈਸ ਪ੍ਰਸ਼ਾਸਕ ਐਪ ਨੂੰ ਸਰਗਰਮ ਕਰੀਏ?"</string>
<string name="add_device_admin" msgid="4192055385312215731">"ਇਸ ਡੀਵਾਈਸ ਪ੍ਰਸ਼ਾਸਕ ਐਪ ਨੂੰ ਸਰਗਰਮ ਕਰੋ"</string>
@@ -3111,7 +3108,7 @@
<string name="keywords_app_default" msgid="5822717006354487071">"ਇਸ ਨਾਲ ਖੋਲ੍ਹੋ"</string>
<string name="keywords_applications_settings" msgid="1268353611121497450">"ਐਪਲੀਕੇਸ਼ਨਾਂ"</string>
<string name="keywords_time_zone" msgid="998254736898753085">"ਸਮਾਂ ਖੇਤਰ"</string>
- <string name="keywords_draw_overlay" msgid="4130899177619041842">"ਚੈਟ ਦਾ ਮੁੱਖ ਹਿੱਸਾ"</string>
+ <string name="keywords_draw_overlay" msgid="1001120206241401007">"ਚੈਟ ਦਾ ਸਿਖਰਲਾ ਹਿੱਸਾ, ਸਿਸਟਮ, ਸੁਚੇਤਨਾ, ਵਿੰਡੋ, ਵਿੰਡੋ ਬਾਕਸ, ਡਿਸਪਲੇ, ਦੂਜੀਆਂ ਐਪਾਂ ਦੇ ਉੱਪਰ ਦਿਸਣਾ, ਉਲੀਕਣਾ"</string>
<string name="keywords_flashlight" msgid="6161632177705233710">"ਫਲੈਸ਼ਲਾਈਟ, ਲਾਈਟ, ਟਾਰਚ"</string>
<string name="keywords_change_wifi_state" msgid="627068244033681010">"ਵਾਈ ਫਾਈ, ਵਾਈ-ਫਾਈ, ਟੌਗਲ, ਕੰਟਰੋਲ"</string>
<string name="keywords_more_mobile_networks" msgid="8995946622054642367">"ਸੈਲਿਊਲਰ, ਮੋਬਾਈਲ, ਸੈੱਲ ਕੈਰੀਅਰ, ਵਾਇਰਲੈੱਸ, ਡਾਟਾ, 4g,3g, 2g, lte"</string>
@@ -3135,7 +3132,7 @@
<string name="keywords_sounds_and_notifications_interruptions" msgid="5426093074031208917">"ਨਾ ਕਰੋ ਪਰੇਸ਼ਾਨ ਨਾ ਕਰੋ, ਰੋਕੋ, ਰੁਕਾਵਟ, ਬ੍ਰੇਕ"</string>
<string name="keywords_app" msgid="6334757056536837791">"ਰੈਮ"</string>
<string name="keywords_location" msgid="4132655528196729043">"ਨਜ਼ਦੀਕੀ, ਟਿਕਾਣਾ, ਇਤਿਹਾਸ, ਰਿਪੋਰਟਿੰਗ, GPS"</string>
- <string name="keywords_accounts" msgid="1957925565953357627">"ਖਾਤਾ"</string>
+ <string name="keywords_accounts" msgid="4479029747403203867">"ਖਾਤਾ, ਖਾਤਾ ਸ਼ਾਮਲ ਕਰੋ, ਕਾਰਜ ਪ੍ਰੋਫਾਈਲ"</string>
<string name="keywords_users" msgid="3434190133131387942">"ਪਾਬੰਦੀ, ਪਾਬੰਦੀ ਲਗਾਓ, ਪਾਬੰਦੀ ਲਗਾਈ"</string>
<string name="keywords_keyboard_and_ime" msgid="9143339015329957107">"ਲਿਖਤ ਸੁਧਾਈ, ਸਹੀ, ਧੁਨੀ, ਕੰਬਣਾ, ਸਵੈ, ਭਾਸ਼ਾ, ਸੰਕੇਤ, ਸੁਝਾਓ, ਸੁਝਾਅ, ਥੀਮ, ਅਪਮਾਨਜਨਕ, ਸ਼ਬਦ, ਕਿਸਮ, ਇਮੋਜੀ, ਅੰਤਰਰਾਸ਼ਟਰੀ"</string>
<string name="keywords_reset_apps" msgid="5293291209613191845">"ਮੁੜ-ਸੈੱਟ ਕਰੋ, ਤਰਜੀਹਾਂ, ਪੂਰਵ-ਨਿਰਧਾਰਤ"</string>
@@ -3173,6 +3170,7 @@
<string name="keywords_storage_settings" msgid="297283751968446577">"ਮੈਮੋਰੀ, ਕੈਸ਼ੇ, ਡਾਟਾ, ਮਿਟਾਓ, ਕਲੀਅਰ ਕਰੋ, ਖਾਲੀ, ਜਗ੍ਹਾ"</string>
<string name="keywords_bluetooth_settings" msgid="6804844062789439858">"ਕਨੈਕਟ ਕੀਤੇ, ਡੀਵਾਈਸ, ਹੈੱਡਫ਼ੋਨ, ਹੈੱਡਸੈੱਟ, ਸਪੀਕਰ, ਵਾਇਰਲੈੱਸ, ਜੋੜਾਬੱਧ, ਈਅਰਬੱਡ, ਸੰਗੀਤ, ਮੀਡੀਆ"</string>
<string name="keywords_wallpaper" msgid="5058364390917429896">"ਬੈਕਗ੍ਰਾਊਂਡ, ਸਕ੍ਰੀਨ, ਲਾਕਸਕ੍ਰੀਨ, ਥੀਮ"</string>
+ <string name="keywords_styles" msgid="5828725481814049422">"ਪ੍ਰਤੀਕ ਦੀ ਆਕ੍ਰਿਤੀ, ਐਕਸੈਂਟ ਰੰਗ, ਫੌਂਟ"</string>
<string name="keywords_assist_input" msgid="5017533309492679287">"ਪੂਰਵ-ਨਿਰਧਾਰਤ, ਸਹਾਇਕ"</string>
<string name="keywords_default_payment_app" msgid="3838565809518896799">"ਭੁਗਤਾਨ, ਪੂਰਵ-ਨਿਰਧਾਰਤ"</string>
<string name="keywords_ambient_display" msgid="3103487805748659132">"ਇਨਕਮਿੰਗ ਸੂਚਨਾ"</string>
@@ -3182,7 +3180,7 @@
<string name="keywords_notification_vibration" msgid="31924624421190547">"ਸਪਰਸ਼ ਸੰਵੇਦਕ, ਥਰਥਰਾਹਟ, ਸੰਵੇਦਨਸ਼ੀਲਤਾ"</string>
<string name="keywords_battery_saver_sticky" msgid="5586215686021650278">"ਬੈਟਰੀ ਸੇਵਰ, ਸਥਿਰ, ਬਰਕਰਾਰ, ਪਾਵਰ ਸੇਵਰ, ਬੈਟਰੀ"</string>
<string name="keywords_battery_saver_schedule" msgid="7358789228486231944">"ਨਿਯਮਬੱਧ ਕੰਮ, ਸਮਾਂ-ਸੂਚੀ, ਬੈਟਰੀ ਸੇਵਰ, ਪਾਵਰ ਸੇਵਰ, ਬੈਟਰੀ, ਸਵੈਚਲਿਤ, ਫ਼ੀਸਦ"</string>
- <string name="keywords_add_an_account" msgid="6488139919428902434">"ਕਾਰਜ ਪ੍ਰੋਫਾਈਲ"</string>
+ <string name="keywords_enhance_4g_lte" msgid="2273810564244790859">"volte, ਉੱਨਤ ਕਾਲਿੰਗ, 4g ਕਾਲਿੰਗ"</string>
<string name="default_sound" msgid="8821684447333687810">"ਪੂਰਵ-ਨਿਰਧਾਰਤ ਧੁਨੀ"</string>
<string name="sound_settings_summary" msgid="4100853606668287965">"ਰਿੰਗ ਦੀ ਅਵਾਜ਼ <xliff:g id="PERCENTAGE">%1$s</xliff:g> ਹੈ"</string>
<string name="sound_dashboard_summary" msgid="3402435125958012986">"ਅਵਾਜ਼, ਥਰਥਰਾਹਟ, ਪਰੇਸ਼ਾਨ ਨਾ ਕਰੋ"</string>
@@ -3889,7 +3887,6 @@
<string name="permit_draw_overlay" msgid="7456536798718633432">"ਦੂਜੀਆਂ ਐਪਾਂ ਉੱਪਰ ਪ੍ਰਦਰਸ਼ਿਤ ਹੋਣ ਨੂੰ ਇਜਾਜ਼ਤ ਦਿਓ"</string>
<string name="allow_overlay_description" msgid="8961670023925421358">"ਇਸ ਐਪ ਨੂੰ ਤੁਹਾਡੇ ਵੱਲੋਂ ਵਰਤੀਆਂ ਜਾ ਰਹੀਆਂ ਹੋਰ ਐਪਾਂ \'ਤੇ ਪ੍ਰਦਰਸ਼ਿਤ ਕਰਨ ਦਿਓ। ਇਹ ਤੁਹਾਡੇ ਦੁਆਰਾ ਉਹਨਾਂ ਐਪਾਂ ਦੀ ਵਰਤੋਂ ਵਿੱਚ ਦਖ਼ਲ ਦੇ ਸਕਦੀ ਹੈ ਜਾਂ ਉਹਨਾਂ ਦੇ ਦਿਖਾਈ ਦੇਣ ਜਾਂ ਕੰਮ ਕਰਨ ਦੇ ਤਰੀਕੇ ਨੂੰ ਬਦਲ ਸਕਦੀ ਹੈ।"</string>
<string name="keywords_vr_listener" msgid="7441221822576384680">"VR ਆਭਾਸੀ ਵਾਸਤਵਿਕਤਾ ਸਰੋਤਾ ਸਟੀਰੀਓ ਸਹਾਇਕ ਸੇਵਾ"</string>
- <string name="keywords_system_alert_window" msgid="5049498015597864850">"ਸਿਸਟਮ ਚਿਤਾਵਨੀ ਵਿੰਡੋ ਡਾਇਲੌਗ ਦੂਜੀਆਂ ਐਪਾਂ ਦੇ ਉੱਪਰ ਪ੍ਰਦਰਸ਼ਿਤ ਕਰੋ"</string>
<string name="overlay_settings" msgid="6930854109449524280">"ਦੂਜੀਆਂ ਐਪਾਂ ਦੇ ਉੱਪਰ ਪ੍ਰਦਰਸ਼ਿਤ ਕਰੋ"</string>
<string name="system_alert_window_summary" msgid="602892301318324492">"<xliff:g id="COUNT_1">%2$d</xliff:g> ਵਿੱਚੋਂ <xliff:g id="COUNT_0">%1$d</xliff:g> ਐਪਾਂ ਨੂੰ ਹੋਰ ਐਪਾਂ ਉੱਤੇ ਪ੍ਰਦਰਸ਼ਿਤ ਹੋਣ ਦੀ ਇਜਾਜ਼ਤ ਦਿੱਤੀ"</string>
<string name="filter_overlay_apps" msgid="6965969283342557573">"ਅਨੁਮਤੀ ਵਾਲੀਆਂ ਐਪਸ"</string>
@@ -4125,7 +4122,6 @@
<string name="notification_log_details_none" msgid="184131801230614059">"ਕੋਈ ਨਹੀਂਂ"</string>
<string name="notification_log_details_ranking_null" msgid="244660392058720919">"ਰੈਕਿੰਗ ਔਬਜੈਕਟ ਗੁੰਮ ਹੈ।"</string>
<string name="notification_log_details_ranking_none" msgid="599607025882587844">"ਰੈਕਿੰਗ ਔਬਜੈਕਟ ਵਿੱਚ ਇਹ ਕੁੰਜੀ ਸ਼ਾਮਲ ਨਹੀਂ ਹੈ।"</string>
- <string name="theme_customization_category" msgid="1049181544004163283">"ਥੀਮਿੰਗ"</string>
<string name="theme_customization_device_default" msgid="5058147707906551368">"ਪੂਰਵ-ਨਿਰਧਾਰਤ ਡੀਵਾਈਸ"</string>
<string name="display_cutout_emulation" msgid="7466869822418376317">"ਡਿਸਪਲੇ ਕੱਟਆਊਟ"</string>
<string name="display_cutout_emulation_keywords" msgid="4495418317471622562">"ਡਿਸਪਲੇ ਕੱਟਆਊਟ, ਨੌਚ"</string>
@@ -4551,6 +4547,8 @@
<string name="network_connection_errorstate_dialog_message" msgid="6953778550775646710">"ਕੋਈ ਗੜਬੜ ਹੋ ਗਈ। ਐਪਲੀਕੇਸ਼ਨ ਨੇ ਕਿਸੇ ਡੀਵਾਈਸ ਨੂੰ ਚੁਣਨ ਦੀ ਬੇਨਤੀ ਰੱਦ ਕਰ ਦਿੱਤੀ ਹੈ।"</string>
<string name="network_connection_connect_successful" msgid="5935510954474494928">"ਕਨੈਕਸ਼ਨ ਸਫਲ ਰਿਹਾ"</string>
<string name="network_connection_request_dialog_showall" msgid="6938922880244567521">"ਸਭ ਦਿਖਾਓ"</string>
+ <string name="network_connection_searching_message" msgid="4638576789450817530">"ਡੀਵਾਈਸ ਖੋਜਿਆ ਜਾ ਰਿਹਾ ਹੈ…"</string>
+ <string name="network_connection_connecting_message" msgid="3740982406609245654">"ਡੀਵਾਈਸ ਨਾਲ ਕਨੈਕਟ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ…"</string>
<plurals name="show_bluetooth_devices" formatted="false" msgid="1715020480026568408">
<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>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index d26a652..e2e6adf 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -364,8 +364,6 @@
<string name="security_enable_widgets_disabled_summary" msgid="6392489775303464905">"Wyłączone przez administratora"</string>
<string name="lockdown_settings_title" msgid="7393790212603280213">"Pokaż opcję blokady"</string>
<string name="lockdown_settings_summary" msgid="4359438673563318171">"Wyświetlaj opcję przycisku zasilania, która wyłącza Smart Lock, odblokowywanie biometryczne i powiadomienia na ekranie blokady"</string>
- <string name="trust_agents_extend_unlock_title" msgid="2796555263565097031">"Agenty zaufania przedłużają blokadę"</string>
- <string name="trust_agents_extend_unlock_summary" msgid="3976344969220255010">"Po włączeniu tej opcji agenty zaufania będą dłużej utrzymywać urządzenie w stanie odblokowanym, ale nie będą miały możliwości odblokowania zablokowanego urządzenia"</string>
<string name="trust_lost_locks_screen_title" msgid="2992742466966021682">"Zablokuj ekran po utracie zaufania"</string>
<string name="trust_lost_locks_screen_summary" msgid="693784434582021206">"Po włączeniu urządzenie zablokuje się, gdy ostatni agent zaufania utraci zaufanie"</string>
<string name="owner_info_settings_summary" msgid="7472393443779227052">"Brak"</string>
@@ -969,6 +967,7 @@
<string name="wifi_eap_identity" msgid="4359453783379679103">"Tożsamość"</string>
<string name="wifi_eap_anonymous" msgid="2989469344116577955">"Tożsamość anonimowa"</string>
<string name="wifi_password" msgid="5948219759936151048">"Hasło"</string>
+ <string name="wifi_sae_password_id" msgid="1697832722221765763">"Identyfikator hasła SAE"</string>
<string name="wifi_show_password" msgid="6461249871236968884">"Pokaż hasło"</string>
<string name="wifi_ap_band_config" msgid="1611826705989117930">"Wybierz pasmo punktu dostępu"</string>
<string name="wifi_ap_choose_auto" msgid="2677800651271769965">"Automatycznie"</string>
@@ -989,7 +988,6 @@
<string name="wifi_dpp_share_wifi" msgid="9065890131734833809">"Udostępnij Wi‑Fi"</string>
<string name="wifi_dpp_scan_qr_code_with_another_device" msgid="5854392840857123065">"Zeskanuj ten kod QR, by połączyć się z siecią „<xliff:g id="SSID">%1$s</xliff:g>” i udostępnić hasło"</string>
<string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="4436318319178361543">"Zeskanuj ten kod QR, by połączyć się z siecią „<xliff:g id="SSID">%1$s</xliff:g>”"</string>
- <string name="wifi_dpp_could_not_detect_valid_qr_code" msgid="641893675646330576">"Nie udało się odczytać kodu QR. Ustaw kod pośrodku pola i spróbuj ponownie"</string>
<string name="wifi_dpp_failure_authentication_or_configuration" msgid="3372757783382381044">"Spróbuj ponownie. Jeśli problem się powtórzy, skontaktuj się z producentem urządzenia"</string>
<string name="wifi_dpp_failure_not_compatible" msgid="2829930473520603740">"Coś poszło nie tak"</string>
<string name="wifi_dpp_failure_timeout" msgid="5228320772245820458">"Upewnij się, że urządzenie jest podłączone do zasilania, naładowane i włączone"</string>
@@ -1012,6 +1010,7 @@
<string name="wifi_dpp_hotspot_password" msgid="4120419278831581613">"Hasło do hotspota: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
<string name="wifi_dpp_add_device" msgid="4072206063308645677">"Dodaj urządzenie"</string>
<string name="wifi_dpp_connect_network_using_qr_code" msgid="3887335309163999665">"Dodaj urządzenie do tej sieci, używając kodu QR"</string>
+ <string name="wifi_dpp_qr_code_is_not_valid_format" msgid="3700087439867692944">"Nieprawidłowy format kodu QR"</string>
<string name="retry" msgid="6472609612090877557">"Ponów"</string>
<string name="wifi_shared" msgid="844142443226926070">"Udostępnij innym użytkownikom urządzenia"</string>
<string name="wifi_unchanged" msgid="3410422020930397102">"(nie zmieniono)"</string>
@@ -1167,6 +1166,7 @@
<string name="emergency_address_title" msgid="932729250447887545">"Adres alarmowy"</string>
<string name="emergency_address_summary" msgid="7751971156196115129">"Traktowany jako Twoja lokalizacja, gdy dzwonisz pod numer alarmowy przez Wi‑Fi"</string>
<string name="private_dns_help_message" msgid="3299567069152568958"><annotation id="url">"Więcej informacji"</annotation>" o funkcjach prywatnego DNS"</string>
+ <string name="private_dns_mode_on" msgid="5882613439541371003">"Włączony"</string>
<string name="wifi_calling_pref_managed_by_carrier" msgid="6845711858866828986">"Ustawieniem zarządza operator"</string>
<string name="wifi_calling_settings_activation_instructions" msgid="7492509632478260955">"Aktywuj Połączenia przez Wi-Fi"</string>
<string name="wifi_calling_turn_on" msgid="1171403510313983983">"Włącz Połączenia przez Wi-Fi"</string>
@@ -1916,7 +1916,7 @@
<string name="default_emergency_app" msgid="1951760659640369980">"Aplikacja alarmowa"</string>
<string name="reset_app_preferences" msgid="1321050641018356925">"Resetuj ustawienia aplikacji"</string>
<string name="reset_app_preferences_title" msgid="6093179367325336662">"Zresetować ustawienia aplikacji?"</string>
- <string name="reset_app_preferences_desc" msgid="4822447731869201512">"To działanie zresetuje wszystkie ustawienia dotyczące:\n\n"<li>"wyłączonych aplikacji,"</li>\n<li>"wyłączonych powiadomień aplikacji,"</li>\n<li>"domyślnych aplikacji dla wybranych czynności,"</li>\n<li>"ograniczeń użycia danych w tle dla aplikacji,"</li>\n<li>"wszelkich ograniczeń dostępu."</li>\n\n"Nie utracisz żadnych danych aplikacji."</string>
+ <string name="reset_app_preferences_desc" msgid="731757609326016760">"To działanie zresetuje wszystkie ustawienia:\n\n"<li>"wyłączonych aplikacji,"</li>\n<li>"wyłączonych powiadomień z aplikacji,"</li>\n<li>"domyślnych aplikacji dla wybranych czynności,"</li>\n<li>"ograniczeń korzystania przez aplikacje z danych w tle,"</li>\n<li>"wszystkich ograniczeń dotyczących uprawnień."</li>\n\n"Nie stracisz żadnych danych aplikacji."</string>
<string name="reset_app_preferences_button" msgid="2559089511841281242">"Resetuj aplikacje"</string>
<string name="manage_space_text" msgid="8852711522447794676">"Zarządzaj miejscem"</string>
<string name="filter" msgid="2018011724373033887">"Filtr"</string>
@@ -2131,7 +2131,7 @@
<string name="accessibility_screen_magnification_short_summary" msgid="3411979839172752057">"Kliknij trzy razy, by powiększyć"</string>
<string name="accessibility_screen_magnification_navbar_short_summary" msgid="3693116360267980492">"Kliknij przycisk, by powiększyć"</string>
<string name="accessibility_screen_magnification_summary" msgid="5258868553337478505"><b>"Aby powiększyć"</b>", szybko kliknij ekran trzy raz.\n"<ul><li>"Przeciągnij co najmniej dwoma palcami, by przewijać ekran."</li>\n<li>"Ściągnij do siebie co najmniej dwa palce, by dostosować powiększenie."</li></ul>\n\n<b>"Aby tymczasowo powiększyć widok"</b>", szybko kliknij ekran trzy razy i przytrzymaj palec po trzecim kliknięciu.\n"<ul><li>"Przeciągaj palcem, by poruszać się po ekranie."</li>\n<li>"Unieś palec, by wyłączyć powiększenie."</li></ul>\n\n"Nie można powiększyć klawiatury ani paska nawigacji."</string>
- <string name="accessibility_screen_magnification_navbar_summary" msgid="2272878354599332009">"Gdy powiększenie jest włączone, możesz powiększać fragmenty ekranu.\n\n"<b>"Aby powiekszyć"</b>", uruchom powiększenie, a następnie kliknij dowolne miejsce na ekranie.\n"<ul><li>"• Przeciągnij co najmniej dwa palce, by przewinąć"</li>\n<li>"• Ściśnij co najmniej dwa palce, by dostosować powiększenie"</li></ul>\n\n<b>"Aby powiększyć fragment tymczasowo"</b>", uruchom powiększenie i kliknij dowolne miejsce na ekranie.\n"<ul><li>"• Przeciągnij, by poruszać się po ekranie"</li>\n<li>"• Podnieś palec, aby pomniejszyć fragment ekranu"</li></ul>\n\n"Nie można powiększać klawiatury ani paska nawigacyjnego."</string>
+ <string name="accessibility_screen_magnification_navbar_summary" msgid="6700716275347612310">"Gdy powiększenie jest włączone, możesz powiększać fragmenty ekranu.\n\n"<b>"Aby powiekszyć"</b>", uruchom powiększenie, a następnie kliknij dowolne miejsce na ekranie.\n"<ul><li>"Przeciągnij co najmniej dwoma palcami, by przewijać."</li>\n<li>"Ściągnij do siebie co najmniej dwa palce, by dostosować powiększenie."</li></ul>\n\n<b>"Aby powiększyć tymczasowo"</b>", uruchom powiększenie, a następnie naciśnij i przytrzymaj dowolne miejsce na ekranie.\n"<ul><li>"Przeciągaj palcem, by poruszać się po ekranie."</li>\n<li>"Unieś palec, by wyłączyć powiększenie."</li></ul>\n\n"Nie można powiększyć klawiatury ani paska nawigacji."</string>
<string name="accessibility_tutorial_dialog_title_button" msgid="3682222614034474845">"Otwieranie przyciskiem ułatwień dostępu"</string>
<string name="accessibility_tutorial_dialog_title_gesture" msgid="1342726230497913398">"Otwieranie gestem"</string>
<string name="accessibility_tutorial_dialog_title_gesture_settings" msgid="8539392614235820285">"Użyj nowego gestu ułatwień dostępu"</string>
@@ -2184,8 +2184,7 @@
<string name="accessibility_hearingaid_title" msgid="8312145423610648518">"Aparaty słuchowe"</string>
<string name="accessibility_hearingaid_not_connected_summary" msgid="6240237523789614599">"Brak połączonych aparatów słuchowych"</string>
<string name="accessibility_hearingaid_adding_summary" msgid="2947474468412309778">"Dodaj aparaty słuchowe"</string>
- <string name="accessibility_hearingaid_pair_instructions_first_message" msgid="3912093691643131154">"Aby sparować aparaty słuchowe, na następnym ekranie znajdź i kliknij urządzenie."</string>
- <string name="accessibility_hearingaid_pair_instructions_second_message" msgid="5596683393607650243">"Upewnij się, że aparaty słuchowe są w trybie parowania."</string>
+ <string name="accessibility_hearingaid_pair_instructions_message" msgid="3094382949733435414">"Aby sparować aparaty słuchowe, na następnym ekranie znajdź i kliknij urządzenie. Upewnij się, że aparaty słuchowe są w trybie parowania."</string>
<string name="accessibility_hearingaid_active_device_summary" msgid="3924362383258688984">"Urządzenie <xliff:g id="DEVICE_NAME">%1$s</xliff:g> jest aktywne"</string>
<plurals name="show_number_hearingaid_count" formatted="false" msgid="3160782397139295486">
<item quantity="few"><xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> zapisane aparaty słuchowe</item>
@@ -2564,7 +2563,6 @@
<string name="menu_stats_last_unplugged" msgid="5922246077592434526">"Ostatnio odłączony na <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
<string name="menu_stats_total" msgid="8973377864854807854">"Łączne użycie"</string>
<string name="menu_stats_refresh" msgid="1676215433344981075">"Odśwież"</string>
- <string name="process_kernel_label" msgid="3916858646836739323">"System operacyjny Android"</string>
<string name="process_mediaserver_label" msgid="6500382062945689285">"Serwer mediów"</string>
<string name="process_dex2oat_label" msgid="2592408651060518226">"Optymalizacja aplikacji"</string>
<string name="battery_saver" msgid="8172485772238572153">"Oszczędzanie baterii"</string>
@@ -2695,8 +2693,6 @@
<string name="no_device_admins" msgid="4846602835339095768">"Brak dostępnych aplikacji do administrowania urządzeniem"</string>
<string name="personal_device_admin_title" msgid="2849617316347669861">"Osobiste"</string>
<string name="managed_device_admin_title" msgid="7853955652864478435">"Praca"</string>
- <string name="sms_access_restriction_enabled" msgid="7054488078710530278">"Ogranicz dostęp do SMS-ów i rejestru połączeń"</string>
- <string name="sms_access_restriction_enabled_summary" msgid="6851339654677842328">"Tylko domyślne aplikacje do obsługi telefonu i wiadomości mają dostęp do SMS-ów i rejestru połączeń"</string>
<string name="no_trust_agents" msgid="7450273545568977523">"Brak agentów zaufania"</string>
<string name="add_device_admin_msg" msgid="1501847129819382149">"Aktywować aplikację do administrowania urządzeniem?"</string>
<string name="add_device_admin" msgid="4192055385312215731">"Aktywuj tę aplikację do administrowania urządzeniem"</string>
@@ -3195,7 +3191,7 @@
<string name="keywords_app_default" msgid="5822717006354487071">"Otwórz w:"</string>
<string name="keywords_applications_settings" msgid="1268353611121497450">"Aplikacje"</string>
<string name="keywords_time_zone" msgid="998254736898753085">"strefa czasowa"</string>
- <string name="keywords_draw_overlay" msgid="4130899177619041842">"Nagłówek czatu"</string>
+ <string name="keywords_draw_overlay" msgid="1001120206241401007">"Nagłówek czatu, system, alert, okno, wyświetlacz, nad innymi aplikacjami, rysować"</string>
<string name="keywords_flashlight" msgid="6161632177705233710">"Latarka"</string>
<string name="keywords_change_wifi_state" msgid="627068244033681010">"wifi, wi-fi, przełącz, sterowanie"</string>
<string name="keywords_more_mobile_networks" msgid="8995946622054642367">"komórkowy, mobilne, operator komórkowy, bezprzewodowe, dane, 4g, 3g, 2g, lte"</string>
@@ -3219,7 +3215,7 @@
<string name="keywords_sounds_and_notifications_interruptions" msgid="5426093074031208917">"nie przeszkadzać, przerywać, zakłócenie, zakłócać"</string>
<string name="keywords_app" msgid="6334757056536837791">"RAM"</string>
<string name="keywords_location" msgid="4132655528196729043">"w pobliżu, lokalizacja, historia, raportowanie, GPS"</string>
- <string name="keywords_accounts" msgid="1957925565953357627">"konto"</string>
+ <string name="keywords_accounts" msgid="4479029747403203867">"konto, dodaj konto, profil do pracy"</string>
<string name="keywords_users" msgid="3434190133131387942">"ograniczenie, ogranicz, ograniczony"</string>
<string name="keywords_keyboard_and_ime" msgid="9143339015329957107">"poprawianie tekstu, popraw, dźwięk, wibracje, automatycznie, język, gest, sugeruj, sugestia, motyw, obraźliwe, słowo, typ, emotikon, międzynarodowe"</string>
<string name="keywords_reset_apps" msgid="5293291209613191845">"zresetuj, ustawienia, domyślne"</string>
@@ -3257,6 +3253,7 @@
<string name="keywords_storage_settings" msgid="297283751968446577">"pamięć, pamięć podręczna, dane, usuwanie, czyszczenie, wolne, miejsce"</string>
<string name="keywords_bluetooth_settings" msgid="6804844062789439858">"połączone, urządzenie, słuchawki, zestaw słuchawkowy, głośnik, bezprzewodowy, parowanie, słuchawki douszne, muzyka, multimedia"</string>
<string name="keywords_wallpaper" msgid="5058364390917429896">"tło, ekran, blokada ekranu, motyw"</string>
+ <string name="keywords_styles" msgid="5828725481814049422">"kształt ikony, kolor uzupełniający, czcionka"</string>
<string name="keywords_assist_input" msgid="5017533309492679287">"domyślne, asystent"</string>
<string name="keywords_default_payment_app" msgid="3838565809518896799">"płatność, domyślna"</string>
<string name="keywords_ambient_display" msgid="3103487805748659132">"powiadomienie przychodzące"</string>
@@ -3266,7 +3263,7 @@
<string name="keywords_notification_vibration" msgid="31924624421190547">"reakcja na dotyk, wibracje, czułość"</string>
<string name="keywords_battery_saver_sticky" msgid="5586215686021650278">"oszczędzanie baterii, przyklejony, trwały, oszczędzanie energii, bateria"</string>
<string name="keywords_battery_saver_schedule" msgid="7358789228486231944">"rutyna, harmonogram, oszczędzanie baterii, oszczędzanie energii, bateria, automatycznie, procent"</string>
- <string name="keywords_add_an_account" msgid="6488139919428902434">"profil służbowy"</string>
+ <string name="keywords_enhance_4g_lte" msgid="2273810564244790859">"volte, połączenia zaawansowane, połączenia 4g"</string>
<string name="default_sound" msgid="8821684447333687810">"Dźwięk domyślny"</string>
<string name="sound_settings_summary" msgid="4100853606668287965">"Głośność dzwonka to <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
<string name="sound_dashboard_summary" msgid="3402435125958012986">"Głośność, wibracje, Nie przeszkadzać"</string>
@@ -4015,7 +4012,6 @@
<string name="permit_draw_overlay" msgid="7456536798718633432">"Pozwól na wyświetlanie nad innymi aplikacjami"</string>
<string name="allow_overlay_description" msgid="8961670023925421358">"Pozwala aplikacji na wyświetlanie się nad innymi aplikacjami, których właśnie używasz. Może zakłócać korzystanie z innych aplikacji oraz wpływać na ich wygląd lub sposób działania."</string>
<string name="keywords_vr_listener" msgid="7441221822576384680">"vr rzeczywistość wirtualna odbiornik stereo usługa pomocnicza"</string>
- <string name="keywords_system_alert_window" msgid="5049498015597864850">"system alert okno okno dialogowe wyświetlać nad innymi aplikacjami"</string>
<string name="overlay_settings" msgid="6930854109449524280">"Wyświetlanie nad innymi"</string>
<string name="system_alert_window_summary" msgid="602892301318324492">"Aplikacje, które mogą wyświetlać się nad innymi: <xliff:g id="COUNT_0">%1$d</xliff:g> z <xliff:g id="COUNT_1">%2$d</xliff:g>"</string>
<string name="filter_overlay_apps" msgid="6965969283342557573">"Aplikacje z uprawnieniami"</string>
@@ -4263,7 +4259,6 @@
<string name="notification_log_details_none" msgid="184131801230614059">"brak"</string>
<string name="notification_log_details_ranking_null" msgid="244660392058720919">"Brak obiektu rankingu."</string>
<string name="notification_log_details_ranking_none" msgid="599607025882587844">"Obiekt rankingu nie zawiera takiego klucza."</string>
- <string name="theme_customization_category" msgid="1049181544004163283">"Motywy"</string>
<string name="theme_customization_device_default" msgid="5058147707906551368">"Ustawienie domyślne urządzenia"</string>
<string name="display_cutout_emulation" msgid="7466869822418376317">"Wycięcie w ekranie"</string>
<string name="display_cutout_emulation_keywords" msgid="4495418317471622562">"wycięcie w ekranie, notch"</string>
@@ -4713,6 +4708,8 @@
<string name="network_connection_errorstate_dialog_message" msgid="6953778550775646710">"Coś się stało. Aplikacja anulowała prośbę o wybór urządzenia."</string>
<string name="network_connection_connect_successful" msgid="5935510954474494928">"Mamy połączenie"</string>
<string name="network_connection_request_dialog_showall" msgid="6938922880244567521">"Pokaż wszystko"</string>
+ <string name="network_connection_searching_message" msgid="4638576789450817530">"Szukam urządzenia…"</string>
+ <string name="network_connection_connecting_message" msgid="3740982406609245654">"Łączę się z urządzeniem…"</string>
<plurals name="show_bluetooth_devices" formatted="false" msgid="1715020480026568408">
<item quantity="few">Podłączono <xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> urządzenia</item>
<item quantity="many">Podłączono <xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> urządzeń</item>
diff --git a/res/values-pt-rBR/strings.xml b/res/values-pt-rBR/strings.xml
index 35049f1..fc01809 100644
--- a/res/values-pt-rBR/strings.xml
+++ b/res/values-pt-rBR/strings.xml
@@ -360,8 +360,6 @@
<string name="security_enable_widgets_disabled_summary" msgid="6392489775303464905">"Desativada pelo administrador"</string>
<string name="lockdown_settings_title" msgid="7393790212603280213">"Mostrar opção de bloqueio total"</string>
<string name="lockdown_settings_summary" msgid="4359438673563318171">"Exibir a opção do botão liga/desliga que desativa o Smart Lock, o desbloqueio biométrico e as notificações na tela de bloqueio"</string>
- <string name="trust_agents_extend_unlock_title" msgid="2796555263565097031">"Agentes de confiança só podem ampliar o desbloqueio"</string>
- <string name="trust_agents_extend_unlock_summary" msgid="3976344969220255010">"Se essa opção for ativada, os agentes de confiança poderão manter o dispositivo desbloqueado por mais tempo, mas não poderão desbloquear o dispositivo"</string>
<string name="trust_lost_locks_screen_title" msgid="2992742466966021682">"Bloquear tela quando a confiança for perdida"</string>
<string name="trust_lost_locks_screen_summary" msgid="693784434582021206">"Se essa opção for ativada, o dispositivo será bloqueado quando o último agente de confiança perder a confiança"</string>
<string name="owner_info_settings_summary" msgid="7472393443779227052">"Nenhuma"</string>
@@ -937,6 +935,7 @@
<string name="wifi_eap_identity" msgid="4359453783379679103">"Identidade"</string>
<string name="wifi_eap_anonymous" msgid="2989469344116577955">"Identidade anônima"</string>
<string name="wifi_password" msgid="5948219759936151048">"Senha"</string>
+ <string name="wifi_sae_password_id" msgid="1697832722221765763">"Identificador de senha SAE"</string>
<string name="wifi_show_password" msgid="6461249871236968884">"Mostrar senha"</string>
<string name="wifi_ap_band_config" msgid="1611826705989117930">"Selecionar banda do ponto de acesso"</string>
<string name="wifi_ap_choose_auto" msgid="2677800651271769965">"Automático"</string>
@@ -957,7 +956,6 @@
<string name="wifi_dpp_share_wifi" msgid="9065890131734833809">"Compartilhar Wi‑Fi"</string>
<string name="wifi_dpp_scan_qr_code_with_another_device" msgid="5854392840857123065">"Faça a leitura deste código QR para conectar-se a “<xliff:g id="SSID">%1$s</xliff:g>” e compartilhar a senha"</string>
<string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="4436318319178361543">"Faça a leitura deste código QR para conectar-se a “<xliff:g id="SSID">%1$s</xliff:g>”"</string>
- <string name="wifi_dpp_could_not_detect_valid_qr_code" msgid="641893675646330576">"Não foi possível ler o código QR. Centralize a tela no código e tente novamente"</string>
<string name="wifi_dpp_failure_authentication_or_configuration" msgid="3372757783382381044">"Tente novamente. Se o problema persistir, entre em contato com o fabricante do dispositivo"</string>
<string name="wifi_dpp_failure_not_compatible" msgid="2829930473520603740">"Algo deu errado"</string>
<string name="wifi_dpp_failure_timeout" msgid="5228320772245820458">"Verifique se o dispositivo está conectado, carregado e ligado"</string>
@@ -980,6 +978,7 @@
<string name="wifi_dpp_hotspot_password" msgid="4120419278831581613">"Senha do ponto de acesso: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
<string name="wifi_dpp_add_device" msgid="4072206063308645677">"Adicionar dispositivo"</string>
<string name="wifi_dpp_connect_network_using_qr_code" msgid="3887335309163999665">"Use um código QR para adicionar um dispositivo a esta rede"</string>
+ <string name="wifi_dpp_qr_code_is_not_valid_format" msgid="3700087439867692944">"O código QR não está em um formato válido"</string>
<string name="retry" msgid="6472609612090877557">"Repetir"</string>
<string name="wifi_shared" msgid="844142443226926070">"Compartilhar com outros usuários do dispositivo"</string>
<string name="wifi_unchanged" msgid="3410422020930397102">"(sem alteração)"</string>
@@ -1129,6 +1128,7 @@
<string name="emergency_address_title" msgid="932729250447887545">"Endereço de emergência"</string>
<string name="emergency_address_summary" msgid="7751971156196115129">"Usado como seu local quando você faz uma chamada de emergência usando o Wi‑Fi"</string>
<string name="private_dns_help_message" msgid="3299567069152568958"><annotation id="url">"Saiba mais"</annotation>" sobre recursos de DNS particular"</string>
+ <string name="private_dns_mode_on" msgid="5882613439541371003">"Ativado"</string>
<string name="wifi_calling_pref_managed_by_carrier" msgid="6845711858866828986">"Configuração gerenciada pela operadora"</string>
<string name="wifi_calling_settings_activation_instructions" msgid="7492509632478260955">"Ativar chamada no Wi-Fi"</string>
<string name="wifi_calling_turn_on" msgid="1171403510313983983">"Ativar chamada no Wi-Fi"</string>
@@ -1872,7 +1872,7 @@
<string name="default_emergency_app" msgid="1951760659640369980">"App de emergência"</string>
<string name="reset_app_preferences" msgid="1321050641018356925">"Redefinir apps"</string>
<string name="reset_app_preferences_title" msgid="6093179367325336662">"Redefinir apps?"</string>
- <string name="reset_app_preferences_desc" msgid="4822447731869201512">"Isso redefinirá todas as preferências para:\n\n"<li>"Apps desabilitados"</li>\n<li>"Notificações de apps desabilitados"</li>\n<li>"Apps padrão para ações"</li>\n<li>"Restrições de dados em segundo plano para apps"</li>\n<li>"Qualquer restrição de permissão"</li>\n\n"Você não perderá os dados dos apps."</string>
+ <string name="reset_app_preferences_desc" msgid="731757609326016760">"Isso redefinirá todas as preferências para:\n\n"<li>" apps desativados;"</li>" \n "<li>"notificações de apps desativados; "</li>\n<li>"apps padrão para ações;"</li>\n<li>"restrições de dados em segundo plano para apps; "</li>\n<li>"qualquer restrição de permissão."</li>\n\n"Você não perderá os dados dos apps."</string>
<string name="reset_app_preferences_button" msgid="2559089511841281242">"Redefinir apps"</string>
<string name="manage_space_text" msgid="8852711522447794676">"Gerenciar espaço"</string>
<string name="filter" msgid="2018011724373033887">"Filtro"</string>
@@ -2087,7 +2087,7 @@
<string name="accessibility_screen_magnification_short_summary" msgid="3411979839172752057">"Tocar três vezes para ampliar"</string>
<string name="accessibility_screen_magnification_navbar_short_summary" msgid="3693116360267980492">"Toque em um botão para aplicar zoom"</string>
<string name="accessibility_screen_magnification_summary" msgid="5258868553337478505"><b>"Para aplicar zoom"</b>", toque três vezes na tela rapidamente.\n"<ul><li>"Arraste dois ou mais dedos para rolar"</li>\n<li>"Faça um gesto de pinça com dois ou mais dedos para ajustar o zoom"</li></ul>\n\n<b>"Para aplicar zoom temporariamente"</b>", toque rapidamente na tela três vezes e mantenha o dedo pressionado no terceiro toque.\n"<ul><li>"Arraste para mover pela tela"</li>\n<li>"Levante o dedo para diminuir o zoom"</li></ul>\n\n"Não é possível aumentar o zoom no teclado e na barra de navegação."</string>
- <string name="accessibility_screen_magnification_navbar_summary" msgid="2272878354599332009">"Quando a ampliação está ativada, você pode aumentar o zoom na tela.\n\n"<b>"Para aplicar zoom"</b>", inicie a ampliação e toque em qualquer lugar da tela.\n"<ul><li>"• Arraste com dois ou mais dedos para rolar a tela."</li>\n<li>"• Faça um movimento de pinça com dois ou mais dedos para ajustar o zoom."</li></ul>\n\n<b>"Se quiser aplicar zoom temporariamente"</b>", inicie a ampliação, toque em qualquer parte da tela e mantenha-a pressionada.\n"<ul><li>"• Arraste para mover a visualização."</li>\n<li>"• Levante o dedo para diminuir o zoom."</li></ul>\n\n"Não é possível aumentar o zoom no teclado nem na barra de navegação."</string>
+ <string name="accessibility_screen_magnification_navbar_summary" msgid="6700716275347612310">"Quando a ampliação está ativada, você pode aumentar o zoom na tela.\n\n"<b>"Para aplicar zoom"</b>", inicie a ampliação e toque em qualquer lugar da tela.\n"<ul><li>"Arraste dois dedos ou mais para rolar a tela."</li>\n<li>"Faça um gesto de pinça com dois ou mais dedos para ajustar o zoom."</li></ul>\n\n<b>"Para aplicar zoom temporariamente"</b>", inicie a ampliação e depois toque em qualquer ponto na tela e mantenha-o pressionado.\n"<ul><li>"Arraste para mover a tela."</li>\n<li>"Levante o dedo para diminuir o zoom."</li></ul>\n\n"Não é possível aumentar o zoom no teclado e na barra de navegação."</string>
<string name="accessibility_tutorial_dialog_title_button" msgid="3682222614034474845">"Usar o botão de acessibilidade para abrir"</string>
<string name="accessibility_tutorial_dialog_title_gesture" msgid="1342726230497913398">"Usar gesto para abrir"</string>
<string name="accessibility_tutorial_dialog_title_gesture_settings" msgid="8539392614235820285">"Usar o novo gesto de acessibilidade"</string>
@@ -2140,8 +2140,7 @@
<string name="accessibility_hearingaid_title" msgid="8312145423610648518">"Aparelhos auditivos"</string>
<string name="accessibility_hearingaid_not_connected_summary" msgid="6240237523789614599">"Nenhum aparelho auditivo conectado"</string>
<string name="accessibility_hearingaid_adding_summary" msgid="2947474468412309778">"Adicionar aparelhos auditivos"</string>
- <string name="accessibility_hearingaid_pair_instructions_first_message" msgid="3912093691643131154">"Para parear aparelhos auditivos, localize seu dispositivo na próxima tela e toque nele."</string>
- <string name="accessibility_hearingaid_pair_instructions_second_message" msgid="5596683393607650243">"Verifique se seus aparelhos auditivos estão no modo de pareamento."</string>
+ <string name="accessibility_hearingaid_pair_instructions_message" msgid="3094382949733435414">"Para parear aparelhos auditivos, localize seu dispositivo na próxima tela e toque nele. Verifique se seus aparelhos auditivos estão no modo de pareamento."</string>
<string name="accessibility_hearingaid_active_device_summary" msgid="3924362383258688984">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ativo"</string>
<plurals name="show_number_hearingaid_count" formatted="false" msgid="3160782397139295486">
<item quantity="one"><xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> aparelho auditivo salvo</item>
@@ -2490,7 +2489,6 @@
<string name="menu_stats_last_unplugged" msgid="5922246077592434526">"Quando foi desconectado pela última vez para <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
<string name="menu_stats_total" msgid="8973377864854807854">"Total de uso"</string>
<string name="menu_stats_refresh" msgid="1676215433344981075">"Atualizar"</string>
- <string name="process_kernel_label" msgid="3916858646836739323">"Sistema operacional Android"</string>
<string name="process_mediaserver_label" msgid="6500382062945689285">"Servidor de mídia"</string>
<string name="process_dex2oat_label" msgid="2592408651060518226">"Otimização do app"</string>
<string name="battery_saver" msgid="8172485772238572153">"Economia de bateria"</string>
@@ -2621,8 +2619,6 @@
<string name="no_device_admins" msgid="4846602835339095768">"Nenhum app de administrador do dispositivo disponível"</string>
<string name="personal_device_admin_title" msgid="2849617316347669861">"Pessoal"</string>
<string name="managed_device_admin_title" msgid="7853955652864478435">"Trabalho"</string>
- <string name="sms_access_restriction_enabled" msgid="7054488078710530278">"Restringir acesso a SMS e registro de chamadas"</string>
- <string name="sms_access_restriction_enabled_summary" msgid="6851339654677842328">"Apenas apps padrão de chamadas e mensagens têm permissões para SMS e registro de chamadas"</string>
<string name="no_trust_agents" msgid="7450273545568977523">"Nenhum agente de confiança disponível"</string>
<string name="add_device_admin_msg" msgid="1501847129819382149">"Ativar app de admin. do dispositivo?"</string>
<string name="add_device_admin" msgid="4192055385312215731">"Ativar o app de administrador deste dispositivo"</string>
@@ -3111,7 +3107,7 @@
<string name="keywords_app_default" msgid="5822717006354487071">"Abrir com"</string>
<string name="keywords_applications_settings" msgid="1268353611121497450">"Apps"</string>
<string name="keywords_time_zone" msgid="998254736898753085">"fuso horário"</string>
- <string name="keywords_draw_overlay" msgid="4130899177619041842">"Cabeçalho do chat"</string>
+ <string name="keywords_draw_overlay" msgid="1001120206241401007">"Ícone do chat, sistema, alerta, janela, diálogo, tela, sobre outros apps, sobrepor"</string>
<string name="keywords_flashlight" msgid="6161632177705233710">"Lanterna, Luz, Luminária"</string>
<string name="keywords_change_wifi_state" msgid="627068244033681010">"wifi, wi-fi, alternar, controle"</string>
<string name="keywords_more_mobile_networks" msgid="8995946622054642367">"celular, dispositivo móvel, operadora de celular, sem fio, dados, 4g, 3g, 2g, lte"</string>
@@ -3135,7 +3131,7 @@
<string name="keywords_sounds_and_notifications_interruptions" msgid="5426093074031208917">"não perturbe, interromper, interrupção"</string>
<string name="keywords_app" msgid="6334757056536837791">"RAM"</string>
<string name="keywords_location" msgid="4132655528196729043">"por perto, local, histórico, relatório, GPS"</string>
- <string name="keywords_accounts" msgid="1957925565953357627">"conta"</string>
+ <string name="keywords_accounts" msgid="4479029747403203867">"conta, adicionar uma conta, perfil de trabalho"</string>
<string name="keywords_users" msgid="3434190133131387942">"restrição, restringir, restrito"</string>
<string name="keywords_keyboard_and_ime" msgid="9143339015329957107">"correção de texto, corrigir, som, vibrar, automático, idioma, gesto, sugerir, sugestão, tema, ofensivo, palavra, digitar, emoji, internacional"</string>
<string name="keywords_reset_apps" msgid="5293291209613191845">"redefinir, preferências, padrão"</string>
@@ -3173,6 +3169,7 @@
<string name="keywords_storage_settings" msgid="297283751968446577">"memória, cache, dados, excluir, limpar, liberar, espaço"</string>
<string name="keywords_bluetooth_settings" msgid="6804844062789439858">"conectado, dispositivo, fones de ouvido, headset, alto-falante, sem fio, parear, música, mídia"</string>
<string name="keywords_wallpaper" msgid="5058364390917429896">"plano de fundo, tela, tela de bloqueio, tema"</string>
+ <string name="keywords_styles" msgid="5828725481814049422">"formato do ícone, cor de destaque, fonte"</string>
<string name="keywords_assist_input" msgid="5017533309492679287">"padrão, assistente"</string>
<string name="keywords_default_payment_app" msgid="3838565809518896799">"pagamento, padrão"</string>
<string name="keywords_ambient_display" msgid="3103487805748659132">"notificação recebida"</string>
@@ -3182,7 +3179,7 @@
<string name="keywords_notification_vibration" msgid="31924624421190547">"funcionalidade tátil, vibração, sensibilidade"</string>
<string name="keywords_battery_saver_sticky" msgid="5586215686021650278">"economia de bateria, fixo, persistir, economia de energia, bateria"</string>
<string name="keywords_battery_saver_schedule" msgid="7358789228486231944">"rotina, agenda, economia de bateria, economia de energia, bateria, automático, percentagem"</string>
- <string name="keywords_add_an_account" msgid="6488139919428902434">"perfil de trabalho"</string>
+ <string name="keywords_enhance_4g_lte" msgid="2273810564244790859">"volte, chamada avançada, chamadas por 4g"</string>
<string name="default_sound" msgid="8821684447333687810">"Som padrão"</string>
<string name="sound_settings_summary" msgid="4100853606668287965">"Volume do toque em <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
<string name="sound_dashboard_summary" msgid="3402435125958012986">"Volume, vibração, Não perturbe"</string>
@@ -3889,7 +3886,6 @@
<string name="permit_draw_overlay" msgid="7456536798718633432">"Permitir sobreposição a outros apps"</string>
<string name="allow_overlay_description" msgid="8961670023925421358">"Permite que esse app seja exibido em sobreposição a outros apps que você esteja usando. Pode haver interferência no uso e alteração nas atividades desses apps."</string>
<string name="keywords_vr_listener" msgid="7441221822576384680">"rv realidade virtual ouvinte estéreo serviço de ajuda"</string>
- <string name="keywords_system_alert_window" msgid="5049498015597864850">"alerta do sistema janela caixa de diálogo sobreposição apps"</string>
<string name="overlay_settings" msgid="6930854109449524280">"Sobrepor a outros apps"</string>
<string name="system_alert_window_summary" msgid="602892301318324492">"<xliff:g id="COUNT_0">%1$d</xliff:g> de <xliff:g id="COUNT_1">%2$d</xliff:g> apps têm permissão para serem sobrepostos a outros apps"</string>
<string name="filter_overlay_apps" msgid="6965969283342557573">"Apps com permissão"</string>
@@ -4125,7 +4121,6 @@
<string name="notification_log_details_none" msgid="184131801230614059">"nenhum"</string>
<string name="notification_log_details_ranking_null" msgid="244660392058720919">"O objeto de classificação está ausente."</string>
<string name="notification_log_details_ranking_none" msgid="599607025882587844">"O objeto de classificação não contém essa chave."</string>
- <string name="theme_customization_category" msgid="1049181544004163283">"Aplicação de temas"</string>
<string name="theme_customization_device_default" msgid="5058147707906551368">"Padrão do dispositivo"</string>
<string name="display_cutout_emulation" msgid="7466869822418376317">"Corte da tela"</string>
<string name="display_cutout_emulation_keywords" msgid="4495418317471622562">"corte de tela, entalhe"</string>
@@ -4551,6 +4546,8 @@
<string name="network_connection_errorstate_dialog_message" msgid="6953778550775646710">"Algo deu errado. O aplicativo cancelou a solicitação para selecionar um dispositivo."</string>
<string name="network_connection_connect_successful" msgid="5935510954474494928">"Conexão realizada"</string>
<string name="network_connection_request_dialog_showall" msgid="6938922880244567521">"Mostrar tudo"</string>
+ <string name="network_connection_searching_message" msgid="4638576789450817530">"Procurando dispositivo…"</string>
+ <string name="network_connection_connecting_message" msgid="3740982406609245654">"Conectando ao dispositivo…"</string>
<plurals name="show_bluetooth_devices" formatted="false" msgid="1715020480026568408">
<item quantity="one"><xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> dispositivo conectado</item>
<item quantity="other"><xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> dispositivos conectados</item>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index ba5563f..f17de01 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -360,8 +360,6 @@
<string name="security_enable_widgets_disabled_summary" msgid="6392489775303464905">"Desativado pelo gestor"</string>
<string name="lockdown_settings_title" msgid="7393790212603280213">"Mostrar opção de bloqueio"</string>
<string name="lockdown_settings_summary" msgid="4359438673563318171">"Apresente a opção de botão ligar/desligar, que desativa o Smart Lock, o desbloqueio com dados biométricos e as notificações no ecrã de bloqueio"</string>
- <string name="trust_agents_extend_unlock_title" msgid="2796555263565097031">"Agentes fidedignos só podem ampliar o desbloqueio"</string>
- <string name="trust_agents_extend_unlock_summary" msgid="3976344969220255010">"Se estiver ativado, os agentes fidedignos mantêm o seu dispositivo desbloqueado durante mais tempo, mas já não conseguem desbloquear um dispositivo bloqueado."</string>
<string name="trust_lost_locks_screen_title" msgid="2992742466966021682">"Bloq. ecrã quando se perder a confiança"</string>
<string name="trust_lost_locks_screen_summary" msgid="693784434582021206">"Se estiver ativado, o dispositivo fica bloqueado quando o último agente fidedigno perder a confiança."</string>
<string name="owner_info_settings_summary" msgid="7472393443779227052">"Nenhum"</string>
@@ -937,6 +935,7 @@
<string name="wifi_eap_identity" msgid="4359453783379679103">"Identidade"</string>
<string name="wifi_eap_anonymous" msgid="2989469344116577955">"Identidade anónima"</string>
<string name="wifi_password" msgid="5948219759936151048">"Palavra-passe"</string>
+ <string name="wifi_sae_password_id" msgid="1697832722221765763">"Identificador palavra-passe SAE"</string>
<string name="wifi_show_password" msgid="6461249871236968884">"Mostrar palavra-passe"</string>
<string name="wifi_ap_band_config" msgid="1611826705989117930">"Selecionar banda do PA"</string>
<string name="wifi_ap_choose_auto" msgid="2677800651271769965">"Automático"</string>
@@ -957,7 +956,6 @@
<string name="wifi_dpp_share_wifi" msgid="9065890131734833809">"Partilhar Wi‑Fi"</string>
<string name="wifi_dpp_scan_qr_code_with_another_device" msgid="5854392840857123065">"Leia este código QR para se ligar a \"<xliff:g id="SSID">%1$s</xliff:g>\" e partilhar a palavra-passe"</string>
<string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="4436318319178361543">"Leia este código QR para se ligar a \"<xliff:g id="SSID">%1$s</xliff:g>\""</string>
- <string name="wifi_dpp_could_not_detect_valid_qr_code" msgid="641893675646330576">"Não foi possível ler o código QR. Volte a centrar o código e tente novamente."</string>
<string name="wifi_dpp_failure_authentication_or_configuration" msgid="3372757783382381044">"Tente novamente. Se o problema persistir, contacte o fabricante do dispositivo."</string>
<string name="wifi_dpp_failure_not_compatible" msgid="2829930473520603740">"Ocorreu um erro."</string>
<string name="wifi_dpp_failure_timeout" msgid="5228320772245820458">"Certifique-se de que o dispositivo está ligado à corrente, carregado e ligado."</string>
@@ -980,6 +978,7 @@
<string name="wifi_dpp_hotspot_password" msgid="4120419278831581613">"Palavra-passe da zona Wi-Fi: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
<string name="wifi_dpp_add_device" msgid="4072206063308645677">"Adicionar dispositivo"</string>
<string name="wifi_dpp_connect_network_using_qr_code" msgid="3887335309163999665">"Utilize um código QR para adicionar um dispositivo a esta rede"</string>
+ <string name="wifi_dpp_qr_code_is_not_valid_format" msgid="3700087439867692944">"O código QR não é um formato válido."</string>
<string name="retry" msgid="6472609612090877557">"Repetir"</string>
<string name="wifi_shared" msgid="844142443226926070">"Partilhar com outros utilizadores do dispositivo"</string>
<string name="wifi_unchanged" msgid="3410422020930397102">"(sem alteração)"</string>
@@ -1129,6 +1128,7 @@
<string name="emergency_address_title" msgid="932729250447887545">"Endereço de emergência"</string>
<string name="emergency_address_summary" msgid="7751971156196115129">"Utilizado como a sua localização quando efetuar chamadas de emergência através de Wi‑Fi."</string>
<string name="private_dns_help_message" msgid="3299567069152568958"><annotation id="url">"Saiba mais"</annotation>" acerca das funcionalidades de DNS privado."</string>
+ <string name="private_dns_mode_on" msgid="5882613439541371003">"Ativado"</string>
<string name="wifi_calling_pref_managed_by_carrier" msgid="6845711858866828986">"Definição gerida pelo operador."</string>
<string name="wifi_calling_settings_activation_instructions" msgid="7492509632478260955">"Ativar Chamadas Wi-Fi"</string>
<string name="wifi_calling_turn_on" msgid="1171403510313983983">"Ativar Chamadas Wi-Fi"</string>
@@ -1872,7 +1872,7 @@
<string name="default_emergency_app" msgid="1951760659640369980">"Aplicação de emergência"</string>
<string name="reset_app_preferences" msgid="1321050641018356925">"Repor preferências de aplicações"</string>
<string name="reset_app_preferences_title" msgid="6093179367325336662">"Repor preferências de aplicações?"</string>
- <string name="reset_app_preferences_desc" msgid="4822447731869201512">"Procede à reposição de todas as preferências de:\n\n"<li>"Aplicações desativadas"</li>\n<li>"Notificações de aplicações desativadas"</li>\n<li>"Aplicações predefinidas para ações"</li>\n<li>"Restrições de dados em segundo plano para aplicações"</li>\n<li>"Todas as restrições de permissão"</li>\n\n"Não irá perder quaisquer dados das aplicações."</string>
+ <string name="reset_app_preferences_desc" msgid="731757609326016760">"Esta ação irá repor todas as preferências de:\n\n"<li>"Aplicações desativadas"</li>\n<li>"Notificações de aplicações desativadas"</li>\n<li>"Aplicações predefinidas para ações"</li>\n<li>"Restrições de dados de segundo plano para aplicações"</li>\n<li>"Todas as restrições de autorização"</li>\n\n"Não irá perder quaisquer dados das aplicações."</string>
<string name="reset_app_preferences_button" msgid="2559089511841281242">"Repor aplicações"</string>
<string name="manage_space_text" msgid="8852711522447794676">"Gerir espaço"</string>
<string name="filter" msgid="2018011724373033887">"Filtrar"</string>
@@ -2087,7 +2087,7 @@
<string name="accessibility_screen_magnification_short_summary" msgid="3411979839172752057">"Tocar três vezes para aumentar/diminuir o zoom"</string>
<string name="accessibility_screen_magnification_navbar_short_summary" msgid="3693116360267980492">"Tocar num botão para utilizar o zoom"</string>
<string name="accessibility_screen_magnification_summary" msgid="5258868553337478505"><b>"Para utilizar o zoom"</b>", toque rapidamente no ecrã três vezes.\n"<ul><li>"Arraste dois ou mais dedos para se deslocar"</li>\n<li>"Junte dois ou mais dedos para ajustar o zoom"</li></ul>\n\n<b>"Para utilizar o zoom temporariamente"</b>", toque rapidamente no ecrã três vezes sem soltar ao terceiro toque.\n"<ul><li>"Arraste para se mover no ecrã"</li>\n<li>"Levante o dedo para diminuir o zoom"</li></ul>\n\n"Não é possível utilizar o teclado ou a barra de navegação para aumentar o zoom."</string>
- <string name="accessibility_screen_magnification_navbar_summary" msgid="2272878354599332009">"Quando a ampliação estiver ativada, pode aumentar o zoom no ecrã.\n\n"<b>"Para utilizar o zoom"</b>", inicie a ampliação e, em seguida, toque em qualquer parte do ecrã.\n"<ul><li>"• Arraste 2 ou mais dedos para se deslocar."</li>\n<li>"• Junte 2 ou mais dedos para ajustar o zoom."</li></ul>\n\n<b>"Para utilizar o zoom temporariamente"</b>", inicie a ampliação e, em seguida, toque sem soltar em qualquer parte do ecrã.\n"<ul><li>"• Arraste o dedo para se mover pelo ecrã."</li>\n<li>"• Levante o dedo para diminuir o zoom."</li></ul>\n\n"Não é possível aumentar o zoom no teclado ou na barra de navegação."</string>
+ <string name="accessibility_screen_magnification_navbar_summary" msgid="6700716275347612310">"Quando a ampliação estiver ativada, pode aumentar o zoom no ecrã.\n\n"<b>"Para utilizar o zoom"</b>", inicie a ampliação e, em seguida, toque em qualquer parte do ecrã.\n"<ul><li>"Arraste 2 ou mais dedos para se deslocar."</li>\n<li>"Junte 2 ou mais dedos para ajustar o zoom."</li></ul>\n\n<b>"Para utilizar o zoom temporariamente"</b>", inicie a ampliação e, em seguida, toque sem soltar em qualquer parte do ecrã.\n"<ul><li>"Arraste o dedo para se mover pelo ecrã."</li>\n<li>"Levante o dedo para diminuir o zoom."</li></ul>\n\n"Não é possível aumentar o zoom no teclado nem na barra de navegação."</string>
<string name="accessibility_tutorial_dialog_title_button" msgid="3682222614034474845">"Utilize o botão de acessibilidade para abrir"</string>
<string name="accessibility_tutorial_dialog_title_gesture" msgid="1342726230497913398">"Utilize gestos para abrir"</string>
<string name="accessibility_tutorial_dialog_title_gesture_settings" msgid="8539392614235820285">"Utilize o novo gesto de acessibilidade"</string>
@@ -2140,8 +2140,7 @@
<string name="accessibility_hearingaid_title" msgid="8312145423610648518">"Aparelhos auditivos"</string>
<string name="accessibility_hearingaid_not_connected_summary" msgid="6240237523789614599">"Nenhum aparelho auditivo associado"</string>
<string name="accessibility_hearingaid_adding_summary" msgid="2947474468412309778">"Adicione aparelhos auditivos"</string>
- <string name="accessibility_hearingaid_pair_instructions_first_message" msgid="3912093691643131154">"Para sincronizar os aparelhos auditivos, localize os dispositivos no ecrã seguinte e toque nos mesmos."</string>
- <string name="accessibility_hearingaid_pair_instructions_second_message" msgid="5596683393607650243">"Certifique-se de que os aparelhos auditivos estão no modo de sincronização."</string>
+ <string name="accessibility_hearingaid_pair_instructions_message" msgid="3094382949733435414">"Para sincronizar os aparelhos auditivos, localize os dispositivos no ecrã seguinte e toque nos mesmos. Certifique-se de que os aparelhos auditivos estão no modo de sincronização."</string>
<string name="accessibility_hearingaid_active_device_summary" msgid="3924362383258688984">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ativo"</string>
<plurals name="show_number_hearingaid_count" formatted="false" msgid="3160782397139295486">
<item quantity="other"><xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> aparelhos auditivos guardados.</item>
@@ -2490,7 +2489,6 @@
<string name="menu_stats_last_unplugged" msgid="5922246077592434526">"Desde a última vez que foi desligado por <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
<string name="menu_stats_total" msgid="8973377864854807854">"Totais de utilização"</string>
<string name="menu_stats_refresh" msgid="1676215433344981075">"Atualizar"</string>
- <string name="process_kernel_label" msgid="3916858646836739323">"SO Android"</string>
<string name="process_mediaserver_label" msgid="6500382062945689285">"Mediaserver"</string>
<string name="process_dex2oat_label" msgid="2592408651060518226">"Otimização de aplicações"</string>
<string name="battery_saver" msgid="8172485772238572153">"Poupança de bateria"</string>
@@ -2621,8 +2619,6 @@
<string name="no_device_admins" msgid="4846602835339095768">"Nenhuma aplicação de administração do dispositivo disponível"</string>
<string name="personal_device_admin_title" msgid="2849617316347669861">"Pessoal"</string>
<string name="managed_device_admin_title" msgid="7853955652864478435">"Trabalho"</string>
- <string name="sms_access_restriction_enabled" msgid="7054488078710530278">"Restringir o acesso ao registo de chamadas e SMS"</string>
- <string name="sms_access_restriction_enabled_summary" msgid="6851339654677842328">"Apenas as aplicações de mensagens e de telefone predefinidas têm autorizações de registo de chamadas e de SMS."</string>
<string name="no_trust_agents" msgid="7450273545568977523">"Nenhum agente fidedigno disponível"</string>
<string name="add_device_admin_msg" msgid="1501847129819382149">"Ativar aplicação admin. do dispositivo?"</string>
<string name="add_device_admin" msgid="4192055385312215731">"Ativar a aplicação de administração deste dispositivo"</string>
@@ -3111,7 +3107,7 @@
<string name="keywords_app_default" msgid="5822717006354487071">"Abrir com"</string>
<string name="keywords_applications_settings" msgid="1268353611121497450">"Aplicações"</string>
<string name="keywords_time_zone" msgid="998254736898753085">"fuso horário"</string>
- <string name="keywords_draw_overlay" msgid="4130899177619041842">"Balão de chat"</string>
+ <string name="keywords_draw_overlay" msgid="1001120206241401007">"Balão de chat, sistema, alerta, janela, caixa de diálogo, ecrã, sobrepor-se a outras aplicações, desenhar"</string>
<string name="keywords_flashlight" msgid="6161632177705233710">"Lanterna, luz"</string>
<string name="keywords_change_wifi_state" msgid="627068244033681010">"Wifi, Wi-Fi, ativar/desativar, controlar"</string>
<string name="keywords_more_mobile_networks" msgid="8995946622054642367">"telemóvel, dispositivo móvel, operador de telemóvel, sem fios, dados, 4g, 3g, 2g, lte"</string>
@@ -3135,7 +3131,7 @@
<string name="keywords_sounds_and_notifications_interruptions" msgid="5426093074031208917">"não, não incomodar, interromper, interrupção, pausa"</string>
<string name="keywords_app" msgid="6334757056536837791">"RAM"</string>
<string name="keywords_location" msgid="4132655528196729043">"próximo, localização, histórico, relatórios, GPS"</string>
- <string name="keywords_accounts" msgid="1957925565953357627">"conta"</string>
+ <string name="keywords_accounts" msgid="4479029747403203867">"conta, adicionar uma conta, perfil de trabalho"</string>
<string name="keywords_users" msgid="3434190133131387942">"restrição, restringir, restrito"</string>
<string name="keywords_keyboard_and_ime" msgid="9143339015329957107">"correção de texto, corrigir, som, vibrar, idioma, automático, gesto, sugerir, sugestão, tema, palavra, ofensiva, escrever, emoji, internacional"</string>
<string name="keywords_reset_apps" msgid="5293291209613191845">"repor, preferências, predefinição"</string>
@@ -3173,6 +3169,7 @@
<string name="keywords_storage_settings" msgid="297283751968446577">"memória, cache, dados, eliminar, limpar, libertar, espaço"</string>
<string name="keywords_bluetooth_settings" msgid="6804844062789439858">"associado, dispositivo, auscultadores, auscultadores com microfone integrado, altifalante, sem fios, sincronizar, auriculares, música, multimédia"</string>
<string name="keywords_wallpaper" msgid="5058364390917429896">"fundo, ecrã, ecrã de bloqueio, tema"</string>
+ <string name="keywords_styles" msgid="5828725481814049422">"forma do ícone, cor de destaque, tipo de letra"</string>
<string name="keywords_assist_input" msgid="5017533309492679287">"predefinição, assistente"</string>
<string name="keywords_default_payment_app" msgid="3838565809518896799">"pagamento, predefinido"</string>
<string name="keywords_ambient_display" msgid="3103487805748659132">"notificação recebida"</string>
@@ -3182,7 +3179,7 @@
<string name="keywords_notification_vibration" msgid="31924624421190547">"funcionalidade tátil, vibrar, sensibilidade"</string>
<string name="keywords_battery_saver_sticky" msgid="5586215686021650278">"poupança de bateria, fixa, persistente, poupança de energia, bateria"</string>
<string name="keywords_battery_saver_schedule" msgid="7358789228486231944">"rotina, horário, poupança de bateria, poupança de energia, bateria, automática, percentagem"</string>
- <string name="keywords_add_an_account" msgid="6488139919428902434">"perfil de trabalho"</string>
+ <string name="keywords_enhance_4g_lte" msgid="2273810564244790859">"volte, chamadas avançadas, chamadas 4g"</string>
<string name="default_sound" msgid="8821684447333687810">"Som predefinido"</string>
<string name="sound_settings_summary" msgid="4100853606668287965">"Volume do toque a <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
<string name="sound_dashboard_summary" msgid="3402435125958012986">"Volume, vibração, Não incomodar"</string>
@@ -3889,7 +3886,6 @@
<string name="permit_draw_overlay" msgid="7456536798718633432">"Permitir sobreposição a outras aplicações"</string>
<string name="allow_overlay_description" msgid="8961670023925421358">"Permita que esta aplicação se sobreponha a outras aplicações que esteja a utilizar. Pode interferir com a sua utilização dessas aplicações ou alterar a forma como estas aparecem ou se comportam."</string>
<string name="keywords_vr_listener" msgid="7441221822576384680">"rv realidade virtual serviço de escuta estéreo serviço assistente"</string>
- <string name="keywords_system_alert_window" msgid="5049498015597864850">"janela de alerta do sistema caixa de diálogo sobrepor-se a outras aplicações"</string>
<string name="overlay_settings" msgid="6930854109449524280">"Sobrepor a outras aplicações"</string>
<string name="system_alert_window_summary" msgid="602892301318324492">"<xliff:g id="COUNT_0">%1$d</xliff:g> de <xliff:g id="COUNT_1">%2$d</xliff:g> aplicações autorizadas a sobreporem-se a outras aplicações"</string>
<string name="filter_overlay_apps" msgid="6965969283342557573">"Aplicações com autorização"</string>
@@ -4125,7 +4121,6 @@
<string name="notification_log_details_none" msgid="184131801230614059">"nenhum"</string>
<string name="notification_log_details_ranking_null" msgid="244660392058720919">"O objeto de classificação está em falta."</string>
<string name="notification_log_details_ranking_none" msgid="599607025882587844">"O objeto de classificação não contém esta chave."</string>
- <string name="theme_customization_category" msgid="1049181544004163283">"Temas"</string>
<string name="theme_customization_device_default" msgid="5058147707906551368">"Predefinição do dispositivo"</string>
<string name="display_cutout_emulation" msgid="7466869822418376317">"Recorte no ecrã"</string>
<string name="display_cutout_emulation_keywords" msgid="4495418317471622562">"ecrã com recorte, entalhe"</string>
@@ -4551,6 +4546,8 @@
<string name="network_connection_errorstate_dialog_message" msgid="6953778550775646710">"Ocorreu um erro. A aplicação cancelou o pedido de escolha de um dispositivo."</string>
<string name="network_connection_connect_successful" msgid="5935510954474494928">"Ligação estabelecida com êxito"</string>
<string name="network_connection_request_dialog_showall" msgid="6938922880244567521">"Mostrar tudo"</string>
+ <string name="network_connection_searching_message" msgid="4638576789450817530">"A procurar dispositivo…"</string>
+ <string name="network_connection_connecting_message" msgid="3740982406609245654">"A ligar ao dispositivo…"</string>
<plurals name="show_bluetooth_devices" formatted="false" msgid="1715020480026568408">
<item quantity="other"><xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> dispositivos ligados.</item>
<item quantity="one"><xliff:g id="NUMBER_DEVICE_COUNT_0">%1$d</xliff:g> dispositivo ligado</item>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 35049f1..fc01809 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -360,8 +360,6 @@
<string name="security_enable_widgets_disabled_summary" msgid="6392489775303464905">"Desativada pelo administrador"</string>
<string name="lockdown_settings_title" msgid="7393790212603280213">"Mostrar opção de bloqueio total"</string>
<string name="lockdown_settings_summary" msgid="4359438673563318171">"Exibir a opção do botão liga/desliga que desativa o Smart Lock, o desbloqueio biométrico e as notificações na tela de bloqueio"</string>
- <string name="trust_agents_extend_unlock_title" msgid="2796555263565097031">"Agentes de confiança só podem ampliar o desbloqueio"</string>
- <string name="trust_agents_extend_unlock_summary" msgid="3976344969220255010">"Se essa opção for ativada, os agentes de confiança poderão manter o dispositivo desbloqueado por mais tempo, mas não poderão desbloquear o dispositivo"</string>
<string name="trust_lost_locks_screen_title" msgid="2992742466966021682">"Bloquear tela quando a confiança for perdida"</string>
<string name="trust_lost_locks_screen_summary" msgid="693784434582021206">"Se essa opção for ativada, o dispositivo será bloqueado quando o último agente de confiança perder a confiança"</string>
<string name="owner_info_settings_summary" msgid="7472393443779227052">"Nenhuma"</string>
@@ -937,6 +935,7 @@
<string name="wifi_eap_identity" msgid="4359453783379679103">"Identidade"</string>
<string name="wifi_eap_anonymous" msgid="2989469344116577955">"Identidade anônima"</string>
<string name="wifi_password" msgid="5948219759936151048">"Senha"</string>
+ <string name="wifi_sae_password_id" msgid="1697832722221765763">"Identificador de senha SAE"</string>
<string name="wifi_show_password" msgid="6461249871236968884">"Mostrar senha"</string>
<string name="wifi_ap_band_config" msgid="1611826705989117930">"Selecionar banda do ponto de acesso"</string>
<string name="wifi_ap_choose_auto" msgid="2677800651271769965">"Automático"</string>
@@ -957,7 +956,6 @@
<string name="wifi_dpp_share_wifi" msgid="9065890131734833809">"Compartilhar Wi‑Fi"</string>
<string name="wifi_dpp_scan_qr_code_with_another_device" msgid="5854392840857123065">"Faça a leitura deste código QR para conectar-se a “<xliff:g id="SSID">%1$s</xliff:g>” e compartilhar a senha"</string>
<string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="4436318319178361543">"Faça a leitura deste código QR para conectar-se a “<xliff:g id="SSID">%1$s</xliff:g>”"</string>
- <string name="wifi_dpp_could_not_detect_valid_qr_code" msgid="641893675646330576">"Não foi possível ler o código QR. Centralize a tela no código e tente novamente"</string>
<string name="wifi_dpp_failure_authentication_or_configuration" msgid="3372757783382381044">"Tente novamente. Se o problema persistir, entre em contato com o fabricante do dispositivo"</string>
<string name="wifi_dpp_failure_not_compatible" msgid="2829930473520603740">"Algo deu errado"</string>
<string name="wifi_dpp_failure_timeout" msgid="5228320772245820458">"Verifique se o dispositivo está conectado, carregado e ligado"</string>
@@ -980,6 +978,7 @@
<string name="wifi_dpp_hotspot_password" msgid="4120419278831581613">"Senha do ponto de acesso: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
<string name="wifi_dpp_add_device" msgid="4072206063308645677">"Adicionar dispositivo"</string>
<string name="wifi_dpp_connect_network_using_qr_code" msgid="3887335309163999665">"Use um código QR para adicionar um dispositivo a esta rede"</string>
+ <string name="wifi_dpp_qr_code_is_not_valid_format" msgid="3700087439867692944">"O código QR não está em um formato válido"</string>
<string name="retry" msgid="6472609612090877557">"Repetir"</string>
<string name="wifi_shared" msgid="844142443226926070">"Compartilhar com outros usuários do dispositivo"</string>
<string name="wifi_unchanged" msgid="3410422020930397102">"(sem alteração)"</string>
@@ -1129,6 +1128,7 @@
<string name="emergency_address_title" msgid="932729250447887545">"Endereço de emergência"</string>
<string name="emergency_address_summary" msgid="7751971156196115129">"Usado como seu local quando você faz uma chamada de emergência usando o Wi‑Fi"</string>
<string name="private_dns_help_message" msgid="3299567069152568958"><annotation id="url">"Saiba mais"</annotation>" sobre recursos de DNS particular"</string>
+ <string name="private_dns_mode_on" msgid="5882613439541371003">"Ativado"</string>
<string name="wifi_calling_pref_managed_by_carrier" msgid="6845711858866828986">"Configuração gerenciada pela operadora"</string>
<string name="wifi_calling_settings_activation_instructions" msgid="7492509632478260955">"Ativar chamada no Wi-Fi"</string>
<string name="wifi_calling_turn_on" msgid="1171403510313983983">"Ativar chamada no Wi-Fi"</string>
@@ -1872,7 +1872,7 @@
<string name="default_emergency_app" msgid="1951760659640369980">"App de emergência"</string>
<string name="reset_app_preferences" msgid="1321050641018356925">"Redefinir apps"</string>
<string name="reset_app_preferences_title" msgid="6093179367325336662">"Redefinir apps?"</string>
- <string name="reset_app_preferences_desc" msgid="4822447731869201512">"Isso redefinirá todas as preferências para:\n\n"<li>"Apps desabilitados"</li>\n<li>"Notificações de apps desabilitados"</li>\n<li>"Apps padrão para ações"</li>\n<li>"Restrições de dados em segundo plano para apps"</li>\n<li>"Qualquer restrição de permissão"</li>\n\n"Você não perderá os dados dos apps."</string>
+ <string name="reset_app_preferences_desc" msgid="731757609326016760">"Isso redefinirá todas as preferências para:\n\n"<li>" apps desativados;"</li>" \n "<li>"notificações de apps desativados; "</li>\n<li>"apps padrão para ações;"</li>\n<li>"restrições de dados em segundo plano para apps; "</li>\n<li>"qualquer restrição de permissão."</li>\n\n"Você não perderá os dados dos apps."</string>
<string name="reset_app_preferences_button" msgid="2559089511841281242">"Redefinir apps"</string>
<string name="manage_space_text" msgid="8852711522447794676">"Gerenciar espaço"</string>
<string name="filter" msgid="2018011724373033887">"Filtro"</string>
@@ -2087,7 +2087,7 @@
<string name="accessibility_screen_magnification_short_summary" msgid="3411979839172752057">"Tocar três vezes para ampliar"</string>
<string name="accessibility_screen_magnification_navbar_short_summary" msgid="3693116360267980492">"Toque em um botão para aplicar zoom"</string>
<string name="accessibility_screen_magnification_summary" msgid="5258868553337478505"><b>"Para aplicar zoom"</b>", toque três vezes na tela rapidamente.\n"<ul><li>"Arraste dois ou mais dedos para rolar"</li>\n<li>"Faça um gesto de pinça com dois ou mais dedos para ajustar o zoom"</li></ul>\n\n<b>"Para aplicar zoom temporariamente"</b>", toque rapidamente na tela três vezes e mantenha o dedo pressionado no terceiro toque.\n"<ul><li>"Arraste para mover pela tela"</li>\n<li>"Levante o dedo para diminuir o zoom"</li></ul>\n\n"Não é possível aumentar o zoom no teclado e na barra de navegação."</string>
- <string name="accessibility_screen_magnification_navbar_summary" msgid="2272878354599332009">"Quando a ampliação está ativada, você pode aumentar o zoom na tela.\n\n"<b>"Para aplicar zoom"</b>", inicie a ampliação e toque em qualquer lugar da tela.\n"<ul><li>"• Arraste com dois ou mais dedos para rolar a tela."</li>\n<li>"• Faça um movimento de pinça com dois ou mais dedos para ajustar o zoom."</li></ul>\n\n<b>"Se quiser aplicar zoom temporariamente"</b>", inicie a ampliação, toque em qualquer parte da tela e mantenha-a pressionada.\n"<ul><li>"• Arraste para mover a visualização."</li>\n<li>"• Levante o dedo para diminuir o zoom."</li></ul>\n\n"Não é possível aumentar o zoom no teclado nem na barra de navegação."</string>
+ <string name="accessibility_screen_magnification_navbar_summary" msgid="6700716275347612310">"Quando a ampliação está ativada, você pode aumentar o zoom na tela.\n\n"<b>"Para aplicar zoom"</b>", inicie a ampliação e toque em qualquer lugar da tela.\n"<ul><li>"Arraste dois dedos ou mais para rolar a tela."</li>\n<li>"Faça um gesto de pinça com dois ou mais dedos para ajustar o zoom."</li></ul>\n\n<b>"Para aplicar zoom temporariamente"</b>", inicie a ampliação e depois toque em qualquer ponto na tela e mantenha-o pressionado.\n"<ul><li>"Arraste para mover a tela."</li>\n<li>"Levante o dedo para diminuir o zoom."</li></ul>\n\n"Não é possível aumentar o zoom no teclado e na barra de navegação."</string>
<string name="accessibility_tutorial_dialog_title_button" msgid="3682222614034474845">"Usar o botão de acessibilidade para abrir"</string>
<string name="accessibility_tutorial_dialog_title_gesture" msgid="1342726230497913398">"Usar gesto para abrir"</string>
<string name="accessibility_tutorial_dialog_title_gesture_settings" msgid="8539392614235820285">"Usar o novo gesto de acessibilidade"</string>
@@ -2140,8 +2140,7 @@
<string name="accessibility_hearingaid_title" msgid="8312145423610648518">"Aparelhos auditivos"</string>
<string name="accessibility_hearingaid_not_connected_summary" msgid="6240237523789614599">"Nenhum aparelho auditivo conectado"</string>
<string name="accessibility_hearingaid_adding_summary" msgid="2947474468412309778">"Adicionar aparelhos auditivos"</string>
- <string name="accessibility_hearingaid_pair_instructions_first_message" msgid="3912093691643131154">"Para parear aparelhos auditivos, localize seu dispositivo na próxima tela e toque nele."</string>
- <string name="accessibility_hearingaid_pair_instructions_second_message" msgid="5596683393607650243">"Verifique se seus aparelhos auditivos estão no modo de pareamento."</string>
+ <string name="accessibility_hearingaid_pair_instructions_message" msgid="3094382949733435414">"Para parear aparelhos auditivos, localize seu dispositivo na próxima tela e toque nele. Verifique se seus aparelhos auditivos estão no modo de pareamento."</string>
<string name="accessibility_hearingaid_active_device_summary" msgid="3924362383258688984">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ativo"</string>
<plurals name="show_number_hearingaid_count" formatted="false" msgid="3160782397139295486">
<item quantity="one"><xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> aparelho auditivo salvo</item>
@@ -2490,7 +2489,6 @@
<string name="menu_stats_last_unplugged" msgid="5922246077592434526">"Quando foi desconectado pela última vez para <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
<string name="menu_stats_total" msgid="8973377864854807854">"Total de uso"</string>
<string name="menu_stats_refresh" msgid="1676215433344981075">"Atualizar"</string>
- <string name="process_kernel_label" msgid="3916858646836739323">"Sistema operacional Android"</string>
<string name="process_mediaserver_label" msgid="6500382062945689285">"Servidor de mídia"</string>
<string name="process_dex2oat_label" msgid="2592408651060518226">"Otimização do app"</string>
<string name="battery_saver" msgid="8172485772238572153">"Economia de bateria"</string>
@@ -2621,8 +2619,6 @@
<string name="no_device_admins" msgid="4846602835339095768">"Nenhum app de administrador do dispositivo disponível"</string>
<string name="personal_device_admin_title" msgid="2849617316347669861">"Pessoal"</string>
<string name="managed_device_admin_title" msgid="7853955652864478435">"Trabalho"</string>
- <string name="sms_access_restriction_enabled" msgid="7054488078710530278">"Restringir acesso a SMS e registro de chamadas"</string>
- <string name="sms_access_restriction_enabled_summary" msgid="6851339654677842328">"Apenas apps padrão de chamadas e mensagens têm permissões para SMS e registro de chamadas"</string>
<string name="no_trust_agents" msgid="7450273545568977523">"Nenhum agente de confiança disponível"</string>
<string name="add_device_admin_msg" msgid="1501847129819382149">"Ativar app de admin. do dispositivo?"</string>
<string name="add_device_admin" msgid="4192055385312215731">"Ativar o app de administrador deste dispositivo"</string>
@@ -3111,7 +3107,7 @@
<string name="keywords_app_default" msgid="5822717006354487071">"Abrir com"</string>
<string name="keywords_applications_settings" msgid="1268353611121497450">"Apps"</string>
<string name="keywords_time_zone" msgid="998254736898753085">"fuso horário"</string>
- <string name="keywords_draw_overlay" msgid="4130899177619041842">"Cabeçalho do chat"</string>
+ <string name="keywords_draw_overlay" msgid="1001120206241401007">"Ícone do chat, sistema, alerta, janela, diálogo, tela, sobre outros apps, sobrepor"</string>
<string name="keywords_flashlight" msgid="6161632177705233710">"Lanterna, Luz, Luminária"</string>
<string name="keywords_change_wifi_state" msgid="627068244033681010">"wifi, wi-fi, alternar, controle"</string>
<string name="keywords_more_mobile_networks" msgid="8995946622054642367">"celular, dispositivo móvel, operadora de celular, sem fio, dados, 4g, 3g, 2g, lte"</string>
@@ -3135,7 +3131,7 @@
<string name="keywords_sounds_and_notifications_interruptions" msgid="5426093074031208917">"não perturbe, interromper, interrupção"</string>
<string name="keywords_app" msgid="6334757056536837791">"RAM"</string>
<string name="keywords_location" msgid="4132655528196729043">"por perto, local, histórico, relatório, GPS"</string>
- <string name="keywords_accounts" msgid="1957925565953357627">"conta"</string>
+ <string name="keywords_accounts" msgid="4479029747403203867">"conta, adicionar uma conta, perfil de trabalho"</string>
<string name="keywords_users" msgid="3434190133131387942">"restrição, restringir, restrito"</string>
<string name="keywords_keyboard_and_ime" msgid="9143339015329957107">"correção de texto, corrigir, som, vibrar, automático, idioma, gesto, sugerir, sugestão, tema, ofensivo, palavra, digitar, emoji, internacional"</string>
<string name="keywords_reset_apps" msgid="5293291209613191845">"redefinir, preferências, padrão"</string>
@@ -3173,6 +3169,7 @@
<string name="keywords_storage_settings" msgid="297283751968446577">"memória, cache, dados, excluir, limpar, liberar, espaço"</string>
<string name="keywords_bluetooth_settings" msgid="6804844062789439858">"conectado, dispositivo, fones de ouvido, headset, alto-falante, sem fio, parear, música, mídia"</string>
<string name="keywords_wallpaper" msgid="5058364390917429896">"plano de fundo, tela, tela de bloqueio, tema"</string>
+ <string name="keywords_styles" msgid="5828725481814049422">"formato do ícone, cor de destaque, fonte"</string>
<string name="keywords_assist_input" msgid="5017533309492679287">"padrão, assistente"</string>
<string name="keywords_default_payment_app" msgid="3838565809518896799">"pagamento, padrão"</string>
<string name="keywords_ambient_display" msgid="3103487805748659132">"notificação recebida"</string>
@@ -3182,7 +3179,7 @@
<string name="keywords_notification_vibration" msgid="31924624421190547">"funcionalidade tátil, vibração, sensibilidade"</string>
<string name="keywords_battery_saver_sticky" msgid="5586215686021650278">"economia de bateria, fixo, persistir, economia de energia, bateria"</string>
<string name="keywords_battery_saver_schedule" msgid="7358789228486231944">"rotina, agenda, economia de bateria, economia de energia, bateria, automático, percentagem"</string>
- <string name="keywords_add_an_account" msgid="6488139919428902434">"perfil de trabalho"</string>
+ <string name="keywords_enhance_4g_lte" msgid="2273810564244790859">"volte, chamada avançada, chamadas por 4g"</string>
<string name="default_sound" msgid="8821684447333687810">"Som padrão"</string>
<string name="sound_settings_summary" msgid="4100853606668287965">"Volume do toque em <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
<string name="sound_dashboard_summary" msgid="3402435125958012986">"Volume, vibração, Não perturbe"</string>
@@ -3889,7 +3886,6 @@
<string name="permit_draw_overlay" msgid="7456536798718633432">"Permitir sobreposição a outros apps"</string>
<string name="allow_overlay_description" msgid="8961670023925421358">"Permite que esse app seja exibido em sobreposição a outros apps que você esteja usando. Pode haver interferência no uso e alteração nas atividades desses apps."</string>
<string name="keywords_vr_listener" msgid="7441221822576384680">"rv realidade virtual ouvinte estéreo serviço de ajuda"</string>
- <string name="keywords_system_alert_window" msgid="5049498015597864850">"alerta do sistema janela caixa de diálogo sobreposição apps"</string>
<string name="overlay_settings" msgid="6930854109449524280">"Sobrepor a outros apps"</string>
<string name="system_alert_window_summary" msgid="602892301318324492">"<xliff:g id="COUNT_0">%1$d</xliff:g> de <xliff:g id="COUNT_1">%2$d</xliff:g> apps têm permissão para serem sobrepostos a outros apps"</string>
<string name="filter_overlay_apps" msgid="6965969283342557573">"Apps com permissão"</string>
@@ -4125,7 +4121,6 @@
<string name="notification_log_details_none" msgid="184131801230614059">"nenhum"</string>
<string name="notification_log_details_ranking_null" msgid="244660392058720919">"O objeto de classificação está ausente."</string>
<string name="notification_log_details_ranking_none" msgid="599607025882587844">"O objeto de classificação não contém essa chave."</string>
- <string name="theme_customization_category" msgid="1049181544004163283">"Aplicação de temas"</string>
<string name="theme_customization_device_default" msgid="5058147707906551368">"Padrão do dispositivo"</string>
<string name="display_cutout_emulation" msgid="7466869822418376317">"Corte da tela"</string>
<string name="display_cutout_emulation_keywords" msgid="4495418317471622562">"corte de tela, entalhe"</string>
@@ -4551,6 +4546,8 @@
<string name="network_connection_errorstate_dialog_message" msgid="6953778550775646710">"Algo deu errado. O aplicativo cancelou a solicitação para selecionar um dispositivo."</string>
<string name="network_connection_connect_successful" msgid="5935510954474494928">"Conexão realizada"</string>
<string name="network_connection_request_dialog_showall" msgid="6938922880244567521">"Mostrar tudo"</string>
+ <string name="network_connection_searching_message" msgid="4638576789450817530">"Procurando dispositivo…"</string>
+ <string name="network_connection_connecting_message" msgid="3740982406609245654">"Conectando ao dispositivo…"</string>
<plurals name="show_bluetooth_devices" formatted="false" msgid="1715020480026568408">
<item quantity="one"><xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> dispositivo conectado</item>
<item quantity="other"><xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> dispositivos conectados</item>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 65dd16e..cda0d8a 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -362,8 +362,6 @@
<string name="security_enable_widgets_disabled_summary" msgid="6392489775303464905">"Dezactivat de administrator"</string>
<string name="lockdown_settings_title" msgid="7393790212603280213">"Afișați opțiunea de blocare strictă"</string>
<string name="lockdown_settings_summary" msgid="4359438673563318171">"Afișați opțiunea butonului de pornire care dezactivează Smart Lock, deblocarea biometrică și notificările pe ecranul de blocare"</string>
- <string name="trust_agents_extend_unlock_title" msgid="2796555263565097031">"Doar agenții de încredere mențin dispozitivul deblocat mai mult timp"</string>
- <string name="trust_agents_extend_unlock_summary" msgid="3976344969220255010">"Dacă este activată această opțiune, agenții de încredere vor menține dispozitivul deblocat mai mult timp, dar nu mai pot debloca un dispozitiv blocat."</string>
<string name="trust_lost_locks_screen_title" msgid="2992742466966021682">"Ecranul de blocare când încrederea este pierdută"</string>
<string name="trust_lost_locks_screen_summary" msgid="693784434582021206">"Dacă este activată, dispozitivul se va bloca atunci când ultimul agent de încredere pierde încrederea"</string>
<string name="owner_info_settings_summary" msgid="7472393443779227052">"Niciunul"</string>
@@ -953,6 +951,7 @@
<string name="wifi_eap_identity" msgid="4359453783379679103">"Identitate"</string>
<string name="wifi_eap_anonymous" msgid="2989469344116577955">"Identitate anonimă"</string>
<string name="wifi_password" msgid="5948219759936151048">"Parolă"</string>
+ <string name="wifi_sae_password_id" msgid="1697832722221765763">"Identificatorul de parole SAE"</string>
<string name="wifi_show_password" msgid="6461249871236968884">"Afișați parola"</string>
<string name="wifi_ap_band_config" msgid="1611826705989117930">"Selectați banda AP"</string>
<string name="wifi_ap_choose_auto" msgid="2677800651271769965">"Automat"</string>
@@ -973,7 +972,6 @@
<string name="wifi_dpp_share_wifi" msgid="9065890131734833809">"Distribuiți Wi‑Fi"</string>
<string name="wifi_dpp_scan_qr_code_with_another_device" msgid="5854392840857123065">"Scanați acest cod QR ca să vă conectați la „<xliff:g id="SSID">%1$s</xliff:g>” și să trimiteți parola"</string>
<string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="4436318319178361543">"Scanați acest cod QR pentru a vă conecta la „<xliff:g id="SSID">%1$s</xliff:g>”"</string>
- <string name="wifi_dpp_could_not_detect_valid_qr_code" msgid="641893675646330576">"Nu s-a putut citi codul QR. Reintroduceți codul și încercați din nou"</string>
<string name="wifi_dpp_failure_authentication_or_configuration" msgid="3372757783382381044">"Încercați din nou. Dacă problema persistă, contactați producătorul dispozitivului"</string>
<string name="wifi_dpp_failure_not_compatible" msgid="2829930473520603740">"A apărut o eroare"</string>
<string name="wifi_dpp_failure_timeout" msgid="5228320772245820458">"Asigurați-vă că dispozitivul este conectat la priză, încărcat și pornit"</string>
@@ -996,6 +994,7 @@
<string name="wifi_dpp_hotspot_password" msgid="4120419278831581613">"Parolă hotspot: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
<string name="wifi_dpp_add_device" msgid="4072206063308645677">"Adăugați un dispozitiv"</string>
<string name="wifi_dpp_connect_network_using_qr_code" msgid="3887335309163999665">"Folosiți un cod QR pentru a adăuga un dispozitiv la această rețea"</string>
+ <string name="wifi_dpp_qr_code_is_not_valid_format" msgid="3700087439867692944">"Codul QR nu are un format valid"</string>
<string name="retry" msgid="6472609612090877557">"Încercați din nou"</string>
<string name="wifi_shared" msgid="844142443226926070">"Permiteți accesul și altor utilizatori ai dispozitivului"</string>
<string name="wifi_unchanged" msgid="3410422020930397102">"(nu s-a schimbat)"</string>
@@ -1148,6 +1147,7 @@
<string name="emergency_address_title" msgid="932729250447887545">"Adresă de urgență"</string>
<string name="emergency_address_summary" msgid="7751971156196115129">"Folosită ca locație când efectuați un apel de urgență prin Wi-Fi"</string>
<string name="private_dns_help_message" msgid="3299567069152568958"><annotation id="url">"Aflați mai multe"</annotation>" despre funcțiile DNS-ului privat"</string>
+ <string name="private_dns_mode_on" msgid="5882613439541371003">"Activat"</string>
<string name="wifi_calling_pref_managed_by_carrier" msgid="6845711858866828986">"Setare gestionată de operator"</string>
<string name="wifi_calling_settings_activation_instructions" msgid="7492509632478260955">"Activați Apelarea prin Wi-Fi"</string>
<string name="wifi_calling_turn_on" msgid="1171403510313983983">"Activați Apelarea prin Wi-Fi"</string>
@@ -1894,7 +1894,7 @@
<string name="default_emergency_app" msgid="1951760659640369980">"Aplicația de urgență"</string>
<string name="reset_app_preferences" msgid="1321050641018356925">"Resetați preferințele pentru aplicații"</string>
<string name="reset_app_preferences_title" msgid="6093179367325336662">"Resetați preferințele pentru aplicații?"</string>
- <string name="reset_app_preferences_desc" msgid="4822447731869201512">"Se vor reseta toate preferințele pentru:\n\n"<li>"aplicații dezactivate,"</li>\n<li>"notificări de aplicații dezactivate,"</li>\n<li>"aplicații prestabilite pentru acțiuni,"</li>\n<li>"restricții privind datele de fundal pentru aplicații,"</li>\n<li>"orice restricții de permisiuni."</li>\n\n"Nu veți pierde datele aplicațiilor."</string>
+ <string name="reset_app_preferences_desc" msgid="731757609326016760">"Astfel vor fi resetate toate preferințele pentru:\n\n"<li>"aplicații dezactivate,"</li>\n<li>"notificări de aplicații dezactivate,"</li>\n<li>"aplicații prestabilite pentru acțiuni,"</li>\n<li>"restricții privind datele de fundal pentru aplicații,"</li>\n<li>"orice restricții de permisiuni."</li>\n\n"Nu veți pierde datele aplicațiilor."</string>
<string name="reset_app_preferences_button" msgid="2559089511841281242">"Resetați aplicațiile"</string>
<string name="manage_space_text" msgid="8852711522447794676">"Gestionați spațiul"</string>
<string name="filter" msgid="2018011724373033887">"Filtrați"</string>
@@ -2109,7 +2109,7 @@
<string name="accessibility_screen_magnification_short_summary" msgid="3411979839172752057">"Atingeți de 3 ori pentru zoom"</string>
<string name="accessibility_screen_magnification_navbar_short_summary" msgid="3693116360267980492">"Atingeți un buton pentru a micșora/mări"</string>
<string name="accessibility_screen_magnification_summary" msgid="5258868553337478505"><b>"Pentru a mări sau micșora"</b>", atingeți rapid ecranul de 3 ori.\n"<ul><li>"Trageți cu 2 sau mai multe degete pentru a derula"</li>\n<li>"Ciupiți cu 2 sau mai multe degete pentru a ajusta nivelul de zoom"</li></ul>\n\n<b>"Pentru a mări temporar"</b>", atingeți rapid ecranul de 3 ori și țineți apăsat cu degetul la a treia atingere.\n"<ul><li>"Trageți cu degetul pentru a mișca imaginea pe ecran."</li>\n<li>"Ridicați degetul pentru a micșora."</li></ul>\n\n"Nu puteți mări pe tastatură și pe bara de navigare."</string>
- <string name="accessibility_screen_magnification_navbar_summary" msgid="2272878354599332009">"Când mărirea este activată, puteți mări pe ecran.\n\n"<b>"Pentru a mări"</b>", începeți mărirea, apoi atingeți oriunde pe ecran.\n"<ul><li>"• Trageți cu 2 sau mai multe degete pentru a derula"</li>\n<li>"• Ciupiți cu 2 sau mai multe degete pentru a regla nivelul de zoom"</li></ul>\n\n<b>"Pentru a mări temporar"</b>", începeți mărirea, apoi atingeți lung oriunde pe ecran.\n"<ul><li>"• Trageți pentru a vă mișca pe ecran"</li>\n<li>"• Ridicați degetul pentru a micșora"</li></ul>\n\n"Nu puteți mări pe tastatură și pe bara de navigare."</string>
+ <string name="accessibility_screen_magnification_navbar_summary" msgid="6700716275347612310">"Când mărirea este activată, puteți mări pe ecran.\n\n"<b>"Pentru a mări"</b>", începeți mărirea, apoi atingeți oriunde pe ecran.\n"<ul><li>"Trageți cu 2 sau mai multe degete pentru a derula"</li>\n<li>"Ciupiți cu 2 sau mai multe degete pentru a regla nivelul de zoom"</li></ul>\n\n<b>"Pentru a mări temporar"</b>", începeți mărirea, apoi atingeți lung oriunde pe ecran.\n"<ul><li>"Trageți pentru a vă mișca pe ecran"</li>\n<li>"Ridicați degetul pentru a micșora"</li></ul>\n\n"Nu puteți mări pe tastatură și pe bara de navigare."</string>
<string name="accessibility_tutorial_dialog_title_button" msgid="3682222614034474845">"Folosiți butonul de accesibilitate pentru a deschide"</string>
<string name="accessibility_tutorial_dialog_title_gesture" msgid="1342726230497913398">"Folosiți gestul pentru a deschide"</string>
<string name="accessibility_tutorial_dialog_title_gesture_settings" msgid="8539392614235820285">"Folosiți noul gest de accesibilitate"</string>
@@ -2162,8 +2162,7 @@
<string name="accessibility_hearingaid_title" msgid="8312145423610648518">"Aparate auditive"</string>
<string name="accessibility_hearingaid_not_connected_summary" msgid="6240237523789614599">"Nu s-a conectat niciun aparat auditiv"</string>
<string name="accessibility_hearingaid_adding_summary" msgid="2947474468412309778">"Adăugați aparate auditive"</string>
- <string name="accessibility_hearingaid_pair_instructions_first_message" msgid="3912093691643131154">"Pentru a asocia aparatele auditive, găsiți și atingeți dispozitivul pe ecranul următor."</string>
- <string name="accessibility_hearingaid_pair_instructions_second_message" msgid="5596683393607650243">"Asigurați-vă că aparatele auditive sunt în modul de asociere."</string>
+ <string name="accessibility_hearingaid_pair_instructions_message" msgid="3094382949733435414">"Pentru a asocia aparatele auditive, găsiți și atingeți dispozitivul pe ecranul următor. Asigurați-vă că aparatele auditive sunt în modul de asociere."</string>
<string name="accessibility_hearingaid_active_device_summary" msgid="3924362383258688984">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> este activ"</string>
<plurals name="show_number_hearingaid_count" formatted="false" msgid="3160782397139295486">
<item quantity="few"><xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> aparate auditive salvate</item>
@@ -2527,7 +2526,6 @@
<string name="menu_stats_last_unplugged" msgid="5922246077592434526">"De la ultima deconectare pentru <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
<string name="menu_stats_total" msgid="8973377864854807854">"Totaluri privind utilizarea"</string>
<string name="menu_stats_refresh" msgid="1676215433344981075">"Actualizați"</string>
- <string name="process_kernel_label" msgid="3916858646836739323">"Sistem de operare Android"</string>
<string name="process_mediaserver_label" msgid="6500382062945689285">"Server media"</string>
<string name="process_dex2oat_label" msgid="2592408651060518226">"Optimizarea aplicației"</string>
<string name="battery_saver" msgid="8172485772238572153">"Economisirea bateriei"</string>
@@ -2658,8 +2656,6 @@
<string name="no_device_admins" msgid="4846602835339095768">"Nu este disponibilă nicio aplicație pentru administratorul dispozitivului"</string>
<string name="personal_device_admin_title" msgid="2849617316347669861">"Personal"</string>
<string name="managed_device_admin_title" msgid="7853955652864478435">"Serviciu"</string>
- <string name="sms_access_restriction_enabled" msgid="7054488078710530278">"Limitați accesul la SMS-uri și jurnalul de apeluri"</string>
- <string name="sms_access_restriction_enabled_summary" msgid="6851339654677842328">"Doar aplicațiile prestabilite de telefonie și de mesagerie au permisiuni să acceseze SMS-urile și jurnalul de apeluri"</string>
<string name="no_trust_agents" msgid="7450273545568977523">"Nu există agenți de încredere disponibili"</string>
<string name="add_device_admin_msg" msgid="1501847129819382149">"Activați aplicația pentru administrator?"</string>
<string name="add_device_admin" msgid="4192055385312215731">"Activați această aplicație pentru administratorul dispozitivului"</string>
@@ -3153,7 +3149,7 @@
<string name="keywords_app_default" msgid="5822717006354487071">"Deschideți cu"</string>
<string name="keywords_applications_settings" msgid="1268353611121497450">"Aplicații"</string>
<string name="keywords_time_zone" msgid="998254736898753085">"fus orar"</string>
- <string name="keywords_draw_overlay" msgid="4130899177619041842">"Cap de chat"</string>
+ <string name="keywords_draw_overlay" msgid="1001120206241401007">"Cap de chat, sistem, alertă, fereastră, casetă de dialog, ecran peste alte aplicații, desen"</string>
<string name="keywords_flashlight" msgid="6161632177705233710">"Lanternă, Lumină, Lanternă"</string>
<string name="keywords_change_wifi_state" msgid="627068244033681010">"wifi, wi-fi, comutator, control"</string>
<string name="keywords_more_mobile_networks" msgid="8995946622054642367">"celular, mobil, operator servicii mobile, wireless, date, 4g, 3g, 2g, lte"</string>
@@ -3177,7 +3173,7 @@
<string name="keywords_sounds_and_notifications_interruptions" msgid="5426093074031208917">"nu deranja, întrerupe, întrerupere, pauză"</string>
<string name="keywords_app" msgid="6334757056536837791">"RAM"</string>
<string name="keywords_location" msgid="4132655528196729043">"în apropiere, locație, istoric, raportare, GPS"</string>
- <string name="keywords_accounts" msgid="1957925565953357627">"cont"</string>
+ <string name="keywords_accounts" msgid="4479029747403203867">"cont, adăugați un cont, profil de serviciu"</string>
<string name="keywords_users" msgid="3434190133131387942">"restricție, restricționare, restricționat"</string>
<string name="keywords_keyboard_and_ime" msgid="9143339015329957107">"corectarea textului, corectați, sunet, vibrații, automat, limbă, gest, sugerați, sugestie, temă, cuvânt, ofensator, introducere text, emoji, internațional"</string>
<string name="keywords_reset_apps" msgid="5293291209613191845">"resetați, preferințe, valori prestabilite"</string>
@@ -3215,6 +3211,7 @@
<string name="keywords_storage_settings" msgid="297283751968446577">"memorie, memorie cache, date, ștergeți, goliți, liber, spațiu"</string>
<string name="keywords_bluetooth_settings" msgid="6804844062789439858">"conectat, dispozitiv, căști, set căști-microfon, difuzoare, wireless, asociere, căști intraauriculare, muzică, conținut media"</string>
<string name="keywords_wallpaper" msgid="5058364390917429896">"fundal, ecran, ecran de blocare, temă"</string>
+ <string name="keywords_styles" msgid="5828725481814049422">"forma pictogramei, culoare de evidențiere, font"</string>
<string name="keywords_assist_input" msgid="5017533309492679287">"prestabilit, asistent"</string>
<string name="keywords_default_payment_app" msgid="3838565809518896799">"plată, prestabilită"</string>
<string name="keywords_ambient_display" msgid="3103487805748659132">"notificare primită"</string>
@@ -3224,7 +3221,7 @@
<string name="keywords_notification_vibration" msgid="31924624421190547">"tactil, vibrații, sensibilitate"</string>
<string name="keywords_battery_saver_sticky" msgid="5586215686021650278">"economisirea bateriei, fix, persistent, economisirea energiei, baterie"</string>
<string name="keywords_battery_saver_schedule" msgid="7358789228486231944">"rutină, program, economisirea bateriei, economisirea energiei, baterie, automat, procent"</string>
- <string name="keywords_add_an_account" msgid="6488139919428902434">"profil de serviciu"</string>
+ <string name="keywords_enhance_4g_lte" msgid="2273810564244790859">"volte, apelare avansată, apelare 4g"</string>
<string name="default_sound" msgid="8821684447333687810">"Sunet prestabilit"</string>
<string name="sound_settings_summary" msgid="4100853606668287965">"Volumul soneriei este la <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
<string name="sound_dashboard_summary" msgid="3402435125958012986">"Volum, vibrații, Nu deranja"</string>
@@ -3952,7 +3949,6 @@
<string name="permit_draw_overlay" msgid="7456536798718633432">"Permiteți afișarea peste alte aplicații"</string>
<string name="allow_overlay_description" msgid="8961670023925421358">"Permiteți acestei aplicații să se afișeze peste alte aplicații pe care le folosiți. Aceasta poate interfera cu folosirea acelor aplicații sau poate schimba modul în care acestea apar sau se comportă."</string>
<string name="keywords_vr_listener" msgid="7441221822576384680">"rv realitate virtuală instrument de ascultare stereo serviciu de ajutor"</string>
- <string name="keywords_system_alert_window" msgid="5049498015597864850">"fereastră de dialog alertă de sistem peste alte aplicații"</string>
<string name="overlay_settings" msgid="6930854109449524280">"Afișare peste alte aplicații"</string>
<string name="system_alert_window_summary" msgid="602892301318324492">"<xliff:g id="COUNT_0">%1$d</xliff:g> din <xliff:g id="COUNT_1">%2$d</xliff:g> aplicații au voie să afișeze peste alte aplicații"</string>
<string name="filter_overlay_apps" msgid="6965969283342557573">"Aplicații cu permisiune"</string>
@@ -4194,7 +4190,6 @@
<string name="notification_log_details_none" msgid="184131801230614059">"niciunul"</string>
<string name="notification_log_details_ranking_null" msgid="244660392058720919">"Obiectul clasificării lipsește."</string>
<string name="notification_log_details_ranking_none" msgid="599607025882587844">"Obiectul clasificării nu conține această cheie."</string>
- <string name="theme_customization_category" msgid="1049181544004163283">"Personalizare temă"</string>
<string name="theme_customization_device_default" msgid="5058147707906551368">"Prestabilit pentru dispozitiv"</string>
<string name="display_cutout_emulation" msgid="7466869822418376317">"Decupajul ecranului"</string>
<string name="display_cutout_emulation_keywords" msgid="4495418317471622562">"decupare ecran"</string>
@@ -4632,6 +4627,8 @@
<string name="network_connection_errorstate_dialog_message" msgid="6953778550775646710">"A intervenit ceva. Această aplicație a anulat solicitarea de a alege un dispozitiv."</string>
<string name="network_connection_connect_successful" msgid="5935510954474494928">"Conectare reușită"</string>
<string name="network_connection_request_dialog_showall" msgid="6938922880244567521">"Afișați-le pe toate"</string>
+ <string name="network_connection_searching_message" msgid="4638576789450817530">"Se caută dispozitivul…"</string>
+ <string name="network_connection_connecting_message" msgid="3740982406609245654">"Se conectează la dispozitiv…"</string>
<plurals name="show_bluetooth_devices" formatted="false" msgid="1715020480026568408">
<item quantity="few"><xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> dispozitive conectate</item>
<item quantity="other"><xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> de dispozitive conectate</item>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 152a3ad..5b3a1a4 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -364,8 +364,6 @@
<string name="security_enable_widgets_disabled_summary" msgid="6392489775303464905">"Отключено администратором"</string>
<string name="lockdown_settings_title" msgid="7393790212603280213">"Добавить кнопку блокировки"</string>
<string name="lockdown_settings_summary" msgid="4359438673563318171">"Добавить в меню кнопки питания возможность отключения Smart Lock, биометрической разблокировки и уведомлений на заблокированном экране"</string>
- <string name="trust_agents_extend_unlock_title" msgid="2796555263565097031">"Агенты доверия откладывают блокировку"</string>
- <string name="trust_agents_extend_unlock_summary" msgid="3976344969220255010">"Если параметр включен, агенты доверия могут увеличивать время, в течение которого устройство остается разблокированным, но не могут разблокировать его"</string>
<string name="trust_lost_locks_screen_title" msgid="2992742466966021682">"Блокировать экран при утрате доверия"</string>
<string name="trust_lost_locks_screen_summary" msgid="693784434582021206">"Если параметр включен, устройство блокируется, когда последний агент доверия теряет доверие"</string>
<string name="owner_info_settings_summary" msgid="7472393443779227052">"Нет текста"</string>
@@ -969,6 +967,7 @@
<string name="wifi_eap_identity" msgid="4359453783379679103">"Пользователь"</string>
<string name="wifi_eap_anonymous" msgid="2989469344116577955">"Неизвестный"</string>
<string name="wifi_password" msgid="5948219759936151048">"Пароль"</string>
+ <string name="wifi_sae_password_id" msgid="1697832722221765763">"Идентификатор пароля SAE"</string>
<string name="wifi_show_password" msgid="6461249871236968884">"Показать пароль"</string>
<string name="wifi_ap_band_config" msgid="1611826705989117930">"Диапазон частот Wi-Fi"</string>
<string name="wifi_ap_choose_auto" msgid="2677800651271769965">"Авто"</string>
@@ -989,7 +988,6 @@
<string name="wifi_dpp_share_wifi" msgid="9065890131734833809">"Предоставить доступ к Wi‑Fi"</string>
<string name="wifi_dpp_scan_qr_code_with_another_device" msgid="5854392840857123065">"Чтобы подключиться к сети \"<xliff:g id="SSID">%1$s</xliff:g>\" и поделиться паролем, отсканируйте этот QR-код."</string>
<string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="4436318319178361543">"Чтобы подключиться к сети \"<xliff:g id="SSID">%1$s</xliff:g>\", отсканируйте этот QR-код."</string>
- <string name="wifi_dpp_could_not_detect_valid_qr_code" msgid="641893675646330576">"Не удалось считать QR-код. Наведите камеру так, чтобы QR-код располагался по центру, и повторите попытку."</string>
<string name="wifi_dpp_failure_authentication_or_configuration" msgid="3372757783382381044">"Повторите попытку. Если это не поможет, свяжитесь с производителем устройства."</string>
<string name="wifi_dpp_failure_not_compatible" msgid="2829930473520603740">"Произошла ошибка."</string>
<string name="wifi_dpp_failure_timeout" msgid="5228320772245820458">"Убедитесь, что устройство включено, заряжено и подключено к адаптеру питания."</string>
@@ -1012,6 +1010,7 @@
<string name="wifi_dpp_hotspot_password" msgid="4120419278831581613">"Пароль точки доступа: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
<string name="wifi_dpp_add_device" msgid="4072206063308645677">"Добавить устройство"</string>
<string name="wifi_dpp_connect_network_using_qr_code" msgid="3887335309163999665">"Использовать QR-код, чтобы добавить устройство к этой сети"</string>
+ <string name="wifi_dpp_qr_code_is_not_valid_format" msgid="3700087439867692944">"Недопустимый формат QR-кода"</string>
<string name="retry" msgid="6472609612090877557">"Повторить попытку"</string>
<string name="wifi_shared" msgid="844142443226926070">"Поделиться с другими пользователями устройства"</string>
<string name="wifi_unchanged" msgid="3410422020930397102">"(без изменений)"</string>
@@ -1167,6 +1166,7 @@
<string name="emergency_address_title" msgid="932729250447887545">"Адрес в чрезвычайных ситуациях"</string>
<string name="emergency_address_summary" msgid="7751971156196115129">"Ваше местоположение при экстренном вызове по Wi‑Fi"</string>
<string name="private_dns_help_message" msgid="3299567069152568958">"Подробнее "<annotation id="url">"о персональном DNS-сервере"</annotation>"…"</string>
+ <string name="private_dns_mode_on" msgid="5882613439541371003">"Включено"</string>
<string name="wifi_calling_pref_managed_by_carrier" msgid="6845711858866828986">"Эти настройки управляются оператором"</string>
<string name="wifi_calling_settings_activation_instructions" msgid="7492509632478260955">"Активируйте звонки по Wi-Fi"</string>
<string name="wifi_calling_turn_on" msgid="1171403510313983983">"Включите звонки по Wi-Fi"</string>
@@ -1916,7 +1916,7 @@
<string name="default_emergency_app" msgid="1951760659640369980">"Тревожное оповещение"</string>
<string name="reset_app_preferences" msgid="1321050641018356925">"Сбросить настройки приложений"</string>
<string name="reset_app_preferences_title" msgid="6093179367325336662">"Сбросить настройки?"</string>
- <string name="reset_app_preferences_desc" msgid="4822447731869201512">"Будут сброшены следующие настройки:\n\n"<li>"Отключенные приложения"</li>\n<li>"Отключенные уведомления приложений"</li>\n<li>"Приложения по умолчанию"</li>\n<li>"Ограничения на передачу данных в фоновом режиме"</li>\n<li>"Все ограничения разрешений"</li>\n\n"Данные приложений удалены не будут."</string>
+ <string name="reset_app_preferences_desc" msgid="731757609326016760">"Будут сброшены следующие настройки:\n\n"<li>"отключенные приложения;"</li>\n<li>"отключенные уведомления приложений;"</li>\n<li>"приложения по умолчанию;"</li>\n<li>"ограничения на передачу данных в фоновом режиме;"</li>\n<li>"все ограничения разрешений."</li>\n\n"Данные приложений не будут удалены."</string>
<string name="reset_app_preferences_button" msgid="2559089511841281242">"Сбросить"</string>
<string name="manage_space_text" msgid="8852711522447794676">"Управление местом"</string>
<string name="filter" msgid="2018011724373033887">"Фильтр"</string>
@@ -2131,7 +2131,7 @@
<string name="accessibility_screen_magnification_short_summary" msgid="3411979839172752057">"Изменение масштаба тремя нажатиями"</string>
<string name="accessibility_screen_magnification_navbar_short_summary" msgid="3693116360267980492">"Чтобы увеличить масштаб, нажмите кнопку"</string>
<string name="accessibility_screen_magnification_summary" msgid="5258868553337478505">"Чтобы "<b>"увеличить масштаб"</b>", быстро коснитесь экрана одним пальцем три раза.\n"<ul><li>"Для прокрутки проведите двумя пальцами."</li>\n<li>"Чтобы изменить масштаб, сведите два пальца вместе или разведите их."</li></ul>\n\n"Если нужно "<b>"временно увеличить масштаб"</b>", быстро нажмите на экран три раза и удерживайте на третьем нажатии.\n"<ul><li>"Для обзора проводите по экрану."</li>\n<li>"Чтобы уменьшить масштаб, отпустите палец."</li></ul>\n\n"Эти жесты не работают на клавиатуре и панели навигации."</string>
- <string name="accessibility_screen_magnification_navbar_summary" msgid="2272878354599332009">"Благодаря функции увеличения вы сможете приближать изображение на экране.\n\n"<b>"Если вы хотите увеличить изображение"</b>", включите сервис и нажмите на экран в любом месте.\n"<ul><li>"• Чтобы прокрутить увеличенную область, проведите двумя или тремя пальцами."</li>\n<li>"• Чтобы изменить масштаб, сведите вместе два или три пальца."</li></ul>\n\n<b>"Если вы хотите временно увеличить изображение"</b>", включите сервис, а затем нажмите на экран в любом месте и задержите палец.\n"<ul><li>"• Чтобы перемещаться по экрану, проведите по нему."</li>\n<li>"• Чтобы отключить увеличение, уберите палец."</li></ul>\n\n"Увеличить изображение клавиатуры или панели навигации нельзя."</string>
+ <string name="accessibility_screen_magnification_navbar_summary" msgid="6700716275347612310">"Благодаря функции увеличения вы сможете приближать изображение на экране.\n\n"<b>"Если вы хотите увеличить изображение"</b>", включите функцию и нажмите на экран в любом месте.\n"<ul><li>"Для прокрутки проведите двумя пальцами."</li>\n<li>"Чтобы изменить масштаб, сведите два пальца вместе или разведите их."</li></ul>\n\n<b>"Если нужно временно увеличить масштаб"</b>", включите функцию увеличения, коснитесь экрана и удерживайте.\n"<ul><li>"Для обзора проведите по экрану."</li>\n<li>"Чтобы уменьшить масштаб, отпустите палец."</li></ul>\n\n"Эти жесты не работают на клавиатуре и панели навигации."</string>
<string name="accessibility_tutorial_dialog_title_button" msgid="3682222614034474845">"Используйте кнопку специальных возможностей"</string>
<string name="accessibility_tutorial_dialog_title_gesture" msgid="1342726230497913398">"Используйте жесты"</string>
<string name="accessibility_tutorial_dialog_title_gesture_settings" msgid="8539392614235820285">"Используйте новый жест"</string>
@@ -2184,8 +2184,7 @@
<string name="accessibility_hearingaid_title" msgid="8312145423610648518">"Слуховые аппараты"</string>
<string name="accessibility_hearingaid_not_connected_summary" msgid="6240237523789614599">"Нет подключенных слуховых аппаратов"</string>
<string name="accessibility_hearingaid_adding_summary" msgid="2947474468412309778">"Добавить слуховой аппарат"</string>
- <string name="accessibility_hearingaid_pair_instructions_first_message" msgid="3912093691643131154">"Чтобы подключить слуховой аппарат, коснитесь его названия на следующем экране."</string>
- <string name="accessibility_hearingaid_pair_instructions_second_message" msgid="5596683393607650243">"Убедитесь, что ваш слуховой аппарат находится в режиме установления соединения."</string>
+ <string name="accessibility_hearingaid_pair_instructions_message" msgid="3094382949733435414">"Чтобы подключить слуховой аппарат, нажмите на его название на следующем экране. Убедитесь, что ваш слуховой аппарат находится в режиме установления соединения."</string>
<string name="accessibility_hearingaid_active_device_summary" msgid="3924362383258688984">"Устройство \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\" активно"</string>
<plurals name="show_number_hearingaid_count" formatted="false" msgid="3160782397139295486">
<item quantity="one"><xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> сохраненный слуховой аппарат</item>
@@ -2564,7 +2563,6 @@
<string name="menu_stats_last_unplugged" msgid="5922246077592434526">"С последнего отключения <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
<string name="menu_stats_total" msgid="8973377864854807854">"Всего"</string>
<string name="menu_stats_refresh" msgid="1676215433344981075">"Обновить"</string>
- <string name="process_kernel_label" msgid="3916858646836739323">"ОС Android"</string>
<string name="process_mediaserver_label" msgid="6500382062945689285">"Сервер медиа"</string>
<string name="process_dex2oat_label" msgid="2592408651060518226">"Оптимизация приложений"</string>
<string name="battery_saver" msgid="8172485772238572153">"Режим энергосбережения"</string>
@@ -2695,8 +2693,6 @@
<string name="no_device_admins" msgid="4846602835339095768">"Нет доступных приложений администратора устройства"</string>
<string name="personal_device_admin_title" msgid="2849617316347669861">"Личный"</string>
<string name="managed_device_admin_title" msgid="7853955652864478435">"Рабочий"</string>
- <string name="sms_access_restriction_enabled" msgid="7054488078710530278">"Ограничение доступа к SMS и списку вызовов"</string>
- <string name="sms_access_restriction_enabled_summary" msgid="6851339654677842328">"Доступ к SMS и списку вызовов есть только у приложений для звонков и обмена сообщениями, используемых по умолчанию"</string>
<string name="no_trust_agents" msgid="7450273545568977523">"Нет агентов доверия."</string>
<string name="add_device_admin_msg" msgid="1501847129819382149">"Приложение администратора устройства"</string>
<string name="add_device_admin" msgid="4192055385312215731">"Активировать приложение администратора устройства"</string>
@@ -3195,7 +3191,7 @@
<string name="keywords_app_default" msgid="5822717006354487071">"Открыть с помощью"</string>
<string name="keywords_applications_settings" msgid="1268353611121497450">"Приложения"</string>
<string name="keywords_time_zone" msgid="998254736898753085">"часовой пояс"</string>
- <string name="keywords_draw_overlay" msgid="4130899177619041842">"Chat Heads"</string>
+ <string name="keywords_draw_overlay" msgid="1001120206241401007">"Чат-фото, системные сообщения, оповещения, окна, диалоговые окна, экран, поверх других приложений, графический ключ поверх других элементов"</string>
<string name="keywords_flashlight" msgid="6161632177705233710">"Фонарик, фонарь, свет"</string>
<string name="keywords_change_wifi_state" msgid="627068244033681010">"wifi, wi-fi, переключатель, управление"</string>
<string name="keywords_more_mobile_networks" msgid="8995946622054642367">"сотовая сеть, мобильный Интернет, сотовый оператор, беспроводная сеть, передача данных, 4G, 3G, 2G, LTE"</string>
@@ -3219,7 +3215,7 @@
<string name="keywords_sounds_and_notifications_interruptions" msgid="5426093074031208917">"не беспокоить, режим оповещения, оповещение, прерывание"</string>
<string name="keywords_app" msgid="6334757056536837791">"ОЗУ"</string>
<string name="keywords_location" msgid="4132655528196729043">"поблизости, местоположение, история, отчеты, GPS"</string>
- <string name="keywords_accounts" msgid="1957925565953357627">"аккаунт"</string>
+ <string name="keywords_accounts" msgid="4479029747403203867">"аккаунт, добавить аккаунт, рабочий профиль"</string>
<string name="keywords_users" msgid="3434190133131387942">"ограничение, ограничить, ограничено"</string>
<string name="keywords_keyboard_and_ime" msgid="9143339015329957107">"исправление текста, автозамена, звук, вибрация, авто, язык, жест, подсказка, тема, неприемлемый, слово, ввод, эмодзи, смайлик, международный"</string>
<string name="keywords_reset_apps" msgid="5293291209613191845">"сбросить, настройки, по умолчанию"</string>
@@ -3257,6 +3253,7 @@
<string name="keywords_storage_settings" msgid="297283751968446577">"память, кеш, данные, удалить, очистить, освободить, место"</string>
<string name="keywords_bluetooth_settings" msgid="6804844062789439858">"подключено, устройство, наушники, гарнитура, динамик, беспроводной, связать, наушники-вкладыши, музыка, мультимедиа"</string>
<string name="keywords_wallpaper" msgid="5058364390917429896">"фон, экран, блокировка экрана, тема"</string>
+ <string name="keywords_styles" msgid="5828725481814049422">"форма значков, цвет акцента, шрифт"</string>
<string name="keywords_assist_input" msgid="5017533309492679287">"по умолчанию, ассистент"</string>
<string name="keywords_default_payment_app" msgid="3838565809518896799">"оплата, по умолчанию"</string>
<string name="keywords_ambient_display" msgid="3103487805748659132">"входящее уведомление"</string>
@@ -3266,7 +3263,7 @@
<string name="keywords_notification_vibration" msgid="31924624421190547">"осязание, вибрация, чувствительность"</string>
<string name="keywords_battery_saver_sticky" msgid="5586215686021650278">"энергосбережение, постоянная экономия заряда, батарея"</string>
<string name="keywords_battery_saver_schedule" msgid="7358789228486231944">"программа, расписание, режим энергосбережения, экономия заряда, батарея, автоматически, процент"</string>
- <string name="keywords_add_an_account" msgid="6488139919428902434">"рабочий профиль"</string>
+ <string name="keywords_enhance_4g_lte" msgid="2273810564244790859">"volte, расширенный вызов, звонки по сети 4g"</string>
<string name="default_sound" msgid="8821684447333687810">"Мелодия по умолчанию"</string>
<string name="sound_settings_summary" msgid="4100853606668287965">"Громкость звонка: <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
<string name="sound_dashboard_summary" msgid="3402435125958012986">"Громкость, вибрация, режим \"Не беспокоить\""</string>
@@ -4015,7 +4012,6 @@
<string name="permit_draw_overlay" msgid="7456536798718633432">"Показывать поверх других приложений"</string>
<string name="allow_overlay_description" msgid="8961670023925421358">"Элементы интерфейса будут отображаться поверх других окон. Это может мешать вашей работе с приложениями или искажать их интерфейс."</string>
<string name="keywords_vr_listener" msgid="7441221822576384680">"vr виртуальная реальность режим вспомогательный сервис"</string>
- <string name="keywords_system_alert_window" msgid="5049498015597864850">"системные предупреждения показ поверх других окон"</string>
<string name="overlay_settings" msgid="6930854109449524280">"Поверх других приложений"</string>
<string name="system_alert_window_summary" msgid="602892301318324492">"<xliff:g id="COUNT_0">%1$d</xliff:g> из <xliff:g id="COUNT_1">%2$d</xliff:g> приложений отображаются поверх других окон"</string>
<string name="filter_overlay_apps" msgid="6965969283342557573">"Авторизованные приложения"</string>
@@ -4263,7 +4259,6 @@
<string name="notification_log_details_none" msgid="184131801230614059">"нет"</string>
<string name="notification_log_details_ranking_null" msgid="244660392058720919">"Объект отсутствует."</string>
<string name="notification_log_details_ranking_none" msgid="599607025882587844">"В объекте нет этого ключа."</string>
- <string name="theme_customization_category" msgid="1049181544004163283">"Темы"</string>
<string name="theme_customization_device_default" msgid="5058147707906551368">"Вариант по умолчанию"</string>
<string name="display_cutout_emulation" msgid="7466869822418376317">"Вырез на экране"</string>
<string name="display_cutout_emulation_keywords" msgid="4495418317471622562">"вырез на экране, выемка"</string>
@@ -4713,6 +4708,8 @@
<string name="network_connection_errorstate_dialog_message" msgid="6953778550775646710">"Произошла ошибка. Приложение отменило запрос на выбор устройства."</string>
<string name="network_connection_connect_successful" msgid="5935510954474494928">"Подключено"</string>
<string name="network_connection_request_dialog_showall" msgid="6938922880244567521">"Показать все"</string>
+ <string name="network_connection_searching_message" msgid="4638576789450817530">"Поиск устройства…"</string>
+ <string name="network_connection_connecting_message" msgid="3740982406609245654">"Подключение к устройству…"</string>
<plurals name="show_bluetooth_devices" formatted="false" msgid="1715020480026568408">
<item quantity="one">Подключено <xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> устройство</item>
<item quantity="few">Подключено <xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> устройства</item>
diff --git a/res/values-si/strings.xml b/res/values-si/strings.xml
index 4a64502..5276af3 100644
--- a/res/values-si/strings.xml
+++ b/res/values-si/strings.xml
@@ -360,8 +360,6 @@
<string name="security_enable_widgets_disabled_summary" msgid="6392489775303464905">"ඔබගේ පරිපාලක විසින් අබල කර ඇත"</string>
<string name="lockdown_settings_title" msgid="7393790212603280213">"අගුලු හැරීමේ විකල්පය පෙන්වන්න"</string>
<string name="lockdown_settings_summary" msgid="4359438673563318171">"Smart Lock, ජෛව මිතික අගුලු හැරීම, සහ අගුලු තිරයෙහි දැනුම්දීම් සඳහා වන සංදර්ශක බල සැපයුම් බොත්තම් විකල්පය."</string>
- <string name="trust_agents_extend_unlock_title" msgid="2796555263565097031">"විශ්වාස නියෝජිතයින් පමණක් අඟුලු ඇරීම දීර්ඝ කරති"</string>
- <string name="trust_agents_extend_unlock_summary" msgid="3976344969220255010">"සබල කළේ නම්, විශ්වාස නියෝජිතයින් දිගු කලකට ඔබේ උපාංගය අඟුලු ඇර තබා ගන්නා නමුත්, ඔවුන්ට අඟුළු දැමූ උපාංගයක් තවදුරටත් අඟුලු ඇරීමට නොහැකි වෙයි."</string>
<string name="trust_lost_locks_screen_title" msgid="2992742466966021682">"විශ්වාසය අහිමි වන විට තිරය අගුළු දමන්න"</string>
<string name="trust_lost_locks_screen_summary" msgid="693784434582021206">"සබල කර ඇත්නම්, අවසන් විශ්වාසනීය නියෝජිතයාට විශ්වාසය අහිමි වන විට උපාංගය අගුළු දැමෙනු ඇත"</string>
<string name="owner_info_settings_summary" msgid="7472393443779227052">"කිසිවක් නැත"</string>
@@ -937,6 +935,7 @@
<string name="wifi_eap_identity" msgid="4359453783379679103">"අනන්යතාවය"</string>
<string name="wifi_eap_anonymous" msgid="2989469344116577955">"නොදන්නා අනන්යතාව"</string>
<string name="wifi_password" msgid="5948219759936151048">"මුරපදය"</string>
+ <string name="wifi_sae_password_id" msgid="1697832722221765763">"SAE මුරපද අනන්යකාරකය"</string>
<string name="wifi_show_password" msgid="6461249871236968884">"මුරපදය පෙන්වන්න"</string>
<string name="wifi_ap_band_config" msgid="1611826705989117930">"AP කලාපය තෝරන්න"</string>
<string name="wifi_ap_choose_auto" msgid="2677800651271769965">"ස්වයං"</string>
@@ -957,7 +956,6 @@
<string name="wifi_dpp_share_wifi" msgid="9065890131734833809">"Wi‑Fi බෙදා ගන්න"</string>
<string name="wifi_dpp_scan_qr_code_with_another_device" msgid="5854392840857123065">"“<xliff:g id="SSID">%1$s</xliff:g>” වෙත සම්බන්ධ කිරීමටත් මුරපදය බෙදා ගැනීමටත් මෙම QR කේතය ස්කෑන් කරන්න"</string>
<string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="4436318319178361543">"“<xliff:g id="SSID">%1$s</xliff:g>” වෙත සම්බන්ධ කිරීමට මෙම QR කේතය ස්කෑන් කරන්න"</string>
- <string name="wifi_dpp_could_not_detect_valid_qr_code" msgid="641893675646330576">"QR කේතය කියවීමට නොහැකි විය. කේතය යළි ඇතුළත් කර නැවත උත්සාහ කරන්න"</string>
<string name="wifi_dpp_failure_authentication_or_configuration" msgid="3372757783382381044">"නැවත උත්සාහ කරන්න. ගැටලුව පවතින්නේ නම්, උපාංග නිෂ්පාදකය සම්බන්ධ කර ගන්න"</string>
<string name="wifi_dpp_failure_not_compatible" msgid="2829930473520603740">"යමක් වැරදිණි"</string>
<string name="wifi_dpp_failure_timeout" msgid="5228320772245820458">"උපාංගය පේනුගත කර, ආරෝපණ කර, සක්රීය කර තිබෙන බවට වග බලා ගන්න"</string>
@@ -980,6 +978,7 @@
<string name="wifi_dpp_hotspot_password" msgid="4120419278831581613">"හොට්ස්පොට් මුරපදය: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
<string name="wifi_dpp_add_device" msgid="4072206063308645677">"උපාංගය එක් කරන්න"</string>
<string name="wifi_dpp_connect_network_using_qr_code" msgid="3887335309163999665">"මෙම ජාලයට උපාංගයක් එක් කිරීමට QR කේතයක් භාවිතා කරන්න"</string>
+ <string name="wifi_dpp_qr_code_is_not_valid_format" msgid="3700087439867692944">"QR කේතය වලංගු ආකෘතියක් නොවේ"</string>
<string name="retry" msgid="6472609612090877557">"යළි උත්සාහ කරන්න"</string>
<string name="wifi_shared" msgid="844142443226926070">"අනෙකුත් උපාංග පරිශීලකයන් සමග බෙදා ගන්න"</string>
<string name="wifi_unchanged" msgid="3410422020930397102">"(වෙනස් නොකළ)"</string>
@@ -1129,6 +1128,7 @@
<string name="emergency_address_title" msgid="932729250447887545">"හදිසි අවස්ථා ලිපිනය"</string>
<string name="emergency_address_summary" msgid="7751971156196115129">"ඔබ Wi-Fi හරහා හදිසි ඇමතුමක් ලබා ගන්නා විට ඔබගේ ස්ථානය ලෙස භාවිතා වේ"</string>
<string name="private_dns_help_message" msgid="3299567069152568958">"පුද්ගලික DNS විශේෂාංග ගැන "<annotation id="url">"තව දැන ගන්න"</annotation></string>
+ <string name="private_dns_mode_on" msgid="5882613439541371003">"සක්රියයි"</string>
<string name="wifi_calling_pref_managed_by_carrier" msgid="6845711858866828986">"වාහකය මගින් කළමනාකරණය කළ සැකසීම"</string>
<string name="wifi_calling_settings_activation_instructions" msgid="7492509632478260955">"Wi-Fi ඇමතුම සක්රිය කරන්න"</string>
<string name="wifi_calling_turn_on" msgid="1171403510313983983">"Wi-Fi ඇමතුම ක්රියාත්මක කරන්න"</string>
@@ -1872,7 +1872,7 @@
<string name="default_emergency_app" msgid="1951760659640369980">"හදිසි යෙදුම"</string>
<string name="reset_app_preferences" msgid="1321050641018356925">"යෙදුම් මනාප නැවත සකසන්න"</string>
<string name="reset_app_preferences_title" msgid="6093179367325336662">"යෙදුම් මනාප නැවත සකසන්නද?"</string>
- <string name="reset_app_preferences_desc" msgid="4822447731869201512">"මේ මගින් පහත සඳහන් සියලු අභිරුචි යළි පිහිටුවයි:\n\n"<li>"අබල යෙදුම්"</li>\n" "<li>"අබල යෙදුම් දැනුම්දීම්"</li>\n" "<li>"ක්රියාවන් සඳහා සුපුරුදු යෙදුම්"</li>\n" "<li>"යෙදුම් සඳහා පසුබිම් දත්ත සීමා කිරීම්"</li>\n" "<li>"ඕනෑම අවසර සීමා"</li>\n\n" ඔබට යෙදුම් දත්ත කිසිවක් නැති නොවේ."</string>
+ <string name="reset_app_preferences_desc" msgid="731757609326016760">"මෙය මේ සඳහා සියලු මනාප යළි සකසනු ඇත:\n\n"<li>"අබලිත යෙදුම්"</li>\n<li>"අබලිත යෙදුම් දැනුම්දීම්"</li>\n<li>"ක්රියා සඳහා පෙරනිමි යෙදුම්"</li>\n<li>"යෙදුම් සඳහා පසුබිම් දත්ත සීමා කිරීම්"</li>\n<li>"ඕනෑම අවසර සීමා"</li>\n\n"ඔබට යෙදුම් දත්ත කිසිවක් අහිමි නොවනු නැත."</string>
<string name="reset_app_preferences_button" msgid="2559089511841281242">"යෙදුම් මනාප නැවත සකසන්න"</string>
<string name="manage_space_text" msgid="8852711522447794676">"ඉඩ කළමනාකරණය"</string>
<string name="filter" msgid="2018011724373033887">"පෙරහන කරන්න"</string>
@@ -2087,7 +2087,7 @@
<string name="accessibility_screen_magnification_short_summary" msgid="3411979839172752057">"විශාලනය කිරීමට 3 වරක් තට්ටු කරන්න"</string>
<string name="accessibility_screen_magnification_navbar_short_summary" msgid="3693116360267980492">"විශාලනය කිරීමට බොත්තමක් තට්ටු කරන්න"</string>
<string name="accessibility_screen_magnification_summary" msgid="5258868553337478505"><b>"විශාලනය කිරීමට"</b>", ඉක්මනින් තිරය මත 3න් වරක් තට්ටු කරන්න.\n"<ul><li>"අනුචලනය කිරීමට ඇඟිලි 2කක් හෝ ඊට වැඩි ගණනක් ඇඳගෙන යන්න"</li>\n<li>"විශාලනය සීරුමාරු කිරීමට ඇඟිලි 2කක් හෝ ඊට වැඩි ගණනක් පින්ච් කරන්න"</li></ul>\n\n<b>"තාවකාලිකව විශාලනය කිරීමට"</b>", ඉක්මනින් තිරය මත 3න් වරක් තට්ටු කර තුන් වන තට්ටුව මත ඇඟිල්ල රඳවා ගෙන සිටින්න.\n"<ul><li>"තිරය වටා යාමට අඳින්න"</li>\n<li>"විශාලනය අඩු කිරීමට ඇඟිල්ල ඔසවන්න"</li></ul>\n\n"යතුරු පුවරුව හෝ සංචලන තීරුව තුළට ඔබට විශාලනය කළ නොහැක."</string>
- <string name="accessibility_screen_magnification_navbar_summary" msgid="2272878354599332009">"විශාලනය සක්රීය කළ විට, ඔබට ඔබේ තිරය විශාලන කළ හැක.\n\n"<b>"විශාලන කිරීමට"</b>", විශාලනය ආරම්භ කරන්න, පසුව තිරයේ ඕනෑම තැනකින් තට්ටු කරන්න.\n"<ul><li>"• අනුචලන කිරීමට ඇඟිලි 2 ක් හෝ වැඩි ගණනක් අදින්න"</li>\n<li>"• විශාලනය ගැළපීමට ඇඟිලි 2 ක් හෝ වැඩි ගණනක් කොනහන්න"</li></ul>\n\n<b>"තාවකාලිකව විශාලන කිරීමට"</b>", විශාලනය ආරම්භ කරන්න, පසුව තිරයේ ඕනෑම තැනකින් ස්පර්ශ කර අල්ලා සිටින්න.\n"<ul><li>"• තිරය වටේ එහා මෙහා කිරීමට අදින්න"</li>\n<li>"• විශාලනය අඩු කිරීමට ඇඟිල්ල උස්සන්න"</li></ul>\n\n"ඔබට යතුරු පුවරුවේ හෝ සංචලන තීරුවේ විශාලන කළ නොහැක."</string>
+ <string name="accessibility_screen_magnification_navbar_summary" msgid="6700716275347612310">"විශාලනය ක්රියාත්මක කර ඇති විට, ඔබට ඔබේ තිරයේ දී විශාලනය වැඩි කළ හැකිය.\n\n"<b>"විශාලනය කිරීමට"</b>", විශාලනය ආරම්භ කර, අනතුරුව තිරයේ ඕනෑම තැනක තට්ටු කරන්න.\n"<ul><li>"අනුචලනය කිරීමට ඇඟිලි 2ක් හෝ ඊට වැඩි ගණනක් අදින්න"</li>\n<li>"විශාලනය සීරුමාරු කිරීමට ඇඟිලි 2ක් හෝ ඊට වැඩි ගණනක් කොනහන්න"</li></ul>\n\n<b>"තාවකාලිකව විශාලනය කිරීමට"</b>", විශාලනය ආරම්භ කර, අනතුරුව තිරයේ ඕනෑම තැනක ස්පර්ශ කර & අල්ලාගෙන සිටින්න.\n"<ul><li>"තිරය වටා චලනය කිරීමට අදින්න"</li>\n<li>"විශාලනය අඩු කිරීමට ඇඟිල්ල ඔසවන්න"</li></ul>\n\n"ඔබට යතුරු පුවරුවේ හෝ සංචාලන තීරුවේ දී විශාලනය වැඩි කළ නොහැකිය."</string>
<string name="accessibility_tutorial_dialog_title_button" msgid="3682222614034474845">"විවෘත කිරීමට ප්රවේශ්යතා බොත්තම භාවිත කරන්න"</string>
<string name="accessibility_tutorial_dialog_title_gesture" msgid="1342726230497913398">"විවෘත කිරීමට ඉංගිතය භාවිත කරන්න"</string>
<string name="accessibility_tutorial_dialog_title_gesture_settings" msgid="8539392614235820285">"නව ප්රවේශ්යතා ඉංගිතය භාවිත කරන්න"</string>
@@ -2140,8 +2140,7 @@
<string name="accessibility_hearingaid_title" msgid="8312145423610648518">"ශ්රවණාධාරක"</string>
<string name="accessibility_hearingaid_not_connected_summary" msgid="6240237523789614599">"ශ්රවණාධාරක සම්බන්ධ කර නැත"</string>
<string name="accessibility_hearingaid_adding_summary" msgid="2947474468412309778">"ශ්රවණාධාරක එක් කරන්න"</string>
- <string name="accessibility_hearingaid_pair_instructions_first_message" msgid="3912093691643131154">"ඔබගේ ශ්රවණාධාරක යුගල කිරීමට, ඊළඟ තිරයේ ඔබේ උපාංගය සොයා තට්ටු කරන්න."</string>
- <string name="accessibility_hearingaid_pair_instructions_second_message" msgid="5596683393607650243">"ඔබේ යුගල ප්රකාරයක ඇති බව සහතික කර ගන්න."</string>
+ <string name="accessibility_hearingaid_pair_instructions_message" msgid="3094382949733435414">"ඔබගේ ශ්රවණාධාරක යුගල කිරීමට, මීළඟ තිරයේ ඔබේ උපාංගය සොයා තට්ටු කරන්න. ඔබේ යුගල ප්රකාරයක ඇති බව සහතික කර ගන්න."</string>
<string name="accessibility_hearingaid_active_device_summary" msgid="3924362383258688984">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ක්රියාත්මකයි"</string>
<plurals name="show_number_hearingaid_count" formatted="false" msgid="3160782397139295486">
<item quantity="one">සුරැකි ශ්රවණාධාර <xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g></item>
@@ -2490,7 +2489,6 @@
<string name="menu_stats_last_unplugged" msgid="5922246077592434526">"අවසන් වරට පේනුව ගලවුයේ <xliff:g id="UNPLUGGED">%1$s</xliff:g> සඳහාය"</string>
<string name="menu_stats_total" msgid="8973377864854807854">"භාවිත එකතු"</string>
<string name="menu_stats_refresh" msgid="1676215433344981075">"නැවුම් කරන්න"</string>
- <string name="process_kernel_label" msgid="3916858646836739323">"Android OS"</string>
<string name="process_mediaserver_label" msgid="6500382062945689285">"මාධ්යසේවාදායකය"</string>
<string name="process_dex2oat_label" msgid="2592408651060518226">"යෙදුම් ප්රශස්තකරණය"</string>
<string name="battery_saver" msgid="8172485772238572153">"බැටරි සුරැකුම"</string>
@@ -2621,8 +2619,6 @@
<string name="no_device_admins" msgid="4846602835339095768">"උපාංග පරිපාලක යෙදුම් ලබාගත නොහැක"</string>
<string name="personal_device_admin_title" msgid="2849617316347669861">"පෞද්ගලික"</string>
<string name="managed_device_admin_title" msgid="7853955652864478435">"කාර්යාලය"</string>
- <string name="sms_access_restriction_enabled" msgid="7054488078710530278">"SMS සහ ඇමතුම් ලොග ප්රවේශය සීමා කරන්න"</string>
- <string name="sms_access_restriction_enabled_summary" msgid="6851339654677842328">"පෙරනිමි දුරකථන සහ පණිවිඩකරණ යෙදුම්වලට පමණක් SMS සහ ඇමතුම් ලොග අවසර ඇත"</string>
<string name="no_trust_agents" msgid="7450273545568977523">"විශ්වාසනීය ඒජන්තවරුන් නැත"</string>
<string name="add_device_admin_msg" msgid="1501847129819382149">"උපාංගය පරිපාලක යෙදුම සක්රිය කරන්නද?"</string>
<string name="add_device_admin" msgid="4192055385312215731">"මෙම උපාංගය පරිපාලක යෙදුම සක්රිය කරන්න"</string>
@@ -3111,7 +3107,7 @@
<string name="keywords_app_default" msgid="5822717006354487071">"සමඟ විවෘත කරන්න"</string>
<string name="keywords_applications_settings" msgid="1268353611121497450">"යෙදුම්"</string>
<string name="keywords_time_zone" msgid="998254736898753085">"වේලා කලාපය"</string>
- <string name="keywords_draw_overlay" msgid="4130899177619041842">"කථාබස් ශීර්ෂය"</string>
+ <string name="keywords_draw_overlay" msgid="1001120206241401007">"Chat ශීර්ෂකය, පද්ධතිය, ඇඟවීම, කවුළුව, සංදර්ශකය, අනෙක් යෙදුම් ඉහළින්, ඇදීම"</string>
<string name="keywords_flashlight" msgid="6161632177705233710">"සැණෙළිය, එළිය, පන්දම"</string>
<string name="keywords_change_wifi_state" msgid="627068244033681010">"wifi, wi-fi, ටොගල කිරීම, පාලනය"</string>
<string name="keywords_more_mobile_networks" msgid="8995946622054642367">"සෙලියුලර්, ජංගම, සෙල් වාහකය, රැහැන් රහිත, දත්ත, 4g, 3g, 2g, lte"</string>
@@ -3135,7 +3131,7 @@
<string name="keywords_sounds_and_notifications_interruptions" msgid="5426093074031208917">"බාධා නොකරන්න එපා, බාධා කිරීම, බාධාව, බිඳීම"</string>
<string name="keywords_app" msgid="6334757056536837791">"RAM"</string>
<string name="keywords_location" msgid="4132655528196729043">"අවට, ස්ථානය, ඉතිහාසය, වාර්තාකරණය, GPS"</string>
- <string name="keywords_accounts" msgid="1957925565953357627">"ගිණුම"</string>
+ <string name="keywords_accounts" msgid="4479029747403203867">"ගිණුම, ගිණුමක් එක් කරන්න, කාර්යාල පැතිකඩ"</string>
<string name="keywords_users" msgid="3434190133131387942">"සීමා කිරීම, සීමා කරන්න, සීමා කරන ලදී"</string>
<string name="keywords_keyboard_and_ime" msgid="9143339015329957107">"පෙළ නිවැරදි කිරීම, නිවැරදි, ශබ්දය, කම්පනය, ස්වයං, භාෂාව, අභිනය, යෝජනා කිරීම, යෝජනාව, තේමාව, අහිතකර, වචනය, වර්ගය, ඉමොජි ජාත්යන්තර"</string>
<string name="keywords_reset_apps" msgid="5293291209613191845">"නැවත සකසන්න, මනාප, පෙරනිමි"</string>
@@ -3173,6 +3169,7 @@
<string name="keywords_storage_settings" msgid="297283751968446577">"මතකය, හැඹිලිය, දත්ත, ඉවත් කිරීම, පැහැදිලි, නිදහස්, ඉඩ"</string>
<string name="keywords_bluetooth_settings" msgid="6804844062789439858">"සම්බන්ධිත, උපාංගය, හෙඩ්ෆෝන්, හෙඩ්සෙට්, ස්පීකර, රැහැන් රහිත, යුගල, ඉයර්බඩ්, සංගීතය, මාධ්ය"</string>
<string name="keywords_wallpaper" msgid="5058364390917429896">"පසුබිම, තිරය, අගුලු තිරය, තේමාව"</string>
+ <string name="keywords_styles" msgid="5828725481814049422">"නිරූපක හැඩය, උච්ඡාරණ වර්ණය, ෆොන්ටය"</string>
<string name="keywords_assist_input" msgid="5017533309492679287">"පෙරනිමි, සහායක"</string>
<string name="keywords_default_payment_app" msgid="3838565809518896799">"ගෙවීම, පෙරනිමි"</string>
<string name="keywords_ambient_display" msgid="3103487805748659132">"එන දැනුම්දීම"</string>
@@ -3182,7 +3179,7 @@
<string name="keywords_notification_vibration" msgid="31924624421190547">"ස්පර්ශ, කම්පනය, සංවේදීතාව"</string>
<string name="keywords_battery_saver_sticky" msgid="5586215686021650278">"බැටරි සුරැකුම, ඇලෙන, දිගටම පැවතීම, බල සුරැකුම, බැටරිය"</string>
<string name="keywords_battery_saver_schedule" msgid="7358789228486231944">"චර්යානුගත, කාල සටහන, බැටරි සුරැකුම, බල සුරැකුම, බැටරිය, ස්වයංක්රීය, ප්රතිශතය"</string>
- <string name="keywords_add_an_account" msgid="6488139919428902434">"වැඩ පැතිකඩ"</string>
+ <string name="keywords_enhance_4g_lte" msgid="2273810564244790859">"volte, උසස් ඇමතුම්, 4g ඇමතුම්"</string>
<string name="default_sound" msgid="8821684447333687810">"සුපුරුදු හඬ"</string>
<string name="sound_settings_summary" msgid="4100853606668287965">"<xliff:g id="PERCENTAGE">%1$s</xliff:g> දී නාදක හඬ පරිමාව"</string>
<string name="sound_dashboard_summary" msgid="3402435125958012986">"හඬ පරිමාව, කම්පනය, බාධා නොකරන්න"</string>
@@ -3889,7 +3886,6 @@
<string name="permit_draw_overlay" msgid="7456536798718633432">"වෙනත් යෙදුම් උඩින් පෙන්වීමට අවසර දෙන්න"</string>
<string name="allow_overlay_description" msgid="8961670023925421358">"මෙම යෙදුමට ඔබ භාවිත කරන වෙනත් යෙදුම්වලට ඉහළින්ම සංදර්ශනය වීමට ඉඩ දෙන්න. එය ඔබේ එම යෙදුම් භාවිතය හෝ ඒවා පෙනෙන හෝ හැසිරෙන ආකාරය වෙත අවහිර කිරීමට හැකිය."</string>
<string name="keywords_vr_listener" msgid="7441221822576384680">"vr අතථ්ය තථ්ය සවන් දෙන්නා ස්ටීරියෝ උදවුකරු සේවාව"</string>
- <string name="keywords_system_alert_window" msgid="5049498015597864850">"පද්ධති ඇඟවීම් කවුළු සංවාදය අනෙක් යෙදුම් උඩින් පෙන්වීම"</string>
<string name="overlay_settings" msgid="6930854109449524280">"වෙනත් යෙදුම් උඩින් පෙන්වන්න"</string>
<string name="system_alert_window_summary" msgid="602892301318324492">"යෙදුම් <xliff:g id="COUNT_1">%2$d</xliff:g>කින් <xliff:g id="COUNT_0">%1$d</xliff:g> කට වෙනත් යෙදුම් උඩින් පෙන්වන්න අවසර ඇත"</string>
<string name="filter_overlay_apps" msgid="6965969283342557573">"අවසරය ඇති යෙදුම්"</string>
@@ -4125,7 +4121,6 @@
<string name="notification_log_details_none" msgid="184131801230614059">"කිසිවක් නැත"</string>
<string name="notification_log_details_ranking_null" msgid="244660392058720919">"ශ්රේණිගත කිරීමේ වස්තුව අස්ථානගතයි."</string>
<string name="notification_log_details_ranking_none" msgid="599607025882587844">"ශ්රේණිගත කිරීමේ වස්තුවේ මෙම යතුර අඩංගු නොවේ."</string>
- <string name="theme_customization_category" msgid="1049181544004163283">"තේමා යෙදීම"</string>
<string name="theme_customization_device_default" msgid="5058147707906551368">"උපාංගයේ පෙරනිමිය"</string>
<string name="display_cutout_emulation" msgid="7466869822418376317">"සංදර්ශක කට්අවුට්"</string>
<string name="display_cutout_emulation_keywords" msgid="4495418317471622562">"සංදර්ශක කටවුට්, නොච්"</string>
@@ -4551,6 +4546,8 @@
<string name="network_connection_errorstate_dialog_message" msgid="6953778550775646710">"යම් දෙයක් ඇත. යෙදුම උපාංගයක් තේරීමට කළ ඉල්ලීම අවලංගු කර ඇත."</string>
<string name="network_connection_connect_successful" msgid="5935510954474494928">"සම්බන්ධතාව සාර්ථකයි"</string>
<string name="network_connection_request_dialog_showall" msgid="6938922880244567521">"සියල්ල පෙන්වන්න"</string>
+ <string name="network_connection_searching_message" msgid="4638576789450817530">"උපාංගය සඳහා සොයමින්…"</string>
+ <string name="network_connection_connecting_message" msgid="3740982406609245654">"උපාංගය වෙත සම්බන්ධ වෙමින්…"</string>
<plurals name="show_bluetooth_devices" formatted="false" msgid="1715020480026568408">
<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>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 1e78c9b..a1bc41f 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -364,8 +364,6 @@
<string name="security_enable_widgets_disabled_summary" msgid="6392489775303464905">"Zakázané správcom"</string>
<string name="lockdown_settings_title" msgid="7393790212603280213">"Zobraziť možnosti uzamknutia"</string>
<string name="lockdown_settings_summary" msgid="4359438673563318171">"Zobrazenie vypínača, ktorý vypína Smart Lock, biometrické odomykanie a upozornenia na uzamknutej obrazovke"</string>
- <string name="trust_agents_extend_unlock_title" msgid="2796555263565097031">"Agenty dôvery predĺžia iba odomknutie"</string>
- <string name="trust_agents_extend_unlock_summary" msgid="3976344969220255010">"Ak túto možnosť povolíte, agenty dôvery ponechajú vaše zariadenie dlhšie odomknuté, ale už nebudú môcť odomknúť uzamknuté zariadenie."</string>
<string name="trust_lost_locks_screen_title" msgid="2992742466966021682">"Uzamknutie obrazovky v prípade straty dôveryhodnosti"</string>
<string name="trust_lost_locks_screen_summary" msgid="693784434582021206">"Po aktivácii umožňuje zariadeniu uzamknúť sa, keď posledný agent dôvery stratí dôveryhodnosť"</string>
<string name="owner_info_settings_summary" msgid="7472393443779227052">"Žiadne"</string>
@@ -969,6 +967,7 @@
<string name="wifi_eap_identity" msgid="4359453783379679103">"Identita"</string>
<string name="wifi_eap_anonymous" msgid="2989469344116577955">"Anonymná identita"</string>
<string name="wifi_password" msgid="5948219759936151048">"Heslo"</string>
+ <string name="wifi_sae_password_id" msgid="1697832722221765763">"Identifikátor hesla SAE"</string>
<string name="wifi_show_password" msgid="6461249871236968884">"Zobrazovať heslo"</string>
<string name="wifi_ap_band_config" msgid="1611826705989117930">"Vybrať pásmo pre prístupový bod"</string>
<string name="wifi_ap_choose_auto" msgid="2677800651271769965">"Automaticky"</string>
@@ -989,7 +988,6 @@
<string name="wifi_dpp_share_wifi" msgid="9065890131734833809">"Zdieľanie Wi‑Fi"</string>
<string name="wifi_dpp_scan_qr_code_with_another_device" msgid="5854392840857123065">"Ak sa chcete pripojiť k sieti <xliff:g id="SSID">%1$s</xliff:g> a zdieľať heslo, naskenujte tento QR kód"</string>
<string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="4436318319178361543">"Ak sa chcete pripojiť k sieti <xliff:g id="SSID">%1$s</xliff:g>, naskenujte tento QR kód"</string>
- <string name="wifi_dpp_could_not_detect_valid_qr_code" msgid="641893675646330576">"QR kód sa nepodarilo prečítať. Opätovne ho vycentrujte a skúste to znova."</string>
<string name="wifi_dpp_failure_authentication_or_configuration" msgid="3372757783382381044">"Skúste to znova. Ak problém pretrváva, kontaktujte výrobcu zariadenia."</string>
<string name="wifi_dpp_failure_not_compatible" msgid="2829930473520603740">"Vyskytol sa problém"</string>
<string name="wifi_dpp_failure_timeout" msgid="5228320772245820458">"Uistite, sa či je zariadenie zapojené do zásuvky, nabité a zapnuté"</string>
@@ -1012,6 +1010,7 @@
<string name="wifi_dpp_hotspot_password" msgid="4120419278831581613">"Heslo hotspotu: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
<string name="wifi_dpp_add_device" msgid="4072206063308645677">"Pridať zariadenie"</string>
<string name="wifi_dpp_connect_network_using_qr_code" msgid="3887335309163999665">"Pridajte zariadenie do tejto siete pomocou QR kódu"</string>
+ <string name="wifi_dpp_qr_code_is_not_valid_format" msgid="3700087439867692944">"QR kód nie je platný formát"</string>
<string name="retry" msgid="6472609612090877557">"Skúsiť znova"</string>
<string name="wifi_shared" msgid="844142443226926070">"Zdieľať s ostatnými používateľmi zariadenia"</string>
<string name="wifi_unchanged" msgid="3410422020930397102">"(nezmenené)"</string>
@@ -1167,6 +1166,7 @@
<string name="emergency_address_title" msgid="932729250447887545">"Tiesňová adresa"</string>
<string name="emergency_address_summary" msgid="7751971156196115129">"Používa sa ako vaša poloha pri tiesňových volaniach cez Wi‑Fi"</string>
<string name="private_dns_help_message" msgid="3299567069152568958"><annotation id="url">"Ďalšie informácie"</annotation>" o funkciách súkromného režimu DNS"</string>
+ <string name="private_dns_mode_on" msgid="5882613439541371003">"Zapnuté"</string>
<string name="wifi_calling_pref_managed_by_carrier" msgid="6845711858866828986">"Nastavenie spravuje operátor"</string>
<string name="wifi_calling_settings_activation_instructions" msgid="7492509632478260955">"Aktivujte volanie cez Wi-Fi"</string>
<string name="wifi_calling_turn_on" msgid="1171403510313983983">"Zapnite volanie cez Wi-Fi"</string>
@@ -1916,7 +1916,7 @@
<string name="default_emergency_app" msgid="1951760659640369980">"Aplikácia pre tiesňové volania"</string>
<string name="reset_app_preferences" msgid="1321050641018356925">"Resetovať nastavenia aplikácií"</string>
<string name="reset_app_preferences_title" msgid="6093179367325336662">"Chcete resetovať nastavenia aplikácií?"</string>
- <string name="reset_app_preferences_desc" msgid="4822447731869201512">"Touto akciou resetujete predvoľby položiek:\n\n"<li>"deaktivované aplikácie,"</li>\n<li>"deaktivované upozornenia aplikácií,"</li>\n<li>"predvolené aplikácie pre rôzne akcie,"</li>\n<li>"obmedzenia dátových prenosov na pozadí pre aplikácie,"</li>\n<li>"akékoľvek obmedzenia povolení."</li>\n\n"Neprídete o žiadne dáta v aplikáciách."</string>
+ <string name="reset_app_preferences_desc" msgid="731757609326016760">"Táto akcia resetuje predvoľby \n\n"<li>"zakázaných aplikácií;"</li>\n<li>"upozornení zakázaných aplikácií;"</li>\n<li>"predvolených aplikácií pre akcie;"</li>\n<li>"obmedzení dát na pozadí pre aplikácie;"</li>\n<li>"akýchkoľvek obmedzení povolení."</li>\n\n"Neprídete o žiadne dáta aplikácií."</string>
<string name="reset_app_preferences_button" msgid="2559089511841281242">"Obnoviť aplikácie"</string>
<string name="manage_space_text" msgid="8852711522447794676">"Správa pamäte"</string>
<string name="filter" msgid="2018011724373033887">"Filtrovať"</string>
@@ -2131,7 +2131,7 @@
<string name="accessibility_screen_magnification_short_summary" msgid="3411979839172752057">"Na priblíženie trikrát klepnite"</string>
<string name="accessibility_screen_magnification_navbar_short_summary" msgid="3693116360267980492">"Na priblíženie klepnite na tlačidlo"</string>
<string name="accessibility_screen_magnification_summary" msgid="5258868553337478505"><b>"Ak chcete zobrazenie priblížiť"</b>", trikrát rýchlo klepnite na obrazovku.\n"<ul><li>"Zobrazenie posuniete presunutím dvoch alebo viacerých prstov po obrazovke."</li>\n<li>"Priblíženie upravíte priblížením dvoch alebo viacerých prstov."</li></ul>\n\n<b>"Zobrazenie dočasne priblížite"</b>" tak, že trikrát rýchlo klepnete na obrazovku jedným prstom a po poslednom klepnutí prst pridržíte.\n"<ul><li>"Obrazovku môžete posúvať presúvaním prsta."</li>\n<li>"Zdvihnutím prsta zobrazenie oddialite."</li></ul>\n\n"Klávesnica ani navigačný panel sa nedajú priblížiť."</string>
- <string name="accessibility_screen_magnification_navbar_summary" msgid="2272878354599332009">"Keď je priblíženie zapnuté, môžete si zväčšiť obsah obrazovky.\n\n"<b>"Urobíte to tak"</b>", že spustíte priblíženie a klepnete kamkoľvek na obrazovku.\n"<ul><li>"• Zobrazenie posuniete presunutím dvoch alebo viacerých prstov."</li>\n<li>"• Priblíženie upravíte stiahnutím dvoch alebo viacerých prstov."</li></ul>\n\n<b>"Ak chcete obsah priblížiť krátkodobo"</b>", spustite priblíženie a pridržte ľubovoľné miesto na obrazovke.\n"<ul><li>"• Po obrazovke prechádzate presunutím."</li>\n<li>"• Oddialite zdvihnutím prsta."</li></ul>\n\n"Nemôžete priblížiť klávesnicu ani navigačný panel."</string>
+ <string name="accessibility_screen_magnification_navbar_summary" msgid="6700716275347612310">"Keď je priblíženie zapnuté, môžete si zväčšiť obsah obrazovky.\n\n"<b>"Urobíte to tak"</b>", že spustíte priblíženie a klepnete kamkoľvek na obrazovku.\n"<ul><li>"Zobrazenie posuniete presunutím dvoch alebo viacerých prstov."</li>\n<li>"Priblíženie upravíte stiahnutím dvoch alebo viacerých prstov."</li></ul>\n\n<b>"Ak chcete obsah priblížiť krátkodobo"</b>", spustite priblíženie a pridržte ľubovoľné miesto na obrazovke.\n"<ul><li>"Po obrazovke prechádzate presunutím."</li>\n<li>"Oddialite zdvihnutím prsta."</li></ul>\n\n"Nemôžete priblížiť klávesnicu ani navigačný panel."</string>
<string name="accessibility_tutorial_dialog_title_button" msgid="3682222614034474845">"Otváranie tlačidlom dostupnosti"</string>
<string name="accessibility_tutorial_dialog_title_gesture" msgid="1342726230497913398">"Otváranie gestom"</string>
<string name="accessibility_tutorial_dialog_title_gesture_settings" msgid="8539392614235820285">"Používanie nového gesta dostupnosti"</string>
@@ -2184,8 +2184,7 @@
<string name="accessibility_hearingaid_title" msgid="8312145423610648518">"Načúvadlá"</string>
<string name="accessibility_hearingaid_not_connected_summary" msgid="6240237523789614599">"Nie sú pripojené žiadne načúvadlá"</string>
<string name="accessibility_hearingaid_adding_summary" msgid="2947474468412309778">"Pridať načúvadlá"</string>
- <string name="accessibility_hearingaid_pair_instructions_first_message" msgid="3912093691643131154">"Ak chcete spárovať načúvadlo, na ďalšej obrazovke klepnite na svoje zariadenie."</string>
- <string name="accessibility_hearingaid_pair_instructions_second_message" msgid="5596683393607650243">"Skontrolujte, či sú načúvadlá v režime párovania."</string>
+ <string name="accessibility_hearingaid_pair_instructions_message" msgid="3094382949733435414">"Ak chcete spárovať načúvadlá, na ďalšej obrazovke klepnite na svoje zariadenie. Skontrolujte, či sú načúvadlá v režime párovania."</string>
<string name="accessibility_hearingaid_active_device_summary" msgid="3924362383258688984">"Zariadenie <xliff:g id="DEVICE_NAME">%1$s</xliff:g> je aktívne"</string>
<plurals name="show_number_hearingaid_count" formatted="false" msgid="3160782397139295486">
<item quantity="few"><xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> uložené načúvadlá</item>
@@ -2564,7 +2563,6 @@
<string name="menu_stats_last_unplugged" msgid="5922246077592434526">"Pri poslednom odpojení pre <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
<string name="menu_stats_total" msgid="8973377864854807854">"Využitie batérie celkom"</string>
<string name="menu_stats_refresh" msgid="1676215433344981075">"Obnoviť"</string>
- <string name="process_kernel_label" msgid="3916858646836739323">"OS Android"</string>
<string name="process_mediaserver_label" msgid="6500382062945689285">"Mediaserver"</string>
<string name="process_dex2oat_label" msgid="2592408651060518226">"Optimalizácia aplikácií"</string>
<string name="battery_saver" msgid="8172485772238572153">"Šetrič batérie"</string>
@@ -2695,8 +2693,6 @@
<string name="no_device_admins" msgid="4846602835339095768">"K dispozícii nie sú žiadne aplikácie na správu zariadenia"</string>
<string name="personal_device_admin_title" msgid="2849617316347669861">"Osobné"</string>
<string name="managed_device_admin_title" msgid="7853955652864478435">"Práca"</string>
- <string name="sms_access_restriction_enabled" msgid="7054488078710530278">"Obmedzenie prístupu k SMS a denníku hovorov"</string>
- <string name="sms_access_restriction_enabled_summary" msgid="6851339654677842328">"Povolenia na prístup k SMS a denníku hovorov majú iba predvolené telefónne aplikácie a aplikácie pre SMS a MMS"</string>
<string name="no_trust_agents" msgid="7450273545568977523">"Nie sú k dispozícii žiadne agenty dôvery"</string>
<string name="add_device_admin_msg" msgid="1501847129819382149">"Aktivovať aplikáciu na správu zariadenia?"</string>
<string name="add_device_admin" msgid="4192055385312215731">"Aktivovať túto aplikáciu na správu zariadenia"</string>
@@ -3195,7 +3191,7 @@
<string name="keywords_app_default" msgid="5822717006354487071">"Otvoriť v aplikácii"</string>
<string name="keywords_applications_settings" msgid="1268353611121497450">"Aplikácie"</string>
<string name="keywords_time_zone" msgid="998254736898753085">"časové pásmo"</string>
- <string name="keywords_draw_overlay" msgid="4130899177619041842">"Záhlavie četu"</string>
+ <string name="keywords_draw_overlay" msgid="1001120206241401007">"Záhlavie četu, systém, upozornenie, okno, dialógové okno, zobrazenie, nad inými aplikáciami, vykreslenie"</string>
<string name="keywords_flashlight" msgid="6161632177705233710">"Svietidlo, svetlo, baterka"</string>
<string name="keywords_change_wifi_state" msgid="627068244033681010">"wifi, wi-fi, prepínač, ovládanie"</string>
<string name="keywords_more_mobile_networks" msgid="8995946622054642367">"mobilné, mobil, mobilný operátor, bezdrôtové, dáta, 4g, 3g, 2g, lte"</string>
@@ -3219,7 +3215,7 @@
<string name="keywords_sounds_and_notifications_interruptions" msgid="5426093074031208917">"nie, nerušiť, vyrušiť, vyrušenie, prerušenie"</string>
<string name="keywords_app" msgid="6334757056536837791">"RAM"</string>
<string name="keywords_location" msgid="4132655528196729043">"nablízku, poloha, história, nahlasovanie, GPS"</string>
- <string name="keywords_accounts" msgid="1957925565953357627">"účet"</string>
+ <string name="keywords_accounts" msgid="4479029747403203867">"účet, pridať účet, pracovný profil"</string>
<string name="keywords_users" msgid="3434190133131387942">"obmedzenie, obmedziť, obmedzené"</string>
<string name="keywords_keyboard_and_ime" msgid="9143339015329957107">"oprava textu, opraviť, zvuk, vibrácie, automatický výber, jazyk, gesto, navrhnúť, návrh, motív, urážlivé slovo, typ, emodži, medzinárodné"</string>
<string name="keywords_reset_apps" msgid="5293291209613191845">"resetovať, nastavenia, predvolené"</string>
@@ -3257,6 +3253,7 @@
<string name="keywords_storage_settings" msgid="297283751968446577">"pamäť, vyrovnávacia pamäť, údaje, odstrániť, vymazať, voľné, miesto"</string>
<string name="keywords_bluetooth_settings" msgid="6804844062789439858">"pripojené, zariadenie, slúchadlá, slúchadlá s mikrofónom, reproduktor, bezdrôtové, párovať, slúchadlá do uší, hudba, médiá"</string>
<string name="keywords_wallpaper" msgid="5058364390917429896">"pozadie, obrazovka, uzamknutá obrazovka, motív"</string>
+ <string name="keywords_styles" msgid="5828725481814049422">"tvar ikony, zvýrazňujúca farba, písmo"</string>
<string name="keywords_assist_input" msgid="5017533309492679287">"predvolené, asistent"</string>
<string name="keywords_default_payment_app" msgid="3838565809518896799">"platby, predvolené"</string>
<string name="keywords_ambient_display" msgid="3103487805748659132">"prichádzajúce upozornenie"</string>
@@ -3266,7 +3263,7 @@
<string name="keywords_notification_vibration" msgid="31924624421190547">"hmatová spätná väzba, vibrovanie, citlivosť"</string>
<string name="keywords_battery_saver_sticky" msgid="5586215686021650278">"šetrič batérie, pevne umiestnené, trvalé, šetrič energie, batéria"</string>
<string name="keywords_battery_saver_schedule" msgid="7358789228486231944">"postup, plán, šetrič batérie, šetrič energie, batéria, automaticky, percento"</string>
- <string name="keywords_add_an_account" msgid="6488139919428902434">"pracovný profil"</string>
+ <string name="keywords_enhance_4g_lte" msgid="2273810564244790859">"VoLTE, rozšírené hovory, volanie cez 4g"</string>
<string name="default_sound" msgid="8821684447333687810">"Predvolený zvuk"</string>
<string name="sound_settings_summary" msgid="4100853606668287965">"Hlasitosť zvonenia <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
<string name="sound_dashboard_summary" msgid="3402435125958012986">"Hlasitosť, vibrovanie, režim bez vyrušení"</string>
@@ -4015,7 +4012,6 @@
<string name="permit_draw_overlay" msgid="7456536798718633432">"Povoliť zobrazenie cez iné aplikácie"</string>
<string name="allow_overlay_description" msgid="8961670023925421358">"Umožní tejto aplikácií zobrazovať sa nad inými aplikáciami, ktoré používate. Môže tak narušiť používanie týchto aplikácií alebo zmeniť ich vzhľad či správanie."</string>
<string name="keywords_vr_listener" msgid="7441221822576384680">"vr virtuálna realita prijímač stereo pomocné zariadenie"</string>
- <string name="keywords_system_alert_window" msgid="5049498015597864850">"zobrazenie dialógového okna s upozornením systému nad inými aplikáciami"</string>
<string name="overlay_settings" msgid="6930854109449524280">"Zobrazenie cez iné aplikácie"</string>
<string name="system_alert_window_summary" msgid="602892301318324492">"<xliff:g id="COUNT_0">%1$d</xliff:g> z <xliff:g id="COUNT_1">%2$d</xliff:g> aplikácií má povolené zobrazovanie cez iné aplikácie"</string>
<string name="filter_overlay_apps" msgid="6965969283342557573">"Aplikácie s povolením"</string>
@@ -4263,7 +4259,6 @@
<string name="notification_log_details_none" msgid="184131801230614059">"žiadne"</string>
<string name="notification_log_details_ranking_null" msgid="244660392058720919">"Chýba objekt hodnotenia."</string>
<string name="notification_log_details_ranking_none" msgid="599607025882587844">"Objekt hodnotenia neobsahuje tento kľúč."</string>
- <string name="theme_customization_category" msgid="1049181544004163283">"Motívy"</string>
<string name="theme_customization_device_default" msgid="5058147707906551368">"Predvolené nastavenie zariadenia"</string>
<string name="display_cutout_emulation" msgid="7466869822418376317">"Výrez obrazovky"</string>
<string name="display_cutout_emulation_keywords" msgid="4495418317471622562">"výrez obrazovky, výrez"</string>
@@ -4713,6 +4708,8 @@
<string name="network_connection_errorstate_dialog_message" msgid="6953778550775646710">"Vyskytol sa problém. Aplikácia zrušila žiadosť o výber zariadenia."</string>
<string name="network_connection_connect_successful" msgid="5935510954474494928">"Pripojenie je úspešné"</string>
<string name="network_connection_request_dialog_showall" msgid="6938922880244567521">"Zobraziť všetko"</string>
+ <string name="network_connection_searching_message" msgid="4638576789450817530">"Hľadá sa zariadenie…"</string>
+ <string name="network_connection_connecting_message" msgid="3740982406609245654">"Pripája sa k zariadeniu…"</string>
<plurals name="show_bluetooth_devices" formatted="false" msgid="1715020480026568408">
<item quantity="few"><xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> pripojené zariadenia</item>
<item quantity="many"><xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> devices connected</item>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index b68fd30..d5ac9bf 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -364,8 +364,6 @@
<string name="security_enable_widgets_disabled_summary" msgid="6392489775303464905">"Onemogočil skrbnik"</string>
<string name="lockdown_settings_title" msgid="7393790212603280213">"Prikaz možnosti za zaklep"</string>
<string name="lockdown_settings_summary" msgid="4359438673563318171">"Prikaz možnosti gumba za vklop, s katero izklopite funkcijo Smart Lock, odklepanje z biometričnimi podatki in obvestila na zaklenjenem zaslonu"</string>
- <string name="trust_agents_extend_unlock_title" msgid="2796555263565097031">"Posredniki zaupanja le podaljšajo čas odklenjenosti"</string>
- <string name="trust_agents_extend_unlock_summary" msgid="3976344969220255010">"Če je ta možnost omogočena, posredniki zaupanja poskrbijo, da naprava ostane odklenjena dalj časa, vendar ne more več odkleniti zaklenjene naprave."</string>
<string name="trust_lost_locks_screen_title" msgid="2992742466966021682">"Zakleni zaslon ob izgubljenem zaupanju"</string>
<string name="trust_lost_locks_screen_summary" msgid="693784434582021206">"Če je ta možnost omogočena, se naprava zaklene, ko zadnji posrednik zaupanja izgubi zaupanje"</string>
<string name="owner_info_settings_summary" msgid="7472393443779227052">"Brez"</string>
@@ -969,6 +967,7 @@
<string name="wifi_eap_identity" msgid="4359453783379679103">"Identiteta"</string>
<string name="wifi_eap_anonymous" msgid="2989469344116577955">"Anonimna identiteta"</string>
<string name="wifi_password" msgid="5948219759936151048">"Geslo"</string>
+ <string name="wifi_sae_password_id" msgid="1697832722221765763">"Identifikator gesla SAE"</string>
<string name="wifi_show_password" msgid="6461249871236968884">"Pokaži geslo"</string>
<string name="wifi_ap_band_config" msgid="1611826705989117930">"Izbira pasu dostopne točke"</string>
<string name="wifi_ap_choose_auto" msgid="2677800651271769965">"Samodejno"</string>
@@ -989,7 +988,6 @@
<string name="wifi_dpp_share_wifi" msgid="9065890131734833809">"Skupna raba omrežja Wi‑Fi"</string>
<string name="wifi_dpp_scan_qr_code_with_another_device" msgid="5854392840857123065">"Če želite vzpostaviti povezavo z omrežjem »<xliff:g id="SSID">%1$s</xliff:g>« in dati geslo v skupno rabo, preberite to kodo QR"</string>
<string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="4436318319178361543">"Če želite vzpostaviti povezavo z omrežjem »<xliff:g id="SSID">%1$s</xliff:g>«, preberite to kodo QR"</string>
- <string name="wifi_dpp_could_not_detect_valid_qr_code" msgid="641893675646330576">"Kode QR ni bilo mogoče prebrati. Kodo nastavite na sredino in poskusite znova."</string>
<string name="wifi_dpp_failure_authentication_or_configuration" msgid="3372757783382381044">"Poskusite znova. Če se težava ponavlja, se obrnite na proizvajalca naprave."</string>
<string name="wifi_dpp_failure_not_compatible" msgid="2829930473520603740">"Prišlo je do težave"</string>
<string name="wifi_dpp_failure_timeout" msgid="5228320772245820458">"Prepričajte se, da je naprava priključena, napolnjena in vklopljena"</string>
@@ -1012,6 +1010,7 @@
<string name="wifi_dpp_hotspot_password" msgid="4120419278831581613">"Geslo za dostopno točko: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
<string name="wifi_dpp_add_device" msgid="4072206063308645677">"Dodajte napravo"</string>
<string name="wifi_dpp_connect_network_using_qr_code" msgid="3887335309163999665">"Če želite dodati napravo v to omrežje, uporabite kodo QR"</string>
+ <string name="wifi_dpp_qr_code_is_not_valid_format" msgid="3700087439867692944">"Koda QR nima pravilne oblike zapisa"</string>
<string name="retry" msgid="6472609612090877557">"Poskusi znova"</string>
<string name="wifi_shared" msgid="844142443226926070">"Skupna raba z drugimi uporabniki naprave"</string>
<string name="wifi_unchanged" msgid="3410422020930397102">"(nespremenjeno)"</string>
@@ -1167,6 +1166,7 @@
<string name="emergency_address_title" msgid="932729250447887545">"Naslov za nujne primere"</string>
<string name="emergency_address_summary" msgid="7751971156196115129">"Uporabljen je kot vaš naslov, ko opravite klic v sili prek Wi‑Fi-ja"</string>
<string name="private_dns_help_message" msgid="3299567069152568958"><annotation id="url">"Preberite več"</annotation>" o funkcijah zasebnega strežnika DNS"</string>
+ <string name="private_dns_mode_on" msgid="5882613439541371003">"Vklopljeno"</string>
<string name="wifi_calling_pref_managed_by_carrier" msgid="6845711858866828986">"Nastavitev upravlja operater"</string>
<string name="wifi_calling_settings_activation_instructions" msgid="7492509632478260955">"Aktivirajte klicanje prek Wi-Fi-ja"</string>
<string name="wifi_calling_turn_on" msgid="1171403510313983983">"Vklopite klicanje prek Wi-Fi-ja"</string>
@@ -1916,7 +1916,7 @@
<string name="default_emergency_app" msgid="1951760659640369980">"Aplikacija v sili"</string>
<string name="reset_app_preferences" msgid="1321050641018356925">"Ponastavi nastavitve aplikacij"</string>
<string name="reset_app_preferences_title" msgid="6093179367325336662">"Želite ponastaviti nastavitve aplikacij?"</string>
- <string name="reset_app_preferences_desc" msgid="4822447731869201512">"S tem bodo ponastavljene vse nastavitve za:\n\n"<li>"onemogočene aplikacije,"</li>\n<li>"obvestila za onemogočene aplikacije,"</li>\n<li>"privzete aplikacije za dejanja,"</li>\n<li>"omejitev prenosa podatkov v ozadju za aplikacije,"</li>\n<li>"omejitve dovoljenj."</li>\n\n" Podatkov iz aplikacij ne boste izgubili."</string>
+ <string name="reset_app_preferences_desc" msgid="731757609326016760">"S tem bodo ponastavljene vse nastavitve za:\n\n"<li>" onemogočene aplikacije,"</li>\n<li>" obvestila za onemogočene aplikacije,"</li>\n<li>" privzete aplikacije za dejanja,"</li>\n<li>" omejitve prenosa podatkov v ozadju za aplikacije,"</li>\n<li>" omejitve dovoljenj."</li>\n\n" Podatkov aplikacij ne boste izgubili."</string>
<string name="reset_app_preferences_button" msgid="2559089511841281242">"Ponastavi aplikacije"</string>
<string name="manage_space_text" msgid="8852711522447794676">"Upravljaj prostor"</string>
<string name="filter" msgid="2018011724373033887">"Filtriraj"</string>
@@ -2131,7 +2131,7 @@
<string name="accessibility_screen_magnification_short_summary" msgid="3411979839172752057">"Če želite povečati, se trikrat dotaknite"</string>
<string name="accessibility_screen_magnification_navbar_short_summary" msgid="3693116360267980492">"Če želite povečati, se dotaknite gumba"</string>
<string name="accessibility_screen_magnification_summary" msgid="5258868553337478505"><b>"Če želite povečati"</b>", se hitro trikrat dotaknite zaslona.\n"<ul><li>"Povlecite z dvema ali več prsti po zaslonu, če se želite pomikati."</li>\n<li>"Povlecite dva ali več prstov skupaj, če želite prilagoditi povečavo."</li></ul>\n\n<b>"Če želite začasno povečati"</b>", se hitro trikrat dotaknite zaslona in pri tretjem dotiku zadržite prst na zaslonu.\n"<ul><li>"Povlecite, če se želite premikati po zaslonu."</li>\n<li>"Dvignite prst, če želite zmanjšati povečavo."</li></ul>\n\n"Povečava ni mogoča na tipkovnici in v vrstici za krmarjenje."</string>
- <string name="accessibility_screen_magnification_navbar_summary" msgid="2272878354599332009">"Ko je povečava vklopljena, lahko povečate prikaz na zaslonu.\n\n"<b>"Če želite povečati prikaz"</b>", zaženite povečavo, nato pa se dotaknite poljubnega mesta na zaslonu.\n"<ul><li>"• Povlecite z dvema ali več prsti po zaslonu, če se želite pomikati."</li>\n<li>"• Primaknite ali razmaknite dva ali več prstov, če želite prilagoditi povečavo."</li></ul>\n\n<b>"Če želite začasno povečati prikaz"</b>", zaženite povečavo in se dotaknite poljubnega mesta na zaslonu ter ga pridržite.\n"<ul><li>"• Povlecite, če se želite premikati po zaslonu."</li>\n<li>"• Dvignite prst, če želite zmanjšati povečavo."</li></ul>\n\n"Povečava ni mogoča na tipkovnici ali v vrstici za krmarjenje."</string>
+ <string name="accessibility_screen_magnification_navbar_summary" msgid="6700716275347612310">"Ko je povečava vklopljena, lahko povečate prikaz na zaslonu.\n\n"<b>"Če želite povečati prikaz"</b>", zaženite povečavo, nato pa se dotaknite poljubnega mesta na zaslonu.\n"<ul><li>"Povlecite z dvema ali več prsti po zaslonu, če se želite pomikati."</li>\n<li>"Primaknite ali razmaknite dva ali več prstov, če želite prilagoditi povečavo."</li></ul>\n\n<b>"Če želite začasno povečati prikaz"</b>", zaženite povečavo ter se dotaknite poljubnega mesta na zaslonu in ga pridržite.\n"<ul><li>"Povlecite, če se želite premikati po zaslonu."</li>\n<li>"Dvignite prst, če želite zmanjšati povečavo."</li></ul>\n\n"Povečava ni mogoča na tipkovnici ali v vrstici za krmarjenje."</string>
<string name="accessibility_tutorial_dialog_title_button" msgid="3682222614034474845">"Odpiranje z gumbom za ljudi s posebnimi potrebami"</string>
<string name="accessibility_tutorial_dialog_title_gesture" msgid="1342726230497913398">"Odpiranje s potezo"</string>
<string name="accessibility_tutorial_dialog_title_gesture_settings" msgid="8539392614235820285">"Uporaba nove poteze za ljudi s posebnimi potrebami"</string>
@@ -2184,8 +2184,7 @@
<string name="accessibility_hearingaid_title" msgid="8312145423610648518">"Slušni pripomočki"</string>
<string name="accessibility_hearingaid_not_connected_summary" msgid="6240237523789614599">"Noben slušni pripomoček ni povezan"</string>
<string name="accessibility_hearingaid_adding_summary" msgid="2947474468412309778">"Dodajanje slušnih pripomočkov"</string>
- <string name="accessibility_hearingaid_pair_instructions_first_message" msgid="3912093691643131154">"Če želite seznaniti slušne pripomočke, na naslednjem zaslonu poiščite napravo in se je dotaknite."</string>
- <string name="accessibility_hearingaid_pair_instructions_second_message" msgid="5596683393607650243">"Prepričajte se, da so slušni pripomočki v načinu seznanjanja."</string>
+ <string name="accessibility_hearingaid_pair_instructions_message" msgid="3094382949733435414">"Če želite seznaniti slušne pripomočke, na naslednjem zaslonu poiščite napravo in se je dotaknite. Prepričajte se, da so slušni pripomočki v načinu seznanjanja."</string>
<string name="accessibility_hearingaid_active_device_summary" msgid="3924362383258688984">"Naprava <xliff:g id="DEVICE_NAME">%1$s</xliff:g> je aktivna"</string>
<plurals name="show_number_hearingaid_count" formatted="false" msgid="3160782397139295486">
<item quantity="one"><xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> shranjen slušni pripomoček</item>
@@ -2564,7 +2563,6 @@
<string name="menu_stats_last_unplugged" msgid="5922246077592434526">"Po zadnjem odklopu za <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
<string name="menu_stats_total" msgid="8973377864854807854">"Skupna poraba"</string>
<string name="menu_stats_refresh" msgid="1676215433344981075">"Osveži"</string>
- <string name="process_kernel_label" msgid="3916858646836739323">"OS Android"</string>
<string name="process_mediaserver_label" msgid="6500382062945689285">"Predstavnostni strežnik"</string>
<string name="process_dex2oat_label" msgid="2592408651060518226">"Optimizacija aplikacij"</string>
<string name="battery_saver" msgid="8172485772238572153">"Varčevanje z energijo akumulatorja"</string>
@@ -2695,8 +2693,6 @@
<string name="no_device_admins" msgid="4846602835339095768">"Na voljo ni nobena skrbniška aplikacija naprave"</string>
<string name="personal_device_admin_title" msgid="2849617316347669861">"Osebno"</string>
<string name="managed_device_admin_title" msgid="7853955652864478435">"Delo"</string>
- <string name="sms_access_restriction_enabled" msgid="7054488078710530278">"Omejitev dostopa do SMS-ov in dnevnika klicev"</string>
- <string name="sms_access_restriction_enabled_summary" msgid="6851339654677842328">"Samo privzete aplikacije za klicanje in sporočila imajo dovoljenja za sporočila SMS in dnevnik klicev"</string>
<string name="no_trust_agents" msgid="7450273545568977523">"Na voljo ni nobenega posrednika zaupanja"</string>
<string name="add_device_admin_msg" msgid="1501847129819382149">"Aktivacija skrbniške aplikacije naprave?"</string>
<string name="add_device_admin" msgid="4192055385312215731">"Aktiviraj to skrbniško aplikacijo naprave"</string>
@@ -3195,7 +3191,7 @@
<string name="keywords_app_default" msgid="5822717006354487071">"Za odpiranje uporabi"</string>
<string name="keywords_applications_settings" msgid="1268353611121497450">"Aplikacije"</string>
<string name="keywords_time_zone" msgid="998254736898753085">"časovni pas"</string>
- <string name="keywords_draw_overlay" msgid="4130899177619041842">"Glava klepeta"</string>
+ <string name="keywords_draw_overlay" msgid="1001120206241401007">"Glava klepeta, sistem, opozorilo, okno, pogovorno okno, prikaz, čez druge aplikacije, risanje"</string>
<string name="keywords_flashlight" msgid="6161632177705233710">"Svetilka, luč, baterijska svetilka, žepna svetilka"</string>
<string name="keywords_change_wifi_state" msgid="627068244033681010">"wifi, wi-fi, preklop, upravljanje"</string>
<string name="keywords_more_mobile_networks" msgid="8995946622054642367">"mobilno omrežje, mobilno, operater, brezžično, podatki, 4g, 3g, 2g, lte"</string>
@@ -3219,7 +3215,7 @@
<string name="keywords_sounds_and_notifications_interruptions" msgid="5426093074031208917">"ne moti, prekinjaj, prekinitev, motnja"</string>
<string name="keywords_app" msgid="6334757056536837791">"RAM"</string>
<string name="keywords_location" msgid="4132655528196729043">"v bližini, lokacija, zgodovina, poročanje, GPS"</string>
- <string name="keywords_accounts" msgid="1957925565953357627">"račun"</string>
+ <string name="keywords_accounts" msgid="4479029747403203867">"račun, dodajanje računa, dodaj račun, delovni profil"</string>
<string name="keywords_users" msgid="3434190133131387942">"omejitev, omeji, omejeno"</string>
<string name="keywords_keyboard_and_ime" msgid="9143339015329957107">"popravljanje besedila, pravilno, zvok, vibriranje, samodejno, jezik, poteza, predlaganje, predlog, tema, žaljivo, beseda, vrsta, emodžiji, mednarodno"</string>
<string name="keywords_reset_apps" msgid="5293291209613191845">"ponastavitev, nastavitve, privzeto"</string>
@@ -3257,6 +3253,7 @@
<string name="keywords_storage_settings" msgid="297283751968446577">"pomnilnik, predpomnilnik, podatki, izbrisati, počistiti, sprostiti, prostor"</string>
<string name="keywords_bluetooth_settings" msgid="6804844062789439858">"povezano, naprava, slušalke, slušalke z mikrofonom, zvočnik, brezžično, seznaniti, seznanitev, ušesne slušalke, glasba, predstavnost"</string>
<string name="keywords_wallpaper" msgid="5058364390917429896">"ozadje, zaslon, zaklenjen zaslon, tema"</string>
+ <string name="keywords_styles" msgid="5828725481814049422">"oblika ikon, barva poudarka, pisava"</string>
<string name="keywords_assist_input" msgid="5017533309492679287">"privzeto, pomočnik"</string>
<string name="keywords_default_payment_app" msgid="3838565809518896799">"plačilo, plačevanje, privzeto"</string>
<string name="keywords_ambient_display" msgid="3103487805748659132">"dohodno obvestilo"</string>
@@ -3266,7 +3263,7 @@
<string name="keywords_notification_vibration" msgid="31924624421190547">"haptično, vibriranje, občutljivost"</string>
<string name="keywords_battery_saver_sticky" msgid="5586215686021650278">"varčevanje z energijo akumulatorja, lepljivo, trajno, varčevanje z energijo, akumulator"</string>
<string name="keywords_battery_saver_schedule" msgid="7358789228486231944">"rutina, vsakodnevni opravek, razpored, urnik, varčevanje z energijo akumulatorja, varčevanje z energijo, akumulator, samodejno, odstotek, delež"</string>
- <string name="keywords_add_an_account" msgid="6488139919428902434">"delovni profil"</string>
+ <string name="keywords_enhance_4g_lte" msgid="2273810564244790859">"volte, napredno klicanje, klicanje 4g"</string>
<string name="default_sound" msgid="8821684447333687810">"Privzeti zvok"</string>
<string name="sound_settings_summary" msgid="4100853606668287965">"Glasnost zvonjenja: <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
<string name="sound_dashboard_summary" msgid="3402435125958012986">"Glasnost, vibriranje, ne moti"</string>
@@ -4015,7 +4012,6 @@
<string name="permit_draw_overlay" msgid="7456536798718633432">"Dovoli prekrivanje drugih aplikacij"</string>
<string name="allow_overlay_description" msgid="8961670023925421358">"Omogočite tej aplikaciji, da prekrije druge aplikacije, ki jih uporabljate. To lahko vpliva na uporabo teh aplikacij ali spremeni njihov običajen videz ali delovanje."</string>
<string name="keywords_vr_listener" msgid="7441221822576384680">"vr navidezna resničnost poslušalec stereo storitev za pomoč"</string>
- <string name="keywords_system_alert_window" msgid="5049498015597864850">"sistemsko opozorilo pogovorno okno prikaz s prekrivanjem drugih aplikacij"</string>
<string name="overlay_settings" msgid="6930854109449524280">"Prekrivanje drugih aplikacij"</string>
<string name="system_alert_window_summary" msgid="602892301318324492">"<xliff:g id="COUNT_0">%1$d</xliff:g> od <xliff:g id="COUNT_1">%2$d</xliff:g> aplikacij, ki lahko prekrivajo druge aplikacije"</string>
<string name="filter_overlay_apps" msgid="6965969283342557573">"Aplikacije z dovoljenjem"</string>
@@ -4263,7 +4259,6 @@
<string name="notification_log_details_none" msgid="184131801230614059">"brez"</string>
<string name="notification_log_details_ranking_null" msgid="244660392058720919">"Manjka predmet za uvrščanje."</string>
<string name="notification_log_details_ranking_none" msgid="599607025882587844">"Predmet za uvrščanje ne vsebuje tega ključa."</string>
- <string name="theme_customization_category" msgid="1049181544004163283">"Nastavljanje teme"</string>
<string name="theme_customization_device_default" msgid="5058147707906551368">"Privzeta nastavitev naprave"</string>
<string name="display_cutout_emulation" msgid="7466869822418376317">"Zareza zaslona"</string>
<string name="display_cutout_emulation_keywords" msgid="4495418317471622562">"izrez prikaza"</string>
@@ -4713,6 +4708,8 @@
<string name="network_connection_errorstate_dialog_message" msgid="6953778550775646710">"Prišlo je do napake. Aplikacija je preklicala zahtevo za izbiro naprave."</string>
<string name="network_connection_connect_successful" msgid="5935510954474494928">"Uspešna vzpostavitev povezave"</string>
<string name="network_connection_request_dialog_showall" msgid="6938922880244567521">"Pokaži vse"</string>
+ <string name="network_connection_searching_message" msgid="4638576789450817530">"Iskanje naprave …"</string>
+ <string name="network_connection_connecting_message" msgid="3740982406609245654">"Vzpostavljanje povezave z napravo …"</string>
<plurals name="show_bluetooth_devices" formatted="false" msgid="1715020480026568408">
<item quantity="one"><xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> povezana naprava</item>
<item quantity="two"><xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> povezani napravi</item>
diff --git a/res/values-sq/strings.xml b/res/values-sq/strings.xml
index 52d99b9..6982d33 100644
--- a/res/values-sq/strings.xml
+++ b/res/values-sq/strings.xml
@@ -360,8 +360,6 @@
<string name="security_enable_widgets_disabled_summary" msgid="6392489775303464905">"Çaktivizuar nga administratori"</string>
<string name="lockdown_settings_title" msgid="7393790212603280213">"Shfaq opsionin e bllokimit"</string>
<string name="lockdown_settings_summary" msgid="4359438673563318171">"Shfaq opsionin e butonit të energjisë që çaktivizon Smart Lock, shkyçjen biometrike dhe njoftimet në ekranin e kyçjes"</string>
- <string name="trust_agents_extend_unlock_title" msgid="2796555263565097031">"Shkyçja e zgjeruar vetëm për agjentët e besimit"</string>
- <string name="trust_agents_extend_unlock_summary" msgid="3976344969220255010">"Nëse janë aktivizuar, agjentët e besimit do ta mbajnë pajisjen tënde të shkyçur për një kohë më të gjatë, por nuk mund ta shkyçin më një pajisje të kyçur."</string>
<string name="trust_lost_locks_screen_title" msgid="2992742466966021682">"Kyçe ekranin kur të humbasë besimi"</string>
<string name="trust_lost_locks_screen_summary" msgid="693784434582021206">"Nëse është aktivizuar, pajisja do të kyçet kur agjenti i fundit i besimit të humbasë besimin"</string>
<string name="owner_info_settings_summary" msgid="7472393443779227052">"Asnjë"</string>
@@ -937,6 +935,7 @@
<string name="wifi_eap_identity" msgid="4359453783379679103">"Identiteti"</string>
<string name="wifi_eap_anonymous" msgid="2989469344116577955">"Identitet anonim"</string>
<string name="wifi_password" msgid="5948219759936151048">"Fjalëkalimi"</string>
+ <string name="wifi_sae_password_id" msgid="1697832722221765763">"Identifikues fjalëkalimi të SAE"</string>
<string name="wifi_show_password" msgid="6461249871236968884">"Shfaq fjalëkalimin"</string>
<string name="wifi_ap_band_config" msgid="1611826705989117930">"Zgjidh bandën AP"</string>
<string name="wifi_ap_choose_auto" msgid="2677800651271769965">"Automatik"</string>
@@ -957,7 +956,6 @@
<string name="wifi_dpp_share_wifi" msgid="9065890131734833809">"Ndaj Wi‑Fi"</string>
<string name="wifi_dpp_scan_qr_code_with_another_device" msgid="5854392840857123065">"Skano këtë kod QR për t\'u lidhur me “<xliff:g id="SSID">%1$s</xliff:g>” dhe ndaj fjalëkalimin"</string>
<string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="4436318319178361543">"Skano këtë kod QR për t\'u lidhur me “<xliff:g id="SSID">%1$s</xliff:g>”"</string>
- <string name="wifi_dpp_could_not_detect_valid_qr_code" msgid="641893675646330576">"Kodi QR nuk mund të lexohej Vendose përsëri kodin në qendër dhe provo përsëri"</string>
<string name="wifi_dpp_failure_authentication_or_configuration" msgid="3372757783382381044">"Provo sërish. Nëse problemi vazhdon, kontakto me prodhuesin e pajisjes"</string>
<string name="wifi_dpp_failure_not_compatible" msgid="2829930473520603740">"Ndodhi një gabim"</string>
<string name="wifi_dpp_failure_timeout" msgid="5228320772245820458">"Sigurohu që pajisja është në prizë, e karikuar dhe e ndezur"</string>
@@ -980,6 +978,7 @@
<string name="wifi_dpp_hotspot_password" msgid="4120419278831581613">"Fjalëkalimi i zonës së qasjes për internet: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
<string name="wifi_dpp_add_device" msgid="4072206063308645677">"Shto pajisje"</string>
<string name="wifi_dpp_connect_network_using_qr_code" msgid="3887335309163999665">"Përdor një kod QR për të shtuar një pajisje në këtë rrjet"</string>
+ <string name="wifi_dpp_qr_code_is_not_valid_format" msgid="3700087439867692944">"Kodi QR nuk është në format të vlefshëm"</string>
<string name="retry" msgid="6472609612090877557">"Riprovo"</string>
<string name="wifi_shared" msgid="844142443226926070">"Ndaje me përdoruesit e tjerë të pajisjes"</string>
<string name="wifi_unchanged" msgid="3410422020930397102">"(i pandryshuar)"</string>
@@ -1129,6 +1128,7 @@
<string name="emergency_address_title" msgid="932729250447887545">"Adresa e urgjencës"</string>
<string name="emergency_address_summary" msgid="7751971156196115129">"Përdoret si vendndodhja jote kur kryen një telefonatë urgjence me Wi‑Fi"</string>
<string name="private_dns_help_message" msgid="3299567069152568958"><annotation id="url">"Mëso më shumë"</annotation>" rreth funksioneve të \"DNS-së private\""</string>
+ <string name="private_dns_mode_on" msgid="5882613439541371003">"Aktive"</string>
<string name="wifi_calling_pref_managed_by_carrier" msgid="6845711858866828986">"Cilësimi menaxhohet nga operatori celular"</string>
<string name="wifi_calling_settings_activation_instructions" msgid="7492509632478260955">"Aktivizo \"Telefonatën me Wi-Fi\""</string>
<string name="wifi_calling_turn_on" msgid="1171403510313983983">"Aktivizo \"Telefonatën me Wi-Fi\""</string>
@@ -1872,7 +1872,7 @@
<string name="default_emergency_app" msgid="1951760659640369980">"Aplikacioni i emergjencave"</string>
<string name="reset_app_preferences" msgid="1321050641018356925">"Rivendos preferencat e apl."</string>
<string name="reset_app_preferences_title" msgid="6093179367325336662">"Të rivendosen preferencat e aplikacionit?"</string>
- <string name="reset_app_preferences_desc" msgid="4822447731869201512">"Kjo do t\'i rivendosë të gjitha preferencat për:\n\n"<li>"Aplikacionet e çaktivizuara"</li>\n<li>"Njoftimet e aplikacioneve të çaktivizuara"</li>\n<li>"Aplikacionet e parazgjedhura për veprimet"</li>\n<li>"Kufizimet e të dhënave në sfond për aplikacionet"</li>\n<li>"Çdo kufizim të lejes"</li>\n\n" Nuk do të humbësh asnjë të dhënë aplikacioni."</string>
+ <string name="reset_app_preferences_desc" msgid="731757609326016760">"Kjo do t\'i rivendosë të gjitha preferencat për:\n\n"<li>" Aplikacionet e çaktivizuara"</li>\n<li>" Njoftimet e aplikacioneve të çaktivizuara"</li>\n<li>" Aplikacionet e parazgjedhura për veprimet"</li>\n<li>" Kufizimet e të dhënave në sfond për aplikacionet"</li>\n<li>" Çdo kufizim të autorizimeve"</li>\n\n" Nuk do të humbësh asnjë të dhënë aplikacioni."</string>
<string name="reset_app_preferences_button" msgid="2559089511841281242">"Rivendos aplikacionet"</string>
<string name="manage_space_text" msgid="8852711522447794676">"Menaxho hapësirën"</string>
<string name="filter" msgid="2018011724373033887">"Filtro"</string>
@@ -2087,7 +2087,7 @@
<string name="accessibility_screen_magnification_short_summary" msgid="3411979839172752057">"Trokit 3 herë për ta zmadhuar"</string>
<string name="accessibility_screen_magnification_navbar_short_summary" msgid="3693116360267980492">"Trokit te një buton për të zmadhuar"</string>
<string name="accessibility_screen_magnification_summary" msgid="5258868553337478505"><b>"Për të zmadhuar"</b>", trokit me shpejtësi tek ekrani 3 herë.\n"<ul><li>"Zvarrit 2 ose më shumë gishta për të lëvizur"</li>\n<li>"Afro 2 ose më shumë gishta për të rregulluar zmadhimin"</li></ul>\n\n<b>"Për të zmadhuar përkohësisht"</b>", trokit me shpejtësi 3 herë tek ekrani dhe mbaj të shtypur gishtin në trokitjen e tretë.\n"<ul><li>"Zvarrite për të zhvendosur ekranin"</li>\n<li>"Ngrije gishtin për ta zvogëluar"</li></ul>\n\n"Nuk mund të zmadhosh te tastiera dhe te shiriti i navigimit."</string>
- <string name="accessibility_screen_magnification_navbar_summary" msgid="2272878354599332009">"Kur aktivizohet zmadhimi, mund të zmadhosh mbi ekranin tënd.\n\n"<b>"Për të zmadhuar"</b>", nis zmadhimin, më pas trokit diku në ekran.\n"<ul><li>"• Zvarrit 2 ose më shumë gishta për të lëvizur"</li>\n<li>"• Bashko 2 ose më shumë gishta për të rregulluar zmadhimin"</li></ul>\n\n<b>"Për të zmadhuar përkohësisht"</b>", nis zmadhimin, më pas prek dhe mbaj të shtypur diku në ekran.\n"<ul><li>"• Zvarrit për të lëvizur rrotull në ekran"</li>\n<li>"• Ngrije gishtin për të vogëluar"</li></ul>\n\n"Nuk mund të zmadhosh mbi tastierë ose shiritin e navigimit."</string>
+ <string name="accessibility_screen_magnification_navbar_summary" msgid="6700716275347612310">"Kur aktivizohet zmadhimi, mund të zmadhosh mbi ekranin tënd.\n\n"<b>"Për të zmadhuar"</b>", nis zmadhimin, më pas trokit diku në ekran.\n"<ul><li>"Zvarrit 2 ose më shumë gishta për të lëvizur"</li>\n<li>"Afro 2 ose më shumë gishta për të rregulluar zmadhimin"</li></ul>\n\n<b>"Për të zmadhuar përkohësisht"</b>", nis zmadhimin dhe më pas prek dhe mbaj të shtypur diku në ekran.\n"<ul><li>"Zvarrit për të lëvizur nëpër ekran"</li>\n<li>"Ngri gishtin për të zvogëluar"</li></ul>\n\n"Nuk mund të zmadhosh te tastiera ose shiriti i navigimit."</string>
<string name="accessibility_tutorial_dialog_title_button" msgid="3682222614034474845">"Përdor butonin e qasshmërisë për të hapur"</string>
<string name="accessibility_tutorial_dialog_title_gesture" msgid="1342726230497913398">"Përdor gjestin për të hapur"</string>
<string name="accessibility_tutorial_dialog_title_gesture_settings" msgid="8539392614235820285">"Përdor gjestin e ri të qasshmërisë"</string>
@@ -2140,8 +2140,7 @@
<string name="accessibility_hearingaid_title" msgid="8312145423610648518">"Aparatet e dëgjimit"</string>
<string name="accessibility_hearingaid_not_connected_summary" msgid="6240237523789614599">"Nuk ka asnjë aparat dëgjimi të lidhur"</string>
<string name="accessibility_hearingaid_adding_summary" msgid="2947474468412309778">"Shto aparate dëgjimi"</string>
- <string name="accessibility_hearingaid_pair_instructions_first_message" msgid="3912093691643131154">"Për të çiftuar aparatin e dëgjimit, gjej e trokit pajisjen tënde në ekranin tjetër."</string>
- <string name="accessibility_hearingaid_pair_instructions_second_message" msgid="5596683393607650243">"Sigurohu që aparatet e tua të dëgjimit të jenë në modalitetin e çiftimit."</string>
+ <string name="accessibility_hearingaid_pair_instructions_message" msgid="3094382949733435414">"Për të çiftuar aparatet e tua të dëgjimit, gjej dhe trokit te pajisja jote në ekranin tjetër. Sigurohu që aparatet e tua të dëgjimit të jenë në modalitetin e çiftimit."</string>
<string name="accessibility_hearingaid_active_device_summary" msgid="3924362383258688984">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> është aktive"</string>
<plurals name="show_number_hearingaid_count" formatted="false" msgid="3160782397139295486">
<item quantity="other"><xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> aparate dëgjimi të ruajtura</item>
@@ -2490,7 +2489,6 @@
<string name="menu_stats_last_unplugged" msgid="5922246077592434526">"Kur ishte në prizë për herë të fundit për <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
<string name="menu_stats_total" msgid="8973377864854807854">"Totalet e përdorimit"</string>
<string name="menu_stats_refresh" msgid="1676215433344981075">"Rifresko"</string>
- <string name="process_kernel_label" msgid="3916858646836739323">"Sistemi operativ Android"</string>
<string name="process_mediaserver_label" msgid="6500382062945689285">"Serveri i medias"</string>
<string name="process_dex2oat_label" msgid="2592408651060518226">"Optimizimi i aplikacionit"</string>
<string name="battery_saver" msgid="8172485772238572153">"Kursyesi i baterisë"</string>
@@ -2621,8 +2619,6 @@
<string name="no_device_admins" msgid="4846602835339095768">"Nuk ka asnjë aplikacion administrimi të pajisjes në dispozicion"</string>
<string name="personal_device_admin_title" msgid="2849617316347669861">"Personal"</string>
<string name="managed_device_admin_title" msgid="7853955652864478435">"Punë"</string>
- <string name="sms_access_restriction_enabled" msgid="7054488078710530278">"Kufizo qasjen tek evidenca e telefonatave dhe SMS-ve"</string>
- <string name="sms_access_restriction_enabled_summary" msgid="6851339654677842328">"Vetëm aplikacionet e parazgjedhura të mesazheve dhe telefonit kanë leje për evidencën e telefonatave dhe SMS-ve"</string>
<string name="no_trust_agents" msgid="7450273545568977523">"Nuk mundësohet asnjë agjent i besuar"</string>
<string name="add_device_admin_msg" msgid="1501847129819382149">"Të aktivizohet aplikacioni i administratorit të pajisjes?"</string>
<string name="add_device_admin" msgid="4192055385312215731">"Aktivizo këtë aplikacion të administratorit të pajisjes"</string>
@@ -3111,7 +3107,7 @@
<string name="keywords_app_default" msgid="5822717006354487071">"Hap me"</string>
<string name="keywords_applications_settings" msgid="1268353611121497450">"Aplikacionet"</string>
<string name="keywords_time_zone" msgid="998254736898753085">"brezi orar"</string>
- <string name="keywords_draw_overlay" msgid="4130899177619041842">"Koka e bisedës"</string>
+ <string name="keywords_draw_overlay" msgid="1001120206241401007">"Koka e bisedës, sistem, sinjalizim, dritare, dialog, shfaq, mbi aplikacionet e tjera, vizato"</string>
<string name="keywords_flashlight" msgid="6161632177705233710">"Elektriku, drita, feneri"</string>
<string name="keywords_change_wifi_state" msgid="627068244033681010">"wifi, wi-fi, ndrysho, kontrolli"</string>
<string name="keywords_more_mobile_networks" msgid="8995946622054642367">"celular, celular, operator celular, pa tel, të dhëna, 4g, 3g, 2g, lte"</string>
@@ -3135,7 +3131,7 @@
<string name="keywords_sounds_and_notifications_interruptions" msgid="5426093074031208917">"mos, mos shqetëso, ndërprit, ndërprerje, pushim"</string>
<string name="keywords_app" msgid="6334757056536837791">"RAM"</string>
<string name="keywords_location" msgid="4132655528196729043">"në afërsi, vendndodhje, historik, raportim, GPS"</string>
- <string name="keywords_accounts" msgid="1957925565953357627">"llogaria"</string>
+ <string name="keywords_accounts" msgid="4479029747403203867">"llogaria, shto një llogari, profili i punës"</string>
<string name="keywords_users" msgid="3434190133131387942">"kufizimi, kufizo, të kufizuara"</string>
<string name="keywords_keyboard_and_ime" msgid="9143339015329957107">"korrigjim teksti, saktë, zë, dridhje, automatike, gjuhë, gjest, sugjero, sugjerim, temë, ofenduese, fjalë, emoji. ndërkombëtare"</string>
<string name="keywords_reset_apps" msgid="5293291209613191845">"rivendos, preferencat, e parazgjedhur"</string>
@@ -3173,6 +3169,7 @@
<string name="keywords_storage_settings" msgid="297283751968446577">"memorie, memorie specifike, të dhëna, fshi, pastro, e lirë, hapësirë"</string>
<string name="keywords_bluetooth_settings" msgid="6804844062789439858">"e lidhur, pajisje, kufje, kufje me mikrofon, altoparlant, pa tela, çift, kufje të vogla, muzikë, media"</string>
<string name="keywords_wallpaper" msgid="5058364390917429896">"sfond, ekran, ekrani i kyçjes, temë"</string>
+ <string name="keywords_styles" msgid="5828725481814049422">"forma e ikonës, ngjyra e theksit, fonti"</string>
<string name="keywords_assist_input" msgid="5017533309492679287">"i parazgjedhur, asistenti"</string>
<string name="keywords_default_payment_app" msgid="3838565809518896799">"pagesë, e parazgjedhur"</string>
<string name="keywords_ambient_display" msgid="3103487805748659132">"njoftim hyrës"</string>
@@ -3182,7 +3179,7 @@
<string name="keywords_notification_vibration" msgid="31924624421190547">"prekje, dridhje, ndjeshmëri"</string>
<string name="keywords_battery_saver_sticky" msgid="5586215686021650278">"kursyesi i baterisë, i ngjitur, vazhdoj, kursyesi i energjisë, bateria"</string>
<string name="keywords_battery_saver_schedule" msgid="7358789228486231944">"rutina, planifikimi, kursyesi i baterisë, kursyesi i energjisë, bateria, automatike, përqind"</string>
- <string name="keywords_add_an_account" msgid="6488139919428902434">"profili i punës"</string>
+ <string name="keywords_enhance_4g_lte" msgid="2273810564244790859">"volte, telefonatë e përparuar, telefonatë me 4g"</string>
<string name="default_sound" msgid="8821684447333687810">"Zëri i parazgjedhur"</string>
<string name="sound_settings_summary" msgid="4100853606668287965">"Volumi i ziles në <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
<string name="sound_dashboard_summary" msgid="3402435125958012986">"Volum, dridhje, \"Mos shqetëso\""</string>
@@ -3889,7 +3886,6 @@
<string name="permit_draw_overlay" msgid="7456536798718633432">"Lejo shfaqjen mbi aplikacionet e tjera"</string>
<string name="allow_overlay_description" msgid="8961670023925421358">"Lejoje këtë aplikacion të shfaqet në krye të aplikacioneve të tjera që po përdor. Kjo mund të ndërhyjë me përdorimin tënd të atyre aplikacioneve ose mund të ndryshojë mënyrën se si ata duken ose sillen."</string>
<string name="keywords_vr_listener" msgid="7441221822576384680">"vr realitet virtual dëgjues stereo ndihmues shërbim"</string>
- <string name="keywords_system_alert_window" msgid="5049498015597864850">"sistem sinjalizim dritare dialog shfaq mbi aplikacionet e tjera"</string>
<string name="overlay_settings" msgid="6930854109449524280">"Shfaq mbi aplikacionet e tjera"</string>
<string name="system_alert_window_summary" msgid="602892301318324492">"<xliff:g id="COUNT_0">%1$d</xliff:g> nga <xliff:g id="COUNT_1">%2$d</xliff:g> gjithsej lejohen të shfaqen mbi aplikacionet e tjera"</string>
<string name="filter_overlay_apps" msgid="6965969283342557573">"Aplikacionet me leje"</string>
@@ -4125,7 +4121,6 @@
<string name="notification_log_details_none" msgid="184131801230614059">"asnjë"</string>
<string name="notification_log_details_ranking_null" msgid="244660392058720919">"Objekti i renditjes mungon."</string>
<string name="notification_log_details_ranking_none" msgid="599607025882587844">"Objekti i renditjes nuk e përmban këtë çelës."</string>
- <string name="theme_customization_category" msgid="1049181544004163283">"Krijimi i temës"</string>
<string name="theme_customization_device_default" msgid="5058147707906551368">"Parazgjedhja e pajisjes"</string>
<string name="display_cutout_emulation" msgid="7466869822418376317">"Prerja e ekranit"</string>
<string name="display_cutout_emulation_keywords" msgid="4495418317471622562">"prerje ekrani, e prerë"</string>
@@ -4551,6 +4546,8 @@
<string name="network_connection_errorstate_dialog_message" msgid="6953778550775646710">"Ndodhi diçka. Aplikacioni ka anuluar kërkesën për të zgjedhur një pajisje."</string>
<string name="network_connection_connect_successful" msgid="5935510954474494928">"Lidhja ishte e suksesshme"</string>
<string name="network_connection_request_dialog_showall" msgid="6938922880244567521">"Shfaq të gjitha"</string>
+ <string name="network_connection_searching_message" msgid="4638576789450817530">"Po kërkohet për pajisjen…"</string>
+ <string name="network_connection_connecting_message" msgid="3740982406609245654">"Po lidhet me pajisjen…"</string>
<plurals name="show_bluetooth_devices" formatted="false" msgid="1715020480026568408">
<item quantity="other"><xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> pajisje të lidhura</item>
<item quantity="one"><xliff:g id="NUMBER_DEVICE_COUNT_0">%1$d</xliff:g> pajisje e lidhur</item>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 5a76c59..6dfd34b 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -362,8 +362,6 @@
<string name="security_enable_widgets_disabled_summary" msgid="6392489775303464905">"Администратор је онемогућио"</string>
<string name="lockdown_settings_title" msgid="7393790212603280213">"Прикажи опцију закључавања"</string>
<string name="lockdown_settings_summary" msgid="4359438673563318171">"Приказује опцију дугмета за напајање која искључује Smart Lock, биометријско откључавање и обавештења на закључаном екрану"</string>
- <string name="trust_agents_extend_unlock_title" msgid="2796555263565097031">"Поуздани агенти - дуже откључано"</string>
- <string name="trust_agents_extend_unlock_summary" msgid="3976344969220255010">"Ако је омогућено, поуздани агенти ће омогућити да уређај дуже остане откључан, али не могу више да откључавају закључан уређај."</string>
<string name="trust_lost_locks_screen_title" msgid="2992742466966021682">"Закључај екран када је агент непоуздан"</string>
<string name="trust_lost_locks_screen_summary" msgid="693784434582021206">"Ако се омогући, уређај ће се закључати када последњи поуздани агент више не буде поуздан"</string>
<string name="owner_info_settings_summary" msgid="7472393443779227052">"Ништа"</string>
@@ -953,6 +951,7 @@
<string name="wifi_eap_identity" msgid="4359453783379679103">"Идентитет"</string>
<string name="wifi_eap_anonymous" msgid="2989469344116577955">"Анонимни идентитет"</string>
<string name="wifi_password" msgid="5948219759936151048">"Лозинка"</string>
+ <string name="wifi_sae_password_id" msgid="1697832722221765763">"Идентификатор SAE лозинке"</string>
<string name="wifi_show_password" msgid="6461249871236968884">"Прикажи лозинку"</string>
<string name="wifi_ap_band_config" msgid="1611826705989117930">"Изаберите опсег приступне тачке"</string>
<string name="wifi_ap_choose_auto" msgid="2677800651271769965">"Аутоматски"</string>
@@ -973,7 +972,6 @@
<string name="wifi_dpp_share_wifi" msgid="9065890131734833809">"Дели Wi‑Fi"</string>
<string name="wifi_dpp_scan_qr_code_with_another_device" msgid="5854392840857123065">"Скенирајте овај QR кôд да бисте се повезали са „<xliff:g id="SSID">%1$s</xliff:g>“ и делили лозинку"</string>
<string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="4436318319178361543">"Скенирајте овај QR кôд да бисте се придружили мрежи „<xliff:g id="SSID">%1$s</xliff:g>“"</string>
- <string name="wifi_dpp_could_not_detect_valid_qr_code" msgid="641893675646330576">"Читање QR кода није успело. Поново центрирајте кôд, па пробајте поново"</string>
<string name="wifi_dpp_failure_authentication_or_configuration" msgid="3372757783382381044">"Пробајте поново. Ако се проблем настави, контактирајте произвођача уређаја"</string>
<string name="wifi_dpp_failure_not_compatible" msgid="2829930473520603740">"Дошло је до грешке"</string>
<string name="wifi_dpp_failure_timeout" msgid="5228320772245820458">"Уверите се да је уређај прикључен на извор напајања, напуњен и укључен"</string>
@@ -996,6 +994,7 @@
<string name="wifi_dpp_hotspot_password" msgid="4120419278831581613">"Лозинка хотспота: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
<string name="wifi_dpp_add_device" msgid="4072206063308645677">"Додајте уређај"</string>
<string name="wifi_dpp_connect_network_using_qr_code" msgid="3887335309163999665">"Користите QR кôд да бисте додали уређај на ову мрежу"</string>
+ <string name="wifi_dpp_qr_code_is_not_valid_format" msgid="3700087439867692944">"QR кôд није у важећем формату"</string>
<string name="retry" msgid="6472609612090877557">"Пробај поново"</string>
<string name="wifi_shared" msgid="844142443226926070">"Дели са другим корисницима уређаја"</string>
<string name="wifi_unchanged" msgid="3410422020930397102">"(непромењено)"</string>
@@ -1148,6 +1147,7 @@
<string name="emergency_address_title" msgid="932729250447887545">"Адреса за хитне случајеве"</string>
<string name="emergency_address_summary" msgid="7751971156196115129">"Користи се као ваша локација када упутите хитни позив помоћу Wi-Fi-ја"</string>
<string name="private_dns_help_message" msgid="3299567069152568958"><annotation id="url">"Сазнајте више"</annotation>" о функцијама Приватног DNS-а"</string>
+ <string name="private_dns_mode_on" msgid="5882613439541371003">"Укључено"</string>
<string name="wifi_calling_pref_managed_by_carrier" msgid="6845711858866828986">"Мобилни оператер управља подешавањем"</string>
<string name="wifi_calling_settings_activation_instructions" msgid="7492509632478260955">"Активирајте Позивање преко Wi-Fi-ја"</string>
<string name="wifi_calling_turn_on" msgid="1171403510313983983">"Укључите позивање преко Wi-Fi-ја"</string>
@@ -1894,7 +1894,7 @@
<string name="default_emergency_app" msgid="1951760659640369980">"Апликација за хитне случајеве"</string>
<string name="reset_app_preferences" msgid="1321050641018356925">"Ресетуј подешавања апликације"</string>
<string name="reset_app_preferences_title" msgid="6093179367325336662">"Желите да ресетујете подешавања апликације?"</string>
- <string name="reset_app_preferences_desc" msgid="4822447731869201512">"Овим ћете вратити на почетне вредности сва подешавања за:\n\n"<li>"Онемогућене апликације"</li>\n<li>"Обавештења о онемогућеним апликацијама"</li>\n<li>"Подразумеване апликације за радње"</li>\n<li>"Ограничења за позадинске податке за апликације"</li>\n<li>"Било каква ограничења за дозволе"</li>\n\n" Нећете изгубити податке апликација."</string>
+ <string name="reset_app_preferences_desc" msgid="731757609326016760">"Овим ће се ресетовати сва подешавања за:\n\n"<li>"Онемогућене апликације"</li>\n<li>"Обавештења о онемогућеним апликацијама"</li>\n<li>"Подразумеване апликације за радње"</li>\n<li>"Ограничења за позадинске податке за апликације"</li>\n<li>"Сва ограничења за дозволе"</li>\n\n"Нећете изгубити никакве податке апликације."</string>
<string name="reset_app_preferences_button" msgid="2559089511841281242">"Ресетуј апликације"</string>
<string name="manage_space_text" msgid="8852711522447794676">"Управљај простором"</string>
<string name="filter" msgid="2018011724373033887">"Филтрирај"</string>
@@ -2109,7 +2109,7 @@
<string name="accessibility_screen_magnification_short_summary" msgid="3411979839172752057">"Додирните 3 пута да бисте зумирали"</string>
<string name="accessibility_screen_magnification_navbar_short_summary" msgid="3693116360267980492">"Додирните дугме да бисте зумирали"</string>
<string name="accessibility_screen_magnification_summary" msgid="5258868553337478505"><b>"Да бисте зумирали"</b>", брзо додирните екран 3 пута.\n"<ul><li>"Превуците помоћу 2 или више прстију да бисте померали приказ"</li>\n<li>"Скупите 2 или више прстију да бисте прилагодили зумирање"</li></ul>\n\n<b>"За привремено зумирање"</b>" брзо додирните екран 3 пута и задржите прст при трећем додиру.\n"<ul><li>"Превлачите прстом да бисте се кретали по екрану"</li>\n<li>"Подигните прст да бисте умањили приказ"</li></ul>\n\n"Не можете да зумирате тастатуру ни траку за навигацију."</string>
- <string name="accessibility_screen_magnification_navbar_summary" msgid="2272878354599332009">"Када је увећање укључено, можете да увећате екран.\n\n"<b>"Да бисте зумирали"</b>", покрените увећање, па додирните било који део екрана.\n"<ul><li>"• Превуците помоћу 2 или више прстију да бисте померали приказ"</li>\n<li>"• Скупите 2 или више прстију да бисте прилагодили зумирање"</li></ul>\n\n<b>"За привремено зумирање"</b>" покрените увећање, па додирните и задржите било који део екрана.\n"<ul><li>"• Превлачите прстом да бисте се кретали по екрану"</li>\n<li>"• Подигните прст да бисте умањили приказ"</li></ul>\n\n"Не можете да увећавате тастатуру или траку за навигацију."</string>
+ <string name="accessibility_screen_magnification_navbar_summary" msgid="6700716275347612310">"Када је увећање укључено, можете да увећате екран.\n\n"<b>"Да бисте зумирали"</b>", покрените увећање, па додирните било који део екрана.\n"<ul><li>"Превлачите помоћу 2 или више прстију да бисте померали приказ"</li>\n<li>"Скупите 2 или више прстију да бисте прилагодили зумирање"</li></ul>\n\n<b>"За привремено зумирање"</b>" покрените увећање, па додирните и задржите било који део екрана.\n"<ul><li>"Превлачите да бисте се кретали по екрану"</li>\n<li>"Подигните прст да бисте умањили приказ"</li></ul>\n\n"Не можете да увећавате тастатуру или траку за навигацију."</string>
<string name="accessibility_tutorial_dialog_title_button" msgid="3682222614034474845">"Отварајте помоћу дугмета за приступачност"</string>
<string name="accessibility_tutorial_dialog_title_gesture" msgid="1342726230497913398">"Отварајте помоћу покрета"</string>
<string name="accessibility_tutorial_dialog_title_gesture_settings" msgid="8539392614235820285">"Користите нови покрет за приступачност"</string>
@@ -2162,8 +2162,7 @@
<string name="accessibility_hearingaid_title" msgid="8312145423610648518">"Слушни апарати"</string>
<string name="accessibility_hearingaid_not_connected_summary" msgid="6240237523789614599">"Није повезан ниједан слушни апарат"</string>
<string name="accessibility_hearingaid_adding_summary" msgid="2947474468412309778">"Додајте слушне апарате"</string>
- <string name="accessibility_hearingaid_pair_instructions_first_message" msgid="3912093691643131154">"Да бисте упарили слушне апарате, пронађите и додирните свој уређај на следећем екрану."</string>
- <string name="accessibility_hearingaid_pair_instructions_second_message" msgid="5596683393607650243">"Проверите да ли су слушни апарати у режиму упаривања."</string>
+ <string name="accessibility_hearingaid_pair_instructions_message" msgid="3094382949733435414">"Да бисте упарили слушне апарате, пронађите и додирните уређај на следећем екрану. Проверите да ли су слушни апарати у режиму упаривања."</string>
<string name="accessibility_hearingaid_active_device_summary" msgid="3924362383258688984">"Активан: <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
<plurals name="show_number_hearingaid_count" formatted="false" msgid="3160782397139295486">
<item quantity="one"><xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> сачувани слушни апарат</item>
@@ -2527,7 +2526,6 @@
<string name="menu_stats_last_unplugged" msgid="5922246077592434526">"Током последњег искључивања за <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
<string name="menu_stats_total" msgid="8973377864854807854">"Укупно коришћено"</string>
<string name="menu_stats_refresh" msgid="1676215433344981075">"Освежи"</string>
- <string name="process_kernel_label" msgid="3916858646836739323">"Android ОС"</string>
<string name="process_mediaserver_label" msgid="6500382062945689285">"Медија сервер"</string>
<string name="process_dex2oat_label" msgid="2592408651060518226">"Оптимизација апликација"</string>
<string name="battery_saver" msgid="8172485772238572153">"Уштеда батерије"</string>
@@ -2658,8 +2656,6 @@
<string name="no_device_admins" msgid="4846602835339095768">"Нема доступних апликација за администратора уређаја"</string>
<string name="personal_device_admin_title" msgid="2849617316347669861">"Лични"</string>
<string name="managed_device_admin_title" msgid="7853955652864478435">"Посао"</string>
- <string name="sms_access_restriction_enabled" msgid="7054488078710530278">"Ограничи приступ SMS-овима и евиденцији позива"</string>
- <string name="sms_access_restriction_enabled_summary" msgid="6851339654677842328">"Само подразумеване апликације за позиве и размену SMS-ова имају дозволе за приступ SMS-овима и евиденцији позива"</string>
<string name="no_trust_agents" msgid="7450273545568977523">"Нема доступних поузданих агената"</string>
<string name="add_device_admin_msg" msgid="1501847129819382149">"Активирај апликацију за администраторе?"</string>
<string name="add_device_admin" msgid="4192055385312215731">"Активирај ову апликацију за администраторе уређаја"</string>
@@ -3153,7 +3149,7 @@
<string name="keywords_app_default" msgid="5822717006354487071">"Отвори помоћу"</string>
<string name="keywords_applications_settings" msgid="1268353611121497450">"Апликације"</string>
<string name="keywords_time_zone" msgid="998254736898753085">"временска зона"</string>
- <string name="keywords_draw_overlay" msgid="4130899177619041842">"Приказ ћаскања преко других апликација"</string>
+ <string name="keywords_draw_overlay" msgid="1001120206241401007">"Облачић за ћаскање, систем, обавештење, прозор, дијалог, приказ, преко других апликација, превлачење"</string>
<string name="keywords_flashlight" msgid="6161632177705233710">"Батеријска лампа, светло, лампа"</string>
<string name="keywords_change_wifi_state" msgid="627068244033681010">"wifi, wi-fi, укључи/искључи, контрола"</string>
<string name="keywords_more_mobile_networks" msgid="8995946622054642367">"мобилна мрежа, мобилни подаци, мобилни оператер, бежично, подаци, 4g, 3g, 2g, lte"</string>
@@ -3177,7 +3173,7 @@
<string name="keywords_sounds_and_notifications_interruptions" msgid="5426093074031208917">"не ометати, прекидати, прекид, прекинути"</string>
<string name="keywords_app" msgid="6334757056536837791">"RAM"</string>
<string name="keywords_location" msgid="4132655528196729043">"у близини, локација, историја, извештавање, GPS"</string>
- <string name="keywords_accounts" msgid="1957925565953357627">"налог"</string>
+ <string name="keywords_accounts" msgid="4479029747403203867">"налог, додајте налог, профил за Work"</string>
<string name="keywords_users" msgid="3434190133131387942">"ограничење, ограничити, ограничено"</string>
<string name="keywords_keyboard_and_ime" msgid="9143339015329957107">"исправка текста, исправити, звук, вибрирати, аутоматски, језик, покрет, предлагати, предлог, тема, увредљиво, реч, куцати, емоџи, међународно"</string>
<string name="keywords_reset_apps" msgid="5293291209613191845">"ресетовање, подешавања, подразумевано"</string>
@@ -3215,6 +3211,7 @@
<string name="keywords_storage_settings" msgid="297283751968446577">"меморија, кеш, подаци, избриши, обриши, слободно, простор"</string>
<string name="keywords_bluetooth_settings" msgid="6804844062789439858">"повезано, уређај, слушалице, хедсет, звучник, бежично, упари, бубице, музика, медији"</string>
<string name="keywords_wallpaper" msgid="5058364390917429896">"позадина, екран, закључани екран, тема"</string>
+ <string name="keywords_styles" msgid="5828725481814049422">"облик иконе, боја за наглашавање, фонт"</string>
<string name="keywords_assist_input" msgid="5017533309492679287">"подразумевано, помоћник"</string>
<string name="keywords_default_payment_app" msgid="3838565809518896799">"плаћање, подразумевано"</string>
<string name="keywords_ambient_display" msgid="3103487805748659132">"долазно обавештење"</string>
@@ -3224,7 +3221,7 @@
<string name="keywords_notification_vibration" msgid="31924624421190547">"додирне повратне информације, вибрирање, осетљивост"</string>
<string name="keywords_battery_saver_sticky" msgid="5586215686021650278">"уштеда батерије, лепљиво, трајно, уштеда енергије, батерија"</string>
<string name="keywords_battery_saver_schedule" msgid="7358789228486231944">"рутина, распоред, уштеда батерије, уштеда енергије, батерија, аутоматско, проценат"</string>
- <string name="keywords_add_an_account" msgid="6488139919428902434">"профил за Work"</string>
+ <string name="keywords_enhance_4g_lte" msgid="2273810564244790859">"volte, напредно позивање, 4g позивање"</string>
<string name="default_sound" msgid="8821684447333687810">"Подразумевани звук"</string>
<string name="sound_settings_summary" msgid="4100853606668287965">"Јачина звона је <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
<string name="sound_dashboard_summary" msgid="3402435125958012986">"Јачина звука, вибрација, Не узнемиравај"</string>
@@ -3952,7 +3949,6 @@
<string name="permit_draw_overlay" msgid="7456536798718633432">"Дозволи приказ преко других апликација"</string>
<string name="allow_overlay_description" msgid="8961670023925421358">"Омогућите овој апликацији да се приказује преко других апликација које користите. То може да омета коришћење тих апликација или да промени њихов изглед или понашање."</string>
<string name="keywords_vr_listener" msgid="7441221822576384680">"вр виртуелна реалност обрађивач услуга стерео помагача"</string>
- <string name="keywords_system_alert_window" msgid="5049498015597864850">"систем обавештење прозор дијалог приказ преко других апликација"</string>
<string name="overlay_settings" msgid="6930854109449524280">"Приказ преко других апликација"</string>
<string name="system_alert_window_summary" msgid="602892301318324492">"Апликације са дозволом за приказ преко других: <xliff:g id="COUNT_0">%1$d</xliff:g> од <xliff:g id="COUNT_1">%2$d</xliff:g>"</string>
<string name="filter_overlay_apps" msgid="6965969283342557573">"Апликације са дозволом"</string>
@@ -4194,7 +4190,6 @@
<string name="notification_log_details_none" msgid="184131801230614059">"ниједно"</string>
<string name="notification_log_details_ranking_null" msgid="244660392058720919">"Недостаје објекат за рангирање."</string>
<string name="notification_log_details_ranking_none" msgid="599607025882587844">"Објекат за рангирање не садржи ову шифру."</string>
- <string name="theme_customization_category" msgid="1049181544004163283">"Теме"</string>
<string name="theme_customization_device_default" msgid="5058147707906551368">"Подразумевано подешавање за уређај"</string>
<string name="display_cutout_emulation" msgid="7466869822418376317">"Изрез екрана"</string>
<string name="display_cutout_emulation_keywords" msgid="4495418317471622562">"изрезана слика за екран, урез"</string>
@@ -4632,6 +4627,8 @@
<string name="network_connection_errorstate_dialog_message" msgid="6953778550775646710">"Дошло је до неког проблема. Апликација је отказала захтев за избор уређаја."</string>
<string name="network_connection_connect_successful" msgid="5935510954474494928">"Повезивање је успело"</string>
<string name="network_connection_request_dialog_showall" msgid="6938922880244567521">"Прикажи све"</string>
+ <string name="network_connection_searching_message" msgid="4638576789450817530">"Тражи се уређај…"</string>
+ <string name="network_connection_connecting_message" msgid="3740982406609245654">"Повезује се са уређајем…"</string>
<plurals name="show_bluetooth_devices" formatted="false" msgid="1715020480026568408">
<item quantity="one">Повезан је <xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> уређај</item>
<item quantity="few">Повезана су <xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> уређаја</item>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index bc04110..f5dd551 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -360,8 +360,6 @@
<string name="security_enable_widgets_disabled_summary" msgid="6392489775303464905">"Inaktiverad av administratören"</string>
<string name="lockdown_settings_title" msgid="7393790212603280213">"Visa låsningsalternativ"</string>
<string name="lockdown_settings_summary" msgid="4359438673563318171">"Visa alternativet för strömbrytaren som inaktiverar Smart Lock, upplåsning med biometri och aviseringar på låsskärmen."</string>
- <string name="trust_agents_extend_unlock_title" msgid="2796555263565097031">"Enbart förlängd upplåsning för betrodda"</string>
- <string name="trust_agents_extend_unlock_summary" msgid="3976344969220255010">"Om detta aktiveras håller betrodda agenter enheten upplåst längre, men de kan inte längre låsa upp en låst enhet."</string>
<string name="trust_lost_locks_screen_title" msgid="2992742466966021682">"Lås skärmen när ingen är betrodd"</string>
<string name="trust_lost_locks_screen_summary" msgid="693784434582021206">"Om detta aktiveras låses enheten när den sista betrodda agenten slutar att vara betrodd"</string>
<string name="owner_info_settings_summary" msgid="7472393443779227052">"Inget"</string>
@@ -937,6 +935,7 @@
<string name="wifi_eap_identity" msgid="4359453783379679103">"Identitet"</string>
<string name="wifi_eap_anonymous" msgid="2989469344116577955">"Anonym identitet"</string>
<string name="wifi_password" msgid="5948219759936151048">"Lösenord"</string>
+ <string name="wifi_sae_password_id" msgid="1697832722221765763">"Lösenordsidentifierare för SAE"</string>
<string name="wifi_show_password" msgid="6461249871236968884">"Visa lösenord"</string>
<string name="wifi_ap_band_config" msgid="1611826705989117930">"Välj AP-band"</string>
<string name="wifi_ap_choose_auto" msgid="2677800651271769965">"Automatiskt"</string>
@@ -957,7 +956,6 @@
<string name="wifi_dpp_share_wifi" msgid="9065890131734833809">"Dela Wi‑Fi"</string>
<string name="wifi_dpp_scan_qr_code_with_another_device" msgid="5854392840857123065">"Anslut till <xliff:g id="SSID">%1$s</xliff:g> och dela lösenordet genom att skanna QR-koden"</string>
<string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="4436318319178361543">"Anslut till <xliff:g id="SSID">%1$s</xliff:g> genom att skanna QR-koden"</string>
- <string name="wifi_dpp_could_not_detect_valid_qr_code" msgid="641893675646330576">"Det gick inte att läsa QR-koden. Centrera om koden och försök igen"</string>
<string name="wifi_dpp_failure_authentication_or_configuration" msgid="3372757783382381044">"Försök igen. Om problemet kvarstår kontaktar du enhetens tillverkare"</string>
<string name="wifi_dpp_failure_not_compatible" msgid="2829930473520603740">"Något gick fel"</string>
<string name="wifi_dpp_failure_timeout" msgid="5228320772245820458">"Kontrollera att enheten är inkopplad, laddad och påslagen"</string>
@@ -980,6 +978,7 @@
<string name="wifi_dpp_hotspot_password" msgid="4120419278831581613">"Lösenord till surfzon: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
<string name="wifi_dpp_add_device" msgid="4072206063308645677">"Lägg till enhet"</string>
<string name="wifi_dpp_connect_network_using_qr_code" msgid="3887335309163999665">"Lägg till en enhet på nätverket med hjälp av en QR-kod"</string>
+ <string name="wifi_dpp_qr_code_is_not_valid_format" msgid="3700087439867692944">"QR-kodens format är ogiltigt"</string>
<string name="retry" msgid="6472609612090877557">"Försök igen"</string>
<string name="wifi_shared" msgid="844142443226926070">"Dela med andra som använder enheten"</string>
<string name="wifi_unchanged" msgid="3410422020930397102">"(oförändrat)"</string>
@@ -1129,6 +1128,7 @@
<string name="emergency_address_title" msgid="932729250447887545">"Adress för nödfall"</string>
<string name="emergency_address_summary" msgid="7751971156196115129">"Används som din plats om du ringer nödsamtal via Wi‑Fi"</string>
<string name="private_dns_help_message" msgid="3299567069152568958"><annotation id="url">"Läs mer"</annotation>" om privata DNS-funktioner"</string>
+ <string name="private_dns_mode_on" msgid="5882613439541371003">"På"</string>
<string name="wifi_calling_pref_managed_by_carrier" msgid="6845711858866828986">"Inställningen hanteras av operatören"</string>
<string name="wifi_calling_settings_activation_instructions" msgid="7492509632478260955">"Aktivera Wi-Fi-samtal"</string>
<string name="wifi_calling_turn_on" msgid="1171403510313983983">"Aktivera Wi-Fi-samtal"</string>
@@ -1872,7 +1872,7 @@
<string name="default_emergency_app" msgid="1951760659640369980">"App för nödsituationer"</string>
<string name="reset_app_preferences" msgid="1321050641018356925">"Återställ inställningarna"</string>
<string name="reset_app_preferences_title" msgid="6093179367325336662">"Vill du återställa?"</string>
- <string name="reset_app_preferences_desc" msgid="4822447731869201512">"Detta återställer alla inställningar för:\n\n "<li>"inaktiverade appar"</li>\n" "<li>"inaktiverade appaviseringar"</li>\n" "<li>"standardappar för åtgärder"</li>\n" "<li>"begränsningar i bakgrundsdata för appar"</li>\n" "<li>"begränsningar för alla behörigheter."</li>\n\n"Ingen appdata kommer att försvinna."</string>
+ <string name="reset_app_preferences_desc" msgid="731757609326016760">"Detta återställer alla inställningar för:\n\n"<li>"Inaktiverade appar"</li>\n<li>"Inaktiverade appmeddelanden"</li>\n<li>"Standardappar för åtgärder"</li>\n<li>"Begränsningar av bakgrundsdata för appar"</li>\n<li>"Alla begränsningar av behörigheter"</li>\n\n"Ingen appdata försvinner."</string>
<string name="reset_app_preferences_button" msgid="2559089511841281242">"Återställ appar"</string>
<string name="manage_space_text" msgid="8852711522447794676">"Hantera utrymme"</string>
<string name="filter" msgid="2018011724373033887">"Filtrera"</string>
@@ -2087,7 +2087,7 @@
<string name="accessibility_screen_magnification_short_summary" msgid="3411979839172752057">"Tryck tre gånger om du vill zooma"</string>
<string name="accessibility_screen_magnification_navbar_short_summary" msgid="3693116360267980492">"Tryck på en knapp för att zooma"</string>
<string name="accessibility_screen_magnification_summary" msgid="5258868553337478505"><b>"Zooma"</b>" genom att trycka snabbt tre gånger på skärmen.\n"<ul><li>"Tryck och dra med minst två fingrar om du vill rulla över skärmen"</li>\n<li>"Justera zoomen genom att nypa med minst två fingrar"</li></ul>\n\n<b>"Zooma tillfälligt"</b>" genom att trycka snabbt på skärmen tre gånger och trycka ned fingret på det tredje trycket.\n"<ul><li>"Tryck och dra om du vill flytta runt på skärmen"</li>\n<li>"Lyft fingret när du vill zooma ut"</li></ul>\n\n"Det går inte att zooma in på tangentbordet eller navigeringsfältet."</string>
- <string name="accessibility_screen_magnification_navbar_summary" msgid="2272878354599332009">"När förstoring har aktiverats kan du zooma in på skärmen.\n\n"<b>"Om du vill zooma"</b>" aktiverar du förstoring och trycker var som helst på skärmen.\n"<ul><li>"• Skrolla genom att dra med minst två fingrar."</li>\n<li>"• Justera zoomen genom att nypa med minst två fingrar."</li></ul>\n\n<b>"Om du vill zooma tillfälligt"</b>" aktiverar du förstoring och trycker länge var som helst på skärmen.\n"<ul><li>"• Flytta runt på skärmen genom att dra."</li>\n<li>"• Zooma ut genom att lyfta fingret."</li></ul>\n\n"Det går inte att zooma in på tangentbordet eller navigeringsfältet."</string>
+ <string name="accessibility_screen_magnification_navbar_summary" msgid="6700716275347612310">"När förstoring har aktiverats kan du zooma in på skärmen.\n\n"<b>"Om du vill zooma"</b>" aktiverar du förstoring och trycker var som helst på skärmen.\n"<ul><li>"Skrolla genom att dra med minst två fingrar."</li>\n<li>"Justera zoomen genom att nypa med minst två fingrar."</li></ul>\n\n<b>"Om du vill zooma tillfälligt"</b>" aktiverar du förstoring och trycker länge var som helst på skärmen.\n"<ul><li>"Flytta runt på skärmen genom att dra."</li>\n<li>"Zooma ut genom att lyfta fingret."</li></ul>\n\n"Det går inte att zooma in på tangentbordet eller navigeringsfältet."</string>
<string name="accessibility_tutorial_dialog_title_button" msgid="3682222614034474845">"Öppna med tillgänglighetsknappen"</string>
<string name="accessibility_tutorial_dialog_title_gesture" msgid="1342726230497913398">"Öppna med rörelse"</string>
<string name="accessibility_tutorial_dialog_title_gesture_settings" msgid="8539392614235820285">"Använd en ny tillgänglighetsrörelse"</string>
@@ -2140,8 +2140,7 @@
<string name="accessibility_hearingaid_title" msgid="8312145423610648518">"Hörapparater"</string>
<string name="accessibility_hearingaid_not_connected_summary" msgid="6240237523789614599">"Inga hörapparater har anslutits"</string>
<string name="accessibility_hearingaid_adding_summary" msgid="2947474468412309778">"Lägg till hörapparater"</string>
- <string name="accessibility_hearingaid_pair_instructions_first_message" msgid="3912093691643131154">"Parkoppla hörapparater genom att hitta och trycka på dem på nästa skärm."</string>
- <string name="accessibility_hearingaid_pair_instructions_second_message" msgid="5596683393607650243">"Kontrollera att hörapparaterna är i kopplingsläge."</string>
+ <string name="accessibility_hearingaid_pair_instructions_message" msgid="3094382949733435414">"Parkoppla dina hörapparater genom att hitta och trycka på dem på nästa skärm. Kontrollera att hörapparaterna är i kopplingsläge."</string>
<string name="accessibility_hearingaid_active_device_summary" msgid="3924362383258688984">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> aktiv"</string>
<plurals name="show_number_hearingaid_count" formatted="false" msgid="3160782397139295486">
<item quantity="other"><xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> hörapparater har sparats</item>
@@ -2490,7 +2489,6 @@
<string name="menu_stats_last_unplugged" msgid="5922246077592434526">"Sedan senaste bortkoppling <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
<string name="menu_stats_total" msgid="8973377864854807854">"Total förbrukning"</string>
<string name="menu_stats_refresh" msgid="1676215433344981075">"Uppdatera"</string>
- <string name="process_kernel_label" msgid="3916858646836739323">"Operativsystemet Android"</string>
<string name="process_mediaserver_label" msgid="6500382062945689285">"Mediaserver"</string>
<string name="process_dex2oat_label" msgid="2592408651060518226">"Appoptimering"</string>
<string name="battery_saver" msgid="8172485772238572153">"Batterisparläge"</string>
@@ -2621,8 +2619,6 @@
<string name="no_device_admins" msgid="4846602835339095768">"Inga tillgängliga appar för enhetsadministratör"</string>
<string name="personal_device_admin_title" msgid="2849617316347669861">"Personlig"</string>
<string name="managed_device_admin_title" msgid="7853955652864478435">"Arbete"</string>
- <string name="sms_access_restriction_enabled" msgid="7054488078710530278">"Begränsa åtkomst till sms- och samtalshistorik"</string>
- <string name="sms_access_restriction_enabled_summary" msgid="6851339654677842328">"Endast standardappar för telefon och sms har behörighet till samtalshistorik"</string>
<string name="no_trust_agents" msgid="7450273545568977523">"Det finns inga tillgängliga betrodda agenter"</string>
<string name="add_device_admin_msg" msgid="1501847129819382149">"Aktivera appen för enhetsadministratör?"</string>
<string name="add_device_admin" msgid="4192055385312215731">"Aktivera den här appen för enhetsadministratör"</string>
@@ -3111,7 +3107,7 @@
<string name="keywords_app_default" msgid="5822717006354487071">"Öppna med"</string>
<string name="keywords_applications_settings" msgid="1268353611121497450">"Appar"</string>
<string name="keywords_time_zone" msgid="998254736898753085">"tidszon"</string>
- <string name="keywords_draw_overlay" msgid="4130899177619041842">"Chatthuvud"</string>
+ <string name="keywords_draw_overlay" msgid="1001120206241401007">"Chatthuvud, system, avisering, fönster, dialogruta, skärm, ovanpå andra appar, rita"</string>
<string name="keywords_flashlight" msgid="6161632177705233710">"Ficklampa, Lampa, Handlampa"</string>
<string name="keywords_change_wifi_state" msgid="627068244033681010">"wifi, wi-fi, på/av, styra"</string>
<string name="keywords_more_mobile_networks" msgid="8995946622054642367">"mobiltelefon, mobil, mobiloperatör, trådlös, data, 4g, 3g, 2g, lte"</string>
@@ -3135,7 +3131,7 @@
<string name="keywords_sounds_and_notifications_interruptions" msgid="5426093074031208917">"stör inte, avbryt, avbrott, paus"</string>
<string name="keywords_app" msgid="6334757056536837791">"RAM"</string>
<string name="keywords_location" msgid="4132655528196729043">"närliggande, plats, historik, rapportering, GPS"</string>
- <string name="keywords_accounts" msgid="1957925565953357627">"konto"</string>
+ <string name="keywords_accounts" msgid="4479029747403203867">"konto, lägg till konto, jobbprofil"</string>
<string name="keywords_users" msgid="3434190133131387942">"begränsning, begränsa, begränsad"</string>
<string name="keywords_keyboard_and_ime" msgid="9143339015329957107">"textkorrigering, korrigera, ljud, vibrera, automatiskt, språk, gest, föreslå, förslag, tema, stötande, ord, skriva, emoji, internationell"</string>
<string name="keywords_reset_apps" msgid="5293291209613191845">"återställa, inställningar, standardinställningar"</string>
@@ -3173,6 +3169,7 @@
<string name="keywords_storage_settings" msgid="297283751968446577">"minne, cache, data, radera, rensa, frigör, utrymme"</string>
<string name="keywords_bluetooth_settings" msgid="6804844062789439858">"ansluten, enhet, hörlurar, headset, högtalare, trådlös, parkoppla, hörsnäckor, musik, media"</string>
<string name="keywords_wallpaper" msgid="5058364390917429896">"bakgrund, skärm, låsskärm, tema"</string>
+ <string name="keywords_styles" msgid="5828725481814049422">"ikonform, accentfärg, teckensnitt"</string>
<string name="keywords_assist_input" msgid="5017533309492679287">"standard, assistent"</string>
<string name="keywords_default_payment_app" msgid="3838565809518896799">"betalning, standard"</string>
<string name="keywords_ambient_display" msgid="3103487805748659132">"inkommande avisering"</string>
@@ -3182,7 +3179,7 @@
<string name="keywords_notification_vibration" msgid="31924624421190547">"haptik, vibration, känslighet"</string>
<string name="keywords_battery_saver_sticky" msgid="5586215686021650278">"batterisparläge, fast position, beständig, strömläge, batteri"</string>
<string name="keywords_battery_saver_schedule" msgid="7358789228486231944">"rutin, schema, batterisparläge, energisparläge, batteri, automatiskt, procent"</string>
- <string name="keywords_add_an_account" msgid="6488139919428902434">"jobbprofil"</string>
+ <string name="keywords_enhance_4g_lte" msgid="2273810564244790859">"volte, avancerade samtal, 4g-samtal"</string>
<string name="default_sound" msgid="8821684447333687810">"Standardsignal"</string>
<string name="sound_settings_summary" msgid="4100853606668287965">"Ringvolym på <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
<string name="sound_dashboard_summary" msgid="3402435125958012986">"Volym, vibrera, stör ej"</string>
@@ -3889,7 +3886,6 @@
<string name="permit_draw_overlay" msgid="7456536798718633432">"Tillåt visning ovanpå andra appar"</string>
<string name="allow_overlay_description" msgid="8961670023925421358">"Tillåt att den här appen visas ovanpå andra appar. Detta kan inverka på ett störande sätt på användningen av de andra apparna eller göra så att de verkar se ut eller fungera annorlunda."</string>
<string name="keywords_vr_listener" msgid="7441221822576384680">"vr virtuell verklighet lyssnare stereo hjälptjänst"</string>
- <string name="keywords_system_alert_window" msgid="5049498015597864850">"systemvarning dialogruta visa på andra appar"</string>
<string name="overlay_settings" msgid="6930854109449524280">"Visa ovanpå andra appar"</string>
<string name="system_alert_window_summary" msgid="602892301318324492">"<xliff:g id="COUNT_0">%1$d</xliff:g> av <xliff:g id="COUNT_1">%2$d</xliff:g> appar får visas ovanpå andra appar"</string>
<string name="filter_overlay_apps" msgid="6965969283342557573">"Appar med behörighet"</string>
@@ -4125,7 +4121,6 @@
<string name="notification_log_details_none" msgid="184131801230614059">"ingen"</string>
<string name="notification_log_details_ranking_null" msgid="244660392058720919">"Det finns inget rankningsobjekt."</string>
<string name="notification_log_details_ranking_none" msgid="599607025882587844">"Rankningsobjektet innehåller inte den här nyckeln."</string>
- <string name="theme_customization_category" msgid="1049181544004163283">"Teman"</string>
<string name="theme_customization_device_default" msgid="5058147707906551368">"Enhetens standardinställning"</string>
<string name="display_cutout_emulation" msgid="7466869822418376317">"Skärmutskärning"</string>
<string name="display_cutout_emulation_keywords" msgid="4495418317471622562">"urklipp av skärm, flärp"</string>
@@ -4551,6 +4546,8 @@
<string name="network_connection_errorstate_dialog_message" msgid="6953778550775646710">"Något inträffade. Appen har avbrutit förfrågan om att välja enhet."</string>
<string name="network_connection_connect_successful" msgid="5935510954474494928">"Anslutningen har upprättats"</string>
<string name="network_connection_request_dialog_showall" msgid="6938922880244567521">"Visa alla"</string>
+ <string name="network_connection_searching_message" msgid="4638576789450817530">"Söker efter enhet …"</string>
+ <string name="network_connection_connecting_message" msgid="3740982406609245654">"Ansluter till enheten …"</string>
<plurals name="show_bluetooth_devices" formatted="false" msgid="1715020480026568408">
<item quantity="other"><xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> anslutna enheter</item>
<item quantity="one"><xliff:g id="NUMBER_DEVICE_COUNT_0">%1$d</xliff:g> ansluten enhet</item>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index 0f73846..f8fc791 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -360,8 +360,6 @@
<string name="security_enable_widgets_disabled_summary" msgid="6392489775303464905">"Imezimwa na msimamizi"</string>
<string name="lockdown_settings_title" msgid="7393790212603280213">"Onyesha chaguo la kufunga"</string>
<string name="lockdown_settings_summary" msgid="4359438673563318171">"Onyesha chaguo la kitufe cha kuwasha/kuzima ambacho huzima Smart Lock, kufungua kwa bayometriki na arifa kwenye skrini iliyofungwa"</string>
- <string name="trust_agents_extend_unlock_title" msgid="2796555263565097031">"Kipengele cha kutathmini hali ya kuaminika kitumike tu kufungua"</string>
- <string name="trust_agents_extend_unlock_summary" msgid="3976344969220255010">"Vikiwashwa, vipengele vya kutathmini hali ya kuaminika vitaifanya simu yako isalie ikiwa imefunguliwa kwa kipindi kirefu, lakini havitaweza kufungua kifaa kilichofungwa."</string>
<string name="trust_lost_locks_screen_title" msgid="2992742466966021682">"Funga skrini ikiacha kuaminika"</string>
<string name="trust_lost_locks_screen_summary" msgid="693784434582021206">"Ikiwashwa, kifaa kitafungwa wakati kipengele cha mwisho cha kutathmini hali ya kuaminika kitaacha kuaminika"</string>
<string name="owner_info_settings_summary" msgid="7472393443779227052">"Hamna"</string>
@@ -937,6 +935,7 @@
<string name="wifi_eap_identity" msgid="4359453783379679103">"Kitambulisho"</string>
<string name="wifi_eap_anonymous" msgid="2989469344116577955">"Kitambulisho kisichojulikana"</string>
<string name="wifi_password" msgid="5948219759936151048">"Nenosiri"</string>
+ <string name="wifi_sae_password_id" msgid="1697832722221765763">"Kitambulishi cha nenosiri la SAE"</string>
<string name="wifi_show_password" msgid="6461249871236968884">"Onyesha nenosiri"</string>
<string name="wifi_ap_band_config" msgid="1611826705989117930">"Chagua Bendi ya AP"</string>
<string name="wifi_ap_choose_auto" msgid="2677800651271769965">"Otomatiki"</string>
@@ -957,7 +956,6 @@
<string name="wifi_dpp_share_wifi" msgid="9065890131734833809">"Shiriki Wi‑Fi"</string>
<string name="wifi_dpp_scan_qr_code_with_another_device" msgid="5854392840857123065">"Changanua msimbo huu wa QR ili uunganishe kwenye “<xliff:g id="SSID">%1$s</xliff:g>” na ushiriki nenosiri"</string>
<string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="4436318319178361543">"Changanua msimbo huu wa QR ili uunganishe kwenye “<xliff:g id="SSID">%1$s</xliff:g>”"</string>
- <string name="wifi_dpp_could_not_detect_valid_qr_code" msgid="641893675646330576">"Imeshindwa kusoma msimbo wa QR. Weka msimbo upya kisha ujaribu tena"</string>
<string name="wifi_dpp_failure_authentication_or_configuration" msgid="3372757783382381044">"Jaribu tena. Tatizo hili likiendelea, wasiliana na kampuni iliyotengeneza kifaa"</string>
<string name="wifi_dpp_failure_not_compatible" msgid="2829930473520603740">"Hitilafu fulani imetokea"</string>
<string name="wifi_dpp_failure_timeout" msgid="5228320772245820458">"Hakikisha kuwa umechomeka kifaa, umechaji na umekiwasha"</string>
@@ -980,6 +978,7 @@
<string name="wifi_dpp_hotspot_password" msgid="4120419278831581613">"Nenosiri la mtandaopepe: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
<string name="wifi_dpp_add_device" msgid="4072206063308645677">"Ongeza kifaa"</string>
<string name="wifi_dpp_connect_network_using_qr_code" msgid="3887335309163999665">"Tumia msimbo wa QR ili uongeze kifaa kwenye mtandao huu"</string>
+ <string name="wifi_dpp_qr_code_is_not_valid_format" msgid="3700087439867692944">"Msimbo wa QR si muundo sahihi"</string>
<string name="retry" msgid="6472609612090877557">"Jaribu tena"</string>
<string name="wifi_shared" msgid="844142443226926070">"Shiriki na watumiaji wengine wa kifaa"</string>
<string name="wifi_unchanged" msgid="3410422020930397102">"(haijabadilishwa)"</string>
@@ -1129,6 +1128,7 @@
<string name="emergency_address_title" msgid="932729250447887545">"Anwani ya Dharura"</string>
<string name="emergency_address_summary" msgid="7751971156196115129">"Inatumika kama anwani ya mahali ulipo ikiwa utapiga simu ukitumia Wi‑Fi"</string>
<string name="private_dns_help_message" msgid="3299567069152568958"><annotation id="url">"Pata maelezo zaidi"</annotation>" kuhusu vipengele vya DNS ya Faragha"</string>
+ <string name="private_dns_mode_on" msgid="5882613439541371003">"Imewashwa"</string>
<string name="wifi_calling_pref_managed_by_carrier" msgid="6845711858866828986">"Mipangilio inadhibitiwa na mtoa huduma"</string>
<string name="wifi_calling_settings_activation_instructions" msgid="7492509632478260955">"Washa Huduma ya Kupiga Simu kupitia Wi-Fi"</string>
<string name="wifi_calling_turn_on" msgid="1171403510313983983">"Washa kipengele cha kupiga simu kupitia Wi-Fi"</string>
@@ -1872,7 +1872,7 @@
<string name="default_emergency_app" msgid="1951760659640369980">"Programu ya dharura"</string>
<string name="reset_app_preferences" msgid="1321050641018356925">"Badilisha mapendeleo ya programu"</string>
<string name="reset_app_preferences_title" msgid="6093179367325336662">"Ungependa kubadilisha mapendeleo ya programu?"</string>
- <string name="reset_app_preferences_desc" msgid="4822447731869201512">"Kufanya hivi kutabadilisha mapendeleo yote ya:\n\n"<li>"Programu zilizozimwa"</li>\n<li>"Arifa za programu zilizozimwa"</li>\n<li>"Programu chaguomsingi kwa vitendo"</li>\n<li>"Vikwazo vya chinichini vya data ya programu"</li>\n<li>"Vikwazo vyovyote vya ruhusa"</li>\n\n"Hutapoteza data yoyote ya programu."</string>
+ <string name="reset_app_preferences_desc" msgid="731757609326016760">"Hatua hii itaweka upya mapendeleo yote ya:\n\n"<li>"Programu zilizozimwa"</li>\n<li>"Arifa za programu zilizozimwa"</li>\n<li>"Programu chaguomsingi za vitendo"</li>\n<li>"Udhibiti wa data ya chini chini katika programu"</li>\n<li>"Udhibiti wowote wa ruhusa"</li>\n\n"Hutapoteza data yoyote ya programu."</string>
<string name="reset_app_preferences_button" msgid="2559089511841281242">"Weka upya"</string>
<string name="manage_space_text" msgid="8852711522447794676">"Dhibiti nafasi"</string>
<string name="filter" msgid="2018011724373033887">"Kichujio"</string>
@@ -2087,7 +2087,7 @@
<string name="accessibility_screen_magnification_short_summary" msgid="3411979839172752057">"Gusa mara 3 ili ukuze"</string>
<string name="accessibility_screen_magnification_navbar_short_summary" msgid="3693116360267980492">"Gusa kitufe ili ukuze"</string>
<string name="accessibility_screen_magnification_summary" msgid="5258868553337478505"><b>"Ili kukuza"</b>", gusa skrini mara 3 haraka.\n"<ul><li>"Buruta vidole 2 au zaidi ili usogeze"</li>\n<li>"Bana vidole 2 au zaidi ili ubadilishe ukuzaji"</li></ul>\n\n<b>"Ili kukuza kwa muda mfupi"</b>", gusa skrini mara 3 kwa haraka na ukifika mara ya tatu, usiondoe kidole.\n"<ul><li>"Buruta ili usogeze kwenye skrini"</li>\n<li>"Inua kidole ili uvute mbali"</li></ul>\n\n"Huwezi kukuza ukitumia kibodi au sehemu ya viungo muhimu."</string>
- <string name="accessibility_screen_magnification_navbar_summary" msgid="2272878354599332009">"Ukiwasha ukuzaji, unaweza kuvuta karibu kwenye skrini yako.\n\n"<b>"Ili ukuze"</b>", anzisha ukuzaji kisha uguse mahali popote kwenye skrini.\n"<ul><li>"• Buruta vidole 2 au zaidi ili usogeze"</li>\n<li>"• Bana vidole 2 au zaidi ili urekebishe ukuzaji"</li></ul>\n\n<b>"Ili ukuze kwa muda"</b>", anzisha ukuzaji kisha uguse na ushikilie mahali popote kwenye skrini.\n"<ul><li>"• Buruta ili usogeze kwenye skrini"</li>\n<li>"• Inua kidole ili usogeze mbali"</li></ul>\n\n"Huwezi kuvuta karibu kwenye kibodi au sehemu ya viungo muhimu."</string>
+ <string name="accessibility_screen_magnification_navbar_summary" msgid="6700716275347612310">"Ukiwasha ukuzaji, unaweza kuvuta karibu kwenye skrini yako.\n\n"<b>"Ili ukuze"</b>", anzisha ukuzaji kisha uguse mahali popote kwenye skrini.\n"<ul><li>"Buruta vidole 2 au zaidi ili usogeze"</li>\n<li>"Bana vidole 2 au zaidi ili urekebishe ukuzaji"</li></ul>\n\n<b>"Ili ukuze kwa muda"</b>", anzisha ukuzaji kisha uguse na ushikilie mahali popote kwenye skrini.\n"<ul><li>"Buruta ili usogeze kwenye skrini"</li>\n<li>"Inua kidole ili usogeze mbali"</li></ul>\n\n"Huwezi kuvuta karibu kwenye kibodi au sehemu ya viungo muhimu."</string>
<string name="accessibility_tutorial_dialog_title_button" msgid="3682222614034474845">"Tumia kitufe cha ufikivu kufungua"</string>
<string name="accessibility_tutorial_dialog_title_gesture" msgid="1342726230497913398">"Tumia ishara ili ufungue"</string>
<string name="accessibility_tutorial_dialog_title_gesture_settings" msgid="8539392614235820285">"Tumia ishara mpya ya ufikivu"</string>
@@ -2140,8 +2140,7 @@
<string name="accessibility_hearingaid_title" msgid="8312145423610648518">"Vifaa vya kusaidia kusikia"</string>
<string name="accessibility_hearingaid_not_connected_summary" msgid="6240237523789614599">"Hujaunganisha vifaa vyovyote vya kusaidia kusikia"</string>
<string name="accessibility_hearingaid_adding_summary" msgid="2947474468412309778">"Ongeza vifaa vya kusaidia kusikia"</string>
- <string name="accessibility_hearingaid_pair_instructions_first_message" msgid="3912093691643131154">"Ili uoanishe visaidizi vya kusikia, tafuta na uguse kifaa chako kwenye skrini inayofuata."</string>
- <string name="accessibility_hearingaid_pair_instructions_second_message" msgid="5596683393607650243">"Hakikisha kuwa vifaa vya kusaidia kusikia viko katika hali ya kuoanisha."</string>
+ <string name="accessibility_hearingaid_pair_instructions_message" msgid="3094382949733435414">"Ili uoanishe visaidizi vyako vya kusikia, tafuta na uguse kifaa chako kwenye skrini inayofuata. Hakikisha kuwa visaidizi vyako vya kusikia viko katika hali ya kuoanisha."</string>
<string name="accessibility_hearingaid_active_device_summary" msgid="3924362383258688984">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> inatumika"</string>
<plurals name="show_number_hearingaid_count" formatted="false" msgid="3160782397139295486">
<item quantity="other">Imehifadhi vifaa <xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> vya kusaidia kusikia</item>
@@ -2490,7 +2489,6 @@
<string name="menu_stats_last_unplugged" msgid="5922246077592434526">"Ilipochopolewa mara ya mwisho kwa <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
<string name="menu_stats_total" msgid="8973377864854807854">"Jumla ya utumiaji"</string>
<string name="menu_stats_refresh" msgid="1676215433344981075">"Onyesha upya"</string>
- <string name="process_kernel_label" msgid="3916858646836739323">"Mfumo wa Uendeshaji wa Android"</string>
<string name="process_mediaserver_label" msgid="6500382062945689285">"Seva ya media"</string>
<string name="process_dex2oat_label" msgid="2592408651060518226">"Uboreshaji wa programu"</string>
<string name="battery_saver" msgid="8172485772238572153">"Kiokoa Betri"</string>
@@ -2621,8 +2619,6 @@
<string name="no_device_admins" msgid="4846602835339095768">"Hakuna programu za msimamizi wa kifaa zinazopatikana"</string>
<string name="personal_device_admin_title" msgid="2849617316347669861">"Binafsi"</string>
<string name="managed_device_admin_title" msgid="7853955652864478435">"Kazini"</string>
- <string name="sms_access_restriction_enabled" msgid="7054488078710530278">"Zuia ufikiaji wa rekodi ya nambari za simu na SMS"</string>
- <string name="sms_access_restriction_enabled_summary" msgid="6851339654677842328">"Programu chaguomsingi za simu na za kutuma ujumbe ndizo tu zina ruhusa za kufikia SMS na rekodi ya nambari za simu"</string>
<string name="no_trust_agents" msgid="7450273545568977523">"Hakuna madalali wa kuaminiwa wanaopatikana"</string>
<string name="add_device_admin_msg" msgid="1501847129819382149">"Ungependa kuanza kutumia programu ya msimamizi wa kifaa?"</string>
<string name="add_device_admin" msgid="4192055385312215731">"Anza kutumia programu ya msimamizi wa kifaa"</string>
@@ -3111,7 +3107,7 @@
<string name="keywords_app_default" msgid="5822717006354487071">"Fungua ukitumia"</string>
<string name="keywords_applications_settings" msgid="1268353611121497450">"Maombi"</string>
<string name="keywords_time_zone" msgid="998254736898753085">"saa za eneo"</string>
- <string name="keywords_draw_overlay" msgid="4130899177619041842">"Gumzo kuu"</string>
+ <string name="keywords_draw_overlay" msgid="1001120206241401007">"Gumzo kuu, mfumo, arifa, dirisha, kidirisha, onyesho, juu ya programu zingine, droo"</string>
<string name="keywords_flashlight" msgid="6161632177705233710">"Taa, Mwangaza, Tochi"</string>
<string name="keywords_change_wifi_state" msgid="627068244033681010">"Wi-Fi, wi-fi, geuza, dhibiti"</string>
<string name="keywords_more_mobile_networks" msgid="8995946622054642367">"mtandao wa simu, rununu, mtoa huduma wa vifaa vya mkononi, isiyotumia waya, data, 4g, 3g, 2g, lte"</string>
@@ -3135,7 +3131,7 @@
<string name="keywords_sounds_and_notifications_interruptions" msgid="5426093074031208917">"usinisumbue, katiza, kukatiza, katiza"</string>
<string name="keywords_app" msgid="6334757056536837791">"RAM"</string>
<string name="keywords_location" msgid="4132655528196729043">"maeneo ya karibu nawe, mahali, historia, kuripoti, GPS"</string>
- <string name="keywords_accounts" msgid="1957925565953357627">"akaunti"</string>
+ <string name="keywords_accounts" msgid="4479029747403203867">"akaunti, ongeza akaunti, wasifu wa kazini"</string>
<string name="keywords_users" msgid="3434190133131387942">"vikwazo, weka vikwazo, imewekewa vikwazo"</string>
<string name="keywords_keyboard_and_ime" msgid="9143339015329957107">"kusahihisha maandishi, sahihisha, sauti, tetema, otomatiki, lugha, ishara, pendekeza, pendekezo, mandhari, ya kukera, neno, andika, emoji, ya kimataifa"</string>
<string name="keywords_reset_apps" msgid="5293291209613191845">"weka upya, mapendeleo, chaguomsingi"</string>
@@ -3173,6 +3169,7 @@
<string name="keywords_storage_settings" msgid="297283751968446577">"hifadhi, akiba, data, futa, futa data yote, nafasi iliyosalia, nafasi"</string>
<string name="keywords_bluetooth_settings" msgid="6804844062789439858">"imeunganishwa, kifaa, vipokea sauti vinavyobanwa kichwani, vifaa vya sauti, spika, pasiwaya, oanisha, vifaa vya sauti vya masikioni, muziki, maudhui"</string>
<string name="keywords_wallpaper" msgid="5058364390917429896">"chinichini, skrini, kifunga skrini, mandhari"</string>
+ <string name="keywords_styles" msgid="5828725481814049422">"umbo la aikoni, rangi ya msisitizo, fonti"</string>
<string name="keywords_assist_input" msgid="5017533309492679287">"chaguomsingi, mratibu"</string>
<string name="keywords_default_payment_app" msgid="3838565809518896799">"malipo, chaguomsingi"</string>
<string name="keywords_ambient_display" msgid="3103487805748659132">"arifa zinazoingia"</string>
@@ -3182,7 +3179,7 @@
<string name="keywords_notification_vibration" msgid="31924624421190547">"kugusa, kutetema, utambuzi"</string>
<string name="keywords_battery_saver_sticky" msgid="5586215686021650278">"kiokoa betri, inayonata, inayodumu, kiokoa umeme, betri"</string>
<string name="keywords_battery_saver_schedule" msgid="7358789228486231944">"mpangilio, ratiba, kiokoa betri, kuokoa umeme, betri, otomatiki, asilimia"</string>
- <string name="keywords_add_an_account" msgid="6488139919428902434">"wasifu wa kazini"</string>
+ <string name="keywords_enhance_4g_lte" msgid="2273810564244790859">"volte, upigaji simu ulioimarishwa, upigaji simu kupitia 4g"</string>
<string name="default_sound" msgid="8821684447333687810">"Sauti chaguomsingi"</string>
<string name="sound_settings_summary" msgid="4100853606668287965">"Kiwango cha sauti ya mlio ni <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
<string name="sound_dashboard_summary" msgid="3402435125958012986">"Kiwango cha sauti, mtetemo, Usinisumbue"</string>
@@ -3889,7 +3886,6 @@
<string name="permit_draw_overlay" msgid="7456536798718633432">"Ruhusu programu ionekane juu ya zingine"</string>
<string name="allow_overlay_description" msgid="8961670023925421358">"Ruhusu programu hii ionekane juu ya programu zingine unazotumia. Huenda hali hii ikaathiri jinsi unavyotumia programu hizo au kubadilisha jinsi zinavyoonekana au kufanya kazi."</string>
<string name="keywords_vr_listener" msgid="7441221822576384680">"vr uhalisia pepe kisikilizaji stereo kisaidizi huduma"</string>
- <string name="keywords_system_alert_window" msgid="5049498015597864850">"kidirisha cha arifa ya mfumo huonekana kwenye programu zingine"</string>
<string name="overlay_settings" msgid="6930854109449524280">"Onyesha juu ya programu zingine"</string>
<string name="system_alert_window_summary" msgid="602892301318324492">"Programu <xliff:g id="COUNT_0">%1$d</xliff:g> kati ya <xliff:g id="COUNT_1">%2$d</xliff:g> zimeruhusiwa kuonekana juu ya programu zingine"</string>
<string name="filter_overlay_apps" msgid="6965969283342557573">"Programu zilizo na ruhusa"</string>
@@ -4125,7 +4121,6 @@
<string name="notification_log_details_none" msgid="184131801230614059">"hamna"</string>
<string name="notification_log_details_ranking_null" msgid="244660392058720919">"Haina kipengele cha kuorodhesha."</string>
<string name="notification_log_details_ranking_none" msgid="599607025882587844">"Kipengele cha kuorodhesha hakina ufunguo huu."</string>
- <string name="theme_customization_category" msgid="1049181544004163283">"Kuweka maudhui"</string>
<string name="theme_customization_device_default" msgid="5058147707906551368">"Hali chaguomsingi ya kifaa"</string>
<string name="display_cutout_emulation" msgid="7466869822418376317">"Mkato kwenye skrini"</string>
<string name="display_cutout_emulation_keywords" msgid="4495418317471622562">"mwonekano wenye pengo, mkato wa umbo"</string>
@@ -4552,6 +4547,8 @@
<string name="network_connection_errorstate_dialog_message" msgid="6953778550775646710">"Hitilafu fulani imetokea. Programu imeghairi ombi la kuchagua kifaa."</string>
<string name="network_connection_connect_successful" msgid="5935510954474494928">"Imeunganisha"</string>
<string name="network_connection_request_dialog_showall" msgid="6938922880244567521">"Onyesha yote"</string>
+ <string name="network_connection_searching_message" msgid="4638576789450817530">"Inatafuta kifaa…"</string>
+ <string name="network_connection_connecting_message" msgid="3740982406609245654">"Inaunganisha kwenye kifaa…"</string>
<plurals name="show_bluetooth_devices" formatted="false" msgid="1715020480026568408">
<item quantity="other">Imeunganisha vifaa <xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g></item>
<item quantity="one">Imeunganisha kifaa <xliff:g id="NUMBER_DEVICE_COUNT_0">%1$d</xliff:g></item>
diff --git a/res/values-ta/strings.xml b/res/values-ta/strings.xml
index 50bf247..415b0b2 100644
--- a/res/values-ta/strings.xml
+++ b/res/values-ta/strings.xml
@@ -360,8 +360,6 @@
<string name="security_enable_widgets_disabled_summary" msgid="6392489775303464905">"நிர்வாகி முடக்கியுள்ளார்"</string>
<string name="lockdown_settings_title" msgid="7393790212603280213">"பூட்டு விருப்பத்தைக் காட்டு"</string>
<string name="lockdown_settings_summary" msgid="4359438673563318171">"Smart Lock, பயோமெட்ரிக் அன்லாக்கிங், பூட்டுத் திரையில் தெரியும் அறிவிப்புகள் ஆகியவற்றை ஆஃப் செய்யக்கூடிய \'பவர் பட்டன்\' விருப்பத்தைக் காட்டும்"</string>
- <string name="trust_agents_extend_unlock_title" msgid="2796555263565097031">"நீடித்த திறப்பு: நம்பகமான ஏஜெண்டுக்கு"</string>
- <string name="trust_agents_extend_unlock_summary" msgid="3976344969220255010">"நம்பமான ஏஜெண்டுகளை இயக்குவதன் மூலம் நீண்ட நேரம் உங்கள் சாதனத்தைத் திறந்து வைக்க முடியுமே தவிர மூடப்பட்டுள்ள சாதனத்தை அது திறக்காது."</string>
<string name="trust_lost_locks_screen_title" msgid="2992742466966021682">"நம்பிக்கை இழந்ததும் திரை பூட்டப்படுதல்"</string>
<string name="trust_lost_locks_screen_summary" msgid="693784434582021206">"இயக்கப்பட்டால், கடைசி நம்பகமான ஏஜெண்ட் நம்பிக்கையை இழந்ததும் சாதனம் பூட்டப்படும்"</string>
<string name="owner_info_settings_summary" msgid="7472393443779227052">"ஏதுமில்லை"</string>
@@ -937,6 +935,7 @@
<string name="wifi_eap_identity" msgid="4359453783379679103">"அடையாளம்"</string>
<string name="wifi_eap_anonymous" msgid="2989469344116577955">"அநாமதேய அடையாளம்"</string>
<string name="wifi_password" msgid="5948219759936151048">"கடவுச்சொல்"</string>
+ <string name="wifi_sae_password_id" msgid="1697832722221765763">"SAE கடவுச்சொல் அடையாளங்காட்டி"</string>
<string name="wifi_show_password" msgid="6461249871236968884">"கடவுச்சொல்லைக் காட்டு"</string>
<string name="wifi_ap_band_config" msgid="1611826705989117930">"AP அலைவரிசையைத் தேர்ந்தெடுக்கவும்"</string>
<string name="wifi_ap_choose_auto" msgid="2677800651271769965">"தானியங்கு"</string>
@@ -957,7 +956,6 @@
<string name="wifi_dpp_share_wifi" msgid="9065890131734833809">"வைஃபையைப் பகிர்தல்"</string>
<string name="wifi_dpp_scan_qr_code_with_another_device" msgid="5854392840857123065">"“<xliff:g id="SSID">%1$s</xliff:g>” உடன் இணைக்க இந்த QR குறியீட்டை ஸ்கேன் செய்து கடவுச்சொல்லைப் பகிரவும்"</string>
<string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="4436318319178361543">"“<xliff:g id="SSID">%1$s</xliff:g>” உடன் இணைக்க இந்த QR குறியீட்டை ஸ்கேன் செய்யவும்"</string>
- <string name="wifi_dpp_could_not_detect_valid_qr_code" msgid="641893675646330576">"QR குறியீட்டின் விவரங்களைப் பெற இயலவில்லை. சரியாக மையத்தில் காட்டி முயலவும்"</string>
<string name="wifi_dpp_failure_authentication_or_configuration" msgid="3372757783382381044">"மீண்டும் முயலவும். சிக்கல் தொடர்ந்தால் சாதன உற்பத்தியாளரைத் தொடர்புகொள்ளவும்"</string>
<string name="wifi_dpp_failure_not_compatible" msgid="2829930473520603740">"ஏதோ தவறாகிவிட்டது"</string>
<string name="wifi_dpp_failure_timeout" msgid="5228320772245820458">"சாதனம் பிளக்கில் செருகப்பட்டும் சார்ஜ் செய்யப்பட்டும் ஆன் நிலையிலும் இருப்பதை உறுதிசெய்துகொள்ளவும்"</string>
@@ -980,6 +978,7 @@
<string name="wifi_dpp_hotspot_password" msgid="4120419278831581613">"ஹாட்ஸ்பாட் கடவுச்சொல்: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
<string name="wifi_dpp_add_device" msgid="4072206063308645677">"சாதனத்தைச் சேர்க்கவும்"</string>
<string name="wifi_dpp_connect_network_using_qr_code" msgid="3887335309163999665">"நெட்வொர்க்கில் சாதனத்தைச் சேர்க்க QR குறியீட்டைப் பயன்படுத்தவும்"</string>
+ <string name="wifi_dpp_qr_code_is_not_valid_format" msgid="3700087439867692944">"QR குறியீடு சரியான வடிவமில்லை"</string>
<string name="retry" msgid="6472609612090877557">"மீண்டும் முயல்க"</string>
<string name="wifi_shared" msgid="844142443226926070">"பிற சாதனப் பயனர்களுடன் பகிர்"</string>
<string name="wifi_unchanged" msgid="3410422020930397102">"(மாற்றப்படவில்லை)"</string>
@@ -1129,6 +1128,7 @@
<string name="emergency_address_title" msgid="932729250447887545">"அவசர முகவரி"</string>
<string name="emergency_address_summary" msgid="7751971156196115129">"வைஃபை மூலம் அவசர அழைப்பை மேற்கொள்ளும்போது, உங்களின் அப்போதைய இருப்பிடமே உங்கள் முகவரியாகக் கருதப்படும்"</string>
<string name="private_dns_help_message" msgid="3299567069152568958">"தனிப்பட்ட DNS அம்சங்கள் பற்றி "<annotation id="url">"மேலும் அறிக"</annotation></string>
+ <string name="private_dns_mode_on" msgid="5882613439541371003">"ஆன்"</string>
<string name="wifi_calling_pref_managed_by_carrier" msgid="6845711858866828986">"அமைப்பானது மொபைல் நிறுவனத்தால் நிர்வகிக்கப்படுகிறது"</string>
<string name="wifi_calling_settings_activation_instructions" msgid="7492509632478260955">"வைஃபை அழைப்பைச் செயல்படுத்தவும்"</string>
<string name="wifi_calling_turn_on" msgid="1171403510313983983">"வைஃபை அழைப்பை ஆன் செய்க"</string>
@@ -1872,7 +1872,7 @@
<string name="default_emergency_app" msgid="1951760659640369980">"அவசரப் ஆப்ஸ்"</string>
<string name="reset_app_preferences" msgid="1321050641018356925">"ஆப்ஸ் அமைப்பை மீட்டமை"</string>
<string name="reset_app_preferences_title" msgid="6093179367325336662">"அமைப்பை மீட்டமைக்கவா?"</string>
- <string name="reset_app_preferences_desc" msgid="4822447731869201512">"இது, பின்வருபவற்றின் எல்லா விருப்பத்தேர்வுகளையும் மீட்டமைக்கும்:\n\n"<li>"முடக்கப்பட்ட ஆப்ஸ்"</li>\n<li>"முடக்கப்பட்ட ஆப்ஸின் அறிவிப்புகள்"</li>\n<li>"செயல்பாடுகளுக்கான இயல்புநிலை ஆப்ஸ்"</li>\n<li>"ஆப்ஸ்களுக்கான பின்புல டேட்டாவின் கட்டுப்பாடுகள்"</li>\n<li>"ஏதேனும் அனுமதிக் கட்டுப்பாடுகள்"</li>\n\n"எந்த ஆப்ஸ் டேட்டாவையும் இழக்கமாட்டீர்கள்."</string>
+ <string name="reset_app_preferences_desc" msgid="731757609326016760">"பின்வரும் விருப்பத்தேர்வுகளை இது மீட்டமைக்கும்:\n\n"<li>"முடக்கப்பட்டுள்ள ஆப்ஸ்"</li>\n<li>"முடக்கப்பட்டுள்ள ஆப்ஸ் அறிவிப்புகள்"</li>\n<li>"செயல்பாடுகளுக்கான இயல்புநிலை ஆப்ஸ்"</li>\n<li>"ஆப்ஸிற்கான பின்புலத் தரவுக் கட்டுப்பாடுகள்"</li>\n<li>"ஏதேனும் அனுமதிக் கட்டுப்பாடுகள்"</li>\n\n"இதன் காரணமாக எந்த ஆப்ஸ் தரவையும் இழக்கமாட்டீர்கள்."</string>
<string name="reset_app_preferences_button" msgid="2559089511841281242">"ஆப்ஸை மீட்டமை"</string>
<string name="manage_space_text" msgid="8852711522447794676">"காலி இடத்தை நிர்வகி"</string>
<string name="filter" msgid="2018011724373033887">"வடிகட்டு"</string>
@@ -2087,7 +2087,7 @@
<string name="accessibility_screen_magnification_short_summary" msgid="3411979839172752057">"அளவை மாற்ற, 3 முறை தட்டவும்"</string>
<string name="accessibility_screen_magnification_navbar_short_summary" msgid="3693116360267980492">"திரையைப் பெரிதாக்க, பட்டனைத் தட்டவும்"</string>
<string name="accessibility_screen_magnification_summary" msgid="5258868553337478505"><b>"பெரிதாக்க"</b>", திரையில் 3 முறை வேகமாகத் தட்டவும்.\n"<ul><li>"ஸ்க்ரோல் செய்ய, இரண்டு அல்லது அதற்கு மேற்பட்ட விரல்களால் இழுக்கவும்"</li>\n<li>"அளவை மாற்ற, இரண்டு அல்லது அதற்கு மேற்பட்ட விரல்களால் பின்ச் செய்யவும்"</li></ul>\n\n<b>"தற்காலிகமாகப் பெரிதாக்க"</b>", திரையை 3 முறை வேகமாகத் தட்டி, மூன்றாவது முறை தட்டும் போது விரலால் திரையைப் பிடித்திருக்கவும்.\n"<ul><li>"திரையில் நகர்த்த, இழுக்கவும்"</li>\n<li>"சிறிதாக்க, விரலை எடுக்கவும்"</li></ul>\n\n"விசைப்பலகையிலும் உலாவல் பட்டியிலும் பெரிதாக்க முடியாது."</string>
- <string name="accessibility_screen_magnification_navbar_summary" msgid="2272878354599332009">"’பெரிதாக்கல்’ அம்சம் ஆன் செய்யப்பட்டுள்ளபோது திரையைப் பெரிதாக்கிப் பார்க்கலாம்.\n\n"<b>"அதற்கு"</b>" இந்த அம்சத்தைத் தொடங்கி திரையில் எங்கு வேண்டுமானாலும் தட்டவும்.\n"<ul><li>"• ஸ்க்ரோல் செய்ய இரண்டு அல்லது மேற்பட்ட விரல்களில் இழுக்கவும்"</li>\n<li>"• அளவை மாற்ற இரண்டு அல்லது மேற்பட்ட விரல்களில் பின்ச் செய்யவும்"</li></ul>\n\n<b>"தற்காலிகமாகப் பெரிதாக்க"</b>" இந்த அம்சத்தைத் தொடங்கி திரையில் எங்கு வேண்டுமானாலும் தொட்டுப் பிடிக்கவும்.\n"<ul><li>"• திரையில் எங்கு வேண்டுமானாலும் செல்ல இழுக்கவும்"</li>\n<li>"• சிறிதாக்க விரல்களால் பின்ச் செய்து மேலே இழுக்கவும்"</li></ul>\n\n"கீபோர்டிலோ வழிசெலுத்தல் பட்டியையோ பெரிதாக்க இயலாது."</string>
+ <string name="accessibility_screen_magnification_navbar_summary" msgid="6700716275347612310">"’பெரிதாக்கல்’ அம்சம் ஆன் செய்யப்பட்டுள்ளபோது திரையைப் பெரிதாக்கிப் பார்க்கலாம்.\n\n"<b>"அதற்கு "</b>", இந்த அம்சத்தைத் தொடங்கி திரையில் எங்கு வேண்டுமானாலும் தட்டவும்.\n"<ul><li>"ஸ்க்ரோல் செய்ய இரண்டு அல்லது மேற்பட்ட விரல்களில் இழுக்கவும்"</li>\n<li>"அளவை மாற்ற இரண்டு அல்லது மேற்பட்ட விரல்களில் பின்ச் செய்யவும்"</li></ul>\n\n<b>"தற்காலிகமாகப் பெரிதாக்க"</b>", இந்த அம்சத்தைத் தொடங்கி திரையில் எங்கு வேண்டுமானாலும் தொட்டுப் பிடிக்கவும்.\n"<ul><li>"திரையில் எங்கு வேண்டுமானாலும் செல்ல இழுக்கவும்"</li>\n<li>"சிறிதாக்க விரல்களால் பின்ச் செய்து மேலே இழுக்கவும்"</li></ul>\n\n"கீபோர்டிலோ வழிசெலுத்தல் பட்டியையோ பெரிதாக்க இயலாது."</string>
<string name="accessibility_tutorial_dialog_title_button" msgid="3682222614034474845">"திறக்க அணுகல்தன்மை பட்டனைப் பயன்படுத்துதல்"</string>
<string name="accessibility_tutorial_dialog_title_gesture" msgid="1342726230497913398">"திறக்க சைகைகளைப் பயன்படுத்துதல்"</string>
<string name="accessibility_tutorial_dialog_title_gesture_settings" msgid="8539392614235820285">"புதிய அணுகல்தன்மை சைகையைப் பயன்படுத்துதல்"</string>
@@ -2140,8 +2140,7 @@
<string name="accessibility_hearingaid_title" msgid="8312145423610648518">"செவித்துணைக் கருவிகள்"</string>
<string name="accessibility_hearingaid_not_connected_summary" msgid="6240237523789614599">"இணைக்கப்பட்ட செவித்துணைக் கருவிகள் இல்லை"</string>
<string name="accessibility_hearingaid_adding_summary" msgid="2947474468412309778">"செவித்துணை கருவிகளைச் சேர்க்கவும்"</string>
- <string name="accessibility_hearingaid_pair_instructions_first_message" msgid="3912093691643131154">"செவித்துணைக் கருவிகளை இணைக்க, அடுத்துவரும் திரையில் காட்டப்படும் உங்கள் சாதனத்தைக் கண்டறிந்து, தட்டவும்."</string>
- <string name="accessibility_hearingaid_pair_instructions_second_message" msgid="5596683393607650243">"உங்கள் செவித்துணைக் கருவிகள், இணைத்தல் பயன்முறையில் உள்ளதை உறுதிப்படுத்திக்கொள்ளவும்."</string>
+ <string name="accessibility_hearingaid_pair_instructions_message" msgid="3094382949733435414">"செவித்துணைக் கருவிகளை இணைக்க அடுத்துவரும் திரையில் காட்டப்படும் உங்கள் சாதனத்தைக் கண்டறிந்து தட்டவும். உங்கள் செவித்துணைக் கருவிகள் \'இணைத்தல் பயன்முறையில்\' உள்ளதை உறுதிப்படுத்திக்கொள்ளவும்."</string>
<string name="accessibility_hearingaid_active_device_summary" msgid="3924362383258688984">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> செயல்பாட்டில் உள்ளது"</string>
<plurals name="show_number_hearingaid_count" formatted="false" msgid="3160782397139295486">
<item quantity="other">சேமித்த செவித்துணைக் கருவிகள்: <xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g></item>
@@ -2490,7 +2489,6 @@
<string name="menu_stats_last_unplugged" msgid="5922246077592434526">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> க்குக் கடைசியாக பிளகை அகற்றியபோது"</string>
<string name="menu_stats_total" msgid="8973377864854807854">"பயன்பாட்டின் மொத்தம்"</string>
<string name="menu_stats_refresh" msgid="1676215433344981075">"புதுப்பி"</string>
- <string name="process_kernel_label" msgid="3916858646836739323">"Android OS"</string>
<string name="process_mediaserver_label" msgid="6500382062945689285">"மீடியாசர்வர்"</string>
<string name="process_dex2oat_label" msgid="2592408651060518226">"பயன்பாட்டிற்கான மேம்படுத்தல்"</string>
<string name="battery_saver" msgid="8172485772238572153">"பேட்டரி சேமிப்பான்"</string>
@@ -2621,8 +2619,6 @@
<string name="no_device_admins" msgid="4846602835339095768">"சாதன நிர்வாகிப் பயன்பாடுகள் எதுவுமில்லை"</string>
<string name="personal_device_admin_title" msgid="2849617316347669861">"தனிப்பட்டவை"</string>
<string name="managed_device_admin_title" msgid="7853955652864478435">"பணியிடம்"</string>
- <string name="sms_access_restriction_enabled" msgid="7054488078710530278">"மெசேஜ், அழைப்புப் பதிவு அணுகலைக் கட்டுப்படுத்துதல்"</string>
- <string name="sms_access_restriction_enabled_summary" msgid="6851339654677842328">"இயல்புநிலை மொபைலாலும் மெசேஜிங் ஆப்ஸாலும் மட்டுமே மெசேஜையும் \'அழைப்புப் பதிவையும்\' அணுக இயலும்"</string>
<string name="no_trust_agents" msgid="7450273545568977523">"நம்பகமான ஏஜென்ட்கள் இல்லை"</string>
<string name="add_device_admin_msg" msgid="1501847129819382149">"இந்த ஆப்ஸை செயல்படுத்தவா?"</string>
<string name="add_device_admin" msgid="4192055385312215731">"இந்தச் சாதன நிர்வாகி ஆப்ஸைச் செயல்படுத்து"</string>
@@ -3111,7 +3107,7 @@
<string name="keywords_app_default" msgid="5822717006354487071">"இதன்மூலம் திற"</string>
<string name="keywords_applications_settings" msgid="1268353611121497450">"ஆப்ஸ்"</string>
<string name="keywords_time_zone" msgid="998254736898753085">"நேர மண்டலம்"</string>
- <string name="keywords_draw_overlay" msgid="4130899177619041842">"சாட்-ஹெட்"</string>
+ <string name="keywords_draw_overlay" msgid="1001120206241401007">"சாட் ஹெட், அமைப்பு, விழிப்பூட்டல், சாளரம், உரையாடல், காட்சிப்படுத்தல், பிற ஆப்ஸ் மேல், வரை"</string>
<string name="keywords_flashlight" msgid="6161632177705233710">"ஃபிளாஷ்லைட், லைட், டார்ச்"</string>
<string name="keywords_change_wifi_state" msgid="627068244033681010">"வைஃபை, வை-ஃபை, நிலைமாற்றி, கட்டுப்பாடு"</string>
<string name="keywords_more_mobile_networks" msgid="8995946622054642367">"செல்லுலார், மொபைல், செல் கேரியர், வயர்லெஸ், தரவு, 4g,3g, 2g, lte"</string>
@@ -3135,7 +3131,7 @@
<string name="keywords_sounds_and_notifications_interruptions" msgid="5426093074031208917">"வேண்டாம், தொந்தரவு செய்யாதே, குறுக்கீடு, குறுக்கிடல், இடைநிறுத்தம்"</string>
<string name="keywords_app" msgid="6334757056536837791">"RAM"</string>
<string name="keywords_location" msgid="4132655528196729043">"அக்கம்பக்கம், இருப்பிடம், வரலாறு, அறிக்கையிடல், GPS"</string>
- <string name="keywords_accounts" msgid="1957925565953357627">"கணக்கு"</string>
+ <string name="keywords_accounts" msgid="4479029747403203867">"கணக்கு, கணக்கைச் சேர்த்தல், பணிக் கணக்கு"</string>
<string name="keywords_users" msgid="3434190133131387942">"வரம்பிடல், வரம்பு, வரம்பிட்டது"</string>
<string name="keywords_keyboard_and_ime" msgid="9143339015329957107">"உரை திருத்தம், சரிசெய், ஒலி, அதிர்வு, தானியங்கு, மொழி, சைகை, பரிந்துரை, பரிந்துரைப்பு, தீம், வன்மொழி, சொல், வகை, ஈமோஜி, சர்வதேசம்"</string>
<string name="keywords_reset_apps" msgid="5293291209613191845">"மீட்டமை, விருப்பத்தேர்வுகள், இயல்பு"</string>
@@ -3173,6 +3169,7 @@
<string name="keywords_storage_settings" msgid="297283751968446577">"நினைவகம், தற்காலிக நினைவகம், தரவு, நீக்கு, அழி, காலியாக்கு, நினைவக இடம்"</string>
<string name="keywords_bluetooth_settings" msgid="6804844062789439858">"இணைக்கப்பட்டது, சாதனம், ஹெட்ஃபோன்கள், ஹெட்செட், ஸ்பீக்கர், வயர்லெஸ், இணை, சிறிய ஹெட்ஃபோன்கள், இசை, மீடியா"</string>
<string name="keywords_wallpaper" msgid="5058364390917429896">"பின்னணி, திரை, பூட்டுத்திரை, தீம்"</string>
+ <string name="keywords_styles" msgid="5828725481814049422">"ஐகான் வடிவம், ஆக்செண்ட் வண்ணம், எழுத்துரு"</string>
<string name="keywords_assist_input" msgid="5017533309492679287">"இயல்பு, அசிஸ்டண்ட்"</string>
<string name="keywords_default_payment_app" msgid="3838565809518896799">"பேமெண்ட், இயல்பு"</string>
<string name="keywords_ambient_display" msgid="3103487805748659132">"உள்வரும் அறிவிப்பு"</string>
@@ -3182,7 +3179,7 @@
<string name="keywords_notification_vibration" msgid="31924624421190547">"தொட்டு கருத்துத் தெரிவித்தல், அதிர்வு, உணர்திறன்"</string>
<string name="keywords_battery_saver_sticky" msgid="5586215686021650278">"பேட்டரி சேமிப்பான், ஸ்டிக்கி, பெர்சிஸ்ட், மின்சக்தி சேமிப்பான், பேட்டரி"</string>
<string name="keywords_battery_saver_schedule" msgid="7358789228486231944">"வழக்கமான செயல்பாடு, கால அட்டவணை, பேட்டரி சேமிப்பான், மின்சக்தி சேமிப்பான், பேட்டரி, தானியங்கு, சதவீதம்"</string>
- <string name="keywords_add_an_account" msgid="6488139919428902434">"பணிக் கணக்கு"</string>
+ <string name="keywords_enhance_4g_lte" msgid="2273810564244790859">"volte, மேம்பட்ட அழைப்பு, 4g அழைப்பு"</string>
<string name="default_sound" msgid="8821684447333687810">"இயல்பு ஒலி"</string>
<string name="sound_settings_summary" msgid="4100853606668287965">"ரிங் ஒலியளவு: <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
<string name="sound_dashboard_summary" msgid="3402435125958012986">"ஒலியளவு, அதிர்வு, தொந்தரவு செய்யாதே"</string>
@@ -3889,7 +3886,6 @@
<string name="permit_draw_overlay" msgid="7456536798718633432">"பிற ஆப்ஸின் மேலே காட்டுவதை அனுமதி"</string>
<string name="allow_overlay_description" msgid="8961670023925421358">"நீங்கள் பயன்படுத்தும் பிற ஆப்ஸின் மேலே உள்ளடக்கத்தைக் காட்ட, இந்த ஆப்ஸை அனுமதிக்கும். மேலும், அவற்றை நீங்கள் பயன்படுத்தும் போது இது குறுக்கிடக்கூடும் அல்லது அவை தோன்றும் விதத்தையோ, செயல்படும் விதத்தையோ மாற்றக்கூடும்."</string>
<string name="keywords_vr_listener" msgid="7441221822576384680">"vr விர்ச்சுவல் ரியாலிட்டி லிஷனர் ஸ்டீரியோ உதவிச் சேவை"</string>
- <string name="keywords_system_alert_window" msgid="5049498015597864850">"சாதனம் விழிப்பூட்டல் சாளரம் உரையாடல் காட்டு பிற பயன்பாடுகளின் மேல்"</string>
<string name="overlay_settings" msgid="6930854109449524280">"பிற ஆப்ஸின் மேலே காட்டு"</string>
<string name="system_alert_window_summary" msgid="602892301318324492">"பிற பயன்பாடுகளின் மேலே காட்டுவதற்கு <xliff:g id="COUNT_1">%2$d</xliff:g> இல் <xliff:g id="COUNT_0">%1$d</xliff:g> பயன்பாடுகள் அனுமதிக்கப்பட்டுள்ளன"</string>
<string name="filter_overlay_apps" msgid="6965969283342557573">"அனுமதி பெற்ற பயன்பாடுகள்"</string>
@@ -4125,7 +4121,6 @@
<string name="notification_log_details_none" msgid="184131801230614059">"எதுவுமில்லை"</string>
<string name="notification_log_details_ranking_null" msgid="244660392058720919">"மதிப்பீட்டுத் தகவல் இல்லை."</string>
<string name="notification_log_details_ranking_none" msgid="599607025882587844">"மதிப்பீட்டுத் தகவலில் இந்த விசை இல்லை."</string>
- <string name="theme_customization_category" msgid="1049181544004163283">"தீம் மேலடுக்குகள்"</string>
<string name="theme_customization_device_default" msgid="5058147707906551368">"சாதனத்தின் இயல்புநிலை"</string>
<string name="display_cutout_emulation" msgid="7466869822418376317">"டிஸ்ப்ளே கட்அவுட்"</string>
<string name="display_cutout_emulation_keywords" msgid="4495418317471622562">"கட்அவுட் காட்சி, நோட்ச்"</string>
@@ -4551,6 +4546,8 @@
<string name="network_connection_errorstate_dialog_message" msgid="6953778550775646710">"ஏதோ அறிவிப்பு வந்துள்ளது. ஒரு சாதனத்தைத் தேர்வுசெய்வதற்கான கோரிக்கையை இந்த ஆப்ஸ் ரத்துசெய்துள்ளது."</string>
<string name="network_connection_connect_successful" msgid="5935510954474494928">"இணைப்பு வெற்றியடைந்தது"</string>
<string name="network_connection_request_dialog_showall" msgid="6938922880244567521">"அனைத்தையும் காட்டு"</string>
+ <string name="network_connection_searching_message" msgid="4638576789450817530">"சாதனத்தைத் தேடுகிறது…"</string>
+ <string name="network_connection_connecting_message" msgid="3740982406609245654">"சாதனத்துடன் இணைக்கப்படுகிறது…"</string>
<plurals name="show_bluetooth_devices" formatted="false" msgid="1715020480026568408">
<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>
diff --git a/res/values-te/strings.xml b/res/values-te/strings.xml
index 2c13f9d..a3b1aa9 100644
--- a/res/values-te/strings.xml
+++ b/res/values-te/strings.xml
@@ -360,8 +360,6 @@
<string name="security_enable_widgets_disabled_summary" msgid="6392489775303464905">"నిర్వాహకులు నిలిపివేసారు"</string>
<string name="lockdown_settings_title" msgid="7393790212603280213">"అన్నీ లాక్ చేయి ఎంపికను చూపు"</string>
<string name="lockdown_settings_summary" msgid="4359438673563318171">"Smart Lock, బయోమెట్రిక్ అన్లాకింగ్ మరియు లాక్ స్క్రీన్లో నోటిఫికేషన్లను ఆఫ్ చేసే పవర్ బటన్ ఎంపికను ప్రదర్శించు"</string>
- <string name="trust_agents_extend_unlock_title" msgid="2796555263565097031">"విశ్వసనీయ ఏజెంట్లు మాత్రమే అన్లాక్ను పొడిగిస్తాయి"</string>
- <string name="trust_agents_extend_unlock_summary" msgid="3976344969220255010">"ప్రారంభించబడితే, విశ్వసనీయ ఏజెంట్లు మీ పరికరాన్ని ఎక్కువ సమయం పాటు అన్లాక్ చేసి ఉంచుతాయి, కానీ లాక్ చేయబడిన పరికరాన్ని అన్లాక్ చేయలేవు."</string>
<string name="trust_lost_locks_screen_title" msgid="2992742466966021682">"విశ్వసనీయతను కోల్పోయినప్పుడు స్క్రీన్ను లాక్ చేయండి"</string>
<string name="trust_lost_locks_screen_summary" msgid="693784434582021206">"ప్రారంభించబడితే, చివరి విశ్వసనీయ ఏజెంట్ విశ్వసనీయతను కోల్పోయినప్పుడు పరికరం లాక్ చేయబడుతుంది"</string>
<string name="owner_info_settings_summary" msgid="7472393443779227052">"ఏమీ లేదు"</string>
@@ -937,6 +935,8 @@
<string name="wifi_eap_identity" msgid="4359453783379679103">"గుర్తింపు"</string>
<string name="wifi_eap_anonymous" msgid="2989469344116577955">"అనామక గుర్తింపు"</string>
<string name="wifi_password" msgid="5948219759936151048">"పాస్వర్డ్"</string>
+ <!-- no translation found for wifi_sae_password_id (1697832722221765763) -->
+ <skip />
<string name="wifi_show_password" msgid="6461249871236968884">"పాస్వర్డ్ను చూపు"</string>
<string name="wifi_ap_band_config" msgid="1611826705989117930">"AP బ్యాండ్ ఎంచుకోండి"</string>
<string name="wifi_ap_choose_auto" msgid="2677800651271769965">"స్వీయ"</string>
@@ -957,7 +957,6 @@
<string name="wifi_dpp_share_wifi" msgid="9065890131734833809">"Wi‑Fi షేర్ చేయి"</string>
<string name="wifi_dpp_scan_qr_code_with_another_device" msgid="5854392840857123065">"“<xliff:g id="SSID">%1$s</xliff:g>”కు కనెక్ట్ చేయడానికి, అలాగే షేర్ చేయడానికి ఈ QR కోడ్ను స్కాన్ చేయండి"</string>
<string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="4436318319178361543">"“<xliff:g id="SSID">%1$s</xliff:g>”కు కనెక్ట్ చేయడానికి ఈ QR కోడ్ను స్కాన్ చేయండి"</string>
- <string name="wifi_dpp_could_not_detect_valid_qr_code" msgid="641893675646330576">"QR కోడ్ను చదవడం సాధ్యం కాలేదు కోడ్ను మధ్యలో పెట్టి మళ్లీ ప్రయత్నించండి"</string>
<string name="wifi_dpp_failure_authentication_or_configuration" msgid="3372757783382381044">"మళ్లీ ప్రయత్నించండి. సమస్య ఇంకా కొనసాగితే, పరికరం తయారీదారుని సంప్రదించండి"</string>
<string name="wifi_dpp_failure_not_compatible" msgid="2829930473520603740">"ఏదో తప్పు జరిగింది"</string>
<string name="wifi_dpp_failure_timeout" msgid="5228320772245820458">"పరికరం ప్లగ్-ఇన్ చేయబడి, ఛార్జ్ చేయబడి మరియు ఆన్ చేయబడి ఉండేలా చూడండి"</string>
@@ -980,6 +979,7 @@
<string name="wifi_dpp_hotspot_password" msgid="4120419278831581613">"హాట్స్పాట్ పాస్వర్డ్: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
<string name="wifi_dpp_add_device" msgid="4072206063308645677">"పరికరాన్ని జోడించండి"</string>
<string name="wifi_dpp_connect_network_using_qr_code" msgid="3887335309163999665">"ఈ నెట్వర్క్కు పరికరాన్ని జోడించడానికి QR కోడ్ను ఉపయోగించండి"</string>
+ <string name="wifi_dpp_qr_code_is_not_valid_format" msgid="3700087439867692944">"QR కోడ్ చెల్లుబాటు అయ్యే ఫార్మాట్లో లేదు"</string>
<string name="retry" msgid="6472609612090877557">"మళ్లీ ప్రయత్నించు"</string>
<string name="wifi_shared" msgid="844142443226926070">"ఇతర పరికర వినియోగదారులతో భాగస్వామ్యం చేయి"</string>
<string name="wifi_unchanged" msgid="3410422020930397102">"(మారలేదు)"</string>
@@ -1129,6 +1129,7 @@
<string name="emergency_address_title" msgid="932729250447887545">"అత్యవసర చిరునామా"</string>
<string name="emergency_address_summary" msgid="7751971156196115129">"Wi-Fi ద్వారా అత్యవసర కాల్ చేసినప్పుడు మీ స్థానాన్ని ఉపయోగించబడుతుంది"</string>
<string name="private_dns_help_message" msgid="3299567069152568958">"ప్రైవేట్ DNS ఫీచర్ల గురించి "<annotation id="url">"మరింత తెలుసుకోండి"</annotation></string>
+ <string name="private_dns_mode_on" msgid="5882613439541371003">"ఆన్"</string>
<string name="wifi_calling_pref_managed_by_carrier" msgid="6845711858866828986">"క్యారియర్ ద్వారా నిర్వహించబడుతున్న సెట్టింగ్"</string>
<string name="wifi_calling_settings_activation_instructions" msgid="7492509632478260955">"Wi-Fi కాలింగ్ను సక్రియం చేయండి"</string>
<string name="wifi_calling_turn_on" msgid="1171403510313983983">"Wi-Fi కాలింగ్ను ఆన్ చేయండి"</string>
@@ -1872,7 +1873,7 @@
<string name="default_emergency_app" msgid="1951760659640369980">"అత్యవసర యాప్"</string>
<string name="reset_app_preferences" msgid="1321050641018356925">"యాప్ ప్రాధాన్యతలను రీసెట్ చేయి"</string>
<string name="reset_app_preferences_title" msgid="6093179367325336662">"యాప్ ప్రాధాన్యతలను రీసెట్ చేయాలా?"</string>
- <string name="reset_app_preferences_desc" msgid="4822447731869201512">"ఇది వీటి కోసం అన్ని ప్రాధాన్యతలను రీసెట్ చేస్తుంది:\n\n"<li>"నిలిపివేయబడిన యాప్లు"</li>\n<li>"నిలిపివేయబడిన యాప్ నోటిఫికేషన్లు"</li>\n<li>"చర్యల కోసం డిఫాల్ట్ యాప్లు"</li>\n<li>"యాప్ల కోసం నేపథ్య డేటా పరిమితులు"</li>\n<li>"ఏవైనా అనుమతి పరిమితులు"</li>\n\n"మీరు యాప్ డేటాను కోల్పోరు."</string>
+ <string name="reset_app_preferences_desc" msgid="731757609326016760">"ఇది వీటి కోసం అన్ని ప్రాధాన్యతలను రీసెట్ చేస్తుంది:\n\n"<li>"నిలిపివేయబడిన యాప్లు"</li>\n<li>"నిలిపివేయబడిన యాప్లు"</li>\n<li>"చర్యల కోసం డిఫాల్ట్ యాప్లు"</li>\n<li>"యాప్ల కోసం నేపథ్య డేటా పరిమితులు"</li>\n<li>"ఏవైనా అనుమతి పరిమితులు"</li>\n\n"మీరు ఏ యాప్ డేటాను కోల్పోరు."</string>
<string name="reset_app_preferences_button" msgid="2559089511841281242">"యాప్లను రీసెట్ చేయి"</string>
<string name="manage_space_text" msgid="8852711522447794676">"నిల్వ ఖాళీని నిర్వహించు"</string>
<string name="filter" msgid="2018011724373033887">"ఫిల్టర్ చేయి"</string>
@@ -2087,7 +2088,7 @@
<string name="accessibility_screen_magnification_short_summary" msgid="3411979839172752057">"జూమ్ చేయడానికి 3 సార్లు నొక్కండి"</string>
<string name="accessibility_screen_magnification_navbar_short_summary" msgid="3693116360267980492">"జూమ్ చేయడం కోసం బటన్ని నొక్కండి"</string>
<string name="accessibility_screen_magnification_summary" msgid="5258868553337478505"><b>"జూమ్ చేయాలంటే"</b>", స్క్రీన్పై 3 సార్లు వెంటవెంటనే నొక్కండి.\n"<ul><li>"స్క్రోల్ చేయాలంటే 2 లేదా అంతకంటే ఎక్కువ వేళ్లతో లాగండి"</li>\n<li>"జూమ్ని సర్దుబాటు చేయాలంటే 2 లేదా అంతకంటే ఎక్కువ వేళ్లను స్క్రీన్పై ఉంచి ఆ వేళ్లను దగ్గరకు లేదా దూరానికి లాగండి"</li></ul>\n\n<b>"తాత్కాలికంగా జూమ్ చేయాలంటే"</b>", స్క్రీన్పై 3 సార్లు వెంటవెంటనే నొక్కి, మూడవసారి మీ వేలిని అలాగే పైకెత్తకుండా ఉంచండి.\n"<ul><li>"స్క్రీన్ని కదిలించడానికి దానిని ఎటువైపు కావాలంటే అటువైపు లాగండి"</li>\n<li>"దూరంగా జూమ్ చేయాలంటే వేలిని పైకి ఎత్తండి"</li></ul>\n\n"కీబోర్డ్ లేదా నావిగేషన్ పట్టీలో మీరు దగ్గరకు జూమ్ చేయలేరు."</string>
- <string name="accessibility_screen_magnification_navbar_summary" msgid="2272878354599332009">"మాగ్నిఫికేషన్ను ఆన్ చేసినప్పుడు, మీ స్క్రీన్లో దగ్గరకు జూమ్ చేయవచ్చు.\n\n"<b>"జూమ్ చేయడానికి"</b>", మాగ్నిఫికేషన్ను ప్రారంభించి, తర్వాత స్క్రీన్పై ఎక్కడైనా నొక్కండి.\n"<ul><li>"• స్క్రోల్ చేయడానికి 2 లేదా అంతకంటే ఎక్కువ వేళ్లతో లాగండి"</li>\n<li>"• జూమ్ను సర్దుబాటు చేయడానికి 2 లేదా అంతకంటే ఎక్కువ వేళ్లను దగ్గరకు లేదా దూరానికి లాగండి"</li></ul>\n\n<b>"తాత్కాలికంగా జూమ్ చేయడానికి "</b>", మాగ్నిఫికేషన్ను ప్రారంభించి, తర్వాత స్క్రీన్ను ఎక్కడైనా తాకి & పట్టుకోండి.\n"<ul><li>"• స్క్రీన్ చుట్టూ కదలడానికి లాగండి"</li>\n<li>"• దూరంగా జూమ్ చేయడానికి వేలిని పైకి ఎత్తండి"</li></ul>\n\n"కీబోర్డ్లో లేదా నావిగేషన్ బార్లో మీరు దగ్గరగా జూమ్ చేయలేరు."</string>
+ <string name="accessibility_screen_magnification_navbar_summary" msgid="6700716275347612310">"మాగ్నిఫికేషన్ను ఆన్ చేసినప్పుడు, మీ స్క్రీన్పైన దగ్గరకు జూమ్ చేయవచ్చు.\n\n"<b>"జూమ్ చేయడానికి"</b>", మాగ్నిఫికేషన్ను ప్రారంభించి, తర్వాత స్క్రీన్పై ఎక్కడైనా నొక్కండి.\n"<ul><li>"స్క్రోల్ చేయడానికి 2 లేదా అంతకంటే ఎక్కువ వేళ్లతో లాగండి"</li>\n<li>"జూమ్ను సర్దుబాటు చేయడానికి 2 లేదా అంతకంటే ఎక్కువ వేళ్లను దగ్గరకు లేదా దూరానికి లాగండి"</li></ul>\n\n<b>"తాత్కాలికంగా జూమ్ చేయడానికి"</b>", మాగ్నిఫికేషన్ను ప్రారంభించి, తర్వాత స్క్రీన్ను ఎక్కడైనా తాకి & పట్టుకోండి.\n"<ul><li>"స్క్రీన్ పైన కదలడానికి లాగండి"</li>\n<li>"దూరంగా జూమ్ చేయడానికి వేలిని పైకి ఎత్తండి"</li></ul>\n\n"కీబోర్డ్లో లేదా నావిగేషన్ బార్లో మీరు దగ్గరగా జూమ్ చేయలేరు."</string>
<string name="accessibility_tutorial_dialog_title_button" msgid="3682222614034474845">"తెరవడానికి యాక్సెసిబిలిటీ బటన్ను ఉపయోగించండి"</string>
<string name="accessibility_tutorial_dialog_title_gesture" msgid="1342726230497913398">"తెరవడానికి సంజ్ఞను ఉపయోగించండి"</string>
<string name="accessibility_tutorial_dialog_title_gesture_settings" msgid="8539392614235820285">"కొత్త యాక్సెసిబిలిటీ సంజ్ఞను ఉపయోగించండి"</string>
@@ -2140,8 +2141,7 @@
<string name="accessibility_hearingaid_title" msgid="8312145423610648518">"వినికిడి పరికరాలు"</string>
<string name="accessibility_hearingaid_not_connected_summary" msgid="6240237523789614599">"వినికిడి పరికరాలను కనెక్ట్ చేయలేదు"</string>
<string name="accessibility_hearingaid_adding_summary" msgid="2947474468412309778">"వినికిడి మద్దతు ఉపకరణాలను జోడించండి"</string>
- <string name="accessibility_hearingaid_pair_instructions_first_message" msgid="3912093691643131154">"వినికిడి పరికరాలు జత చేయాలంటే, తర్వాతి స్క్రీన్లో మీ పరికరాన్ని కనుగొని, దాన్ని నొక్కండి."</string>
- <string name="accessibility_hearingaid_pair_instructions_second_message" msgid="5596683393607650243">"మీ వినికిడి పరికరాలు జత చేసే మోడ్లో ఉన్నట్లు నిర్ధారించుకోండి."</string>
+ <string name="accessibility_hearingaid_pair_instructions_message" msgid="3094382949733435414">"మీ వినికిడి పరికరాలు జత చేయాలంటే, తర్వాతి స్క్రీన్లో మీ పరికరాన్ని కనుగొని, దానిపై నొక్కండి. మీ వినికిడి పరికరాలు జత చేసే మోడ్లో ఉన్నట్లు నిర్ధారించుకోండి."</string>
<string name="accessibility_hearingaid_active_device_summary" msgid="3924362383258688984">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> యాక్టివ్గా ఉంది"</string>
<plurals name="show_number_hearingaid_count" formatted="false" msgid="3160782397139295486">
<item quantity="other"><xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> వినికిడి పరికరాలు సేవ్ చేయబడ్డాయి</item>
@@ -2490,7 +2490,6 @@
<string name="menu_stats_last_unplugged" msgid="5922246077592434526">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> వరకు చివరిగా అన్ప్లగ్ చేయబడినప్పుడు"</string>
<string name="menu_stats_total" msgid="8973377864854807854">"వినియోగ మొత్తాలు"</string>
<string name="menu_stats_refresh" msgid="1676215433344981075">"రిఫ్రెష్ చేయి"</string>
- <string name="process_kernel_label" msgid="3916858646836739323">"Android OS"</string>
<string name="process_mediaserver_label" msgid="6500382062945689285">"మీడియా సర్వర్"</string>
<string name="process_dex2oat_label" msgid="2592408651060518226">"అనువర్తన అనుకూలీకరణ"</string>
<string name="battery_saver" msgid="8172485772238572153">"బ్యాటరీ సేవర్"</string>
@@ -2621,8 +2620,6 @@
<string name="no_device_admins" msgid="4846602835339095768">"పరికర నిర్వాహకుల అనువర్తనాలు అందుబాటులో లేవు"</string>
<string name="personal_device_admin_title" msgid="2849617316347669861">"వ్యక్తిగతం"</string>
<string name="managed_device_admin_title" msgid="7853955652864478435">"కార్యాలయం"</string>
- <string name="sms_access_restriction_enabled" msgid="7054488078710530278">"SMS & కాల్ లాగ్ యాక్సెస్ను పరిమితం చేయండి"</string>
- <string name="sms_access_restriction_enabled_summary" msgid="6851339654677842328">"కేవలం డిఫాల్ట్ ఫోన్ మరియు సందేశ యాప్లు మాత్రమే SMS & లాగ్ అనుమతులను కలిగి ఉన్నాయి"</string>
<string name="no_trust_agents" msgid="7450273545568977523">"విశ్వసనీయ ఏజెంట్లు అందుబాటులో లేరు"</string>
<string name="add_device_admin_msg" msgid="1501847129819382149">"పరికర నిర్వాహకుల యాప్ను యాక్టివేట్ చేయాలా?"</string>
<string name="add_device_admin" msgid="4192055385312215731">"ఈ పరికరం నిర్వాహకుల యాప్ను యాక్టివేట్ చేయి"</string>
@@ -3111,7 +3108,7 @@
<string name="keywords_app_default" msgid="5822717006354487071">"దీనితో తెరువు"</string>
<string name="keywords_applications_settings" msgid="1268353611121497450">"అప్లికేషన్లు"</string>
<string name="keywords_time_zone" msgid="998254736898753085">"సమయ మండలి"</string>
- <string name="keywords_draw_overlay" msgid="4130899177619041842">"చాట్ హెడ్"</string>
+ <string name="keywords_draw_overlay" msgid="1001120206241401007">"చాట్ హెడ్, సిస్టమ్, హెచ్చరిక, విండో, డైలాగ్, ప్రదర్శన, ఇతర అగ్ర యాప్ల పైకి, లాగడం"</string>
<string name="keywords_flashlight" msgid="6161632177705233710">"ఫ్లాష్లైట్, లైట్, టార్చ్"</string>
<string name="keywords_change_wifi_state" msgid="627068244033681010">"wifi, wi-fi, టోగుల్, నియంత్రణ"</string>
<string name="keywords_more_mobile_networks" msgid="8995946622054642367">"సెల్యులార్, మొబైల్, సెల్ క్యారియర్, వైర్లెస్, డేటా, 4g, 3g, 2g, lte"</string>
@@ -3135,7 +3132,7 @@
<string name="keywords_sounds_and_notifications_interruptions" msgid="5426093074031208917">"ఆటంకం కలిగించవద్దు, అంతరాయం కలిగించు, అంతరాయం, విరామం"</string>
<string name="keywords_app" msgid="6334757056536837791">"RAM"</string>
<string name="keywords_location" msgid="4132655528196729043">"సమీపంలోని, స్థానం, చరిత్ర, నివేదించబడుతోంది, GPS"</string>
- <string name="keywords_accounts" msgid="1957925565953357627">"ఖాతా"</string>
+ <string name="keywords_accounts" msgid="4479029747403203867">"ఖాతా, ఖాతాను జోడించండి, కార్యాలయ ప్రొఫైల్"</string>
<string name="keywords_users" msgid="3434190133131387942">"పరిమితి, పరిమితం చేయి, పరిమితం చేయబడింది"</string>
<string name="keywords_keyboard_and_ime" msgid="9143339015329957107">"వచన దిద్దుబాటు, దిద్దుబాటు చేయి, ధ్వని, వైబ్రేట్, స్వయంచాలకం, భాష, సంజ్ఞ, సూచించు, సూచన, థీమ్, అభ్యంతరకరం, పదం, రకం, ఎమోజీ, అంతర్జాతీయం"</string>
<string name="keywords_reset_apps" msgid="5293291209613191845">"రీసెట్, ప్రాధాన్యతలు, డిఫాల్ట్"</string>
@@ -3173,6 +3170,7 @@
<string name="keywords_storage_settings" msgid="297283751968446577">"మెమరీ, కాష్, డేటా, తొలగించు, క్లియర్ చేయి, ఖాళీ, స్థలం"</string>
<string name="keywords_bluetooth_settings" msgid="6804844062789439858">"కనెక్ట్ అయింది, పరికరం, హెడ్ఫోన్లు, హెడ్సెట్, స్పీకర్, వైర్లెస్, జత చేయి, ఇయర్బడ్లు, సంగీతం, మీడియా"</string>
<string name="keywords_wallpaper" msgid="5058364390917429896">"నేపథ్యం, స్క్రీన్, లాక్స్క్రీన్, థీమ్"</string>
+ <string name="keywords_styles" msgid="5828725481814049422">"చిహ్నం ఆకారం, ముదురు రంగు, ఫాంట్"</string>
<string name="keywords_assist_input" msgid="5017533309492679287">"డిఫాల్ట్, అసిస్టెంట్"</string>
<string name="keywords_default_payment_app" msgid="3838565809518896799">"చెల్లింపు, డిఫాల్ట్"</string>
<string name="keywords_ambient_display" msgid="3103487805748659132">"ఇన్కమింగ్ నోటిఫికేషన్"</string>
@@ -3182,7 +3180,7 @@
<string name="keywords_notification_vibration" msgid="31924624421190547">"స్పర్శలు, వైబ్రేట్, సెన్సిటివిటీ"</string>
<string name="keywords_battery_saver_sticky" msgid="5586215686021650278">"బ్యాటరీ సేవర్, అనుబంధితం, స్థిరం, పవర్ సేవర్, బ్యాటరీ"</string>
<string name="keywords_battery_saver_schedule" msgid="7358789228486231944">"సాధారణ సమయం, షెడ్యూల్, బ్యాటరీ సేవర్, పవర్ సేవర్, బ్యాటరీ, ఆటోమేటిక్, శాతం"</string>
- <string name="keywords_add_an_account" msgid="6488139919428902434">"కార్యాలయ ప్రొఫైల్"</string>
+ <string name="keywords_enhance_4g_lte" msgid="2273810564244790859">"volte, అధునాతన కాలింగ్, 4g కాలింగ్"</string>
<string name="default_sound" msgid="8821684447333687810">"డిఫాల్ట్ ధ్వని"</string>
<string name="sound_settings_summary" msgid="4100853606668287965">"రింగ్ వాల్యూమ్ <xliff:g id="PERCENTAGE">%1$s</xliff:g> ఉంది"</string>
<string name="sound_dashboard_summary" msgid="3402435125958012986">"వాల్యూమ్, వైబ్రేషన్, అంతరాయం కలిగించవద్దు"</string>
@@ -3891,7 +3889,6 @@
<string name="permit_draw_overlay" msgid="7456536798718633432">"ఇతర యాప్ల ఎగువన కనిపించడానికి అనుమతించు"</string>
<string name="allow_overlay_description" msgid="8961670023925421358">"మీరు ఉపయోగించే ఇతర అనువర్తనాలలో ఎగువ భాగంలో కనిపించడం కోసం ఈ అనువర్తనాన్ని అనుమతించండి. మీరు ఆ అనువర్తనాలను ఉపయోగించే సమయంలో ఇది అంతరాయం కలిగించవచ్చు లేదా అవి కనిపించే లేదా ప్రవర్తించే తీరును మార్చవచ్చు."</string>
<string name="keywords_vr_listener" msgid="7441221822576384680">"vr వర్చువల్ రియాలిటీ పరిశీలన స్టీరియో సహాయకం సేవ"</string>
- <string name="keywords_system_alert_window" msgid="5049498015597864850">"సిస్టమ్ హెచ్చరిక విండో డైలాగ్ని ఇతర అనువర్తనాల ఎగువన చూపు"</string>
<string name="overlay_settings" msgid="6930854109449524280">"ఇతర యాప్ల పైన ప్రదర్శన"</string>
<string name="system_alert_window_summary" msgid="602892301318324492">"<xliff:g id="COUNT_1">%2$d</xliff:g>లో <xliff:g id="COUNT_0">%1$d</xliff:g> యాప్లు ఇతర యాప్ల ఎగువన కనిపించడానికి అనుమతించబడ్డాయి"</string>
<string name="filter_overlay_apps" msgid="6965969283342557573">"అనుమతి ఉన్న అనువర్తనాలు"</string>
@@ -4127,7 +4124,6 @@
<string name="notification_log_details_none" msgid="184131801230614059">"ఏదీ లేదు"</string>
<string name="notification_log_details_ranking_null" msgid="244660392058720919">"ర్యాంకింగ్ ఆబ్జెక్ట్ లేదు."</string>
<string name="notification_log_details_ranking_none" msgid="599607025882587844">"ర్యాంకింగ్ ఆబ్జెక్ట్లో ఈ కీ లేదు."</string>
- <string name="theme_customization_category" msgid="1049181544004163283">"థీమ్ సెట్ చేయబడుతుంది"</string>
<string name="theme_customization_device_default" msgid="5058147707906551368">"పరికర డిఫాల్ట్"</string>
<string name="display_cutout_emulation" msgid="7466869822418376317">"డిస్ప్లే కట్అవుట్"</string>
<string name="display_cutout_emulation_keywords" msgid="4495418317471622562">"ప్రదర్శన కట్అవుట్, నాచ్"</string>
@@ -4553,6 +4549,8 @@
<string name="network_connection_errorstate_dialog_message" msgid="6953778550775646710">"ఏదో తప్పు జరిగింది. ఈ అప్లికేషన్ పరికరాన్ని ఎంచుకునే అభ్యర్థనని రద్దు చేసింది."</string>
<string name="network_connection_connect_successful" msgid="5935510954474494928">"విజయవంతంగా కనెక్ట్ చేయబడింది"</string>
<string name="network_connection_request_dialog_showall" msgid="6938922880244567521">"అన్నింటినీ చూపు"</string>
+ <string name="network_connection_searching_message" msgid="4638576789450817530">"పరికరం కోసం వెతుకుతోంది..."</string>
+ <string name="network_connection_connecting_message" msgid="3740982406609245654">"పరికరానికి కనెక్ట్ చేస్తోంది..."</string>
<plurals name="show_bluetooth_devices" formatted="false" msgid="1715020480026568408">
<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>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index 947fa7a..6a124e2 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -360,8 +360,6 @@
<string name="security_enable_widgets_disabled_summary" msgid="6392489775303464905">"ปิดใช้โดยผู้ดูแลระบบ"</string>
<string name="lockdown_settings_title" msgid="7393790212603280213">"แสดงตัวเลือกการปิดล็อก"</string>
<string name="lockdown_settings_summary" msgid="4359438673563318171">"แสดงตัวเลือกปุ่มเปิด/ปิดที่จะปิด Smart Lock การปลดล็อกด้วยข้อมูลไบโอเมตริก และการแจ้งเตือนในหน้าจอล็อก"</string>
- <string name="trust_agents_extend_unlock_title" msgid="2796555263565097031">"เอเจนต์ความน่าเชื่อถือขยายเฉพาะการปลดล็อก"</string>
- <string name="trust_agents_extend_unlock_summary" msgid="3976344969220255010">"หากเปิดใช้ เอเจนต์ความน่าเชื่อถือจะปลดล็อกอุปกรณ์ค้างไว้นานขึ้น แต่จะปลดล็อกอุปกรณ์ที่ล็อกอยู่ไม่ได้อีกต่อไป"</string>
<string name="trust_lost_locks_screen_title" msgid="2992742466966021682">"หน้าจอล็อกเมื่อสภาพแวดล้อมไม่น่าเชื่อถือ"</string>
<string name="trust_lost_locks_screen_summary" msgid="693784434582021206">"หากเปิดใช้ อุปกรณ์จะล็อกเมื่อเอเจนต์ความน่าเชื่อถือล่าสุดเห็นว่าสภาพแวดล้อมไม่น่าเชื่อถือ"</string>
<string name="owner_info_settings_summary" msgid="7472393443779227052">"ไม่มี"</string>
@@ -937,6 +935,7 @@
<string name="wifi_eap_identity" msgid="4359453783379679103">"ข้อมูลระบุตัวตน"</string>
<string name="wifi_eap_anonymous" msgid="2989469344116577955">"ตัวตนที่ไม่ระบุชื่อ"</string>
<string name="wifi_password" msgid="5948219759936151048">"รหัสผ่าน"</string>
+ <string name="wifi_sae_password_id" msgid="1697832722221765763">"ตัวระบุรหัสผ่าน SAE"</string>
<string name="wifi_show_password" msgid="6461249871236968884">"แสดงรหัสผ่าน"</string>
<string name="wifi_ap_band_config" msgid="1611826705989117930">"เลือกย่านความถี่ AP"</string>
<string name="wifi_ap_choose_auto" msgid="2677800651271769965">"อัตโนมัติ"</string>
@@ -957,7 +956,6 @@
<string name="wifi_dpp_share_wifi" msgid="9065890131734833809">"แชร์ Wi‑Fi"</string>
<string name="wifi_dpp_scan_qr_code_with_another_device" msgid="5854392840857123065">"สแกนโค้ด QR นี้เพื่อเชื่อมต่อกับ “<xliff:g id="SSID">%1$s</xliff:g>” และแชร์รหัสผ่าน"</string>
<string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="4436318319178361543">"สแกนโค้ด QR นี้เพื่อเชื่อมต่อกับ “<xliff:g id="SSID">%1$s</xliff:g>”"</string>
- <string name="wifi_dpp_could_not_detect_valid_qr_code" msgid="641893675646330576">"อ่านโค้ด QR ไม่ได้ เล็งให้โค้ดอยู่กึ่งกลางอีกครั้งแล้วลองใหม่"</string>
<string name="wifi_dpp_failure_authentication_or_configuration" msgid="3372757783382381044">"ลองอีกครั้ง หากยังแก้ปัญหาไม่ได้ ให้ติดต่อผู้ผลิตอุปกรณ์"</string>
<string name="wifi_dpp_failure_not_compatible" msgid="2829930473520603740">"มีข้อผิดพลาดเกิดขึ้น"</string>
<string name="wifi_dpp_failure_timeout" msgid="5228320772245820458">"ตรวจสอบว่าได้เสียบปลั๊ก ชาร์จ และเปิดอุปกรณ์แล้ว"</string>
@@ -980,6 +978,7 @@
<string name="wifi_dpp_hotspot_password" msgid="4120419278831581613">"รหัสผ่านฮอตสปอต: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
<string name="wifi_dpp_add_device" msgid="4072206063308645677">"เพิ่มอุปกรณ์"</string>
<string name="wifi_dpp_connect_network_using_qr_code" msgid="3887335309163999665">"ใช้คิวอาร์โค้ดเพื่อเพิ่มอุปกรณ์ในเครือข่ายนี้"</string>
+ <string name="wifi_dpp_qr_code_is_not_valid_format" msgid="3700087439867692944">"คิวอาร์โค้ดมีรูปแบบไม่ถูกต้อง"</string>
<string name="retry" msgid="6472609612090877557">"ลองอีกครั้ง"</string>
<string name="wifi_shared" msgid="844142443226926070">"แชร์กับผู้ใช้อุปกรณ์คนอื่นๆ"</string>
<string name="wifi_unchanged" msgid="3410422020930397102">"(ไม่เปลี่ยน)"</string>
@@ -1129,6 +1128,7 @@
<string name="emergency_address_title" msgid="932729250447887545">"ที่อยู่ฉุกเฉิน"</string>
<string name="emergency_address_summary" msgid="7751971156196115129">"ใช้เป็นตำแหน่งของคุณเมื่อโทรหาหมายเลขฉุกเฉินผ่าน Wi-Fi"</string>
<string name="private_dns_help_message" msgid="3299567069152568958"><annotation id="url">"ดูข้อมูลเพิ่มเติม"</annotation>"เกี่ยวกับฟีเจอร์ของ DNS ส่วนตัว"</string>
+ <string name="private_dns_mode_on" msgid="5882613439541371003">"เปิด"</string>
<string name="wifi_calling_pref_managed_by_carrier" msgid="6845711858866828986">"การตั้งค่าที่จัดการโดยผู้ให้บริการ"</string>
<string name="wifi_calling_settings_activation_instructions" msgid="7492509632478260955">"เปิดใช้งานการโทรผ่าน Wi-Fi"</string>
<string name="wifi_calling_turn_on" msgid="1171403510313983983">"เปิดการโทรผ่าน Wi-Fi"</string>
@@ -1872,7 +1872,7 @@
<string name="default_emergency_app" msgid="1951760659640369980">"แอปฉุกเฉิน"</string>
<string name="reset_app_preferences" msgid="1321050641018356925">"รีเซ็ตค่ากำหนดแอป"</string>
<string name="reset_app_preferences_title" msgid="6093179367325336662">"รีเซ็ตค่ากำหนดแอปไหม"</string>
- <string name="reset_app_preferences_desc" msgid="4822447731869201512">"การดำเนินการนี้จะรีเซ็ตค่ากำหนดทั้งหมดสำหรับ:\n\n"<li>"แอปที่ปิดใช้งาน"</li>\n<li>"การแจ้งเตือนแอปที่ปิดใช้งาน"</li>\n<li>"แอปพลิเคชันเริ่มต้นสำหรับการทำงานต่างๆ"</li>\n<li>"ข้อจำกัดข้อมูลในพื้นหลังสำหรับแอป"</li>\n<li>"ข้อจำกัดสิทธิ์ใดๆ"</li>\n\n"ข้อมูลของแอปจะไม่หายไป"</string>
+ <string name="reset_app_preferences_desc" msgid="731757609326016760">"คำสั่งนี้จะรีเซ็ตค่ากำหนดทั้งหมดของรายการต่อไปนี้\n\n"<li>"แอปที่ปิดใช้"</li>\n<li>"การแจ้งเตือนของแอปที่ปิดใช้"</li>\n<li>"แอปพลิเคชันเริ่มต้นสำหรับการทำงานต่างๆ"</li>\n<li>"การจำกัดอินเทอร์เน็ตที่ใช้งานอยู่เบื้องหลังของแอป"</li>\n<li>"การจำกัดสิทธิ์ใดๆ"</li>\n\n"ทั้งนี้ข้อมูลแอปจะไม่หายไป"</string>
<string name="reset_app_preferences_button" msgid="2559089511841281242">"รีเซ็ตแอป"</string>
<string name="manage_space_text" msgid="8852711522447794676">"จัดการพื้นที่"</string>
<string name="filter" msgid="2018011724373033887">"ตัวกรอง"</string>
@@ -2087,7 +2087,7 @@
<string name="accessibility_screen_magnification_short_summary" msgid="3411979839172752057">"แตะ 3 ครั้งเพื่อซูม"</string>
<string name="accessibility_screen_magnification_navbar_short_summary" msgid="3693116360267980492">"แตะปุ่มเพื่อซูม"</string>
<string name="accessibility_screen_magnification_summary" msgid="5258868553337478505"><b>"หากต้องการซูม"</b>" ให้แตะหน้าจอ 3 ครั้งเร็วๆ\n"<ul><li>"ลากนิ้ว 2 นิ้วหรือมากกว่าเพื่อเลื่อน"</li>\n<li>"บีบนิ้ว 2 นิ้วหรือมากกว่าเพื่อปรับการซูม"</li></ul>\n\n<b>"หากต้องการซูมชั่วคราว"</b>" ให้แตะหน้าจอ 3 ครั้งเร็วๆ และกดนิ้วค้างไว้ขณะแตะครั้งที่ 3\n"<ul><li>"ลากเพื่อเลื่อนไปยังส่วนต่างๆ ของหน้าจอ"</li>\n<li>"ยกนิ้วเพื่อซูมออก"</li></ul>\n\n"คุณไม่สามารถซูมเข้าในแป้นพิมพ์และแถบการนำทาง"</string>
- <string name="accessibility_screen_magnification_navbar_summary" msgid="2272878354599332009">"คุณจะซูมหน้าจอเข้าได้เมื่อเปิดการขยาย\n\n"<b>"วิธีซูมคือ"</b>" เริ่มการขยาย จากนั้นแตะบริเวณที่ต้องการซูมในหน้าจอ\n"<ul><li>"• ลากนิ้วอย่างน้อย 2 นิ้วเพื่อเลื่อน"</li>\n<li>"• บีบนิ้วอย่างน้อย 2 นิ้วเพื่อปรับการซูม"</li></ul>\n\n<b>"วิธีซูมชั่วคราวคือ"</b>" เริ่มการขยาย จากนั้นแตะบริเวณที่ต้องการซูมในหน้าจอค้างไว้\n"<ul><li>"• ลากเพื่อไปยังส่วนต่างๆ ในหน้าจอ"</li>\n<li>"• ยกนิ้วขึ้นเพื่อซูมออก"</li></ul>\n\n"คุณซูมเข้าโดยใช้แป้นพิมพ์หรือแถบนำทางไม่ได้"</string>
+ <string name="accessibility_screen_magnification_navbar_summary" msgid="6700716275347612310">"คุณจะซูมหน้าจอเข้าได้เมื่อเปิดการขยาย\n\n"<b>"วิธีซูมคือ"</b>" เริ่มการขยาย จากนั้นแตะบริเวณที่ต้องการซูมในหน้าจอ\n"<ul><li>"ลากนิ้วอย่างน้อย 2 นิ้วเพื่อเลื่อน"</li>\n<li>"บีบนิ้วอย่างน้อย 2 นิ้วเพื่อปรับการซูม"</li></ul>\n\n<b>"วิธีซูมชั่วคราวคือ"</b>" เริ่มการขยาย จากนั้นแตะบริเวณที่ต้องการซูมในหน้าจอค้างไว้\n"<ul><li>"ลากเพื่อไปยังส่วนต่างๆ ในหน้าจอ"</li>\n<li>"ยกนิ้วขึ้นเพื่อซูมออก"</li></ul>\n\n"คุณซูมเข้าโดยใช้แป้นพิมพ์หรือแถบนำทางไม่ได้"</string>
<string name="accessibility_tutorial_dialog_title_button" msgid="3682222614034474845">"ใช้ปุ่มการช่วยเหลือพิเศษเพื่อเปิด"</string>
<string name="accessibility_tutorial_dialog_title_gesture" msgid="1342726230497913398">"ใช้ท่าทางสัมผัสเพื่อเปิด"</string>
<string name="accessibility_tutorial_dialog_title_gesture_settings" msgid="8539392614235820285">"ใช้ท่าทางสัมผัสการช่วยเหลือพิเศษแบบใหม่"</string>
@@ -2140,8 +2140,7 @@
<string name="accessibility_hearingaid_title" msgid="8312145423610648518">"เครื่องช่วยการได้ยิน"</string>
<string name="accessibility_hearingaid_not_connected_summary" msgid="6240237523789614599">"ไม่ได้เชื่อมต่อเครื่องช่วยการได้ยิน"</string>
<string name="accessibility_hearingaid_adding_summary" msgid="2947474468412309778">"เพิ่มเครื่องช่วยการได้ยิน"</string>
- <string name="accessibility_hearingaid_pair_instructions_first_message" msgid="3912093691643131154">"หากต้องการจับคู่กับเครื่องช่วยการได้ยิน ให้ค้นหาและแตะอุปกรณ์ในหน้าจอถัดไป"</string>
- <string name="accessibility_hearingaid_pair_instructions_second_message" msgid="5596683393607650243">"ตรวจสอบว่าเครื่องช่วยการได้ยินอยู่ในโหมดการจับคู่"</string>
+ <string name="accessibility_hearingaid_pair_instructions_message" msgid="3094382949733435414">"หากต้องการจับคู่กับเครื่องช่วยฟัง ให้ค้นหาและแตะอุปกรณ์ในหน้าจอถัดไป ตรวจสอบว่าเครื่องช่วยฟังอยู่ในโหมดการจับคู่"</string>
<string name="accessibility_hearingaid_active_device_summary" msgid="3924362383258688984">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ใช้งานอยู่"</string>
<plurals name="show_number_hearingaid_count" formatted="false" msgid="3160782397139295486">
<item quantity="other">บันทึกเครื่องช่วยการได้ยิน <xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> เครื่องแล้ว</item>
@@ -2490,7 +2489,6 @@
<string name="menu_stats_last_unplugged" msgid="5922246077592434526">"การใช้งานตั้งแต่ถอดปลั๊กของ <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
<string name="menu_stats_total" msgid="8973377864854807854">"ยอดใช้งานรวม"</string>
<string name="menu_stats_refresh" msgid="1676215433344981075">"รีเฟรช"</string>
- <string name="process_kernel_label" msgid="3916858646836739323">"ระบบปฏิบัติการ Android"</string>
<string name="process_mediaserver_label" msgid="6500382062945689285">"Mediaserver"</string>
<string name="process_dex2oat_label" msgid="2592408651060518226">"การเพิ่มประสิทธิภาพแอป"</string>
<string name="battery_saver" msgid="8172485772238572153">"โหมดประหยัดแบตเตอรี่"</string>
@@ -2621,8 +2619,6 @@
<string name="no_device_admins" msgid="4846602835339095768">"ไม่มีแอปดูแลอุปกรณ์ที่พร้อมใช้งาน"</string>
<string name="personal_device_admin_title" msgid="2849617316347669861">"ส่วนตัว"</string>
<string name="managed_device_admin_title" msgid="7853955652864478435">"ที่ทำงาน"</string>
- <string name="sms_access_restriction_enabled" msgid="7054488078710530278">"จำกัดการเข้าถึง SMS และประวัติการโทร"</string>
- <string name="sms_access_restriction_enabled_summary" msgid="6851339654677842328">"เฉพาะแอปโทรศัพท์และแอปรับส่งข้อความเริ่มต้นเท่านั้นที่มีสิทธิ์เข้าถึง SMS และประวัติการโทร"</string>
<string name="no_trust_agents" msgid="7450273545568977523">"ไม่มีเอเจนต์ความน่าเชื่อถือ"</string>
<string name="add_device_admin_msg" msgid="1501847129819382149">"เปิดใช้งานแอปผู้ดูแลระบบอุปกรณ์ไหม"</string>
<string name="add_device_admin" msgid="4192055385312215731">"เปิดใช้งานแอปผู้ดูแลระบบอุปกรณ์นี้"</string>
@@ -3111,7 +3107,7 @@
<string name="keywords_app_default" msgid="5822717006354487071">"เปิดด้วย"</string>
<string name="keywords_applications_settings" msgid="1268353611121497450">"แอปพลิเคชัน"</string>
<string name="keywords_time_zone" msgid="998254736898753085">"เขตเวลา"</string>
- <string name="keywords_draw_overlay" msgid="4130899177619041842">"ส่วนหัวของแชท"</string>
+ <string name="keywords_draw_overlay" msgid="1001120206241401007">"ส่วนหัวของแชท ระบบ การแจ้งเตือน หน้าต่าง กล่องโต้ตอบ การแสดงผล ทับแอปอื่นๆ วาด"</string>
<string name="keywords_flashlight" msgid="6161632177705233710">"ไฟฉาย ไฟ แฟลช"</string>
<string name="keywords_change_wifi_state" msgid="627068244033681010">"wifi, wi-fi, สลับ, การควบคุม"</string>
<string name="keywords_more_mobile_networks" msgid="8995946622054642367">"มือถือ, อุปกรณ์เคลื่อนที่, ผู้ให้บริการมือถือ, ไร้สาย, เน็ต, 4g, 3g, 2g, lte"</string>
@@ -3135,7 +3131,7 @@
<string name="keywords_sounds_and_notifications_interruptions" msgid="5426093074031208917">"ห้าม อย่ารบกวน, แทรก, การรบกวน, การพัก"</string>
<string name="keywords_app" msgid="6334757056536837791">"RAM"</string>
<string name="keywords_location" msgid="4132655528196729043">"ใกล้เคียง, ประวัติตำแหน่ง, การรายงาน, GPS"</string>
- <string name="keywords_accounts" msgid="1957925565953357627">"บัญชี"</string>
+ <string name="keywords_accounts" msgid="4479029747403203867">"บัญชี, เพิ่มบัญชี, โปรไฟล์งาน"</string>
<string name="keywords_users" msgid="3434190133131387942">"การจำกัด, จำกัด, ถูกจำกัด"</string>
<string name="keywords_keyboard_and_ime" msgid="9143339015329957107">"การแก้ไขข้อความ, แก้ไข, เสียง, สั่น, อัตโนมัติ, ภาษา, ท่าทางสัมผัส, แนะนำ, คำแนะนำ, ธีม, คำที่ไม่เหมาะสม, พิมพ์, อีโมจิ, นานาชาติ"</string>
<string name="keywords_reset_apps" msgid="5293291209613191845">"รีเซ็ต, ค่ากำหนด, ค่าเริ่มต้น"</string>
@@ -3173,6 +3169,7 @@
<string name="keywords_storage_settings" msgid="297283751968446577">"หน่วยความจำ แคช ข้อมูล ลบ ล้าง เพิ่มพื้นที่ว่าง พื้นที่"</string>
<string name="keywords_bluetooth_settings" msgid="6804844062789439858">"เชื่อมต่อแล้ว, อุปกรณ์, หูฟัง, ชุดหูฟัง, ลำโพง, ไร้สาย, จับคู่, หูฟังเอียร์บัด, เพลง, สื่อ"</string>
<string name="keywords_wallpaper" msgid="5058364390917429896">"พื้นหลัง, หน้าจอ, หน้าจอล็อก, ธีม"</string>
+ <string name="keywords_styles" msgid="5828725481814049422">"รูปร่างไอคอน, สีเฉพาะจุด, แบบอักษร"</string>
<string name="keywords_assist_input" msgid="5017533309492679287">"ค่าเริ่มต้น, ผู้ช่วย"</string>
<string name="keywords_default_payment_app" msgid="3838565809518896799">"การชำระเงิน, ค่าเริ่มต้น"</string>
<string name="keywords_ambient_display" msgid="3103487805748659132">"การแจ้งเตือนเข้ามาใหม่"</string>
@@ -3182,7 +3179,7 @@
<string name="keywords_notification_vibration" msgid="31924624421190547">"ระบบสัมผัส, สั่น, ความไว"</string>
<string name="keywords_battery_saver_sticky" msgid="5586215686021650278">"โหมดประหยัดแบตเตอรี่ ตลอด สม่ำเสมอ โหมดประหยัดพลังงาน แบตเตอรี่"</string>
<string name="keywords_battery_saver_schedule" msgid="7358789228486231944">"กิจวัตร, ตั้งเวลา, โหมดประหยัดแบตเตอรี่, โหมดประหยัดพลังงาน, แบตเตอรี่, อัตโนมัติ, เปอร์เซ็นต์"</string>
- <string name="keywords_add_an_account" msgid="6488139919428902434">"โปรไฟล์งาน"</string>
+ <string name="keywords_enhance_4g_lte" msgid="2273810564244790859">"VoLTE, การโทรขั้นสูง, การโทรผ่าน 4g"</string>
<string name="default_sound" msgid="8821684447333687810">"เสียงเริ่มต้น"</string>
<string name="sound_settings_summary" msgid="4100853606668287965">"ระดับเสียงเรียกเข้าที่ <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
<string name="sound_dashboard_summary" msgid="3402435125958012986">"ระดับเสียง การสั่น ห้ามรบกวน"</string>
@@ -3889,7 +3886,6 @@
<string name="permit_draw_overlay" msgid="7456536798718633432">"อนุญาตให้แสดงทับแอปอื่นๆ"</string>
<string name="allow_overlay_description" msgid="8961670023925421358">"อนุญาตให้แอปนี้แสดงทับแอปอื่นๆ ที่คุณกำลังใช้อยู่ ซึ่งอาจรบกวนการใช้งานแอปเหล่านั้นหรือเปลี่ยนรูปลักษณ์หรือการทำงานตามที่ควรเป็น"</string>
<string name="keywords_vr_listener" msgid="7441221822576384680">"VR Virtual Reality Listener บริการตัวช่วยสเตอริโอ"</string>
- <string name="keywords_system_alert_window" msgid="5049498015597864850">"แสดงหน้าต่างแจ้งเตือนของระบบทับแอปอื่นๆ"</string>
<string name="overlay_settings" msgid="6930854109449524280">"แสดงทับแอปอื่นๆ"</string>
<string name="system_alert_window_summary" msgid="602892301318324492">"<xliff:g id="COUNT_0">%1$d</xliff:g> จาก <xliff:g id="COUNT_1">%2$d</xliff:g> แอปได้รับอนุญาตให้แสดงทับแอปอื่นๆ"</string>
<string name="filter_overlay_apps" msgid="6965969283342557573">"แอปที่มีสิทธิ์"</string>
@@ -4125,7 +4121,6 @@
<string name="notification_log_details_none" msgid="184131801230614059">"ไม่มี"</string>
<string name="notification_log_details_ranking_null" msgid="244660392058720919">"ไม่มีวัตถุการจัดอันดับ"</string>
<string name="notification_log_details_ranking_none" msgid="599607025882587844">"วัตถุการจัดอันดับไม่มีคีย์นี้"</string>
- <string name="theme_customization_category" msgid="1049181544004163283">"ธีม"</string>
<string name="theme_customization_device_default" msgid="5058147707906551368">"ค่าเริ่มต้นของอุปกรณ์"</string>
<string name="display_cutout_emulation" msgid="7466869822418376317">"คัตเอาท์ดิสเพลย์"</string>
<string name="display_cutout_emulation_keywords" msgid="4495418317471622562">"คัตเอาท์ดิสเพลย์"</string>
@@ -4551,6 +4546,8 @@
<string name="network_connection_errorstate_dialog_message" msgid="6953778550775646710">"เกิดข้อผิดพลาด แอปพลิเคชันยกเลิกคำขอเลือกอุปกรณ์"</string>
<string name="network_connection_connect_successful" msgid="5935510954474494928">"เชื่อมต่อสำเร็จ"</string>
<string name="network_connection_request_dialog_showall" msgid="6938922880244567521">"แสดงทั้งหมด"</string>
+ <string name="network_connection_searching_message" msgid="4638576789450817530">"กำลังค้นหาอุปกรณ์…"</string>
+ <string name="network_connection_connecting_message" msgid="3740982406609245654">"กำลังเชื่อมต่ออุปกรณ์…"</string>
<plurals name="show_bluetooth_devices" formatted="false" msgid="1715020480026568408">
<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>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index 984ce9e..7487422 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -360,8 +360,6 @@
<string name="security_enable_widgets_disabled_summary" msgid="6392489775303464905">"Na-disable ng admin"</string>
<string name="lockdown_settings_title" msgid="7393790212603280213">"Ipakita ang opsyong lockdown"</string>
<string name="lockdown_settings_summary" msgid="4359438673563318171">"Ipakita ang opsyong power button na nag-o-off ng Smart Lock, pag-unlock gamit ang biometrics, at mga notification sa lock screen"</string>
- <string name="trust_agents_extend_unlock_title" msgid="2796555263565097031">"Extend unlock para lang sa trust agent"</string>
- <string name="trust_agents_extend_unlock_summary" msgid="3976344969220255010">"Kung naka-enable, pananatilihin ng mga trust agent na mas matagal na naka-unlock ang iyong device, ngunit hindi na makakapag-unlock ng naka-lock na device."</string>
<string name="trust_lost_locks_screen_title" msgid="2992742466966021682">"I-lock ang screen kapag nawala ang trust"</string>
<string name="trust_lost_locks_screen_summary" msgid="693784434582021206">"Kung naka-enable, mala-lock ang device kapag nawalan ng trust ang huling trust agent"</string>
<string name="owner_info_settings_summary" msgid="7472393443779227052">"Wala"</string>
@@ -937,6 +935,7 @@
<string name="wifi_eap_identity" msgid="4359453783379679103">"Pagkakilanlan"</string>
<string name="wifi_eap_anonymous" msgid="2989469344116577955">"Anonymous na pagkakakilanlan"</string>
<string name="wifi_password" msgid="5948219759936151048">"Password"</string>
+ <string name="wifi_sae_password_id" msgid="1697832722221765763">"Identifier ng password ng SAE"</string>
<string name="wifi_show_password" msgid="6461249871236968884">"Ipakita ang password"</string>
<string name="wifi_ap_band_config" msgid="1611826705989117930">"Pumili ng AP Band"</string>
<string name="wifi_ap_choose_auto" msgid="2677800651271769965">"Awtomatiko"</string>
@@ -957,7 +956,6 @@
<string name="wifi_dpp_share_wifi" msgid="9065890131734833809">"Ibahagi ang Wi‑Fi"</string>
<string name="wifi_dpp_scan_qr_code_with_another_device" msgid="5854392840857123065">"I-scan ang QR code na ito para kumonekta sa “<xliff:g id="SSID">%1$s</xliff:g>” at ibahagi ang password"</string>
<string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="4436318319178361543">"I-scan ang QR code na ito para kumonekta sa “<xliff:g id="SSID">%1$s</xliff:g>”"</string>
- <string name="wifi_dpp_could_not_detect_valid_qr_code" msgid="641893675646330576">"Hindi mabasa ang QR code. Igitna ulit ang code at subukang muli"</string>
<string name="wifi_dpp_failure_authentication_or_configuration" msgid="3372757783382381044">"Subukang muli. Kung magpatuloy ang isyu, makipag-ugnayan sa manufacturer ng device"</string>
<string name="wifi_dpp_failure_not_compatible" msgid="2829930473520603740">"Nagkaproblema"</string>
<string name="wifi_dpp_failure_timeout" msgid="5228320772245820458">"Tiyaking nakasaksak ang device, may charge, at naka-on"</string>
@@ -980,6 +978,7 @@
<string name="wifi_dpp_hotspot_password" msgid="4120419278831581613">"Password ng hotspot: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
<string name="wifi_dpp_add_device" msgid="4072206063308645677">"Magdagdag ng device"</string>
<string name="wifi_dpp_connect_network_using_qr_code" msgid="3887335309163999665">"Gumamit ng QR code para makapagdagdag ng device sa network na ito"</string>
+ <string name="wifi_dpp_qr_code_is_not_valid_format" msgid="3700087439867692944">"Hindi valid na format ang QR code"</string>
<string name="retry" msgid="6472609612090877557">"Subukang Muli"</string>
<string name="wifi_shared" msgid="844142443226926070">"Ibahagi sa iba pang mga user ng device"</string>
<string name="wifi_unchanged" msgid="3410422020930397102">"(di-nabago)"</string>
@@ -1129,6 +1128,7 @@
<string name="emergency_address_title" msgid="932729250447887545">"Pang-emergency na Address"</string>
<string name="emergency_address_summary" msgid="7751971156196115129">"Ginagamit bilang iyong lokasyon kapag nagsagawa ka ng pang-emergency na tawag sa pamamagitan ng Wi‑Fi"</string>
<string name="private_dns_help_message" msgid="3299567069152568958"><annotation id="url">"Matuto pa"</annotation>" tungkol sa mga feature ng Pribadong DNS"</string>
+ <string name="private_dns_mode_on" msgid="5882613439541371003">"Naka-on"</string>
<string name="wifi_calling_pref_managed_by_carrier" msgid="6845711858866828986">"Pinamamahalaan ng carrier ang setting"</string>
<string name="wifi_calling_settings_activation_instructions" msgid="7492509632478260955">"I-activate ang Pagtawag gamit ang Wi-Fi"</string>
<string name="wifi_calling_turn_on" msgid="1171403510313983983">"I-on ang pagtawag gamit ang Wi-Fi"</string>
@@ -1872,7 +1872,7 @@
<string name="default_emergency_app" msgid="1951760659640369980">"Emergency app"</string>
<string name="reset_app_preferences" msgid="1321050641018356925">"I-reset ang kagustuhan sa app"</string>
<string name="reset_app_preferences_title" msgid="6093179367325336662">"I-reset ang gusto sa app?"</string>
- <string name="reset_app_preferences_desc" msgid="4822447731869201512">"Ire-reset nito ang lahat ng kagustuhan para sa:\n\n"<li>"Mga naka-disable na app"</li>\n<li>"Mga naka-disable na notification ng app"</li>\n<li>"Mga default na application para sa mga pagkilos"</li>\n<li>"Mga paghihigpit sa data sa background para sa mga app"</li>\n<li>"Anumang mga paghihigpit sa pahintulot"</li>\n\n"Hindi ka mawawalan ng anumang data ng app."</string>
+ <string name="reset_app_preferences_desc" msgid="731757609326016760">"Ire-reset nito ang lahat ng kagustuhan para sa:\n\n"<li>"Mga naka-disable na app"</li>\n<li>"Mga naka-disable na notification ng app"</li>\n<li>"Mga default na application para sa mga pagkilos"</li>\n<li>"Mga paghihigpit sa data ng background para sa mga app"</li>\n<li>"Anumang paghihigpit sa pahintulot"</li>\n\n"Hindi ka mawawalan ng anumang data ng app."</string>
<string name="reset_app_preferences_button" msgid="2559089511841281242">"I-reset ang apps"</string>
<string name="manage_space_text" msgid="8852711522447794676">"Pamahalaan ang espasyo"</string>
<string name="filter" msgid="2018011724373033887">"I-filter"</string>
@@ -2087,7 +2087,7 @@
<string name="accessibility_screen_magnification_short_summary" msgid="3411979839172752057">"Mag-tap nang 3 beses upang mag-zoom"</string>
<string name="accessibility_screen_magnification_navbar_short_summary" msgid="3693116360267980492">"Mag-tap ng button upang mag-zoom"</string>
<string name="accessibility_screen_magnification_summary" msgid="5258868553337478505"><b>"Upang mag-zoom"</b>", mabilisang i-tap ang screen nang 3 beses.\n"<ul><li>"I-drag ang 2 o higit pang daliri upang mag-scroll"</li>\n<li>"I-pinch ang 2 o higit pang daliri upang isaayos ang zoom"</li></ul>\n\n<b>"Upang mag-zoom pansamantala"</b>", mabilisang i-tap ang screen nang 3 beses at pumindot nang matagal sa pangatlong pag-tap.\n"<ul><li>"Mag-drag upang gumalaw-galaw sa screen"</li>\n<li>"Iangat ang iyong daliri upang mag-zoom out"</li></ul>\n\n"Hindi ka maaaring mag-zoom in sa keyboard at navigation bar."</string>
- <string name="accessibility_screen_magnification_navbar_summary" msgid="2272878354599332009">"Kapag naka-on ang pag-magnify, makakapag-zoom in ka sa iyong screen.\n\n"<b>"Para mag-zoom"</b>", simulan ang pag-magnify, pagkatapos ay mag-tap kahit saan sa screen.\n"<ul><li>"• Mag-drag ng 2 o higit pang daliri para mag-scroll"</li>\n<li>"• Mag-pinch ng 2 o higit pang daliri para i-adjust ang zoom"</li></ul>\n\n<b>"Para pansamantalang mag-zoom"</b>", simulan ang pag-magnify, pagkatapos ay pumindot nang matagal kahit saan sa screen.\n"<ul><li>"• Mag-drag para mag-navigate sa screen"</li>\n<li>"• Iangat ang daliri para mag-zoom out"</li></ul>\n\n"Hindi ka puwedeng mag-zoom in sa keyboard o navigation bar."</string>
+ <string name="accessibility_screen_magnification_navbar_summary" msgid="6700716275347612310">"Kapag naka-on ang pag-magnify, makakapag-zoom in ka sa iyong screen.\n\n"<b>"Para mag-zoom"</b>", simulan ang pag-magnify, pagkatapos ay mag-tap kahit saan sa screen.\n"<ul><li>"Mag-drag ng 2 o higit pang daliri para mag-scroll"</li>\n<li>"Mag-pinch ng 2 o higit pang daliri para isaayos ang pag-zoom"</li></ul>\n\n<b>"Para mag-zoom pansamantala"</b>", simulan ang pag-magnify, pagkatapos ay pumindot nang matagal kahit saan sa screen.\n"<ul><li>"Mag-drag para gumalaw-galaw sa screen"</li>\n<li>"Iangat ang daliri para mag-zoom out"</li></ul>\n\n"Hindi ka makakapag-zoom in sa keyboard o navigation bar."</string>
<string name="accessibility_tutorial_dialog_title_button" msgid="3682222614034474845">"Gamitin ang button sa accessibility para buksan"</string>
<string name="accessibility_tutorial_dialog_title_gesture" msgid="1342726230497913398">"Gumamit ng galaw para buksan"</string>
<string name="accessibility_tutorial_dialog_title_gesture_settings" msgid="8539392614235820285">"Gamitin ang bagong galaw sa pagiging accessible"</string>
@@ -2140,8 +2140,7 @@
<string name="accessibility_hearingaid_title" msgid="8312145423610648518">"Mga hearing aid"</string>
<string name="accessibility_hearingaid_not_connected_summary" msgid="6240237523789614599">"Walang nakakonektang hearing aid"</string>
<string name="accessibility_hearingaid_adding_summary" msgid="2947474468412309778">"Magdagdag ng mga hearing aid"</string>
- <string name="accessibility_hearingaid_pair_instructions_first_message" msgid="3912093691643131154">"Para ipares ang hearing aids mo, hanapin at i-tap ang device mo sa susunod na screen."</string>
- <string name="accessibility_hearingaid_pair_instructions_second_message" msgid="5596683393607650243">"Tiyaking nasa mode ng pagpapares ang iyong mga hearing aid."</string>
+ <string name="accessibility_hearingaid_pair_instructions_message" msgid="3094382949733435414">"Para ipares ang iyong mga hearing aid, hanapin at i-tap ang device mo sa susunod na screen. Tiyaking nasa mode ng pagpapares ang iyong mga hearing aid."</string>
<string name="accessibility_hearingaid_active_device_summary" msgid="3924362383258688984">"Aktibo ang <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
<plurals name="show_number_hearingaid_count" formatted="false" msgid="3160782397139295486">
<item quantity="one"><xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> na-save na hearing aid</item>
@@ -2490,7 +2489,6 @@
<string name="menu_stats_last_unplugged" msgid="5922246077592434526">"Habang huling naka-unplug para sa <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
<string name="menu_stats_total" msgid="8973377864854807854">"Mga kabuuan ng paggamit"</string>
<string name="menu_stats_refresh" msgid="1676215433344981075">"I-refresh"</string>
- <string name="process_kernel_label" msgid="3916858646836739323">"Android OS"</string>
<string name="process_mediaserver_label" msgid="6500382062945689285">"Mediaserver"</string>
<string name="process_dex2oat_label" msgid="2592408651060518226">"Pag-optimize ng app"</string>
<string name="battery_saver" msgid="8172485772238572153">"Pangtipid sa Baterya"</string>
@@ -2621,8 +2619,6 @@
<string name="no_device_admins" msgid="4846602835339095768">"Walang available na app ng admin ng device"</string>
<string name="personal_device_admin_title" msgid="2849617316347669861">"Personal"</string>
<string name="managed_device_admin_title" msgid="7853955652864478435">"Trabaho"</string>
- <string name="sms_access_restriction_enabled" msgid="7054488078710530278">"Paghigpitan ang access sa SMS at log ng tawag"</string>
- <string name="sms_access_restriction_enabled_summary" msgid="6851339654677842328">"Ang mga default na app sa telepono at pagmemensahe lang ang may mga pahintulot sa SMS at log ng tawag"</string>
<string name="no_trust_agents" msgid="7450273545568977523">"Walang available na mga trust agent"</string>
<string name="add_device_admin_msg" msgid="1501847129819382149">"I-activate ang app ng admin ng device?"</string>
<string name="add_device_admin" msgid="4192055385312215731">"I-activate ang app ng admin ng device na ito"</string>
@@ -3111,7 +3107,7 @@
<string name="keywords_app_default" msgid="5822717006354487071">"Buksan gamit ang"</string>
<string name="keywords_applications_settings" msgid="1268353611121497450">"Mga Application"</string>
<string name="keywords_time_zone" msgid="998254736898753085">"timezone"</string>
- <string name="keywords_draw_overlay" msgid="4130899177619041842">"Head ng chat"</string>
+ <string name="keywords_draw_overlay" msgid="1001120206241401007">"Head ng chat, system, alerto, window, dialog, display, sa ibabaw ng iba pang app, draw"</string>
<string name="keywords_flashlight" msgid="6161632177705233710">"Flashlight, Ilaw, Torch"</string>
<string name="keywords_change_wifi_state" msgid="627068244033681010">"wifi, wi-fi, i-toggle, pagkontrol"</string>
<string name="keywords_more_mobile_networks" msgid="8995946622054642367">"cellular, mobile, cell carrier, wireless, data, 4g,3g, 2g, lte"</string>
@@ -3135,7 +3131,7 @@
<string name="keywords_sounds_and_notifications_interruptions" msgid="5426093074031208917">"huwag gambalain, gambalain, pagkagambala, putol"</string>
<string name="keywords_app" msgid="6334757056536837791">"RAM"</string>
<string name="keywords_location" msgid="4132655528196729043">"kalapit, lokasyon, history, pag-uulat, GPS"</string>
- <string name="keywords_accounts" msgid="1957925565953357627">"account"</string>
+ <string name="keywords_accounts" msgid="4479029747403203867">"account, magdagdag ng account, profile sa trabaho"</string>
<string name="keywords_users" msgid="3434190133131387942">"paghihigpit, paghigpitan, pinaghigpitan"</string>
<string name="keywords_keyboard_and_ime" msgid="9143339015329957107">"pagwawasto ng text, iwasto, tunog, i-vibrate, auto, wika, galaw, imungkahi, mungkahi, tema, nakakapanakit, salita, i-type, emoji, international"</string>
<string name="keywords_reset_apps" msgid="5293291209613191845">"i-reset, mga kagustuhan, default"</string>
@@ -3173,6 +3169,7 @@
<string name="keywords_storage_settings" msgid="297283751968446577">"memory, cache, data, i-delete, i-clear, bakante, espasyo"</string>
<string name="keywords_bluetooth_settings" msgid="6804844062789439858">"nakakonekta, device, headphones, headset, speaker, wireless, ipares, earbuds, musika, media"</string>
<string name="keywords_wallpaper" msgid="5058364390917429896">"background, screen, lockscreen, tema"</string>
+ <string name="keywords_styles" msgid="5828725481814049422">"hugis ng icon, kulay ng accent, font"</string>
<string name="keywords_assist_input" msgid="5017533309492679287">"default, assistant"</string>
<string name="keywords_default_payment_app" msgid="3838565809518896799">"pagbabayad, default"</string>
<string name="keywords_ambient_display" msgid="3103487805748659132">"papasok na notification"</string>
@@ -3182,7 +3179,7 @@
<string name="keywords_notification_vibration" msgid="31924624421190547">"haptics, pag-vibrate, pagkasensitibo"</string>
<string name="keywords_battery_saver_sticky" msgid="5586215686021650278">"pangtipid sa baterya, sticky, manatili, pantipid ng baterya, baterya"</string>
<string name="keywords_battery_saver_schedule" msgid="7358789228486231944">"routine, iskedyul, pangtipid sa baterya, pangtipid ng power, baterya, awtomatiko, porsyento"</string>
- <string name="keywords_add_an_account" msgid="6488139919428902434">"profile sa trabaho"</string>
+ <string name="keywords_enhance_4g_lte" msgid="2273810564244790859">"volte, advanced na pagtawag, pagtawag gamit ang 4g"</string>
<string name="default_sound" msgid="8821684447333687810">"Default na tunog"</string>
<string name="sound_settings_summary" msgid="4100853606668287965">"Nasa <xliff:g id="PERCENTAGE">%1$s</xliff:g> ang volume ng pag-ring"</string>
<string name="sound_dashboard_summary" msgid="3402435125958012986">"Volume, pag-vibrate, Huwag Istorbohin"</string>
@@ -3889,7 +3886,6 @@
<string name="permit_draw_overlay" msgid="7456536798718633432">"Payagang ipakita sa ibabaw ng iba pang app"</string>
<string name="allow_overlay_description" msgid="8961670023925421358">"Payagan ang app na ito na lumabas sa ibabaw ng iba pang ginagamit mong app. Maaari itong makaapekto sa iyong paggamit sa mga naturang app, o sa hitsura o paggana ng mga ito."</string>
<string name="keywords_vr_listener" msgid="7441221822576384680">"vr virtual reality listener stereo pantulong serbisyo"</string>
- <string name="keywords_system_alert_window" msgid="5049498015597864850">"lumalabas ang dialog ng window ng alerto sa system sa ibabaw ng iba pang app"</string>
<string name="overlay_settings" msgid="6930854109449524280">"Ipakita sa ibabaw ng ibang app"</string>
<string name="system_alert_window_summary" msgid="602892301318324492">"Pinapayagan ang <xliff:g id="COUNT_0">%1$d</xliff:g> sa <xliff:g id="COUNT_1">%2$d</xliff:g> (na) app na lumabas sa ibabaw ng ibang app"</string>
<string name="filter_overlay_apps" msgid="6965969283342557573">"Mga app na may pahintulot"</string>
@@ -4125,7 +4121,6 @@
<string name="notification_log_details_none" msgid="184131801230614059">"wala"</string>
<string name="notification_log_details_ranking_null" msgid="244660392058720919">"Walang object sa ranking."</string>
<string name="notification_log_details_ranking_none" msgid="599607025882587844">"Walang ganitong key ang object sa ranking."</string>
- <string name="theme_customization_category" msgid="1049181544004163283">"Pagtatakda ng Tema"</string>
<string name="theme_customization_device_default" msgid="5058147707906551368">"Default ng device"</string>
<string name="display_cutout_emulation" msgid="7466869822418376317">"Cutout ng display"</string>
<string name="display_cutout_emulation_keywords" msgid="4495418317471622562">"cutout ng display, notch"</string>
@@ -4551,6 +4546,8 @@
<string name="network_connection_errorstate_dialog_message" msgid="6953778550775646710">"Nagkaproblema. Kinansela ng application ang kahilingang pumili ng device."</string>
<string name="network_connection_connect_successful" msgid="5935510954474494928">"Naikonekta"</string>
<string name="network_connection_request_dialog_showall" msgid="6938922880244567521">"Ipakita lahat"</string>
+ <string name="network_connection_searching_message" msgid="4638576789450817530">"Naghahanap ng device…"</string>
+ <string name="network_connection_connecting_message" msgid="3740982406609245654">"Kumokonekta sa device…"</string>
<plurals name="show_bluetooth_devices" formatted="false" msgid="1715020480026568408">
<item quantity="one"><xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> (na) device ang nakakonekta</item>
<item quantity="other"><xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> (na) device ang nakakonekta</item>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 66d07c7..9f46fa6 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -360,8 +360,6 @@
<string name="security_enable_widgets_disabled_summary" msgid="6392489775303464905">"Yönetici devre dışı bıraktı"</string>
<string name="lockdown_settings_title" msgid="7393790212603280213">"Kilitleme seçeneğini göster"</string>
<string name="lockdown_settings_summary" msgid="4359438673563318171">"Kilit ekranında Smart Lock, biyometrik kilit açma ve bildirimler özelliğini kapatan güç düğmesi seçeneğini görüntüleyin"</string>
- <string name="trust_agents_extend_unlock_title" msgid="2796555263565097031">"Sadece güven aracıları kilit açmaya izin verir"</string>
- <string name="trust_agents_extend_unlock_summary" msgid="3976344969220255010">"Etkinleştirilirse güven aracıları cihazınızı daha uzun süre kilidi açık olarak tutar, ancak artık kilitlenen bir cihazın kilidini açamaz."</string>
<string name="trust_lost_locks_screen_title" msgid="2992742466966021682">"Güven kaybedildiğinde ekranı kilitle"</string>
<string name="trust_lost_locks_screen_summary" msgid="693784434582021206">"Etkinleştirilirse son güven aracısı güvenini kaybettiğinde cihaz kilitlenecektir."</string>
<string name="owner_info_settings_summary" msgid="7472393443779227052">"Yok"</string>
@@ -937,6 +935,7 @@
<string name="wifi_eap_identity" msgid="4359453783379679103">"Kimlik"</string>
<string name="wifi_eap_anonymous" msgid="2989469344116577955">"Anonim kimlik"</string>
<string name="wifi_password" msgid="5948219759936151048">"Şifre"</string>
+ <string name="wifi_sae_password_id" msgid="1697832722221765763">"SAE şifre tanımlayıcı"</string>
<string name="wifi_show_password" msgid="6461249871236968884">"Şifreyi göster"</string>
<string name="wifi_ap_band_config" msgid="1611826705989117930">"Erişim Noktası Bandı Seçin"</string>
<string name="wifi_ap_choose_auto" msgid="2677800651271769965">"Otomatik"</string>
@@ -957,7 +956,6 @@
<string name="wifi_dpp_share_wifi" msgid="9065890131734833809">"Kablosuz ağı paylaşın"</string>
<string name="wifi_dpp_scan_qr_code_with_another_device" msgid="5854392840857123065">"\"<xliff:g id="SSID">%1$s</xliff:g>\" ağına bağlanmak ve şifreyi paylaşmak için bu QR kodunu tarayın"</string>
<string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="4436318319178361543">"\"<xliff:g id="SSID">%1$s</xliff:g>\" ağına bağlanmak için bu QR kodunu tarayın"</string>
- <string name="wifi_dpp_could_not_detect_valid_qr_code" msgid="641893675646330576">"QR kodu okunamadı. Kodu yeniden ortalayıp tekrar deneyin."</string>
<string name="wifi_dpp_failure_authentication_or_configuration" msgid="3372757783382381044">"Tekrar deneyin. Sorun devam ederse cihaz üreticisiyle iletişime geçin"</string>
<string name="wifi_dpp_failure_not_compatible" msgid="2829930473520603740">"Bir hata oluştu"</string>
<string name="wifi_dpp_failure_timeout" msgid="5228320772245820458">"Cihazın takılı olduğundan, şarjının olduğundan ve açık olduğundan emin olun"</string>
@@ -980,6 +978,7 @@
<string name="wifi_dpp_hotspot_password" msgid="4120419278831581613">"Hotspot şifresi: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
<string name="wifi_dpp_add_device" msgid="4072206063308645677">"Cihaz ekle"</string>
<string name="wifi_dpp_connect_network_using_qr_code" msgid="3887335309163999665">"Bu ağa cihaz eklemek için QR kodu kullanın"</string>
+ <string name="wifi_dpp_qr_code_is_not_valid_format" msgid="3700087439867692944">"QR kodu geçerli bir biçim değil"</string>
<string name="retry" msgid="6472609612090877557">"Tekrar dene"</string>
<string name="wifi_shared" msgid="844142443226926070">"Diğer cihaz kullanıcılarıyla paylaş"</string>
<string name="wifi_unchanged" msgid="3410422020930397102">"(değişmedi)"</string>
@@ -1129,6 +1128,7 @@
<string name="emergency_address_title" msgid="932729250447887545">"Acil Durum Adresi"</string>
<string name="emergency_address_summary" msgid="7751971156196115129">"Kablosuz bağlantı üzerinden acil durum çağrısı yaptığınızda konumunuz olarak kullanılır"</string>
<string name="private_dns_help_message" msgid="3299567069152568958">"Gizli DNS özellikleri ile ilgili "<annotation id="url">"daha fazla bilgi edinin"</annotation></string>
+ <string name="private_dns_mode_on" msgid="5882613439541371003">"Açık"</string>
<string name="wifi_calling_pref_managed_by_carrier" msgid="6845711858866828986">"Ayar, operatör tarafından yönetiliyor"</string>
<string name="wifi_calling_settings_activation_instructions" msgid="7492509632478260955">"Kablosuz çağrıyı etkinleştirin"</string>
<string name="wifi_calling_turn_on" msgid="1171403510313983983">"Kablosuz çağrıyı açın"</string>
@@ -1872,7 +1872,7 @@
<string name="default_emergency_app" msgid="1951760659640369980">"Acil durum uygulaması"</string>
<string name="reset_app_preferences" msgid="1321050641018356925">"Uygulama tercihlerini sıfırla"</string>
<string name="reset_app_preferences_title" msgid="6093179367325336662">"Uygulama tercihleri sıfırlansın mı?"</string>
- <string name="reset_app_preferences_desc" msgid="4822447731869201512">"Bu işlem şunlar için tüm tercihleri sıfırlayacaktır:\n\n"<li>"Devre dışı bırakılan uygulamalar"</li>\n<li>"Devre dışı bırakılan uygulama bildirimleri"</li>\n<li>"İşlemler için varsayılan uygulamalar"</li>\n<li>"Uygulamalar için arka plan veri kısıtlamaları"</li>\n<li>"Tüm izin kısıtlamaları"</li>\n\n"Hiçbir uygulama verisini kaybetmeyeceksiniz."</string>
+ <string name="reset_app_preferences_desc" msgid="731757609326016760">"Bu işlem, şunlarla ilgili tüm tercihleri sıfırlayacaktır:\n\n"<li>"Devre dışı bırakılan uygulamalar"</li>\n<li>"Devre dışı bırakılan uygulama bildirimleri"</li>\n<li>"İşlemler için varsayılan uygulamalar"</li>\n<li>"Uygulamalar için arka plan verileri kısıtlamaları"</li>\n<li>"Tüm izin kısıtlamaları"</li>\n\n"Uygulama verileriniz kaybolmayacak."</string>
<string name="reset_app_preferences_button" msgid="2559089511841281242">"Uygulamaları sıfırla"</string>
<string name="manage_space_text" msgid="8852711522447794676">"Alanı yönet"</string>
<string name="filter" msgid="2018011724373033887">"Filtre"</string>
@@ -2087,7 +2087,7 @@
<string name="accessibility_screen_magnification_short_summary" msgid="3411979839172752057">"Yakınlaştırmak için 3 defa dokunun"</string>
<string name="accessibility_screen_magnification_navbar_short_summary" msgid="3693116360267980492">"Yakınlaştırmak için bir düğmeye dokunun"</string>
<string name="accessibility_screen_magnification_summary" msgid="5258868553337478505"><b>"Yakınlaştırmak için"</b>" ekrana 3 kez hızlıca dokunun.\n"<ul><li>"Kaydırmak için 2 veya daha fazla parmağınızı sürükleyin"</li>\n<li>"Yakınlaştırmayı ayarlamak için 2 veya daha fazla parmağınızı birbirine yaklaştırın"</li></ul>\n\n<b>"Geçici olarak büyütmek için"</b>" ekrana 3 kez hızlıca dokunun ve üçüncü dokunuşunuzda parmağınızı basılı tutun.\n"<ul><li>"Ekranda gezinmek için parmağınızı sürükleyin"</li>\n<li>"Uzaklaştırmak için parmağınızı kaldırın"</li></ul>\n\n"Klavyede veya gezinme çubuğundayken yakınlaştırma yapamazsınız."</string>
- <string name="accessibility_screen_magnification_navbar_summary" msgid="2272878354599332009">"Büyütme açıkken, ekranınızı yakınlaştırabilirsiniz.\n\n"<b>"Yakınlaştırmak için"</b>", büyütme işlevini başlatın, ardından ekranda istediğiniz yere dokunun.\n"<ul><li>"• Kaydırmak için 2 veya daha fazla parmağınızla sürükleme hareketi yapın"</li>\n<li>"• Yakınlaştırmayı ayarlamak için 2 veya daha fazla parmağınızla sıkıştırma hareketi yapın"</li></ul>\n\n<b>"Geçici olarak yakınlaştırmak için"</b>", büyütme işlevini başlatın, ardından ekranda herhangi bir yere dokunup basılı tutun.\n"<ul><li>"• Ekranda gezinmek için sürükleyin"</li>\n<li>"• Uzaklaştırmak için parmağınızı kaldırın"</li></ul>\n\n"Klavyede veya gezinme çubuğunda yakınlaştıramazsınız."</string>
+ <string name="accessibility_screen_magnification_navbar_summary" msgid="6700716275347612310">"Büyütme açıldığında ekranınızda yakınlaştırma yapabilirsiniz.\n\n"<b>"Yakınlaştırmak için"</b>", büyütmeyi başlatın, ardından ekranda herhangi bir yere dokunun.\n"<ul><li>"Kaydırmak için 2 veya daha fazla parmağınızı sürükleyin"</li>\n<li>"Yakınlaştırmayı ayarlamak için 2 veya daha fazla parmağınızı birbirine yaklaştırın"</li></ul>\n\n<b>"Geçici olarak yakınlaştırmak için"</b>", büyütmeyi başlatın, ardından ekranda herhangi bir yere dokunup basılı tutun.\n"<ul><li>"Ekranda hareket etmek için sürükleyin"</li>\n<li>"Uzaklaştırmak için parmağınızı çekin"</li></ul>\n\n"Klavyede veya gezinme çubuğundayken yakınlaştırma yapamazsınız."</string>
<string name="accessibility_tutorial_dialog_title_button" msgid="3682222614034474845">"Açmak için erişilebilirlik düğmesini kullanın"</string>
<string name="accessibility_tutorial_dialog_title_gesture" msgid="1342726230497913398">"Açmak için hareketi kullanın"</string>
<string name="accessibility_tutorial_dialog_title_gesture_settings" msgid="8539392614235820285">"Yeni erişilebilirlik hareketlerini kullanma"</string>
@@ -2140,8 +2140,7 @@
<string name="accessibility_hearingaid_title" msgid="8312145423610648518">"İşitme cihazları"</string>
<string name="accessibility_hearingaid_not_connected_summary" msgid="6240237523789614599">"Bağlı işitme cihazı yok"</string>
<string name="accessibility_hearingaid_adding_summary" msgid="2947474468412309778">"İşitme cihazı ekle"</string>
- <string name="accessibility_hearingaid_pair_instructions_first_message" msgid="3912093691643131154">"İşitme cihazınızı eşleştirmek için sonraki ekranda cihazınızı bulup dokunun."</string>
- <string name="accessibility_hearingaid_pair_instructions_second_message" msgid="5596683393607650243">"İşitme cihazlarınızın eşleme modunda olduğundan emin olun."</string>
+ <string name="accessibility_hearingaid_pair_instructions_message" msgid="3094382949733435414">"İşitme cihazınızı eşleştirmek için sonraki ekranda cihazınızı bulup dokunun. İşitme cihazınızın eşleme modunda olduğundan emin olun."</string>
<string name="accessibility_hearingaid_active_device_summary" msgid="3924362383258688984">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> etkin"</string>
<plurals name="show_number_hearingaid_count" formatted="false" msgid="3160782397139295486">
<item quantity="other"><xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> işitme cihazı kayıtlı</item>
@@ -2490,7 +2489,6 @@
<string name="menu_stats_last_unplugged" msgid="5922246077592434526">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> için fişten son çekildikten itibaren"</string>
<string name="menu_stats_total" msgid="8973377864854807854">"Kullanım toplamı"</string>
<string name="menu_stats_refresh" msgid="1676215433344981075">"Yenile"</string>
- <string name="process_kernel_label" msgid="3916858646836739323">"Android OS"</string>
<string name="process_mediaserver_label" msgid="6500382062945689285">"Medya sunucusu"</string>
<string name="process_dex2oat_label" msgid="2592408651060518226">"Optimizasyon ekle"</string>
<string name="battery_saver" msgid="8172485772238572153">"Pil Tasarrufu"</string>
@@ -2621,8 +2619,6 @@
<string name="no_device_admins" msgid="4846602835339095768">"Kullanılabilir cihaz yönetimi uygulaması yok"</string>
<string name="personal_device_admin_title" msgid="2849617316347669861">"Kişisel"</string>
<string name="managed_device_admin_title" msgid="7853955652864478435">"İş"</string>
- <string name="sms_access_restriction_enabled" msgid="7054488078710530278">"SMS ve çağrı günlüğüne erişimi kısıtla"</string>
- <string name="sms_access_restriction_enabled_summary" msgid="6851339654677842328">"Yalnızca varsayılan telefon ve mesajlaşma uygulamalarının SMS ve çağrı günlüğüne erişim izinleri vardır"</string>
<string name="no_trust_agents" msgid="7450273545568977523">"Kullanılabilir güven aracısı yok"</string>
<string name="add_device_admin_msg" msgid="1501847129819382149">"Cihaz yönetimi uygulaması etkinleştirilsin mi?"</string>
<string name="add_device_admin" msgid="4192055385312215731">"Bu cihaz yönetimi uygulamasını etkinleştir"</string>
@@ -3111,7 +3107,7 @@
<string name="keywords_app_default" msgid="5822717006354487071">"Şununla aç:"</string>
<string name="keywords_applications_settings" msgid="1268353611121497450">"Uygulamalar"</string>
<string name="keywords_time_zone" msgid="998254736898753085">"saat dilimi"</string>
- <string name="keywords_draw_overlay" msgid="4130899177619041842">"Chat head"</string>
+ <string name="keywords_draw_overlay" msgid="1001120206241401007">"Sohbet başlığı, sistem, uyarı, pencere, iletişim, ekran, en üstte diğer uygulamalar, çizim"</string>
<string name="keywords_flashlight" msgid="6161632177705233710">"El feneri, Işık, Fener"</string>
<string name="keywords_change_wifi_state" msgid="627068244033681010">"kablosuz, kablosuz ağ, aç/kapat, kontrol"</string>
<string name="keywords_more_mobile_networks" msgid="8995946622054642367">"hücresel, mobil, cep telefonu operatörü, kablosuz, veri, 4g, 3g, 2g, lte"</string>
@@ -3135,7 +3131,7 @@
<string name="keywords_sounds_and_notifications_interruptions" msgid="5426093074031208917">"rahatsız etmeyin, kesme, kesinti, kopma"</string>
<string name="keywords_app" msgid="6334757056536837791">"RAM"</string>
<string name="keywords_location" msgid="4132655528196729043">"etrafta, konum, geçmiş, raporlama, GPS"</string>
- <string name="keywords_accounts" msgid="1957925565953357627">"hesap"</string>
+ <string name="keywords_accounts" msgid="4479029747403203867">"hesap, hesap ekle, iş profili"</string>
<string name="keywords_users" msgid="3434190133131387942">"kısıtlama, kısıtla, kısıtlı"</string>
<string name="keywords_keyboard_and_ime" msgid="9143339015329957107">"metin düzeltme, düzeltme, ses, titreşim, otomatik, dil, hareket, öner, öneri, tema, rahatsız edici, kelime, tür, emoji, uluslararası"</string>
<string name="keywords_reset_apps" msgid="5293291209613191845">"sıfırlama, tercihler, varsayılan"</string>
@@ -3173,6 +3169,7 @@
<string name="keywords_storage_settings" msgid="297283751968446577">"bellek, önbellek, veri, sil, temizle, boş, alan"</string>
<string name="keywords_bluetooth_settings" msgid="6804844062789439858">"bağlı, cihaz, kulaklık, mikrofonlu kulaklık, hoparlör, kablosuz, eşle, kulak içi kulaklık, müzik, medya"</string>
<string name="keywords_wallpaper" msgid="5058364390917429896">"arka plan, ekran, kilit ekranı, tema"</string>
+ <string name="keywords_styles" msgid="5828725481814049422">"simge şekli, vurgu rengi, yazı tipi"</string>
<string name="keywords_assist_input" msgid="5017533309492679287">"varsayılan, destek"</string>
<string name="keywords_default_payment_app" msgid="3838565809518896799">"ödeme, varsayılan"</string>
<string name="keywords_ambient_display" msgid="3103487805748659132">"gelen bildirim"</string>
@@ -3182,7 +3179,7 @@
<string name="keywords_notification_vibration" msgid="31924624421190547">"dokunma teknolojisi, titreşim, hassasiyet"</string>
<string name="keywords_battery_saver_sticky" msgid="5586215686021650278">"pil tasarrufu, yapışkan, kalıcı, güç tasarrufu, pil"</string>
<string name="keywords_battery_saver_schedule" msgid="7358789228486231944">"rutin, program, pil tasarrufu, güç tasarrufu, pil, otomatik, yüzde"</string>
- <string name="keywords_add_an_account" msgid="6488139919428902434">"iş profili"</string>
+ <string name="keywords_enhance_4g_lte" msgid="2273810564244790859">"VoLTE, Gelişmiş Arama, 4G Arama"</string>
<string name="default_sound" msgid="8821684447333687810">"Varsayılan ses"</string>
<string name="sound_settings_summary" msgid="4100853606668287965">"Zil sesi seviyesi: <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
<string name="sound_dashboard_summary" msgid="3402435125958012986">"Ses düzeyi, titreşim, Rahatsız Etmeyin"</string>
@@ -3889,7 +3886,6 @@
<string name="permit_draw_overlay" msgid="7456536798718633432">"Diğer uyg. üzerinde gösterime izin ver"</string>
<string name="allow_overlay_description" msgid="8961670023925421358">"Bu uygulamaya, kullandığınız diğer uygulamaların üzerinde gösterme izin verir. Bu durum, diğer uygulamaların kullanımını etkileyebilir veya görünüşünü ya da davranışını değiştirebilir."</string>
<string name="keywords_vr_listener" msgid="7441221822576384680">"vr sanal gerçeklik dinleyici stereo yardımcı hizmeti"</string>
- <string name="keywords_system_alert_window" msgid="5049498015597864850">"sistem uyarı penceresi iletişim kutusu gösterme en üstte diğer uygulamalar"</string>
<string name="overlay_settings" msgid="6930854109449524280">"Diğer uyg. üzerinde göster"</string>
<string name="system_alert_window_summary" msgid="602892301318324492">"<xliff:g id="COUNT_0">%1$d</xliff:g>/<xliff:g id="COUNT_1">%2$d</xliff:g> uyg. diğer uyg. üzerinde gösterilmesine izin veriliyor"</string>
<string name="filter_overlay_apps" msgid="6965969283342557573">"İzni olan uygulamalar"</string>
@@ -4125,7 +4121,6 @@
<string name="notification_log_details_none" msgid="184131801230614059">"hiçbiri"</string>
<string name="notification_log_details_ranking_null" msgid="244660392058720919">"Sıralama nesnesi eksik."</string>
<string name="notification_log_details_ranking_none" msgid="599607025882587844">"Sıralama nesnesi bu anahtarı içermiyor."</string>
- <string name="theme_customization_category" msgid="1049181544004163283">"Tema oluşturma"</string>
<string name="theme_customization_device_default" msgid="5058147707906551368">"Cihaz varsayılanı"</string>
<string name="display_cutout_emulation" msgid="7466869822418376317">"Ekran kesimi"</string>
<string name="display_cutout_emulation_keywords" msgid="4495418317471622562">"ekran kesimi, çentik"</string>
@@ -4551,6 +4546,8 @@
<string name="network_connection_errorstate_dialog_message" msgid="6953778550775646710">"Bir sorun oluştu. Uygulama, cihaz seçme isteğini iptal etti."</string>
<string name="network_connection_connect_successful" msgid="5935510954474494928">"Bağlantı başarılı"</string>
<string name="network_connection_request_dialog_showall" msgid="6938922880244567521">"Tümünü göster"</string>
+ <string name="network_connection_searching_message" msgid="4638576789450817530">"Cihaz aranıyor…"</string>
+ <string name="network_connection_connecting_message" msgid="3740982406609245654">"Cihaza bağlanıyor…"</string>
<plurals name="show_bluetooth_devices" formatted="false" msgid="1715020480026568408">
<item quantity="other"><xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> cihaz bağlandı</item>
<item quantity="one"><xliff:g id="NUMBER_DEVICE_COUNT_0">%1$d</xliff:g> cihaz bağlandı</item>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 51f16c6..0726a3c 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -364,8 +364,6 @@
<string name="security_enable_widgets_disabled_summary" msgid="6392489775303464905">"Вимкнено адміністратором"</string>
<string name="lockdown_settings_title" msgid="7393790212603280213">"Показувати опцію блокування"</string>
<string name="lockdown_settings_summary" msgid="4359438673563318171">"Додати в меню кнопки живлення функцію, яка вимикає Smart Lock, біометричне розблокування та сповіщення на заблокованому екрані"</string>
- <string name="trust_agents_extend_unlock_title" msgid="2796555263565097031">"Довірчі агенти лише подовжують розблокування"</string>
- <string name="trust_agents_extend_unlock_summary" msgid="3976344969220255010">"Коли довірчі агенти ввімкнено, пристрій залишається розблокованим довше, але вони не можуть розблокувати заблокований пристрій."</string>
<string name="trust_lost_locks_screen_title" msgid="2992742466966021682">"Блокувати екран, коли втрачено довіру"</string>
<string name="trust_lost_locks_screen_summary" msgid="693784434582021206">"Якщо цю функцію ввімкнено, пристрій заблокується, коли останній агент утратить довіру"</string>
<string name="owner_info_settings_summary" msgid="7472393443779227052">"Немає"</string>
@@ -969,6 +967,7 @@
<string name="wifi_eap_identity" msgid="4359453783379679103">"Ідентифік."</string>
<string name="wifi_eap_anonymous" msgid="2989469344116577955">"Анонімна ідентиф-ція"</string>
<string name="wifi_password" msgid="5948219759936151048">"Пароль"</string>
+ <string name="wifi_sae_password_id" msgid="1697832722221765763">"Ідентифікатор пароля SAE"</string>
<string name="wifi_show_password" msgid="6461249871236968884">"Показати пароль"</string>
<string name="wifi_ap_band_config" msgid="1611826705989117930">"Виберіть діапазон частот точки доступу"</string>
<string name="wifi_ap_choose_auto" msgid="2677800651271769965">"Автоматично"</string>
@@ -989,7 +988,6 @@
<string name="wifi_dpp_share_wifi" msgid="9065890131734833809">"Поділитися мережею Wi‑Fi"</string>
<string name="wifi_dpp_scan_qr_code_with_another_device" msgid="5854392840857123065">"Відскануйте QR-код, щоб підключитися до мережі \"<xliff:g id="SSID">%1$s</xliff:g>\" і поділитися паролем"</string>
<string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="4436318319178361543">"Відскануйте QR-код, щоб підключитися до мережі \"<xliff:g id="SSID">%1$s</xliff:g>\""</string>
- <string name="wifi_dpp_could_not_detect_valid_qr_code" msgid="641893675646330576">"Не вдалося розпізнати QR-код. Ще раз розмістіть код у центрі рамки й повторіть спробу"</string>
<string name="wifi_dpp_failure_authentication_or_configuration" msgid="3372757783382381044">"Повторіть спробу. Якщо проблема не зникне, зверніться до виробника пристрою"</string>
<string name="wifi_dpp_failure_not_compatible" msgid="2829930473520603740">"Сталася помилка"</string>
<string name="wifi_dpp_failure_timeout" msgid="5228320772245820458">"Переконайтеся, що пристрій підключено, заряджено й увімкнено"</string>
@@ -1012,6 +1010,7 @@
<string name="wifi_dpp_hotspot_password" msgid="4120419278831581613">"Пароль точки доступу: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
<string name="wifi_dpp_add_device" msgid="4072206063308645677">"Додати пристрій"</string>
<string name="wifi_dpp_connect_network_using_qr_code" msgid="3887335309163999665">"Зіскануйте QR-код, щоб додати пристрій до цієї мережі"</string>
+ <string name="wifi_dpp_qr_code_is_not_valid_format" msgid="3700087439867692944">"Недійсний формат QR-коду"</string>
<string name="retry" msgid="6472609612090877557">"Повторити"</string>
<string name="wifi_shared" msgid="844142443226926070">"Надати доступ іншим користувачам пристрою"</string>
<string name="wifi_unchanged" msgid="3410422020930397102">"(без змін)"</string>
@@ -1167,6 +1166,7 @@
<string name="emergency_address_title" msgid="932729250447887545">"Екстрена адреса"</string>
<string name="emergency_address_summary" msgid="7751971156196115129">"Використовується як адреса, коли ви телефонуєте в екстрені служби через Wi-Fi"</string>
<string name="private_dns_help_message" msgid="3299567069152568958"><annotation id="url">"Докладніше"</annotation>" про функції приватної DNS"</string>
+ <string name="private_dns_mode_on" msgid="5882613439541371003">"Увімкнено"</string>
<string name="wifi_calling_pref_managed_by_carrier" msgid="6845711858866828986">"Налаштуванням керує оператор"</string>
<string name="wifi_calling_settings_activation_instructions" msgid="7492509632478260955">"Активувати дзвінки через Wi-Fi"</string>
<string name="wifi_calling_turn_on" msgid="1171403510313983983">"Увімкнути дзвінки через Wi-Fi"</string>
@@ -1916,7 +1916,7 @@
<string name="default_emergency_app" msgid="1951760659640369980">"Додаток для екстрених викликів"</string>
<string name="reset_app_preferences" msgid="1321050641018356925">"Скинути налаштування додатків"</string>
<string name="reset_app_preferences_title" msgid="6093179367325336662">"Скинути налаштування додатків?"</string>
- <string name="reset_app_preferences_desc" msgid="4822447731869201512">"Буде скинуто всі налаштування для:\n\n"<li>"вимкнених додатків"</li>\n<li>"вимкнених сповіщень із додатків"</li>\n<li>"додатків за умовчанням"</li>\n<li>"обмежень щодо передавання даних у фоновому режимі"</li>\n<li>"усіх обмежень щодо дозволів"</li>\n\n"Дані додатків видалено не буде."</string>
+ <string name="reset_app_preferences_desc" msgid="731757609326016760">"Буде скинуто всі налаштування для:\n\n"<li>"вимкнених додатків;"</li>\n<li>"сповіщень вимкнених додатків;"</li>\n<li>"додатків для виконання дій за умовчанням;"</li>\n<li>"обмежень щодо використання даних додатками у фоновому режимі;"</li>\n<li>"усіх обмежень щодо дозволів."</li>\n\n"Ви не втратите жодних даних додатків."</string>
<string name="reset_app_preferences_button" msgid="2559089511841281242">"Скинути"</string>
<string name="manage_space_text" msgid="8852711522447794676">"Кер. простором"</string>
<string name="filter" msgid="2018011724373033887">"Фільтрув."</string>
@@ -2131,7 +2131,7 @@
<string name="accessibility_screen_magnification_short_summary" msgid="3411979839172752057">"Тричі торкніться, щоб збільшити"</string>
<string name="accessibility_screen_magnification_navbar_short_summary" msgid="3693116360267980492">"Торкніться кнопки, щоб збільшити вміст"</string>
<string name="accessibility_screen_magnification_summary" msgid="5258868553337478505"><b>"Щоб збільшити вміст"</b>", тричі торкніться екрана.\n"<ul><li>"Щоб прокрутити вміст, проведіть по екрану принаймні двома пальцями."</li>\n<li>"Щоб змінити масштаб, стисніть або розведіть принаймні два пальці."</li></ul>\n\n<b>"Щоб тимчасово збільшити вміст"</b>", тричі натисніть і втримуйте його.\n"<ul><li>"Пересувайте палець, щоб переміщатись екраном."</li>\n<li>"Підніміть палець, щоб знову зменшити елемент."</li></ul>\n\n"Масштабування не підтримується на клавіатурі та панелі навігації."</string>
- <string name="accessibility_screen_magnification_navbar_summary" msgid="2272878354599332009">"Коли функцію збільшення ввімкнено, ви можете наближувати вміст на екрані.\n\n"<b>"Щоб наблизити вміст"</b>", увімкніть збільшення, а потім торкніться будь-якого місця на екрані.\n"<ul><li>"• Щоб прокрутити, потягніть екран принаймні двома пальцями"</li>\n<li>"• Щоб змінити рівень масштабування, стисніть принаймні два пальці"</li></ul>\n\n<b>"Щоб тимчасово наблизити вміст"</b>", увімкніть функцію збільшення, а потім натисніть і утримуйте будь-яке місце на екрані.\n"<ul><li>"• Щоб переміщатись екраном, пересувайте палець."</li>\n<li>"• Щоб віддалити зображення, підніміть палець."</li></ul>\n\n"Наближення не підтримується на клавіатурі чи панелі навігації."</string>
+ <string name="accessibility_screen_magnification_navbar_summary" msgid="6700716275347612310">"Коли функцію збільшення ввімкнено, ви можете наближувати вміст на екрані.\n\n"<b>"Щоб наблизити вміст"</b>", увімкніть збільшення, а потім торкніться будь-якого місця на екрані.\n"<ul><li>"Щоб прокрутити вміст, проведіть по екрану принаймні двома пальцями"</li>\n<li>"Щоб змінити масштаб, стисніть або розведіть принаймні два пальці"</li></ul>\n\n<b>"Щоб тимчасово збільшити вміст"</b>", увімкніть збільшення, а потім натисніть і утримуйте будь-яке місце на екрані.\n"<ul><li>"Пересувайте палець, щоб переміщатись екраном"</li>\n<li>"Підніміть палець, щоб знову зменшити елемент"</li></ul>\n\n"Масштабування не підтримується на клавіатурі та панелі навігації."</string>
<string name="accessibility_tutorial_dialog_title_button" msgid="3682222614034474845">"Використовуйте кнопку спеціальних можливостей"</string>
<string name="accessibility_tutorial_dialog_title_gesture" msgid="1342726230497913398">"Використовуйте жест"</string>
<string name="accessibility_tutorial_dialog_title_gesture_settings" msgid="8539392614235820285">"Спробуйте новий жест для спеціальних можливостей"</string>
@@ -2184,8 +2184,7 @@
<string name="accessibility_hearingaid_title" msgid="8312145423610648518">"Слухові апарати"</string>
<string name="accessibility_hearingaid_not_connected_summary" msgid="6240237523789614599">"Слухові апарати не під’єднано"</string>
<string name="accessibility_hearingaid_adding_summary" msgid="2947474468412309778">"Додати слухові апарати"</string>
- <string name="accessibility_hearingaid_pair_instructions_first_message" msgid="3912093691643131154">"Щоб підключити слуховий апарат, виберіть його на наступному екрані."</string>
- <string name="accessibility_hearingaid_pair_instructions_second_message" msgid="5596683393607650243">"Переконайтеся, що на слухових апаратах увімкнено режим створення пари."</string>
+ <string name="accessibility_hearingaid_pair_instructions_message" msgid="3094382949733435414">"Щоб підключити слуховий апарат, виберіть його на наступному екрані. Не забудьте перевести свій слуховий апарат у режим створення пари."</string>
<string name="accessibility_hearingaid_active_device_summary" msgid="3924362383258688984">"Пристрій <xliff:g id="DEVICE_NAME">%1$s</xliff:g> активовано"</string>
<plurals name="show_number_hearingaid_count" formatted="false" msgid="3160782397139295486">
<item quantity="one">Збережено <xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> слуховий апарат</item>
@@ -2564,7 +2563,6 @@
<string name="menu_stats_last_unplugged" msgid="5922246077592434526">"З часу ост. відключ. для <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
<string name="menu_stats_total" msgid="8973377864854807854">"Заг. використ."</string>
<string name="menu_stats_refresh" msgid="1676215433344981075">"Оновити"</string>
- <string name="process_kernel_label" msgid="3916858646836739323">"ОС Android"</string>
<string name="process_mediaserver_label" msgid="6500382062945689285">"Медіа-сервер"</string>
<string name="process_dex2oat_label" msgid="2592408651060518226">"Оптимізація додатка"</string>
<string name="battery_saver" msgid="8172485772238572153">"Режим економії заряду акумулятора"</string>
@@ -2695,8 +2693,6 @@
<string name="no_device_admins" msgid="4846602835339095768">"Немає додатків адміністратора пристрою"</string>
<string name="personal_device_admin_title" msgid="2849617316347669861">"Особисте"</string>
<string name="managed_device_admin_title" msgid="7853955652864478435">"Робота"</string>
- <string name="sms_access_restriction_enabled" msgid="7054488078710530278">"Обмежити доступ до SMS і журналу викликів"</string>
- <string name="sms_access_restriction_enabled_summary" msgid="6851339654677842328">"Лише додатки для дзвінків і обміну повідомленнями за умовчанням мають дозволи на доступ до SMS і журналу викликів"</string>
<string name="no_trust_agents" msgid="7450273545568977523">"Немає довірчих агентів"</string>
<string name="add_device_admin_msg" msgid="1501847129819382149">"Активувати додаток адміністратора пристрою?"</string>
<string name="add_device_admin" msgid="4192055385312215731">"Активувати додаток адміністратора пристрою"</string>
@@ -3195,7 +3191,7 @@
<string name="keywords_app_default" msgid="5822717006354487071">"Відкрити за допомогою"</string>
<string name="keywords_applications_settings" msgid="1268353611121497450">"Додатки"</string>
<string name="keywords_time_zone" msgid="998254736898753085">"часовий пояс"</string>
- <string name="keywords_draw_overlay" msgid="4130899177619041842">"Показувати поверх інших додатків"</string>
+ <string name="keywords_draw_overlay" msgid="1001120206241401007">"угорі чату, система, сповіщення, вікно, діалог, показ, поверх інших додатків, відображення"</string>
<string name="keywords_flashlight" msgid="6161632177705233710">"Ліхтарик, світло, ліхтар"</string>
<string name="keywords_change_wifi_state" msgid="627068244033681010">"wifi, wi-fi, перемкнути, керувати"</string>
<string name="keywords_more_mobile_networks" msgid="8995946622054642367">"мобільний зв’язок, мобільний, оператор мобільного зв’язку, без дротів, трафік, 4g, 3g, 2g, lte"</string>
@@ -3219,7 +3215,7 @@
<string name="keywords_sounds_and_notifications_interruptions" msgid="5426093074031208917">"не турбувати, пріоритет, пріоритетні сповіщення, втручатися"</string>
<string name="keywords_app" msgid="6334757056536837791">"оперативна пам’ять"</string>
<string name="keywords_location" msgid="4132655528196729043">"поруч, місцезнаходження, історія, надсилання, GPS"</string>
- <string name="keywords_accounts" msgid="1957925565953357627">"обліковий запис"</string>
+ <string name="keywords_accounts" msgid="4479029747403203867">"обліковий запис, додати обліковий запис, робочий профіль"</string>
<string name="keywords_users" msgid="3434190133131387942">"обмеження, обмежувати, обмежено"</string>
<string name="keywords_keyboard_and_ime" msgid="9143339015329957107">"виправлення тексту, виправити, звук, вібросигнал. автоматично, мова, жести, пропонувати, пропозиція, тема, образливо, слово, ввести текст, смайли міжнародний"</string>
<string name="keywords_reset_apps" msgid="5293291209613191845">"скинути, параметри, за умовчанням"</string>
@@ -3257,6 +3253,7 @@
<string name="keywords_storage_settings" msgid="297283751968446577">"пам’ять, кеш, дані, видалити, очистити, звільнити, місце"</string>
<string name="keywords_bluetooth_settings" msgid="6804844062789439858">"під’єднано, пристрій, навушники, гарнітура, динамік, бездротовий, створення пари, вакуумні навушники, музика, медіа-вміст"</string>
<string name="keywords_wallpaper" msgid="5058364390917429896">"фон, екран, заблокований екран, тема"</string>
+ <string name="keywords_styles" msgid="5828725481814049422">"форма значка, акцентний колір, шрифт"</string>
<string name="keywords_assist_input" msgid="5017533309492679287">"за умовчанням, асистент"</string>
<string name="keywords_default_payment_app" msgid="3838565809518896799">"платіж, за умовчанням"</string>
<string name="keywords_ambient_display" msgid="3103487805748659132">"вхідне сповіщення"</string>
@@ -3266,7 +3263,7 @@
<string name="keywords_notification_vibration" msgid="31924624421190547">"тактильна реакція, вібрація, чутливість"</string>
<string name="keywords_battery_saver_sticky" msgid="5586215686021650278">"режим енергозбереження, закріплений, постійний, економія заряду, акумулятор"</string>
<string name="keywords_battery_saver_schedule" msgid="7358789228486231944">"послідовність дій, розклад, режим енергозбереження, економія заряду, акумулятор, автоматично, відсоток"</string>
- <string name="keywords_add_an_account" msgid="6488139919428902434">"робочий профіль"</string>
+ <string name="keywords_enhance_4g_lte" msgid="2273810564244790859">"volte, виклики з розширеними можливостями, виклики в режимі 4G"</string>
<string name="default_sound" msgid="8821684447333687810">"Звук за умовчанням"</string>
<string name="sound_settings_summary" msgid="4100853606668287965">"Гучність дзвінка: <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
<string name="sound_dashboard_summary" msgid="3402435125958012986">"Гучність, вібросигнал і режим \"Не турбувати\""</string>
@@ -4015,7 +4012,6 @@
<string name="permit_draw_overlay" msgid="7456536798718633432">"Показувати поверх інших додатків"</string>
<string name="allow_overlay_description" msgid="8961670023925421358">"Дозволити цьому додатку відображатися поверх інших відкритих додатків. Він може заважати користуватись іншими додатками або змінювати їх вигляд чи поведінку."</string>
<string name="keywords_vr_listener" msgid="7441221822576384680">"vr віртуальна реальність стерео допоміжний сервіс"</string>
- <string name="keywords_system_alert_window" msgid="5049498015597864850">"показувати діалогове вікно сповіщень системи поверх інших додатків"</string>
<string name="overlay_settings" msgid="6930854109449524280">"Показувати поверх додатків"</string>
<string name="system_alert_window_summary" msgid="602892301318324492">"Додатки, які можуть відображатися поверх інших додатків: <xliff:g id="COUNT_0">%1$d</xliff:g> з <xliff:g id="COUNT_1">%2$d</xliff:g>"</string>
<string name="filter_overlay_apps" msgid="6965969283342557573">"Додатки з дозволом"</string>
@@ -4263,7 +4259,6 @@
<string name="notification_log_details_none" msgid="184131801230614059">"немає"</string>
<string name="notification_log_details_ranking_null" msgid="244660392058720919">"Об’єкта немає в рейтингу."</string>
<string name="notification_log_details_ranking_none" msgid="599607025882587844">"Об’єкт у рейтингу не містить цього ключа."</string>
- <string name="theme_customization_category" msgid="1049181544004163283">"Теми"</string>
<string name="theme_customization_device_default" msgid="5058147707906551368">"Налаштування пристрою за умовчанням"</string>
<string name="display_cutout_emulation" msgid="7466869822418376317">"Відрізання екрана"</string>
<string name="display_cutout_emulation_keywords" msgid="4495418317471622562">"відключення дисплея, переривання"</string>
@@ -4713,6 +4708,8 @@
<string name="network_connection_errorstate_dialog_message" msgid="6953778550775646710">"Щось трапилося. Додаток скасував запит на вибір пристрою."</string>
<string name="network_connection_connect_successful" msgid="5935510954474494928">"Підключено"</string>
<string name="network_connection_request_dialog_showall" msgid="6938922880244567521">"Показати всі"</string>
+ <string name="network_connection_searching_message" msgid="4638576789450817530">"Пошук пристрою…"</string>
+ <string name="network_connection_connecting_message" msgid="3740982406609245654">"Підключення до пристрою…"</string>
<plurals name="show_bluetooth_devices" formatted="false" msgid="1715020480026568408">
<item quantity="one">Підключено <xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> пристрій</item>
<item quantity="few">Підключено <xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> пристрої</item>
diff --git a/res/values-ur/strings.xml b/res/values-ur/strings.xml
index 9b714a6..846353d 100644
--- a/res/values-ur/strings.xml
+++ b/res/values-ur/strings.xml
@@ -360,8 +360,6 @@
<string name="security_enable_widgets_disabled_summary" msgid="6392489775303464905">"منتظم کی طرف سے غیر فعال کردہ"</string>
<string name="lockdown_settings_title" msgid="7393790212603280213">"مقفل کرنے کا اختیار دکھائیں"</string>
<string name="lockdown_settings_summary" msgid="4359438673563318171">"مقفل اسکرین پر Smart Lock، بایو میٹرک غیر مقفل کرنے کی سہولت اور اطلاعات کو آف کرنے والے پاور بٹن کا اختیار ڈسپلے کریں"</string>
- <string name="trust_agents_extend_unlock_title" msgid="2796555263565097031">"صرف ٹرسٹ ایجنٹس کے لیے غیر مقفل کی توسیع"</string>
- <string name="trust_agents_extend_unlock_summary" msgid="3976344969220255010">"فعال ہونے پر، ٹرسٹ ایجنٹس آپ کے آلہ کو لمبے وقت تک غیر مقفل رکھیں گے، لیکن مقفل شدہ آلہ کو اب غیر مقفل نہیں کر پائیں گے۔"</string>
<string name="trust_lost_locks_screen_title" msgid="2992742466966021682">"اعتماد کھو دینے پر مقفل اسکرین"</string>
<string name="trust_lost_locks_screen_summary" msgid="693784434582021206">"اگر فعال ہے تو، جب ٹرسٹ ایجنٹ کے اعتماد کھو دینے پر آلہ مقفل ہو جائے گا"</string>
<string name="owner_info_settings_summary" msgid="7472393443779227052">"کوئی نہیں"</string>
@@ -937,6 +935,8 @@
<string name="wifi_eap_identity" msgid="4359453783379679103">"شناخت"</string>
<string name="wifi_eap_anonymous" msgid="2989469344116577955">"گمنام شناخت"</string>
<string name="wifi_password" msgid="5948219759936151048">"پاس ورڈ"</string>
+ <!-- no translation found for wifi_sae_password_id (1697832722221765763) -->
+ <skip />
<string name="wifi_show_password" msgid="6461249871236968884">"پاس ورڈ دکھائیں"</string>
<string name="wifi_ap_band_config" msgid="1611826705989117930">"AP بینڈ منتخب کریں"</string>
<string name="wifi_ap_choose_auto" msgid="2677800651271769965">"خودکار"</string>
@@ -957,7 +957,6 @@
<string name="wifi_dpp_share_wifi" msgid="9065890131734833809">"Wi-Fi کا اشتراک کریں"</string>
<string name="wifi_dpp_scan_qr_code_with_another_device" msgid="5854392840857123065">"”<xliff:g id="SSID">%1$s</xliff:g>“ سے منسلک ہونے کے لیے اس QR کوڈ کو اسکین کریں اور پاس ورڈ کا اشتراک کریں"</string>
<string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="4436318319178361543">"”<xliff:g id="SSID">%1$s</xliff:g>“ سے منسلک ہونے کے لیے یہ QR کوڈ اسکین کریں"</string>
- <string name="wifi_dpp_could_not_detect_valid_qr_code" msgid="641893675646330576">"QR کوڈ کو نہیں پڑھا جا سکا۔ کوڈ کو پھر سے سینٹر میں کریں اور دوبارہ کوشش کریں"</string>
<string name="wifi_dpp_failure_authentication_or_configuration" msgid="3372757783382381044">"دوبارہ کوشش کریں۔ اگر مسئلہ جاری رہتا ہے تو آلہ کے صنعت کار سے رابطہ کریں"</string>
<string name="wifi_dpp_failure_not_compatible" msgid="2829930473520603740">"کچھ غلط ہو گیا"</string>
<string name="wifi_dpp_failure_timeout" msgid="5228320772245820458">"یقینی بنائیں کے آلہ کو پلگ ان، چارج اور آن کر دیا گیا ہے"</string>
@@ -980,6 +979,7 @@
<string name="wifi_dpp_hotspot_password" msgid="4120419278831581613">"ہاٹ اسپاٹ کا پاس ورڈ: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
<string name="wifi_dpp_add_device" msgid="4072206063308645677">"آلہ شامل کریں"</string>
<string name="wifi_dpp_connect_network_using_qr_code" msgid="3887335309163999665">"اس نیٹ ورک میں کوئی آلہ شامل کرنے کے لیے QR کوڈ استعمال کریں"</string>
+ <string name="wifi_dpp_qr_code_is_not_valid_format" msgid="3700087439867692944">"QR کوڈ درست فارمیٹ نہیں ہے"</string>
<string name="retry" msgid="6472609612090877557">"پھر کوشش کریں"</string>
<string name="wifi_shared" msgid="844142443226926070">"دوسرے آلہ صارفین کے ساتھ اشتراک کریں"</string>
<string name="wifi_unchanged" msgid="3410422020930397102">"(غیر تبدیل شدہ)"</string>
@@ -1129,6 +1129,7 @@
<string name="emergency_address_title" msgid="932729250447887545">"ہنگامی پتہ"</string>
<string name="emergency_address_summary" msgid="7751971156196115129">"جب آپ Wi-Fi سے ہنگامی کال کرتے ہیں، تو آپ کے مقام کے طور پر استعمال ہوتا ہے"</string>
<string name="private_dns_help_message" msgid="3299567069152568958">"نجی DNS کی خصوصیات کے بارے میں "<annotation id="url">"مزید جانیں"</annotation></string>
+ <string name="private_dns_mode_on" msgid="5882613439541371003">"آن"</string>
<string name="wifi_calling_pref_managed_by_carrier" msgid="6845711858866828986">"ترتیب کیریئر کے زیر انتظام ہے"</string>
<string name="wifi_calling_settings_activation_instructions" msgid="7492509632478260955">"Wi-Fi کالنگ فعال کریں"</string>
<string name="wifi_calling_turn_on" msgid="1171403510313983983">"Wi-Fi کالنگ آن کریں"</string>
@@ -1872,7 +1873,7 @@
<string name="default_emergency_app" msgid="1951760659640369980">"ہنگامی ایپ"</string>
<string name="reset_app_preferences" msgid="1321050641018356925">"ایپ کی ترجیحات کو ری سیٹ کریں"</string>
<string name="reset_app_preferences_title" msgid="6093179367325336662">"ایپ کی ترجیحات کو ری سیٹ کریں؟"</string>
- <string name="reset_app_preferences_desc" msgid="4822447731869201512">"اس سے مندرجہ ذیل کیلئے تمام ترجیحات ری سیٹ ہو جائیں گی:\n\n"<li>"غیر فعال ایپس"</li>\n<li>"غیر فعال ایپس کی اطلاعات"</li>\n<li>"کارروائیوں کیلئے ڈیفالٹ ایپلیکیشنز"</li>\n<li>"ایپس کیلئے پس منظر کے ڈیٹا کی پابندیاں"</li>\n<li>"کوئی بھی اجازتی پابندیاں"</li>\n\n" آپ کسی ایپ کے ڈیٹا سے محروم نہیں ہوں گے۔"</string>
+ <string name="reset_app_preferences_desc" msgid="731757609326016760">"یہ مندرجہ ذیل کے لیے تمام ترجیحات کو دوبارہ ترتیب دے گا:\n\n"<li>"غیر فعال کردہ ایپس"</li>\n<li>"غیر فعال کردہ ایپس کی اطلاعات"</li>\n<li>"کارروائیوں کے لیے ڈیفالٹ ایپلیکیشنز"</li>\n<li>"ایپس کے لیے پس منظر کے ڈیٹا کی پابندیاں"</li>\n<li>"کوئی اجازتی پابندیاں"</li>\n\n"آپ کسی بھی ایپ کے ڈیٹا سے محروم نہیں ہوں گے۔"</string>
<string name="reset_app_preferences_button" msgid="2559089511841281242">"ایپس کو دوبارہ ترتیب دیں"</string>
<string name="manage_space_text" msgid="8852711522447794676">"خالی جگہ کا نظم کریں"</string>
<string name="filter" msgid="2018011724373033887">"فلٹر"</string>
@@ -2087,7 +2088,7 @@
<string name="accessibility_screen_magnification_short_summary" msgid="3411979839172752057">"زوم کرنے کیلئے 3 بار تھپتھپائیں"</string>
<string name="accessibility_screen_magnification_navbar_short_summary" msgid="3693116360267980492">"زوم کرنے کیلئے ایک بٹن پر تھپتھپائیں"</string>
<string name="accessibility_screen_magnification_summary" msgid="5258868553337478505"><b>"زوم کرنے کیلئے"</b>"، تیزی سے اسکرین پر 3 بار تھپتھپائیں۔\n"<ul><li>"اسکرول کرنے کیلئے 2 یا زیادہ انگلیوں کو گھسیٹیں"</li>\n<li>"زوم ایڈجسٹ کرنے کیلئے 2 یا زیادہ انگلیوں سے چٹکی بھریں"</li></ul>\n\n<b>"عارضی طور پر زوم کرنے کیلئے"</b>"، تیزی سے اسکرین کو 3 بار تھپتھپائیں اور تیسری تھپتھپاہٹ پر اپنی انگلی کو نیچے دبائے رکھیں۔\n"<ul><li>"اسکرین کے اوپر اِدھر اُدھر حرکت دینے کیلئے گھسیٹیں"</li>\n<li>"زوم آؤٹ کرنے کیلئے انگلی اٹھائیں"</li></ul>\n\n"آپ کی بورڈ اور نیویگیشن بار پر زوم ان نہیں کر سکتے۔"</string>
- <string name="accessibility_screen_magnification_navbar_summary" msgid="2272878354599332009">"جب نوٹیفکیشن آن ہو، تو آپ اپنی اسکرین پر زوم ان کرسکتے ہیں۔\n\n"<b>"زوم کرنے کے لیے "</b>"، نوٹیفکیشن شروع کریں، پھر اسکرین پر کہیں بھی تھپتھپائیں۔\n"<ul><li>" سکرول کرنے کے لیے 2 یا زائد انگلیوں سے گھسیٹیں"</li>\n<li>"• زوم ایڈجیسٹ کرنے کے لیے 2 یا زائد انگلیوں سے چٹکی بھریں"</li></ul>\n\n<b>"عارضی طورپر زوم کرنے کے لیے"</b>"، نوٹیفکیشن شروع کریں، پھر اسکرین پر کہیں بھی ٹچ کرکے ہولڈ کریں۔\n"<ul><li>"• اسکرین کے اردگرد منتقل کرنے کے لیے گھسیٹیں"</li>\n<li>"• زوم آؤٹ کرنے کے لیے انگلی اٹھائیں"</li></ul>\n\n"آپ کی بورڈ یا نیویگیشن بار پر زوم ان نہیں کرسکتے۔"</string>
+ <string name="accessibility_screen_magnification_navbar_summary" msgid="6700716275347612310">"جب میگنیفکیشن آن ہو، تو آپ اپنی اسکرین پر زوم ان کرسکتے ہیں۔\n\n"<b>"زوم کرنے کے لیے"</b>"، میگنیفکیشن شروع کریں، پھر اسکرین پر کہیں بھی تھپتھپائیں۔\n"<ul><li>" اسکرول کرنے کے لیے 2 یا زائد انگلیوں سے گھسیٹیں"</li>\n<li>"زوم ایڈجیسٹ کرنے کے لیے 2 یا زائد انگلیوں سے چٹکی بھریں"</li></ul>\n\n<b>"عارضی طور پر زوم کرنے کے لیے"</b>"، میگنیفکیشن شروع کریں، پھر اسکرین پر کہیں بھی ٹچ اور ہولڈ کریں۔\n"<ul><li>"اسکرین کے اردگرد منتقل کرنے کے لیے گھسیٹیں"</li>\n<li>"زوم آؤٹ کرنے کے لیے انگلی اٹھائیں"</li></ul>\n\n"آپ کی بورڈ یا نیویگیشن بار پر زوم ان نہیں کرسکتے۔"</string>
<string name="accessibility_tutorial_dialog_title_button" msgid="3682222614034474845">"کھولنے کے لیے ایکسیسبیلٹی بٹن کا استعمال کریں"</string>
<string name="accessibility_tutorial_dialog_title_gesture" msgid="1342726230497913398">"کھولنے کے لیے اشارہ استعمال کریں"</string>
<string name="accessibility_tutorial_dialog_title_gesture_settings" msgid="8539392614235820285">"نیا رسائی اشارہ استعمال کریں"</string>
@@ -2140,8 +2141,7 @@
<string name="accessibility_hearingaid_title" msgid="8312145423610648518">"سماعتی آلات"</string>
<string name="accessibility_hearingaid_not_connected_summary" msgid="6240237523789614599">"کوئی سماعتی آلہ منسلک نہیں ہے"</string>
<string name="accessibility_hearingaid_adding_summary" msgid="2947474468412309778">"سماعتی آلات شامل کریں"</string>
- <string name="accessibility_hearingaid_pair_instructions_first_message" msgid="3912093691643131154">"اپنے سماعتی آلات کا جوڑا بنانے کے لئے اگلی اسکرین پر اپنا آلہ تلاش کریں اور تھپتھپائیں۔"</string>
- <string name="accessibility_hearingaid_pair_instructions_second_message" msgid="5596683393607650243">"یقینی بنائیں کہ آپ کے سماعتی آلات جوڑا بنانے کی وضع میں ہیں۔"</string>
+ <string name="accessibility_hearingaid_pair_instructions_message" msgid="3094382949733435414">"اپنے سماعتی آلات کا جوڑا بنانے کے لیے، اگلی اسکرین پر اپنا آلہ تلاش کریں اور تھپتھپائیں۔ یقینی بنائیں کہ آپ کے سماعتی آلات جوڑا بنانے کی وضع میں ہیں۔"</string>
<string name="accessibility_hearingaid_active_device_summary" msgid="3924362383258688984">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> فعال ہے"</string>
<plurals name="show_number_hearingaid_count" formatted="false" msgid="3160782397139295486">
<item quantity="other"><xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> محفوظ کردہ سماعتی آلات</item>
@@ -2490,7 +2490,6 @@
<string name="menu_stats_last_unplugged" msgid="5922246077592434526">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> کیلئے آخری بار پلگ نکالے جانے کے وقت"</string>
<string name="menu_stats_total" msgid="8973377864854807854">"مجموعی استعمال"</string>
<string name="menu_stats_refresh" msgid="1676215433344981075">"ریفریش کریں"</string>
- <string name="process_kernel_label" msgid="3916858646836739323">"Android OS"</string>
<string name="process_mediaserver_label" msgid="6500382062945689285">"Mediaserver"</string>
<string name="process_dex2oat_label" msgid="2592408651060518226">"ایپ کو بہتر بنانا"</string>
<string name="battery_saver" msgid="8172485772238572153">"بیٹری سیور"</string>
@@ -2621,8 +2620,6 @@
<string name="no_device_admins" msgid="4846602835339095768">"آلہ کے منتظم کی کوئی ایپ دستیاب نہیں ہے"</string>
<string name="personal_device_admin_title" msgid="2849617316347669861">"ذاتی"</string>
<string name="managed_device_admin_title" msgid="7853955652864478435">"دفتر"</string>
- <string name="sms_access_restriction_enabled" msgid="7054488078710530278">"SMS اور کال لاگ تک رسائی کو محدود کریں"</string>
- <string name="sms_access_restriction_enabled_summary" msgid="6851339654677842328">"صرف ڈیفالٹ فون اور پیغام رسانی کی ایپس میں SMS اور کال لاگ کی اجازتیں ہیں"</string>
<string name="no_trust_agents" msgid="7450273545568977523">"ٹرسٹ کے کوئی ایجنٹس دستیاب نہیں ہیں"</string>
<string name="add_device_admin_msg" msgid="1501847129819382149">"آلہ کے منتظم کی ایپ فعال کریں؟"</string>
<string name="add_device_admin" msgid="4192055385312215731">"اس آلہ کے منتظم کی ایپ فعال کریں"</string>
@@ -3109,7 +3106,7 @@
<string name="keywords_app_default" msgid="5822717006354487071">"ان کے ساتھ کھولیں"</string>
<string name="keywords_applications_settings" msgid="1268353611121497450">"ایپلیکیشنز"</string>
<string name="keywords_time_zone" msgid="998254736898753085">"ٹائم زون"</string>
- <string name="keywords_draw_overlay" msgid="4130899177619041842">"چَیٹ ہیڈ"</string>
+ <string name="keywords_draw_overlay" msgid="1001120206241401007">"چیٹ ہیڈ، سسٹم، الرٹ، ونڈو، ڈائیلاگ، دیگر ایپس پر ڈسپلے، ڈرا"</string>
<string name="keywords_flashlight" msgid="6161632177705233710">"فلیش لائٹ، روشنی، ٹارچ"</string>
<string name="keywords_change_wifi_state" msgid="627068244033681010">"wifi, wi-fi ٹوگل، کنٹرول"</string>
<string name="keywords_more_mobile_networks" msgid="8995946622054642367">"سیلولر، موبائل، سیل کیریئر، وائرلیس، ڈیٹا، 4g,3g, 2g, lte"</string>
@@ -3133,7 +3130,7 @@
<string name="keywords_sounds_and_notifications_interruptions" msgid="5426093074031208917">"ڈسٹرب نہ کریں، مداخلت کرنا، مداخلت، بریک"</string>
<string name="keywords_app" msgid="6334757056536837791">"RAM"</string>
<string name="keywords_location" msgid="4132655528196729043">"قریبی، مقام، سرگزشت، اطلاع دہندگی، GPS"</string>
- <string name="keywords_accounts" msgid="1957925565953357627">"اکاؤنٹ"</string>
+ <string name="keywords_accounts" msgid="4479029747403203867">"اکاؤنٹ، اکاؤنٹ شامل کریں، دفتری پروفائل"</string>
<string name="keywords_users" msgid="3434190133131387942">"پابندی، پابندی لگائیں، پابندی شدہ"</string>
<string name="keywords_keyboard_and_ime" msgid="9143339015329957107">"متن کی اصلاح، اصلاح، آواز، ارتعاش، خودکار، زبان، اشارہ، تجویز کریں، تجویز، تھیم، ناگوار، لفظ، ٹائپ کریں، emoji، بین الاقوامی"</string>
<string name="keywords_reset_apps" msgid="5293291209613191845">"ری سیٹ کریں، ترجیحات، ڈیفالٹ"</string>
@@ -3171,6 +3168,7 @@
<string name="keywords_storage_settings" msgid="297283751968446577">"میموری، کیش، ڈیٹا، حذف، صاف، خالی، جگہ"</string>
<string name="keywords_bluetooth_settings" msgid="6804844062789439858">"منسلک، آلہ، ہیڈ فونز، ہیڈ سیٹ، اسپیکر، وائرلیس، جوڑا، ایئر بڈز، موسیقی، میڈیا"</string>
<string name="keywords_wallpaper" msgid="5058364390917429896">"پس منظر، اسکرین، لاک اسکرین، تھیم"</string>
+ <string name="keywords_styles" msgid="5828725481814049422">"آئیکن، شکل، لہجہ کا رنگ، فونٹ"</string>
<string name="keywords_assist_input" msgid="5017533309492679287">"ڈیفالٹ، اسسٹنٹ"</string>
<string name="keywords_default_payment_app" msgid="3838565809518896799">"ادائیگی، ڈیفالٹ"</string>
<string name="keywords_ambient_display" msgid="3103487805748659132">"آنے والی اطلاع"</string>
@@ -3180,7 +3178,7 @@
<string name="keywords_notification_vibration" msgid="31924624421190547">"ہیپٹکس، وائبریٹ، حساسیت"</string>
<string name="keywords_battery_saver_sticky" msgid="5586215686021650278">"بیٹری سیور، چپک جانے والی، برقرار، پاور سیور، بیٹری"</string>
<string name="keywords_battery_saver_schedule" msgid="7358789228486231944">"روٹین، شیڈول، بیٹری سیور، پاور سیور، بیٹری، خودکار طور پر، فیصد"</string>
- <string name="keywords_add_an_account" msgid="6488139919428902434">"دفتری پروفائل"</string>
+ <string name="keywords_enhance_4g_lte" msgid="2273810564244790859">"volte، اعلی درجے کی کالنگ، 4G کالنگ"</string>
<string name="default_sound" msgid="8821684447333687810">"ڈیفالٹ ساؤنڈ"</string>
<string name="sound_settings_summary" msgid="4100853606668287965">"رنگ والیوم <xliff:g id="PERCENTAGE">%1$s</xliff:g> پر ہے"</string>
<string name="sound_dashboard_summary" msgid="3402435125958012986">"والیوم، ارتعاش، ڈسٹرب نہ کریں"</string>
@@ -3887,7 +3885,6 @@
<string name="permit_draw_overlay" msgid="7456536798718633432">"دیگر ایپس پر ڈسپلے کی اجازت دیں"</string>
<string name="allow_overlay_description" msgid="8961670023925421358">"اپنی زیر استعمال دیگر ایپس کے اوپر اس ایپ کو ڈسپلے ہونے کی اجازت دیں۔ یہ آپ کی ان ایپس کے استعمال میں مداخلت کر سکتی ہے یا وہ جس طرح دکھائی دیتی یا برتاؤ کرتی دکھائی دیتی ہیں، اس میں تبدیلی کر سکتی ہے۔"</string>
<string name="keywords_vr_listener" msgid="7441221822576384680">"vr ورچوئل رئیلٹی سامع اسٹیریو مددگار سروس"</string>
- <string name="keywords_system_alert_window" msgid="5049498015597864850">"دیگر ایپس کے اوپر سسٹم الرٹ ونڈو ڈائیلاگ کا ڈسپلے"</string>
<string name="overlay_settings" msgid="6930854109449524280">"دیگر ایپس پر ڈسپلے کریں"</string>
<string name="system_alert_window_summary" msgid="602892301318324492">"<xliff:g id="COUNT_1">%2$d</xliff:g> میں سے <xliff:g id="COUNT_0">%1$d</xliff:g> ایپس کو دیگر ایپس پر دکھانے کی اجازت ہے"</string>
<string name="filter_overlay_apps" msgid="6965969283342557573">"اجازت والی ایپس"</string>
@@ -4123,7 +4120,6 @@
<string name="notification_log_details_none" msgid="184131801230614059">"کوئی نہیں"</string>
<string name="notification_log_details_ranking_null" msgid="244660392058720919">"رینکنگ آبجیکٹ غائب ہے۔"</string>
<string name="notification_log_details_ranking_none" msgid="599607025882587844">"یہ کلید رینکنگ آبجیکٹ میں موجود نہیں ہے۔"</string>
- <string name="theme_customization_category" msgid="1049181544004163283">"تھیم لگایا جا رہا ہے"</string>
<string name="theme_customization_device_default" msgid="5058147707906551368">"آلہ ڈیفالٹ"</string>
<string name="display_cutout_emulation" msgid="7466869822418376317">"ڈسپلے کٹ آؤٹ"</string>
<string name="display_cutout_emulation_keywords" msgid="4495418317471622562">"ڈسپلے کٹ آؤٹ، نشان"</string>
@@ -4549,6 +4545,8 @@
<string name="network_connection_errorstate_dialog_message" msgid="6953778550775646710">"کچھ غلط ہو گیا۔ ایپلیکیشن نے آلہ کو منتخب کرنے کی درخواست کو منسوخ کر دیا ہے۔"</string>
<string name="network_connection_connect_successful" msgid="5935510954474494928">"کنکشن کامیاب"</string>
<string name="network_connection_request_dialog_showall" msgid="6938922880244567521">"سبھی دکھائیں"</string>
+ <string name="network_connection_searching_message" msgid="4638576789450817530">"آلے کی تلاش جاری ہے…"</string>
+ <string name="network_connection_connecting_message" msgid="3740982406609245654">"آلہ سے منسلک ہو رہا ہے…"</string>
<plurals name="show_bluetooth_devices" formatted="false" msgid="1715020480026568408">
<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>
diff --git a/res/values-uz/strings.xml b/res/values-uz/strings.xml
index 4ac05b3..b67499b 100644
--- a/res/values-uz/strings.xml
+++ b/res/values-uz/strings.xml
@@ -360,8 +360,6 @@
<string name="security_enable_widgets_disabled_summary" msgid="6392489775303464905">"Administrator tomonidan o‘chirilgan"</string>
<string name="lockdown_settings_title" msgid="7393790212603280213">"Qulflash tugmasini chiqarish"</string>
<string name="lockdown_settings_summary" msgid="4359438673563318171">"Smart Lock, qulfni biometrik sensor bilan ochish va ekran qulfidagi bildirishnomalarni faolsizlantiradigan quvvat tugmasini chiqarish"</string>
- <string name="trust_agents_extend_unlock_title" msgid="2796555263565097031">"Ishonch agentlari qulf ochishni sura oladi"</string>
- <string name="trust_agents_extend_unlock_summary" msgid="3976344969220255010">"Bu parametr yoqilsa, ishonch agentlari uzoq vaqt qulfsiz saqlaydi, lekin qulflangan qurilmani qulfdan chiqara olmaydi."</string>
<string name="trust_lost_locks_screen_title" msgid="2992742466966021682">"Ishonch yoʻqolsa, ekran qulflansin"</string>
<string name="trust_lost_locks_screen_summary" msgid="693784434582021206">"Bu parametr yoqilsa, oxirgi ishonchli agent ishonchni yoʻqotsa, qurilma qulflanadi"</string>
<string name="owner_info_settings_summary" msgid="7472393443779227052">"Hech narsa kiritilmagan"</string>
@@ -937,6 +935,7 @@
<string name="wifi_eap_identity" msgid="4359453783379679103">"Nom"</string>
<string name="wifi_eap_anonymous" msgid="2989469344116577955">"Anonim nom"</string>
<string name="wifi_password" msgid="5948219759936151048">"Parol"</string>
+ <string name="wifi_sae_password_id" msgid="1697832722221765763">"SAE parol identifikatori"</string>
<string name="wifi_show_password" msgid="6461249871236968884">"Parol berkitilmasin"</string>
<string name="wifi_ap_band_config" msgid="1611826705989117930">"Wi-Fi chastotalari diapazoni"</string>
<string name="wifi_ap_choose_auto" msgid="2677800651271769965">"Avtomatik"</string>
@@ -957,7 +956,6 @@
<string name="wifi_dpp_share_wifi" msgid="9065890131734833809">"Wi‑Fi tarmoqni ulashish"</string>
<string name="wifi_dpp_scan_qr_code_with_another_device" msgid="5854392840857123065">"“<xliff:g id="SSID">%1$s</xliff:g>” nomli tarmoqqa ulanish va parolni ulashish uchun mazkur QR kodni skanerlang"</string>
<string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="4436318319178361543">"“<xliff:g id="SSID">%1$s</xliff:g>” nomli tarmoqqa ulanish uchun mazkur QR kodni skanerlang"</string>
- <string name="wifi_dpp_could_not_detect_valid_qr_code" msgid="641893675646330576">"QR kod oʻqilmadi Kodni kamera oʻrtasiga moslab, qaytadan urining"</string>
<string name="wifi_dpp_failure_authentication_or_configuration" msgid="3372757783382381044">"Qayta urining. Muammo qaytarilsa, qurilma ishlab chiqaruvchisiga murojaat qiling"</string>
<string name="wifi_dpp_failure_not_compatible" msgid="2829930473520603740">"Xatolik yuz berdi"</string>
<string name="wifi_dpp_failure_timeout" msgid="5228320772245820458">"Qurilma quvvat manbaiga ulangan, quvvati yetarli va yoniqligini tekshiring"</string>
@@ -980,6 +978,7 @@
<string name="wifi_dpp_hotspot_password" msgid="4120419278831581613">"Hotspot paroli: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
<string name="wifi_dpp_add_device" msgid="4072206063308645677">"Qurilma kiritish"</string>
<string name="wifi_dpp_connect_network_using_qr_code" msgid="3887335309163999665">"Qurilmani bu tarmoqqa kiritish uchun QR kodni skanlang"</string>
+ <string name="wifi_dpp_qr_code_is_not_valid_format" msgid="3700087439867692944">"QR xato formatda"</string>
<string name="retry" msgid="6472609612090877557">"Qaytadan"</string>
<string name="wifi_shared" msgid="844142443226926070">"Qurilmaning boshqa foydalanuvchilari bilan ulashish"</string>
<string name="wifi_unchanged" msgid="3410422020930397102">"(o‘zgartirilmagan)"</string>
@@ -1129,6 +1128,7 @@
<string name="emergency_address_title" msgid="932729250447887545">"Favqulodda holatlardagi manzili"</string>
<string name="emergency_address_summary" msgid="7751971156196115129">"Wi‑Fi orqali favqulodda chaqiruv amalga oshirilganda joylashuvingizdan foydalaniladi"</string>
<string name="private_dns_help_message" msgid="3299567069152568958">"Shaxsiy DNS imkoniyatlari haqida "<annotation id="url">"batafsil"</annotation></string>
+ <string name="private_dns_mode_on" msgid="5882613439541371003">"Yoniq"</string>
<string name="wifi_calling_pref_managed_by_carrier" msgid="6845711858866828986">"Bu sozlamalarni aloqa operatori boshqaradi"</string>
<string name="wifi_calling_settings_activation_instructions" msgid="7492509632478260955">"Wi-Fi chaqiruvni faollashtiring"</string>
<string name="wifi_calling_turn_on" msgid="1171403510313983983">"Wi-Fi chaqiruvni yoqing"</string>
@@ -1872,7 +1872,7 @@
<string name="default_emergency_app" msgid="1951760659640369980">"Favqulodda bildirishnomalar ilovasi"</string>
<string name="reset_app_preferences" msgid="1321050641018356925">"Standart sozlamalarni tiklash"</string>
<string name="reset_app_preferences_title" msgid="6093179367325336662">"Standart sozlamalar tiklansinmi?"</string>
- <string name="reset_app_preferences_desc" msgid="4822447731869201512">"Quyidagi sozlamalar asliga qaytariladi:\n\n"<li>"Faolsizlantirilgan ilovalar"</li>\n<li>"Faolsizlantirilgan ilovalarning bildirishnomalari"</li>\n<li>"Muayyan amallar uchun birlamchi ilovalar"</li>\n<li>"Fonda internetdan foydalanishga nisbatan cheklovlar"</li>\n<li>"Ruxsatlar uchun barcha cheklovlar"</li>\n\n"Ilovalarga tegishli ma’lumotlar saqlanib qoladi."</string>
+ <string name="reset_app_preferences_desc" msgid="731757609326016760">"Quyidagi sozlamalar asliga qaytariladi:\n\n "<li>"Faolsizlantirilgan ilovalar"</li>\n" "<li>"Faolsizlantirilgan ilovalarning bildirishnomalari"</li>\n" "<li>"Muayyan amallar uchun birlamchi ilovalar"</li>\n" "<li>"Fonda internetdan foydalanishga nisbatan cheklovlar"</li>\n" "<li>"Ruxsatlar uchun barcha cheklovlar"</li>\n\n"Ilovalarga tegishli axborotlar saqlanib qoladi."</string>
<string name="reset_app_preferences_button" msgid="2559089511841281242">"OK"</string>
<string name="manage_space_text" msgid="8852711522447794676">"Xotiradagi bo‘sh joy boshqaruvi"</string>
<string name="filter" msgid="2018011724373033887">"Saralash"</string>
@@ -2087,7 +2087,7 @@
<string name="accessibility_screen_magnification_short_summary" msgid="3411979839172752057">"3 marta bosib masshtabni o‘zgartirish"</string>
<string name="accessibility_screen_magnification_navbar_short_summary" msgid="3693116360267980492">"Kattalashtirish uchun tugmani bosing"</string>
<string name="accessibility_screen_magnification_summary" msgid="5258868553337478505"><b>"Kattalashtirish"</b>" uchun ekranga bitta barmoq bilan 3 marta bosing.\n"<ul><li>"Siljitish uchun ikkita barmog‘ingiz bilan suring"</li>\n<li>"Masshtabini o‘zgartirish uchun ekran ustida ikki barmog‘ingizni jipslashtiring"</li></ul>\n\n<b>"Vaqtinchalik kattalashtirish"</b>" uchun ekran ustida barmog‘ingizni 3 marta tez-tez bosib, oxirgisini bosib turing.\n"<ul><li>"Ekran bo‘ylab harakatlanish uchun suring"</li>\n<li>"O‘z holatiga qaytarish uchun barmoqni qo‘yib yuboring"</li></ul>\n\n"Klaviatura yoki navigatsiya paneli orqali kattalashtirib bo‘lmaydi."</string>
- <string name="accessibility_screen_magnification_navbar_summary" msgid="2272878354599332009">"Kattalashtirish funksiyasi yordamida ekrandagi tasvirlarni yaqinlashtirishingiz mumkin.\n\n"<b>"Tasvirni yaqinlashtirish uchun"</b>" bu xizmatni ishga tushiring va ekranning biror yeriga bosing.\n"<ul><li>"• Yaqinlashtirilgan hududni siljitish uchun 2 ta yoki koʻproq barmoq bilan suring"</li>\n<li>"• Yaqinlashtirish yoki uzoqlashtirish uchun 2 ta yoki koʻproq barmoq bilan chimding"</li></ul>\n\n<b>"Tasvrni vaqtinchalik yaqinlashtirish uchun"</b>" kattalashtirish funksiyasini ishga tushiring va ekranning biror yeriga bosib turing.\n"<ul><li>"• Ekranning biror qismiga oʻtish uchun barmoq bilan suring"</li>\n<li>"• Chap barmoq bilan uzoqlashtirish mumkin"</li></ul>\n\n"Klaviatura yoki navigatsiya paneli orqali yaqinlashtirish imkonsiz."</string>
+ <string name="accessibility_screen_magnification_navbar_summary" msgid="6700716275347612310">"Agar kattalashtirish yoqilsa, ekrandagi maʼlumotlarni kattalashtirish mumkin.\n\n"<b>"Kattalashtirish"</b>" uchun zum tugmasini bosib, ekranning istalgan joyini bosing.\n"<ul><li>"Siljitish uchun bir nechta barmogʻingiz bilan suring"</li>\n<li>"Masshtabini oʻzgartirish uchun bir nechta barmogʻingizni jipslashtiring"</li></ul>\n\n<b>"Vaqtinchalik kattalashtirish uchun"</b>" zum tugmasini bosib, ekranning istalgan joyini bosing va ushlab turing.\n"<ul><li>"Ekran boʻylab harakatlanish uchun suring"</li>\n<li>"Oʻz holatiga qaytarish uchun barmoqni qoʻyib yuboring"</li></ul>\n\n"Klaviatura yoki navigatsiya paneli orqali kattalashtirib boʻlmaydi."</string>
<string name="accessibility_tutorial_dialog_title_button" msgid="3682222614034474845">"Ochish uchun maxsus imkoniyatlar tugmasi"</string>
<string name="accessibility_tutorial_dialog_title_gesture" msgid="1342726230497913398">"Imo-ishoralardan foydalaning"</string>
<string name="accessibility_tutorial_dialog_title_gesture_settings" msgid="8539392614235820285">"Maxsus imkoniyatlarga oid yangi ishora"</string>
@@ -2140,8 +2140,7 @@
<string name="accessibility_hearingaid_title" msgid="8312145423610648518">"Eshitish apparatlari"</string>
<string name="accessibility_hearingaid_not_connected_summary" msgid="6240237523789614599">"Hech qanday eshitish apparatlari ulanmagan"</string>
<string name="accessibility_hearingaid_adding_summary" msgid="2947474468412309778">"Eshitish apparatlarini kiritish"</string>
- <string name="accessibility_hearingaid_pair_instructions_first_message" msgid="3912093691643131154">"Eshitish apparatlarini ulash uchun keyingi ekranda qurilmani topib, ustiga bosing."</string>
- <string name="accessibility_hearingaid_pair_instructions_second_message" msgid="5596683393607650243">"Eshitish apparatlari ulanish rejimida ekanini tekshiring."</string>
+ <string name="accessibility_hearingaid_pair_instructions_message" msgid="3094382949733435414">"Eshitish apparatlarini ulash uchun keyingi ekranda qurilmani topib, ustiga bosing. Eshitish apparatlari ulanish rejimida ekanini tekshiring."</string>
<string name="accessibility_hearingaid_active_device_summary" msgid="3924362383258688984">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> faol"</string>
<plurals name="show_number_hearingaid_count" formatted="false" msgid="3160782397139295486">
<item quantity="other"><xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> ta saqlangan eshitish apparati</item>
@@ -2500,7 +2499,6 @@
<string name="menu_stats_last_unplugged" msgid="5922246077592434526">"Quvvat manbaidan uzilganiga <xliff:g id="UNPLUGGED">%1$s</xliff:g> bo‘ldi"</string>
<string name="menu_stats_total" msgid="8973377864854807854">"Jami"</string>
<string name="menu_stats_refresh" msgid="1676215433344981075">"Yangilash"</string>
- <string name="process_kernel_label" msgid="3916858646836739323">"Android OS"</string>
<string name="process_mediaserver_label" msgid="6500382062945689285">"Mediaserver"</string>
<string name="process_dex2oat_label" msgid="2592408651060518226">"Ilovalarni optimallashtirish"</string>
<string name="battery_saver" msgid="8172485772238572153">"Quvvat tejash"</string>
@@ -2631,8 +2629,6 @@
<string name="no_device_admins" msgid="4846602835339095768">"Hech qanday qurilma administratori ilovasi o‘rnatilmagan"</string>
<string name="personal_device_admin_title" msgid="2849617316347669861">"Shaxsiy"</string>
<string name="managed_device_admin_title" msgid="7853955652864478435">"Ish"</string>
- <string name="sms_access_restriction_enabled" msgid="7054488078710530278">"SMS va chaqiruvlar jurnaliga kirishni cheklash"</string>
- <string name="sms_access_restriction_enabled_summary" msgid="6851339654677842328">"Faqat asosiy telefon va SMS ilovalarida SMS va chaqiruvlar jurnaliga kirish uchun ruxsat bor"</string>
<string name="no_trust_agents" msgid="7450273545568977523">"Ishonchli agentlar mavjud emas"</string>
<string name="add_device_admin_msg" msgid="1501847129819382149">"Bu ilova faollashtirilsinmi?"</string>
<string name="add_device_admin" msgid="4192055385312215731">"Bu qurilma administratori ilovasini faollashtirish"</string>
@@ -3121,7 +3117,7 @@
<string name="keywords_app_default" msgid="5822717006354487071">"Bu orqali ochish"</string>
<string name="keywords_applications_settings" msgid="1268353611121497450">"Ilovalar"</string>
<string name="keywords_time_zone" msgid="998254736898753085">"vaqt mintaqasi"</string>
- <string name="keywords_draw_overlay" msgid="4130899177619041842">"Chat boshi"</string>
+ <string name="keywords_draw_overlay" msgid="1001120206241401007">"Chat boshi, tizim, bildirishnoma, oyna, muloqot, chiqarish, boshqa ilovalar ustidan, chizish"</string>
<string name="keywords_flashlight" msgid="6161632177705233710">"Chaqnoq, chiroq, yorqinlik"</string>
<string name="keywords_change_wifi_state" msgid="627068244033681010">"Wi-Fi, wi-fi, almashtirish, boshqarish"</string>
<string name="keywords_more_mobile_networks" msgid="8995946622054642367">"mobil, mobil aloqa operatori, simsiz, internet, 4g, 3g, 2g, lte"</string>
@@ -3145,7 +3141,7 @@
<string name="keywords_sounds_and_notifications_interruptions" msgid="5426093074031208917">"bezovta qilmaslik, bezovta, bezovtalik, uzish"</string>
<string name="keywords_app" msgid="6334757056536837791">"RAM"</string>
<string name="keywords_location" msgid="4132655528196729043">"yaqin-atrofda, joylashuv, tarix, xabar berish, GPS"</string>
- <string name="keywords_accounts" msgid="1957925565953357627">"hisob"</string>
+ <string name="keywords_accounts" msgid="4479029747403203867">"hisob, hisob kiritish, ishchi profil"</string>
<string name="keywords_users" msgid="3434190133131387942">"cheklov, cheklash, cheklangan"</string>
<string name="keywords_keyboard_and_ime" msgid="9143339015329957107">"matnni tuzatish, to‘g‘ri, ovoz, tebranish, avto, til, imo-ishora, taklif qilish, taklif, mavzu, haqoratomuz so‘z, yozish, kulgich, xalqaro"</string>
<string name="keywords_reset_apps" msgid="5293291209613191845">"tiklash, sozlamalar, birlamchi"</string>
@@ -3183,6 +3179,7 @@
<string name="keywords_storage_settings" msgid="297283751968446577">"xotira, kesh, maʼlumotlar, oʻchirish, tozalash, ochish, joy"</string>
<string name="keywords_bluetooth_settings" msgid="6804844062789439858">"ulangan, qurilma, quloqliklar, garnitura, karnay, simsiz, ulash, quloqliklar, musiqa, media"</string>
<string name="keywords_wallpaper" msgid="5058364390917429896">"fon, ekran, ekran qulfi, mavzu"</string>
+ <string name="keywords_styles" msgid="5828725481814049422">"belgi shakli, aksent rangi, shrift"</string>
<string name="keywords_assist_input" msgid="5017533309492679287">"birlamchi, assistent"</string>
<string name="keywords_default_payment_app" msgid="3838565809518896799">"to‘lov, birlamchi"</string>
<string name="keywords_ambient_display" msgid="3103487805748659132">"kiruvchi bildirishnoma"</string>
@@ -3192,7 +3189,7 @@
<string name="keywords_notification_vibration" msgid="31924624421190547">"sezish, tebranish, sezuvchanlik"</string>
<string name="keywords_battery_saver_sticky" msgid="5586215686021650278">"quvvat tejash, yopishqoq, davom etish, batareya tejash, batareya"</string>
<string name="keywords_battery_saver_schedule" msgid="7358789228486231944">"amallar ketma-ketligi, jadval, batareya tejagich, quvvat tejagich, batareya, avtomatik, foiz"</string>
- <string name="keywords_add_an_account" msgid="6488139919428902434">"ish profili"</string>
+ <string name="keywords_enhance_4g_lte" msgid="2273810564244790859">"volte, kengaytirilgan chaqiruv, 4g chaqiruv"</string>
<string name="default_sound" msgid="8821684447333687810">"Birlamchi ovoz"</string>
<string name="sound_settings_summary" msgid="4100853606668287965">"Jiringlaganda: <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
<string name="sound_dashboard_summary" msgid="3402435125958012986">"Tovush balandligi, tebranish, Bezovta qilinmasin rejimi"</string>
@@ -3903,7 +3900,6 @@
<string name="permit_draw_overlay" msgid="7456536798718633432">"Boshqa ilovalar ustidan ochilishiga ruxsat"</string>
<string name="allow_overlay_description" msgid="8961670023925421358">"Interfeys elementlarini boshqa oynalar ustidan ochishga ruxsat beradi. Bu funksiya ilovalar bilan ishlashingizga xalaqit qilishi yoki ularning interfeysini buzib tashlashi mumkin."</string>
<string name="keywords_vr_listener" msgid="7441221822576384680">"vr virtual borliq tinglovchi stereo yordamchi xizmat"</string>
- <string name="keywords_system_alert_window" msgid="5049498015597864850">"tizim signal muloqot oynasi boshqa ilovalar ustidan ochilish"</string>
<string name="overlay_settings" msgid="6930854109449524280">"Boshqa ilovalar ustidan ochilish"</string>
<string name="system_alert_window_summary" msgid="602892301318324492">"<xliff:g id="COUNT_0">%1$d</xliff:g> ta ilova boshqa oynalar ustidan ochilishi mumkin (jami: <xliff:g id="COUNT_1">%2$d</xliff:g>)"</string>
<string name="filter_overlay_apps" msgid="6965969283342557573">"Ruxsatga ega ilovalar"</string>
@@ -4139,7 +4135,6 @@
<string name="notification_log_details_none" msgid="184131801230614059">"hech qanday"</string>
<string name="notification_log_details_ranking_null" msgid="244660392058720919">"Obyekt mavjud emas."</string>
<string name="notification_log_details_ranking_none" msgid="599607025882587844">"Obyektda bu kalit yo‘q."</string>
- <string name="theme_customization_category" msgid="1049181544004163283">"Mavzular"</string>
<string name="theme_customization_device_default" msgid="5058147707906551368">"Qurilma standarti"</string>
<string name="display_cutout_emulation" msgid="7466869822418376317">"Ekran kesimi"</string>
<string name="display_cutout_emulation_keywords" msgid="4495418317471622562">"ekran kesimi, kesim"</string>
@@ -4565,6 +4560,8 @@
<string name="network_connection_errorstate_dialog_message" msgid="6953778550775646710">"Xatolik yuz berdi. Ilova qurilmani tanlash talabini bekor qildi."</string>
<string name="network_connection_connect_successful" msgid="5935510954474494928">"Muvaffaqiyatli ulandi!"</string>
<string name="network_connection_request_dialog_showall" msgid="6938922880244567521">"Hammasi"</string>
+ <string name="network_connection_searching_message" msgid="4638576789450817530">"Qurilma qidirilmoqda…"</string>
+ <string name="network_connection_connecting_message" msgid="3740982406609245654">"Qurilmaga ulanilmoqda…"</string>
<plurals name="show_bluetooth_devices" formatted="false" msgid="1715020480026568408">
<item quantity="other"><xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> ta qurilma ulandi</item>
<item quantity="one"><xliff:g id="NUMBER_DEVICE_COUNT_0">%1$d</xliff:g> ta qurilma ulandi</item>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index 8b5efcc..cce4f10 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -360,8 +360,6 @@
<string name="security_enable_widgets_disabled_summary" msgid="6392489775303464905">"Bị quản trị viên vô hiệu hóa"</string>
<string name="lockdown_settings_title" msgid="7393790212603280213">"Hiển thị tùy chọn khóa"</string>
<string name="lockdown_settings_summary" msgid="4359438673563318171">"Hiển thị tùy chọn nút nguồn để tắt tính năng Smart Lock, mở khóa bằng sinh trắc học, và thông báo trên màn hình khóa"</string>
- <string name="trust_agents_extend_unlock_title" msgid="2796555263565097031">"Tác nhân tin cậy chỉ kéo dài thời gian mở khóa"</string>
- <string name="trust_agents_extend_unlock_summary" msgid="3976344969220255010">"Nếu bạn bật, các tác nhân tin cậy sẽ kéo dài thời gian mở khóa, nhưng không thể mở khóa thiết bị bị khóa nữa."</string>
<string name="trust_lost_locks_screen_title" msgid="2992742466966021682">"Khóa màn hình khi mất đi sự tin cậy"</string>
<string name="trust_lost_locks_screen_summary" msgid="693784434582021206">"Nếu bạn bật, thiết bị sẽ khóa khi tác nhân tin cậy cuối cùng mất đi sự tin cậy"</string>
<string name="owner_info_settings_summary" msgid="7472393443779227052">"Không có"</string>
@@ -937,6 +935,7 @@
<string name="wifi_eap_identity" msgid="4359453783379679103">"Nhận dạng"</string>
<string name="wifi_eap_anonymous" msgid="2989469344116577955">"Danh tính ẩn danh"</string>
<string name="wifi_password" msgid="5948219759936151048">"Mật khẩu"</string>
+ <string name="wifi_sae_password_id" msgid="1697832722221765763">"Mã nhận dạng mật khẩu SAE"</string>
<string name="wifi_show_password" msgid="6461249871236968884">"Hiển thị mật khẩu"</string>
<string name="wifi_ap_band_config" msgid="1611826705989117930">"Chọn băng tần AP"</string>
<string name="wifi_ap_choose_auto" msgid="2677800651271769965">"Tự động"</string>
@@ -957,7 +956,6 @@
<string name="wifi_dpp_share_wifi" msgid="9065890131734833809">"Chia sẻ Wi‑Fi"</string>
<string name="wifi_dpp_scan_qr_code_with_another_device" msgid="5854392840857123065">"Quét mã QR này để kết nối với “<xliff:g id="SSID">%1$s</xliff:g>” và chia sẻ mật khẩu"</string>
<string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="4436318319178361543">"Quét mã QR này để kết nối với “<xliff:g id="SSID">%1$s</xliff:g>”"</string>
- <string name="wifi_dpp_could_not_detect_valid_qr_code" msgid="641893675646330576">"Không thể đọc mã QR. Hãy căn lại mã vào giữa rồi thử lại"</string>
<string name="wifi_dpp_failure_authentication_or_configuration" msgid="3372757783382381044">"Hãy thử lại. Nếu sự cố vẫn tiếp diễn, hãy liên hệ với nhà sản xuất thiết bị"</string>
<string name="wifi_dpp_failure_not_compatible" msgid="2829930473520603740">"Đã xảy ra lỗi"</string>
<string name="wifi_dpp_failure_timeout" msgid="5228320772245820458">"Hãy đảm bảo thiết bị đã cắm điện, sạc đầy và đang bật"</string>
@@ -980,6 +978,7 @@
<string name="wifi_dpp_hotspot_password" msgid="4120419278831581613">"Mật khẩu điểm phát sóng: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
<string name="wifi_dpp_add_device" msgid="4072206063308645677">"Thêm thiết bị"</string>
<string name="wifi_dpp_connect_network_using_qr_code" msgid="3887335309163999665">"Sử dụng mã QR để thêm thiết bị vào mạng này"</string>
+ <string name="wifi_dpp_qr_code_is_not_valid_format" msgid="3700087439867692944">"Mã QR không phải là định dạng hợp lệ"</string>
<string name="retry" msgid="6472609612090877557">"Thử lại"</string>
<string name="wifi_shared" msgid="844142443226926070">"Chia sẻ với những người khác cũng dùng thiết bị này"</string>
<string name="wifi_unchanged" msgid="3410422020930397102">"(không thay đổi)"</string>
@@ -1129,6 +1128,7 @@
<string name="emergency_address_title" msgid="932729250447887545">"Địa chỉ khẩn cấp"</string>
<string name="emergency_address_summary" msgid="7751971156196115129">"Dùng làm vị trí của bạn khi bạn thực hiện cuộc gọi khẩn cấp qua Wi‑Fi"</string>
<string name="private_dns_help_message" msgid="3299567069152568958"><annotation id="url">"Tìm hiểu thêm"</annotation>" về tính năng DNS riêng"</string>
+ <string name="private_dns_mode_on" msgid="5882613439541371003">"Đang bật"</string>
<string name="wifi_calling_pref_managed_by_carrier" msgid="6845711858866828986">"Cài đặt do nhà mạng quản lý"</string>
<string name="wifi_calling_settings_activation_instructions" msgid="7492509632478260955">"Kích hoạt tính năng Gọi qua Wi‑Fi"</string>
<string name="wifi_calling_turn_on" msgid="1171403510313983983">"Bật tính năng Gọi qua Wi‑Fi"</string>
@@ -1872,7 +1872,7 @@
<string name="default_emergency_app" msgid="1951760659640369980">"Ứng dụng khẩn cấp"</string>
<string name="reset_app_preferences" msgid="1321050641018356925">"Đặt lại tùy chọn ứng dụng"</string>
<string name="reset_app_preferences_title" msgid="6093179367325336662">"Đặt lại tùy chọn ứng dụng?"</string>
- <string name="reset_app_preferences_desc" msgid="4822447731869201512">"Thao tác này sẽ đặt lại tất cả tùy chọn cho:\n\n"<li>"Ứng dụng bị tắt"</li>\n<li>"Thông báo của ứng dụng bị tắt"</li>\n<li>"Ứng dụng mặc định cho các thao tác"</li>\n<li>"Các hạn hế về dữ liệu nền cho các ứng dụng"</li>\n<li>"Mọi hạn chế về quyền truy cập"</li>\n\n"Bạn sẽ không mất bất kỳ dữ liệu ứng dụng nào."</string>
+ <string name="reset_app_preferences_desc" msgid="731757609326016760">"Thao tác này sẽ đặt lại tất cả tùy chọn cho:\n\n"<li>"Ứng dụng bị tắt"</li>\n<li>"Thông báo ứng dụng bị tắt"</li>\n<li>"Ứng dụng mặc định cho các thao tác"</li>\n<li>"Giới hạn dữ liệu nền cho ứng dụng"</li>\n<li>"Bất kỳ giới hạn về quyền nào"</li>\n\n"Bạn sẽ không mất bất kỳ dữ liệu ứng dụng nào."</string>
<string name="reset_app_preferences_button" msgid="2559089511841281242">"Đặt lại ứng dụng"</string>
<string name="manage_space_text" msgid="8852711522447794676">"Quản lý dung lượng"</string>
<string name="filter" msgid="2018011724373033887">"Bộ lọc"</string>
@@ -2087,7 +2087,7 @@
<string name="accessibility_screen_magnification_short_summary" msgid="3411979839172752057">"Nhấn 3 lần để thu phóng"</string>
<string name="accessibility_screen_magnification_navbar_short_summary" msgid="3693116360267980492">"Nhấn vào nút để thu phóng"</string>
<string name="accessibility_screen_magnification_summary" msgid="5258868553337478505"><b>"Để thu phóng"</b>", nhấn nhanh màn hình 3 lần.\n"<ul><li>"Kéo 2 hoặc nhiều ngón tay để cuộn"</li>\n<li>"Chụm 2 hoặc nhiều ngón tay để điều chỉnh mức thu phóng"</li></ul>\n\n<b>"Để thu phóng tạm thời"</b>", nhấn nhanh màn hình 3 lần và giữ ngón tay của bạn vào lần nhấn thứ ba.\n"<ul><li>"Kéo để di chuyển quanh màn hình"</li>\n<li>"Nhấc ngón tay để thu nhỏ"</li></ul>\n\n"Bạn không thể phóng to trên thanh điều hướng."</string>
- <string name="accessibility_screen_magnification_navbar_summary" msgid="2272878354599332009">"Khi tính năng phóng to đang bật, bạn có thể phóng to trên màn hình.\n\n"<b>"Để thu phóng"</b>", hãy bắt đầu tính năng phóng to, sau đó nhấn vào vị trí bất kỳ trên màn hình.\n"<ul><li>"• Kéo 2 hoặc nhiều ngón tay để cuộn"</li>\n<li>"• Chụm 2 hoặc nhiều ngón tay để điều chỉnh mức thu phóng"</li></ul>\n\n<b>"Để thu phóng tạm thời"</b>", hãy bắt đầu tính năng phóng to, sau đó chạm và giữ vị trí bất kỳ trên màn hình.\n"<ul><li>"• Kéo để di chuyển xung quanh màn hình"</li>\n<li>"• Nhấc ngón tay lên để thu nhỏ"</li></ul>\n\n"Bạn không thể phóng to trên bàn phím hoặc thanh điều hướng."</string>
+ <string name="accessibility_screen_magnification_navbar_summary" msgid="6700716275347612310">"Khi tính năng phóng to đang bật, bạn có thể phóng to trên màn hình.\n\n"<b>"Để thu phóng"</b>", hãy mở tính năng phóng to rồi nhấn vào vị trí bất kỳ trên màn hình.\n"<ul><li>"Kéo 2 hoặc nhiều ngón tay để cuộn"</li>\n<li>"Chụm 2 hoặc nhiều ngón tay để điều chỉnh mức thu phóng"</li></ul>\n\n<b>"Để thu phóng tạm thời"</b>", hãy mở tính năng phóng to rồi chạm và giữ vị trí bất kỳ trên màn hình.\n"<ul><li>"Kéo để di chuyển quanh màn hình"</li>\n<li>"Nhấc ngón tay để thu nhỏ"</li></ul>\n\n"Bạn không thể phóng to trên bàn phím hoặc thanh điều hướng."</string>
<string name="accessibility_tutorial_dialog_title_button" msgid="3682222614034474845">"Dùng nút hỗ trợ tiếp cận để mở"</string>
<string name="accessibility_tutorial_dialog_title_gesture" msgid="1342726230497913398">"Dùng cử chỉ để mở"</string>
<string name="accessibility_tutorial_dialog_title_gesture_settings" msgid="8539392614235820285">"Dùng cử chỉ hỗ trợ tiếp cận mới"</string>
@@ -2140,8 +2140,7 @@
<string name="accessibility_hearingaid_title" msgid="8312145423610648518">"Thiết bị trợ thính"</string>
<string name="accessibility_hearingaid_not_connected_summary" msgid="6240237523789614599">"Chưa kết nối thiết bị trợ thính nào"</string>
<string name="accessibility_hearingaid_adding_summary" msgid="2947474468412309778">"Thêm thiết bị trợ thính"</string>
- <string name="accessibility_hearingaid_pair_instructions_first_message" msgid="3912093691643131154">"Để ghép nối thiết bị trợ thính, hãy tìm và nhấn vào thiết bị trên màn hình tiếp theo."</string>
- <string name="accessibility_hearingaid_pair_instructions_second_message" msgid="5596683393607650243">"Đảm bảo thiết bị trợ thính ở chế độ ghép nối."</string>
+ <string name="accessibility_hearingaid_pair_instructions_message" msgid="3094382949733435414">"Để ghép nối máy trợ thính, hãy tìm và nhấn vào thiết bị trên màn hình tiếp theo. Đảm bảo máy trợ thính đang ở chế độ ghép nối."</string>
<string name="accessibility_hearingaid_active_device_summary" msgid="3924362383258688984">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> hoạt động"</string>
<plurals name="show_number_hearingaid_count" formatted="false" msgid="3160782397139295486">
<item quantity="other"><xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> thiết bị trợ thính đã lưu</item>
@@ -2490,7 +2489,6 @@
<string name="menu_stats_last_unplugged" msgid="5922246077592434526">"Trong khi tháo đầu cắm lần cuối cho <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
<string name="menu_stats_total" msgid="8973377864854807854">"Tổng số sử dụng"</string>
<string name="menu_stats_refresh" msgid="1676215433344981075">"Làm mới"</string>
- <string name="process_kernel_label" msgid="3916858646836739323">"Hệ điều hành Android"</string>
<string name="process_mediaserver_label" msgid="6500382062945689285">"Máy chủ phương tiện"</string>
<string name="process_dex2oat_label" msgid="2592408651060518226">"Tối ưu hóa ứng dụng"</string>
<string name="battery_saver" msgid="8172485772238572153">"Trình tiết kiệm pin"</string>
@@ -2621,8 +2619,6 @@
<string name="no_device_admins" msgid="4846602835339095768">"Không có ứng dụng quản trị thiết bị nào"</string>
<string name="personal_device_admin_title" msgid="2849617316347669861">"Cá nhân"</string>
<string name="managed_device_admin_title" msgid="7853955652864478435">"Cơ quan"</string>
- <string name="sms_access_restriction_enabled" msgid="7054488078710530278">"Hạn chế truy cập vào SMS và nhật ký cuộc gọi"</string>
- <string name="sms_access_restriction_enabled_summary" msgid="6851339654677842328">"Chỉ ứng dụng gọi điện và nhắn tin mặc định có quyền truy cập vào SMS và nhật ký cuộc gọi"</string>
<string name="no_trust_agents" msgid="7450273545568977523">"Không có tác nhân tin cậy nào"</string>
<string name="add_device_admin_msg" msgid="1501847129819382149">"Kích hoạt ứng dụng quản trị thiết bị?"</string>
<string name="add_device_admin" msgid="4192055385312215731">"Kích hoạt ứng dụng quản trị thiết bị này"</string>
@@ -3111,7 +3107,7 @@
<string name="keywords_app_default" msgid="5822717006354487071">"Mở bằng"</string>
<string name="keywords_applications_settings" msgid="1268353611121497450">"Ứng dụng"</string>
<string name="keywords_time_zone" msgid="998254736898753085">"múi giờ"</string>
- <string name="keywords_draw_overlay" msgid="4130899177619041842">"Bong bóng trò chuyện"</string>
+ <string name="keywords_draw_overlay" msgid="1001120206241401007">"Bong bóng trò chuyện, hệ thống, thông báo, cửa sổ, hộp thoại, hiển thị, trên đầu các ứng dụng khác, vẽ"</string>
<string name="keywords_flashlight" msgid="6161632177705233710">"Đèn pin, Sáng, Đèn pin"</string>
<string name="keywords_change_wifi_state" msgid="627068244033681010">"wifi, wi-fi, bật/tắt, kiểm soát"</string>
<string name="keywords_more_mobile_networks" msgid="8995946622054642367">"di động, thiết bị di động, nhà cung cấp dịch vụ di động, không dây, dữ liệu, 4g, 3g, 2g, lte"</string>
@@ -3135,7 +3131,7 @@
<string name="keywords_sounds_and_notifications_interruptions" msgid="5426093074031208917">"không làm phiền, làm gián đoạn, gián đoạn, ngắt"</string>
<string name="keywords_app" msgid="6334757056536837791">"RAM"</string>
<string name="keywords_location" msgid="4132655528196729043">"lân cận, vị trí, lịch sử, báo cáo, GPS"</string>
- <string name="keywords_accounts" msgid="1957925565953357627">"tài khoản"</string>
+ <string name="keywords_accounts" msgid="4479029747403203867">"tài khoản, thêm tài khoản, hồ sơ công việc"</string>
<string name="keywords_users" msgid="3434190133131387942">"giới hạn, hạn chế, bị hạn chế"</string>
<string name="keywords_keyboard_and_ime" msgid="9143339015329957107">"sửa văn bản, sửa, âm thanh, rung, tự động, ngôn ngữ, cử chỉ, đề xuất, khuyến nghị, chủ đề, từ, xúc phạm, nhập, biểu tượng cảm xúc, quốc tế"</string>
<string name="keywords_reset_apps" msgid="5293291209613191845">"đặt lại, tùy chọn, mặc định"</string>
@@ -3173,6 +3169,7 @@
<string name="keywords_storage_settings" msgid="297283751968446577">"bộ nhớ, bộ nhớ đệm, dữ liệu, xóa, xóa sạch, giải phóng, dung lượng"</string>
<string name="keywords_bluetooth_settings" msgid="6804844062789439858">"đã kết nối, thiết bị, tai nghe, bộ tai nghe, loa, không dây, ghép nối, tai nghe đặt trong tai, nhạc, phương tiện"</string>
<string name="keywords_wallpaper" msgid="5058364390917429896">"nền, màn hình, màn hình khóa, giao diện"</string>
+ <string name="keywords_styles" msgid="5828725481814049422">"hình dạng biểu tượng, màu nhấn, phông chữ"</string>
<string name="keywords_assist_input" msgid="5017533309492679287">"mặc định, trợ lý"</string>
<string name="keywords_default_payment_app" msgid="3838565809518896799">"thanh toán, mặc định"</string>
<string name="keywords_ambient_display" msgid="3103487805748659132">"thông báo đến"</string>
@@ -3182,7 +3179,7 @@
<string name="keywords_notification_vibration" msgid="31924624421190547">"xúc giác, rung, độ nhạy"</string>
<string name="keywords_battery_saver_sticky" msgid="5586215686021650278">"trình tiết kiệm pin, cố định, tiếp tục, trình tiết kiệm điện, pin"</string>
<string name="keywords_battery_saver_schedule" msgid="7358789228486231944">"quy trình, lịch biểu, trình tiết kiệm pin, trình tiết kiệm điện, pin, tự động, phần trăm"</string>
- <string name="keywords_add_an_account" msgid="6488139919428902434">"hồ sơ công việc"</string>
+ <string name="keywords_enhance_4g_lte" msgid="2273810564244790859">"volte, gọi nâng cao, gọi qua mạng 4G"</string>
<string name="default_sound" msgid="8821684447333687810">"Âm thanh mặc định"</string>
<string name="sound_settings_summary" msgid="4100853606668287965">"Âm lượng chuông ở mức <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
<string name="sound_dashboard_summary" msgid="3402435125958012986">"Âm lượng, rung, Không làm phiền"</string>
@@ -3889,7 +3886,6 @@
<string name="permit_draw_overlay" msgid="7456536798718633432">"Cho phép hiển thị trên các ứng dụng khác"</string>
<string name="allow_overlay_description" msgid="8961670023925421358">"Cho phép ứng dụng này hiển thị trên các ứng dụng khác mà bạn đang sử dụng. Điều này có thể ảnh hưởng đến việc bạn sử dụng các ứng dụng đó hoặc thay đổi cách chúng xuất hiện hoặc hoạt động."</string>
<string name="keywords_vr_listener" msgid="7441221822576384680">"vr thực tế ảo trình nghe âm thanh nổi trình trợ giúp dịch vụ"</string>
- <string name="keywords_system_alert_window" msgid="5049498015597864850">"hộp thoại cửa sổ thông báo hệ thống hiển thị trên các ứng dụng khác"</string>
<string name="overlay_settings" msgid="6930854109449524280">"Hiển thị trên các ứng dụng khác"</string>
<string name="system_alert_window_summary" msgid="602892301318324492">"<xliff:g id="COUNT_0">%1$d</xliff:g>/<xliff:g id="COUNT_1">%2$d</xliff:g> ứng dụng được phép hiển thị trên các ứng dụng khác"</string>
<string name="filter_overlay_apps" msgid="6965969283342557573">"Các ứng dụng có quyền"</string>
@@ -4125,7 +4121,6 @@
<string name="notification_log_details_none" msgid="184131801230614059">"không có"</string>
<string name="notification_log_details_ranking_null" msgid="244660392058720919">"Thiếu đối tượng xếp hạng."</string>
<string name="notification_log_details_ranking_none" msgid="599607025882587844">"Đối tượng xếp hạng không chứa khóa này."</string>
- <string name="theme_customization_category" msgid="1049181544004163283">"Tùy chỉnh giao diện"</string>
<string name="theme_customization_device_default" msgid="5058147707906551368">"Theo mặc định của thiết bị"</string>
<string name="display_cutout_emulation" msgid="7466869822418376317">"Vết cắt trên màn hình"</string>
<string name="display_cutout_emulation_keywords" msgid="4495418317471622562">"cắt hiển thị, vết cắt"</string>
@@ -4551,6 +4546,8 @@
<string name="network_connection_errorstate_dialog_message" msgid="6953778550775646710">"Đã xảy ra lỗi. Ứng dụng đã hủy yêu cầu chọn thiết bị."</string>
<string name="network_connection_connect_successful" msgid="5935510954474494928">"Kết nối thành công"</string>
<string name="network_connection_request_dialog_showall" msgid="6938922880244567521">"Hiển thị tất cả"</string>
+ <string name="network_connection_searching_message" msgid="4638576789450817530">"Đang tìm kiếm thiết bị..."</string>
+ <string name="network_connection_connecting_message" msgid="3740982406609245654">"Đang kết nối với thiết bị..."</string>
<plurals name="show_bluetooth_devices" formatted="false" msgid="1715020480026568408">
<item quantity="other"><xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> thiết bị đã kết nối</item>
<item quantity="one"><xliff:g id="NUMBER_DEVICE_COUNT_0">%1$d</xliff:g> thiết bị đã kết nối</item>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 5b0c8c0..a46a33f 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -360,8 +360,6 @@
<string name="security_enable_widgets_disabled_summary" msgid="6392489775303464905">"已被管理员停用"</string>
<string name="lockdown_settings_title" msgid="7393790212603280213">"显示锁定选项"</string>
<string name="lockdown_settings_summary" msgid="4359438673563318171">"显示可在锁定屏幕上关闭 Smart Lock、指纹解锁和通知功能的电源按钮选项"</string>
- <string name="trust_agents_extend_unlock_title" msgid="2796555263565097031">"可信代理只会延长解锁时间"</string>
- <string name="trust_agents_extend_unlock_summary" msgid="3976344969220255010">"启用后，可信代理会延长设备的解锁时间，但无法再将已锁定的设备解锁。"</string>
<string name="trust_lost_locks_screen_title" msgid="2992742466966021682">"信任状态结束时锁定屏幕"</string>
<string name="trust_lost_locks_screen_summary" msgid="693784434582021206">"启用后，系统会在最后一个可信代理结束信任状态时锁定设备"</string>
<string name="owner_info_settings_summary" msgid="7472393443779227052">"无"</string>
@@ -937,6 +935,7 @@
<string name="wifi_eap_identity" msgid="4359453783379679103">"身份"</string>
<string name="wifi_eap_anonymous" msgid="2989469344116577955">"匿名身份"</string>
<string name="wifi_password" msgid="5948219759936151048">"密码"</string>
+ <string name="wifi_sae_password_id" msgid="1697832722221765763">"SAE 密码标识符"</string>
<string name="wifi_show_password" msgid="6461249871236968884">"显示密码"</string>
<string name="wifi_ap_band_config" msgid="1611826705989117930">"选择 AP 频段"</string>
<string name="wifi_ap_choose_auto" msgid="2677800651271769965">"自动"</string>
@@ -957,7 +956,6 @@
<string name="wifi_dpp_share_wifi" msgid="9065890131734833809">"分享 WLAN"</string>
<string name="wifi_dpp_scan_qr_code_with_another_device" msgid="5854392840857123065">"扫描此二维码即可连接到“<xliff:g id="SSID">%1$s</xliff:g>”并分享密码"</string>
<string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="4436318319178361543">"扫描此二维码即可连接到“<xliff:g id="SSID">%1$s</xliff:g>”"</string>
- <string name="wifi_dpp_could_not_detect_valid_qr_code" msgid="641893675646330576">"无法读取二维码。请重新将二维码置中，然后重试"</string>
<string name="wifi_dpp_failure_authentication_or_configuration" msgid="3372757783382381044">"请重试。如果问题依然存在，请与设备制造商联系"</string>
<string name="wifi_dpp_failure_not_compatible" msgid="2829930473520603740">"出了点问题"</string>
<string name="wifi_dpp_failure_timeout" msgid="5228320772245820458">"请确保设备已连接到电源，正在充电且处于开启状态"</string>
@@ -980,6 +978,7 @@
<string name="wifi_dpp_hotspot_password" msgid="4120419278831581613">"热点密码：<xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
<string name="wifi_dpp_add_device" msgid="4072206063308645677">"添加设备"</string>
<string name="wifi_dpp_connect_network_using_qr_code" msgid="3887335309163999665">"使用二维码将设备添加到此网络"</string>
+ <string name="wifi_dpp_qr_code_is_not_valid_format" msgid="3700087439867692944">"二维码的格式无效"</string>
<string name="retry" msgid="6472609612090877557">"重试"</string>
<string name="wifi_shared" msgid="844142443226926070">"与其他设备用户共享"</string>
<string name="wifi_unchanged" msgid="3410422020930397102">"（未更改）"</string>
@@ -1129,6 +1128,7 @@
<string name="emergency_address_title" msgid="932729250447887545">"紧急联系地址"</string>
<string name="emergency_address_summary" msgid="7751971156196115129">"当您通过 WLAN 网络拨打紧急呼救电话时，系统会判定您位于这个位置"</string>
<string name="private_dns_help_message" msgid="3299567069152568958"><annotation id="url">"详细了解"</annotation>"私人 DNS 功能"</string>
+ <string name="private_dns_mode_on" msgid="5882613439541371003">"开启"</string>
<string name="wifi_calling_pref_managed_by_carrier" msgid="6845711858866828986">"这项设置由运营商管理"</string>
<string name="wifi_calling_settings_activation_instructions" msgid="7492509632478260955">"请启用 WLAN 通话功能"</string>
<string name="wifi_calling_turn_on" msgid="1171403510313983983">"请开启 WLAN 通话功能"</string>
@@ -1872,7 +1872,7 @@
<string name="default_emergency_app" msgid="1951760659640369980">"紧急警报应用"</string>
<string name="reset_app_preferences" msgid="1321050641018356925">"重置应用偏好设置"</string>
<string name="reset_app_preferences_title" msgid="6093179367325336662">"要重置应用偏好设置吗？"</string>
- <string name="reset_app_preferences_desc" msgid="4822447731869201512">"这将重置以下所有偏好设置：\n\n"<li>"已停用的应用"</li>\n<li>"已停用的应用通知"</li>\n<li>"用于执行操作的默认应用"</li>\n<li>"应用的后台流量限制"</li>\n<li>"所有权限限制"</li>\n\n" 您将不会丢失任何应用数据。"</string>
+ <string name="reset_app_preferences_desc" msgid="731757609326016760">"此操作将会重置以下所有偏好设置：\n\n"<li>"已停用的应用"</li>\n<li>"已停用的应用通知"</li>\n<li>"执行操作的默认应用"</li>\n<li>"应用的后台流量限制"</li>\n<li>"任何权限限制"</li>\n\n"您将不会丢失任何应用数据。"</string>
<string name="reset_app_preferences_button" msgid="2559089511841281242">"重置应用"</string>
<string name="manage_space_text" msgid="8852711522447794676">"管理空间"</string>
<string name="filter" msgid="2018011724373033887">"过滤"</string>
@@ -2087,7 +2087,7 @@
<string name="accessibility_screen_magnification_short_summary" msgid="3411979839172752057">"点按三次即可放大屏幕"</string>
<string name="accessibility_screen_magnification_navbar_short_summary" msgid="3693116360267980492">"点按按钮即可放大"</string>
<string name="accessibility_screen_magnification_summary" msgid="5258868553337478505"><b>"要放大"</b>"，在屏幕上快速点按屏幕三次即可。\n"<ul><li>"用双指或多指在屏幕上拖动即可进行滚动"</li>\n<li>"张合双指或多指即可调整缩放级别"</li></ul>\n\n<b>"要暂时性地放大"</b>"，请快速在屏幕上点按三次，并在最后一次点按时按住手指不放。\n"<ul><li>"拖动手指即可在屏幕上四处移动"</li>\n<li>"松开手指即可缩小回原来的状态"</li></ul>\n\n"您不能在键盘和导航栏中使用放大功能。"</string>
- <string name="accessibility_screen_magnification_navbar_summary" msgid="2272878354599332009">"开启放大功能后，您可以放大屏幕。\n\n"<b>"要放大"</b>"，请启动放大功能，然后点按屏幕上的任意位置。\n"<ul><li>"• 拖动双指或多指即可进行滚动"</li>\n<li>"• 张合双指或多指即可调整缩放级别"</li></ul>\n\n<b>"要暂时性地放大"</b>"，请启动放大功能，然后轻触并按住屏幕上的任意位置。\n"<ul><li>"• 拖动手指即可在屏幕上四处移动"</li>\n<li>"• 松开手指即可缩小回原来的状态"</li></ul>\n\n"您不能在键盘和导航栏中使用放大功能。"</string>
+ <string name="accessibility_screen_magnification_navbar_summary" msgid="6700716275347612310">"开启放大功能后，您就可以放大屏幕上的内容。\n\n"<b>"要放大内容"</b>"，请先启动放大功能，然后点按屏幕上的任意位置。\n"<ul><li>"拖动双指或多指即可进行滚动"</li>\n<li>"张合双指或多指即可调整缩放级别"</li></ul>\n\n<b>"要暂时性放大内容"</b>"，请先启动放大功能，然后轻触并按住屏幕上的任意位置。\n"<ul><li>"拖动手指即可在屏幕上四处移动"</li>\n<li>"松开手指即可缩小回原来的状态"</li></ul>\n\n"您无法针对键盘或导航栏使用放大功能。"</string>
<string name="accessibility_tutorial_dialog_title_button" msgid="3682222614034474845">"使用“无障碍”按钮打开"</string>
<string name="accessibility_tutorial_dialog_title_gesture" msgid="1342726230497913398">"使用手势打开"</string>
<string name="accessibility_tutorial_dialog_title_gesture_settings" msgid="8539392614235820285">"使用新的无障碍手势"</string>
@@ -2140,8 +2140,7 @@
<string name="accessibility_hearingaid_title" msgid="8312145423610648518">"助听器"</string>
<string name="accessibility_hearingaid_not_connected_summary" msgid="6240237523789614599">"未连接任何助听器"</string>
<string name="accessibility_hearingaid_adding_summary" msgid="2947474468412309778">"添加助听器"</string>
- <string name="accessibility_hearingaid_pair_instructions_first_message" msgid="3912093691643131154">"要为助听器配对，请在下一个屏幕上查找并点按您的设备。"</string>
- <string name="accessibility_hearingaid_pair_instructions_second_message" msgid="5596683393607650243">"请确保您的助听器已处于配对模式。"</string>
+ <string name="accessibility_hearingaid_pair_instructions_message" msgid="3094382949733435414">"要为助听器配对，请在下一个屏幕上查找并点按您的设备。请确保您的助听器已处于配对模式。"</string>
<string name="accessibility_hearingaid_active_device_summary" msgid="3924362383258688984">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>已启用"</string>
<plurals name="show_number_hearingaid_count" formatted="false" msgid="3160782397139295486">
<item quantity="other">已保存 <xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> 台助听器</item>
@@ -2490,7 +2489,6 @@
<string name="menu_stats_last_unplugged" msgid="5922246077592434526">"上次拔下电源 <xliff:g id="UNPLUGGED">%1$s</xliff:g> 时"</string>
<string name="menu_stats_total" msgid="8973377864854807854">"总使用量"</string>
<string name="menu_stats_refresh" msgid="1676215433344981075">"刷新"</string>
- <string name="process_kernel_label" msgid="3916858646836739323">"Android 操作系统"</string>
<string name="process_mediaserver_label" msgid="6500382062945689285">"媒体服务器"</string>
<string name="process_dex2oat_label" msgid="2592408651060518226">"应用优化"</string>
<string name="battery_saver" msgid="8172485772238572153">"省电模式"</string>
@@ -2621,8 +2619,6 @@
<string name="no_device_admins" msgid="4846602835339095768">"没有可用的设备管理应用"</string>
<string name="personal_device_admin_title" msgid="2849617316347669861">"个人"</string>
<string name="managed_device_admin_title" msgid="7853955652864478435">"工作"</string>
- <string name="sms_access_restriction_enabled" msgid="7054488078710530278">"限制短信和通话记录访问权限"</string>
- <string name="sms_access_restriction_enabled_summary" msgid="6851339654677842328">"只有默认的电话和短信应用拥有短信和通话记录权限"</string>
<string name="no_trust_agents" msgid="7450273545568977523">"没有可信代理"</string>
<string name="add_device_admin_msg" msgid="1501847129819382149">"要启用设备管理应用吗？"</string>
<string name="add_device_admin" msgid="4192055385312215731">"启用此设备管理应用"</string>
@@ -3111,7 +3107,7 @@
<string name="keywords_app_default" msgid="5822717006354487071">"打开方式"</string>
<string name="keywords_applications_settings" msgid="1268353611121497450">"应用"</string>
<string name="keywords_time_zone" msgid="998254736898753085">"时区"</string>
- <string name="keywords_draw_overlay" msgid="4130899177619041842">"聊天头像"</string>
+ <string name="keywords_draw_overlay" msgid="1001120206241401007">"聊天头像, 系统, 提醒, 窗口, 对话框, 显示屏, 在其他应用上层, 绘制"</string>
<string name="keywords_flashlight" msgid="6161632177705233710">"手电筒, 灯, 手电"</string>
<string name="keywords_change_wifi_state" msgid="627068244033681010">"WLAN, wlan, 切换, 控制"</string>
<string name="keywords_more_mobile_networks" msgid="8995946622054642367">"移动网络, 移动, 手机运营商, 无线, 数据, 4G, 3G, 2G, LTE"</string>
@@ -3135,7 +3131,7 @@
<string name="keywords_sounds_and_notifications_interruptions" msgid="5426093074031208917">"勿扰, 请勿打扰, 打扰, 打断"</string>
<string name="keywords_app" msgid="6334757056536837791">"RAM 内存"</string>
<string name="keywords_location" msgid="4132655528196729043">"附近, 位置信息, 历史记录, 报告, GPS"</string>
- <string name="keywords_accounts" msgid="1957925565953357627">"帐号"</string>
+ <string name="keywords_accounts" msgid="4479029747403203867">"帐号, 添加帐号, 工作资料"</string>
<string name="keywords_users" msgid="3434190133131387942">"限制, 限定, 受限"</string>
<string name="keywords_keyboard_and_ime" msgid="9143339015329957107">"文字, 文本, 更正, 声音, 提示音, 振动, 自动, 语言, 手势, 推荐, 建议, 主题, 主题背景, 令人反感, 字词, 输入, 表情符号, 国际"</string>
<string name="keywords_reset_apps" msgid="5293291209613191845">"重置, 偏好设置, 默认"</string>
@@ -3173,6 +3169,7 @@
<string name="keywords_storage_settings" msgid="297283751968446577">"内存, 缓存, 数据, 删除, 清除, 释放, 空间"</string>
<string name="keywords_bluetooth_settings" msgid="6804844062789439858">"已连接, 设备, 头戴式耳机, 耳机, 扬声器, 无线, 配对, 入耳式耳机, 音乐, 媒体"</string>
<string name="keywords_wallpaper" msgid="5058364390917429896">"背景, 屏幕, 锁屏, 主题背景"</string>
+ <string name="keywords_styles" msgid="5828725481814049422">"图标形状, 强调色, 字体"</string>
<string name="keywords_assist_input" msgid="5017533309492679287">"默认, 智能助理"</string>
<string name="keywords_default_payment_app" msgid="3838565809518896799">"付款, 默认"</string>
<string name="keywords_ambient_display" msgid="3103487805748659132">"收到的通知"</string>
@@ -3182,7 +3179,7 @@
<string name="keywords_notification_vibration" msgid="31924624421190547">"触感, 振动, 敏感度"</string>
<string name="keywords_battery_saver_sticky" msgid="5586215686021650278">"省电模式, 固定式, 保留, 节省电量, 电池"</string>
<string name="keywords_battery_saver_schedule" msgid="7358789228486231944">"日常安排, 日程, 省电模式, 节省电量, 电池, 自动, 百分比"</string>
- <string name="keywords_add_an_account" msgid="6488139919428902434">"工作资料"</string>
+ <string name="keywords_enhance_4g_lte" msgid="2273810564244790859">"VoLTE, 高级通话, 4G 通话"</string>
<string name="default_sound" msgid="8821684447333687810">"默认铃声"</string>
<string name="sound_settings_summary" msgid="4100853606668287965">"铃声音量为 <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
<string name="sound_dashboard_summary" msgid="3402435125958012986">"音量、振动、勿扰"</string>
@@ -3889,7 +3886,6 @@
<string name="permit_draw_overlay" msgid="7456536798718633432">"允许显示在其他应用的上层"</string>
<string name="allow_overlay_description" msgid="8961670023925421358">"允许此应用显示在您当前使用的其他应用的上层。这可能会干扰您使用相关应用，或变更这类应用的显示或运行方式。"</string>
<string name="keywords_vr_listener" msgid="7441221822576384680">"vr 虚拟实境 监听器 立体 助手服务"</string>
- <string name="keywords_system_alert_window" msgid="5049498015597864850">"系统 提醒 窗口 对话框 显示 上层 其他应用"</string>
<string name="overlay_settings" msgid="6930854109449524280">"显示在其他应用的上层"</string>
<string name="system_alert_window_summary" msgid="602892301318324492">"<xliff:g id="COUNT_0">%1$d</xliff:g> 个（共 <xliff:g id="COUNT_1">%2$d</xliff:g> 个）应用可以显示在其他应用的上层"</string>
<string name="filter_overlay_apps" msgid="6965969283342557573">"具有该权限的应用"</string>
@@ -4125,7 +4121,6 @@
<string name="notification_log_details_none" msgid="184131801230614059">"无"</string>
<string name="notification_log_details_ranking_null" msgid="244660392058720919">"缺少排名对象。"</string>
<string name="notification_log_details_ranking_none" msgid="599607025882587844">"排名对象不包含此键。"</string>
- <string name="theme_customization_category" msgid="1049181544004163283">"主题"</string>
<string name="theme_customization_device_default" msgid="5058147707906551368">"设备默认设置"</string>
<string name="display_cutout_emulation" msgid="7466869822418376317">"刘海屏"</string>
<string name="display_cutout_emulation_keywords" msgid="4495418317471622562">"刘海屏, 缺口"</string>
@@ -4551,6 +4546,8 @@
<string name="network_connection_errorstate_dialog_message" msgid="6953778550775646710">"出了点问题。该应用已取消选择设备的请求。"</string>
<string name="network_connection_connect_successful" msgid="5935510954474494928">"连接成功"</string>
<string name="network_connection_request_dialog_showall" msgid="6938922880244567521">"全部显示"</string>
+ <string name="network_connection_searching_message" msgid="4638576789450817530">"正在搜索设备…"</string>
+ <string name="network_connection_connecting_message" msgid="3740982406609245654">"正在连接到设备…"</string>
<plurals name="show_bluetooth_devices" formatted="false" msgid="1715020480026568408">
<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>
diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index feceea8..f4a9c34 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml
@@ -360,8 +360,6 @@
<string name="security_enable_widgets_disabled_summary" msgid="6392489775303464905">"已由管理員停用"</string>
<string name="lockdown_settings_title" msgid="7393790212603280213">"顯示鎖定選項"</string>
<string name="lockdown_settings_summary" msgid="4359438673563318171">"顯示開關按鈕選項，即可在上鎖畫面停用 Smart Lock、生物識別解鎖和通知功能"</string>
- <string name="trust_agents_extend_unlock_title" msgid="2796555263565097031">"「信任代理程式」只能延長解鎖的時間"</string>
- <string name="trust_agents_extend_unlock_summary" msgid="3976344969220255010">"啟用這項功能後，「信任代理程式」會讓您的裝置處於解鎖狀態較長時間，但無法再解鎖已上鎖的裝置。"</string>
<string name="trust_lost_locks_screen_title" msgid="2992742466966021682">"失去信任後，畫面將會上鎖"</string>
<string name="trust_lost_locks_screen_summary" msgid="693784434582021206">"啟用這項功能後，當最後一個信任代理程式失去信任時，裝置將會上鎖"</string>
<string name="owner_info_settings_summary" msgid="7472393443779227052">"無"</string>
@@ -937,6 +935,7 @@
<string name="wifi_eap_identity" msgid="4359453783379679103">"身分"</string>
<string name="wifi_eap_anonymous" msgid="2989469344116577955">"匿名身分"</string>
<string name="wifi_password" msgid="5948219759936151048">"密碼"</string>
+ <string name="wifi_sae_password_id" msgid="1697832722221765763">"SAE 密碼識別碼"</string>
<string name="wifi_show_password" msgid="6461249871236968884">"顯示密碼"</string>
<string name="wifi_ap_band_config" msgid="1611826705989117930">"選擇存取點頻段"</string>
<string name="wifi_ap_choose_auto" msgid="2677800651271769965">"自動"</string>
@@ -957,7 +956,6 @@
<string name="wifi_dpp_share_wifi" msgid="9065890131734833809">"分享 Wi‑Fi"</string>
<string name="wifi_dpp_scan_qr_code_with_another_device" msgid="5854392840857123065">"掃瞄此二維條碼即可連線至「<xliff:g id="SSID">%1$s</xliff:g>」並分享密碼"</string>
<string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="4436318319178361543">"掃描此二維條碼即可連線至「<xliff:g id="SSID">%1$s</xliff:g>」"</string>
- <string name="wifi_dpp_could_not_detect_valid_qr_code" msgid="641893675646330576">"無法讀取二維條碼。重新將二維條碼放在正中，然後再試一次"</string>
<string name="wifi_dpp_failure_authentication_or_configuration" msgid="3372757783382381044">"請再試一次。如果仍有問題，請聯絡裝置製造商"</string>
<string name="wifi_dpp_failure_not_compatible" msgid="2829930473520603740">"發生問題"</string>
<string name="wifi_dpp_failure_timeout" msgid="5228320772245820458">"確保裝置已插入、充電並開啟"</string>
@@ -980,6 +978,7 @@
<string name="wifi_dpp_hotspot_password" msgid="4120419278831581613">"熱點密碼：<xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
<string name="wifi_dpp_add_device" msgid="4072206063308645677">"新增裝置"</string>
<string name="wifi_dpp_connect_network_using_qr_code" msgid="3887335309163999665">"使用二維條碼在此網絡新增裝置"</string>
+ <string name="wifi_dpp_qr_code_is_not_valid_format" msgid="3700087439867692944">"二維條碼格式無效"</string>
<string name="retry" msgid="6472609612090877557">"重試"</string>
<string name="wifi_shared" msgid="844142443226926070">"與其他裝置使用者分享"</string>
<string name="wifi_unchanged" msgid="3410422020930397102">"(未變更)"</string>
@@ -1129,6 +1128,7 @@
<string name="emergency_address_title" msgid="932729250447887545">"緊急地址"</string>
<string name="emergency_address_summary" msgid="7751971156196115129">"當您使用 Wi-Fi 撥打緊急電話時，緊急服務會將該地址視作您所在位置的地址"</string>
<string name="private_dns_help_message" msgid="3299567069152568958"><annotation id="url">"進一步瞭解"</annotation>"私人 DNS 功能"</string>
+ <string name="private_dns_mode_on" msgid="5882613439541371003">"開啟"</string>
<string name="wifi_calling_pref_managed_by_carrier" msgid="6845711858866828986">"由流動網絡供應商管理的設定"</string>
<string name="wifi_calling_settings_activation_instructions" msgid="7492509632478260955">"啟用 Wi-Fi 通話功能"</string>
<string name="wifi_calling_turn_on" msgid="1171403510313983983">"開啟 Wi-Fi 通話功能"</string>
@@ -1873,7 +1873,7 @@
<string name="default_emergency_app" msgid="1951760659640369980">"緊急應用程式"</string>
<string name="reset_app_preferences" msgid="1321050641018356925">"重設應用程式偏好設定"</string>
<string name="reset_app_preferences_title" msgid="6093179367325336662">"重設應用程式偏好設定？"</string>
- <string name="reset_app_preferences_desc" msgid="4822447731869201512">"此操作會重設以下項目的所有偏好設定：\n\n"<li>"已停用的應用程式"</li>\n<li>"已停用的應用程式通知"</li>\n<li>"執行操作的預設應用程式"</li>\n<li>"應用程式的背景資料限制"</li>\n<li>"任何權限限制"</li>\n\n"您不會遺失任何應用程式資料。"</string>
+ <string name="reset_app_preferences_desc" msgid="731757609326016760">"此操作將會重設下列所有偏好設定：\n\n"<li>"已停用的應用程式"</li>\n<li>"已停用的應用程式通知"</li>\n<li>"執行操作的預設應用程式"</li>\n<li>"應用程式的背景數據限制"</li>\n<li>"任何權限限制"</li>\n\n"您將不會失去任何應用程式資料。"</string>
<string name="reset_app_preferences_button" msgid="2559089511841281242">"重設應用程式"</string>
<string name="manage_space_text" msgid="8852711522447794676">"管理空間"</string>
<string name="filter" msgid="2018011724373033887">"篩選"</string>
@@ -2088,7 +2088,7 @@
<string name="accessibility_screen_magnification_short_summary" msgid="3411979839172752057">"輕按 3 次即可縮放畫面"</string>
<string name="accessibility_screen_magnification_navbar_short_summary" msgid="3693116360267980492">"輕按按鈕即可縮放"</string>
<string name="accessibility_screen_magnification_summary" msgid="5258868553337478505"><b>"如要縮放"</b>"，請快速輕按螢幕 3 下。\n"<ul><li>"用 2 隻或多隻手指拖曳，即可捲動螢幕"</li>\n<li>"用 2 隻或多隻手指縮放，即可調整縮放程度"</li></ul>\n\n<b>"如要暫時縮放"</b>"，請快速輕按螢幕 3 下 (第 3 下按住螢幕)。\n"<ul><li>"拖曳即可在螢幕上移動"</li>\n<li>"提起手指即可縮小至原大"</li></ul>\n\n"您無法在鍵盤或導覽列上使用放大功能。"</string>
- <string name="accessibility_screen_magnification_navbar_summary" msgid="2272878354599332009">"當放大功能開啟時，您可放大畫面。\n\n"<b>"如要縮放"</b>"，請開啟放大功能，然後輕按畫面上任何地方。\n"<ul><li>"• 拖曳兩隻或更多手指即可捲動畫面"</li>\n<li>"• 用兩隻或更多手指縮放即可調整縮放水平"</li></ul>\n\n<b>"如要短暫縮放"</b>"，請開啟放大功能，然後按住畫面上任何地方。\n"<ul><li>"• 拖曳即可在螢幕四處移動"</li>\n<li>"• 提起手指即可縮小畫面"</li></ul>\n\n"您無法放大鍵盤或導覽列。"</string>
+ <string name="accessibility_screen_magnification_navbar_summary" msgid="6700716275347612310">"開啟放大功能後，您可放大畫面。\n\n"<b>"如要縮放"</b>"，請開啟放大功能，然後輕按螢幕任何地方。\n"<ul><li>"用 2 隻或多隻手指拖曳，即可捲動螢幕"</li>\n<li>"用 2 隻或多隻手指縮放，即可調整縮放程度"</li></ul>\n\n<b>"如要暫時縮放"</b>"，請開啟放大功能，再按住螢幕任何地方。\n"<ul><li>"拖曳即可在螢幕上移動"</li>\n<li>"提起手指即可縮小至原大"</li></ul>\n\n"您無法在鍵盤或導覽列上使用放大功能。"</string>
<string name="accessibility_tutorial_dialog_title_button" msgid="3682222614034474845">"使用無障礙功能按鈕即可開啟"</string>
<string name="accessibility_tutorial_dialog_title_gesture" msgid="1342726230497913398">"使用手勢即可開啟"</string>
<string name="accessibility_tutorial_dialog_title_gesture_settings" msgid="8539392614235820285">"使用新的無障礙手勢"</string>
@@ -2141,8 +2141,7 @@
<string name="accessibility_hearingaid_title" msgid="8312145423610648518">"助聽器"</string>
<string name="accessibility_hearingaid_not_connected_summary" msgid="6240237523789614599">"冇連接任何助聽器"</string>
<string name="accessibility_hearingaid_adding_summary" msgid="2947474468412309778">"新增助聽器"</string>
- <string name="accessibility_hearingaid_pair_instructions_first_message" msgid="3912093691643131154">"如果要配對助聽器，請喺下一個畫面搵出你嘅裝置，然後扲一下。"</string>
- <string name="accessibility_hearingaid_pair_instructions_second_message" msgid="5596683393607650243">"請確定你嘅助聽器已經處於配對模式。"</string>
+ <string name="accessibility_hearingaid_pair_instructions_message" msgid="3094382949733435414">"如要配對助聽器，請於下一個畫面找出您的裝置，然後輕按一下。請確定您的助聽器已處於配對模式。"</string>
<string name="accessibility_hearingaid_active_device_summary" msgid="3924362383258688984">"「<xliff:g id="DEVICE_NAME">%1$s</xliff:g>」已啟用"</string>
<plurals name="show_number_hearingaid_count" formatted="false" msgid="3160782397139295486">
<item quantity="other">儲存咗 <xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> 個助聽器</item>
@@ -2491,7 +2490,6 @@
<string name="menu_stats_last_unplugged" msgid="5922246077592434526">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> 前拔除電源"</string>
<string name="menu_stats_total" msgid="8973377864854807854">"整體使用狀況"</string>
<string name="menu_stats_refresh" msgid="1676215433344981075">"重新整理"</string>
- <string name="process_kernel_label" msgid="3916858646836739323">"Android 作業系統"</string>
<string name="process_mediaserver_label" msgid="6500382062945689285">"媒體伺服器"</string>
<string name="process_dex2oat_label" msgid="2592408651060518226">"應用程式優化"</string>
<string name="battery_saver" msgid="8172485772238572153">"省電模式"</string>
@@ -2622,8 +2620,6 @@
<string name="no_device_admins" msgid="4846602835339095768">"沒有可用的裝置管理應用程式"</string>
<string name="personal_device_admin_title" msgid="2849617316347669861">"個人"</string>
<string name="managed_device_admin_title" msgid="7853955652864478435">"公司"</string>
- <string name="sms_access_restriction_enabled" msgid="7054488078710530278">"限制存取短訊和通話記錄"</string>
- <string name="sms_access_restriction_enabled_summary" msgid="6851339654677842328">"只有預設手機和短訊應用程式能夠存取短訊和通話記錄"</string>
<string name="no_trust_agents" msgid="7450273545568977523">"沒有信任的代理程式可供使用"</string>
<string name="add_device_admin_msg" msgid="1501847129819382149">"要啟動裝置管理應用程式嗎？"</string>
<string name="add_device_admin" msgid="4192055385312215731">"啟動此裝置管理應用程式"</string>
@@ -3112,7 +3108,7 @@
<string name="keywords_app_default" msgid="5822717006354487071">"開啟方式"</string>
<string name="keywords_applications_settings" msgid="1268353611121497450">"應用程式"</string>
<string name="keywords_time_zone" msgid="998254736898753085">"時區"</string>
- <string name="keywords_draw_overlay" msgid="4130899177619041842">"即時通訊大頭貼"</string>
+ <string name="keywords_draw_overlay" msgid="1001120206241401007">"即時通訊大頭貼, 系統, 通知, 視窗, 對話框, 顯示屏, 在其他應用程式上面, 繪圖"</string>
<string name="keywords_flashlight" msgid="6161632177705233710">"閃光燈, 燈, 電筒"</string>
<string name="keywords_change_wifi_state" msgid="627068244033681010">"WiFi, Wi-Fi, 切換, 控制"</string>
<string name="keywords_more_mobile_networks" msgid="8995946622054642367">"流動網絡, 流動裝置, 流動網絡供應商, 無線, 數據, 4G, 3G, 2G, LTE"</string>
@@ -3136,7 +3132,7 @@
<string name="keywords_sounds_and_notifications_interruptions" msgid="5426093074031208917">"不得干擾, 騷擾, 干擾, 中斷"</string>
<string name="keywords_app" msgid="6334757056536837791">"RAM"</string>
<string name="keywords_location" msgid="4132655528196729043">"附近, 位置, 記錄, 報告, GPS"</string>
- <string name="keywords_accounts" msgid="1957925565953357627">"帳戶"</string>
+ <string name="keywords_accounts" msgid="4479029747403203867">"帳戶, 新增帳戶, 工作設定檔"</string>
<string name="keywords_users" msgid="3434190133131387942">"規限, 限制, 受限"</string>
<string name="keywords_keyboard_and_ime" msgid="9143339015329957107">"文字更正, 修正, 聲音, 震動, 自動, 語言, 手勢, 建議, 提議, 主題背景, 令人反感, 文字, 輸入, 表情圖案, 國際"</string>
<string name="keywords_reset_apps" msgid="5293291209613191845">"重設, 偏好, 預設"</string>
@@ -3174,6 +3170,7 @@
<string name="keywords_storage_settings" msgid="297283751968446577">"記憶體, 快取, 資料, 刪除, 清除, 釋出, 空間"</string>
<string name="keywords_bluetooth_settings" msgid="6804844062789439858">"已連線, 裝置, 耳機, 耳機, 喇叭, 無線, 配對, 耳塞, 音樂, 媒體"</string>
<string name="keywords_wallpaper" msgid="5058364390917429896">"背景, 螢幕, 鎖定螢幕, 主題"</string>
+ <string name="keywords_styles" msgid="5828725481814049422">"圖示形狀、強調色、字型"</string>
<string name="keywords_assist_input" msgid="5017533309492679287">"預設, 助理"</string>
<string name="keywords_default_payment_app" msgid="3838565809518896799">"付款, 預設"</string>
<string name="keywords_ambient_display" msgid="3103487805748659132">"收到的通知"</string>
@@ -3183,7 +3180,7 @@
<string name="keywords_notification_vibration" msgid="31924624421190547">"觸感反應, 震動, 敏感度"</string>
<string name="keywords_battery_saver_sticky" msgid="5586215686021650278">"省電模式, 固定, 持續, 節電模式, 電池"</string>
<string name="keywords_battery_saver_schedule" msgid="7358789228486231944">"日常用電情況, 用電安排, 省電模式, 節能模式, 電池, 自動, 百分比"</string>
- <string name="keywords_add_an_account" msgid="6488139919428902434">"工作設定檔"</string>
+ <string name="keywords_enhance_4g_lte" msgid="2273810564244790859">"VoLTE、進階通話、4G 通話"</string>
<string name="default_sound" msgid="8821684447333687810">"預設音效"</string>
<string name="sound_settings_summary" msgid="4100853606668287965">"鈴聲音量為 <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
<string name="sound_dashboard_summary" msgid="3402435125958012986">"音量、震動、請勿騷擾"</string>
@@ -3890,7 +3887,6 @@
<string name="permit_draw_overlay" msgid="7456536798718633432">"可顯示在其他應用程式上面"</string>
<string name="allow_overlay_description" msgid="8961670023925421358">"允許此應用程式在您目前使用的其他應用程式上層顯示內容，因此可能會干擾您使用相關應用程式，或變更這些應用程式的顯示或運作方式。"</string>
<string name="keywords_vr_listener" msgid="7441221822576384680">"VR 虛擬實境 接聽器 立體聲 協助服務"</string>
- <string name="keywords_system_alert_window" msgid="5049498015597864850">"系統提示視窗對話框在其他應用程式上層顯示"</string>
<string name="overlay_settings" msgid="6930854109449524280">"在其他應用程式上面顯示"</string>
<string name="system_alert_window_summary" msgid="602892301318324492">"<xliff:g id="COUNT_0">%1$d</xliff:g> 個應用程式 (共 <xliff:g id="COUNT_1">%2$d</xliff:g> 個) 可顯示在其他應用程式上面"</string>
<string name="filter_overlay_apps" msgid="6965969283342557573">"擁有權限的應用程式"</string>
@@ -4126,7 +4122,6 @@
<string name="notification_log_details_none" msgid="184131801230614059">"無"</string>
<string name="notification_log_details_ranking_null" msgid="244660392058720919">"沒有評級物件。"</string>
<string name="notification_log_details_ranking_none" msgid="599607025882587844">"評級物件不包含此密鑰。"</string>
- <string name="theme_customization_category" msgid="1049181544004163283">"自訂主題背景"</string>
<string name="theme_customization_device_default" msgid="5058147707906551368">"裝置預設設定"</string>
<string name="display_cutout_emulation" msgid="7466869822418376317">"顯示屏凹口"</string>
<string name="display_cutout_emulation_keywords" msgid="4495418317471622562">"顯示屏凹口 (缺口)"</string>
@@ -4552,6 +4547,8 @@
<string name="network_connection_errorstate_dialog_message" msgid="6953778550775646710">"發生錯誤。應用程式已取消選擇裝置的要求。"</string>
<string name="network_connection_connect_successful" msgid="5935510954474494928">"連線成功"</string>
<string name="network_connection_request_dialog_showall" msgid="6938922880244567521">"顯示全部"</string>
+ <string name="network_connection_searching_message" msgid="4638576789450817530">"正在搜尋裝置…"</string>
+ <string name="network_connection_connecting_message" msgid="3740982406609245654">"正在連接裝置…"</string>
<plurals name="show_bluetooth_devices" formatted="false" msgid="1715020480026568408">
<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>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index e8a9c83..49b0eb1 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -360,8 +360,6 @@
<string name="security_enable_widgets_disabled_summary" msgid="6392489775303464905">"已由管理員停用"</string>
<string name="lockdown_settings_title" msgid="7393790212603280213">"顯示鎖定選項"</string>
<string name="lockdown_settings_summary" msgid="4359438673563318171">"顯示電源按鈕選項，可在螢幕鎖定畫面停用 Smart Lock、生物特徵辨識解鎖和通知功能"</string>
- <string name="trust_agents_extend_unlock_title" msgid="2796555263565097031">"信任的代理程式只會延長解鎖時間"</string>
- <string name="trust_agents_extend_unlock_summary" msgid="3976344969220255010">"啟用後，信任的代理程式會延長裝置的解鎖時間，但無法再將已鎖定的裝置解鎖。"</string>
<string name="trust_lost_locks_screen_title" msgid="2992742466966021682">"信任狀態結束時鎖定螢幕"</string>
<string name="trust_lost_locks_screen_summary" msgid="693784434582021206">"啟用後，系統會在最後一個信任的代理程式結束信任狀態時鎖定裝置"</string>
<string name="owner_info_settings_summary" msgid="7472393443779227052">"無"</string>
@@ -937,6 +935,7 @@
<string name="wifi_eap_identity" msgid="4359453783379679103">"身分"</string>
<string name="wifi_eap_anonymous" msgid="2989469344116577955">"匿名身分"</string>
<string name="wifi_password" msgid="5948219759936151048">"密碼"</string>
+ <string name="wifi_sae_password_id" msgid="1697832722221765763">"SAE 密碼 ID"</string>
<string name="wifi_show_password" msgid="6461249871236968884">"顯示密碼"</string>
<string name="wifi_ap_band_config" msgid="1611826705989117930">"選取存取點頻帶"</string>
<string name="wifi_ap_choose_auto" msgid="2677800651271769965">"自動"</string>
@@ -957,7 +956,6 @@
<string name="wifi_dpp_share_wifi" msgid="9065890131734833809">"分享 Wi-Fi"</string>
<string name="wifi_dpp_scan_qr_code_with_another_device" msgid="5854392840857123065">"掃描這個 QR 圖碼即可連線至「<xliff:g id="SSID">%1$s</xliff:g>」並分享密碼"</string>
<string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="4436318319178361543">"掃描這個 QR 圖碼即可連線至「<xliff:g id="SSID">%1$s</xliff:g>」"</string>
- <string name="wifi_dpp_could_not_detect_valid_qr_code" msgid="641893675646330576">"無法讀取 QR 圖碼。請重新將圖碼置中，然後再試一次"</string>
<string name="wifi_dpp_failure_authentication_or_configuration" msgid="3372757783382381044">"請再試一次，如果問題持續發生，請與裝置製造商聯絡"</string>
<string name="wifi_dpp_failure_not_compatible" msgid="2829930473520603740">"發生錯誤"</string>
<string name="wifi_dpp_failure_timeout" msgid="5228320772245820458">"請確認已插上裝置，且裝置已充滿電並處於開啟狀態"</string>
@@ -980,6 +978,7 @@
<string name="wifi_dpp_hotspot_password" msgid="4120419278831581613">"無線基地台密碼：<xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
<string name="wifi_dpp_add_device" msgid="4072206063308645677">"新增裝置"</string>
<string name="wifi_dpp_connect_network_using_qr_code" msgid="3887335309163999665">"使用 QR 圖碼將裝置新增至這個網路"</string>
+ <string name="wifi_dpp_qr_code_is_not_valid_format" msgid="3700087439867692944">"QR 圖碼格式無效"</string>
<string name="retry" msgid="6472609612090877557">"重試"</string>
<string name="wifi_shared" msgid="844142443226926070">"與裝置的其他使用者共用"</string>
<string name="wifi_unchanged" msgid="3410422020930397102">"(未變更)"</string>
@@ -1129,6 +1128,7 @@
<string name="emergency_address_title" msgid="932729250447887545">"緊急地址"</string>
<string name="emergency_address_summary" msgid="7751971156196115129">"當你透過 Wi‑Fi 網路撥打緊急電話時，系統會判定你位於這個地址"</string>
<string name="private_dns_help_message" msgid="3299567069152568958"><annotation id="url">"進一步瞭解"</annotation>"私人 DNS 功能"</string>
+ <string name="private_dns_mode_on" msgid="5882613439541371003">"已開啟"</string>
<string name="wifi_calling_pref_managed_by_carrier" msgid="6845711858866828986">"這項設定由電信業者管理"</string>
<string name="wifi_calling_settings_activation_instructions" msgid="7492509632478260955">"啟用 Wi-Fi 通話功能"</string>
<string name="wifi_calling_turn_on" msgid="1171403510313983983">"開啟 Wi-Fi 通話功能"</string>
@@ -1872,7 +1872,7 @@
<string name="default_emergency_app" msgid="1951760659640369980">"緊急應用程式"</string>
<string name="reset_app_preferences" msgid="1321050641018356925">"重設應用程式偏好設定"</string>
<string name="reset_app_preferences_title" msgid="6093179367325336662">"重設應用程式偏好設定？"</string>
- <string name="reset_app_preferences_desc" msgid="4822447731869201512">"這會重設下列項目的所有偏好設定：\n\n"<li>"已停用的應用程式"</li>\n<li>"已停用的應用程式通知"</li>\n<li>"執行動作的預設應用程式"</li>\n<li>"應用程式的背景數據限制"</li>\n<li>"任何權限限制"</li>\n\n"你不會遺失任何應用程式資料。"</string>
+ <string name="reset_app_preferences_desc" msgid="731757609326016760">"這麼做會重設下列項目的所有偏好設定：\n\n"<li>"已停用的應用程式"</li>\n<li>"已停用的應用程式通知"</li>\n<li>"執行動作的預設應用程式"</li>\n<li>"應用程式背景資料限制"</li>\n<li>"任何權限限制"</li>\n\n"你不會遺失任何應用程式資料。"</string>
<string name="reset_app_preferences_button" msgid="2559089511841281242">"重設應用程式"</string>
<string name="manage_space_text" msgid="8852711522447794676">"管理空間"</string>
<string name="filter" msgid="2018011724373033887">"篩選"</string>
@@ -2087,7 +2087,7 @@
<string name="accessibility_screen_magnification_short_summary" msgid="3411979839172752057">"輕觸三下即可縮放畫面"</string>
<string name="accessibility_screen_magnification_navbar_short_summary" msgid="3693116360267980492">"輕觸按鈕即可縮放"</string>
<string name="accessibility_screen_magnification_summary" msgid="5258868553337478505"><b>"如要進行縮放"</b>"，請快速輕觸螢幕三次。\n"<ul><li>"使用兩指或多指在畫面上拖曳以進行捲動"</li>\n<li>"使用兩指或多指撥動以調整縮放大小"</li></ul>\n\n<b>"如要暫時放大畫面"</b>"，請在螢幕上快速輕觸三下，並在第三下時按住。\n"<ul><li>"使用手指拖曳可瀏覽畫面的不同部分"</li>\n<li>"放開手指即可縮小"</li></ul>\n\n"你無法放大鍵盤和導覽列部分。"</string>
- <string name="accessibility_screen_magnification_navbar_summary" msgid="2272878354599332009">"放大功能啟用後，你可以放大檢視畫面內容。\n\n"<b>"如要進行縮放"</b>"，請啟動放大功能，然後輕觸畫面上的任何位置。\n"<ul><li>"• 使用兩指或多指拖曳可捲動畫面"</li>\n<li>"• 使用兩指或多指撥動可調整縮放等級"</li></ul>\n\n<b>"如要暫時放大畫面"</b>"，請啟動放大功能，然後按住畫面上的任何位置。\n"<ul><li>"• 拖曳手指可移動畫面"</li>\n<li>"• 移開手指可縮小畫面"</li></ul>\n\n"你無法放大鍵盤或導覽列。"</string>
+ <string name="accessibility_screen_magnification_navbar_summary" msgid="6700716275347612310">"放大功能啟用後，你可以放大畫面上的內容。\n\n"<b>"如要進行縮放"</b>"，請開啟放大功能，然後輕觸畫面上的任何位置。\n"<ul><li>"使用兩指或多指以拖曳的方式捲動畫面"</li>\n<li>"使用兩指或多指撥動以調整縮放大小"</li></ul>\n\n<b>"如要暫時放大畫面"</b>"，請開啟放大功能，然後輕觸並按住畫面上的任何位置。\n"<ul><li>"使用手指拖曳可瀏覽畫面的不同部分"</li>\n<li>"放開手指即可縮小"</li></ul>\n\n"你無法放大鍵盤和導覽列部分。"</string>
<string name="accessibility_tutorial_dialog_title_button" msgid="3682222614034474845">"使用無障礙按鈕啟用無障礙服務"</string>
<string name="accessibility_tutorial_dialog_title_gesture" msgid="1342726230497913398">"使用手勢啟用無障礙服務"</string>
<string name="accessibility_tutorial_dialog_title_gesture_settings" msgid="8539392614235820285">"使用全新的無障礙手勢"</string>
@@ -2140,8 +2140,7 @@
<string name="accessibility_hearingaid_title" msgid="8312145423610648518">"助聽器"</string>
<string name="accessibility_hearingaid_not_connected_summary" msgid="6240237523789614599">"未連接任何助聽器"</string>
<string name="accessibility_hearingaid_adding_summary" msgid="2947474468412309778">"新增助聽器"</string>
- <string name="accessibility_hearingaid_pair_instructions_first_message" msgid="3912093691643131154">"如要配對助聽器，請在下一個畫面中找出並輕觸你的裝置。"</string>
- <string name="accessibility_hearingaid_pair_instructions_second_message" msgid="5596683393607650243">"請確定你的助聽器已處於配對模式。"</string>
+ <string name="accessibility_hearingaid_pair_instructions_message" msgid="3094382949733435414">"如要配對助聽器，請在下一個畫面中找出並輕觸你的裝置。請確定你的助聽器已處於配對模式。"</string>
<string name="accessibility_hearingaid_active_device_summary" msgid="3924362383258688984">"已啟用「<xliff:g id="DEVICE_NAME">%1$s</xliff:g>」"</string>
<plurals name="show_number_hearingaid_count" formatted="false" msgid="3160782397139295486">
<item quantity="other">已儲存 <xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> 個助聽器</item>
@@ -2490,7 +2489,6 @@
<string name="menu_stats_last_unplugged" msgid="5922246077592434526">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> 前拔除插頭"</string>
<string name="menu_stats_total" msgid="8973377864854807854">"電池整體使用狀況"</string>
<string name="menu_stats_refresh" msgid="1676215433344981075">"重新整理"</string>
- <string name="process_kernel_label" msgid="3916858646836739323">"Android 作業系統"</string>
<string name="process_mediaserver_label" msgid="6500382062945689285">"媒體伺服器"</string>
<string name="process_dex2oat_label" msgid="2592408651060518226">"應用程式最佳化"</string>
<string name="battery_saver" msgid="8172485772238572153">"節約耗電量"</string>
@@ -2621,8 +2619,6 @@
<string name="no_device_admins" msgid="4846602835339095768">"沒有可用的裝置管理員應用程式"</string>
<string name="personal_device_admin_title" msgid="2849617316347669861">"個人"</string>
<string name="managed_device_admin_title" msgid="7853955652864478435">"工作"</string>
- <string name="sms_access_restriction_enabled" msgid="7054488078710530278">"限制簡訊和通話記錄存取權"</string>
- <string name="sms_access_restriction_enabled_summary" msgid="6851339654677842328">"只有預設使用的電話和簡訊應用程式擁有簡訊和通話記錄權限"</string>
<string name="no_trust_agents" msgid="7450273545568977523">"沒有信任的代理程式可供使用"</string>
<string name="add_device_admin_msg" msgid="1501847129819382149">"要啟用裝置管理員應用程式嗎？"</string>
<string name="add_device_admin" msgid="4192055385312215731">"啟用這個裝置管理員應用程式"</string>
@@ -3111,7 +3107,7 @@
<string name="keywords_app_default" msgid="5822717006354487071">"開啟方式"</string>
<string name="keywords_applications_settings" msgid="1268353611121497450">"應用程式"</string>
<string name="keywords_time_zone" msgid="998254736898753085">"時區"</string>
- <string name="keywords_draw_overlay" msgid="4130899177619041842">"即時通訊頭像"</string>
+ <string name="keywords_draw_overlay" msgid="1001120206241401007">"即時通訊頭像, 系統, 快訊, 視窗, 對話方塊, 顯示, 在其他應用程式上層, 拉動"</string>
<string name="keywords_flashlight" msgid="6161632177705233710">"手電筒, 燈, 閃光燈"</string>
<string name="keywords_change_wifi_state" msgid="627068244033681010">"wifi, wi-fi, 切換, 控制"</string>
<string name="keywords_more_mobile_networks" msgid="8995946622054642367">"行動網路, 行動裝置, 電信業者, 無線, 數據, 4G, 3G, 2G, LTE"</string>
@@ -3135,7 +3131,7 @@
<string name="keywords_sounds_and_notifications_interruptions" msgid="5426093074031208917">"零干擾, 干擾, 打擾, 中斷"</string>
<string name="keywords_app" msgid="6334757056536837791">"RAM"</string>
<string name="keywords_location" msgid="4132655528196729043">"附近, 位置資訊, 記錄, 回報, 全球衛星定位系統"</string>
- <string name="keywords_accounts" msgid="1957925565953357627">"帳戶"</string>
+ <string name="keywords_accounts" msgid="4479029747403203867">"帳戶, 新增帳戶, 工作資料夾"</string>
<string name="keywords_users" msgid="3434190133131387942">"限制, 限制, 受限"</string>
<string name="keywords_keyboard_and_ime" msgid="9143339015329957107">"文字修正, 校正, 音效, 震動, 自動, 語言, 手勢, 建議, 字詞建議, 主題, 令人反感, 字詞, 輸入, 表情符號, 國際"</string>
<string name="keywords_reset_apps" msgid="5293291209613191845">"重設, 偏好設定, 預設值"</string>
@@ -3173,6 +3169,7 @@
<string name="keywords_storage_settings" msgid="297283751968446577">"記憶體, 快取, 資料, 刪除, 清除, 釋出, 空間"</string>
<string name="keywords_bluetooth_settings" msgid="6804844062789439858">"已連線, 裝置, 耳罩式耳機, 耳機, 喇叭, 無線, 配對, 耳塞式耳機, 音樂, 媒體"</string>
<string name="keywords_wallpaper" msgid="5058364390917429896">"背景, 螢幕, 鎖定螢幕, 主題"</string>
+ <string name="keywords_styles" msgid="5828725481814049422">"圖示形狀, 強調色, 字型"</string>
<string name="keywords_assist_input" msgid="5017533309492679287">"預設, Google 助理"</string>
<string name="keywords_default_payment_app" msgid="3838565809518896799">"付款, 預設"</string>
<string name="keywords_ambient_display" msgid="3103487805748659132">"收到的通知"</string>
@@ -3182,7 +3179,7 @@
<string name="keywords_notification_vibration" msgid="31924624421190547">"觸動回饋, 震動, 敏感度"</string>
<string name="keywords_battery_saver_sticky" msgid="5586215686021650278">"節約耗電量, 固定式, 保留, 省電功能, 電池"</string>
<string name="keywords_battery_saver_schedule" msgid="7358789228486231944">"日常安排, 時間表, 節約耗電量, 節約電量, 電池, 自動, 百分比"</string>
- <string name="keywords_add_an_account" msgid="6488139919428902434">"工作資料"</string>
+ <string name="keywords_enhance_4g_lte" msgid="2273810564244790859">"VoLTE, 進階通話功能, 4G 通話功能"</string>
<string name="default_sound" msgid="8821684447333687810">"預設音效"</string>
<string name="sound_settings_summary" msgid="4100853606668287965">"鈴聲音量為 <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
<string name="sound_dashboard_summary" msgid="3402435125958012986">"音量、震動、零打擾"</string>
@@ -3889,7 +3886,6 @@
<string name="permit_draw_overlay" msgid="7456536798718633432">"允許顯示在其他應用程式上層"</string>
<string name="allow_overlay_description" msgid="8961670023925421358">"允許此應用程式顯示在畫面上層 (覆蓋你使用的其他應用程式)。這可能會干擾你使用相關的應用程式，或是影響它們的顯示或運作方式。"</string>
<string name="keywords_vr_listener" msgid="7441221822576384680">"vr 虛擬實境 接聽器 音響 小幫手 服務"</string>
- <string name="keywords_system_alert_window" msgid="5049498015597864850">"系統快訊視窗對話方塊在其他應用程式上層顯示"</string>
<string name="overlay_settings" msgid="6930854109449524280">"顯示在其他應用程式上層"</string>
<string name="system_alert_window_summary" msgid="602892301318324492">"<xliff:g id="COUNT_0">%1$d</xliff:g> 個應用程式可以顯示在其他應用程式上層 (共 <xliff:g id="COUNT_1">%2$d</xliff:g> 個應用程式)"</string>
<string name="filter_overlay_apps" msgid="6965969283342557573">"具備權限的應用程式"</string>
@@ -4125,7 +4121,6 @@
<string name="notification_log_details_none" msgid="184131801230614059">"無"</string>
<string name="notification_log_details_ranking_null" msgid="244660392058720919">"缺少排名物件。"</string>
<string name="notification_log_details_ranking_none" msgid="599607025882587844">"排名物件不包含這組金鑰。"</string>
- <string name="theme_customization_category" msgid="1049181544004163283">"主題設定"</string>
<string name="theme_customization_device_default" msgid="5058147707906551368">"裝置預設設定"</string>
<string name="display_cutout_emulation" msgid="7466869822418376317">"螢幕凹口"</string>
<string name="display_cutout_emulation_keywords" msgid="4495418317471622562">"螢幕凹口, 凹口"</string>
@@ -4551,6 +4546,8 @@
<string name="network_connection_errorstate_dialog_message" msgid="6953778550775646710">"網路連線發生錯誤，因此應用程式已取消選擇裝置的要求。"</string>
<string name="network_connection_connect_successful" msgid="5935510954474494928">"連線成功"</string>
<string name="network_connection_request_dialog_showall" msgid="6938922880244567521">"全部顯示"</string>
+ <string name="network_connection_searching_message" msgid="4638576789450817530">"正在搜尋裝置…"</string>
+ <string name="network_connection_connecting_message" msgid="3740982406609245654">"正在連線到裝置…"</string>
<plurals name="show_bluetooth_devices" formatted="false" msgid="1715020480026568408">
<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>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index d221701..0ee28b8 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -360,8 +360,6 @@
<string name="security_enable_widgets_disabled_summary" msgid="6392489775303464905">"Kukhutshazwe umlawuli"</string>
<string name="lockdown_settings_title" msgid="7393790212603280213">"Bonisa inketho yokukhiya"</string>
<string name="lockdown_settings_summary" msgid="4359438673563318171">"Bonisa inketho yenkinobho yamandla evala i-Smart Lock, ukuvulwa kwe-biometric, nezaziso ekukhiyeni isikrini"</string>
- <string name="trust_agents_extend_unlock_title" msgid="2796555263565097031">"Ukwethemba abenzeli kukhulisa ukuvula"</string>
- <string name="trust_agents_extend_unlock_summary" msgid="3976344969220255010">"Uma kunikwe amandla, abasebenzeli bokwethembeka bazogcina idivayisi yakho ivulekile isikhathi eside, ngeke bakwazi ukuvula idivayisi ekhiyiwe."</string>
<string name="trust_lost_locks_screen_title" msgid="2992742466966021682">"Khiya isikrini uma ukwethemba kulahleka"</string>
<string name="trust_lost_locks_screen_summary" msgid="693784434582021206">"Uma kunikwe amandla, idivayisi izokhiya uma umsebenzeli wokwethemba alahlekelwa ukwethembeka"</string>
<string name="owner_info_settings_summary" msgid="7472393443779227052">"Lutho"</string>
@@ -937,6 +935,7 @@
<string name="wifi_eap_identity" msgid="4359453783379679103">"Ukuhlonza"</string>
<string name="wifi_eap_anonymous" msgid="2989469344116577955">"Ukuhlonza okungaziwe"</string>
<string name="wifi_password" msgid="5948219759936151048">"Iphasiwedi"</string>
+ <string name="wifi_sae_password_id" msgid="1697832722221765763">"Isihlonzi sephasiwedi ye-SAE"</string>
<string name="wifi_show_password" msgid="6461249871236968884">"Bonisa iphasiwedi"</string>
<string name="wifi_ap_band_config" msgid="1611826705989117930">"Khetha ibhendi le-AP"</string>
<string name="wifi_ap_choose_auto" msgid="2677800651271769965">"Okuzenzakalelayo"</string>
@@ -957,7 +956,6 @@
<string name="wifi_dpp_share_wifi" msgid="9065890131734833809">"Yaba i-Wi‑Fi"</string>
<string name="wifi_dpp_scan_qr_code_with_another_device" msgid="5854392840857123065">"Skena le khodi ye-QR ukuze uxhumeke ku-“<xliff:g id="SSID">%1$s</xliff:g>” uphinde wabelane ngephasiwedi"</string>
<string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="4436318319178361543">"Skena le khodi ye-QR ukuze ixhumeke ku-“<xliff:g id="SSID">%1$s</xliff:g>”"</string>
- <string name="wifi_dpp_could_not_detect_valid_qr_code" msgid="641893675646330576">"Ayikwazanga ukufunda ikhodi ye-QR. Phinda umise phakathi kwendawo ikhodi uphinde uzame futhi"</string>
<string name="wifi_dpp_failure_authentication_or_configuration" msgid="3372757783382381044">"Zama futhi. Uma inkinga iqhubeka, xhumana nomkhiqizi wedivayisi"</string>
<string name="wifi_dpp_failure_not_compatible" msgid="2829930473520603740">"Okuthile akuhambanga kahle"</string>
<string name="wifi_dpp_failure_timeout" msgid="5228320772245820458">"Yenza isiqinisekiso sokuthi idivayisi ixhunyiwe, ishajiwe, futhi ivuliwe"</string>
@@ -980,6 +978,7 @@
<string name="wifi_dpp_hotspot_password" msgid="4120419278831581613">"Iphasiwedi ye-hotspot: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
<string name="wifi_dpp_add_device" msgid="4072206063308645677">"Engeza idivayisi"</string>
<string name="wifi_dpp_connect_network_using_qr_code" msgid="3887335309163999665">"Sebenzisa ikhodi ye-QR ukuze ungeze idivayisi kule nethiwekhi"</string>
+ <string name="wifi_dpp_qr_code_is_not_valid_format" msgid="3700087439867692944">"Ikhodi ye-QR ayiyona ifomethi evumelekile"</string>
<string name="retry" msgid="6472609612090877557">"Zama futhi"</string>
<string name="wifi_shared" msgid="844142443226926070">"Yabelana nabanye abasebenzisi bedivayisi"</string>
<string name="wifi_unchanged" msgid="3410422020930397102">"(akushintshiwe)"</string>
@@ -1129,6 +1128,7 @@
<string name="emergency_address_title" msgid="932729250447887545">"Ikheli eliphuthumayo"</string>
<string name="emergency_address_summary" msgid="7751971156196115129">"Isetshenziswa njengendawo yakho uma wenza ikholi ephuthumayo nge-Wi-Fi"</string>
<string name="private_dns_help_message" msgid="3299567069152568958"><annotation id="url">"Funda kabanzi"</annotation>" mayelana nezici ze-Private DNS"</string>
+ <string name="private_dns_mode_on" msgid="5882613439541371003">"Kuvuliwe"</string>
<string name="wifi_calling_pref_managed_by_carrier" msgid="6845711858866828986">"Isilungiselelo siphethwe inkampani yenethiwekhi"</string>
<string name="wifi_calling_settings_activation_instructions" msgid="7492509632478260955">"Yenza kusebenze ukushaya kwe-Wi-Fi"</string>
<string name="wifi_calling_turn_on" msgid="1171403510313983983">"Vula ukushaya kwe-Wi-Fi"</string>
@@ -1873,7 +1873,7 @@
<string name="default_emergency_app" msgid="1951760659640369980">"Uhlelo lokusebenza lwesimo esiphuthumayo"</string>
<string name="reset_app_preferences" msgid="1321050641018356925">"Setha kabusha izintandokazi zezinhlelo zokusebenza"</string>
<string name="reset_app_preferences_title" msgid="6093179367325336662">"Setha kabusha izintandokazi zohlelo lokusebenza?"</string>
- <string name="reset_app_preferences_desc" msgid="4822447731869201512">"Lokhu kuzosetha kabusha konke okuncamelayo kwe-:\n\n"<li>"Izinhlelo zokusebenza ezikhutshaziwe"</li>\n<li>"Izaziso zezinhlelo zokusebenza ezikhutshaziwe"</li>\n<li>"Izinhlelo zokusebenza ezizenzakalelayo zezenzo"</li>\n<li>"Imikhawulo yedatha yangemuva yezinhlelo zokusebenza"</li>\n<li>"Noma yimiphi imikhawulo yemvume"</li>\n\n"Ngeke uze ulahlekelwe noma iyiphi idatha yohlelo lokusebenza."</string>
+ <string name="reset_app_preferences_desc" msgid="731757609326016760">"Lokhu kuzosetha kabusha konke okuncamelayo kwe-:\n\n"<li>"Izinhlelo zokusebenza ezikhutshaziwe"</li>\n<li>"Izaziso zezinhlelo zokusebenza ezikhutshaziwe"</li>\n<li>"Izinhlelo zokusebenza ezizenzakalelayo zezenzo"</li>\n<li>"Imikhawulo yedatha yangemuva yezinhlelo zokusebenza"</li>\n<li>"Noma yimiphi imikhawulo yemvume"</li>\n\n"Ngeke uze ulahlekelwe noma iyiphi idatha yohlelo lokusebenza."</string>
<string name="reset_app_preferences_button" msgid="2559089511841281242">"Setha kabusha izinhlelo zokusebenza"</string>
<string name="manage_space_text" msgid="8852711522447794676">"Lawula isikhala"</string>
<string name="filter" msgid="2018011724373033887">"Hlunga"</string>
@@ -2088,7 +2088,7 @@
<string name="accessibility_screen_magnification_short_summary" msgid="3411979839172752057">"Thepha izikhathi ezingu-3 ukuze usondeze"</string>
<string name="accessibility_screen_magnification_navbar_short_summary" msgid="3693116360267980492">"Thepha inkinobho ukuze usondeze"</string>
<string name="accessibility_screen_magnification_summary" msgid="5258868553337478505"><b>"Ukuze usondeze"</b>", thepha izikhathi ezingu-3 iskikrini.\n"<ul><li>"Hudula iminwe engu-2 noma ngaphezulu ukuze uskrole"</li>\n<li>"Ncinza iminwe engu-2 noma ngaphezulu ukuze ulungise ukusondeza"</li></ul>\n\n<b>"Ukuze usondeze okwesikhashana"</b>", thepha ngokushesha isikrini izikhathi ezingu-3 bese ucindezele ngomunwe wakho ekuthepheni kwesithathu.\n"<ul><li>"Hudula ukuze uhambise esikrinini"</li>\n<li>"Phakamisa umunwe ukuze uhlehlise"</li></ul>\n\n"Awukwazi ukusondeza kukhibhodi nakwibha yokuzula."</string>
- <string name="accessibility_screen_magnification_navbar_summary" msgid="2272878354599332009">"Uma i-magnification ivuliwe, ungasondeza isikrini sakho.\n\n"<b>"Ukuze uzondeze"</b>", qalisa i-magnification, bese uthephe noma yikuphi esikrinini.\n"<ul><li>"• Hudula iminwe engu-2 noma ngaphezulu ukuze uskrole"</li>\n<li>"• Ncinza iminwe engu-2 noma ngaphezulu ukuze ulungise ukusondeza"</li></ul>\n\n<b>"Ukuze usondeze okwesikhashana"</b>", qalisa i-magnification, bese uthinte & ubambe noma yikuphi esikrinini.\n"<ul><li>"• Hudula ukuze uzungezise isikrini"</li>\n<li>"• Phakamisa umunwe ukuze uhlehlise"</li></ul>\n\n"Awukwazi ukusondeza kukhibhodi noma ibha yokuzula."</string>
+ <string name="accessibility_screen_magnification_navbar_summary" msgid="6700716275347612310">"Uma ukukhulisa kuvuliwe, ungasondeza isikrini sakho.\n\n"<b>"Ukuze usondeze"</b>", qala ukukhulisa, thepha noma yikuphi kusikrini.\n"<ul><li>"Hudula iminwe engu-2 noma ngaphezulu ukuze uskrole"</li>\n<li>"Ncinza iminwe engu-2 noma ngaphezulu ukuze ulungisa ukusondela"</li></ul>\n\n<b>"Ukuze usondeze okwesikhashana"</b>", qalisaukukhulisa, bese uthinte futhi ubambe noma yokuhi esikrinini.\n"<ul><li>"Hudula ukuze uhambahambe esikrinini"</li>\n<li>"Phakamisa umunwe ukuze uhlehlise isithombe"</li></ul>\n\n"Awukwazi ukusondeza kwikhibhodi noma kwibha yokuzula."</string>
<string name="accessibility_tutorial_dialog_title_button" msgid="3682222614034474845">"Sebenzisa inkinobho yokufinyelela ukuze uvule"</string>
<string name="accessibility_tutorial_dialog_title_gesture" msgid="1342726230497913398">"Sebenzisa ukuthinta ukuze uvule"</string>
<string name="accessibility_tutorial_dialog_title_gesture_settings" msgid="8539392614235820285">"Sebenzisa ukuthinta kokufinyelela okusha"</string>
@@ -2141,8 +2141,7 @@
<string name="accessibility_hearingaid_title" msgid="8312145423610648518">"Izinsiza zokuzwa"</string>
<string name="accessibility_hearingaid_not_connected_summary" msgid="6240237523789614599">"Azikho izinsiza zokuzwa ezixhunyiwe"</string>
<string name="accessibility_hearingaid_adding_summary" msgid="2947474468412309778">"Engeza izinsinza zokuzwa"</string>
- <string name="accessibility_hearingaid_pair_instructions_first_message" msgid="3912093691643131154">"Ukuze ubhanqe insiza yakho yokuzwa, thola futhi uthephe idivayisi yakho esikrinini esilandelayo."</string>
- <string name="accessibility_hearingaid_pair_instructions_second_message" msgid="5596683393607650243">"Qiniseka ukuthi izinsiza zakho zokuzwa zikumodi yokubhanqa."</string>
+ <string name="accessibility_hearingaid_pair_instructions_message" msgid="3094382949733435414">"Ukuze ubhanqe insiza yakho yokuzwa, thola futhi uthephe idivayisi yakho esikrinini esilandelayo. Qiniseka ukuthi izinsiza zakho zokuzwa zikumodi yokubhanqa."</string>
<string name="accessibility_hearingaid_active_device_summary" msgid="3924362383258688984">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> iyasebenza"</string>
<plurals name="show_number_hearingaid_count" formatted="false" msgid="3160782397139295486">
<item quantity="one"><xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> kulondolozwe izinsiza zokuzwa</item>
@@ -2491,7 +2490,6 @@
<string name="menu_stats_last_unplugged" msgid="5922246077592434526">"Ngenkathi igcinwe ukunqamulwa kwe <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
<string name="menu_stats_total" msgid="8973377864854807854">"Inani lokusetshenziswa"</string>
<string name="menu_stats_refresh" msgid="1676215433344981075">"Qala kabusha"</string>
- <string name="process_kernel_label" msgid="3916858646836739323">"I-Android OS"</string>
<string name="process_mediaserver_label" msgid="6500382062945689285">"Iseva yemidiya"</string>
<string name="process_dex2oat_label" msgid="2592408651060518226">"Ukuthuthukisa kohlelo lokusebenza"</string>
<string name="battery_saver" msgid="8172485772238572153">"Isilondolozi sebhethri"</string>
@@ -2622,8 +2620,6 @@
<string name="no_device_admins" msgid="4846602835339095768">"Azikho izinhlelo zokusebenza zomlawuli wedivayisi ezitholakalayo"</string>
<string name="personal_device_admin_title" msgid="2849617316347669861">"Okomuntu siqu"</string>
<string name="managed_device_admin_title" msgid="7853955652864478435">"Umsebenzi"</string>
- <string name="sms_access_restriction_enabled" msgid="7054488078710530278">"Khawulela i-SMS nokufinyelela kurekhodi lamakholi"</string>
- <string name="sms_access_restriction_enabled_summary" msgid="6851339654677842328">"Inombolo yefoni ezenzakalelayo nezinhlelo zokusebenza zokulayeza zine-SMS kanye nezimvume zerekhodi lamakholi"</string>
<string name="no_trust_agents" msgid="7450273545568977523">"Abekho abenzeli bethemba abatholakalayo"</string>
<string name="add_device_admin_msg" msgid="1501847129819382149">"Sebenzisa uhlelo lokusebenza lomlawuli wedivayisi?"</string>
<string name="add_device_admin" msgid="4192055385312215731">"Sebenzisa lolu hlelo lokusebenza lomlawuli wedivayisi"</string>
@@ -3112,7 +3108,7 @@
<string name="keywords_app_default" msgid="5822717006354487071">"Vula nge-"</string>
<string name="keywords_applications_settings" msgid="1268353611121497450">"Izinhlelo zokusebenza"</string>
<string name="keywords_time_zone" msgid="998254736898753085">"izoni yendawo"</string>
- <string name="keywords_draw_overlay" msgid="4130899177619041842">"Isihloko sengxoxo"</string>
+ <string name="keywords_draw_overlay" msgid="1001120206241401007">"Inhloko yeshadi, isistimu, isexwayiso, iwindi, ingxoxo, isibonisi, ngaphezu kwezinye izinhlelo zokusebenza, ukulingana"</string>
<string name="keywords_flashlight" msgid="6161632177705233710">"I-flashlight, isibani, ithoshi"</string>
<string name="keywords_change_wifi_state" msgid="627068244033681010">"I-wifi, i-wi-fi, guqula, lawula"</string>
<string name="keywords_more_mobile_networks" msgid="8995946622054642367">"iselula, iselula, inkampani yenethiwekhi yeselula, okungenantambo, idatha, i-4g, i-3g, i-2g, i-lte"</string>
@@ -3136,7 +3132,7 @@
<string name="keywords_sounds_and_notifications_interruptions" msgid="5426093074031208917">"ungaphazamisi ukungaphazamisi, phazamisa, ukuphazamisa, ikhefu"</string>
<string name="keywords_app" msgid="6334757056536837791">"I-RAM"</string>
<string name="keywords_location" msgid="4132655528196729043">"eduze, indawo, umlando, ukubik, i-GPS"</string>
- <string name="keywords_accounts" msgid="1957925565953357627">"i-akhawunti"</string>
+ <string name="keywords_accounts" msgid="4479029747403203867">"i-akhawunti, engeza i-akhawunti, umsebenzi wephrofayela"</string>
<string name="keywords_users" msgid="3434190133131387942">"umkhawulo, khawulela, okukhawulelwe"</string>
<string name="keywords_keyboard_and_ime" msgid="9143339015329957107">"ukulungiswa kombhalo, ukulunga, umsindo, ukudlidliza, okuzenzakalelayo, ulimi, ukuthinta, phakamisa, isiphakamiso, itimu, okuhlaselayo, igama, uhlobo, i-emoji, okwamazwe ngamazwe"</string>
<string name="keywords_reset_apps" msgid="5293291209613191845">"setha kabusha, okuncamelayo, okuzenzakalelayo"</string>
@@ -3174,6 +3170,7 @@
<string name="keywords_storage_settings" msgid="297283751968446577">"imemori, inqolobane, idatha, susa, sula, khulula, isikhala"</string>
<string name="keywords_bluetooth_settings" msgid="6804844062789439858">"xhuma, idivayisi, ama-headphones, ama-headset, isipika, i-wireless, ipheya, ama-earbuds, umculo, idatha"</string>
<string name="keywords_wallpaper" msgid="5058364390917429896">"ingemuva, isikrini, ukukhiya isikrini, itimu"</string>
+ <string name="keywords_styles" msgid="5828725481814049422">"umumo wesithonjana, umbala we-accent, ifonti"</string>
<string name="keywords_assist_input" msgid="5017533309492679287">"okuzenzakalelayo, umsizi"</string>
<string name="keywords_default_payment_app" msgid="3838565809518896799">"okuzenzakalelayo kwenkokhelo"</string>
<string name="keywords_ambient_display" msgid="3103487805748659132">"isaziso esingenayo"</string>
@@ -3183,7 +3180,7 @@
<string name="keywords_notification_vibration" msgid="31924624421190547">"ama-haptics, ukudlidliza, ukuzwela"</string>
<string name="keywords_battery_saver_sticky" msgid="5586215686021650278">"isilondolozi sebhethri, okunamathelayo, ukuqhubeka, ukulondolozwa kwamandla, ibhethri"</string>
<string name="keywords_battery_saver_schedule" msgid="7358789228486231944">"umzila, ishejuli, isilondolozi sebhethri, isilondolozi samandla, ibhethri, ukuzenzakalela, iphesenti"</string>
- <string name="keywords_add_an_account" msgid="6488139919428902434">"iphrofayela yomsebenzi"</string>
+ <string name="keywords_enhance_4g_lte" msgid="2273810564244790859">"i-volte, ukushaya okuthuthukile, ukushaya kwe-4g"</string>
<string name="default_sound" msgid="8821684447333687810">"Umsindo owufica ukhona"</string>
<string name="sound_settings_summary" msgid="4100853606668287965">"Ivolumu yokukhalisa kokungu-<xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
<string name="sound_dashboard_summary" msgid="3402435125958012986">"Ivolomu, ukudlidliza, ungaphazamisi"</string>
@@ -3890,7 +3887,6 @@
<string name="permit_draw_overlay" msgid="7456536798718633432">"Vumela ukuboniswa ngaphezu kwezinye izinhlelo zokusebenza"</string>
<string name="allow_overlay_description" msgid="8961670023925421358">"Vumela lolu hlelo lokusebenza ukuthi luboniswe ngaphezulu kwezinye izinhlelo zokusebenza ozisebenzisayo. Lingaphazamisana nokusebenza kwalezo zinhlelo zokusebenza noma lishintshe indlela ezibonakala zivela ngayo noma eziziphatha ngayo."</string>
<string name="keywords_vr_listener" msgid="7441221822576384680">"isevisi yomsizi we-vr wangempela okubonakalayo kwesitiriyo somlaleli"</string>
- <string name="keywords_system_alert_window" msgid="5049498015597864850">"ukuboniwa kwewindi lengxoxo yokwaziswa kwesistimu ngaphezulu kwezinye izinhlelo zokusebenza"</string>
<string name="overlay_settings" msgid="6930854109449524280">"Bonisa ngaphezulu kwezinye izinhlelo zokusebenza"</string>
<string name="system_alert_window_summary" msgid="602892301318324492">"<xliff:g id="COUNT_0">%1$d</xliff:g> kuzinhlelo zokusebenza ezingu-<xliff:g id="COUNT_1">%2$d</xliff:g> zivunyelwe ukuboniswa ngaphezulu kwezinye izinhlelo zokusebenza"</string>
<string name="filter_overlay_apps" msgid="6965969283342557573">"Izinhlelo zokusebenza ezinemvume"</string>
@@ -4126,7 +4122,6 @@
<string name="notification_log_details_none" msgid="184131801230614059">"lutho"</string>
<string name="notification_log_details_ranking_null" msgid="244660392058720919">"Into yokulinganisa ilahlekile."</string>
<string name="notification_log_details_ranking_none" msgid="599607025882587844">"Into yokulinganisa ayiqukethe lo khiye."</string>
- <string name="theme_customization_category" msgid="1049181544004163283">"Yenza itimu"</string>
<string name="theme_customization_device_default" msgid="5058147707906551368">"Idivayisi ezenzakalelayo"</string>
<string name="display_cutout_emulation" msgid="7466869822418376317">"Ukusikwa kwesiboniso"</string>
<string name="display_cutout_emulation_keywords" msgid="4495418317471622562">"bonisa ukusika, inotshi"</string>
@@ -4552,6 +4547,8 @@
<string name="network_connection_errorstate_dialog_message" msgid="6953778550775646710">"Okuthile kuvelile. Uhlelo lokusebenza likhansele isicelo sokukhetha idivayisi."</string>
<string name="network_connection_connect_successful" msgid="5935510954474494928">"Ukuxhumeka kuphumelele"</string>
<string name="network_connection_request_dialog_showall" msgid="6938922880244567521">"Bonisa konke"</string>
+ <string name="network_connection_searching_message" msgid="4638576789450817530">"Iseshela idivayisi…"</string>
+ <string name="network_connection_connecting_message" msgid="3740982406609245654">"Ixhumeka kudivayisi…"</string>
<plurals name="show_bluetooth_devices" formatted="false" msgid="1715020480026568408">
<item quantity="one"><xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> amadivayisi axhunyiwe</item>
<item quantity="other"><xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> amadivayisi axhunyiwe</item>
diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index 9ac9110..fef8052 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -238,6 +238,18 @@
<item>AKA\'</item>
</string-array>
+ <!-- Target EAP methods that will have different TTS strings -->
+ <!-- Note that this array length should be same as the wifi_eap_method_tts_strings-->
+ <string-array name="wifi_eap_method_target_strings" translatable="false">
+ <item>AKA\'</item>
+ </string-array>
+
+ <!-- TTS strings for the target EAP methods -->
+ <!-- Note that this array length should be same as the wifi_eap_method_target_strings-->
+ <string-array name="wifi_eap_method_tts_strings" translatable="false">
+ <item>AKA prime</item>
+ </string-array>
+
<!-- Type of EAP method when EAP SIM, AKA, AKA' are not supported -->
<string-array name="eap_method_without_sim_auth" translatable="false">
<item>PEAP</item>
diff --git a/res/values/attrs.xml b/res/values/attrs.xml
index 83269cc..b2cd1a5 100644
--- a/res/values/attrs.xml
+++ b/res/values/attrs.xml
@@ -56,8 +56,6 @@
<attr name="cardPreferenceStyle" format="reference" />
- <attr name="footerPreferenceStyle" format="reference" />
-
<declare-styleable name="FixedLineSummaryPreference">
<attr name="summaryLineCount" format="integer" />
</declare-styleable>
@@ -70,8 +68,6 @@
<attr name="searchable" format="boolean" />
<!-- Classname of a PreferenceController corresponding to the preference -->
<attr name="controller" format="string" />
- <!-- {@code true} when the controller declared represents a slice from {@link android.app.SettingsSliceContract} -->
- <attr name="platform_slice" format="boolean" />
<!-- customized subtitle if it's an unavailable slice -->
<attr name="unavailableSliceSubtitle" format="string" />
</declare-styleable>
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 7114bb1..a1cb8fc 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -108,8 +108,6 @@
<color name="switchbar_switch_track_tint">#BFFFFFFF</color>
<color name="switchbar_switch_thumb_tint">@android:color/white</color>
- <color name="glif_error_color">@*android:color/material_red_A700</color>
-
<color name="battery_good_color_light">#43a047</color> <!-- Material Green 600 -->
<color name="battery_maybe_color_light">#ef6c00</color> <!-- Material Orange 800 -->
<color name="battery_bad_color_light">#f44336</color> <!-- Material Red 500 -->
diff --git a/res/values/config.xml b/res/values/config.xml
index a4a85ba..bf1a67c 100755
--- a/res/values/config.xml
+++ b/res/values/config.xml
@@ -417,4 +417,14 @@
<!-- "Show work policy info" intent action. TODO(b/134391103): Replace with final SystemAPI intent when it's available. -->
<string name="config_work_policy_info_intent_action" translatable="false"/>
+
+ <!-- Reset application package name -->
+ <string-array name="config_reset_app_package_name" translatable="false">
+ <item>com.android.systemui</item>
+ </string-array>
+
+ <!-- Settings panel keeps observe this uri -->
+ <string-array name="config_panel_keep_observe_uri" translatable="false">
+ <item>content://com.android.settings.slices/intent/media_output_indicator</item>
+ </string-array>
</resources>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index f31a266..4d0affb 100755
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -81,6 +81,7 @@
<dimen name="notification_importance_button_text">16sp</dimen>
<dimen name="notification_importance_button_padding">14dp</dimen>
+ <dimen name="zen_mode_button_padding_vertical">16dp</dimen>
<dimen name="zen_schedule_rule_checkbox_padding">7dp</dimen>
<dimen name="zen_schedule_day_margin">17dp</dimen>
@@ -401,9 +402,6 @@
<dimen name="qrcode_size">264dp</dimen>
<dimen name="qrcode_preview_size">360dp</dimen>
- <!-- Wi-Fi DPP fragment icon size -->
- <dimen name="wifi_dpp_fragment_icon_width_height">48dp</dimen>
-
<!-- Elevation of bluetooth icon -->
<dimen name="bt_icon_elevation">4dp</dimen>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index fb478b3..0c3f8ce 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -810,11 +810,6 @@
<!-- Text shown for the description of the lockdown option -->
<string name="lockdown_settings_summary">Display power button option that turns off Smart Lock, biometric unlocking, and notifications on the lock screen</string>
- <!-- Text shown for the title of the extend unlock mode option for trust agents [CHAR LIMIT=40] -->
- <string name="trust_agents_extend_unlock_title">Trust agents only extend unlock</string>
- <!-- Text shown for the description of the extend unlock mode option [CHAR LIMIT=NONE] -->
- <string name="trust_agents_extend_unlock_summary">If enabled, trust agents will keep your device unlocked for longer, but can no longer unlock a locked device.</string>
-
<!-- Text shown for the title of the lock when trust lost option [CHAR LIMIT=40] -->
<string name="trust_lost_locks_screen_title">Lock screen when trust is lost</string>
<!-- Text shown for the description of the lock when trust lost option [CHAR LIMIT=NONE -->
@@ -2148,6 +2143,8 @@
<string name="wifi_eap_anonymous">Anonymous identity</string>
<!-- Label for the password of the secured network -->
<string name="wifi_password">Password</string>
+ <!-- Label for the sae password id of the secured network [CHAR LIMIT=32] -->
+ <string name="wifi_sae_password_id">SAE password identifier</string>
<!-- Label for the check box to show password -->
<string name="wifi_show_password">Show password</string>
<!-- Label for the RadioGroup to choose wifi ap band -->
@@ -2188,8 +2185,6 @@
<string name="wifi_dpp_scan_qr_code_with_another_device">Scan this QR code to connect to \u201c<xliff:g id="ssid" example="OfficeWifi">%1$s</xliff:g>\u201d and share the password</string>
<!-- Hint for the user to use another device to scan QR code on screen to join a open Wi-Fi [CHAR LIMIT=NONE] -->
<string name="wifi_dpp_scan_open_network_qr_code_with_another_device">Scan this QR code to connect to \u201c<xliff:g id="ssid" example="OfficeWifi">%1$s</xliff:g>\u201d</string>
- <!-- Hint for QR code detection [CHAR LIMIT=NONE] -->
- <string name="wifi_dpp_could_not_detect_valid_qr_code">Couldn\u2019t read QR code. Re-center code and try again</string>
<!-- Hint for Wi-Fi DPP handshake failure [CHAR LIMIT=NONE] -->
<string name="wifi_dpp_failure_authentication_or_configuration">Try again. If the issue continues, contact the device manufacturer</string>
<!-- Hint for Wi-Fi DPP handshake failure [CHAR LIMIT=NONE] -->
@@ -2234,6 +2229,8 @@
<string name="wifi_dpp_add_device">Add device</string>
<!-- Hint for "Add device" [CHAR LIMIT=NONE] -->
<string name="wifi_dpp_connect_network_using_qr_code">Use a QR code to add a device to this network</string>
+ <!-- Hint for QR code process failure [CHAR LIMIT=NONE] -->
+ <string name="wifi_dpp_qr_code_is_not_valid_format">QR code isn\u0027t a valid format</string>
<!-- Label for the try again button [CHAR LIMIT=20]-->
<string name="retry">Retry</string>
<!-- Label for the check box to share a network with other users on the same device -->
@@ -2627,6 +2624,8 @@
<string name="emergency_address_summary">Used as your location when you make an emergency call over Wi\u2011Fi</string>
<!-- Message of private dns that provides a help link. [CHAR LIMIT=NONE] -->
<string name="private_dns_help_message"><annotation id="url">Learn more</annotation> about Private DNS features</string>
+ <!-- Message to display when private dns is on. [CHAR LIMIT=10] -->
+ <string name="private_dns_mode_on">On</string>
<!-- Message to display when setting wifi calling are not editable [CHAR LIMIT=NONE] -->
<string name="wifi_calling_pref_managed_by_carrier">Setting managed by carrier</string>
@@ -2653,7 +2652,7 @@
<!-- Sound settings screen, music effects title [CHAR LIMIT=30]-->
<string name="musicfx_title">Music effects</string>
<!-- Sound settings screen, setting option name -->
- <string name="ring_volume_title">Ring volume</string>
+ <string name="ring_volume_title">Ring & notification volume</string>
<!-- Sound settings screen, setting option name checkbox -->
<string name="vibrate_in_silent_title">Vibrate when silent</string>
<!-- Sound settings screen, setting option name -->
@@ -4362,13 +4361,7 @@
<!-- [CHAR LIMIT=NONE] Manage applications screen, menu item. Title of dialog to confirm resetting user's app preferences. -->
<string name="reset_app_preferences_title">Reset app preferences?</string>
<!-- [CHAR LIMIT=NONE] Manage applications screen, menu item. Body of dialog to confirm resetting user's app preferences. -->
- <string name="reset_app_preferences_desc">This will reset all preferences for:\n\n
- <li>Disabled apps</li>\n
- <li>Disabled app notifications</li>\n
- <li>Default applications for actions</li>\n
- <li>Background data restrictions for apps</li>\n
- <li>Any permission restrictions</li>\n\n
- You will not lose any app data.</string>
+ <string name="reset_app_preferences_desc">This will reset all preferences for:\n\n<li>Disabled apps</li>\n<li>Disabled app notifications</li>\n<li>Default applications for actions</li>\n<li>Background data restrictions for apps</li>\n<li>Any permission restrictions</li>\n\nYou will not lose any app data.</string>
<!-- [CHAR LIMIT=25] Manage applications screen, menu item. Confirmation button of dialog to confirm resetting user's app preferences. -->
<string name="reset_app_preferences_button">Reset apps</string>
<!-- Manage applications screen, individual app screen, button label when the user wants to manage the space taken up by an app. -->
@@ -4862,7 +4855,7 @@
<!-- Summary for the accessibility preference screen to enable screen magnification gestures. [CHAR LIMIT=none] -->
<string name="accessibility_screen_magnification_summary"><b>To zoom</b>, quickly tap the screen 3 times.\n<ul><li>Drag 2 or more fingers to scroll</li>\n<li>Pinch 2 or more fingers to adjust zoom</li></ul>\n\n<b>To zoom temporarily</b>, quickly tap the screen 3 times and hold down your finger on the third tap.\n<ul><li>Drag to move around the screen</li>\n<li>Lift finger to zoom out</li></ul>\n\nYou can\'t zoom in on the keyboard and navigation bar.</string>
<!-- Summary for the accessibility preference screen to enable screen magnification via the nav bar. [CHAR LIMIT=none] -->
- <string name="accessibility_screen_magnification_navbar_summary">When magnification is turned on, you can zoom in on your screen.\n\n<b>To zoom</b>, start magnification, then tap anywhere on the screen.\n<ul><li>• Drag 2 or more fingers to scroll</li>\n<li>• Pinch 2 or more fingers to adjust zoom</li></ul>\n\n<b>To zoom temporarily</b>, start magnification, then touch & hold anywhere on the screen.\n<ul><li>• Drag to move around the screen</li>\n<li>• Lift finger to zoom out</li></ul>\n\nYou can’t zoom in on the keyboard or navigation bar.</string>
+ <string name="accessibility_screen_magnification_navbar_summary">When magnification is turned on, you can zoom in on your screen.\n\n<b>To zoom</b>, start magnification, then tap anywhere on the screen.\n<ul><li>Drag 2 or more fingers to scroll</li>\n<li>Pinch 2 or more fingers to adjust zoom</li></ul>\n\n<b>To zoom temporarily</b>, start magnification, then touch & hold anywhere on the screen.\n<ul><li>Drag to move around the screen</li>\n<li>Lift finger to zoom out</li></ul>\n\nYou can’t zoom in on the keyboard or navigation bar.</string>
<!-- Title for the Accessibility tutorial dialog in Accessibility service with button. [CHAR LIMIT=50] -->
<string name="accessibility_tutorial_dialog_title_button">Use accessibility button to open</string>
<!-- Title for the Accessibility tutorial dialog in Accessibility service with gesture. [CHAR LIMIT=50] -->
@@ -4972,10 +4965,8 @@
<string name="accessibility_hearingaid_not_connected_summary">No hearing aids connected</string>
<!-- Summary for the accessibility preference for hearing aid when adding new devices. [CHAR LIMIT=50] -->
<string name="accessibility_hearingaid_adding_summary">Add hearing aids</string>
- <!-- Message to ask the user that if they want to pair the hearing aid, then they should find and tap the hearing aid device from the list on the next screen. [CHAR LIMIT=NONE] -->
- <string name="accessibility_hearingaid_pair_instructions_first_message">To pair your hearing aids, find and tap your device on the next screen.</string>
<!-- Message to ask the user to make sure that their hearing aid devices are in pairing mode. [CHAR LIMIT=NONE] -->
- <string name="accessibility_hearingaid_pair_instructions_second_message">Make sure your hearing aids are in pairing mode.</string>
+ <string name="accessibility_hearingaid_pair_instructions_message">To pair your hearing aids, find and tap your device on the next screen. Make sure your hearing aids are in pairing mode.</string>
<!-- Summary for the accessibility preference for hearing aid when there is an active device. [CHAR LIMIT=50] -->
<string name="accessibility_hearingaid_active_device_summary"><xliff:g id="device_name">%1$s</xliff:g> active</string>
<!-- Summary for the accessibility preference for hearing aid when there are saved devices. [CHAR LIMIT=50] -->
@@ -5774,9 +5765,6 @@
<!-- Menu label for refreshing with latest usage numbers -->
<string name="menu_stats_refresh">Refresh</string>
- <!-- TODO: Remove it once the same entry in SettingsLib is translated. -->
- <!-- Label for kernel threads in battery usage -->
- <string name="process_kernel_label">Android OS</string>
<!-- Label for mediaserver process in battery usage -->
<string name="process_mediaserver_label">Mediaserver</string>
<!-- Label for dex2oat process in battery usage used for the optimization of one or more apps -->
@@ -6094,10 +6082,6 @@
<string name="personal_device_admin_title">Personal</string>
<!-- Title for managed device admin apps on the list [CHAR_LIMIT=25] -->
<string name="managed_device_admin_title">Work</string>
- <!-- Title for whether to enable SMS access restriction [CHAR LIMIT=50]-->
- <string name="sms_access_restriction_enabled">Restrict SMS & call log access</string>
- <!-- Summary for whether to enable SMS access restriction [CHAR LIMIT=NONE]-->
- <string name="sms_access_restriction_enabled_summary">Only default phone and messaging apps have SMS & call log permissions</string>
<!-- Message when there are no available trust agents to display -->
@@ -7322,7 +7306,7 @@
<!-- Search keyword for "Time zone" settings [CHAR_LIMIT=NONE]-->
<string name="keywords_time_zone">timezone</string>
<!-- Search keyword for "Display over other apps" settings [CHAR_LIMIT=NONE]-->
- <string name="keywords_draw_overlay">Chat head</string>
+ <string name="keywords_draw_overlay">Chat head, system, alert, window, dialog, display, on top other apps, draw</string>
<!-- Search keyword for "Flashlight" settings [CHAR_LIMIT=NONE]-->
<string name="keywords_flashlight">Flashlight, Light, Torch</string>
@@ -7349,7 +7333,7 @@
<string name="keywords_sounds_and_notifications_interruptions">dont don\u2019t disturb, interrupt, interruption, break</string>
<string name="keywords_app">RAM</string>
<string name="keywords_location">nearby, location, history, reporting, GPS</string>
- <string name="keywords_accounts">account</string>
+ <string name="keywords_accounts">account, add an account, work profile</string>
<string name="keywords_users">restriction, restrict, restricted</string>
<string name="keywords_keyboard_and_ime">text correction, correct, sound, vibrate, auto, language, gesture, suggest, suggestion, theme, offensive, word, type, emoji, international</string>
<string name="keywords_reset_apps">reset, preferences, default</string>
@@ -7421,6 +7405,9 @@
<!-- List of synonyms for the Wallpaper picker setting, used to match in settings search [CHAR LIMIT=NONE] -->
<string name="keywords_wallpaper">background, screen, lockscreen, theme</string>
+ <!-- List of synonyms for the Styles picker setting, used to match in settings search [CHAR LIMIT=NONE] -->
+ <string name="keywords_styles">icon shape, accent color, font</string>
+
<!-- List of synonyms for the Default Assist and Voice input setting, used to match in settings search [CHAR LIMIT=NONE] -->
<string name="keywords_assist_input">default, assistant</string>
@@ -7445,8 +7432,8 @@
<!-- Battery Saver: Search terms for battery saver schedule preference. Feel free to add additional terms when translating if appropriate [CHAR_LIMIT=NONE] -->
<string name="keywords_battery_saver_schedule">routine, schedule, battery saver, power saver, battery, automatic, percent</string>
- <!-- List of synonyms for the Add an account setting [CHAR_LIMIT=NONE] -->
- <string name="keywords_add_an_account">work profile</string>
+ <!-- List of synonyms for the enhance 4G LTE titles, used to match in settings search [CHAR LIMIT=NONE] -->
+ <string name="keywords_enhance_4g_lte">volte, advanced calling, 4g calling</string>
<!-- Option title for the default sound, context based on screen -->
<string name="default_sound">Default sound</string>
@@ -7459,7 +7446,7 @@
<!-- Sounds and Notification -->
<!-- Sound: Dashboard summary indicating the volume of ringtone. example: Ring volume at 20%.
[CHAR LIMIT=100] -->
- <string name="sound_settings_summary">Ring volume at <xliff:g id="percentage" example="2%">%1$s</xliff:g></string>
+ <string name="sound_settings_summary">Ring & notification volume at <xliff:g id="percentage" example="2%">%1$s</xliff:g></string>
<!-- Summary for sound settings, explaining a few important settings under it [CHAR LIMIT=NONE]-->
<string name="sound_dashboard_summary">Volume, vibration, Do Not Disturb</string>
@@ -7471,7 +7458,7 @@
<string name="sound_settings_summary_silent">Ringer set to silent</string>
<!-- Sound: Dashboard summary example used in Setup Wizard preview screen. [CHAR LIMIT=100] -->
- <string name="sound_settings_example_summary">Ring volume at 80%</string>
+ <string name="sound_settings_example_summary">Ring & notification volume at 80%</string>
<!-- Sound: Title for the option managing media volume. [CHAR LIMIT=30] -->
<string name="media_volume_option_title">Media volume</string>
@@ -7486,7 +7473,7 @@
<string name="alarm_volume_option_title">Alarm volume</string>
<!-- Sound: Title for the option managing ring volume. [CHAR LIMIT=30] -->
- <string name="ring_volume_option_title">Ring volume</string>
+ <string name="ring_volume_option_title">Ring & notification volume</string>
<!-- Sound: Title for the option managing notification volume. [CHAR LIMIT=30] -->
<string name="notification_volume_option_title">Notification volume</string>
@@ -9403,8 +9390,6 @@
<!-- Keyword for VR setting -->
<string name="keywords_vr_listener">vr virtual reality listener stereo helper service</string>
- <!-- Keyword for SYSTEM_ALERT_WINDOW -->
- <string name="keywords_system_alert_window">system alert window dialog display on top other apps</string>
<!-- Main settings screen item's title to go into the overlay settings screen [CHAR LIMIT=30] -->
<string name="overlay_settings">Display over other apps</string>
@@ -10021,8 +10006,6 @@
<!-- Notification log debug tool: the word 'none' -->
<string name="notification_log_details_ranking_none">Ranking object doesn\'t contain this key.</string>
- <!-- [CHAR_LIMIT=NONE] Developer Settings: Title of the settings category for theme overlays. -->
- <string name="theme_customization_category">Theming</string>
<!-- [CHAR_LIMIT=NONE] Developer Settings: Label for the option that turns off customizations for a given category.-->
<string name="theme_customization_device_default">Device default</string>
@@ -11153,6 +11136,10 @@
<string name="network_connection_connect_successful">Connection successful</string>
<!-- Neutral button for Network connection request Dialog [CHAR LIMIT=30] -->
<string name="network_connection_request_dialog_showall">Show all</string>
+ <!-- Message for Network connection searching progress Dialog. Searching for wifi ap. [CHAR LIMIT=40] -->
+ <string name="network_connection_searching_message">Searching for device\u2026</string>
+ <!-- Message for Network connection connecting progress Dialog. Try to connect to wifi ap.[CHAR LIMIT=40] -->
+ <string name="network_connection_connecting_message">Connecting to device\u2026</string>
<!-- Summary for bluetooth devices count in Bluetooth devices slice. [CHAR LIMIT=NONE] -->
<plurals name="show_bluetooth_devices">
diff --git a/res/values/styles.xml b/res/values/styles.xml
index d3d3199..8be69da 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -651,9 +651,10 @@
<item name="android:background">?android:attr/selectableItemBackground</item>
</style>
- <style name="AccessibilityDialogButtonAllow"
- parent="@style/AccessibilityDialogButton"></style>
- <style name="AccessibilityDialogButtonDeny"
- parent="@style/AccessibilityDialogButton"></style>
+ <style name="Widget.PopupWindow.Settings"
+ parent="@android:style/Widget.DeviceDefault.PopupWindow">
+ <item name="android:clipToPadding">true</item>
+ <item name="android:clipChildren">true</item>
+ </style>
</resources>
diff --git a/res/values/themes_suw.xml b/res/values/themes_suw.xml
index f7f1d16..3c171a1 100644
--- a/res/values/themes_suw.xml
+++ b/res/values/themes_suw.xml
@@ -52,7 +52,6 @@
<item name="preferenceTheme">@style/PreferenceTheme.SetupWizard</item>
<item name="*android:lockPatternStyle">@style/LockPatternStyle.Setup</item>
- <item name="*android:colorError">@color/glif_error_color</item>
</style>
<style name="GlifV2Theme" parent="SudThemeGlifV2.DayNight">
@@ -90,7 +89,6 @@
<item name="preferenceTheme">@style/PreferenceTheme.SetupWizard</item>
<item name="*android:lockPatternStyle">@style/LockPatternStyle.Setup</item>
- <item name="*android:colorError">@color/glif_error_color</item>
</style>
<style name="GlifV3Theme" parent="SudThemeGlifV3.DayNight">
@@ -133,7 +131,6 @@
<item name="preferenceTheme">@style/PreferenceTheme.SetupWizard</item>
<item name="*android:lockPatternStyle">@style/LockPatternStyle.Setup</item>
- <item name="*android:colorError">@color/glif_error_color</item>
</style>
<style name="GlifV2Theme.Transparent">
diff --git a/res/xml/accessibility_autoclick_settings.xml b/res/xml/accessibility_autoclick_settings.xml
index bb77002..0351faf 100644
--- a/res/xml/accessibility_autoclick_settings.xml
+++ b/res/xml/accessibility_autoclick_settings.xml
@@ -16,6 +16,7 @@
<PreferenceScreen
xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:settings="http://schemas.android.com/apk/res-auto"
android:key="autoclick_preference_screen"
android:title="@string/accessibility_autoclick_preference_title">
@@ -24,4 +25,9 @@
android:key="autoclick_delay"
android:title="@string/accessibility_autoclick_delay_preference_title" />
+ <com.android.settingslib.widget.FooterPreference
+ android:key="autoclick_footer"
+ android:title="@string/accessibility_autoclick_description"
+ android:selectable="false"
+ settings:searchable="false"/>
</PreferenceScreen>
diff --git a/res/xml/accessibility_control_timeout_settings.xml b/res/xml/accessibility_control_timeout_settings.xml
index e5a6e5b..77bbfd8 100644
--- a/res/xml/accessibility_control_timeout_settings.xml
+++ b/res/xml/accessibility_control_timeout_settings.xml
@@ -30,28 +30,28 @@
settings:controller="com.android.settings.widget.VideoPreferenceController"
android:persistent="false" />
- <com.android.settings.widget.RadioButtonPreference
+ <com.android.settingslib.widget.RadioButtonPreference
android:key="accessibility_control_timeout_default"
android:title="@string/accessibility_timeout_default"
settings:allowDividerAbove="true"
android:persistent="false" />
- <com.android.settings.widget.RadioButtonPreference
+ <com.android.settingslib.widget.RadioButtonPreference
android:key="accessibility_control_timeout_10secs"
android:title="@string/accessibility_timeout_10secs"
android:persistent="false" />
- <com.android.settings.widget.RadioButtonPreference
+ <com.android.settingslib.widget.RadioButtonPreference
android:key="accessibility_control_timeout_30secs"
android:title="@string/accessibility_timeout_30secs"
android:persistent="false" />
- <com.android.settings.widget.RadioButtonPreference
+ <com.android.settingslib.widget.RadioButtonPreference
android:key="accessibility_control_timeout_1min"
android:title="@string/accessibility_timeout_1min"
android:persistent="false" />
- <com.android.settings.widget.RadioButtonPreference
+ <com.android.settingslib.widget.RadioButtonPreference
android:key="accessibility_control_timeout_2mins"
android:title="@string/accessibility_timeout_2mins"
android:persistent="false" />
diff --git a/res/xml/accessibility_daltonizer_settings.xml b/res/xml/accessibility_daltonizer_settings.xml
index 9cd3865..496c515 100644
--- a/res/xml/accessibility_daltonizer_settings.xml
+++ b/res/xml/accessibility_daltonizer_settings.xml
@@ -16,6 +16,7 @@
<PreferenceScreen
xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:settings="http://schemas.android.com/apk/res-auto"
android:key="daltonizer_preference_screen"
android:title="@string/accessibility_display_daltonizer_preference_title">
@@ -27,4 +28,9 @@
android:title="@string/daltonizer_type"
android:icon="@drawable/ic_accessibility_illustration_colorblind" />
+ <com.android.settingslib.widget.FooterPreference
+ android:key="daltonizer_footer"
+ android:title="@string/accessibility_display_daltonizer_preference_subtitle"
+ android:selectable="false"
+ settings:searchable="false"/>
</PreferenceScreen>
diff --git a/res/xml/accessibility_settings.xml b/res/xml/accessibility_settings.xml
index d9c61b5..e13e820 100644
--- a/res/xml/accessibility_settings.xml
+++ b/res/xml/accessibility_settings.xml
@@ -15,41 +15,43 @@
-->
<PreferenceScreen
- xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:settings="http://schemas.android.com/apk/res-auto"
- android:key="accessibility_settings_screen"
- android:title="@string/accessibility_settings"
- android:persistent="true">
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:settings="http://schemas.android.com/apk/res-auto"
+ android:key="accessibility_settings_screen"
+ android:title="@string/accessibility_settings"
+ android:persistent="true">
<Preference
- android:key="accessibility_shortcut_preference"
- android:fragment="com.android.settings.accessibility.AccessibilityShortcutPreferenceFragment"
- android:title="@string/accessibility_global_gesture_preference_title"/>
+ android:key="accessibility_shortcut_preference"
+ android:title="@string/accessibility_global_gesture_preference_title"
+ android:fragment="com.android.settings.accessibility.AccessibilityShortcutPreferenceFragment"
+ settings:controller="com.android.settings.accessibility.AccessibilityShortcutPreferenceController"/>
<PreferenceCategory
- android:key="user_installed_services_category"
- android:title="@string/user_installed_services_category_title">
+ android:key="user_installed_services_category"
+ android:title="@string/user_installed_services_category_title">
</PreferenceCategory>
<PreferenceCategory
- android:key="screen_reader_category"
- android:title="@string/screen_reader_category_title">
+ android:key="screen_reader_category"
+ android:title="@string/screen_reader_category_title">
<Preference
- android:key="tts_settings_preference"
- android:fragment="com.android.settings.tts.TextToSpeechSettings"
- android:title="@string/tts_settings_title"
- settings:searchable="false"/>
+ android:key="tts_settings_preference"
+ android:title="@string/tts_settings_title"
+ android:fragment="com.android.settings.tts.TextToSpeechSettings"
+ settings:controller="com.android.settings.language.TtsPreferenceController"/>
</PreferenceCategory>
<PreferenceCategory
- android:key="display_category"
- android:title="@string/display_category_title">
+ android:key="display_category"
+ android:title="@string/display_category_title">
<Preference
- android:fragment="com.android.settings.display.ToggleFontSizePreferenceFragment"
android:key="font_size_preference_screen"
android:title="@string/title_font_size"
+ android:fragment="com.android.settings.display.ToggleFontSizePreferenceFragment"
+ settings:controller="com.android.settings.display.FontSizePreferenceController"
settings:searchable="false"/>
<com.android.settings.display.ScreenZoomPreference
@@ -61,67 +63,82 @@
<SwitchPreference
android:key="dark_ui_mode_accessibility"
android:title="@string/dark_ui_mode"
+ settings:controller="com.android.settings.display.DarkUIPreferenceController"
settings:searchable="false"/>
<Preference
- android:fragment="com.android.settings.accessibility.MagnificationPreferenceFragment"
android:key="magnification_preference_screen"
android:title="@string/accessibility_screen_magnification_title"
- android:icon="@drawable/ic_accessibility_magnification" />
+ android:icon="@drawable/ic_accessibility_magnification"
+ android:fragment="com.android.settings.accessibility.MagnificationPreferenceFragment"
+ settings:controller="com.android.settings.accessibility.MagnificationPreferenceController"/>
<SwitchPreference
- android:key="toggle_large_pointer_icon"
- android:title="@string/accessibility_toggle_large_pointer_icon_title" />
+ android:key="toggle_large_pointer_icon"
+ android:title="@string/accessibility_toggle_large_pointer_icon_title"
+ settings:controller="com.android.settings.accessibility.LargePointerIconPreferenceController"/>
<SwitchPreference
android:key="toggle_disable_animations"
- android:title="@string/accessibility_disable_animations" />
+ android:title="@string/accessibility_disable_animations"
+ settings:controller="com.android.settings.accessibility.DisableAnimationsPreferenceController"/>
</PreferenceCategory>
<PreferenceCategory
- android:key="interaction_control_category"
- android:title="@string/interaction_control_category_title">
+ android:key="interaction_control_category"
+ android:title="@string/interaction_control_category_title">
<Preference
- android:fragment="com.android.settings.accessibility.ToggleAutoclickPreferenceFragment"
- android:key="autoclick_preference"
- android:title="@string/accessibility_autoclick_preference_title"
- settings:searchable="false"/>
+ android:key="autoclick_preference"
+ android:title="@string/accessibility_autoclick_preference_title"
+ android:fragment="com.android.settings.accessibility.ToggleAutoclickPreferenceFragment"
+ settings:controller="com.android.settings.accessibility.AutoclickPreferenceController"/>
<SwitchPreference
- android:key="toggle_power_button_ends_call_preference"
- android:title="@string/accessibility_power_button_ends_call_prerefence_title"
- android:persistent="false"/>
-
+ android:key="toggle_power_button_ends_call_preference"
+ android:title="@string/accessibility_power_button_ends_call_prerefence_title"
+ android:persistent="false"
+ settings:controller="com.android.settings.accessibility.PowerButtonEndsCallPreferenceController"/>
+
<SwitchPreference
- android:key="toggle_lock_screen_rotation_preference"
- android:title="@string/accelerometer_title"
- android:persistent="false"/>
+ android:key="toggle_lock_screen_rotation_preference"
+ android:title="@string/accelerometer_title"
+ android:persistent="false"
+ settings:controller="com.android.settings.accessibility.LockScreenRotationPreferenceController"/>
<ListPreference
- android:key="select_long_press_timeout_preference"
- android:title="@string/accessibility_long_press_timeout_preference_title"
- android:entries="@array/long_press_timeout_selector_titles"
- android:entryValues="@array/long_press_timeout_selector_values"
- android:persistent="false"/>
+ android:key="select_long_press_timeout_preference"
+ android:title="@string/accessibility_long_press_timeout_preference_title"
+ android:entries="@array/long_press_timeout_selector_titles"
+ android:entryValues="@array/long_press_timeout_selector_values"
+ android:persistent="false"
+ settings:controller="com.android.settings.accessibility.SelectLongPressTimeoutPreferenceController"/>
<Preference
- android:fragment="com.android.settings.accessibility.AccessibilityControlTimeoutPreferenceFragment"
android:key="accessibility_control_timeout_preference_fragment"
android:title="@string/accessibility_setting_item_control_timeout_title"
- android:persistent="false" />
+ android:persistent="false"
+ android:fragment="com.android.settings.accessibility.AccessibilityControlTimeoutPreferenceFragment"
+ settings:controller="com.android.settings.accessibility.AccessibilityTimeoutPreferenceController"/>
<Preference
- android:fragment="com.android.settings.accessibility.VibrationSettings"
android:key="vibration_preference_screen"
- android:title="@string/accessibility_vibration_settings_title" />
+ android:title="@string/accessibility_vibration_settings_title"
+ android:fragment="com.android.settings.accessibility.VibrationSettings"
+ settings:controller="com.android.settings.accessibility.VibrationPreferenceController"/>
+
+ <Preference
+ android:key="gesture_system_navigation_input_summary_accessibility"
+ android:title="@string/system_navigation_title"
+ android:fragment="com.android.settings.gestures.SystemNavigationGestureSettings"
+ settings:controller="com.android.settings.gestures.SystemNavigationPreferenceController" />
</PreferenceCategory>
<PreferenceCategory
- android:key="audio_and_captions_category"
- android:title="@string/audio_and_captions_category_title">
+ android:key="audio_and_captions_category"
+ android:title="@string/audio_and_captions_category_title">
<Preference
android:key="live_caption"
@@ -130,47 +147,51 @@
settings:controller="com.android.settings.accessibility.LiveCaptionPreferenceController"/>
<SwitchPreference
- android:key="toggle_master_mono"
- android:title="@string/accessibility_toggle_master_mono_title"
- android:summary="@string/accessibility_toggle_master_mono_summary"
- android:persistent="false"/>
+ android:key="toggle_master_mono"
+ android:title="@string/accessibility_toggle_master_mono_title"
+ android:summary="@string/accessibility_toggle_master_mono_summary"
+ android:persistent="false"
+ settings:controller="com.android.settings.accessibility.MasterMonoPreferenceController"/>
<com.android.settings.accessibility.BalanceSeekBarPreference
- android:key="seekbar_master_balance"
- android:title="@string/accessibility_toggle_master_balance_title" />
+ android:key="seekbar_master_balance"
+ android:title="@string/accessibility_toggle_master_balance_title"/>
<Preference
android:key="hearing_aid_preference"
android:summary="@string/accessibility_hearingaid_not_connected_summary"
- android:title="@string/accessibility_hearingaid_title"/>
+ android:title="@string/accessibility_hearingaid_title"
+ settings:controller="com.android.settings.accessibility.AccessibilityHearingAidPreferenceController"/>
<Preference
- android:fragment="com.android.settings.accessibility.CaptionPropertiesFragment"
- android:key="captioning_preference_screen"
- android:title="@string/accessibility_captioning_title" />
+ android:key="captioning_preference_screen"
+ android:title="@string/accessibility_captioning_title"
+ android:fragment="com.android.settings.accessibility.CaptionPropertiesFragment"
+ settings:controller="com.android.settings.accessibility.CaptioningPreferenceController"/>
</PreferenceCategory>
<PreferenceCategory
- android:key="experimental_category"
- android:title="@string/experimental_category_title">
+ android:key="experimental_category"
+ android:title="@string/experimental_category_title">
<SwitchPreference
- android:key="toggle_high_text_contrast_preference"
- android:title="@string/accessibility_toggle_high_text_contrast_preference_title" />
+ android:key="toggle_high_text_contrast_preference"
+ android:title="@string/accessibility_toggle_high_text_contrast_preference_title"
+ settings:controller="com.android.settings.accessibility.HighTextContrastPreferenceController"/>
<Preference
- android:fragment="com.android.settings.accessibility.ToggleDaltonizerPreferenceFragment"
- android:key="daltonizer_preference"
- android:title="@string/accessibility_display_daltonizer_preference_title"
- android:icon="@drawable/ic_daltonizer"
- settings:searchable="false"/>
+ android:key="daltonizer_preference"
+ android:title="@string/accessibility_display_daltonizer_preference_title"
+ android:icon="@drawable/ic_daltonizer"
+ android:fragment="com.android.settings.accessibility.ToggleDaltonizerPreferenceFragment"
+ settings:controller="com.android.settings.accessibility.DaltonizerPreferenceController"/>
<SwitchPreference
- android:key="toggle_inversion_preference"
- android:title="@string/accessibility_display_inversion_preference_title"
- android:summary="@string/accessibility_display_inversion_preference_subtitle"
- android:persistent="false"
- android:icon="@drawable/ic_color_inversion"
- settings:controller="com.android.settings.accessibility.ColorInversionPreferenceController"/>
+ android:key="toggle_inversion_preference"
+ android:title="@string/accessibility_display_inversion_preference_title"
+ android:summary="@string/accessibility_display_inversion_preference_subtitle"
+ android:persistent="false"
+ android:icon="@drawable/ic_color_inversion"
+ settings:controller="com.android.settings.accessibility.ColorInversionPreferenceController"/>
</PreferenceCategory>
</PreferenceScreen>
diff --git a/res/xml/accessibility_shortcut_settings.xml b/res/xml/accessibility_shortcut_settings.xml
index 1245050..f431dec 100644
--- a/res/xml/accessibility_shortcut_settings.xml
+++ b/res/xml/accessibility_shortcut_settings.xml
@@ -14,6 +14,7 @@
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/accessibility_global_gesture_preference_title" >
<Preference
@@ -24,4 +25,10 @@
<SwitchPreference
android:key="accessibility_shortcut_on_lock_screen"
android:title="@string/accessibility_shortcut_service_on_lock_screen_title"/>
+
+ <com.android.settingslib.widget.FooterPreference
+ android:key="accessibility_shortcut_footer"
+ android:title="@string/accessibility_shortcut_description"
+ android:selectable="false"
+ settings:searchable="false"/>
</PreferenceScreen>
\ No newline at end of file
diff --git a/res/xml/adaptive_sleep_detail.xml b/res/xml/adaptive_sleep_detail.xml
index 568e694..4b46fae 100644
--- a/res/xml/adaptive_sleep_detail.xml
+++ b/res/xml/adaptive_sleep_detail.xml
@@ -45,4 +45,11 @@
settings:useAdminDisabledSummary="true"
settings:allowDividerAbove="true" />
+ <com.android.settingslib.widget.FooterPreference
+ android:key="adaptive_sleep_footer"
+ android:title="@string/adaptive_sleep_privacy"
+ android:icon="@drawable/ic_privacy_shield_24dp"
+ android:selectable="false"
+ settings:searchable="false" />
+
</PreferenceScreen>
\ No newline at end of file
diff --git a/res/xml/add_account_settings.xml b/res/xml/add_account_settings.xml
index 01e7674..1bc9149 100644
--- a/res/xml/add_account_settings.xml
+++ b/res/xml/add_account_settings.xml
@@ -19,5 +19,11 @@
xmlns:settings="http://schemas.android.com/apk/res-auto"
android:key="add_account_screen"
android:title="@string/header_add_an_account"
- settings:controller="com.android.settings.accounts.ChooseAccountPreferenceController"
- settings:keywords="@string/keywords_add_an_account"/>
+ settings:controller="com.android.settings.accounts.ChooseAccountPreferenceController">
+
+ <com.android.settingslib.widget.FooterPreference
+ android:key="add_account_enterprise_disclosure_footer"
+ android:selectable="false"
+ settings:searchable="false"
+ settings:controller="com.android.settings.accounts.EnterpriseDisclosurePreferenceController"/>
+</PreferenceScreen>
diff --git a/res/xml/auto_brightness_detail.xml b/res/xml/auto_brightness_detail.xml
index abf535f..7c66ab5 100644
--- a/res/xml/auto_brightness_detail.xml
+++ b/res/xml/auto_brightness_detail.xml
@@ -39,4 +39,10 @@
settings:userRestriction="no_config_brightness"
settings:allowDividerAbove="true" />
+ <com.android.settingslib.widget.FooterPreference
+ android:key="auto_brightness_footer"
+ android:title="@string/auto_brightness_description"
+ android:selectable="false"
+ settings:searchable="false" />
+
</PreferenceScreen>
\ No newline at end of file
diff --git a/res/xml/battery_saver_settings.xml b/res/xml/battery_saver_settings.xml
index fa02bff..0436105 100644
--- a/res/xml/battery_saver_settings.xml
+++ b/res/xml/battery_saver_settings.xml
@@ -39,17 +39,16 @@
android:title="@string/battery_saver"
android:selectable="false"
android:summary="@string/battery_saver_turn_on_summary"
+ settings:allowDividerBelow="true"
settings:textOn="@string/battery_saver_button_turn_on"
settings:textOff="@string/battery_saver_button_turn_off"
- settings:platform_slice="true"
- settings:controller="com.android.settings.fuelgauge.batterysaver.BatterySaverButtonPreferenceController" />
+ settings:controller="com.android.settings.fuelgauge.batterysaver.BatterySaverButtonPreferenceController"/>
- <PreferenceCategory
- android:key="battery_saver_footer">
- <com.android.settingslib.widget.FooterPreference
- android:key="battery_saver_footer_preference"
- android:title="@*android:string/battery_saver_description"
- android:selectable="false" />
- </PreferenceCategory>
+ <com.android.settingslib.widget.FooterPreference
+ android:key="battery_saver_footer_preference"
+ android:selectable="false"
+ android:title="@*android:string/battery_saver_description"
+ settings:allowDividerAbove="true"
+ settings:searchable="false"/>
</PreferenceScreen>
diff --git a/res/xml/billing_cycle.xml b/res/xml/billing_cycle.xml
index 3720240..e9a34f1 100644
--- a/res/xml/billing_cycle.xml
+++ b/res/xml/billing_cycle.xml
@@ -16,6 +16,7 @@
<PreferenceScreen
xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:settings="http://schemas.android.com/apk/res-auto"
android:key="billing_cycle_settings"
android:title="@string/billing_cycle">
@@ -39,4 +40,10 @@
android:key="data_limit"
android:title="@string/data_limit" />
+ <com.android.settingslib.widget.FooterPreference
+ android:key="billing_cycle_footer"
+ android:title="@string/data_warning_footnote"
+ android:selectable="false"
+ settings:searchable="false"/>
+
</PreferenceScreen>
diff --git a/res/xml/bluetooth_device_details_fragment.xml b/res/xml/bluetooth_device_details_fragment.xml
index f485c6a..94052b6 100644
--- a/res/xml/bluetooth_device_details_fragment.xml
+++ b/res/xml/bluetooth_device_details_fragment.xml
@@ -47,4 +47,10 @@
<PreferenceCategory
android:key="bluetooth_profiles"/>
+ <com.android.settingslib.widget.FooterPreference
+ android:key="device_details_footer"
+ android:selectable="false"
+ settings:searchable="false"
+ settings:controller="com.android.settings.bluetooth.BluetoothDetailsMacAddressController"/>
+
</PreferenceScreen>
\ No newline at end of file
diff --git a/res/xml/bluetooth_screen.xml b/res/xml/bluetooth_screen.xml
index 42f71b3..2a52a7c 100644
--- a/res/xml/bluetooth_screen.xml
+++ b/res/xml/bluetooth_screen.xml
@@ -36,4 +36,8 @@
settings:useAdminDisabledSummary="true"
settings:controller="com.android.settings.connecteddevice.AddDevicePreferenceController"/>
+ <com.android.settingslib.widget.FooterPreference
+ android:key="bluetooth_screen_footer"
+ android:selectable="false"
+ settings:searchable="false"/>
</PreferenceScreen>
\ No newline at end of file
diff --git a/res/xml/connected_devices.xml b/res/xml/connected_devices.xml
index 7acdc79..a210ea5 100644
--- a/res/xml/connected_devices.xml
+++ b/res/xml/connected_devices.xml
@@ -67,4 +67,11 @@
settings:allowDividerAbove="true"
settings:controller="com.android.settings.connecteddevice.AdvancedConnectedDeviceController"/>
+ <com.android.settingslib.widget.FooterPreference
+ android:key="discoverable_footer"
+ android:title="@string/bluetooth_off_footer"
+ android:selectable="false"
+ settings:controller="com.android.settings.connecteddevice.DiscoverableFooterPreferenceController">
+ </com.android.settingslib.widget.FooterPreference>
+
</PreferenceScreen>
diff --git a/res/xml/data_saver.xml b/res/xml/data_saver.xml
index 19944e2..e884d6d 100644
--- a/res/xml/data_saver.xml
+++ b/res/xml/data_saver.xml
@@ -27,4 +27,10 @@
android:fragment="com.android.settings.datausage.UnrestrictedDataAccess"
settings:controller="com.android.settings.applications.specialaccess.DataSaverController" />
+ <com.android.settingslib.widget.FooterPreference
+ android:key="data_saver_footer"
+ android:title="@*android:string/data_saver_description"
+ android:selectable="false"
+ settings:searchable="false"/>
+
</PreferenceScreen>
diff --git a/res/xml/development_settings.xml b/res/xml/development_settings.xml
index 7cf52fa..68307fc 100644
--- a/res/xml/development_settings.xml
+++ b/res/xml/development_settings.xml
@@ -119,17 +119,6 @@
android:title="@string/quick_settings_developer_tiles"
android:fragment="com.android.settings.development.qstile.DevelopmentTileConfigFragment"
settings:searchable="false" />
-
- <!-- Configure trust agent behavior -->
- <SwitchPreference
- android:key="security_setting_trust_agents_extend_unlock"
- android:title="@string/trust_agents_extend_unlock_title"
- android:summary="@string/trust_agents_extend_unlock_summary" />
-
- <SwitchPreference
- android:key="security_setting_trust_lost_locks_screen"
- android:title="@string/trust_lost_locks_screen_title"
- android:summary="@string/trust_lost_locks_screen_summary" />
</PreferenceCategory>
<PreferenceCategory
@@ -557,11 +546,6 @@
android:title="@string/reset_shortcut_manager_throttling" />
<SwitchPreference
- android:key="sms_access_restriction_enabled"
- android:title="@string/sms_access_restriction_enabled"
- android:summary="@string/sms_access_restriction_enabled_summary" />
-
- <SwitchPreference
android:key="notification_bubbles"
android:title="@string/notification_bubbles_title"
android:summary="@string/notification_bubbles_developer_setting_summary"/>
diff --git a/res/xml/device_admin_settings.xml b/res/xml/device_admin_settings.xml
index 09e0724..1837251 100644
--- a/res/xml/device_admin_settings.xml
+++ b/res/xml/device_admin_settings.xml
@@ -20,4 +20,11 @@
xmlns:settings="http://schemas.android.com/apk/res-auto"
android:title="@string/manage_device_admin"
android:key="device_admin_settings"
- settings:controller="com.android.settings.applications.specialaccess.deviceadmin.DeviceAdminListPreferenceController" />
\ No newline at end of file
+ settings:controller="com.android.settings.applications.specialaccess.deviceadmin.DeviceAdminListPreferenceController">
+
+ <com.android.settingslib.widget.FooterPreference
+ android:key="device_admin_footer"
+ android:title="@string/no_device_admins"
+ android:selectable="false"
+ settings:searchable="false"/>
+</PreferenceScreen>
\ No newline at end of file
diff --git a/res/xml/feature_flags_settings.xml b/res/xml/feature_flags_settings.xml
index 8dc5ab3..0e509a8 100644
--- a/res/xml/feature_flags_settings.xml
+++ b/res/xml/feature_flags_settings.xml
@@ -25,4 +25,10 @@
android:layout="@layout/preference_category_no_label"
android:title="@string/summary_placeholder"
settings:controller="com.android.settings.development.featureflags.FeatureFlagsPreferenceController" />
+
+ <com.android.settingslib.widget.FooterPreference
+ android:key="feature_flag_footer"
+ android:title="@string/experimental_category_title"
+ android:selectable="false"
+ settings:searchable="false"/>
</PreferenceScreen>
diff --git a/res/xml/game_driver_settings.xml b/res/xml/game_driver_settings.xml
index 6daeefb..e467320 100644
--- a/res/xml/game_driver_settings.xml
+++ b/res/xml/game_driver_settings.xml
@@ -37,7 +37,7 @@
</PreferenceCategory>
<com.android.settingslib.widget.FooterPreference
- android:key="footer_preference"
+ android:key="game_driver_footer"
android:title="@string/game_driver_footer_text"
android:selectable="false"
settings:controller="com.android.settings.development.gamedriver.GameDriverFooterPreferenceController">
diff --git a/res/xml/manage_assist.xml b/res/xml/manage_assist.xml
index bb387b5..ef0f696 100644
--- a/res/xml/manage_assist.xml
+++ b/res/xml/manage_assist.xml
@@ -53,4 +53,10 @@
android:title="@string/voice_input_settings_title"
android:fragment="com.android.settings.applications.assist.DefaultVoiceInputPicker" />
+ <com.android.settingslib.widget.FooterPreference
+ android:key="manage_assist_footer"
+ android:title="@string/assist_footer"
+ android:selectable="false"
+ settings:searchable="false"/>
+
</PreferenceScreen>
diff --git a/res/xml/mobile_network_settings.xml b/res/xml/mobile_network_settings.xml
index 1a9b885..ae7c903 100644
--- a/res/xml/mobile_network_settings.xml
+++ b/res/xml/mobile_network_settings.xml
@@ -50,6 +50,7 @@
android:title="@string/enhanced_4g_lte_mode_title"
android:persistent="false"
android:summary="@string/enhanced_4g_lte_mode_summary"
+ settings:keywords="@string/keywords_enhance_4g_lte"
settings:controller="com.android.settings.network.telephony.Enhanced4gLtePreferenceController"/>
<ListPreference
@@ -81,7 +82,7 @@
settings:searchable="false">
<PreferenceScreen
- android:key="wifi_calling_key"
+ android:key="wifi_calling"
android:title="@string/wifi_calling_settings_title"
android:summary="@string/wifi_calling_summary"
settings:controller="com.android.settings.network.telephony.WifiCallingPreferenceController" >
diff --git a/res/xml/mobile_network_settings_v2.xml b/res/xml/mobile_network_settings_v2.xml
index 506b354..31a5ef7 100644
--- a/res/xml/mobile_network_settings_v2.xml
+++ b/res/xml/mobile_network_settings_v2.xml
@@ -21,6 +21,7 @@
<com.android.settingslib.widget.LayoutPreference
android:key="use_sim_switch"
+ android:title="@string/summary_placeholder"
android:layout="@layout/styled_switch_bar"
settings:controller="com.android.settings.network.telephony.MobileNetworkSwitchController"/>
@@ -33,7 +34,7 @@
<com.android.settings.datausage.DataUsageSummaryPreference
android:key="status_header"
android:visibility="gone"
- android:selectable="false" />
+ android:selectable="false"/>
<ListPreference
android:key="calls_preference"
@@ -96,6 +97,7 @@
android:title="@string/enhanced_4g_lte_mode_title"
android:persistent="false"
android:summary="@string/enhanced_4g_lte_mode_summary"
+ settings:keywords="@string/keywords_enhance_4g_lte"
settings:controller="com.android.settings.network.telephony.Enhanced4gLtePreferenceController"/>
<ListPreference
@@ -127,7 +129,7 @@
android:title="@string/call_category">
<PreferenceScreen
- android:key="wifi_calling_key"
+ android:key="wifi_calling"
android:title="@string/wifi_calling_settings_title"
android:summary="@string/wifi_calling_summary"
settings:controller="com.android.settings.network.telephony.WifiCallingPreferenceController">
@@ -201,16 +203,15 @@
android:key="erase_sim"
android:persistent="false"
android:title="@string/mobile_network_erase_sim"
- settings:controller="com.android.settings.network.telephony.DeleteSimProfilePreferenceController" />
+ settings:allowDividerBelow="true"
+ settings:controller="com.android.settings.network.telephony.DeleteSimProfilePreferenceController"/>
- <PreferenceCategory
- android:key="footer_container"
- android:title="@string/summary_placeholder"
- android:layout="@layout/preference_category_no_label"
- settings:controller="com.android.settings.network.telephony.DisableSimFooterPreferenceController">
- <com.android.settingslib.widget.FooterPreference
- android:key="disable_sim_explanation"
- android:title="@string/mobile_network_disable_sim_explanation" />
- </PreferenceCategory>
+ <com.android.settingslib.widget.FooterPreference
+ android:key="disable_sim_explanation"
+ android:title="@string/mobile_network_disable_sim_explanation"
+ android:selectable="false"
+ settings:allowDividerAbove="true"
+ settings:searchable="false"
+ settings:controller="com.android.settings.network.telephony.DisableSimFooterPreferenceController"/>
</PreferenceScreen>
diff --git a/res/xml/my_device_info.xml b/res/xml/my_device_info.xml
index 9a6047c..6ebb1a5 100644
--- a/res/xml/my_device_info.xml
+++ b/res/xml/my_device_info.xml
@@ -94,6 +94,7 @@
android:title="@string/sim_status_title"
settings:keywords="@string/keywords_sim_status"
android:summary="@string/summary_placeholder"
+ settings:enableCopying="true"
settings:allowDividerAbove="true"/>
<!-- Model & hardware -->
@@ -101,9 +102,10 @@
android:key="device_model"
android:order="31"
android:title="@string/hardware_info"
- settings:keywords="@string/keywords_model_and_hardware"
android:summary="@string/summary_placeholder"
android:fragment="com.android.settings.deviceinfo.hardwareinfo.HardwareInfoFragment"
+ settings:enableCopying="true"
+ settings:keywords="@string/keywords_model_and_hardware"
settings:controller="com.android.settings.deviceinfo.HardwareInfoPreferenceController"/>
<!-- IMEI -->
@@ -111,8 +113,9 @@
android:key="imei_info"
android:order="32"
android:title="@string/status_imei"
- settings:keywords="@string/keywords_imei_info"
android:summary="@string/summary_placeholder"
+ settings:keywords="@string/keywords_imei_info"
+ settings:enableCopying="true"
settings:controller="com.android.settings.deviceinfo.imei.ImeiInfoPreferenceController"/>
<!-- Android version -->
diff --git a/res/xml/network_and_internet.xml b/res/xml/network_and_internet.xml
index 32b51d4..609578f 100644
--- a/res/xml/network_and_internet.xml
+++ b/res/xml/network_and_internet.xml
@@ -70,7 +70,6 @@
android:disableDependentsState="true"
android:order="5"
settings:controller="com.android.settings.network.AirplaneModePreferenceController"
- settings:platform_slice="true"
settings:userRestriction="no_airplane_mode"/>
<Preference
diff --git a/res/xml/network_and_internet_v2.xml b/res/xml/network_and_internet_v2.xml
index 3604480..5280221 100644
--- a/res/xml/network_and_internet_v2.xml
+++ b/res/xml/network_and_internet_v2.xml
@@ -59,7 +59,6 @@
android:disableDependentsState="true"
android:order="-5"
settings:controller="com.android.settings.network.AirplaneModePreferenceController"
- settings:platform_slice="true"
settings:userRestriction="no_airplane_mode"/>
<com.android.settingslib.RestrictedPreference
diff --git a/res/xml/night_display_settings.xml b/res/xml/night_display_settings.xml
index 07687ea..1a769f5 100644
--- a/res/xml/night_display_settings.xml
+++ b/res/xml/night_display_settings.xml
@@ -15,45 +15,49 @@
-->
<PreferenceScreen
- xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:settings="http://schemas.android.com/apk/res-auto"
- android:title="@string/night_display_title"
- android:key="night_display_title"
- settings:keywords="@string/keywords_display_night_display">
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:settings="http://schemas.android.com/apk/res-auto"
+ android:title="@string/night_display_title"
+ android:key="night_display_title"
+ settings:keywords="@string/keywords_display_night_display">
<DropDownPreference
android:key="night_display_auto_mode"
android:title="@string/night_display_auto_mode_title"
android:summary="%s"
- settings:controller="com.android.settings.display.NightDisplayAutoModePreferenceController" />
+ settings:controller="com.android.settings.display.NightDisplayAutoModePreferenceController"/>
<Preference
android:key="night_display_start_time"
android:title="@string/night_display_start_time_title"
- settings:controller="com.android.settings.display.NightDisplayCustomStartTimePreferenceController" />
+ settings:controller="com.android.settings.display.NightDisplayCustomStartTimePreferenceController"/>
<Preference
android:key="night_display_end_time"
android:title="@string/night_display_end_time_title"
- settings:controller="com.android.settings.display.NightDisplayCustomEndTimePreferenceController" />
+ settings:controller="com.android.settings.display.NightDisplayCustomEndTimePreferenceController"/>
<com.android.settings.widget.SeekBarPreference
android:key="night_display_temperature"
android:title="@string/night_display_temperature_title"
settings:keywords="@string/keywords_display_night_display"
settings:controller="com.android.settings.display.NightDisplayIntensityPreferenceController"
- settings:unavailableSliceSubtitle="@string/night_display_not_currently_on" />
+ 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" />
+ settings:controller="com.android.settings.display.NightDisplayActivationPreferenceController"/>
- <PreferenceCategory android:key="night_display_footer_category">
- <com.android.settingslib.widget.FooterPreference />
- </PreferenceCategory>
+ <com.android.settingslib.widget.FooterPreference
+ android:key="night_display_footer"
+ android:title="@string/night_display_text"
+ android:selectable="false"
+ settings:allowDividerAbove="true"
+ settings:controller="com.android.settings.display.NightDisplayFooterPreferenceController"/>
</PreferenceScreen>
\ No newline at end of file
diff --git a/res/xml/notification_importance.xml b/res/xml/notification_importance.xml
index 6f9cc0e..0ca00e6 100644
--- a/res/xml/notification_importance.xml
+++ b/res/xml/notification_importance.xml
@@ -17,16 +17,16 @@
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
android:title="@string/notification_importance_title">
- <com.android.settings.widget.RadioButtonPreference
+ <com.android.settingslib.widget.RadioButtonPreference
android:key="importance_high"
android:title="@string/notification_importance_high" />
- <com.android.settings.widget.RadioButtonPreference
+ <com.android.settingslib.widget.RadioButtonPreference
android:key="importance_default"
android:title="@string/notification_importance_default" />
- <com.android.settings.widget.RadioButtonPreference
+ <com.android.settingslib.widget.RadioButtonPreference
android:key="importance_low"
android:title="@string/notification_importance_low" />
- <com.android.settings.widget.RadioButtonPreference
+ <com.android.settingslib.widget.RadioButtonPreference
android:key="importance_min"
android:title="@string/notification_importance_min" />
diff --git a/res/xml/power_usage_details.xml b/res/xml/power_usage_details.xml
deleted file mode 100644
index 8c79116..0000000
--- a/res/xml/power_usage_details.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2015 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">
-
- <com.android.settingslib.widget.LayoutPreference
- android:key="two_buttons"
- android:layout="@layout/two_buttons_panel"
- android:selectable="false" />
-
- <PreferenceCategory
- android:key="controls_parent"
- android:title="@string/controls_subtitle">
-
- <SwitchPreference
- android:key="background_activity"
- android:title="@string/background_activity_title"
- android:summary="@string/background_activity_summary"/>
-
- <Preference
- android:key="high_power"
- android:title="@string/high_power_apps" />
-
- </PreferenceCategory>
-
- <PreferenceCategory
- android:key="details_parent"
- android:layout="@layout/tall_preference_category"
- android:title="@string/details_subtitle" />
-
- <PreferenceCategory
- android:key="messages_parent"
- android:layout="@layout/tall_preference_category" />
-
- <PreferenceCategory
- android:key="packages_parent"
- android:layout="@layout/tall_preference_category"
- android:title="@string/packages_subtitle" />
-
-</PreferenceScreen>
diff --git a/res/xml/power_usage_summary.xml b/res/xml/power_usage_summary.xml
index 88f88f1..005ce17 100644
--- a/res/xml/power_usage_summary.xml
+++ b/res/xml/power_usage_summary.xml
@@ -37,8 +37,7 @@
android:fragment="com.android.settings.fuelgauge.batterysaver.BatterySaverSettings"
android:key="battery_saver_summary"
android:title="@string/battery_saver"
- settings:controller="com.android.settings.fuelgauge.BatterySaverController"
- settings:platform_slice="true" />
+ settings:controller="com.android.settings.fuelgauge.BatterySaverController" />
<Preference
android:fragment="com.android.settings.fuelgauge.SmartBatterySettings"
@@ -64,4 +63,9 @@
android:title="@string/device_screen_usage"
android:selectable="false" />
+ <com.android.settingslib.widget.FooterPreference
+ android:key="power_usage_footer"
+ android:title="@string/battery_footer_summary"
+ android:selectable="false"
+ settings:searchable="false"/>
</PreferenceScreen>
diff --git a/res/xml/restricted_apps_detail.xml b/res/xml/restricted_apps_detail.xml
index 1e08a7e..76c656e 100644
--- a/res/xml/restricted_apps_detail.xml
+++ b/res/xml/restricted_apps_detail.xml
@@ -16,9 +16,15 @@
<PreferenceScreen
xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:settings="http://schemas.android.com/apk/res-auto"
android:title="@string/restricted_app_title">
<PreferenceCategory
android:key="restrict_app_list"/>
+ <com.android.settingslib.widget.FooterPreference
+ android:key="restricted_app_footer"
+ android:title="@string/restricted_app_detail_footer"
+ android:selectable="false"
+ settings:searchable="false"/>
</PreferenceScreen>
diff --git a/res/xml/security_settings_face.xml b/res/xml/security_settings_face.xml
index 1561e8c..4b4de17 100644
--- a/res/xml/security_settings_face.xml
+++ b/res/xml/security_settings_face.xml
@@ -61,17 +61,16 @@
<com.android.settingslib.widget.LayoutPreference
android:key="security_settings_face_delete_faces_container"
android:selectable="false"
- android:layout="@layout/face_remove_button" />
+ android:layout="@layout/face_remove_button"
+ settings:allowDividerBelow="true"/>
<com.android.settingslib.widget.LayoutPreference
android:key="security_settings_face_enroll_faces_container"
android:selectable="false"
- android:layout="@layout/face_enroll_button " />
+ android:layout="@layout/face_enroll_button "
+ settings:allowDividerBelow="true"/>
</PreferenceCategory>
- <PreferenceCategory
- android:key="security_settings_face_footer_container">
- <com.android.settingslib.widget.FooterPreference />
- </PreferenceCategory>
-
+ <com.android.settingslib.widget.FooterPreference
+ settings:allowDividerAbove="true"/>
</PreferenceScreen>
\ No newline at end of file
diff --git a/res/xml/security_settings_picker.xml b/res/xml/security_settings_picker.xml
index 2e6361a..e772c38 100644
--- a/res/xml/security_settings_picker.xml
+++ b/res/xml/security_settings_picker.xml
@@ -15,6 +15,7 @@
-->
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:settings="http://schemas.android.com/apk/res-auto"
android:title="@string/lock_settings_picker_title"
android:key="lock_settings_picker">
@@ -57,4 +58,9 @@
android:title="@string/face_unlock_skip_face"
android:persistent="false"/>
+ <com.android.settingslib.widget.FooterPreference
+ android:key="lock_settings_footer"
+ android:selectable="false"
+ settings:searchable="false"/>
+
</PreferenceScreen>
diff --git a/res/xml/smart_battery_detail.xml b/res/xml/smart_battery_detail.xml
index fa1b20b..87eeb86 100644
--- a/res/xml/smart_battery_detail.xml
+++ b/res/xml/smart_battery_detail.xml
@@ -46,4 +46,9 @@
android:key="restricted_app"
android:title="@string/restricted_app_title"/>
+ <com.android.settingslib.widget.FooterPreference
+ android:key="smart_battery_detail_footer"
+ android:title="@string/smart_battery_footer"
+ android:selectable="false"
+ settings:searchable="false"/>
</PreferenceScreen>
\ No newline at end of file
diff --git a/res/xml/special_access.xml b/res/xml/special_access.xml
index f846298..e07ede7 100644
--- a/res/xml/special_access.xml
+++ b/res/xml/special_access.xml
@@ -42,7 +42,7 @@
android:key="system_alert_window"
android:title="@string/system_alert_window_settings"
android:fragment="com.android.settings.applications.manageapplications.ManageApplications"
- settings:keywords="@string/keywords_system_alert_window"
+ settings:keywords="@string/keywords_draw_overlay"
settings:controller="com.android.settings.applications.specialaccess.SystemAlertWindowPreferenceController">
<extra
android:name="classname"
diff --git a/res/xml/tether_prefs.xml b/res/xml/tether_prefs.xml
index 70a57d7..3f9b8c8 100644
--- a/res/xml/tether_prefs.xml
+++ b/res/xml/tether_prefs.xml
@@ -44,4 +44,10 @@
android:summary="@string/tether_settings_disabled_on_data_saver"
android:selectable="false"
settings:allowDividerAbove="true" />
+
+ <com.android.settingslib.widget.FooterPreference
+ android:key="tether_prefs_footer"
+ android:title="@string/tethering_footer_info"
+ android:selectable="false"
+ settings:searchable="false"/>
</PreferenceScreen>
diff --git a/res/xml/time_zone_prefs.xml b/res/xml/time_zone_prefs.xml
index 2199fae..6fa43fa 100644
--- a/res/xml/time_zone_prefs.xml
+++ b/res/xml/time_zone_prefs.xml
@@ -31,7 +31,7 @@
android:title="@string/date_time_set_timezone_title"
android:summary="@string/summary_placeholder" />
<com.android.settingslib.widget.FooterPreference
- android:key="footer_preference"
+ android:key="timezone_footer"
settings:controller="com.android.settings.datetime.timezone.TimeZoneInfoPreferenceController" />
</PreferenceCategory>
diff --git a/res/xml/tts_engine_picker.xml b/res/xml/tts_engine_picker.xml
index 92bfede..2550fe0 100644
--- a/res/xml/tts_engine_picker.xml
+++ b/res/xml/tts_engine_picker.xml
@@ -18,6 +18,4 @@
android:key="tts_engine_picker_screen"
android:title="@string/tts_engine_preference_title">
- <PreferenceCategory android:key="tts_engine_preference_category"/>
-
</PreferenceScreen>
diff --git a/res/xml/user_settings.xml b/res/xml/user_settings.xml
index 269aa3a..eb8803b 100644
--- a/res/xml/user_settings.xml
+++ b/res/xml/user_settings.xml
@@ -40,4 +40,11 @@
android:order="105"
settings:allowDividerAbove="true"/>
+ <com.android.settingslib.widget.FooterPreference
+ android:key="multiuser_footer"
+ android:title="@string/user_settings_footer_text"
+ android:selectable="false"
+ settings:searchable="false"
+ settings:controller="com.android.settings.users.MultiUserFooterPreferenceController"/>
+
</PreferenceScreen>
diff --git a/res/xml/virtual_keyboard_settings.xml b/res/xml/virtual_keyboard_settings.xml
index 78b27f9..f248236 100644
--- a/res/xml/virtual_keyboard_settings.xml
+++ b/res/xml/virtual_keyboard_settings.xml
@@ -20,8 +20,10 @@
android:title="@string/virtual_keyboard_category">
<!-- Enabled input method list will be populated programmatically here. -->
<Preference
+ android:icon="@drawable/ic_add_24dp"
android:key="add_virtual_keyboard_screen"
android:title="@string/add_virtual_keyboard"
+ android:order="1000"
android:fragment="com.android.settings.inputmethod.AvailableVirtualKeyboardFragment"
- settings:searchable="false"/>
+ settings:controller="com.android.settings.inputmethod.InputMethodPreferenceController" />
</PreferenceScreen>
diff --git a/res/xml/wifi_configure_settings.xml b/res/xml/wifi_configure_settings.xml
index c621466..c7e16ef 100644
--- a/res/xml/wifi_configure_settings.xml
+++ b/res/xml/wifi_configure_settings.xml
@@ -24,20 +24,23 @@
android:key="enable_wifi_wakeup"
android:title="@string/wifi_wakeup"
android:icon="@drawable/ic_auto_wifi"
- android:summary="@string/wifi_wakeup_summary" />
+ android:summary="@string/wifi_wakeup_summary"
+ settings:controller="com.android.settings.wifi.WifiWakeupPreferenceController"/>
<SwitchPreference
android:key="use_open_wifi_automatically"
android:icon="@drawable/ic_open_wifi_autoconnect"
android:title="@string/use_open_wifi_automatically_title"
- android:summary="@string/use_open_wifi_automatically_summary" />
+ android:summary="@string/use_open_wifi_automatically_summary"
+ settings:controller="com.android.settings.wifi.UseOpenWifiPreferenceController"/>
<SwitchPreference
android:key="notify_open_networks"
android:title="@string/wifi_notify_open_networks"
android:icon="@drawable/ic_open_wifi_notifications"
android:summary="@string/wifi_notify_open_networks_summary"
- settings:keywords="@string/keywords_wifi_notify_open_networks"/>
+ settings:keywords="@string/keywords_wifi_notify_open_networks"
+ settings:controller="com.android.settings.wifi.NotifyOpenNetworksPreferenceController"/>
<SwitchPreference
android:key="wifi_cellular_data_fallback"
diff --git a/res/xml/wifi_tether_settings.xml b/res/xml/wifi_tether_settings.xml
index 81e60a2..3a3bdc4 100644
--- a/res/xml/wifi_tether_settings.xml
+++ b/res/xml/wifi_tether_settings.xml
@@ -20,8 +20,7 @@
xmlns:settings="http://schemas.android.com/apk/res-auto"
android:key="wifi_tether_settings_screen"
android:title="@string/wifi_hotspot_checkbox_text"
- settings:searchable="false"
- settings:initialExpandedChildrenCount="3">
+ settings:searchable="false">
<com.android.settings.wifi.tether.WifiTetherSsidPreference
android:key="wifi_tether_network_name"
diff --git a/res/xml/zen_mode_block_settings.xml b/res/xml/zen_mode_block_settings.xml
index cccc63c..1b04fb8 100644
--- a/res/xml/zen_mode_block_settings.xml
+++ b/res/xml/zen_mode_block_settings.xml
@@ -17,6 +17,7 @@
<PreferenceScreen
xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:settings="http://schemas.android.com/apk/res-auto"
android:key="zen_mode_block_settings_page"
android:title="@string/zen_mode_what_to_block_title">
@@ -57,4 +58,10 @@
android:title="@string/zen_mode_block_effect_list" />
</PreferenceCategory>
+ <com.android.settingslib.widget.FooterPreference
+ android:key="zen_mode_block_footer"
+ android:title="@string/zen_mode_blocked_effects_footer"
+ android:selectable="false"
+ settings:searchable="false"/>
+
</PreferenceScreen>
diff --git a/src/com/android/settings/BugreportPreference.java b/src/com/android/settings/BugreportPreference.java
index 1652ad2..dfefe5a 100644
--- a/src/com/android/settings/BugreportPreference.java
+++ b/src/com/android/settings/BugreportPreference.java
@@ -21,20 +21,30 @@
import android.content.Context;
import android.content.DialogInterface;
import android.os.RemoteException;
+import android.os.BugreportParams;
+import android.os.SystemProperties;
import android.util.AttributeSet;
+import android.util.FeatureFlagUtils;
import android.util.Log;
import android.view.View;
import android.widget.CheckedTextView;
import android.widget.TextView;
+import android.content.Intent;
import androidx.appcompat.app.AlertDialog.Builder;
+import com.android.settings.core.FeatureFlags;
import com.android.settings.overlay.FeatureFactory;
import com.android.settingslib.CustomDialogPreferenceCompat;
public class BugreportPreference extends CustomDialogPreferenceCompat {
private static final String TAG = "BugreportPreference";
+ private static final String INTENT_BUGREPORT_REQUESTED =
+ "com.android.internal.intent.action.BUGREPORT_REQUESTED";
+ private static final String EXTRA_ORIGINAL_INTENT = "android.intent.extra.ORIGINAL_INTENT";
+ private static final String EXTRA_BUGREPORT_TYPE = "android.intent.extra.BUGREPORT_TYPE";
+ private static final String SHELL_APP_PACKAGE = "com.android.shell";
private CheckedTextView mInteractiveTitle;
private TextView mInteractiveSummary;
@@ -98,7 +108,24 @@
private void takeBugreport(int bugreportType) {
try {
- ActivityManager.getService().requestBugReport(bugreportType);
+ final Context context = getContext();
+ // USE_BUGREPORT_API is a system property flag used to switch back to the old workflow
+ // using dumpstate. By using the default value as true, new workflow using Bugreport
+ // API is triggered. To switch to the old workflow directly using dumpstate run the
+ // following commands on the terminal:
+ // * adb root
+ // * adb shell setprop settings_use_bugreport_api false
+ if (FeatureFlagUtils.isEnabled(context, FeatureFlagUtils.USE_BUGREPORT_API)) {
+ Intent triggerShellBugreport = new Intent();
+ triggerShellBugreport.setAction(INTENT_BUGREPORT_REQUESTED);
+ triggerShellBugreport.setPackage(SHELL_APP_PACKAGE);
+ triggerShellBugreport.putExtra(EXTRA_BUGREPORT_TYPE, bugreportType);
+
+ // Send broadcast to shell to trigger bugreport using Bugreport API
+ context.sendBroadcast(triggerShellBugreport);
+ } else {
+ ActivityManager.getService().requestBugReport(bugreportType);
+ }
} catch (RemoteException e) {
Log.e(TAG, "error taking bugreport (bugreportType=" + bugreportType + ")", e);
}
diff --git a/src/com/android/settings/RadioInfo.java b/src/com/android/settings/RadioInfo.java
index fdc930e..ffb035a 100644
--- a/src/com/android/settings/RadioInfo.java
+++ b/src/com/android/settings/RadioInfo.java
@@ -1619,13 +1619,14 @@
return;
}
// getSubId says it takes a slotIndex, but it actually takes a phone index
+ int subId = SubscriptionManager.INVALID_SUBSCRIPTION_ID;
int[] subIds = SubscriptionManager.getSubId(phoneIndex);
- if (subIds == null || subIds.length < 1) {
- return;
+ if (subIds != null && subIds.length > 0) {
+ subId = subIds[0];
}
mSelectedPhoneIndex = phoneIndex;
- updatePhoneIndex(phoneIndex, subIds[0]);
+ updatePhoneIndex(phoneIndex, subId);
}
}
diff --git a/src/com/android/settings/RestrictedRadioButton.java b/src/com/android/settings/RestrictedRadioButton.java
index 20c2872..24a1b78 100644
--- a/src/com/android/settings/RestrictedRadioButton.java
+++ b/src/com/android/settings/RestrictedRadioButton.java
@@ -19,13 +19,13 @@
import static com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
import android.content.Context;
-import android.graphics.PorterDuff;
import android.util.AttributeSet;
import android.widget.RadioButton;
import android.widget.TextView;
import com.android.settingslib.RestrictedLockUtils;
import com.android.settingslib.RestrictedLockUtilsInternal;
+import com.android.settingslib.utils.ColorUtil;
public class RestrictedRadioButton extends RadioButton {
private Context mContext;
@@ -67,10 +67,10 @@
RestrictedLockUtilsInternal.setTextViewAsDisabledByAdmin(mContext,
(TextView) this, mDisabledByAdmin);
if (mDisabledByAdmin) {
- getButtonDrawable().setColorFilter(mContext.getColor(R.color.disabled_text_color),
- PorterDuff.Mode.MULTIPLY);
+ getButtonDrawable().setAlpha(
+ (int) (255 * ColorUtil.getDisabledAlpha(mContext)));
} else {
- getButtonDrawable().clearColorFilter();
+ getButtonDrawable().setAlpha(0);
}
}
}
diff --git a/src/com/android/settings/Settings.java b/src/com/android/settings/Settings.java
index ab59da4..add1178 100644
--- a/src/com/android/settings/Settings.java
+++ b/src/com/android/settings/Settings.java
@@ -43,6 +43,7 @@
public static class PrivateVolumeSettingsActivity extends SettingsActivity { /* empty */ }
public static class PublicVolumeSettingsActivity extends SettingsActivity { /* empty */ }
public static class WifiSettingsActivity extends SettingsActivity { /* empty */ }
+ public static class WifiSettings2Activity extends SettingsActivity { /* empty */ }
public static class WifiP2pSettingsActivity extends SettingsActivity { /* empty */ }
public static class AvailableVirtualKeyboardActivity extends SettingsActivity { /* empty */ }
public static class KeyboardLayoutPickerActivity extends SettingsActivity { /* empty */ }
diff --git a/src/com/android/settings/SettingsActivity.java b/src/com/android/settings/SettingsActivity.java
index 3b01b32..071cbcb 100644
--- a/src/com/android/settings/SettingsActivity.java
+++ b/src/com/android/settings/SettingsActivity.java
@@ -16,6 +16,8 @@
package com.android.settings;
+import static com.android.settings.applications.appinfo.AppButtonsPreferenceController.KEY_REMOVE_TASK_WHEN_FINISHING;
+
import android.app.ActionBar;
import android.app.ActivityManager;
import android.content.BroadcastReceiver;
@@ -203,10 +205,14 @@
}
private String getMetricsTag() {
- String tag = getClass().getName();
+ String tag = null;
if (getIntent() != null && getIntent().hasExtra(EXTRA_SHOW_FRAGMENT)) {
tag = getIntent().getStringExtra(EXTRA_SHOW_FRAGMENT);
}
+ if (TextUtils.isEmpty(tag)) {
+ Log.w(LOG_TAG, "MetricsTag is invalid " + tag);
+ tag = getClass().getName();
+ }
if (tag.startsWith("com.android.settings.")) {
tag = tag.replace("com.android.settings.", "");
}
@@ -542,7 +548,12 @@
*/
public void finishPreferencePanel(int resultCode, Intent resultData) {
setResult(resultCode, resultData);
- finish();
+ if (resultData != null &&
+ resultData.getBooleanExtra(KEY_REMOVE_TASK_WHEN_FINISHING, false)) {
+ finishAndRemoveTask();
+ } else {
+ finish();
+ }
}
/**
diff --git a/src/com/android/settings/SettingsPreferenceFragment.java b/src/com/android/settings/SettingsPreferenceFragment.java
index 6b29b2e..c1d020c 100644
--- a/src/com/android/settings/SettingsPreferenceFragment.java
+++ b/src/com/android/settings/SettingsPreferenceFragment.java
@@ -53,7 +53,6 @@
import com.android.settingslib.CustomDialogPreferenceCompat;
import com.android.settingslib.CustomEditTextPreferenceCompat;
import com.android.settingslib.core.instrumentation.Instrumentable;
-import com.android.settingslib.widget.FooterPreferenceMixinCompat;
import com.android.settingslib.widget.LayoutPreference;
import java.util.UUID;
@@ -68,10 +67,6 @@
private static final String SAVE_HIGHLIGHTED_KEY = "android:preference_highlighted";
- protected final FooterPreferenceMixinCompat mFooterPreferenceMixin =
- new FooterPreferenceMixinCompat(this, getSettingsLifecycle());
-
-
private static final int ORDER_FIRST = -1;
private SettingsDialogFragment mDialogFragment;
@@ -113,7 +108,8 @@
}
};
- private ViewGroup mPinnedHeaderFrameLayout;
+ @VisibleForTesting
+ ViewGroup mPinnedHeaderFrameLayout;
private ViewGroup mButtonBar;
private LayoutPreference mHeader;
@@ -186,6 +182,10 @@
mPinnedHeaderFrameLayout.setVisibility(View.VISIBLE);
}
+ public void showPinnedHeader(boolean show) {
+ mPinnedHeaderFrameLayout.setVisibility(show ? View.VISIBLE : View.INVISIBLE);
+ }
+
@Override
public void onSaveInstanceState(Bundle outState) {
super.onSaveInstanceState(outState);
@@ -275,11 +275,13 @@
protected void setHeaderView(int resource) {
mHeader = new LayoutPreference(getPrefContext(), resource);
+ mHeader.setSelectable(false);
addPreferenceToTop(mHeader);
}
protected void setHeaderView(View view) {
mHeader = new LayoutPreference(getPrefContext(), view);
+ mHeader.setSelectable(false);
addPreferenceToTop(mHeader);
}
@@ -310,8 +312,7 @@
if (getPreferenceScreen() != null) {
final View listContainer = getActivity().findViewById(android.R.id.list_container);
boolean show = (getPreferenceScreen().getPreferenceCount()
- - (mHeader != null ? 1 : 0)
- - (mFooterPreferenceMixin.hasFooter() ? 1 : 0)) <= 0
+ - (mHeader != null ? 1 : 0)) <= 0
|| (listContainer != null && listContainer.getVisibility() != View.VISIBLE);
mEmptyView.setVisibility(show ? View.VISIBLE : View.GONE);
} else {
diff --git a/src/com/android/settings/SettingsTutorialDialogWrapperActivity.java b/src/com/android/settings/SettingsTutorialDialogWrapperActivity.java
index ce44689..50b966f 100644
--- a/src/com/android/settings/SettingsTutorialDialogWrapperActivity.java
+++ b/src/com/android/settings/SettingsTutorialDialogWrapperActivity.java
@@ -39,4 +39,4 @@
AccessibilityGestureNavigationTutorial
.showGestureNavigationSettingsTutorialDialog(this, dialog -> finish());
}
-}
\ No newline at end of file
+}
diff --git a/src/com/android/settings/TetherSettings.java b/src/com/android/settings/TetherSettings.java
index 20b6e2f..a6cbcb0 100644
--- a/src/com/android/settings/TetherSettings.java
+++ b/src/com/android/settings/TetherSettings.java
@@ -120,9 +120,6 @@
super.onCreate(icicle);
addPreferencesFromResource(R.xml.tether_prefs);
- mFooterPreferenceMixin.createFooterPreference()
- .setTitle(R.string.tethering_footer_info);
-
mDataSaverBackend = new DataSaverBackend(getContext());
mDataSaverEnabled = mDataSaverBackend.isDataSaverEnabled();
mDataSaverFooter = findPreference(KEY_DATA_SAVER_FOOTER);
diff --git a/src/com/android/settings/Utils.java b/src/com/android/settings/Utils.java
index c4b1400..75db3e1 100644
--- a/src/com/android/settings/Utils.java
+++ b/src/com/android/settings/Utils.java
@@ -131,6 +131,11 @@
"device_identifier_access_restrictions_disabled";
/**
+ * Whether to show the Permissions Hub.
+ */
+ public static final String PROPERTY_PERMISSIONS_HUB_ENABLED = "permissions_hub_enabled";
+
+ /**
* Finds a matching activity for a preference's intent. If a matching
* activity is not found, it will remove the preference.
*
diff --git a/src/com/android/settings/accessibility/AccessibilityGestureNavigationTutorial.java b/src/com/android/settings/accessibility/AccessibilityGestureNavigationTutorial.java
index 8c0bdab..e7b2b82 100644
--- a/src/com/android/settings/accessibility/AccessibilityGestureNavigationTutorial.java
+++ b/src/com/android/settings/accessibility/AccessibilityGestureNavigationTutorial.java
@@ -214,4 +214,4 @@
return ((AccessibilityManager) context.getSystemService(Context.ACCESSIBILITY_SERVICE))
.isTouchExplorationEnabled();
}
-}
\ No newline at end of file
+}
diff --git a/src/com/android/settings/accessibility/AccessibilityHearingAidPreferenceController.java b/src/com/android/settings/accessibility/AccessibilityHearingAidPreferenceController.java
index 641d8ca..8f0ca3e 100644
--- a/src/com/android/settings/accessibility/AccessibilityHearingAidPreferenceController.java
+++ b/src/com/android/settings/accessibility/AccessibilityHearingAidPreferenceController.java
@@ -31,9 +31,6 @@
import androidx.annotation.VisibleForTesting;
import androidx.fragment.app.FragmentManager;
-import androidx.lifecycle.Lifecycle.Event;
-import androidx.lifecycle.LifecycleObserver;
-import androidx.lifecycle.OnLifecycleEvent;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
@@ -43,6 +40,9 @@
import com.android.settings.core.SubSettingLauncher;
import com.android.settingslib.bluetooth.CachedBluetoothDevice;
import com.android.settingslib.bluetooth.LocalBluetoothManager;
+import com.android.settingslib.core.lifecycle.LifecycleObserver;
+import com.android.settingslib.core.lifecycle.events.OnStart;
+import com.android.settingslib.core.lifecycle.events.OnStop;
import java.util.Iterator;
import java.util.List;
@@ -53,7 +53,7 @@
* Controller that shows and updates the bluetooth device name
*/
public class AccessibilityHearingAidPreferenceController extends BasePreferenceController
- implements LifecycleObserver {
+ implements LifecycleObserver, OnStart, OnStop {
private static final String TAG = "AccessibilityHearingAidPreferenceController";
private Preference mHearingAidPreference;
@@ -104,8 +104,8 @@
return mHearingAidProfileSupported ? AVAILABLE : UNSUPPORTED_ON_DEVICE;
}
- @OnLifecycleEvent(Event.ON_RESUME)
- public void onResume() {
+ @Override
+ public void onStart() {
if (mHearingAidProfileSupported) {
IntentFilter filter = new IntentFilter();
filter.addAction(BluetoothHearingAid.ACTION_CONNECTION_STATE_CHANGED);
@@ -114,8 +114,8 @@
}
}
- @OnLifecycleEvent(Event.ON_PAUSE)
- public void onPause() {
+ @Override
+ public void onStop() {
if (mHearingAidProfileSupported) {
mContext.unregisterReceiver(mHearingAidChangedReceiver);
}
diff --git a/src/com/android/settings/accessibility/AccessibilitySettings.java b/src/com/android/settings/accessibility/AccessibilitySettings.java
index cb98892..e4df675 100644
--- a/src/com/android/settings/accessibility/AccessibilitySettings.java
+++ b/src/com/android/settings/accessibility/AccessibilitySettings.java
@@ -16,38 +16,30 @@
package com.android.settings.accessibility;
-import static android.os.Vibrator.VibrationIntensity;
-
import static com.android.settingslib.TwoTargetPreference.ICON_SIZE_MEDIUM;
import android.accessibilityservice.AccessibilityServiceInfo;
import android.app.admin.DevicePolicyManager;
import android.app.settings.SettingsEnums;
import android.content.ComponentName;
-import android.content.ContentResolver;
import android.content.Context;
import android.content.pm.ResolveInfo;
import android.content.pm.ServiceInfo;
-import android.content.res.Resources;
import android.graphics.drawable.Drawable;
import android.hardware.display.ColorDisplayManager;
import android.net.Uri;
import android.os.Bundle;
import android.os.Handler;
import android.os.UserHandle;
-import android.os.Vibrator;
import android.provider.DeviceConfig;
import android.provider.SearchIndexableResource;
import android.provider.Settings;
import android.text.TextUtils;
import android.util.ArrayMap;
-import android.view.KeyCharacterMap;
-import android.view.KeyEvent;
import android.view.accessibility.AccessibilityManager;
import androidx.annotation.VisibleForTesting;
import androidx.core.content.ContextCompat;
-import androidx.preference.ListPreference;
import androidx.preference.Preference;
import androidx.preference.PreferenceCategory;
import androidx.preference.PreferenceScreen;
@@ -55,13 +47,10 @@
import com.android.internal.accessibility.AccessibilityShortcutController;
import com.android.internal.content.PackageMonitor;
-import com.android.internal.view.RotationPolicy;
-import com.android.internal.view.RotationPolicy.RotationPolicyListener;
import com.android.settings.R;
-import com.android.settings.SettingsPreferenceFragment;
import com.android.settings.Utils;
+import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.display.DarkUIPreferenceController;
-import com.android.settings.display.ToggleFontSizePreferenceFragment;
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
import com.android.settingslib.RestrictedLockUtilsInternal;
@@ -69,11 +58,8 @@
import com.android.settingslib.accessibility.AccessibilityUtils;
import com.android.settingslib.search.SearchIndexable;
-import com.google.common.primitives.Ints;
-
import java.util.ArrayList;
import java.util.Collection;
-import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Set;
@@ -82,8 +68,9 @@
* Activity with the accessibility settings.
*/
@SearchIndexable
-public class AccessibilitySettings extends SettingsPreferenceFragment implements
- Preference.OnPreferenceChangeListener {
+public class AccessibilitySettings extends DashboardFragment {
+
+ private static final String TAG = "AccessibilitySettings";
// Index of the first preference in a preference category.
private static final int FIRST_PREFERENCE_IN_CATEGORY_INDEX = -1;
@@ -102,44 +89,15 @@
};
// Preferences
- private static final String TOGGLE_HIGH_TEXT_CONTRAST_PREFERENCE =
- "toggle_high_text_contrast_preference";
private static final String TOGGLE_INVERSION_PREFERENCE =
"toggle_inversion_preference";
- private static final String TOGGLE_POWER_BUTTON_ENDS_CALL_PREFERENCE =
- "toggle_power_button_ends_call_preference";
- private static final String TOGGLE_LOCK_SCREEN_ROTATION_PREFERENCE =
- "toggle_lock_screen_rotation_preference";
private static final String TOGGLE_LARGE_POINTER_ICON =
"toggle_large_pointer_icon";
private static final String TOGGLE_DISABLE_ANIMATIONS = "toggle_disable_animations";
- private static final String TOGGLE_MASTER_MONO =
- "toggle_master_mono";
- private static final String SELECT_LONG_PRESS_TIMEOUT_PREFERENCE =
- "select_long_press_timeout_preference";
- private static final String ACCESSIBILITY_SHORTCUT_PREFERENCE =
- "accessibility_shortcut_preference";
- private static final String HEARING_AID_PREFERENCE =
- "hearing_aid_preference";
- private static final String CAPTIONING_PREFERENCE_SCREEN =
- "captioning_preference_screen";
private static final String DISPLAY_MAGNIFICATION_PREFERENCE_SCREEN =
"magnification_preference_screen";
- private static final String FONT_SIZE_PREFERENCE_SCREEN =
- "font_size_preference_screen";
- private static final String AUTOCLICK_PREFERENCE_SCREEN =
- "autoclick_preference";
- private static final String VIBRATION_PREFERENCE_SCREEN =
- "vibration_preference_screen";
private static final String DISPLAY_DALTONIZER_PREFERENCE_SCREEN =
"daltonizer_preference";
- private static final String ACCESSIBILITY_CONTROL_TIMEOUT_PREFERENCE =
- "accessibility_control_timeout_preference_fragment";
- private static final String DARK_UI_MODE_PREFERENCE =
- "dark_ui_mode_accessibility";
- private static final String LIVE_CAPTION_PREFERENCE_KEY =
- "live_caption";
-
// Extras passed to sub-fragments.
static final String EXTRA_PREFERENCE_KEY = "preference_key";
@@ -161,18 +119,8 @@
// presentation.
private static final long DELAY_UPDATE_SERVICES_MILLIS = 1000;
- // Settings that should be changed when toggling animations
- private static final String[] TOGGLE_ANIMATION_TARGETS = {
- Settings.Global.WINDOW_ANIMATION_SCALE, Settings.Global.TRANSITION_ANIMATION_SCALE,
- Settings.Global.ANIMATOR_DURATION_SCALE
- };
- private static final String ANIMATION_ON_VALUE = "1";
- private static final String ANIMATION_OFF_VALUE = "0";
-
static final String RAMPING_RINGER_ENABLED = "ramping_ringer_enabled";
- private final Map<String, String> mLongPressTimeoutValueToTitleMap = new HashMap<>();
-
private final Handler mHandler = new Handler();
private final Runnable mUpdateRunnable = new Runnable() {
@@ -212,13 +160,6 @@
private final SettingsContentObserver mSettingsContentObserver;
- private final RotationPolicyListener mRotationPolicyListener = new RotationPolicyListener() {
- @Override
- public void onChange() {
- updateLockScreenRotationCheckbox();
- }
- };
-
private final Map<String, PreferenceCategory> mCategoryToPrefCategoryMap =
new ArrayMap<>();
private final Map<Preference, PreferenceCategory> mServicePreferenceToPreferenceCategoryMap =
@@ -226,30 +167,11 @@
private final Map<ComponentName, PreferenceCategory> mPreBundledServiceComponentToCategoryMap =
new ArrayMap<>();
- private SwitchPreference mToggleHighTextContrastPreference;
- private SwitchPreference mTogglePowerButtonEndsCallPreference;
- private SwitchPreference mToggleLockScreenRotationPreference;
private SwitchPreference mToggleLargePointerIconPreference;
private SwitchPreference mToggleDisableAnimationsPreference;
- private SwitchPreference mToggleMasterMonoPreference;
- private ListPreference mSelectLongPressTimeoutPreference;
- private Preference mCaptioningPreferenceScreen;
private Preference mDisplayMagnificationPreferenceScreen;
- private Preference mFontSizePreferenceScreen;
- private Preference mAutoclickPreferenceScreen;
- private Preference mAccessibilityShortcutPreferenceScreen;
private Preference mDisplayDaltonizerPreferenceScreen;
- private Preference mHearingAidPreference;
- private Preference mVibrationPreferenceScreen;
- private Preference mLiveCaptionPreference;
private SwitchPreference mToggleInversionPreference;
- private ColorInversionPreferenceController mInversionPreferenceController;
- private AccessibilityHearingAidPreferenceController mHearingAidPreferenceController;
- private SwitchPreference mDarkUIModePreference;
- private DarkUIPreferenceController mDarkUIPreferenceController;
- private LiveCaptionPreferenceController mLiveCaptionPreferenceController;
-
- private int mLongPressTimeoutDefault;
private DevicePolicyManager mDpm;
@@ -293,7 +215,6 @@
@Override
public void onCreate(Bundle icicle) {
super.onCreate(icicle);
- addPreferencesFromResource(R.xml.accessibility_settings);
initializeAllPreferences();
mDpm = (DevicePolicyManager) (getActivity()
.getSystemService(Context.DEVICE_POLICY_SERVICE));
@@ -302,79 +223,35 @@
@Override
public void onAttach(Context context) {
super.onAttach(context);
- mHearingAidPreferenceController = new AccessibilityHearingAidPreferenceController
- (context, HEARING_AID_PREFERENCE);
- mHearingAidPreferenceController.setFragmentManager(getFragmentManager());
- getLifecycle().addObserver(mHearingAidPreferenceController);
-
- mLiveCaptionPreferenceController = new LiveCaptionPreferenceController(context,
- LIVE_CAPTION_PREFERENCE_KEY);
+ use(DarkUIPreferenceController.class).setParentFragment(this);
+ use(AccessibilityHearingAidPreferenceController.class)
+ .setFragmentManager(getFragmentManager());
}
@Override
- public void onResume() {
- super.onResume();
+ public void onStart() {
+ super.onStart();
updateAllPreferences();
mSettingsPackageMonitor.register(getActivity(), getActivity().getMainLooper(), false);
mSettingsContentObserver.register(getContentResolver());
- if (RotationPolicy.isRotationSupported(getActivity())) {
- RotationPolicy.registerRotationPolicyListener(getActivity(),
- mRotationPolicyListener);
- }
}
@Override
- public void onPause() {
+ public void onStop() {
mSettingsPackageMonitor.unregister();
mSettingsContentObserver.unregister(getContentResolver());
- if (RotationPolicy.isRotationSupported(getActivity())) {
- RotationPolicy.unregisterRotationPolicyListener(getActivity(),
- mRotationPolicyListener);
- }
- super.onPause();
+ super.onStop();
}
@Override
- public boolean onPreferenceChange(Preference preference, Object newValue) {
- if (mSelectLongPressTimeoutPreference == preference) {
- handleLongPressTimeoutPreferenceChange((String) newValue);
- return true;
- }
- return false;
- }
-
- private void handleLongPressTimeoutPreferenceChange(String stringValue) {
- Settings.Secure.putInt(getContentResolver(),
- Settings.Secure.LONG_PRESS_TIMEOUT, Integer.parseInt(stringValue));
- mSelectLongPressTimeoutPreference.setSummary(
- mLongPressTimeoutValueToTitleMap.get(stringValue));
+ protected int getPreferenceScreenResId() {
+ return R.xml.accessibility_settings;
}
@Override
- public boolean onPreferenceTreeClick(Preference preference) {
- if (mToggleHighTextContrastPreference == preference) {
- handleToggleTextContrastPreferenceClick();
- return true;
- } else if (mTogglePowerButtonEndsCallPreference == preference) {
- handleTogglePowerButtonEndsCallPreferenceClick();
- return true;
- } else if (mToggleLockScreenRotationPreference == preference) {
- handleLockScreenRotationPreferenceClick();
- return true;
- } else if (mToggleLargePointerIconPreference == preference) {
- handleToggleLargePointerIconPreferenceClick();
- return true;
- } else if (mToggleDisableAnimationsPreference == preference) {
- handleToggleDisableAnimations();
- return true;
- } else if (mToggleMasterMonoPreference == preference) {
- handleToggleMasterMonoPreferenceClick();
- return true;
- } else if (mHearingAidPreferenceController.handlePreferenceTreeClick(preference)) {
- return true;
- }
- return super.onPreferenceTreeClick(preference);
+ protected String getLogTag() {
+ return TAG;
}
public static CharSequence getServiceSummary(Context context, AccessibilityServiceInfo info,
@@ -401,141 +278,27 @@
DeviceConfig.NAMESPACE_TELEPHONY, RAMPING_RINGER_ENABLED, false);
}
- private void handleToggleTextContrastPreferenceClick() {
- Settings.Secure.putInt(getContentResolver(),
- Settings.Secure.ACCESSIBILITY_HIGH_TEXT_CONTRAST_ENABLED,
- (mToggleHighTextContrastPreference.isChecked() ? 1 : 0));
- }
-
- private void handleTogglePowerButtonEndsCallPreferenceClick() {
- Settings.Secure.putInt(getContentResolver(),
- Settings.Secure.INCALL_POWER_BUTTON_BEHAVIOR,
- (mTogglePowerButtonEndsCallPreference.isChecked()
- ? Settings.Secure.INCALL_POWER_BUTTON_BEHAVIOR_HANGUP
- : Settings.Secure.INCALL_POWER_BUTTON_BEHAVIOR_SCREEN_OFF));
- }
-
- private void handleLockScreenRotationPreferenceClick() {
- RotationPolicy.setRotationLockForAccessibility(getActivity(),
- !mToggleLockScreenRotationPreference.isChecked());
- }
-
- private void handleToggleLargePointerIconPreferenceClick() {
- Settings.Secure.putInt(getContentResolver(),
- Settings.Secure.ACCESSIBILITY_LARGE_POINTER_ICON,
- mToggleLargePointerIconPreference.isChecked() ? 1 : 0);
- }
-
- private void handleToggleDisableAnimations() {
- String newAnimationValue = mToggleDisableAnimationsPreference.isChecked()
- ? ANIMATION_OFF_VALUE : ANIMATION_ON_VALUE;
- for (String animationPreference : TOGGLE_ANIMATION_TARGETS) {
- Settings.Global.putString(getContentResolver(), animationPreference, newAnimationValue);
- }
- }
-
- private void handleToggleMasterMonoPreferenceClick() {
- Settings.System.putIntForUser(getContentResolver(), Settings.System.MASTER_MONO,
- mToggleMasterMonoPreference.isChecked() ? 1 : 0, UserHandle.USER_CURRENT);
- }
-
private void initializeAllPreferences() {
for (int i = 0; i < CATEGORIES.length; i++) {
PreferenceCategory prefCategory = (PreferenceCategory) findPreference(CATEGORIES[i]);
mCategoryToPrefCategoryMap.put(CATEGORIES[i], prefCategory);
}
- // Text contrast.
- mToggleHighTextContrastPreference =
- (SwitchPreference) findPreference(TOGGLE_HIGH_TEXT_CONTRAST_PREFERENCE);
-
// Display inversion.
- mToggleInversionPreference = (SwitchPreference) findPreference(TOGGLE_INVERSION_PREFERENCE);
- mInversionPreferenceController =
- new ColorInversionPreferenceController(getContext(), TOGGLE_INVERSION_PREFERENCE);
- mInversionPreferenceController.displayPreference(getPreferenceScreen());
-
- // Power button ends calls.
- mTogglePowerButtonEndsCallPreference =
- (SwitchPreference) findPreference(TOGGLE_POWER_BUTTON_ENDS_CALL_PREFERENCE);
- if (!KeyCharacterMap.deviceHasKey(KeyEvent.KEYCODE_POWER)
- || !Utils.isVoiceCapable(getActivity())) {
- mCategoryToPrefCategoryMap.get(CATEGORY_INTERACTION_CONTROL)
- .removePreference(mTogglePowerButtonEndsCallPreference);
- }
-
- // Lock screen rotation.
- mToggleLockScreenRotationPreference =
- (SwitchPreference) findPreference(TOGGLE_LOCK_SCREEN_ROTATION_PREFERENCE);
- if (!RotationPolicy.isRotationSupported(getActivity())) {
- mCategoryToPrefCategoryMap.get(CATEGORY_INTERACTION_CONTROL)
- .removePreference(mToggleLockScreenRotationPreference);
- }
+ mToggleInversionPreference = findPreference(TOGGLE_INVERSION_PREFERENCE);
// Large pointer icon.
- mToggleLargePointerIconPreference =
- (SwitchPreference) findPreference(TOGGLE_LARGE_POINTER_ICON);
+ mToggleLargePointerIconPreference = findPreference(TOGGLE_LARGE_POINTER_ICON);
mToggleDisableAnimationsPreference =
(SwitchPreference) findPreference(TOGGLE_DISABLE_ANIMATIONS);
- // Master Mono
- mToggleMasterMonoPreference =
- (SwitchPreference) findPreference(TOGGLE_MASTER_MONO);
-
- // Long press timeout.
- mSelectLongPressTimeoutPreference =
- (ListPreference) findPreference(SELECT_LONG_PRESS_TIMEOUT_PREFERENCE);
- mSelectLongPressTimeoutPreference.setOnPreferenceChangeListener(this);
- if (mLongPressTimeoutValueToTitleMap.size() == 0) {
- String[] timeoutValues = getResources().getStringArray(
- R.array.long_press_timeout_selector_values);
- mLongPressTimeoutDefault = Integer.parseInt(timeoutValues[0]);
- String[] timeoutTitles = getResources().getStringArray(
- R.array.long_press_timeout_selector_titles);
- final int timeoutValueCount = timeoutValues.length;
- for (int i = 0; i < timeoutValueCount; i++) {
- mLongPressTimeoutValueToTitleMap.put(timeoutValues[i], timeoutTitles[i]);
- }
- }
-
- // Hearing Aid.
- mHearingAidPreference = findPreference(HEARING_AID_PREFERENCE);
- mHearingAidPreferenceController.displayPreference(getPreferenceScreen());
-
- // Captioning.
- mCaptioningPreferenceScreen = findPreference(CAPTIONING_PREFERENCE_SCREEN);
-
- // Live caption
- mLiveCaptionPreference = findPreference(LIVE_CAPTION_PREFERENCE_KEY);
- mLiveCaptionPreferenceController.displayPreference(getPreferenceScreen());
-
// Display magnification.
mDisplayMagnificationPreferenceScreen = findPreference(
DISPLAY_MAGNIFICATION_PREFERENCE_SCREEN);
- configureMagnificationPreferenceIfNeeded(mDisplayMagnificationPreferenceScreen);
-
- // Font size.
- mFontSizePreferenceScreen = findPreference(FONT_SIZE_PREFERENCE_SCREEN);
-
- // Autoclick after pointer stops.
- mAutoclickPreferenceScreen = findPreference(AUTOCLICK_PREFERENCE_SCREEN);
// Display color adjustments.
mDisplayDaltonizerPreferenceScreen = findPreference(DISPLAY_DALTONIZER_PREFERENCE_SCREEN);
-
- // Accessibility shortcut.
- mAccessibilityShortcutPreferenceScreen = findPreference(ACCESSIBILITY_SHORTCUT_PREFERENCE);
-
- // Vibrations.
- mVibrationPreferenceScreen = findPreference(VIBRATION_PREFERENCE_SCREEN);
-
- // Dark Mode.
- mDarkUIModePreference = findPreference(DARK_UI_MODE_PREFERENCE);
- mDarkUIPreferenceController = new DarkUIPreferenceController(getContext(),
- DARK_UI_MODE_PREFERENCE);
- mDarkUIPreferenceController.setParentFragment(this);
- mDarkUIPreferenceController.displayPreference(getPreferenceScreen());
}
private void updateAllPreferences() {
@@ -741,262 +504,6 @@
displayCategory.addPreference(mToggleInversionPreference);
displayCategory.addPreference(mDisplayDaltonizerPreferenceScreen);
}
-
- // Text contrast.
- mToggleHighTextContrastPreference.setChecked(
- Settings.Secure.getInt(getContentResolver(),
- Settings.Secure.ACCESSIBILITY_HIGH_TEXT_CONTRAST_ENABLED, 0) == 1);
-
- // If the quick setting is enabled, the preference MUST be enabled.
- mInversionPreferenceController.updateState(mToggleInversionPreference);
-
- // Dark Mode
- mDarkUIPreferenceController.updateState(mDarkUIModePreference);
-
- // Power button ends calls.
- if (KeyCharacterMap.deviceHasKey(KeyEvent.KEYCODE_POWER)
- && Utils.isVoiceCapable(getActivity())) {
- final int incallPowerBehavior = Settings.Secure.getInt(getContentResolver(),
- Settings.Secure.INCALL_POWER_BUTTON_BEHAVIOR,
- Settings.Secure.INCALL_POWER_BUTTON_BEHAVIOR_DEFAULT);
- final boolean powerButtonEndsCall =
- (incallPowerBehavior == Settings.Secure.INCALL_POWER_BUTTON_BEHAVIOR_HANGUP);
- mTogglePowerButtonEndsCallPreference.setChecked(powerButtonEndsCall);
- }
-
- // Auto-rotate screen
- updateLockScreenRotationCheckbox();
-
- // Large pointer icon.
- mToggleLargePointerIconPreference.setChecked(Settings.Secure.getInt(getContentResolver(),
- Settings.Secure.ACCESSIBILITY_LARGE_POINTER_ICON, 0) != 0);
-
- updateDisableAnimationsToggle();
-
- // Master mono
- updateMasterMono();
-
- // Long press timeout.
- final int longPressTimeout = Settings.Secure.getInt(getContentResolver(),
- Settings.Secure.LONG_PRESS_TIMEOUT, mLongPressTimeoutDefault);
- String value = String.valueOf(longPressTimeout);
- mSelectLongPressTimeoutPreference.setValue(value);
- mSelectLongPressTimeoutPreference.setSummary(mLongPressTimeoutValueToTitleMap.get(value));
-
- updateVibrationSummary(mVibrationPreferenceScreen);
-
- mHearingAidPreferenceController.updateState(mHearingAidPreference);
-
- mLiveCaptionPreferenceController.updateState(mLiveCaptionPreference);
-
- updateFeatureSummary(Settings.Secure.ACCESSIBILITY_CAPTIONING_ENABLED,
- mCaptioningPreferenceScreen);
- updateFeatureSummary(Settings.Secure.ACCESSIBILITY_DISPLAY_DALTONIZER_ENABLED,
- mDisplayDaltonizerPreferenceScreen);
-
- updateMagnificationSummary(mDisplayMagnificationPreferenceScreen);
-
- updateFontSizeSummary(mFontSizePreferenceScreen);
-
- updateAutoclickSummary(mAutoclickPreferenceScreen);
-
- updateAccessibilityShortcut(mAccessibilityShortcutPreferenceScreen);
-
- updateAccessibilityTimeoutSummary(getContentResolver(),
- findPreference(ACCESSIBILITY_CONTROL_TIMEOUT_PREFERENCE));
- }
-
- void updateAccessibilityTimeoutSummary(ContentResolver resolver, Preference pref) {
- String[] timeoutSummarys = getResources().getStringArray(
- R.array.accessibility_timeout_summaries);
- int[] timeoutValues = getResources().getIntArray(
- R.array.accessibility_timeout_selector_values);
-
- int timeoutValue = AccessibilityTimeoutController.getSecureAccessibilityTimeoutValue(
- resolver, AccessibilityTimeoutController.CONTROL_TIMEOUT_SETTINGS_SECURE);
-
- int idx = Ints.indexOf(timeoutValues, timeoutValue);
- pref.setSummary(timeoutSummarys[idx == -1 ? 0 : idx]);
- }
-
- private void updateMagnificationSummary(Preference pref) {
- final boolean tripleTapEnabled = Settings.Secure.getInt(getContentResolver(),
- Settings.Secure.ACCESSIBILITY_DISPLAY_MAGNIFICATION_ENABLED, 0) == 1;
- final boolean buttonEnabled = Settings.Secure.getInt(getContentResolver(),
- Settings.Secure.ACCESSIBILITY_DISPLAY_MAGNIFICATION_NAVBAR_ENABLED, 0) == 1;
-
- int summaryResId = 0;
- if (!tripleTapEnabled && !buttonEnabled) {
- summaryResId = R.string.accessibility_feature_state_off;
- } else if (!tripleTapEnabled && buttonEnabled) {
- summaryResId = R.string.accessibility_screen_magnification_navbar_title;
- } else if (tripleTapEnabled && !buttonEnabled) {
- summaryResId = R.string.accessibility_screen_magnification_gestures_title;
- } else {
- summaryResId = R.string.accessibility_screen_magnification_state_navbar_gesture;
- }
- pref.setSummary(summaryResId);
- }
-
- private void updateFeatureSummary(String prefKey, Preference pref) {
- final boolean enabled = Settings.Secure.getInt(getContentResolver(), prefKey, 0) == 1;
- pref.setSummary(enabled ? R.string.accessibility_feature_state_on
- : R.string.accessibility_feature_state_off);
- }
-
- private void updateAutoclickSummary(Preference pref) {
- final boolean enabled = Settings.Secure.getInt(
- getContentResolver(), Settings.Secure.ACCESSIBILITY_AUTOCLICK_ENABLED, 0) == 1;
- if (!enabled) {
- pref.setSummary(R.string.accessibility_feature_state_off);
- return;
- }
- int delay = Settings.Secure.getInt(
- getContentResolver(), Settings.Secure.ACCESSIBILITY_AUTOCLICK_DELAY,
- AccessibilityManager.AUTOCLICK_DELAY_DEFAULT);
- pref.setSummary(ToggleAutoclickPreferenceFragment.getAutoclickPreferenceSummary(
- getResources(), delay));
- }
-
- private void updateFontSizeSummary(Preference pref) {
- final float currentScale = Settings.System.getFloat(getContext().getContentResolver(),
- Settings.System.FONT_SCALE, 1.0f);
- final Resources res = getContext().getResources();
- final String[] entries = res.getStringArray(R.array.entries_font_size);
- final String[] strEntryValues = res.getStringArray(R.array.entryvalues_font_size);
- final int index = ToggleFontSizePreferenceFragment.fontSizeValueToIndex(currentScale,
- strEntryValues);
- pref.setSummary(entries[index]);
- }
-
- @VisibleForTesting
- void updateVibrationSummary(Preference pref) {
- final Context context = getContext();
- final Vibrator vibrator = context.getSystemService(Vibrator.class);
-
- int ringIntensity = Settings.System.getInt(context.getContentResolver(),
- Settings.System.RING_VIBRATION_INTENSITY,
- vibrator.getDefaultRingVibrationIntensity());
- if (Settings.System.getInt(context.getContentResolver(),
- Settings.System.VIBRATE_WHEN_RINGING, 0) == 0 && !isRampingRingerEnabled(context)) {
- ringIntensity = Vibrator.VIBRATION_INTENSITY_OFF;
- }
- CharSequence ringIntensityString =
- VibrationIntensityPreferenceController.getIntensityString(context, ringIntensity);
-
- int notificationIntensity = Settings.System.getInt(context.getContentResolver(),
- Settings.System.NOTIFICATION_VIBRATION_INTENSITY,
- vibrator.getDefaultNotificationVibrationIntensity());
- CharSequence notificationIntensityString =
- VibrationIntensityPreferenceController.getIntensityString(context,
- notificationIntensity);
-
- int touchIntensity = Settings.System.getInt(context.getContentResolver(),
- Settings.System.HAPTIC_FEEDBACK_INTENSITY,
- vibrator.getDefaultHapticFeedbackIntensity());
- if (Settings.System.getInt(context.getContentResolver(),
- Settings.System.HAPTIC_FEEDBACK_ENABLED, 0) == 0) {
- touchIntensity = Vibrator.VIBRATION_INTENSITY_OFF;
- }
- CharSequence touchIntensityString =
- VibrationIntensityPreferenceController.getIntensityString(context, touchIntensity);
-
- if (mVibrationPreferenceScreen == null) {
- mVibrationPreferenceScreen = findPreference(VIBRATION_PREFERENCE_SCREEN);
- }
-
- if (ringIntensity == touchIntensity && ringIntensity == notificationIntensity) {
- mVibrationPreferenceScreen.setSummary(ringIntensityString);
- } else {
- mVibrationPreferenceScreen.setSummary(
- getString(R.string.accessibility_vibration_summary,
- ringIntensityString,
- notificationIntensityString,
- touchIntensityString));
- }
- }
-
- private String getVibrationSummary(Context context, @VibrationIntensity int intensity) {
- final boolean supportsMultipleIntensities = context.getResources().getBoolean(
- R.bool.config_vibration_supports_multiple_intensities);
- if (supportsMultipleIntensities) {
- switch (intensity) {
- case Vibrator.VIBRATION_INTENSITY_OFF:
- return context.getString(R.string.accessibility_vibration_summary_off);
- case Vibrator.VIBRATION_INTENSITY_LOW:
- return context.getString(R.string.accessibility_vibration_summary_low);
- case Vibrator.VIBRATION_INTENSITY_MEDIUM:
- return context.getString(R.string.accessibility_vibration_summary_medium);
- case Vibrator.VIBRATION_INTENSITY_HIGH:
- return context.getString(R.string.accessibility_vibration_summary_high);
- default:
- return "";
- }
- } else {
- if (intensity == Vibrator.VIBRATION_INTENSITY_OFF) {
- return context.getString(R.string.switch_on_text);
- } else {
- return context.getString(R.string.switch_off_text);
- }
- }
- }
-
- private void updateLockScreenRotationCheckbox() {
- Context context = getActivity();
- if (context != null) {
- mToggleLockScreenRotationPreference.setChecked(
- !RotationPolicy.isRotationLocked(context));
- }
- }
-
- private void updateDisableAnimationsToggle() {
- boolean allAnimationsDisabled = true;
- for (String animationSetting : TOGGLE_ANIMATION_TARGETS) {
- if (!TextUtils.equals(
- Settings.Global.getString(getContentResolver(), animationSetting),
- ANIMATION_OFF_VALUE)) {
- allAnimationsDisabled = false;
- break;
- }
- }
- mToggleDisableAnimationsPreference.setChecked(allAnimationsDisabled);
- }
-
- private void updateMasterMono() {
- final boolean masterMono = Settings.System.getIntForUser(
- getContentResolver(), Settings.System.MASTER_MONO,
- 0 /* default */, UserHandle.USER_CURRENT) == 1;
- mToggleMasterMonoPreference.setChecked(masterMono);
- }
-
- private void updateAccessibilityShortcut(Preference preference) {
- if (AccessibilityManager.getInstance(getActivity())
- .getInstalledAccessibilityServiceList().isEmpty()) {
- mAccessibilityShortcutPreferenceScreen
- .setSummary(getString(R.string.accessibility_no_services_installed));
- mAccessibilityShortcutPreferenceScreen.setEnabled(false);
- } else {
- mAccessibilityShortcutPreferenceScreen.setEnabled(true);
- boolean shortcutEnabled =
- AccessibilityUtils.isShortcutEnabled(getContext(), UserHandle.myUserId());
- CharSequence summary = shortcutEnabled
- ? AccessibilityShortcutPreferenceFragment.getServiceName(getContext())
- : getString(R.string.accessibility_feature_state_off);
- mAccessibilityShortcutPreferenceScreen.setSummary(summary);
- }
- }
-
- private static void configureMagnificationPreferenceIfNeeded(Preference preference) {
- // Some devices support only a single magnification mode. In these cases, we redirect to
- // the magnification mode's UI directly, rather than showing a PreferenceScreen with a
- // single list item.
- final Context context = preference.getContext();
- if (!MagnificationPreferenceFragment.isApplicable(context.getResources())) {
- preference.setFragment(ToggleScreenMagnificationPreferenceFragment.class.getName());
- final Bundle extras = preference.getExtras();
- MagnificationGesturesPreferenceController
- .populateMagnificationGesturesPreferenceExtras(extras, context);
- }
}
public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
diff --git a/src/com/android/settings/accessibility/AccessibilityShortcutPreferenceController.java b/src/com/android/settings/accessibility/AccessibilityShortcutPreferenceController.java
new file mode 100644
index 0000000..af0a99f
--- /dev/null
+++ b/src/com/android/settings/accessibility/AccessibilityShortcutPreferenceController.java
@@ -0,0 +1,52 @@
+/*
+ * 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.accessibility;
+
+import android.content.Context;
+import android.os.UserHandle;
+import android.view.accessibility.AccessibilityManager;
+
+import com.android.settings.R;
+import com.android.settings.core.BasePreferenceController;
+import com.android.settingslib.accessibility.AccessibilityUtils;
+
+public class AccessibilityShortcutPreferenceController extends BasePreferenceController {
+ public AccessibilityShortcutPreferenceController(Context context, String preferenceKey) {
+ super(context, preferenceKey);
+ }
+
+ @Override
+ public int getAvailabilityStatus() {
+ return AccessibilityManager
+ .getInstance(mContext).getInstalledAccessibilityServiceList().isEmpty()
+ ? DISABLED_DEPENDENT_SETTING : AVAILABLE;
+ }
+
+ @Override
+ public CharSequence getSummary() {
+ if (AccessibilityManager.getInstance(mContext)
+ .getInstalledAccessibilityServiceList().isEmpty()) {
+ return mContext.getString(R.string.accessibility_no_services_installed);
+ } else {
+ final boolean shortcutEnabled =
+ AccessibilityUtils.isShortcutEnabled(mContext, UserHandle.myUserId());
+ return shortcutEnabled
+ ? AccessibilityShortcutPreferenceFragment.getServiceName(mContext)
+ : mContext.getString(R.string.accessibility_feature_state_off);
+ }
+ }
+}
diff --git a/src/com/android/settings/accessibility/AccessibilityShortcutPreferenceFragment.java b/src/com/android/settings/accessibility/AccessibilityShortcutPreferenceFragment.java
index de65324..cd13875 100644
--- a/src/com/android/settings/accessibility/AccessibilityShortcutPreferenceFragment.java
+++ b/src/com/android/settings/accessibility/AccessibilityShortcutPreferenceFragment.java
@@ -80,8 +80,6 @@
((Boolean) o) ? 1 : 0);
return true;
});
- mFooterPreferenceMixin.createFooterPreference()
- .setTitle(R.string.accessibility_shortcut_description);
}
@Override
@@ -186,7 +184,8 @@
return getServiceInfo(context) != null;
}
- private static @Nullable ComponentName getShortcutComponent(Context context) {
+ private static @Nullable
+ ComponentName getShortcutComponent(Context context) {
String componentNameString = AccessibilityUtils.getShortcutTargetServiceComponentNameString(
context, UserHandle.myUserId());
if (componentNameString == null) return null;
diff --git a/src/com/android/settings/accessibility/AccessibilityTimeoutController.java b/src/com/android/settings/accessibility/AccessibilityTimeoutController.java
index 057013c..a8bd6f0 100644
--- a/src/com/android/settings/accessibility/AccessibilityTimeoutController.java
+++ b/src/com/android/settings/accessibility/AccessibilityTimeoutController.java
@@ -27,9 +27,9 @@
import com.android.settings.R;
import com.android.settings.core.PreferenceControllerMixin;
-import com.android.settings.widget.RadioButtonPreference;
import com.android.settingslib.core.AbstractPreferenceController;
import com.android.settingslib.core.lifecycle.Lifecycle;
+import com.android.settingslib.widget.RadioButtonPreference;
import com.google.common.primitives.Ints;
@@ -87,7 +87,7 @@
if (mAccessibilityTimeoutKeyToValueMap.size() == 0) {
String[] timeoutKeys = mResources.getStringArray(
- R.array.accessibility_timeout_control_selector_keys);
+ R.array.accessibility_timeout_control_selector_keys);
int[] timeoutValues = mResources.getIntArray(
R.array.accessibility_timeout_selector_values);
@@ -141,7 +141,7 @@
private int getAccessibilityTimeoutValue() {
// get accessibility control timeout value
int timeoutValue = getSecureAccessibilityTimeoutValue(mContentResolver,
- CONTROL_TIMEOUT_SETTINGS_SECURE);
+ CONTROL_TIMEOUT_SETTINGS_SECURE);
return timeoutValue;
}
diff --git a/src/com/android/settings/accessibility/AccessibilityTimeoutPreferenceController.java b/src/com/android/settings/accessibility/AccessibilityTimeoutPreferenceController.java
new file mode 100644
index 0000000..e7b0e3c
--- /dev/null
+++ b/src/com/android/settings/accessibility/AccessibilityTimeoutPreferenceController.java
@@ -0,0 +1,49 @@
+/*
+ * 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.accessibility;
+
+import android.content.Context;
+
+import com.android.settings.R;
+import com.android.settings.core.BasePreferenceController;
+
+import com.google.common.primitives.Ints;
+
+public class AccessibilityTimeoutPreferenceController extends BasePreferenceController {
+
+ public AccessibilityTimeoutPreferenceController(Context context, String preferenceKey) {
+ super(context, preferenceKey);
+ }
+
+ @Override
+ public int getAvailabilityStatus() {
+ return AVAILABLE;
+ }
+
+ @Override
+ public CharSequence getSummary() {
+ final String[] timeoutSummarys = mContext.getResources().getStringArray(
+ R.array.accessibility_timeout_summaries);
+ final int[] timeoutValues = mContext.getResources().getIntArray(
+ R.array.accessibility_timeout_selector_values);
+ final int timeoutValue = AccessibilityTimeoutController.getSecureAccessibilityTimeoutValue(
+ mContext.getContentResolver(),
+ AccessibilityTimeoutController.CONTROL_TIMEOUT_SETTINGS_SECURE);
+ final int idx = Ints.indexOf(timeoutValues, timeoutValue);
+ return timeoutSummarys[idx == -1 ? 0 : idx];
+ }
+}
diff --git a/src/com/android/settings/accessibility/AccessibilityUtil.java b/src/com/android/settings/accessibility/AccessibilityUtil.java
new file mode 100644
index 0000000..1cb5ffb
--- /dev/null
+++ b/src/com/android/settings/accessibility/AccessibilityUtil.java
@@ -0,0 +1,36 @@
+/*
+ * 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.accessibility;
+
+import android.content.Context;
+import android.provider.Settings;
+
+import com.android.settings.R;
+
+public class AccessibilityUtil {
+ /**
+ * Return On/Off string according to the setting which specifies the integer value 1 or 0. This
+ * setting is defined in the secure system settings {@link android.provider.Settings.Secure}.
+ */
+ static CharSequence getSummary(Context context, String settingsSecureKey) {
+ final boolean enabled = Settings.Secure.getInt(context.getContentResolver(),
+ settingsSecureKey, 0) == 1;
+ final int resId = enabled ? R.string.accessibility_feature_state_on
+ : R.string.accessibility_feature_state_off;
+ return context.getResources().getText(resId);
+ }
+}
diff --git a/src/com/android/settings/accessibility/AutoclickPreferenceController.java b/src/com/android/settings/accessibility/AutoclickPreferenceController.java
new file mode 100644
index 0000000..4d85b52
--- /dev/null
+++ b/src/com/android/settings/accessibility/AutoclickPreferenceController.java
@@ -0,0 +1,50 @@
+/*
+ * 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.accessibility;
+
+import android.content.Context;
+import android.provider.Settings;
+import android.view.accessibility.AccessibilityManager;
+
+import com.android.settings.R;
+import com.android.settings.core.BasePreferenceController;
+
+public class AutoclickPreferenceController extends BasePreferenceController {
+
+ public AutoclickPreferenceController(Context context, String preferenceKey) {
+ super(context, preferenceKey);
+ }
+
+ @Override
+ public int getAvailabilityStatus() {
+ return AVAILABLE_UNSEARCHABLE;
+ }
+
+ @Override
+ public CharSequence getSummary() {
+ final boolean enabled = Settings.Secure.getInt(mContext.getContentResolver(),
+ Settings.Secure.ACCESSIBILITY_AUTOCLICK_ENABLED, 0) == 1;
+ if (!enabled) {
+ return mContext.getResources().getText(R.string.accessibility_feature_state_off);
+ }
+ final int delay = Settings.Secure.getInt(mContext.getContentResolver(),
+ Settings.Secure.ACCESSIBILITY_AUTOCLICK_DELAY,
+ AccessibilityManager.AUTOCLICK_DELAY_DEFAULT);
+ return ToggleAutoclickPreferenceFragment.getAutoclickPreferenceSummary(
+ mContext.getResources(), delay);
+ }
+}
\ No newline at end of file
diff --git a/src/com/android/settings/accessibility/CaptioningPreferenceController.java b/src/com/android/settings/accessibility/CaptioningPreferenceController.java
new file mode 100644
index 0000000..35d9507
--- /dev/null
+++ b/src/com/android/settings/accessibility/CaptioningPreferenceController.java
@@ -0,0 +1,40 @@
+/*
+ * 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.accessibility;
+
+import android.content.Context;
+import android.provider.Settings;
+
+import com.android.settings.core.BasePreferenceController;
+
+public class CaptioningPreferenceController extends BasePreferenceController {
+
+ public CaptioningPreferenceController(Context context, String preferenceKey) {
+ super(context, preferenceKey);
+ }
+
+ @Override
+ public int getAvailabilityStatus() {
+ return AVAILABLE;
+ }
+
+ @Override
+ public CharSequence getSummary() {
+ return AccessibilityUtil.getSummary(mContext,
+ Settings.Secure.ACCESSIBILITY_CAPTIONING_ENABLED);
+ }
+}
diff --git a/src/com/android/settings/accessibility/DaltonizerPreferenceController.java b/src/com/android/settings/accessibility/DaltonizerPreferenceController.java
new file mode 100644
index 0000000..c02a362
--- /dev/null
+++ b/src/com/android/settings/accessibility/DaltonizerPreferenceController.java
@@ -0,0 +1,40 @@
+/*
+ * 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.accessibility;
+
+import android.content.Context;
+import android.provider.Settings;
+
+import com.android.settings.core.BasePreferenceController;
+
+public class DaltonizerPreferenceController extends BasePreferenceController {
+
+ public DaltonizerPreferenceController(Context context, String preferenceKey) {
+ super(context, preferenceKey);
+ }
+
+ @Override
+ public int getAvailabilityStatus() {
+ return AVAILABLE_UNSEARCHABLE;
+ }
+
+ @Override
+ public CharSequence getSummary() {
+ return AccessibilityUtil.getSummary(mContext,
+ Settings.Secure.ACCESSIBILITY_DISPLAY_DALTONIZER_ENABLED);
+ }
+}
\ No newline at end of file
diff --git a/src/com/android/settings/accessibility/DisableAnimationsPreferenceController.java b/src/com/android/settings/accessibility/DisableAnimationsPreferenceController.java
new file mode 100644
index 0000000..1f91a87
--- /dev/null
+++ b/src/com/android/settings/accessibility/DisableAnimationsPreferenceController.java
@@ -0,0 +1,74 @@
+/*
+ * 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.accessibility;
+
+import android.content.Context;
+import android.provider.Settings;
+import android.text.TextUtils;
+
+import androidx.annotation.VisibleForTesting;
+
+import com.android.settings.core.TogglePreferenceController;
+
+public class DisableAnimationsPreferenceController extends TogglePreferenceController {
+
+ @VisibleForTesting
+ static final String ANIMATION_ON_VALUE = "1";
+ @VisibleForTesting
+ static final String ANIMATION_OFF_VALUE = "0";
+
+ // Settings that should be changed when toggling animations
+ @VisibleForTesting
+ static final String[] TOGGLE_ANIMATION_TARGETS = {
+ Settings.Global.WINDOW_ANIMATION_SCALE, Settings.Global.TRANSITION_ANIMATION_SCALE,
+ Settings.Global.ANIMATOR_DURATION_SCALE
+ };
+
+ public DisableAnimationsPreferenceController(Context context, String preferenceKey) {
+ super(context, preferenceKey);
+ }
+
+ @Override
+ public boolean isChecked() {
+ boolean allAnimationsDisabled = true;
+ for (String animationSetting : TOGGLE_ANIMATION_TARGETS) {
+ if (!TextUtils.equals(
+ Settings.Global.getString(mContext.getContentResolver(), animationSetting),
+ ANIMATION_OFF_VALUE)) {
+ allAnimationsDisabled = false;
+ break;
+ }
+ }
+ return allAnimationsDisabled;
+ }
+
+ @Override
+ public boolean setChecked(boolean isChecked) {
+ final String newAnimationValue = isChecked ? ANIMATION_OFF_VALUE : ANIMATION_ON_VALUE;
+ boolean allAnimationSet = true;
+ for (String animationPreference : TOGGLE_ANIMATION_TARGETS) {
+ allAnimationSet &= Settings.Global.putString(mContext.getContentResolver(),
+ animationPreference, newAnimationValue);
+ }
+ return allAnimationSet;
+ }
+
+ @Override
+ public int getAvailabilityStatus() {
+ return AVAILABLE;
+ }
+}
diff --git a/src/com/android/settings/accessibility/HearingAidDialogFragment.java b/src/com/android/settings/accessibility/HearingAidDialogFragment.java
index 67b9d39..63633d8 100644
--- a/src/com/android/settings/accessibility/HearingAidDialogFragment.java
+++ b/src/com/android/settings/accessibility/HearingAidDialogFragment.java
@@ -37,8 +37,7 @@
@Override
public Dialog onCreateDialog(Bundle savedInstanceState) {
return new AlertDialog.Builder(getActivity())
- .setTitle(R.string.accessibility_hearingaid_pair_instructions_first_message)
- .setMessage(R.string.accessibility_hearingaid_pair_instructions_second_message)
+ .setMessage(R.string.accessibility_hearingaid_pair_instructions_message)
.setPositiveButton(R.string.accessibility_hearingaid_instruction_continue_button,
new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int which) {
diff --git a/src/com/android/settings/accessibility/HighTextContrastPreferenceController.java b/src/com/android/settings/accessibility/HighTextContrastPreferenceController.java
new file mode 100644
index 0000000..f4474d6
--- /dev/null
+++ b/src/com/android/settings/accessibility/HighTextContrastPreferenceController.java
@@ -0,0 +1,46 @@
+/*
+ * 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.accessibility;
+
+import android.content.Context;
+import android.provider.Settings;
+
+import com.android.settings.core.TogglePreferenceController;
+
+public class HighTextContrastPreferenceController extends TogglePreferenceController {
+
+ public HighTextContrastPreferenceController(Context context, String preferenceKey) {
+ super(context, preferenceKey);
+ }
+
+ @Override
+ public int getAvailabilityStatus() {
+ return AVAILABLE;
+ }
+
+ @Override
+ public boolean isChecked() {
+ return Settings.Secure.getInt(mContext.getContentResolver(),
+ Settings.Secure.ACCESSIBILITY_HIGH_TEXT_CONTRAST_ENABLED, 0) == 1;
+ }
+
+ @Override
+ public boolean setChecked(boolean isChecked) {
+ return Settings.Secure.putInt(mContext.getContentResolver(),
+ Settings.Secure.ACCESSIBILITY_HIGH_TEXT_CONTRAST_ENABLED, (isChecked ? 1 : 0));
+ }
+}
diff --git a/src/com/android/settings/accessibility/LargePointerIconPreferenceController.java b/src/com/android/settings/accessibility/LargePointerIconPreferenceController.java
new file mode 100644
index 0000000..a7ee3d5
--- /dev/null
+++ b/src/com/android/settings/accessibility/LargePointerIconPreferenceController.java
@@ -0,0 +1,53 @@
+/*
+ * 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.accessibility;
+
+import android.content.Context;
+import android.provider.Settings;
+
+import androidx.annotation.VisibleForTesting;
+
+import com.android.settings.core.TogglePreferenceController;
+
+public class LargePointerIconPreferenceController extends TogglePreferenceController {
+
+ @VisibleForTesting
+ static final int ON = 1;
+ @VisibleForTesting
+ static final int OFF = 0;
+
+ public LargePointerIconPreferenceController(Context context, String preferenceKey) {
+ super(context, preferenceKey);
+ }
+
+ @Override
+ public boolean isChecked() {
+ return Settings.Secure.getInt(mContext.getContentResolver(),
+ Settings.Secure.ACCESSIBILITY_LARGE_POINTER_ICON, OFF) != OFF;
+ }
+
+ @Override
+ public boolean setChecked(boolean isChecked) {
+ return Settings.Secure.putInt(mContext.getContentResolver(),
+ Settings.Secure.ACCESSIBILITY_LARGE_POINTER_ICON, isChecked ? ON : OFF);
+ }
+
+ @Override
+ public int getAvailabilityStatus() {
+ return AVAILABLE;
+ }
+}
diff --git a/src/com/android/settings/accessibility/LockScreenRotationPreferenceController.java b/src/com/android/settings/accessibility/LockScreenRotationPreferenceController.java
new file mode 100644
index 0000000..a9716d5
--- /dev/null
+++ b/src/com/android/settings/accessibility/LockScreenRotationPreferenceController.java
@@ -0,0 +1,91 @@
+/*
+ * 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.accessibility;
+
+import android.content.Context;
+
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+
+import com.android.internal.view.RotationPolicy;
+import com.android.internal.view.RotationPolicy.RotationPolicyListener;
+import com.android.settings.core.TogglePreferenceController;
+import com.android.settingslib.core.lifecycle.LifecycleObserver;
+import com.android.settingslib.core.lifecycle.events.OnStart;
+import com.android.settingslib.core.lifecycle.events.OnStop;
+
+public class LockScreenRotationPreferenceController extends TogglePreferenceController implements
+ LifecycleObserver, OnStart, OnStop {
+
+ private Preference mPreference;
+ private RotationPolicyListener mRotationPolicyListener;
+
+ public LockScreenRotationPreferenceController(Context context, String preferenceKey) {
+ super(context, preferenceKey);
+ }
+
+ /**
+ * Returns true if rotation lock is enabled.
+ */
+ @Override
+ public boolean isChecked() {
+ return !RotationPolicy.isRotationLocked(mContext);
+ }
+
+ /**
+ * Enables or disables screen rotation lock from Accessibility settings. If rotation is locked
+ * for accessibility, the toggle in Display settings is hidden to avoid confusion.
+ */
+ @Override
+ public boolean setChecked(boolean isChecked) {
+ RotationPolicy.setRotationLockForAccessibility(mContext, !isChecked);
+ return true;
+ }
+
+ @Override
+ public int getAvailabilityStatus() {
+ return RotationPolicy.isRotationSupported(mContext) ? AVAILABLE : UNSUPPORTED_ON_DEVICE;
+ }
+
+ @Override
+ public void onStop() {
+ if (mRotationPolicyListener != null) {
+ RotationPolicy.unregisterRotationPolicyListener(mContext, mRotationPolicyListener);
+ }
+ }
+
+ @Override
+ public void onStart() {
+ if (mRotationPolicyListener == null) {
+ mRotationPolicyListener = new RotationPolicyListener() {
+ @Override
+ public void onChange() {
+ if (mPreference != null) {
+ updateState(mPreference);
+ }
+ }
+ };
+ }
+ RotationPolicy.registerRotationPolicyListener(mContext, mRotationPolicyListener);
+ }
+
+ @Override
+ public void displayPreference(PreferenceScreen screen) {
+ mPreference = screen.findPreference(getPreferenceKey());
+ super.displayPreference(screen);
+ }
+}
diff --git a/src/com/android/settings/accessibility/MagnificationPreferenceController.java b/src/com/android/settings/accessibility/MagnificationPreferenceController.java
new file mode 100644
index 0000000..58eb227
--- /dev/null
+++ b/src/com/android/settings/accessibility/MagnificationPreferenceController.java
@@ -0,0 +1,80 @@
+/*
+ * 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.accessibility;
+
+import android.content.Context;
+import android.os.Bundle;
+import android.provider.Settings;
+
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+
+import com.android.settings.R;
+import com.android.settings.core.BasePreferenceController;
+
+public class MagnificationPreferenceController extends BasePreferenceController {
+
+ private Preference mPreference;
+
+ public MagnificationPreferenceController(Context context, String preferenceKey) {
+ super(context, preferenceKey);
+ }
+
+ @Override
+ public int getAvailabilityStatus() {
+ return AVAILABLE;
+ }
+
+ @Override
+ public CharSequence getSummary() {
+ final boolean tripleTapEnabled = Settings.Secure.getInt(mContext.getContentResolver(),
+ Settings.Secure.ACCESSIBILITY_DISPLAY_MAGNIFICATION_ENABLED, 0) == 1;
+ final boolean buttonEnabled = Settings.Secure.getInt(mContext.getContentResolver(),
+ Settings.Secure.ACCESSIBILITY_DISPLAY_MAGNIFICATION_NAVBAR_ENABLED, 0) == 1;
+
+ int summaryResId = 0;
+ if (!tripleTapEnabled && !buttonEnabled) {
+ summaryResId = R.string.accessibility_feature_state_off;
+ } else if (!tripleTapEnabled && buttonEnabled) {
+ summaryResId = R.string.accessibility_screen_magnification_navbar_title;
+ } else if (tripleTapEnabled && !buttonEnabled) {
+ summaryResId = R.string.accessibility_screen_magnification_gestures_title;
+ } else {
+ summaryResId = R.string.accessibility_screen_magnification_state_navbar_gesture;
+ }
+ return mContext.getResources().getText(summaryResId);
+ }
+
+ @Override
+ public void displayPreference(PreferenceScreen screen) {
+ super.displayPreference(screen);
+ mPreference = screen.findPreference(getPreferenceKey());
+ configureMagnificationPreferenceIfNeeded();
+ }
+
+ private void configureMagnificationPreferenceIfNeeded() {
+ // Some devices support only a single magnification mode. In these cases, we redirect to
+ // the magnification mode's UI directly, rather than showing a PreferenceScreen with a
+ // single list item.
+ if (!MagnificationPreferenceFragment.isApplicable(mContext.getResources())) {
+ mPreference.setFragment(ToggleScreenMagnificationPreferenceFragment.class.getName());
+ final Bundle extras = mPreference.getExtras();
+ MagnificationGesturesPreferenceController
+ .populateMagnificationGesturesPreferenceExtras(extras, mContext);
+ }
+ }
+}
diff --git a/src/com/android/settings/accessibility/MasterMonoPreferenceController.java b/src/com/android/settings/accessibility/MasterMonoPreferenceController.java
new file mode 100644
index 0000000..6082f14
--- /dev/null
+++ b/src/com/android/settings/accessibility/MasterMonoPreferenceController.java
@@ -0,0 +1,47 @@
+/*
+ * 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.accessibility;
+
+import android.content.Context;
+import android.os.UserHandle;
+import android.provider.Settings;
+
+import com.android.settings.core.TogglePreferenceController;
+
+public class MasterMonoPreferenceController extends TogglePreferenceController {
+
+ public MasterMonoPreferenceController(Context context, String preferenceKey) {
+ super(context, preferenceKey);
+ }
+
+ @Override
+ public boolean isChecked() {
+ return Settings.System.getIntForUser(mContext.getContentResolver(),
+ Settings.System.MASTER_MONO, 0 /* default */, UserHandle.USER_CURRENT) == 1;
+ }
+
+ @Override
+ public boolean setChecked(boolean isChecked) {
+ return Settings.System.putIntForUser(mContext.getContentResolver(),
+ Settings.System.MASTER_MONO, isChecked ? 1 : 0, UserHandle.USER_CURRENT);
+ }
+
+ @Override
+ public int getAvailabilityStatus() {
+ return AVAILABLE;
+ }
+}
diff --git a/src/com/android/settings/accessibility/PowerButtonEndsCallPreferenceController.java b/src/com/android/settings/accessibility/PowerButtonEndsCallPreferenceController.java
new file mode 100644
index 0000000..9ea9644
--- /dev/null
+++ b/src/com/android/settings/accessibility/PowerButtonEndsCallPreferenceController.java
@@ -0,0 +1,54 @@
+/*
+ * 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.accessibility;
+
+import android.content.Context;
+import android.provider.Settings;
+import android.view.KeyCharacterMap;
+import android.view.KeyEvent;
+
+import com.android.settings.Utils;
+import com.android.settings.core.TogglePreferenceController;
+
+public class PowerButtonEndsCallPreferenceController extends TogglePreferenceController {
+
+ public PowerButtonEndsCallPreferenceController(Context context, String preferenceKey) {
+ super(context, preferenceKey);
+ }
+
+ @Override
+ public boolean isChecked() {
+ final int incallPowerBehavior = Settings.Secure.getInt(mContext.getContentResolver(),
+ Settings.Secure.INCALL_POWER_BUTTON_BEHAVIOR,
+ Settings.Secure.INCALL_POWER_BUTTON_BEHAVIOR_DEFAULT);
+ return incallPowerBehavior == Settings.Secure.INCALL_POWER_BUTTON_BEHAVIOR_HANGUP;
+ }
+
+ @Override
+ public boolean setChecked(boolean isChecked) {
+ return Settings.Secure.putInt(mContext.getContentResolver(),
+ Settings.Secure.INCALL_POWER_BUTTON_BEHAVIOR,
+ (isChecked ? Settings.Secure.INCALL_POWER_BUTTON_BEHAVIOR_HANGUP
+ : Settings.Secure.INCALL_POWER_BUTTON_BEHAVIOR_SCREEN_OFF));
+ }
+
+ @Override
+ public int getAvailabilityStatus() {
+ return !KeyCharacterMap.deviceHasKey(KeyEvent.KEYCODE_POWER)
+ || !Utils.isVoiceCapable(mContext) ? UNSUPPORTED_ON_DEVICE : AVAILABLE;
+ }
+}
diff --git a/src/com/android/settings/accessibility/SelectLongPressTimeoutPreferenceController.java b/src/com/android/settings/accessibility/SelectLongPressTimeoutPreferenceController.java
new file mode 100644
index 0000000..e5532c5
--- /dev/null
+++ b/src/com/android/settings/accessibility/SelectLongPressTimeoutPreferenceController.java
@@ -0,0 +1,96 @@
+/*
+ * 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.accessibility;
+
+import android.content.Context;
+import android.provider.Settings;
+
+import androidx.preference.ListPreference;
+import androidx.preference.Preference;
+
+import com.android.settings.R;
+import com.android.settings.core.BasePreferenceController;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class SelectLongPressTimeoutPreferenceController extends BasePreferenceController implements
+ Preference.OnPreferenceChangeListener {
+
+ private final Map<String, String> mLongPressTimeoutValueToTitleMap;
+ private int mLongPressTimeoutDefault;
+
+ public SelectLongPressTimeoutPreferenceController(Context context, String preferenceKey) {
+ super(context, preferenceKey);
+ mLongPressTimeoutValueToTitleMap = new HashMap<>();
+ initLongPressTimeoutValueToTitleMap();
+ }
+
+ @Override
+ public int getAvailabilityStatus() {
+ return AVAILABLE;
+ }
+
+ @Override
+ public boolean onPreferenceChange(Preference preference, Object object) {
+ if (!(preference instanceof ListPreference)) {
+ return false;
+ }
+ final ListPreference listPreference = (ListPreference) preference;
+ final int newValue = Integer.parseInt((String) object);
+ Settings.Secure.putInt(mContext.getContentResolver(),
+ Settings.Secure.LONG_PRESS_TIMEOUT, newValue);
+ updateState(listPreference);
+ return true;
+
+ }
+
+ @Override
+ public void updateState(Preference preference) {
+ super.updateState(preference);
+ if (!(preference instanceof ListPreference)) {
+ return;
+ }
+ final ListPreference listPreference = (ListPreference) preference;
+ listPreference.setValue(getLongPressTimeoutValue());
+ }
+
+ @Override
+ public CharSequence getSummary() {
+ return mLongPressTimeoutValueToTitleMap.get(getLongPressTimeoutValue());
+ }
+
+ private String getLongPressTimeoutValue() {
+ final int longPressTimeout = Settings.Secure.getInt(mContext.getContentResolver(),
+ Settings.Secure.LONG_PRESS_TIMEOUT, mLongPressTimeoutDefault);
+ return String.valueOf(longPressTimeout);
+ }
+
+ private void initLongPressTimeoutValueToTitleMap() {
+ if (mLongPressTimeoutValueToTitleMap.size() == 0) {
+ final String[] timeoutValues = mContext.getResources().getStringArray(
+ R.array.long_press_timeout_selector_values);
+ mLongPressTimeoutDefault = Integer.parseInt(timeoutValues[0]);
+ final String[] timeoutTitles = mContext.getResources().getStringArray(
+ R.array.long_press_timeout_selector_titles);
+ final int timeoutValueCount = timeoutValues.length;
+ for (int i = 0; i < timeoutValueCount; i++) {
+ mLongPressTimeoutValueToTitleMap.put(timeoutValues[i], timeoutTitles[i]);
+ }
+ }
+ }
+}
diff --git a/src/com/android/settings/accessibility/ShortcutServicePickerFragment.java b/src/com/android/settings/accessibility/ShortcutServicePickerFragment.java
index dcf1f1c..82e8335 100644
--- a/src/com/android/settings/accessibility/ShortcutServicePickerFragment.java
+++ b/src/com/android/settings/accessibility/ShortcutServicePickerFragment.java
@@ -33,8 +33,8 @@
import android.os.UserHandle;
import android.provider.Settings;
import android.text.TextUtils;
-import android.view.accessibility.AccessibilityManager;
import android.view.View;
+import android.view.accessibility.AccessibilityManager;
import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentActivity;
@@ -44,9 +44,9 @@
import com.android.settings.R;
import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
import com.android.settings.widget.RadioButtonPickerFragment;
-import com.android.settings.widget.RadioButtonPreference;
import com.android.settingslib.accessibility.AccessibilityUtils;
import com.android.settingslib.widget.CandidateInfo;
+import com.android.settingslib.widget.RadioButtonPreference;
import java.util.ArrayList;
import java.util.List;
@@ -183,7 +183,7 @@
public void onClick(View view) {
final Fragment fragment = getTargetFragment();
if ((view.getId() == R.id.permission_enable_allow_button)
- && (fragment instanceof ShortcutServicePickerFragment)) {
+ && (fragment instanceof ShortcutServicePickerFragment)) {
final Bundle bundle = getArguments();
((ShortcutServicePickerFragment) fragment).onServiceConfirmed(
bundle.getString(EXTRA_KEY));
diff --git a/src/com/android/settings/accessibility/ToggleAutoclickPreferenceFragment.java b/src/com/android/settings/accessibility/ToggleAutoclickPreferenceFragment.java
index 8e12339..49f752e 100644
--- a/src/com/android/settings/accessibility/ToggleAutoclickPreferenceFragment.java
+++ b/src/com/android/settings/accessibility/ToggleAutoclickPreferenceFragment.java
@@ -77,8 +77,9 @@
/**
* Gets string that should be used as a autoclick preference summary for provided autoclick
* delay.
+ *
* @param resources Resources from which string should be retrieved.
- * @param delay Delay for whose value summary should be retrieved.
+ * @param delay Delay for whose value summary should be retrieved.
*/
static CharSequence getAutoclickPreferenceSummary(Resources resources, int delay) {
int summaryIndex = getAutoclickPreferenceSummaryIndex(delay);
@@ -136,8 +137,6 @@
mDelay.setMax(delayToSeekBarProgress(MAX_AUTOCLICK_DELAY));
mDelay.setProgress(delayToSeekBarProgress(delay));
mDelay.setOnPreferenceChangeListener(this);
- mFooterPreferenceMixin.createFooterPreference()
- .setTitle(R.string.accessibility_autoclick_description);
}
@Override
@@ -166,11 +165,11 @@
public boolean onPreferenceChange(Preference preference, Object newValue) {
if (preference == mDelay && newValue instanceof Integer) {
Settings.Secure.putInt(getContentResolver(),
- Settings.Secure.ACCESSIBILITY_AUTOCLICK_DELAY,
- seekBarProgressToDelay((int)newValue));
+ Settings.Secure.ACCESSIBILITY_AUTOCLICK_DELAY,
+ seekBarProgressToDelay((int) newValue));
return true;
- }
- return false;
+ }
+ return false;
}
/**
diff --git a/src/com/android/settings/accessibility/ToggleDaltonizerPreferenceFragment.java b/src/com/android/settings/accessibility/ToggleDaltonizerPreferenceFragment.java
index 8924899..e307e9b 100644
--- a/src/com/android/settings/accessibility/ToggleDaltonizerPreferenceFragment.java
+++ b/src/com/android/settings/accessibility/ToggleDaltonizerPreferenceFragment.java
@@ -43,6 +43,7 @@
private static final String ENABLED = Settings.Secure.ACCESSIBILITY_DISPLAY_DALTONIZER_ENABLED;
private static final String TYPE = Settings.Secure.ACCESSIBILITY_DISPLAY_DALTONIZER;
private static final int DEFAULT_TYPE = AccessibilityManager.DALTONIZER_CORRECT_DEUTERANOMALY;
+ private static final String KEY_DALTONIZER_FOOTER = "daltonizer_footer";
private ListPreference mType;
@@ -62,10 +63,8 @@
mType = (ListPreference) findPreference("type");
- if (!ColorDisplayManager.isColorTransformAccelerated(getActivity())) {
- mFooterPreferenceMixin.createFooterPreference().setTitle(
- R.string.accessibility_display_daltonizer_preference_subtitle);
- }
+ final Preference footer = findPreference(KEY_DALTONIZER_FOOTER);
+ footer.setVisible(!ColorDisplayManager.isColorTransformAccelerated(getActivity()));
initPreferences();
}
diff --git a/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragment.java b/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragment.java
index fba5ddb..314a577 100644
--- a/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragment.java
+++ b/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragment.java
@@ -29,6 +29,7 @@
import com.android.settings.SettingsPreferenceFragment;
import com.android.settings.widget.SwitchBar;
import com.android.settings.widget.ToggleSwitch;
+import com.android.settingslib.widget.FooterPreference;
public abstract class ToggleFeaturePreferenceFragment extends SettingsPreferenceFragment {
@@ -138,11 +139,17 @@
// Summary.
if (arguments.containsKey(AccessibilitySettings.EXTRA_SUMMARY_RES)) {
final int summary = arguments.getInt(AccessibilitySettings.EXTRA_SUMMARY_RES);
- mFooterPreferenceMixin.createFooterPreference().setTitle(summary);
+ createFooterPreference(getText(summary));
} else if (arguments.containsKey(AccessibilitySettings.EXTRA_SUMMARY)) {
final CharSequence summary = arguments.getCharSequence(
AccessibilitySettings.EXTRA_SUMMARY);
- mFooterPreferenceMixin.createFooterPreference().setTitle(summary);
+ createFooterPreference(summary);
}
}
+
+ private void createFooterPreference(CharSequence title) {
+ final PreferenceScreen preferenceScreen = getPreferenceScreen();
+ preferenceScreen.addPreference(new FooterPreference.Builder(getActivity()).setTitle(
+ title).build());
+ }
}
diff --git a/src/com/android/settings/accessibility/VibrationPreferenceController.java b/src/com/android/settings/accessibility/VibrationPreferenceController.java
new file mode 100644
index 0000000..8bfea34
--- /dev/null
+++ b/src/com/android/settings/accessibility/VibrationPreferenceController.java
@@ -0,0 +1,77 @@
+/*
+ * 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.accessibility;
+
+import android.content.Context;
+import android.os.Vibrator;
+import android.provider.Settings;
+
+import com.android.settings.R;
+import com.android.settings.core.BasePreferenceController;
+
+public class VibrationPreferenceController extends BasePreferenceController {
+
+ private final Vibrator mVibrator;
+
+ public VibrationPreferenceController(Context context, String preferenceKey) {
+ super(context, preferenceKey);
+ mVibrator = mContext.getSystemService(Vibrator.class);
+ }
+
+ @Override
+ public int getAvailabilityStatus() {
+ return AVAILABLE;
+ }
+
+ @Override
+ public CharSequence getSummary() {
+ int ringIntensity = Settings.System.getInt(mContext.getContentResolver(),
+ Settings.System.RING_VIBRATION_INTENSITY,
+ mVibrator.getDefaultRingVibrationIntensity());
+ if (Settings.System.getInt(mContext.getContentResolver(),
+ Settings.System.VIBRATE_WHEN_RINGING, 0) == 0
+ && !AccessibilitySettings.isRampingRingerEnabled(mContext)) {
+ ringIntensity = Vibrator.VIBRATION_INTENSITY_OFF;
+ }
+ final CharSequence ringIntensityString =
+ VibrationIntensityPreferenceController.getIntensityString(mContext, ringIntensity);
+
+ final int notificationIntensity = Settings.System.getInt(mContext.getContentResolver(),
+ Settings.System.NOTIFICATION_VIBRATION_INTENSITY,
+ mVibrator.getDefaultNotificationVibrationIntensity());
+ final CharSequence notificationIntensityString =
+ VibrationIntensityPreferenceController.getIntensityString(mContext,
+ notificationIntensity);
+
+ int touchIntensity = Settings.System.getInt(mContext.getContentResolver(),
+ Settings.System.HAPTIC_FEEDBACK_INTENSITY,
+ mVibrator.getDefaultHapticFeedbackIntensity());
+ if (Settings.System.getInt(mContext.getContentResolver(),
+ Settings.System.HAPTIC_FEEDBACK_ENABLED, 0) == 0) {
+ touchIntensity = Vibrator.VIBRATION_INTENSITY_OFF;
+ }
+ final CharSequence touchIntensityString =
+ VibrationIntensityPreferenceController.getIntensityString(mContext, touchIntensity);
+
+ if (ringIntensity == touchIntensity && ringIntensity == notificationIntensity) {
+ return ringIntensityString;
+ } else {
+ return mContext.getString(R.string.accessibility_vibration_summary, ringIntensityString,
+ notificationIntensityString, touchIntensityString);
+ }
+ }
+}
diff --git a/src/com/android/settings/accounts/AccountDashboardFragment.java b/src/com/android/settings/accounts/AccountDashboardFragment.java
index 515008a..0dae10b 100644
--- a/src/com/android/settings/accounts/AccountDashboardFragment.java
+++ b/src/com/android/settings/accounts/AccountDashboardFragment.java
@@ -15,11 +15,17 @@
*/
package com.android.settings.accounts;
+import static android.app.ActivityManager.LOCK_TASK_MODE_PINNED;
import static android.provider.Settings.EXTRA_AUTHORITIES;
+import android.app.ActivityManager;
import android.app.settings.SettingsEnums;
import android.content.Context;
+import android.os.Bundle;
import android.provider.SearchIndexableResource;
+import android.util.Log;
+
+import androidx.annotation.VisibleForTesting;
import com.android.settings.R;
import com.android.settings.SettingsPreferenceFragment;
@@ -40,6 +46,14 @@
private static final String TAG = "AccountDashboardFrag";
+ @Override
+ public void onCreate(Bundle icicle) {
+ super.onCreate(icicle);
+ if (isLockTaskModePinned()) {
+ Log.w(TAG, "Devices lock task mode pinned.");
+ finish();
+ }
+ }
@Override
public int getMetricsCategory() {
@@ -83,6 +97,13 @@
return controllers;
}
+ @VisibleForTesting
+ boolean isLockTaskModePinned() {
+ final ActivityManager activityManager =
+ getContext().getSystemService(ActivityManager.class);
+ return activityManager.getLockTaskModeState() == LOCK_TASK_MODE_PINNED;
+ }
+
public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
new BaseSearchIndexProvider() {
@Override
diff --git a/src/com/android/settings/accounts/AccountPreference.java b/src/com/android/settings/accounts/AccountPreference.java
index eea3113..c0da387 100644
--- a/src/com/android/settings/accounts/AccountPreference.java
+++ b/src/com/android/settings/accounts/AccountPreference.java
@@ -125,13 +125,13 @@
res = R.drawable.ic_settings_sync;
break;
case SYNC_DISABLED:
- res = R.drawable.ic_sync_grey_holo;
+ res = R.drawable.ic_settings_sync_disabled;
break;
case SYNC_ERROR:
- res = R.drawable.ic_sync_red_holo;
+ res = R.drawable.ic_settings_sync_failed;
break;
default:
- res = R.drawable.ic_sync_red_holo;
+ res = R.drawable.ic_settings_sync_failed;
Log.e(TAG, "Unknown sync status: " + status);
}
return res;
diff --git a/src/com/android/settings/accounts/AccountSyncSettings.java b/src/com/android/settings/accounts/AccountSyncSettings.java
index ec74cd8..85c3e2c 100644
--- a/src/com/android/settings/accounts/AccountSyncSettings.java
+++ b/src/com/android/settings/accounts/AccountSyncSettings.java
@@ -48,6 +48,7 @@
import com.android.settings.R;
import com.android.settings.Utils;
import com.android.settings.widget.EntityHeaderController;
+import com.android.settingslib.widget.FooterPreference;
import com.google.android.collect.Lists;
@@ -187,11 +188,9 @@
@Override
public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
MenuItem syncNow = menu.add(0, MENU_SYNC_NOW_ID, 0,
- getString(R.string.sync_menu_sync_now))
- .setIcon(R.drawable.ic_menu_refresh_holo_dark);
+ getString(R.string.sync_menu_sync_now));
MenuItem syncCancel = menu.add(0, MENU_SYNC_CANCEL_ID, 0,
- getString(R.string.sync_menu_sync_cancel))
- .setIcon(com.android.internal.R.drawable.ic_menu_close_clear_cancel);
+ getString(R.string.sync_menu_sync_cancel));
syncNow.setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER |
MenuItem.SHOW_AS_ACTION_WITH_TEXT);
@@ -209,6 +208,7 @@
mUserHandle.getIdentifier()).isEmpty();
menu.findItem(MENU_SYNC_NOW_ID).setVisible(!syncActive);
menu.findItem(MENU_SYNC_CANCEL_ID).setVisible(syncActive);
+
}
@Override
@@ -458,8 +458,8 @@
syncPref.setChecked(oneTimeSyncMode || syncEnabled);
}
if (syncIsFailing) {
- mFooterPreferenceMixin.createFooterPreference()
- .setTitle(R.string.sync_is_failing);
+ getPreferenceScreen().addPreference(new FooterPreference.Builder(
+ getActivity()).setTitle(R.string.sync_is_failing).build());
}
}
diff --git a/src/com/android/settings/accounts/AddAccountSettings.java b/src/com/android/settings/accounts/AddAccountSettings.java
index cca15c9..d4d93dd 100644
--- a/src/com/android/settings/accounts/AddAccountSettings.java
+++ b/src/com/android/settings/accounts/AddAccountSettings.java
@@ -100,8 +100,9 @@
addAccountOptions.putBoolean(EXTRA_HAS_MULTIPLE_USERS,
Utils.hasMultipleUsers(AddAccountSettings.this));
addAccountOptions.putParcelable(EXTRA_USER, mUserHandle);
- intent.putExtras(addAccountOptions);
- intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+ intent.putExtras(addAccountOptions)
+ .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+ .addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK);
startActivityForResultAsUser(intent, ADD_ACCOUNT_REQUEST, mUserHandle);
} else {
setResult(RESULT_OK);
diff --git a/src/com/android/settings/accounts/AvatarViewMixin.java b/src/com/android/settings/accounts/AvatarViewMixin.java
index 9e762c7..7eb8cab 100644
--- a/src/com/android/settings/accounts/AvatarViewMixin.java
+++ b/src/com/android/settings/accounts/AvatarViewMixin.java
@@ -67,7 +67,8 @@
private final MutableLiveData<Bitmap> mAvatarImage;
private final ActivityManager mActivityManager;
- private String mAccountName;
+ @VisibleForTesting
+ String mAccountName;
public AvatarViewMixin(SettingsHomepageActivity activity, ImageView avatarView) {
mContext = activity.getApplicationContext();
@@ -127,6 +128,7 @@
if (hasAccount()) {
loadAccount();
} else {
+ mAccountName = null;
mAvatarView.setImageResource(R.drawable.ic_account_circle_24dp);
}
}
diff --git a/src/com/android/settings/accounts/ChooseAccountFragment.java b/src/com/android/settings/accounts/ChooseAccountFragment.java
index 0d7956a..8f3318e 100644
--- a/src/com/android/settings/accounts/ChooseAccountFragment.java
+++ b/src/com/android/settings/accounts/ChooseAccountFragment.java
@@ -20,23 +20,14 @@
import android.content.Context;
import android.os.UserHandle;
import android.os.UserManager;
-import android.provider.SearchIndexableResource;
import com.android.settings.R;
import com.android.settings.Utils;
import com.android.settings.dashboard.DashboardFragment;
-import com.android.settings.search.BaseSearchIndexProvider;
-import com.android.settings.search.Indexable;
-import com.android.settingslib.core.AbstractPreferenceController;
-import com.android.settingslib.search.SearchIndexable;
-
-import java.util.ArrayList;
-import java.util.List;
/**
* Activity asking a user to select an account to be set up.
*/
-@SearchIndexable
public class ChooseAccountFragment extends DashboardFragment {
private static final String TAG = "ChooseAccountFragment";
@@ -60,8 +51,6 @@
use(ChooseAccountPreferenceController.class).initialize(authorities, accountTypesFilter,
userHandle, getActivity());
- use(EnterpriseDisclosurePreferenceController.class).setFooterPreferenceMixin(
- mFooterPreferenceMixin);
}
@Override
@@ -73,35 +62,4 @@
protected String getLogTag() {
return TAG;
}
-
- @Override
- protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
- return buildControllers(context);
- }
-
- private static List<AbstractPreferenceController> buildControllers(Context context) {
- final List<AbstractPreferenceController> controllers = new ArrayList<>();
- controllers.add(new EnterpriseDisclosurePreferenceController(context));
- return controllers;
- }
-
- public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
- new BaseSearchIndexProvider() {
- @Override
- public List<SearchIndexableResource> getXmlResourcesToIndex(Context context,
- boolean enabled) {
- final ArrayList<SearchIndexableResource> result = new ArrayList<>();
-
- final SearchIndexableResource sir = new SearchIndexableResource(context);
- sir.xmlResId = R.xml.add_account_settings;
- result.add(sir);
- return result;
- }
-
- @Override
- public List<AbstractPreferenceController> createPreferenceControllers(
- Context context) {
- return buildControllers(context);
- }
- };
}
diff --git a/src/com/android/settings/accounts/EnterpriseDisclosurePreferenceController.java b/src/com/android/settings/accounts/EnterpriseDisclosurePreferenceController.java
index 7a6e5fa..b4dbf3d 100644
--- a/src/com/android/settings/accounts/EnterpriseDisclosurePreferenceController.java
+++ b/src/com/android/settings/accounts/EnterpriseDisclosurePreferenceController.java
@@ -19,32 +19,23 @@
import android.content.Context;
import androidx.annotation.VisibleForTesting;
-import androidx.preference.PreferenceScreen;
+import androidx.preference.Preference;
import com.android.settings.core.BasePreferenceController;
import com.android.settings.enterprise.EnterprisePrivacyFeatureProvider;
import com.android.settings.overlay.FeatureFactory;
-import com.android.settingslib.widget.FooterPreference;
-import com.android.settingslib.widget.FooterPreferenceMixinCompat;
public class EnterpriseDisclosurePreferenceController extends BasePreferenceController {
private final EnterprisePrivacyFeatureProvider mFeatureProvider;
- private FooterPreferenceMixinCompat mFooterPreferenceMixin;
- private PreferenceScreen mScreen;
- public EnterpriseDisclosurePreferenceController(Context context) {
+ public EnterpriseDisclosurePreferenceController(Context context, String key) {
// Preference key doesn't matter as we are creating the preference in code.
- super(context, "add_account_enterprise_disclosure_footer");
-
+ super(context, key);
mFeatureProvider = FeatureFactory.getFactory(mContext)
.getEnterprisePrivacyFeatureProvider(mContext);
}
- public void setFooterPreferenceMixin(FooterPreferenceMixinCompat footerPreferenceMixin) {
- mFooterPreferenceMixin = footerPreferenceMixin;
- }
-
@Override
public int getAvailabilityStatus() {
if (getDisclosure() == null) {
@@ -53,27 +44,17 @@
return AVAILABLE;
}
- @Override
- public void displayPreference(PreferenceScreen screen) {
- super.displayPreference(screen);
- mScreen = screen;
- addEnterpriseDisclosure();
- }
-
@VisibleForTesting
CharSequence getDisclosure() {
return mFeatureProvider.getDeviceOwnerDisclosure();
}
- private void addEnterpriseDisclosure() {
+ @Override
+ public void updateState(Preference preference) {
final CharSequence disclosure = getDisclosure();
if (disclosure == null) {
return;
}
- final FooterPreference enterpriseDisclosurePreference =
- mFooterPreferenceMixin.createFooterPreference();
- enterpriseDisclosurePreference.setSelectable(false);
- enterpriseDisclosurePreference.setTitle(disclosure);
- mScreen.addPreference(enterpriseDisclosurePreference);
+ preference.setTitle(disclosure);
}
}
diff --git a/src/com/android/settings/applications/AppAndNotificationDashboardFragment.java b/src/com/android/settings/applications/AppAndNotificationDashboardFragment.java
index 5e57908..876c999 100644
--- a/src/com/android/settings/applications/AppAndNotificationDashboardFragment.java
+++ b/src/com/android/settings/applications/AppAndNotificationDashboardFragment.java
@@ -44,8 +44,6 @@
private static final String TAG = "AppAndNotifDashboard";
- private View mProgressHeader;
- private View mProgressAnimation;
private RecentAppStatsMixin mRecentAppStatsMixin;
private RecentAppsPreferenceController mRecentAppsPreferenceController;
private AllAppsInfoPreferenceController mAllAppsInfoPreferenceController;
@@ -92,20 +90,19 @@
@Override
public void onViewCreated(View view, Bundle savedInstanceState) {
super.onViewCreated(view, savedInstanceState);
- mProgressHeader = setPinnedHeaderView(R.layout.progress_header);
- mProgressAnimation = mProgressHeader.findViewById(R.id.progress_bar_animation);
- setLoadingEnabled(false);
+ setPinnedHeaderView(R.layout.progress_header);
+ showPinnedHeader(false);
}
@Override
public void onStart() {
super.onStart();
- setLoadingEnabled(true);
+ showPinnedHeader(true);
}
@Override
public void onReloadDataCompleted(@NonNull List<UsageStats> recentApps) {
- setLoadingEnabled(false);
+ showPinnedHeader(false);
if (!recentApps.isEmpty()) {
Utils.setActionBarShadowAnimation(getActivity(), getSettingsLifecycle(),
getListView());
@@ -117,13 +114,6 @@
return buildPreferenceControllers(context);
}
- private void setLoadingEnabled(boolean enabled) {
- if (mProgressHeader != null && mProgressAnimation != null) {
- mProgressHeader.setVisibility(enabled ? View.VISIBLE : View.INVISIBLE);
- mProgressAnimation.setVisibility(enabled ? View.VISIBLE : View.INVISIBLE);
- }
- }
-
private static List<AbstractPreferenceController> buildPreferenceControllers(Context context) {
final List<AbstractPreferenceController> controllers = new ArrayList<>();
controllers.add(new EmergencyBroadcastPreferenceController(context,
diff --git a/src/com/android/settings/applications/ApplicationFeatureProviderImpl.java b/src/com/android/settings/applications/ApplicationFeatureProviderImpl.java
index 1fd7997..c647b8d 100644
--- a/src/com/android/settings/applications/ApplicationFeatureProviderImpl.java
+++ b/src/com/android/settings/applications/ApplicationFeatureProviderImpl.java
@@ -33,6 +33,7 @@
import android.util.ArraySet;
import com.android.internal.telephony.SmsApplication;
+import com.android.internal.telephony.euicc.EuiccConnector;
import com.android.settings.R;
import java.util.ArrayList;
@@ -141,6 +142,12 @@
keepEnabledPackages.add(defaultSms.getPackageName());
}
+ // Keep Euicc Service enabled.
+ final ComponentInfo euicc = EuiccConnector.findBestComponent(mPm);
+ if (euicc != null) {
+ keepEnabledPackages.add(euicc.packageName);
+ }
+
keepEnabledPackages.addAll(getEnabledPackageWhitelist());
final LocationManager locationManager =
diff --git a/src/com/android/settings/applications/appinfo/AppButtonsPreferenceController.java b/src/com/android/settings/applications/appinfo/AppButtonsPreferenceController.java
index e15b0e3..1b14402 100644
--- a/src/com/android/settings/applications/appinfo/AppButtonsPreferenceController.java
+++ b/src/com/android/settings/applications/appinfo/AppButtonsPreferenceController.java
@@ -80,6 +80,7 @@
PreferenceControllerMixin, LifecycleObserver, OnResume, OnDestroy,
ApplicationsState.Callbacks {
public static final String APP_CHG = "chg";
+ public static final String KEY_REMOVE_TASK_WHEN_FINISHING = "remove_task_when_finishing";
private static final String TAG = "AppButtonsPrefCtl";
private static final String KEY_ACTION_BUTTONS = "action_buttons";
@@ -160,7 +161,7 @@
@Override
public int getAvailabilityStatus() {
// TODO(b/37313605): Re-enable once this controller supports instant apps
- return isInstantApp() || isSystemModule() ? DISABLED_FOR_USER : AVAILABLE;
+ return mFinishing || isInstantApp() || isSystemModule() ? DISABLED_FOR_USER : AVAILABLE;
}
@Override
@@ -189,14 +190,14 @@
@Override
public void onResume() {
- if (isAvailable() && !mFinishing) {
+ if (isAvailable()) {
mAppsControlDisallowedBySystem = RestrictedLockUtilsInternal.hasBaseUserRestriction(
mActivity, UserManager.DISALLOW_APPS_CONTROL, mUserId);
mAppsControlDisallowedAdmin = RestrictedLockUtilsInternal.checkIfRestrictionEnforced(
mActivity, UserManager.DISALLOW_APPS_CONTROL, mUserId);
if (!refreshUi()) {
- setIntentAndFinish(true);
+ setIntentAndFinish(true, false);
}
}
}
@@ -278,9 +279,9 @@
AsyncTask.execute(new DisableChangerRunnable(mPm, mAppEntry.info.packageName,
PackageManager.COMPONENT_ENABLED_STATE_DISABLED_USER));
}
- refreshAndFinishIfPossible();
+ refreshAndFinishIfPossible(true);
} else if (requestCode == mRequestRemoveDeviceAdmin) {
- refreshAndFinishIfPossible();
+ refreshAndFinishIfPossible(false);
}
}
@@ -466,19 +467,20 @@
/**
* Finish this fragment and return data if possible
*/
- private void setIntentAndFinish(boolean appChanged) {
+ private void setIntentAndFinish(boolean appChanged, boolean removeTaskWhenFinishing) {
if (LOCAL_LOGV) {
Log.i(TAG, "appChanged=" + appChanged);
}
Intent intent = new Intent();
intent.putExtra(APP_CHG, appChanged);
+ intent.putExtra(KEY_REMOVE_TASK_WHEN_FINISHING, removeTaskWhenFinishing);
mActivity.finishPreferencePanel(Activity.RESULT_OK, intent);
mFinishing = true;
}
- private void refreshAndFinishIfPossible() {
+ private void refreshAndFinishIfPossible(boolean removeTaskWhenFinishing) {
if (!refreshUi()) {
- setIntentAndFinish(true);
+ setIntentAndFinish(true, removeTaskWhenFinishing);
} else {
startListeningToPackageRemove();
}
diff --git a/src/com/android/settings/applications/appinfo/DefaultAppShortcutPreferenceControllerBase.java b/src/com/android/settings/applications/appinfo/DefaultAppShortcutPreferenceControllerBase.java
index 0663e2a..5df30c2 100644
--- a/src/com/android/settings/applications/appinfo/DefaultAppShortcutPreferenceControllerBase.java
+++ b/src/com/android/settings/applications/appinfo/DefaultAppShortcutPreferenceControllerBase.java
@@ -45,7 +45,7 @@
private boolean mRoleVisible;
- private boolean mAppQualified;
+ private boolean mAppVisible;
private PreferenceScreen mPreferenceScreen;
@@ -65,9 +65,9 @@
mRoleVisible = visible;
refreshAvailability();
});
- roleControllerManager.isApplicationQualifiedForRole(mRoleName, mPackageName, executor,
- qualified -> {
- mAppQualified = qualified;
+ roleControllerManager.isApplicationVisibleForRole(mRoleName, mPackageName, executor,
+ visible -> {
+ mAppVisible = visible;
refreshAvailability();
});
}
@@ -94,7 +94,7 @@
if (mContext.getSystemService(UserManager.class).isManagedProfile()) {
return DISABLED_FOR_USER;
}
- return mRoleVisible && mAppQualified ? AVAILABLE : UNSUPPORTED_ON_DEVICE;
+ return mRoleVisible && mAppVisible ? AVAILABLE : UNSUPPORTED_ON_DEVICE;
}
@Override
diff --git a/src/com/android/settings/applications/assist/ManageAssist.java b/src/com/android/settings/applications/assist/ManageAssist.java
index 952a3ad..ae2728d 100644
--- a/src/com/android/settings/applications/assist/ManageAssist.java
+++ b/src/com/android/settings/applications/assist/ManageAssist.java
@@ -68,14 +68,6 @@
use(AssistGestureSettingsPreferenceController.class).setAssistOnly(true);
}
- @Override
- public void onResume() {
- super.onResume();
-
- mFooterPreferenceMixin.createFooterPreference()
- .setTitle(R.string.assist_footer);
- }
-
private static List<AbstractPreferenceController> buildPreferenceControllers(Context context,
Lifecycle lifecycle) {
final List<AbstractPreferenceController> controllers = new ArrayList<>();
diff --git a/src/com/android/settings/applications/defaultapps/DefaultAppPickerFragment.java b/src/com/android/settings/applications/defaultapps/DefaultAppPickerFragment.java
index 5d41ba7..0ca1876 100644
--- a/src/com/android/settings/applications/defaultapps/DefaultAppPickerFragment.java
+++ b/src/com/android/settings/applications/defaultapps/DefaultAppPickerFragment.java
@@ -33,9 +33,9 @@
import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
import com.android.settings.fuelgauge.BatteryUtils;
import com.android.settings.widget.RadioButtonPickerFragment;
-import com.android.settings.widget.RadioButtonPreference;
import com.android.settingslib.applications.DefaultAppInfo;
import com.android.settingslib.widget.CandidateInfo;
+import com.android.settingslib.widget.RadioButtonPreference;
/**
* A generic app picker fragment that shows a list of app as radio button group.
@@ -73,7 +73,7 @@
SettingsEnums.ACTION_SETTINGS_UPDATE_DEFAULT_APP,
getMetricsCategory(),
selectedKey,
- 0 /* value */);
+ 0 /* value */);
super.onRadioButtonConfirmed(selectedKey);
}
diff --git a/src/com/android/settings/applications/manageapplications/ManageApplications.java b/src/com/android/settings/applications/manageapplications/ManageApplications.java
index 971c6f5..734552e 100644
--- a/src/com/android/settings/applications/manageapplications/ManageApplications.java
+++ b/src/com/android/settings/applications/manageapplications/ManageApplications.java
@@ -151,7 +151,8 @@
private static final String EXTRA_HAS_ENTRIES = "hasEntries";
private static final String EXTRA_HAS_BRIDGE = "hasBridge";
private static final String EXTRA_FILTER_TYPE = "filterType";
- private static final String EXTRA_EXPAND_SEARCH_VIEW = "expand_search_view";
+ @VisibleForTesting
+ static final String EXTRA_EXPAND_SEARCH_VIEW = "expand_search_view";
// attributes used as keys when passing values to AppInfoDashboardFragment activity
public static final String APP_CHG = "chg";
@@ -505,11 +506,13 @@
super.onSaveInstanceState(outState);
mResetAppsHelper.onSaveInstanceState(outState);
outState.putInt(EXTRA_SORT_ORDER, mSortOrder);
+ outState.putInt(EXTRA_FILTER_TYPE, mFilter.getFilterType());
outState.putBoolean(EXTRA_SHOW_SYSTEM, mShowSystem);
outState.putBoolean(EXTRA_HAS_ENTRIES, mApplications.mHasReceivedLoadEntries);
outState.putBoolean(EXTRA_HAS_BRIDGE, mApplications.mHasReceivedBridgeCallback);
- outState.putBoolean(EXTRA_EXPAND_SEARCH_VIEW, !mSearchView.isIconified());
- outState.putInt(EXTRA_FILTER_TYPE, mFilter.getFilterType());
+ if(mSearchView != null) {
+ outState.putBoolean(EXTRA_EXPAND_SEARCH_VIEW, !mSearchView.isIconified());
+ }
if (mApplications != null) {
mApplications.onSaveInstanceState(outState);
}
@@ -690,38 +693,33 @@
@Override
public boolean onOptionsItemSelected(MenuItem item) {
int menuId = item.getItemId();
- switch (item.getItemId()) {
- case R.id.sort_order_alpha:
- case R.id.sort_order_size:
- if (mApplications != null) {
- mApplications.rebuild(menuId);
- }
- break;
- case R.id.show_system:
- case R.id.hide_system:
- mShowSystem = !mShowSystem;
- mApplications.rebuild();
- break;
- case R.id.reset_app_preferences:
- mResetAppsHelper.buildResetDialog();
- return true;
- case R.id.advanced:
- if (mListType == LIST_TYPE_NOTIFICATION) {
- new SubSettingLauncher(getContext())
- .setDestination(ConfigureNotificationSettings.class.getName())
- .setTitleRes(R.string.configure_notification_settings)
- .setSourceMetricsCategory(getMetricsCategory())
- .setResultListener(this, ADVANCED_SETTINGS)
- .launch();
- } else {
- Intent intent = new Intent(
- android.provider.Settings.ACTION_MANAGE_DEFAULT_APPS_SETTINGS);
- startActivityForResult(intent, ADVANCED_SETTINGS);
- }
- return true;
- default:
- // Handle the home button
- return false;
+ int i = item.getItemId();
+ if (i == R.id.sort_order_alpha || i == R.id.sort_order_size) {
+ if (mApplications != null) {
+ mApplications.rebuild(menuId);
+ }
+ } else if (i == R.id.show_system || i == R.id.hide_system) {
+ mShowSystem = !mShowSystem;
+ mApplications.rebuild();
+ } else if (i == R.id.reset_app_preferences) {
+ mResetAppsHelper.buildResetDialog();
+ return true;
+ } else if (i == R.id.advanced) {
+ if (mListType == LIST_TYPE_NOTIFICATION) {
+ new SubSettingLauncher(getContext())
+ .setDestination(ConfigureNotificationSettings.class.getName())
+ .setTitleRes(R.string.configure_notification_settings)
+ .setSourceMetricsCategory(getMetricsCategory())
+ .setResultListener(this, ADVANCED_SETTINGS)
+ .launch();
+ } else {
+ Intent intent = new Intent(
+ android.provider.Settings.ACTION_MANAGE_DEFAULT_APPS_SETTINGS);
+ startActivityForResult(intent, ADVANCED_SETTINGS);
+ }
+ return true;
+ } else {// Handle the home button
+ return false;
}
updateOptionsMenu();
return true;
@@ -1133,29 +1131,24 @@
ApplicationsState.FILTER_DOWNLOADED_AND_LAUNCHER);
}
}
- switch (mLastSortMode) {
- case R.id.sort_order_size:
- switch (mWhichSize) {
- case SIZE_INTERNAL:
- comparatorObj = ApplicationsState.INTERNAL_SIZE_COMPARATOR;
- break;
- case SIZE_EXTERNAL:
- comparatorObj = ApplicationsState.EXTERNAL_SIZE_COMPARATOR;
- break;
- default:
- comparatorObj = ApplicationsState.SIZE_COMPARATOR;
- break;
- }
- break;
- case R.id.sort_order_recent_notification:
- comparatorObj = AppStateNotificationBridge.RECENT_NOTIFICATION_COMPARATOR;
- break;
- case R.id.sort_order_frequent_notification:
- comparatorObj = AppStateNotificationBridge.FREQUENCY_NOTIFICATION_COMPARATOR;
- break;
- default:
- comparatorObj = ApplicationsState.ALPHA_COMPARATOR;
- break;
+ if (mLastSortMode == R.id.sort_order_size) {
+ switch (mWhichSize) {
+ case SIZE_INTERNAL:
+ comparatorObj = ApplicationsState.INTERNAL_SIZE_COMPARATOR;
+ break;
+ case SIZE_EXTERNAL:
+ comparatorObj = ApplicationsState.EXTERNAL_SIZE_COMPARATOR;
+ break;
+ default:
+ comparatorObj = ApplicationsState.SIZE_COMPARATOR;
+ break;
+ }
+ } else if (mLastSortMode == R.id.sort_order_recent_notification) {
+ comparatorObj = AppStateNotificationBridge.RECENT_NOTIFICATION_COMPARATOR;
+ } else if (mLastSortMode == R.id.sort_order_frequent_notification) {
+ comparatorObj = AppStateNotificationBridge.FREQUENCY_NOTIFICATION_COMPARATOR;
+ } else {
+ comparatorObj = ApplicationsState.ALPHA_COMPARATOR;
}
filterObj = new CompoundFilter(filterObj, ApplicationsState.FILTER_NOT_HIDE);
diff --git a/src/com/android/settings/applications/manageapplications/ResetAppsHelper.java b/src/com/android/settings/applications/manageapplications/ResetAppsHelper.java
index 92c0958..1fe0d01 100644
--- a/src/com/android/settings/applications/manageapplications/ResetAppsHelper.java
+++ b/src/com/android/settings/applications/manageapplications/ResetAppsHelper.java
@@ -37,6 +37,7 @@
import com.android.settings.R;
+import java.util.Arrays;
import java.util.List;
public class ResetAppsHelper implements DialogInterface.OnClickListener,
@@ -109,10 +110,17 @@
AsyncTask.execute(new Runnable() {
@Override
public void run() {
- List<ApplicationInfo> apps = mPm.getInstalledApplications(
+ final List<ApplicationInfo> apps = mPm.getInstalledApplications(
PackageManager.GET_DISABLED_COMPONENTS);
+ final List<String> whiteList = Arrays.asList(
+ mContext.getResources().getStringArray(
+ R.array.config_reset_app_package_name));
+
for (int i = 0; i < apps.size(); i++) {
ApplicationInfo app = apps.get(i);
+ if (whiteList.contains(app.packageName)) {
+ continue;
+ }
try {
mNm.clearData(app.packageName, app.uid, false);
} catch (android.os.RemoteException ex) {
diff --git a/src/com/android/settings/applications/specialaccess/SystemAlertWindowPreferenceController.java b/src/com/android/settings/applications/specialaccess/SystemAlertWindowPreferenceController.java
index 5d9e8b6..5c2b009 100644
--- a/src/com/android/settings/applications/specialaccess/SystemAlertWindowPreferenceController.java
+++ b/src/com/android/settings/applications/specialaccess/SystemAlertWindowPreferenceController.java
@@ -31,6 +31,6 @@
@Override
public int getAvailabilityStatus() {
return isSystemAlertWindowEnabled(mContext)
- ? AVAILABLE_UNSEARCHABLE : UNSUPPORTED_ON_DEVICE ;
+ ? AVAILABLE : UNSUPPORTED_ON_DEVICE ;
}
}
diff --git a/src/com/android/settings/applications/specialaccess/deviceadmin/DeviceAdminListPreferenceController.java b/src/com/android/settings/applications/specialaccess/deviceadmin/DeviceAdminListPreferenceController.java
index 7b139d9..73acc12 100644
--- a/src/com/android/settings/applications/specialaccess/deviceadmin/DeviceAdminListPreferenceController.java
+++ b/src/com/android/settings/applications/specialaccess/deviceadmin/DeviceAdminListPreferenceController.java
@@ -45,13 +45,11 @@
import androidx.preference.PreferenceScreen;
import androidx.preference.SwitchPreference;
-import com.android.settings.R;
import com.android.settings.core.BasePreferenceController;
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.FooterPreference;
-import com.android.settingslib.widget.FooterPreferenceMixinCompat;
import org.xmlpull.v1.XmlPullParserException;
@@ -67,6 +65,7 @@
private static final IntentFilter FILTER = new IntentFilter();
private static final String TAG = "DeviceAdminListPrefCtrl";
+ private static final String KEY_DEVICE_ADMIN_FOOTER = "device_admin_footer";
private final DevicePolicyManager mDPM;
private final UserManager mUm;
@@ -91,7 +90,7 @@
};
private PreferenceGroup mPreferenceGroup;
- private FooterPreferenceMixinCompat mFooterPreferenceMixin;
+ private FooterPreference mFooterPreference;
static {
FILTER.addAction(ACTION_DEVICE_POLICY_MANAGER_STATE_CHANGED);
@@ -105,12 +104,6 @@
mIPackageManager = AppGlobals.getPackageManager();
}
- public DeviceAdminListPreferenceController setFooterPreferenceMixin(
- FooterPreferenceMixinCompat mixin) {
- mFooterPreferenceMixin = mixin;
- return this;
- }
-
@Override
public int getAvailabilityStatus() {
return AVAILABLE;
@@ -120,6 +113,7 @@
public void displayPreference(PreferenceScreen screen) {
super.displayPreference(screen);
mPreferenceGroup = screen.findPreference(getPreferenceKey());
+ mFooterPreference = mPreferenceGroup.findPreference(KEY_DEVICE_ADMIN_FOOTER);
}
@Override
@@ -167,10 +161,8 @@
if (mPreferenceGroup == null) {
return;
}
- if (mFooterPreferenceMixin != null) {
- final FooterPreference footer = mFooterPreferenceMixin.createFooterPreference();
- footer.setTitle(R.string.no_device_admins);
- footer.setVisible(mAdmins.isEmpty());
+ if (mFooterPreference != null) {
+ mFooterPreference.setVisible(mAdmins.isEmpty());
}
final Map<String, SwitchPreference> preferenceCache = new ArrayMap<>();
final Context prefContext = mPreferenceGroup.getContext();
diff --git a/src/com/android/settings/applications/specialaccess/deviceadmin/DeviceAdminSettings.java b/src/com/android/settings/applications/specialaccess/deviceadmin/DeviceAdminSettings.java
index 7cbd8c7..66e3996 100644
--- a/src/com/android/settings/applications/specialaccess/deviceadmin/DeviceAdminSettings.java
+++ b/src/com/android/settings/applications/specialaccess/deviceadmin/DeviceAdminSettings.java
@@ -38,13 +38,6 @@
}
@Override
- public void onAttach(Context context) {
- super.onAttach(context);
- use(DeviceAdminListPreferenceController.class).setFooterPreferenceMixin(
- mFooterPreferenceMixin);
- }
-
- @Override
protected int getPreferenceScreenResId() {
return R.xml.device_admin_settings;
}
diff --git a/src/com/android/settings/biometrics/face/FaceSettings.java b/src/com/android/settings/biometrics/face/FaceSettings.java
index b8bb030..8771802 100644
--- a/src/com/android/settings/biometrics/face/FaceSettings.java
+++ b/src/com/android/settings/biometrics/face/FaceSettings.java
@@ -112,9 +112,17 @@
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
+ final Context context = getPrefContext();
+ if (!isAvailable(context)) {
+ Log.w(TAG, "no faceManager, finish this");
+ finish();
+ return;
+ }
+
+ mUserManager = context.getSystemService(UserManager.class);
+ mFaceManager = context.getSystemService(FaceManager.class);
mToken = getIntent().getByteArrayExtra(KEY_TOKEN);
- mUserManager = getPrefContext().getSystemService(UserManager.class);
- mFaceManager = getPrefContext().getSystemService(FaceManager.class);
+
mUserId = getActivity().getIntent().getIntExtra(
Intent.EXTRA_USER_ID, UserHandle.myUserId());
diff --git a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFinish.java b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFinish.java
index 5f45015..179de67 100644
--- a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFinish.java
+++ b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFinish.java
@@ -152,6 +152,7 @@
intent.setPackage(Utils.SETTINGS_PACKAGE_NAME);
intent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE_TOKEN, mToken);
intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_SINGLE_TOP);
+ intent.putExtra(Intent.EXTRA_USER_ID, mUserId);
startActivity(intent);
}
diff --git a/src/com/android/settings/biometrics/fingerprint/FingerprintSettings.java b/src/com/android/settings/biometrics/fingerprint/FingerprintSettings.java
index 3fbcfd4..68b21f5 100644
--- a/src/com/android/settings/biometrics/fingerprint/FingerprintSettings.java
+++ b/src/com/android/settings/biometrics/fingerprint/FingerprintSettings.java
@@ -132,6 +132,7 @@
private boolean mLaunchedConfirm;
private Drawable mHighlightDrawable;
private int mUserId;
+ private CharSequence mFooterTitle;
private static final String TAG_AUTHENTICATE_SIDECAR = "authenticate_sidecar";
private static final String TAG_REMOVAL_SIDECAR = "removal_sidecar";
@@ -140,56 +141,57 @@
private HashMap<Integer, String> mFingerprintsRenaming;
FingerprintAuthenticateSidecar.Listener mAuthenticateListener =
- new FingerprintAuthenticateSidecar.Listener() {
- @Override
- public void onAuthenticationSucceeded(
- FingerprintManager.AuthenticationResult result) {
- int fingerId = result.getFingerprint().getBiometricId();
- mHandler.obtainMessage(MSG_FINGER_AUTH_SUCCESS, fingerId, 0).sendToTarget();
- }
+ new FingerprintAuthenticateSidecar.Listener() {
+ @Override
+ public void onAuthenticationSucceeded(
+ FingerprintManager.AuthenticationResult result) {
+ int fingerId = result.getFingerprint().getBiometricId();
+ mHandler.obtainMessage(MSG_FINGER_AUTH_SUCCESS, fingerId, 0).sendToTarget();
+ }
- @Override
- public void onAuthenticationFailed() {
- mHandler.obtainMessage(MSG_FINGER_AUTH_FAIL).sendToTarget();
- }
+ @Override
+ public void onAuthenticationFailed() {
+ mHandler.obtainMessage(MSG_FINGER_AUTH_FAIL).sendToTarget();
+ }
- @Override
- public void onAuthenticationError(int errMsgId, CharSequence errString) {
- mHandler.obtainMessage(MSG_FINGER_AUTH_ERROR, errMsgId, 0, errString)
- .sendToTarget();
- }
+ @Override
+ public void onAuthenticationError(int errMsgId, CharSequence errString) {
+ mHandler.obtainMessage(MSG_FINGER_AUTH_ERROR, errMsgId, 0, errString)
+ .sendToTarget();
+ }
- @Override
- public void onAuthenticationHelp(int helpMsgId, CharSequence helpString) {
- mHandler.obtainMessage(MSG_FINGER_AUTH_HELP, helpMsgId, 0, helpString)
- .sendToTarget();
- }
- };
+ @Override
+ public void onAuthenticationHelp(int helpMsgId, CharSequence helpString) {
+ mHandler.obtainMessage(MSG_FINGER_AUTH_HELP, helpMsgId, 0, helpString)
+ .sendToTarget();
+ }
+ };
FingerprintRemoveSidecar.Listener mRemovalListener =
new FingerprintRemoveSidecar.Listener() {
- public void onRemovalSucceeded(Fingerprint fingerprint) {
- mHandler.obtainMessage(MSG_REFRESH_FINGERPRINT_TEMPLATES,
- fingerprint.getBiometricId(), 0).sendToTarget();
- updateDialog();
- }
+ public void onRemovalSucceeded(Fingerprint fingerprint) {
+ mHandler.obtainMessage(MSG_REFRESH_FINGERPRINT_TEMPLATES,
+ fingerprint.getBiometricId(), 0).sendToTarget();
+ updateDialog();
+ }
- public void onRemovalError(Fingerprint fp, int errMsgId, CharSequence errString) {
- final Activity activity = getActivity();
- if (activity != null) {
- Toast.makeText(activity, errString, Toast.LENGTH_SHORT);
- }
- updateDialog();
- }
+ public void onRemovalError(Fingerprint fp, int errMsgId,
+ CharSequence errString) {
+ final Activity activity = getActivity();
+ if (activity != null) {
+ Toast.makeText(activity, errString, Toast.LENGTH_SHORT);
+ }
+ updateDialog();
+ }
- private void updateDialog() {
- RenameDialog renameDialog = (RenameDialog) getFragmentManager().
- findFragmentByTag(RenameDialog.class.getName());
- if (renameDialog != null) {
- renameDialog.enableDelete();
- }
- }
- };
+ private void updateDialog() {
+ RenameDialog renameDialog = (RenameDialog) getFragmentManager().
+ findFragmentByTag(RenameDialog.class.getName());
+ if (renameDialog != null) {
+ renameDialog.enableDelete();
+ }
+ }
+ };
private final Handler mHandler = new Handler() {
@Override
@@ -199,17 +201,17 @@
removeFingerprintPreference(msg.arg1);
updateAddPreference();
retryFingerprint();
- break;
+ break;
case MSG_FINGER_AUTH_SUCCESS:
highlightFingerprintItem(msg.arg1);
retryFingerprint();
- break;
+ break;
case MSG_FINGER_AUTH_FAIL:
// No action required... fingerprint will allow up to 5 of these
- break;
+ break;
case MSG_FINGER_AUTH_ERROR:
- handleError(msg.arg1 /* errMsgId */, (CharSequence) msg.obj /* errStr */ );
- break;
+ handleError(msg.arg1 /* errMsgId */, (CharSequence) msg.obj /* errStr */);
+ break;
case MSG_FINGER_AUTH_HELP: {
// Not used
}
@@ -219,7 +221,7 @@
};
/**
- * @param errMsgId
+ *
*/
protected void handleError(int errMsgId, CharSequence msg) {
switch (errMsgId) {
@@ -242,7 +244,7 @@
// Activity can be null on a screen rotation.
final Activity activity = getActivity();
if (activity != null) {
- Toast.makeText(activity, msg , Toast.LENGTH_SHORT).show();
+ Toast.makeText(activity, msg, Toast.LENGTH_SHORT).show();
}
}
retryFingerprint(); // start again
@@ -323,7 +325,6 @@
launchChooseOrConfirmLock();
}
- final FooterPreference pref = mFooterPreferenceMixin.createFooterPreference();
final EnforcedAdmin admin = RestrictedLockUtilsInternal.checkIfKeyguardFeaturesDisabled(
activity, DevicePolicyManager.KEYGUARD_DISABLE_FINGERPRINT, mUserId);
final AnnotationSpan.LinkInfo adminLinkInfo = new AnnotationSpan.LinkInfo(
@@ -334,11 +335,11 @@
activity, getString(getHelpResource()), activity.getClass().getName());
final AnnotationSpan.LinkInfo linkInfo = new AnnotationSpan.LinkInfo(
activity, ANNOTATION_URL, helpIntent);
- pref.setTitle(AnnotationSpan.linkify(getText(admin != null
+ mFooterTitle = AnnotationSpan.linkify(getText(admin != null
? R.string
.security_settings_fingerprint_enroll_disclaimer_lockscreen_disabled
: R.string.security_settings_fingerprint_enroll_disclaimer),
- linkInfo, adminLinkInfo));
+ linkInfo, adminLinkInfo);
}
protected void removeFingerprintPreference(int fingerprintId) {
@@ -400,6 +401,7 @@
root.addPreference(addPreference);
addPreference.setOnPreferenceChangeListener(this);
updateAddPreference();
+ createFooterPreference(root);
}
private void updateAddPreference() {
@@ -419,6 +421,15 @@
addPreference.setEnabled(!tooMany && !removalInProgress);
}
+ private void createFooterPreference(PreferenceGroup root) {
+ final Context context = getActivity();
+ if (context == null) {
+ return;
+ }
+ root.addPreference(new FooterPreference.Builder(context).setTitle(
+ mFooterTitle).build());
+ }
+
private static String genKey(int id) {
return KEY_FINGERPRINT_ITEM_PREFIX + "_" + id;
}
@@ -509,7 +520,8 @@
RenameDialog renameDialog = new RenameDialog();
Bundle args = new Bundle();
if (mFingerprintsRenaming.containsKey(fp.getBiometricId())) {
- final Fingerprint f = new Fingerprint(mFingerprintsRenaming.get(fp.getBiometricId()),
+ final Fingerprint f = new Fingerprint(
+ mFingerprintsRenaming.get(fp.getBiometricId()),
fp.getGroupId(), fp.getBiometricId(), fp.getDeviceId());
args.putParcelable("fingerprint", f);
} else {
diff --git a/src/com/android/settings/bluetooth/BluetoothDetailsHeaderController.java b/src/com/android/settings/bluetooth/BluetoothDetailsHeaderController.java
index f509605..fc74004 100644
--- a/src/com/android/settings/bluetooth/BluetoothDetailsHeaderController.java
+++ b/src/com/android/settings/bluetooth/BluetoothDetailsHeaderController.java
@@ -20,6 +20,7 @@
import android.content.Context;
import android.graphics.drawable.Drawable;
import android.provider.DeviceConfig;
+import android.text.TextUtils;
import android.util.Pair;
import androidx.preference.PreferenceFragmentCompat;
@@ -74,10 +75,13 @@
final Pair<Drawable, String> pair =
BluetoothUtils.getBtRainbowDrawableWithDescription(mContext, mCachedDevice);
String summaryText = mCachedDevice.getConnectionSummary();
- // If both the hearing aids are connected, two device status should be shown.
- // If Second Summary is unavailable, to set it to null.
- mHeaderController.setSecondSummary(
- mDeviceManager.getSubDeviceSummary(mCachedDevice));
+ if (TextUtils.isEmpty(summaryText)) {
+ // If first summary is unavailable, not to show second summary.
+ mHeaderController.setSecondSummary((CharSequence)null);
+ } else {
+ // If both the hearing aids are connected, two device status should be shown.
+ mHeaderController.setSecondSummary(mDeviceManager.getSubDeviceSummary(mCachedDevice));
+ }
mHeaderController.setLabel(mCachedDevice.getName());
mHeaderController.setIcon(pair.first);
mHeaderController.setIconContentDescription(pair.second);
diff --git a/src/com/android/settings/bluetooth/BluetoothDetailsMacAddressController.java b/src/com/android/settings/bluetooth/BluetoothDetailsMacAddressController.java
index 835961d..dda247e 100644
--- a/src/com/android/settings/bluetooth/BluetoothDetailsMacAddressController.java
+++ b/src/com/android/settings/bluetooth/BluetoothDetailsMacAddressController.java
@@ -25,26 +25,25 @@
import com.android.settingslib.bluetooth.CachedBluetoothDevice;
import com.android.settingslib.core.lifecycle.Lifecycle;
import com.android.settingslib.widget.FooterPreference;
-import com.android.settingslib.widget.FooterPreferenceMixinCompat;
/**
* This class adds the device MAC address to a footer.
*/
public class BluetoothDetailsMacAddressController extends BluetoothDetailsController {
- FooterPreferenceMixinCompat mFooterPreferenceMixin;
- FooterPreference mFooterPreference;
+ public static final String KEY_DEVICE_DETAILS_FOOTER = "device_details_footer";
+
+ private FooterPreference mFooterPreference;
public BluetoothDetailsMacAddressController(Context context,
PreferenceFragmentCompat fragment,
CachedBluetoothDevice device,
Lifecycle lifecycle) {
super(context, fragment, device, lifecycle);
- mFooterPreferenceMixin = new FooterPreferenceMixinCompat(fragment, lifecycle);
}
@Override
protected void init(PreferenceScreen screen) {
- mFooterPreference = mFooterPreferenceMixin.createFooterPreference();
+ mFooterPreference = screen.findPreference(KEY_DEVICE_DETAILS_FOOTER);
mFooterPreference.setTitle(mContext.getString(
R.string.bluetooth_device_mac_address, mCachedDevice.getAddress()));
}
@@ -57,9 +56,6 @@
@Override
public String getPreferenceKey() {
- if (mFooterPreference == null) {
- return null;
- }
- return mFooterPreference.getKey();
+ return KEY_DEVICE_DETAILS_FOOTER;
}
}
\ No newline at end of file
diff --git a/src/com/android/settings/bluetooth/BluetoothDevicePreference.java b/src/com/android/settings/bluetooth/BluetoothDevicePreference.java
index 74d3b6a..a8b1c97 100644
--- a/src/com/android/settings/bluetooth/BluetoothDevicePreference.java
+++ b/src/com/android/settings/bluetooth/BluetoothDevicePreference.java
@@ -32,6 +32,7 @@
import android.view.View;
import android.widget.ImageView;
+import androidx.annotation.IntDef;
import androidx.annotation.VisibleForTesting;
import androidx.appcompat.app.AlertDialog;
import androidx.preference.Preference;
@@ -44,6 +45,9 @@
import com.android.settingslib.bluetooth.CachedBluetoothDevice;
import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
/**
* BluetoothDevicePreference is the preference type used to display each remote
* Bluetooth device in the Bluetooth Settings screen.
@@ -54,9 +58,19 @@
private static int sDimAlpha = Integer.MIN_VALUE;
+ @Retention(RetentionPolicy.SOURCE)
+ @IntDef({SortType.TYPE_DEFAULT,
+ SortType.TYPE_FIFO})
+ public @interface SortType {
+ int TYPE_DEFAULT = 1;
+ int TYPE_FIFO = 2;
+ }
+
private final CachedBluetoothDevice mCachedDevice;
private final UserManager mUserManager;
private final boolean mShowDevicesWithoutNames;
+ private final long mCurrentTime;
+ private final int mType;
private AlertDialog mDisconnectDialog;
private String contentDescription = null;
@@ -67,7 +81,7 @@
Resources mResources;
public BluetoothDevicePreference(Context context, CachedBluetoothDevice cachedDevice,
- boolean showDeviceWithoutNames) {
+ boolean showDeviceWithoutNames, @SortType int type) {
super(context, null);
mResources = getContext().getResources();
mUserManager = (UserManager) context.getSystemService(Context.USER_SERVICE);
@@ -81,6 +95,8 @@
mCachedDevice = cachedDevice;
mCachedDevice.registerCallback(this);
+ mCurrentTime = System.currentTimeMillis();
+ mType = type;
onDeviceAttributesChanged();
}
@@ -200,8 +216,15 @@
return super.compareTo(another);
}
- return mCachedDevice
- .compareTo(((BluetoothDevicePreference) another).mCachedDevice);
+ switch (mType) {
+ case SortType.TYPE_DEFAULT:
+ return mCachedDevice
+ .compareTo(((BluetoothDevicePreference) another).mCachedDevice);
+ case SortType.TYPE_FIFO:
+ return mCurrentTime > ((BluetoothDevicePreference) another).mCurrentTime ? 1 : -1;
+ default:
+ return super.compareTo(another);
+ }
}
void onClicked() {
diff --git a/src/com/android/settings/bluetooth/BluetoothDeviceUpdater.java b/src/com/android/settings/bluetooth/BluetoothDeviceUpdater.java
index 31055cc..7cf7fd5 100644
--- a/src/com/android/settings/bluetooth/BluetoothDeviceUpdater.java
+++ b/src/com/android/settings/bluetooth/BluetoothDeviceUpdater.java
@@ -226,7 +226,8 @@
if (!mPreferenceMap.containsKey(device)) {
BluetoothDevicePreference btPreference =
new BluetoothDevicePreference(mPrefContext, cachedDevice,
- true /* showDeviceWithoutNames */);
+ true /* showDeviceWithoutNames */,
+ BluetoothDevicePreference.SortType.TYPE_DEFAULT);
btPreference.setOnGearClickListener(mDeviceProfilesListener);
if (this instanceof Preference.OnPreferenceClickListener) {
btPreference.setOnPreferenceClickListener(
diff --git a/src/com/android/settings/bluetooth/BluetoothSwitchPreferenceController.java b/src/com/android/settings/bluetooth/BluetoothSwitchPreferenceController.java
index 48376a7..5b74ce7 100644
--- a/src/com/android/settings/bluetooth/BluetoothSwitchPreferenceController.java
+++ b/src/com/android/settings/bluetooth/BluetoothSwitchPreferenceController.java
@@ -46,6 +46,9 @@
private Context mContext;
private FooterPreference mFooterPreference;
+ @VisibleForTesting
+ AlwaysDiscoverable mAlwaysDiscoverable;
+
public BluetoothSwitchPreferenceController(Context context,
SwitchWidgetController switchController,
FooterPreference footerPreference) {
@@ -69,11 +72,13 @@
SettingsEnums.ACTION_SETTINGS_MASTER_SWITCH_BLUETOOTH_TOGGLE,
mRestrictionUtils);
mBluetoothEnabler.setToggleCallback(this);
+ mAlwaysDiscoverable = new AlwaysDiscoverable(context);
}
@Override
public void onStart() {
mBluetoothEnabler.resume(mContext);
+ mAlwaysDiscoverable.start();
if (mSwitch != null) {
updateText(mSwitch.isChecked());
}
@@ -82,6 +87,7 @@
@Override
public void onStop() {
mBluetoothEnabler.pause();
+ mAlwaysDiscoverable.stop();
}
@Override
diff --git a/src/com/android/settings/bluetooth/DeviceListPreferenceFragment.java b/src/com/android/settings/bluetooth/DeviceListPreferenceFragment.java
index 4f27a39..8a286e4 100644
--- a/src/com/android/settings/bluetooth/DeviceListPreferenceFragment.java
+++ b/src/com/android/settings/bluetooth/DeviceListPreferenceFragment.java
@@ -191,7 +191,7 @@
if (preference == null) {
preference = new BluetoothDevicePreference(getPrefContext(), cachedDevice,
- mShowDevicesWithoutNames);
+ mShowDevicesWithoutNames, BluetoothDevicePreference.SortType.TYPE_FIFO);
preference.setKey(key);
//Set hideSecondTarget is true if it's bonded device.
preference.hideSecondTarget(true);
diff --git a/src/com/android/settings/connecteddevice/BluetoothDashboardFragment.java b/src/com/android/settings/connecteddevice/BluetoothDashboardFragment.java
index ecbda15..36b2ae8 100644
--- a/src/com/android/settings/connecteddevice/BluetoothDashboardFragment.java
+++ b/src/com/android/settings/connecteddevice/BluetoothDashboardFragment.java
@@ -46,6 +46,7 @@
public class BluetoothDashboardFragment extends DashboardFragment {
private static final String TAG = "BluetoothDashboardFrag";
+ private static final String KEY_BLUETOOTH_SCREEN_FOOTER = "bluetooth_screen_footer";
public static final String KEY_BLUETOOTH_SCREEN = "bluetooth_switchbar_screen";
private FooterPreference mFooterPreference;
@@ -75,7 +76,7 @@
@Override
public void onCreate(Bundle icicle) {
super.onCreate(icicle);
- mFooterPreference = mFooterPreferenceMixin.createFooterPreference();
+ mFooterPreference = findPreference(KEY_BLUETOOTH_SCREEN_FOOTER);
}
@Override
diff --git a/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragment.java b/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragment.java
index cbabb06..7df2603 100644
--- a/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragment.java
+++ b/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragment.java
@@ -28,11 +28,8 @@
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settings.slices.SlicePreferenceController;
-import com.android.settingslib.core.AbstractPreferenceController;
-import com.android.settingslib.core.lifecycle.Lifecycle;
import com.android.settingslib.search.SearchIndexable;
-import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
@@ -67,25 +64,6 @@
}
@Override
- protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
- return buildPreferenceControllers(context, getSettingsLifecycle());
- }
-
- private static List<AbstractPreferenceController> buildPreferenceControllers(Context context,
- Lifecycle lifecycle) {
- final List<AbstractPreferenceController> controllers = new ArrayList<>();
- final DiscoverableFooterPreferenceController discoverableFooterPreferenceController =
- new DiscoverableFooterPreferenceController(context);
- controllers.add(discoverableFooterPreferenceController);
-
- if (lifecycle != null) {
- lifecycle.addObserver(discoverableFooterPreferenceController);
- }
-
- return controllers;
- }
-
- @Override
public void onAttach(Context context) {
super.onAttach(context);
final boolean nearbyEnabled = DeviceConfig.getBoolean(DeviceConfig.NAMESPACE_SETTINGS_UI,
@@ -93,7 +71,6 @@
use(AvailableMediaDeviceGroupController.class).init(this);
use(ConnectedDeviceGroupController.class).init(this);
use(PreviouslyConnectedDevicePreferenceController.class).init(this);
- use(DiscoverableFooterPreferenceController.class).init(this);
use(SlicePreferenceController.class).setSliceUri(nearbyEnabled
? Uri.parse(getString(R.string.config_nearby_devices_slice_uri))
: null);
@@ -111,11 +88,5 @@
sir.xmlResId = R.xml.connected_devices;
return Arrays.asList(sir);
}
-
- @Override
- public List<AbstractPreferenceController> createPreferenceControllers(Context
- context) {
- return buildPreferenceControllers(context, null /* lifecycle */);
- }
};
}
diff --git a/src/com/android/settings/connecteddevice/DiscoverableFooterPreferenceController.java b/src/com/android/settings/connecteddevice/DiscoverableFooterPreferenceController.java
index ead3307..91368bf 100644
--- a/src/com/android/settings/connecteddevice/DiscoverableFooterPreferenceController.java
+++ b/src/com/android/settings/connecteddevice/DiscoverableFooterPreferenceController.java
@@ -32,32 +32,29 @@
import com.android.settings.bluetooth.AlwaysDiscoverable;
import com.android.settings.bluetooth.Utils;
import com.android.settings.core.BasePreferenceController;
-import com.android.settings.dashboard.DashboardFragment;
import com.android.settingslib.bluetooth.LocalBluetoothManager;
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.core.lifecycle.events.OnStart;
+import com.android.settingslib.core.lifecycle.events.OnStop;
import com.android.settingslib.widget.FooterPreference;
-import com.android.settingslib.widget.FooterPreferenceMixinCompat;
/**
* Controller that shows and updates the bluetooth device name
*/
public class DiscoverableFooterPreferenceController extends BasePreferenceController
- implements LifecycleObserver, OnResume, OnPause {
+ implements LifecycleObserver, OnStart, OnStop {
private static final String KEY = "discoverable_footer_preference";
@VisibleForTesting
BroadcastReceiver mBluetoothChangedReceiver;
@VisibleForTesting
LocalBluetoothManager mLocalManager;
- private FooterPreferenceMixinCompat mFooterPreferenceMixin;
- private FooterPreference mPreference;
private BluetoothAdapter mBluetoothAdapter;
private AlwaysDiscoverable mAlwaysDiscoverable;
+ private FooterPreference mPreference;
- public DiscoverableFooterPreferenceController(Context context) {
- super(context, KEY);
+ public DiscoverableFooterPreferenceController(Context context, String key) {
+ super(context, key);
mLocalManager = Utils.getLocalBtManager(context);
if (mLocalManager == null) {
return;
@@ -67,53 +64,21 @@
initReceiver();
}
- private void initReceiver() {
- mBluetoothChangedReceiver = new BroadcastReceiver() {
- @Override
- public void onReceive(Context context, Intent intent) {
- if (intent.getAction().equals(BluetoothAdapter.ACTION_STATE_CHANGED)) {
- final int state = intent.getIntExtra(BluetoothAdapter.EXTRA_STATE,
- BluetoothAdapter.ERROR);
- updateFooterPreferenceTitle(state);
- }
- }
- };
- }
-
- public void init(DashboardFragment fragment) {
- mFooterPreferenceMixin = new FooterPreferenceMixinCompat(fragment,
- fragment.getSettingsLifecycle());
- }
-
- @VisibleForTesting
- void init(FooterPreferenceMixinCompat footerPreferenceMixin, FooterPreference preference,
- AlwaysDiscoverable alwaysDiscoverable) {
- mFooterPreferenceMixin = footerPreferenceMixin;
- mPreference = preference;
- mAlwaysDiscoverable = alwaysDiscoverable;
- }
-
@Override
public void displayPreference(PreferenceScreen screen) {
super.displayPreference(screen);
- addFooterPreference(screen);
+ mPreference = screen.findPreference(getPreferenceKey());
}
@Override
public int getAvailabilityStatus() {
return mContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_BLUETOOTH)
- ? AVAILABLE
+ ? AVAILABLE_UNSEARCHABLE
: UNSUPPORTED_ON_DEVICE;
}
- private void addFooterPreference(PreferenceScreen screen) {
- mPreference = mFooterPreferenceMixin.createFooterPreference();
- mPreference.setKey(KEY);
- screen.addPreference(mPreference);
- }
-
@Override
- public void onResume() {
+ public void onStart() {
if (mLocalManager == null) {
return;
}
@@ -124,7 +89,7 @@
}
@Override
- public void onPause() {
+ public void onStop() {
if (mLocalManager == null) {
return;
}
@@ -132,7 +97,7 @@
mAlwaysDiscoverable.stop();
}
- private void updateFooterPreferenceTitle (int bluetoothState) {
+ private void updateFooterPreferenceTitle(int bluetoothState) {
if (bluetoothState == BluetoothAdapter.STATE_ON) {
mPreference.setTitle(getPreferenceTitle());
} else {
@@ -150,4 +115,17 @@
mContext.getText(R.string.bluetooth_device_name_summary),
BidiFormatter.getInstance().unicodeWrap(deviceName));
}
+
+ private void initReceiver() {
+ mBluetoothChangedReceiver = new BroadcastReceiver() {
+ @Override
+ public void onReceive(Context context, Intent intent) {
+ if (intent.getAction().equals(BluetoothAdapter.ACTION_STATE_CHANGED)) {
+ final int state = intent.getIntExtra(BluetoothAdapter.EXTRA_STATE,
+ BluetoothAdapter.ERROR);
+ updateFooterPreferenceTitle(state);
+ }
+ }
+ };
+ }
}
\ No newline at end of file
diff --git a/src/com/android/settings/connecteddevice/usb/UsbDefaultFragment.java b/src/com/android/settings/connecteddevice/usb/UsbDefaultFragment.java
index 4c00c3e..d4f1283 100644
--- a/src/com/android/settings/connecteddevice/usb/UsbDefaultFragment.java
+++ b/src/com/android/settings/connecteddevice/usb/UsbDefaultFragment.java
@@ -32,7 +32,6 @@
import com.android.settings.widget.RadioButtonPickerFragment;
import com.android.settingslib.widget.CandidateInfo;
import com.android.settingslib.widget.FooterPreference;
-import com.android.settingslib.widget.FooterPreferenceMixinCompat;
import com.google.android.collect.Lists;
@@ -61,10 +60,8 @@
@Override
public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
super.onCreatePreferences(savedInstanceState, rootKey);
- FooterPreferenceMixinCompat footer = new FooterPreferenceMixinCompat(this,
- this.getSettingsLifecycle());
- FooterPreference pref = footer.createFooterPreference();
- pref.setTitle(R.string.usb_default_info);
+ getPreferenceScreen().addPreference(new FooterPreference.Builder(getActivity()).setTitle(
+ R.string.usb_default_info).build());
}
@Override
diff --git a/src/com/android/settings/connecteddevice/usb/UsbDetailsDataRoleController.java b/src/com/android/settings/connecteddevice/usb/UsbDetailsDataRoleController.java
index 4b08b74..411bc1d 100644
--- a/src/com/android/settings/connecteddevice/usb/UsbDetailsDataRoleController.java
+++ b/src/com/android/settings/connecteddevice/usb/UsbDetailsDataRoleController.java
@@ -27,7 +27,7 @@
import com.android.settings.R;
import com.android.settings.Utils;
-import com.android.settings.widget.RadioButtonPreference;
+import com.android.settingslib.widget.RadioButtonPreference;
/**
* This class controls the radio buttons for switching between
diff --git a/src/com/android/settings/connecteddevice/usb/UsbDetailsFunctionsController.java b/src/com/android/settings/connecteddevice/usb/UsbDetailsFunctionsController.java
index 858a01c..9c9400d 100644
--- a/src/com/android/settings/connecteddevice/usb/UsbDetailsFunctionsController.java
+++ b/src/com/android/settings/connecteddevice/usb/UsbDetailsFunctionsController.java
@@ -29,7 +29,7 @@
import com.android.settings.R;
import com.android.settings.Utils;
-import com.android.settings.widget.RadioButtonPreference;
+import com.android.settingslib.widget.RadioButtonPreference;
import java.util.LinkedHashMap;
import java.util.Map;
diff --git a/src/com/android/settings/core/BasePreferenceController.java b/src/com/android/settings/core/BasePreferenceController.java
index 324b509..a019c8d 100644
--- a/src/com/android/settings/core/BasePreferenceController.java
+++ b/src/com/android/settings/core/BasePreferenceController.java
@@ -14,7 +14,10 @@
package com.android.settings.core;
import android.annotation.IntDef;
+import android.content.ContentResolver;
import android.content.Context;
+import android.net.Uri;
+import android.provider.SettingsSlicesContract;
import android.text.TextUtils;
import android.util.Log;
@@ -22,6 +25,7 @@
import androidx.preference.PreferenceScreen;
import com.android.settings.search.SearchIndexableRaw;
+import com.android.settings.slices.SettingsSliceProvider;
import com.android.settings.slices.SliceData;
import com.android.settings.slices.Sliceable;
import com.android.settingslib.core.AbstractPreferenceController;
@@ -156,7 +160,7 @@
}
/**
- * @return {@AvailabilityStatus} for the Setting. This status is used to determine if the
+ * @return {@link AvailabilityStatus} for the Setting. This status is used to determine if the
* Setting should be shown or disabled in Settings. Further, it can be used to produce
* appropriate error / warning Slice in the case of unavailability.
* </p>
@@ -171,6 +175,19 @@
return mPreferenceKey;
}
+ @Override
+ public Uri getSliceUri() {
+ return new Uri.Builder()
+ .scheme(ContentResolver.SCHEME_CONTENT)
+ // Default to non-platform authority. Platform Slices will override authority
+ // accordingly.
+ .authority(SettingsSliceProvider.SLICE_AUTHORITY)
+ // Default to action based slices. Intent based slices will override accordingly.
+ .appendPath(SettingsSlicesContract.PATH_SETTING_ACTION)
+ .appendPath(getPreferenceKey())
+ .build();
+ }
+
/**
* @return {@code true} when the controller can be changed on the device.
*
diff --git a/src/com/android/settings/core/PreferenceXmlParserUtils.java b/src/com/android/settings/core/PreferenceXmlParserUtils.java
index 5eebee4..ede6393 100644
--- a/src/com/android/settings/core/PreferenceXmlParserUtils.java
+++ b/src/com/android/settings/core/PreferenceXmlParserUtils.java
@@ -83,7 +83,6 @@
int FLAG_NEED_PREF_TITLE = 1 << 4;
int FLAG_NEED_PREF_SUMMARY = 1 << 5;
int FLAG_NEED_PREF_ICON = 1 << 6;
- int FLAG_NEED_PLATFORM_SLICE_FLAG = 1 << 7;
int FLAG_NEED_KEYWORDS = 1 << 8;
int FLAG_NEED_SEARCHABLE = 1 << 9;
int FLAG_NEED_PREF_APPEND = 1 << 10;
@@ -96,7 +95,6 @@
public static final String METADATA_TITLE = "title";
public static final String METADATA_SUMMARY = "summary";
public static final String METADATA_ICON = "icon";
- public static final String METADATA_PLATFORM_SLICE_FLAG = "platform_slice";
public static final String METADATA_KEYWORDS = "keywords";
public static final String METADATA_SEARCHABLE = "searchable";
public static final String METADATA_APPEND = "staticPreferenceLocation";
@@ -231,10 +229,6 @@
if (hasFlag(flags, MetadataFlag.FLAG_NEED_PREF_ICON)) {
preferenceMetadata.putInt(METADATA_ICON, getIcon(preferenceAttributes));
}
- if (hasFlag(flags, MetadataFlag.FLAG_NEED_PLATFORM_SLICE_FLAG)) {
- preferenceMetadata.putBoolean(METADATA_PLATFORM_SLICE_FLAG,
- getPlatformSlice(preferenceAttributes));
- }
if (hasFlag(flags, MetadataFlag.FLAG_NEED_KEYWORDS)) {
preferenceMetadata.putString(METADATA_KEYWORDS, getKeywords(preferenceAttributes));
}
@@ -318,10 +312,6 @@
return styledAttributes.getResourceId(com.android.internal.R.styleable.Icon_icon, 0);
}
- private static boolean getPlatformSlice(TypedArray styledAttributes) {
- return styledAttributes.getBoolean(R.styleable.Preference_platform_slice, false /* def */);
- }
-
private static boolean isSearchable(TypedArray styledAttributes) {
return styledAttributes.getBoolean(R.styleable.Preference_searchable, true /* default */);
}
diff --git a/src/com/android/settings/core/TogglePreferenceController.java b/src/com/android/settings/core/TogglePreferenceController.java
index 165d7eb..66837d6 100644
--- a/src/com/android/settings/core/TogglePreferenceController.java
+++ b/src/com/android/settings/core/TogglePreferenceController.java
@@ -54,9 +54,8 @@
((TwoStatePreference) preference).setChecked(isChecked());
} else if (preference instanceof MasterSwitchPreference) {
((MasterSwitchPreference) preference).setChecked(isChecked());
- } else {
- refreshSummary(preference);
}
+ refreshSummary(preference);
}
@Override
diff --git a/src/com/android/settings/core/gateway/SettingsGateway.java b/src/com/android/settings/core/gateway/SettingsGateway.java
index 384f262..945ac5c 100644
--- a/src/com/android/settings/core/gateway/SettingsGateway.java
+++ b/src/com/android/settings/core/gateway/SettingsGateway.java
@@ -141,6 +141,7 @@
import com.android.settings.wifi.WifiAPITest;
import com.android.settings.wifi.WifiInfo;
import com.android.settings.wifi.WifiSettings;
+import com.android.settings.wifi.WifiSettings2;
import com.android.settings.wifi.calling.WifiCallingDisclaimerFragment;
import com.android.settings.wifi.calling.WifiCallingSettings;
import com.android.settings.wifi.p2p.WifiP2pSettings;
@@ -157,6 +158,7 @@
AdvancedConnectedDeviceDashboardFragment.class.getName(),
CreateShortcut.class.getName(),
WifiSettings.class.getName(),
+ WifiSettings2.class.getName(),
ConfigureWifiSettings.class.getName(),
SavedAccessPointsWifiSettings.class.getName(),
SimSettings.class.getName(),
@@ -301,6 +303,7 @@
SupportDashboardActivity.class.getName(),
// Home page > Network & Internet
Settings.WifiSettingsActivity.class.getName(),
+ Settings.WifiSettings2Activity.class.getName(),
Settings.DataUsageSummaryActivity.class.getName(),
// Home page > Connected devices
Settings.BluetoothSettingsActivity.class.getName(),
diff --git a/src/com/android/settings/dashboard/DashboardFeatureProviderImpl.java b/src/com/android/settings/dashboard/DashboardFeatureProviderImpl.java
index 64086cb..e9b7f33 100644
--- a/src/com/android/settings/dashboard/DashboardFeatureProviderImpl.java
+++ b/src/com/android/settings/dashboard/DashboardFeatureProviderImpl.java
@@ -21,6 +21,8 @@
import static com.android.settingslib.drawer.TileUtils.META_DATA_PREFERENCE_ICON_URI;
import static com.android.settingslib.drawer.TileUtils.META_DATA_PREFERENCE_SUMMARY;
import static com.android.settingslib.drawer.TileUtils.META_DATA_PREFERENCE_SUMMARY_URI;
+import static com.android.settingslib.drawer.TileUtils.META_DATA_PREFERENCE_TITLE;
+import static com.android.settingslib.drawer.TileUtils.META_DATA_PREFERENCE_TITLE_URI;
import android.app.settings.SettingsEnums;
import android.content.ComponentName;
@@ -108,12 +110,12 @@
if (pref == null) {
return;
}
- pref.setTitle(tile.getTitle(activity.getApplicationContext()));
if (!TextUtils.isEmpty(key)) {
pref.setKey(key);
} else {
pref.setKey(getDashboardKeyForTile(tile));
}
+ bindTitle(pref, tile);
bindSummary(pref, tile);
bindIcon(pref, tile, forceRoundedIcon);
final Bundle metadata = tile.getMetaData();
@@ -168,6 +170,28 @@
launchIntentOrSelectProfile(activity, tile, intent, SettingsEnums.DASHBOARD_SUMMARY);
}
+ private void bindTitle(Preference preference, Tile tile) {
+ final CharSequence title = tile.getTitle(mContext.getApplicationContext());
+ if (title != null) {
+ preference.setTitle(title);
+ return;
+ }
+ if (tile.getMetaData() != null && tile.getMetaData().containsKey(
+ META_DATA_PREFERENCE_TITLE_URI)) {
+ // Set a placeholder title before starting to fetch real title, this is necessary
+ // to avoid preference height change.
+ preference.setTitle(R.string.summary_placeholder);
+
+ ThreadUtils.postOnBackgroundThread(() -> {
+ final Map<String, IContentProvider> providerMap = new ArrayMap<>();
+ final String uri = tile.getMetaData().getString(META_DATA_PREFERENCE_TITLE_URI);
+ final String titleFromUri = TileUtils.getTextFromUri(
+ mContext, uri, providerMap, META_DATA_PREFERENCE_TITLE);
+ ThreadUtils.postOnMainThread(() -> preference.setTitle(titleFromUri));
+ });
+ }
+ }
+
private void bindSummary(Preference preference, Tile tile) {
final CharSequence summary = tile.getSummary(mContext);
if (summary != null) {
@@ -247,7 +271,7 @@
final UserHandle userHandle = intent.getParcelableExtra(EXTRA_USER);
if (userHandle != null && tile.userHandle.contains(userHandle)) {
mMetricsFeatureProvider.logDashboardStartIntent(
- mContext, intent, sourceMetricCategory);
+ mContext, intent, sourceMetricCategory);
activity.startActivityForResultAsUser(intent, 0, userHandle);
} else {
ProfileSelectDialog.show(activity.getSupportFragmentManager(), tile);
diff --git a/src/com/android/settings/dashboard/SummaryLoader.java b/src/com/android/settings/dashboard/SummaryLoader.java
index 059cb93..a1833f8 100644
--- a/src/com/android/settings/dashboard/SummaryLoader.java
+++ b/src/com/android/settings/dashboard/SummaryLoader.java
@@ -206,22 +206,6 @@
});
}
- /**
- * Updates all tile's summary to latest cached version. This is necessary to handle the case
- * where category is updated after summary change.
- */
- public void updateSummaryToCache(DashboardCategory category) {
- if (category == null) {
- return;
- }
- for (Tile tile : category.getTiles()) {
- final String key = mDashboardFeatureProvider.getDashboardKeyForTile(tile);
- if (mSummaryTextMap.containsKey(key)) {
- tile.overrideSummary(mSummaryTextMap.get(key));
- }
- }
- }
-
private synchronized void setListeningW(boolean listening) {
if (mWorkerListening == listening) {
return;
diff --git a/src/com/android/settings/datausage/BillingCycleSettings.java b/src/com/android/settings/datausage/BillingCycleSettings.java
index 87b8198..9c46d39 100644
--- a/src/com/android/settings/datausage/BillingCycleSettings.java
+++ b/src/com/android/settings/datausage/BillingCycleSettings.java
@@ -118,8 +118,6 @@
mEnableDataLimit = (SwitchPreference) findPreference(KEY_SET_DATA_LIMIT);
mEnableDataLimit.setOnPreferenceChangeListener(this);
mDataLimit = findPreference(KEY_DATA_LIMIT);
-
- mFooterPreferenceMixin.createFooterPreference().setTitle(R.string.data_warning_footnote);
}
@Override
diff --git a/src/com/android/settings/datausage/DataSaverBackend.java b/src/com/android/settings/datausage/DataSaverBackend.java
index de28b07..db92659 100644
--- a/src/com/android/settings/datausage/DataSaverBackend.java
+++ b/src/com/android/settings/datausage/DataSaverBackend.java
@@ -199,7 +199,8 @@
}
@Override
- public void onSubscriptionOverride(int subId, int overrideMask, int overrideValue) {
+ public void onSubscriptionOverride(int subId, int overrideMask, int overrideValue,
+ long networkTypeMask) {
}
};
diff --git a/src/com/android/settings/datausage/DataSaverSummary.java b/src/com/android/settings/datausage/DataSaverSummary.java
index 1ab8c79..a2106d9 100644
--- a/src/com/android/settings/datausage/DataSaverSummary.java
+++ b/src/com/android/settings/datausage/DataSaverSummary.java
@@ -63,8 +63,6 @@
super.onCreate(icicle);
addPreferencesFromResource(R.xml.data_saver);
- mFooterPreferenceMixin.createFooterPreference()
- .setTitle(com.android.internal.R.string.data_saver_description);
mUnrestrictedAccess = findPreference(KEY_UNRESTRICTED_ACCESS);
mApplicationsState = ApplicationsState.getInstance(
(Application) getContext().getApplicationContext());
diff --git a/src/com/android/settings/datetime/timezone/OWNERS b/src/com/android/settings/datetime/timezone/OWNERS
index eac0604..02cf23c 100644
--- a/src/com/android/settings/datetime/timezone/OWNERS
+++ b/src/com/android/settings/datetime/timezone/OWNERS
@@ -1,7 +1,7 @@
# Default reviewers for this and subdirectories.
vichang@google.com
+tobiast@google.com
nfuller@google.com
# Emergency approvers in case the above are not available
-pszczepaniak@google.com
narayan@google.com
diff --git a/src/com/android/settings/datetime/timezone/TimeZoneInfoPreferenceController.java b/src/com/android/settings/datetime/timezone/TimeZoneInfoPreferenceController.java
index a819f10..80cefb6 100644
--- a/src/com/android/settings/datetime/timezone/TimeZoneInfoPreferenceController.java
+++ b/src/com/android/settings/datetime/timezone/TimeZoneInfoPreferenceController.java
@@ -29,20 +29,19 @@
import androidx.preference.Preference;
import com.android.settings.R;
-import com.android.settingslib.widget.FooterPreference;
+import com.android.settings.core.BasePreferenceController;
import java.util.Date;
-public class TimeZoneInfoPreferenceController extends BaseTimeZonePreferenceController {
+public class TimeZoneInfoPreferenceController extends BasePreferenceController {
- private static final String PREFERENCE_KEY = FooterPreference.KEY_FOOTER;
@VisibleForTesting
Date mDate;
private TimeZoneInfo mTimeZoneInfo;
private final DateFormat mDateFormat;
- public TimeZoneInfoPreferenceController(Context context) {
- super(context, PREFERENCE_KEY);
+ public TimeZoneInfoPreferenceController(Context context, String key) {
+ super(context, key);
mDateFormat = DateFormat.getDateInstance(SimpleDateFormat.LONG);
mDateFormat.setContext(DisplayContext.CAPITALIZATION_NONE);
mDate = new Date();
@@ -50,24 +49,18 @@
@Override
public int getAvailabilityStatus() {
- return AVAILABLE;
+ return mTimeZoneInfo != null ? AVAILABLE_UNSEARCHABLE : UNSUPPORTED_ON_DEVICE;
}
@Override
- public void updateState(Preference preference) {
- CharSequence formattedTimeZone = mTimeZoneInfo == null ? "" : formatInfo(mTimeZoneInfo);
- preference.setTitle(formattedTimeZone);
- preference.setVisible(mTimeZoneInfo != null);
+ public CharSequence getSummary() {
+ return mTimeZoneInfo == null ? "" : formatInfo(mTimeZoneInfo);
}
public void setTimeZoneInfo(TimeZoneInfo timeZoneInfo) {
mTimeZoneInfo = timeZoneInfo;
}
- public TimeZoneInfo getTimeZoneInfo() {
- return mTimeZoneInfo;
- }
-
private CharSequence formatOffsetAndName(TimeZoneInfo item) {
String name = item.getGenericName();
if (name == null) {
@@ -130,5 +123,4 @@
} while (transition != null);
return transition;
}
-
}
diff --git a/src/com/android/settings/development/BubbleGlobalPreferenceController.java b/src/com/android/settings/development/BubbleGlobalPreferenceController.java
index 86d7be1..2f22d09 100644
--- a/src/com/android/settings/development/BubbleGlobalPreferenceController.java
+++ b/src/com/android/settings/development/BubbleGlobalPreferenceController.java
@@ -16,8 +16,6 @@
package com.android.settings.development;
-import static android.provider.Settings.Secure.NOTIFICATION_BUBBLES;
-
import android.content.Context;
import android.provider.Settings;
@@ -42,7 +40,7 @@
@Override
public String getPreferenceKey() {
- return NOTIFICATION_BUBBLES;
+ return Settings.Global.NOTIFICATION_BUBBLES;
}
@Override
@@ -64,12 +62,12 @@
}
private boolean isEnabled() {
- return Settings.Secure.getInt(mContext.getContentResolver(),
- NOTIFICATION_BUBBLES, OFF) == ON;
+ return Settings.Global.getInt(mContext.getContentResolver(),
+ Settings.Global.NOTIFICATION_BUBBLES, OFF) == ON;
}
private void writeSetting(boolean isEnabled) {
- Settings.Secure.putInt(mContext.getContentResolver(),
- NOTIFICATION_BUBBLES, isEnabled ? ON : OFF);
+ Settings.Global.putInt(mContext.getContentResolver(),
+ Settings.Global.NOTIFICATION_BUBBLES, isEnabled ? ON : OFF);
}
}
diff --git a/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java b/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java
index f384d85..9bd8516 100644
--- a/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java
+++ b/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java
@@ -27,6 +27,7 @@
import android.content.Intent;
import android.content.IntentFilter;
import android.os.Bundle;
+import android.os.SystemProperties;
import android.os.UserManager;
import android.provider.SearchIndexableResource;
import android.util.Log;
@@ -136,6 +137,20 @@
}
};
+ private final Runnable mSystemPropertiesChanged = new Runnable() {
+ @Override
+ public void run() {
+ synchronized (this) {
+ Activity activity = getActivity();
+ if (activity != null) {
+ activity.runOnUiThread(() -> {
+ updatePreferenceStates();
+ });
+ }
+ }
+ }
+ };
+
public DevelopmentSettingsDashboardFragment() {
super(UserManager.DISALLOW_DEBUGGING_FEATURES);
}
@@ -184,7 +199,7 @@
public View onCreateView(LayoutInflater inflater, ViewGroup container,
Bundle savedInstanceState) {
registerReceivers();
-
+ SystemProperties.addChangeCallback(mSystemPropertiesChanged);
final BluetoothAdapter adapter = BluetoothAdapter.getDefaultAdapter();
if (adapter != null) {
adapter.getProfileProxy(getActivity(), mBluetoothA2dpServiceListener,
@@ -203,6 +218,7 @@
adapter.closeProfileProxy(BluetoothProfile.A2DP, mBluetoothA2dp);
mBluetoothA2dp = null;
}
+ SystemProperties.removeChangeCallback(mSystemPropertiesChanged);
}
@Override
@@ -494,8 +510,6 @@
controllers.add(new DefaultLaunchPreferenceController(context, "inactive_apps"));
controllers.add(new AutofillLoggingLevelPreferenceController(context, lifecycle));
controllers.add(new AutofillResetOptionsPreferenceController(context));
- controllers.add(new TrustAgentsExtendUnlockPreferenceController(context));
- controllers.add(new TrustLostLocksScreenPreferenceController(context));
return controllers;
}
diff --git a/src/com/android/settings/development/OWNERS b/src/com/android/settings/development/OWNERS
index 9ffcc47..ecdc4df 100644
--- a/src/com/android/settings/development/OWNERS
+++ b/src/com/android/settings/development/OWNERS
@@ -1,8 +1,9 @@
# Default reviewers for this and subdirectories.
-asargent@google.com
-dling@google.com
-zhfan@google.com
+edgarwang@google.com
+emilychuang@google.com
+rafftsai@google.com
+tmfang@google.com
+
# Emergency approvers in case the above are not available
-asapperstein@google.com
-miket@google.com
+zhfan@google.com
diff --git a/src/com/android/settings/development/OemUnlockPreferenceController.java b/src/com/android/settings/development/OemUnlockPreferenceController.java
index 529970a..f8a245f 100644
--- a/src/com/android/settings/development/OemUnlockPreferenceController.java
+++ b/src/com/android/settings/development/OemUnlockPreferenceController.java
@@ -22,11 +22,13 @@
import android.content.Context;
import android.content.Intent;
import android.content.res.Resources;
-import android.os.Build;
+import android.os.SystemProperties;
import android.os.UserHandle;
import android.os.UserManager;
import android.service.oemlock.OemLockManager;
import android.telephony.TelephonyManager;
+import android.text.TextUtils;
+import android.util.Log;
import androidx.annotation.VisibleForTesting;
import androidx.preference.Preference;
@@ -43,6 +45,9 @@
private static final String PREFERENCE_KEY = "oem_unlock_enable";
private static final String TAG = "OemUnlockPreferenceController";
+ private static final String OEM_UNLOCK_SUPPORTED_KEY = "ro.oem_unlock_supported";
+ private static final String UNSUPPORTED = "-9999";
+ private static final String SUPPORTED = "1";
private final OemLockManager mOemLockManager;
private final UserManager mUserManager;
@@ -55,8 +60,10 @@
DevelopmentSettingsDashboardFragment fragment) {
super(context);
- if (Build.IS_EMULATOR && Build.IS_ENG) {
+ if (!TextUtils.equals(SystemProperties.get(OEM_UNLOCK_SUPPORTED_KEY, UNSUPPORTED),
+ SUPPORTED)) {
mOemLockManager = null;
+ Log.w(TAG, "oem_unlock not supported.");
} else {
mOemLockManager = (OemLockManager) context.getSystemService(Context.OEM_LOCK_SERVICE);
}
diff --git a/src/com/android/settings/development/TrustAgentsExtendUnlockPreferenceController.java b/src/com/android/settings/development/TrustAgentsExtendUnlockPreferenceController.java
deleted file mode 100644
index 0834f9b..0000000
--- a/src/com/android/settings/development/TrustAgentsExtendUnlockPreferenceController.java
+++ /dev/null
@@ -1,58 +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.development;
-
-import android.content.Context;
-import android.provider.Settings;
-
-import androidx.preference.Preference;
-import androidx.preference.SwitchPreference;
-
-import com.android.settings.core.PreferenceControllerMixin;
-import com.android.settingslib.development.DeveloperOptionsPreferenceController;
-
-public class TrustAgentsExtendUnlockPreferenceController extends
- DeveloperOptionsPreferenceController implements
- Preference.OnPreferenceChangeListener, PreferenceControllerMixin {
-
- private static final String KEY_TRUST_AGENTS_EXTEND_UNLOCK =
- "security_setting_trust_agents_extend_unlock";
-
- public TrustAgentsExtendUnlockPreferenceController(Context context) {
- super(context);
- }
-
- @Override
- public String getPreferenceKey() {
- return KEY_TRUST_AGENTS_EXTEND_UNLOCK;
- }
-
- @Override
- public boolean onPreferenceChange(Preference preference, Object newValue) {
- final boolean isEnabled = (Boolean) newValue;
- Settings.Secure.putInt(mContext.getContentResolver(),
- Settings.Secure.TRUST_AGENTS_EXTEND_UNLOCK, isEnabled ? 1 : 0);
- return true;
- }
-
- @Override
- public void updateState(Preference preference) {
- int trustAgentsExtendUnlock = Settings.Secure.getInt(mContext.getContentResolver(),
- Settings.Secure.TRUST_AGENTS_EXTEND_UNLOCK, 0);
- ((SwitchPreference) mPreference).setChecked(trustAgentsExtendUnlock != 0);
- }
-}
diff --git a/src/com/android/settings/development/TrustLostLocksScreenPreferenceController.java b/src/com/android/settings/development/TrustLostLocksScreenPreferenceController.java
deleted file mode 100644
index 3800fd6..0000000
--- a/src/com/android/settings/development/TrustLostLocksScreenPreferenceController.java
+++ /dev/null
@@ -1,58 +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.development;
-
-import android.content.Context;
-import android.provider.Settings;
-
-import androidx.preference.Preference;
-import androidx.preference.SwitchPreference;
-
-import com.android.settings.core.PreferenceControllerMixin;
-import com.android.settingslib.development.DeveloperOptionsPreferenceController;
-
-public class TrustLostLocksScreenPreferenceController
- extends DeveloperOptionsPreferenceController implements
- Preference.OnPreferenceChangeListener, PreferenceControllerMixin {
-
- private static final String KEY_TRUST_LOST_LOCKS_SCREEN =
- "security_setting_trust_lost_locks_screen";
-
- public TrustLostLocksScreenPreferenceController(Context context) {
- super(context);
- }
-
- @Override
- public String getPreferenceKey() {
- return KEY_TRUST_LOST_LOCKS_SCREEN;
- }
-
- @Override
- public boolean onPreferenceChange(Preference preference, Object newValue) {
- final boolean isEnabled = (Boolean) newValue;
- Settings.Secure.putInt(mContext.getContentResolver(),
- Settings.Secure.LOCK_SCREEN_WHEN_TRUST_LOST, isEnabled ? 1 : 0);
- return true;
- }
-
- @Override
- public void updateState(Preference preference) {
- int lockOnTrustLost = Settings.Secure.getInt(mContext.getContentResolver(),
- Settings.Secure.LOCK_SCREEN_WHEN_TRUST_LOST, 0);
- ((SwitchPreference) mPreference).setChecked(lockOnTrustLost != 0);
- }
-}
diff --git a/src/com/android/settings/development/featureflags/FeatureFlagFooterPreferenceController.java b/src/com/android/settings/development/featureflags/FeatureFlagFooterPreferenceController.java
deleted file mode 100644
index a0d7036..0000000
--- a/src/com/android/settings/development/featureflags/FeatureFlagFooterPreferenceController.java
+++ /dev/null
@@ -1,50 +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.development.featureflags;
-
-import android.content.Context;
-
-import com.android.settings.R;
-import com.android.settings.core.BasePreferenceController;
-import com.android.settingslib.core.lifecycle.LifecycleObserver;
-import com.android.settingslib.core.lifecycle.events.OnStart;
-import com.android.settingslib.widget.FooterPreferenceMixinCompat;
-
-public class FeatureFlagFooterPreferenceController extends BasePreferenceController
- implements LifecycleObserver, OnStart {
-
- private FooterPreferenceMixinCompat mFooterMixin;
-
- public FeatureFlagFooterPreferenceController(Context context) {
- super(context, "feature_flag_footer_pref");
- }
-
- public void setFooterMixin(FooterPreferenceMixinCompat mixin) {
- mFooterMixin = mixin;
- }
-
- @Override
- public int getAvailabilityStatus() {
- return AVAILABLE;
- }
-
- @Override
- public void onStart() {
- mFooterMixin.createFooterPreference()
- .setTitle(R.string.experimental_category_title);
- }
-}
diff --git a/src/com/android/settings/development/featureflags/FeatureFlagsDashboard.java b/src/com/android/settings/development/featureflags/FeatureFlagsDashboard.java
index 613fb17..f0d7f1c 100644
--- a/src/com/android/settings/development/featureflags/FeatureFlagsDashboard.java
+++ b/src/com/android/settings/development/featureflags/FeatureFlagsDashboard.java
@@ -24,8 +24,6 @@
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settings.search.Indexable;
-import com.android.settingslib.core.AbstractPreferenceController;
-import com.android.settingslib.core.lifecycle.Lifecycle;
import com.android.settingslib.development.DevelopmentSettingsEnabler;
import com.android.settingslib.search.SearchIndexable;
@@ -55,7 +53,6 @@
@Override
public void onAttach(Context context) {
super.onAttach(context);
- use(FeatureFlagFooterPreferenceController.class).setFooterMixin(mFooterPreferenceMixin);
}
@Override
@@ -63,23 +60,6 @@
return 0;
}
- @Override
- protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
- return buildPrefControllers(context, getSettingsLifecycle());
- }
-
- private static List<AbstractPreferenceController> buildPrefControllers(Context context,
- Lifecycle lifecycle) {
- final List<AbstractPreferenceController> controllers = new ArrayList<>();
- final FeatureFlagFooterPreferenceController footerController =
- new FeatureFlagFooterPreferenceController(context);
- if (lifecycle != null) {
- lifecycle.addObserver(footerController);
- }
- controllers.add(footerController);
- return controllers;
- }
-
public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
new BaseSearchIndexProvider() {
@Override
@@ -97,11 +77,5 @@
protected boolean isPageSearchEnabled(Context context) {
return DevelopmentSettingsEnabler.isDevelopmentSettingsEnabled(context);
}
-
- @Override
- public List<AbstractPreferenceController> createPreferenceControllers(
- Context context) {
- return buildPrefControllers(context, null /* lifecycle */);
- }
};
}
diff --git a/src/com/android/settings/development/gamedriver/GameDriverFooterPreferenceController.java b/src/com/android/settings/development/gamedriver/GameDriverFooterPreferenceController.java
index 12156df..1ad476b 100644
--- a/src/com/android/settings/development/gamedriver/GameDriverFooterPreferenceController.java
+++ b/src/com/android/settings/development/gamedriver/GameDriverFooterPreferenceController.java
@@ -26,7 +26,6 @@
import android.provider.Settings;
import androidx.annotation.VisibleForTesting;
-import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
import com.android.settings.core.BasePreferenceController;
@@ -40,7 +39,7 @@
*/
public class GameDriverFooterPreferenceController extends BasePreferenceController
implements GameDriverContentObserver.OnGameDriverContentChangedListener, LifecycleObserver,
- OnStart, OnStop {
+ OnStart, OnStop {
private final ContentResolver mContentResolver;
@VisibleForTesting
@@ -48,8 +47,8 @@
private FooterPreference mPreference;
- public GameDriverFooterPreferenceController(Context context) {
- super(context, FooterPreference.KEY_FOOTER);
+ public GameDriverFooterPreferenceController(Context context, String key) {
+ super(context, key);
mContentResolver = context.getContentResolver();
mGameDriverContentObserver =
new GameDriverContentObserver(new Handler(Looper.getMainLooper()), this);
@@ -58,8 +57,8 @@
@Override
public int getAvailabilityStatus() {
return Settings.Global.getInt(
- mContentResolver, Settings.Global.GAME_DRIVER_ALL_APPS, GAME_DRIVER_DEFAULT)
- == GAME_DRIVER_OFF
+ mContentResolver, Settings.Global.GAME_DRIVER_ALL_APPS, GAME_DRIVER_DEFAULT)
+ == GAME_DRIVER_OFF
? AVAILABLE_UNSEARCHABLE
: CONDITIONALLY_UNAVAILABLE;
}
@@ -81,11 +80,6 @@
}
@Override
- public void updateState(Preference preference) {
- preference.setVisible(isAvailable());
- }
-
- @Override
public void onGameDriverContentChanged() {
updateState(mPreference);
}
diff --git a/src/com/android/settings/deviceinfo/OWNERS b/src/com/android/settings/deviceinfo/OWNERS
new file mode 100644
index 0000000..97e431a
--- /dev/null
+++ b/src/com/android/settings/deviceinfo/OWNERS
@@ -0,0 +1,5 @@
+# Default reviewers for this and subdirectories.
+andychou@google.com
+bonianchen@google.com
+
+# Emergency approvers in case the above are not available
diff --git a/src/com/android/settings/deviceinfo/PrivateVolumeSettings.java b/src/com/android/settings/deviceinfo/PrivateVolumeSettings.java
index e68f851..8e6158b 100644
--- a/src/com/android/settings/deviceinfo/PrivateVolumeSettings.java
+++ b/src/com/android/settings/deviceinfo/PrivateVolumeSettings.java
@@ -424,41 +424,41 @@
public boolean onOptionsItemSelected(MenuItem item) {
final Context context = getActivity();
final Bundle args = new Bundle();
- switch (item.getItemId()) {
- case R.id.storage_rename:
- RenameFragment.show(this, mVolume);
- return true;
- case R.id.storage_mount:
- new MountTask(context, mVolume).execute();
- return true;
- case R.id.storage_unmount:
- args.putString(VolumeInfo.EXTRA_VOLUME_ID, mVolume.getId());
- new SubSettingLauncher(context)
- .setDestination(PrivateVolumeUnmount.class.getCanonicalName())
- .setTitleRes(R.string.storage_menu_unmount)
- .setSourceMetricsCategory(getMetricsCategory())
- .setArguments(args)
- .launch();
- return true;
- case R.id.storage_format:
- args.putString(VolumeInfo.EXTRA_VOLUME_ID, mVolume.getId());
- new SubSettingLauncher(context)
- .setDestination(PrivateVolumeFormat.class.getCanonicalName())
- .setTitleRes(R.string.storage_menu_format)
- .setSourceMetricsCategory(getMetricsCategory())
- .setArguments(args)
- .launch();
- return true;
- case R.id.storage_migrate:
- final Intent intent = new Intent(context, StorageWizardMigrateConfirm.class);
- intent.putExtra(VolumeInfo.EXTRA_VOLUME_ID, mVolume.getId());
- startActivity(intent);
- return true;
- case R.id.storage_free:
- final Intent deletion_helper_intent =
- new Intent(StorageManager.ACTION_MANAGE_STORAGE);
- startActivity(deletion_helper_intent);
- return true;
+ int i = item.getItemId();
+ if (i == R.id.storage_rename) {
+ RenameFragment.show(this, mVolume);
+ return true;
+ } else if (i == R.id.storage_mount) {
+ new MountTask(context, mVolume).execute();
+ return true;
+ } else if (i == R.id.storage_unmount) {
+ args.putString(VolumeInfo.EXTRA_VOLUME_ID, mVolume.getId());
+ new SubSettingLauncher(context)
+ .setDestination(PrivateVolumeUnmount.class.getCanonicalName())
+ .setTitleRes(R.string.storage_menu_unmount)
+ .setSourceMetricsCategory(getMetricsCategory())
+ .setArguments(args)
+ .launch();
+ return true;
+ } else if (i == R.id.storage_format) {
+ args.putString(VolumeInfo.EXTRA_VOLUME_ID, mVolume.getId());
+ new SubSettingLauncher(context)
+ .setDestination(PrivateVolumeFormat.class.getCanonicalName())
+ .setTitleRes(R.string.storage_menu_format)
+ .setSourceMetricsCategory(getMetricsCategory())
+ .setArguments(args)
+ .launch();
+ return true;
+ } else if (i == R.id.storage_migrate) {
+ final Intent intent = new Intent(context, StorageWizardMigrateConfirm.class);
+ intent.putExtra(VolumeInfo.EXTRA_VOLUME_ID, mVolume.getId());
+ startActivity(intent);
+ return true;
+ } else if (i == R.id.storage_free) {
+ final Intent deletion_helper_intent =
+ new Intent(StorageManager.ACTION_MANAGE_STORAGE);
+ startActivity(deletion_helper_intent);
+ return true;
}
return super.onOptionsItemSelected(item);
}
@@ -476,56 +476,42 @@
itemTitleId = 0;
}
Intent intent = null;
- switch (itemTitleId) {
- case R.string.storage_detail_apps: {
- Bundle args = new Bundle();
- args.putString(ManageApplications.EXTRA_CLASSNAME,
- StorageUseActivity.class.getName());
- args.putString(ManageApplications.EXTRA_VOLUME_UUID, mVolume.getFsUuid());
- args.putString(ManageApplications.EXTRA_VOLUME_NAME, mVolume.getDescription());
- args.putInt(
- ManageApplications.EXTRA_STORAGE_TYPE,
- ManageApplications.STORAGE_TYPE_LEGACY);
- intent = new SubSettingLauncher(getActivity())
- .setDestination(ManageApplications.class.getName())
- .setArguments(args)
- .setTitleRes(R.string.apps_storage)
- .setSourceMetricsCategory(getMetricsCategory())
- .toIntent();
-
- } break;
- case R.string.storage_detail_images: {
- intent = getIntentForStorage(AUTHORITY_MEDIA, "images_root");
- } break;
- case R.string.storage_detail_videos: {
- intent = getIntentForStorage(AUTHORITY_MEDIA, "videos_root");
- } break;
- case R.string.storage_detail_audio: {
- intent = getIntentForStorage(AUTHORITY_MEDIA, "audio_root");
- } break;
- case R.string.storage_detail_system: {
- SystemInfoFragment.show(this);
- return true;
-
- }
- case R.string.storage_detail_other: {
- OtherInfoFragment.show(this, mStorageManager.getBestVolumeDescription(mVolume),
- mSharedVolume, userId);
- return true;
-
- }
- case R.string.storage_detail_cached: {
- ConfirmClearCacheFragment.show(this);
- return true;
-
- }
- case R.string.storage_menu_explore: {
- intent = mSharedVolume.buildBrowseIntent();
- } break;
- case 0: {
- UserInfoFragment.show(this, pref.getTitle(), pref.getSummary());
- return true;
- }
+ if (itemTitleId == R.string.storage_detail_apps) {
+ Bundle args = new Bundle();
+ args.putString(ManageApplications.EXTRA_CLASSNAME,
+ StorageUseActivity.class.getName());
+ args.putString(ManageApplications.EXTRA_VOLUME_UUID, mVolume.getFsUuid());
+ args.putString(ManageApplications.EXTRA_VOLUME_NAME, mVolume.getDescription());
+ args.putInt(
+ ManageApplications.EXTRA_STORAGE_TYPE,
+ ManageApplications.STORAGE_TYPE_LEGACY);
+ intent = new SubSettingLauncher(getActivity())
+ .setDestination(ManageApplications.class.getName())
+ .setArguments(args)
+ .setTitleRes(R.string.apps_storage)
+ .setSourceMetricsCategory(getMetricsCategory())
+ .toIntent();
+ } else if (itemTitleId == R.string.storage_detail_images) {
+ intent = getIntentForStorage(AUTHORITY_MEDIA, "images_root");
+ } else if (itemTitleId == R.string.storage_detail_videos) {
+ intent = getIntentForStorage(AUTHORITY_MEDIA, "videos_root");
+ } else if (itemTitleId == R.string.storage_detail_audio) {
+ intent = getIntentForStorage(AUTHORITY_MEDIA, "audio_root");
+ } else if (itemTitleId == R.string.storage_detail_system) {
+ SystemInfoFragment.show(this);
+ return true;
+ } else if (itemTitleId == R.string.storage_detail_other) {
+ OtherInfoFragment.show(this, mStorageManager.getBestVolumeDescription(mVolume),
+ mSharedVolume, userId);
+ return true;
+ } else if (itemTitleId == R.string.storage_detail_cached) {
+ ConfirmClearCacheFragment.show(this);
+ return true;
+ } else if (itemTitleId == R.string.storage_menu_explore) {
+ intent = mSharedVolume.buildBrowseIntent();
+ } else if (itemTitleId == 0) {
+ UserInfoFragment.show(this, pref.getTitle(), pref.getSummary());
+ return true;
}
if (intent != null) {
@@ -569,75 +555,64 @@
} catch (NumberFormatException e) {
itemTitleId = 0;
}
- switch (itemTitleId) {
- case R.string.storage_detail_system: {
- updatePreference(item, mSystemSize);
- accountedSize += mSystemSize;
- if (LOGV) Log.v(TAG, "mSystemSize: " + mSystemSize
- + " accountedSize: " + accountedSize);
- } break;
- case R.string.storage_detail_apps: {
- updatePreference(item, details.appsSize.get(userId));
- accountedSize += details.appsSize.get(userId);
- if (LOGV) Log.v(TAG, "appsSize: " + details.appsSize.get(userId)
- + " accountedSize: " + accountedSize);
- } break;
- case R.string.storage_detail_images: {
- final long imagesSize = totalValues(details, userId,
- Environment.DIRECTORY_DCIM, Environment.DIRECTORY_PICTURES);
- updatePreference(item, imagesSize);
- accountedSize += imagesSize;
- if (LOGV) Log.v(TAG, "imagesSize: " + imagesSize
- + " accountedSize: " + accountedSize);
- } break;
- case R.string.storage_detail_videos: {
- final long videosSize = totalValues(details, userId,
- Environment.DIRECTORY_MOVIES);
- updatePreference(item, videosSize);
- accountedSize += videosSize;
- if (LOGV) Log.v(TAG, "videosSize: " + videosSize
- + " accountedSize: " + accountedSize);
- } break;
- case R.string.storage_detail_audio: {
- final long audioSize = totalValues(details, userId,
- Environment.DIRECTORY_MUSIC,
- Environment.DIRECTORY_ALARMS, Environment.DIRECTORY_NOTIFICATIONS,
- Environment.DIRECTORY_RINGTONES, Environment.DIRECTORY_PODCASTS);
- updatePreference(item, audioSize);
- accountedSize += audioSize;
- if (LOGV) Log.v(TAG, "audioSize: " + audioSize
- + " accountedSize: " + accountedSize);
- } break;
- case R.string.storage_detail_other: {
- final long downloadsSize = totalValues(details, userId,
- Environment.DIRECTORY_DOWNLOADS);
- final long miscSize = details.miscSize.get(userId);
- totalDownloadsSize += downloadsSize;
- totalMiscSize += miscSize;
- accountedSize += miscSize + downloadsSize;
-
- if (LOGV)
- Log.v(TAG, "miscSize for " + userId + ": " + miscSize + "(total: "
- + totalMiscSize + ") \ndownloadsSize: " + downloadsSize + "(total: "
- + totalDownloadsSize + ") accountedSize: " + accountedSize);
-
- // Cannot display 'Other' until all known items are accounted for.
- otherItem = item;
- } break;
- case R.string.storage_detail_cached: {
- updatePreference(item, details.cacheSize);
- accountedSize += details.cacheSize;
- if (LOGV)
- Log.v(TAG, "cacheSize: " + details.cacheSize + " accountedSize: "
- + accountedSize);
- } break;
- case 0: {
- final long userSize = details.usersSize.get(userId);
- updatePreference(item, userSize);
- accountedSize += userSize;
- if (LOGV) Log.v(TAG, "userSize: " + userSize
- + " accountedSize: " + accountedSize);
- } break;
+ // Cannot display 'Other' until all known items are accounted for.
+ if (itemTitleId == R.string.storage_detail_system) {
+ updatePreference(item, mSystemSize);
+ accountedSize += mSystemSize;
+ if (LOGV) Log.v(TAG, "mSystemSize: " + mSystemSize
+ + " accountedSize: " + accountedSize);
+ } else if (itemTitleId == R.string.storage_detail_apps) {
+ updatePreference(item, details.appsSize.get(userId));
+ accountedSize += details.appsSize.get(userId);
+ if (LOGV) Log.v(TAG, "appsSize: " + details.appsSize.get(userId)
+ + " accountedSize: " + accountedSize);
+ } else if (itemTitleId == R.string.storage_detail_images) {
+ final long imagesSize = totalValues(details, userId,
+ Environment.DIRECTORY_DCIM, Environment.DIRECTORY_PICTURES);
+ updatePreference(item, imagesSize);
+ accountedSize += imagesSize;
+ if (LOGV) Log.v(TAG, "imagesSize: " + imagesSize
+ + " accountedSize: " + accountedSize);
+ } else if (itemTitleId == R.string.storage_detail_videos) {
+ final long videosSize = totalValues(details, userId,
+ Environment.DIRECTORY_MOVIES);
+ updatePreference(item, videosSize);
+ accountedSize += videosSize;
+ if (LOGV) Log.v(TAG, "videosSize: " + videosSize
+ + " accountedSize: " + accountedSize);
+ } else if (itemTitleId == R.string.storage_detail_audio) {
+ final long audioSize = totalValues(details, userId,
+ Environment.DIRECTORY_MUSIC,
+ Environment.DIRECTORY_ALARMS, Environment.DIRECTORY_NOTIFICATIONS,
+ Environment.DIRECTORY_RINGTONES, Environment.DIRECTORY_PODCASTS);
+ updatePreference(item, audioSize);
+ accountedSize += audioSize;
+ if (LOGV) Log.v(TAG, "audioSize: " + audioSize
+ + " accountedSize: " + accountedSize);
+ } else if (itemTitleId == R.string.storage_detail_other) {
+ final long downloadsSize = totalValues(details, userId,
+ Environment.DIRECTORY_DOWNLOADS);
+ final long miscSize = details.miscSize.get(userId);
+ totalDownloadsSize += downloadsSize;
+ totalMiscSize += miscSize;
+ accountedSize += miscSize + downloadsSize;
+ if (LOGV)
+ Log.v(TAG, "miscSize for " + userId + ": " + miscSize + "(total: "
+ + totalMiscSize + ") \ndownloadsSize: " + downloadsSize + "(total: "
+ + totalDownloadsSize + ") accountedSize: " + accountedSize);
+ otherItem = item;
+ } else if (itemTitleId == R.string.storage_detail_cached) {
+ updatePreference(item, details.cacheSize);
+ accountedSize += details.cacheSize;
+ if (LOGV)
+ Log.v(TAG, "cacheSize: " + details.cacheSize + " accountedSize: "
+ + accountedSize);
+ } else if (itemTitleId == 0) {
+ final long userSize = details.usersSize.get(userId);
+ updatePreference(item, userSize);
+ accountedSize += userSize;
+ if (LOGV) Log.v(TAG, "userSize: " + userSize
+ + " accountedSize: " + accountedSize);
}
}
if (otherItem != null) {
diff --git a/src/com/android/settings/deviceinfo/StorageDashboardFragment.java b/src/com/android/settings/deviceinfo/StorageDashboardFragment.java
index c9cec57..9dab2bd 100644
--- a/src/com/android/settings/deviceinfo/StorageDashboardFragment.java
+++ b/src/com/android/settings/deviceinfo/StorageDashboardFragment.java
@@ -66,7 +66,6 @@
private static final int STORAGE_JOB_ID = 0;
private static final int ICON_JOB_ID = 1;
private static final int VOLUME_SIZE_JOB_ID = 2;
- private static final int OPTIONS_MENU_MIGRATE_DATA = 100;
private VolumeInfo mVolume;
private PrivateStorageInfo mStorageInfo;
@@ -139,6 +138,7 @@
}
private void onReceivedSizes() {
+ boolean stopLoading = false;
if (mStorageInfo != null) {
long privateUsedBytes = mStorageInfo.totalBytes - mStorageInfo.freeBytes;
mSummaryController.updateBytes(privateUsedBytes, mStorageInfo.totalBytes);
@@ -152,18 +152,21 @@
userController.setTotalSize(mStorageInfo.totalBytes);
}
}
+ stopLoading = true;
+
}
- if (mAppsResult == null) {
- return;
+ if (mAppsResult != null) {
+ mPreferenceController.onLoadFinished(mAppsResult, UserHandle.myUserId());
+ updateSecondaryUserControllers(mSecondaryUsers, mAppsResult);
+ stopLoading = true;
}
- mPreferenceController.onLoadFinished(mAppsResult, UserHandle.myUserId());
- updateSecondaryUserControllers(mSecondaryUsers, mAppsResult);
-
// setLoading always causes a flicker, so let's avoid doing it.
- if (getView().findViewById(R.id.loading_container).getVisibility() == View.VISIBLE) {
- setLoading(false, true);
+ if (stopLoading) {
+ if (getView().findViewById(R.id.loading_container).getVisibility() == View.VISIBLE) {
+ setLoading(false, true);
+ }
}
}
diff --git a/src/com/android/settings/display/AdaptiveSleepSettings.java b/src/com/android/settings/display/AdaptiveSleepSettings.java
index 66e20b4..09e558b 100644
--- a/src/com/android/settings/display/AdaptiveSleepSettings.java
+++ b/src/com/android/settings/display/AdaptiveSleepSettings.java
@@ -44,13 +44,7 @@
@Override
public void onCreate(Bundle icicle) {
super.onCreate(icicle);
- final FooterPreference footerPreference =
- mFooterPreferenceMixin.createFooterPreference();
mContext = getContext();
-
- footerPreference.setIcon(R.drawable.ic_privacy_shield_24dp);
- footerPreference.setTitle(R.string.adaptive_sleep_privacy);
-
Preference permissionPreference = findPreference(
AdaptiveSleepPermissionPreferenceController.PREF_NAME);
if (permissionPreference != null) {
diff --git a/src/com/android/settings/display/AutoBrightnessPreferenceController.java b/src/com/android/settings/display/AutoBrightnessPreferenceController.java
index 0018d84..1ea65fd 100644
--- a/src/com/android/settings/display/AutoBrightnessPreferenceController.java
+++ b/src/com/android/settings/display/AutoBrightnessPreferenceController.java
@@ -18,17 +18,34 @@
import static android.provider.Settings.System.SCREEN_BRIGHTNESS_MODE_MANUAL;
import android.content.Context;
+import android.database.ContentObserver;
+import android.os.Handler;
+import android.os.Looper;
import android.provider.Settings;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+
import com.android.settings.R;
import com.android.settings.core.TogglePreferenceController;
+import com.android.settingslib.core.lifecycle.LifecycleObserver;
+import com.android.settingslib.core.lifecycle.events.OnStart;
+import com.android.settingslib.core.lifecycle.events.OnStop;
-
-public class AutoBrightnessPreferenceController extends TogglePreferenceController {
-
+public class AutoBrightnessPreferenceController extends TogglePreferenceController implements
+ LifecycleObserver, OnStart, OnStop {
private final String SYSTEM_KEY = SCREEN_BRIGHTNESS_MODE;
private final int DEFAULT_VALUE = SCREEN_BRIGHTNESS_MODE_MANUAL;
+ private Preference mPreference;
+ private ContentObserver mContentObserver =
+ new ContentObserver(new Handler(Looper.getMainLooper())) {
+ @Override
+ public void onChange(boolean selfChange) {
+ refreshSummary(mPreference);
+ }
+ };
+
public AutoBrightnessPreferenceController(Context context, String key) {
super(context, key);
}
@@ -56,9 +73,27 @@
}
@Override
+ public void displayPreference(PreferenceScreen screen) {
+ super.displayPreference(screen);
+ mPreference = screen.findPreference(getPreferenceKey());
+ }
+
+ @Override
public CharSequence getSummary() {
return mContext.getText(isChecked()
? R.string.auto_brightness_summary_on
: R.string.auto_brightness_summary_off);
}
+
+ @Override
+ public void onStart() {
+ mContext.getContentResolver().registerContentObserver(
+ Settings.System.getUriFor(SYSTEM_KEY), false /* notifyForDescendants */,
+ mContentObserver);
+ }
+
+ @Override
+ public void onStop() {
+ mContext.getContentResolver().unregisterContentObserver(mContentObserver);
+ }
}
diff --git a/src/com/android/settings/display/AutoBrightnessSettings.java b/src/com/android/settings/display/AutoBrightnessSettings.java
index b0ab6b0..1dd1d62 100644
--- a/src/com/android/settings/display/AutoBrightnessSettings.java
+++ b/src/com/android/settings/display/AutoBrightnessSettings.java
@@ -37,8 +37,6 @@
@Override
public void onCreate(Bundle icicle) {
super.onCreate(icicle);
- mFooterPreferenceMixin.createFooterPreference()
- .setTitle(R.string.auto_brightness_description);
}
@Override
diff --git a/src/com/android/settings/display/DensityPreference.java b/src/com/android/settings/display/DensityPreference.java
index 61c5729..d30a42a 100644
--- a/src/com/android/settings/display/DensityPreference.java
+++ b/src/com/android/settings/display/DensityPreference.java
@@ -28,7 +28,7 @@
import com.android.settings.R;
import com.android.settings.Utils;
import com.android.settingslib.CustomEditTextPreferenceCompat;
-import com.android.settingslib.display.DisplayDensityUtils;
+import com.android.settingslib.display.DisplayDensityConfiguration;
import java.text.NumberFormat;
@@ -78,7 +78,7 @@
final int minDimensionPx = Math.min(metrics.widthPixels, metrics.heightPixels);
final int newDensity = DisplayMetrics.DENSITY_MEDIUM * minDimensionPx / newSwDp;
final int densityDpi = Math.max(newDensity, 120);
- DisplayDensityUtils.setForcedDisplayDensity(Display.DEFAULT_DISPLAY, densityDpi);
+ DisplayDensityConfiguration.setForcedDisplayDensity(Display.DEFAULT_DISPLAY, densityDpi);
} catch (Exception e) {
// TODO: display a message instead of silently failing.
Slog.e(TAG, "Couldn't save density", e);
diff --git a/src/com/android/settings/display/NightDisplayFooterPreferenceController.java b/src/com/android/settings/display/NightDisplayFooterPreferenceController.java
index 194f006..14fe25e 100644
--- a/src/com/android/settings/display/NightDisplayFooterPreferenceController.java
+++ b/src/com/android/settings/display/NightDisplayFooterPreferenceController.java
@@ -19,26 +19,17 @@
import android.content.Context;
import android.hardware.display.ColorDisplayManager;
-import androidx.preference.Preference;
-
-import com.android.settings.R;
import com.android.settings.core.BasePreferenceController;
-import com.android.settingslib.widget.FooterPreference;
public class NightDisplayFooterPreferenceController extends BasePreferenceController {
- public NightDisplayFooterPreferenceController(Context context) {
- super(context, FooterPreference.KEY_FOOTER);
+ public NightDisplayFooterPreferenceController(Context context, String key) {
+ super(context, key);
}
@Override
public int getAvailabilityStatus() {
- return ColorDisplayManager.isNightDisplayAvailable(mContext) ? AVAILABLE
- : UNSUPPORTED_ON_DEVICE;
- }
-
- @Override
- public void updateState(Preference preference) {
- preference.setTitle(R.string.night_display_text);
+ return ColorDisplayManager.isNightDisplayAvailable(mContext)
+ ? AVAILABLE_UNSEARCHABLE : UNSUPPORTED_ON_DEVICE;
}
}
diff --git a/src/com/android/settings/display/NightDisplaySettings.java b/src/com/android/settings/display/NightDisplaySettings.java
index 6441d71..9f32de2 100644
--- a/src/com/android/settings/display/NightDisplaySettings.java
+++ b/src/com/android/settings/display/NightDisplaySettings.java
@@ -31,7 +31,6 @@
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settings.search.Indexable;
-import com.android.settingslib.core.AbstractPreferenceController;
import com.android.settingslib.search.SearchIndexable;
import java.time.LocalTime;
@@ -176,17 +175,6 @@
return TAG;
}
- @Override
- protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
- return buildPreferenceControllers(context);
- }
-
- private static List<AbstractPreferenceController> buildPreferenceControllers(Context context) {
- final List<AbstractPreferenceController> controllers = new ArrayList<>(1);
- controllers.add(new NightDisplayFooterPreferenceController(context));
- return controllers;
- }
-
public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
new BaseSearchIndexProvider() {
@Override
@@ -203,11 +191,5 @@
protected boolean isPageSearchEnabled(Context context) {
return ColorDisplayManager.isNightDisplayAvailable(context);
}
-
- @Override
- public List<AbstractPreferenceController> createPreferenceControllers(
- Context context) {
- return buildPreferenceControllers(context);
- }
};
}
diff --git a/src/com/android/settings/display/ScreenZoomSettings.java b/src/com/android/settings/display/ScreenZoomSettings.java
index ad6c685..13c76ce 100644
--- a/src/com/android/settings/display/ScreenZoomSettings.java
+++ b/src/com/android/settings/display/ScreenZoomSettings.java
@@ -28,6 +28,7 @@
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settings.search.Indexable;
import com.android.settings.search.SearchIndexableRaw;
+import com.android.settingslib.display.DisplayDensityConfiguration;
import com.android.settingslib.display.DisplayDensityUtils;
import com.android.settingslib.search.SearchIndexable;
@@ -100,9 +101,9 @@
protected void commit() {
final int densityDpi = mValues[mCurrentIndex];
if (densityDpi == mDefaultDensity) {
- DisplayDensityUtils.clearForcedDisplayDensity(Display.DEFAULT_DISPLAY);
+ DisplayDensityConfiguration.clearForcedDisplayDensity(Display.DEFAULT_DISPLAY);
} else {
- DisplayDensityUtils.setForcedDisplayDensity(Display.DEFAULT_DISPLAY, densityDpi);
+ DisplayDensityConfiguration.setForcedDisplayDensity(Display.DEFAULT_DISPLAY, densityDpi);
}
}
diff --git a/src/com/android/settings/display/WallpaperPreferenceController.java b/src/com/android/settings/display/WallpaperPreferenceController.java
index 3ba39e9..b6af9bc 100644
--- a/src/com/android/settings/display/WallpaperPreferenceController.java
+++ b/src/com/android/settings/display/WallpaperPreferenceController.java
@@ -69,9 +69,7 @@
public String getKeywords() {
StringBuilder sb = new StringBuilder(mContext.getString(R.string.keywords_wallpaper));
if (areStylesAvailable()) {
- // TODO(b/130759285): Create a new string keywords_styles_and_wallpaper
- sb.append(", ").append(mContext.getString(R.string.theme_customization_category))
- .append(", ").append(mContext.getString(R.string.keywords_dark_ui_mode));
+ sb.append(", ").append(mContext.getString(R.string.keywords_styles));
}
return sb.toString();
}
diff --git a/src/com/android/settings/flashlight/FlashlightSlice.java b/src/com/android/settings/flashlight/FlashlightSlice.java
index a2c4561..bd7f486 100644
--- a/src/com/android/settings/flashlight/FlashlightSlice.java
+++ b/src/com/android/settings/flashlight/FlashlightSlice.java
@@ -39,6 +39,7 @@
import androidx.slice.builders.ListBuilder.RowBuilder;
import androidx.slice.builders.SliceAction;
+import com.android.internal.annotations.VisibleForTesting;
import com.android.settings.R;
import com.android.settings.Utils;
import com.android.settings.slices.CustomSliceRegistry;
@@ -131,10 +132,19 @@
return null;
}
-
- private static boolean isFlashlightAvailable(Context context) {
- return Settings.Secure.getInt(
- context.getContentResolver(), Secure.FLASHLIGHT_AVAILABLE, 0) == 1;
+ @VisibleForTesting
+ static boolean isFlashlightAvailable(Context context) {
+ int defaultAvailability = 0;
+ try {
+ // check if there is a flash unit
+ if (getCameraId(context) != null) {
+ defaultAvailability = 1;
+ }
+ } catch (CameraAccessException e) {
+ Log.e(TAG, "Error getting camera id.", e);
+ }
+ return Secure.getInt(context.getContentResolver(),
+ Secure.FLASHLIGHT_AVAILABLE, defaultAvailability) == 1;
}
private static boolean isFlashlightEnabled(Context context) {
diff --git a/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceController.java b/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceController.java
index 3064d4f..bfa43d1 100644
--- a/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceController.java
+++ b/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceController.java
@@ -55,8 +55,6 @@
TextView mBatteryPercentText;
@VisibleForTesting
TextView mSummary1;
- @VisibleForTesting
- TextView mSummary2;
private Activity mActivity;
private PreferenceFragmentCompat mHost;
@@ -90,7 +88,6 @@
.findViewById(R.id.battery_header_icon);
mBatteryPercentText = mBatteryLayoutPref.findViewById(R.id.battery_percent);
mSummary1 = mBatteryLayoutPref.findViewById(R.id.summary1);
- mSummary2 = mBatteryLayoutPref.findViewById(R.id.summary2);
quickUpdateHeaderPreference();
}
@@ -115,9 +112,6 @@
} else {
mSummary1.setText(info.remainingLabel);
}
- // Clear this just to be sure we don't get UI jank on re-entering this view from another
- // activity.
- mSummary2.setText("");
mBatteryMeterView.setBatteryLevel(info.batteryLevel);
mBatteryMeterView.setCharging(!info.discharging);
diff --git a/src/com/android/settings/fuelgauge/InactiveApps.java b/src/com/android/settings/fuelgauge/InactiveApps.java
index fdfcaab..6c8a954 100644
--- a/src/com/android/settings/fuelgauge/InactiveApps.java
+++ b/src/com/android/settings/fuelgauge/InactiveApps.java
@@ -31,6 +31,7 @@
import android.content.pm.ResolveInfo;
import android.content.res.Resources;
import android.os.Bundle;
+import android.text.TextUtils;
import androidx.preference.ListPreference;
import androidx.preference.Preference;
@@ -82,6 +83,7 @@
final Context context = getActivity();
final PackageManager pm = context.getPackageManager();
final UsageStatsManager usm = context.getSystemService(UsageStatsManager.class);
+ final String settingsPackage = context.getPackageName();
Intent launcherIntent = new Intent(Intent.ACTION_MAIN);
launcherIntent.addCategory(Intent.CATEGORY_LAUNCHER);
@@ -95,6 +97,10 @@
p.setEntries(SETTABLE_BUCKETS_NAMES);
p.setEntryValues(SETTABLE_BUCKETS_VALUES);
updateSummary(p);
+ // Don't allow Settings to change its own standby bucket.
+ if (TextUtils.equals(packageName, settingsPackage)) {
+ p.setEnabled(false);
+ }
p.setOnPreferenceChangeListener(this);
screen.addPreference(p);
diff --git a/src/com/android/settings/fuelgauge/PowerUsageBase.java b/src/com/android/settings/fuelgauge/PowerUsageBase.java
index ec73b1b..821bd7a 100644
--- a/src/com/android/settings/fuelgauge/PowerUsageBase.java
+++ b/src/com/android/settings/fuelgauge/PowerUsageBase.java
@@ -67,17 +67,12 @@
@Override
public void onStart() {
super.onStart();
- }
-
- @Override
- public void onResume() {
- super.onResume();
mBatteryBroadcastReceiver.register();
}
@Override
- public void onPause() {
- super.onPause();
+ public void onStop() {
+ super.onStop();
mBatteryBroadcastReceiver.unRegister();
}
@@ -85,7 +80,7 @@
final Bundle bundle = new Bundle();
bundle.putInt(KEY_REFRESH_TYPE, refreshType);
- getLoaderManager().restartLoader(0, bundle, new PowerLoaderCallback());
+ LoaderManager.getInstance(this).restartLoader(0, bundle, new PowerLoaderCallback());
}
protected abstract void refreshUi(@BatteryUpdateType int refreshType);
diff --git a/src/com/android/settings/fuelgauge/PowerUsageSummary.java b/src/com/android/settings/fuelgauge/PowerUsageSummary.java
index 880255b..4b127ac 100644
--- a/src/com/android/settings/fuelgauge/PowerUsageSummary.java
+++ b/src/com/android/settings/fuelgauge/PowerUsageSummary.java
@@ -19,15 +19,12 @@
import static com.android.settings.fuelgauge.BatteryBroadcastReceiver.BatteryUpdateType;
import android.app.settings.SettingsEnums;
-import android.content.ContentResolver;
import android.content.Context;
import android.database.ContentObserver;
import android.net.Uri;
-import android.os.BatteryStats;
import android.os.Bundle;
import android.os.Handler;
import android.provider.SearchIndexableResource;
-import android.provider.Settings;
import android.provider.Settings.Global;
import android.text.format.Formatter;
import android.view.Menu;
@@ -70,20 +67,16 @@
static final String TAG = "PowerUsageSummary";
- private static final boolean DEBUG = false;
private static final String KEY_BATTERY_HEADER = "battery_header";
private static final String KEY_SCREEN_USAGE = "screen_usage";
private static final String KEY_TIME_SINCE_LAST_FULL_CHARGE = "last_full_charge";
- private static final String KEY_BATTERY_SAVER_SUMMARY = "battery_saver_summary";
@VisibleForTesting
static final int BATTERY_INFO_LOADER = 1;
@VisibleForTesting
static final int BATTERY_TIP_LOADER = 2;
@VisibleForTesting
- static final int MENU_STATS_TYPE = Menu.FIRST;
- @VisibleForTesting
static final int MENU_ADVANCED_BATTERY = Menu.FIRST + 1;
public static final int DEBUG_INFO_LOADER = 3;
@@ -106,7 +99,6 @@
boolean mNeedUpdateBatteryTip;
@VisibleForTesting
BatteryTipPreferenceController mBatteryTipPreferenceController;
- private int mStatsType = BatteryStats.STATS_SINCE_CHARGED;
@VisibleForTesting
final ContentObserver mSettingsObserver = new ContentObserver(new Handler()) {
@@ -162,7 +154,6 @@
final TextView percentRemaining =
mBatteryLayoutPref.findViewById(R.id.battery_percent);
final TextView summary1 = mBatteryLayoutPref.findViewById(R.id.summary1);
- final TextView summary2 = mBatteryLayoutPref.findViewById(R.id.summary2);
BatteryInfo oldInfo = batteryInfos.get(0);
BatteryInfo newInfo = batteryInfos.get(1);
percentRemaining.setText(Utils.formatPercentage(oldInfo.batteryLevel));
@@ -170,14 +161,13 @@
// set the text to the old estimate (copied from battery info). Note that this
// can sometimes say 0 time remaining because battery stats requires the phone
// be unplugged for a period of time before being willing ot make an estimate.
- summary1.setText(mPowerFeatureProvider.getOldEstimateDebugString(
+ final String OldEstimateString = mPowerFeatureProvider.getOldEstimateDebugString(
Formatter.formatShortElapsedTime(getContext(),
- PowerUtil.convertUsToMs(oldInfo.remainingTimeUs))));
-
- // for this one we can just set the string directly
- summary2.setText(mPowerFeatureProvider.getEnhancedEstimateDebugString(
+ PowerUtil.convertUsToMs(oldInfo.remainingTimeUs)));
+ final String NewEstimateString = mPowerFeatureProvider.getEnhancedEstimateDebugString(
Formatter.formatShortElapsedTime(getContext(),
- PowerUtil.convertUsToMs(newInfo.remainingTimeUs))));
+ PowerUtil.convertUsToMs(newInfo.remainingTimeUs)));
+ summary1.setText(OldEstimateString + "\n" + NewEstimateString);
batteryView.setBatteryLevel(oldInfo.batteryLevel);
batteryView.setCharging(!oldInfo.discharging);
@@ -230,7 +220,6 @@
mScreenUsagePref = (PowerGaugePreference) findPreference(KEY_SCREEN_USAGE);
mLastFullChargePref = (PowerGaugePreference) findPreference(
KEY_TIME_SINCE_LAST_FULL_CHARGE);
- mFooterPreferenceMixin.createFooterPreference().setTitle(R.string.battery_footer_summary);
mBatteryUtils = BatteryUtils.getInstance(getContext());
restartBatteryInfoLoader();
@@ -270,12 +259,6 @@
@Override
public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
- if (DEBUG) {
- menu.add(Menu.NONE, MENU_STATS_TYPE, Menu.NONE, R.string.menu_stats_total)
- .setIcon(com.android.internal.R.drawable.ic_menu_info_details)
- .setAlphabeticShortcut('t');
- }
-
menu.add(Menu.NONE, MENU_ADVANCED_BATTERY, Menu.NONE, R.string.advanced_battery_title);
super.onCreateOptionsMenu(menu, inflater);
@@ -289,14 +272,6 @@
@Override
public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) {
- case MENU_STATS_TYPE:
- if (mStatsType == BatteryStats.STATS_SINCE_CHARGED) {
- mStatsType = BatteryStats.STATS_SINCE_UNPLUGGED;
- } else {
- mStatsType = BatteryStats.STATS_SINCE_CHARGED;
- }
- refreshUi(BatteryUpdateType.MANUAL);
- return true;
case MENU_ADVANCED_BATTERY:
new SubSettingLauncher(getContext())
.setDestination(PowerUsageAdvanced.class.getName())
diff --git a/src/com/android/settings/fuelgauge/RestrictAppPreferenceController.java b/src/com/android/settings/fuelgauge/RestrictAppPreferenceController.java
index d3c1d54..4dd4419 100644
--- a/src/com/android/settings/fuelgauge/RestrictAppPreferenceController.java
+++ b/src/com/android/settings/fuelgauge/RestrictAppPreferenceController.java
@@ -49,6 +49,7 @@
super(context, KEY_RESTRICT_APP);
mAppOpsManager = (AppOpsManager) context.getSystemService(Context.APP_OPS_SERVICE);
mUserManager = context.getSystemService(UserManager.class);
+ mAppInfos = BatteryTipUtils.getRestrictedAppsList(mAppOpsManager, mUserManager);
}
public RestrictAppPreferenceController(InstrumentedPreferenceFragment preferenceFragment) {
@@ -58,21 +59,14 @@
@Override
public int getAvailabilityStatus() {
- return AVAILABLE;
+ return mAppInfos.size() > 0 ? AVAILABLE : CONDITIONALLY_UNAVAILABLE;
}
@Override
- public void updateState(Preference preference) {
- super.updateState(preference);
-
- mAppInfos = BatteryTipUtils.getRestrictedAppsList(mAppOpsManager, mUserManager);
-
+ public CharSequence getSummary() {
final int num = mAppInfos.size();
- // Don't show it if no app been restricted
- preference.setVisible(num > 0);
- preference.setSummary(
- mContext.getResources().getQuantityString(R.plurals.restricted_app_summary, num,
- num));
+ return mContext.getResources().getQuantityString(R.plurals.restricted_app_summary, num,
+ num);
}
@Override
diff --git a/src/com/android/settings/fuelgauge/RestrictedAppDetails.java b/src/com/android/settings/fuelgauge/RestrictedAppDetails.java
index 6722b4a..db83140 100644
--- a/src/com/android/settings/fuelgauge/RestrictedAppDetails.java
+++ b/src/com/android/settings/fuelgauge/RestrictedAppDetails.java
@@ -47,7 +47,6 @@
import com.android.settings.widget.AppCheckBoxPreference;
import com.android.settingslib.core.AbstractPreferenceController;
import com.android.settingslib.utils.StringUtil;
-import com.android.settingslib.widget.FooterPreferenceMixinCompat;
import java.util.List;
@@ -76,8 +75,6 @@
PackageManager mPackageManager;
@VisibleForTesting
BatteryDatabaseManager mBatteryDatabaseManager;
- private final FooterPreferenceMixinCompat mFooterPreferenceMixin =
- new FooterPreferenceMixinCompat(this, getSettingsLifecycle());
public static void startRestrictedAppDetails(InstrumentedPreferenceFragment fragment,
List<AppInfo> appInfos) {
@@ -97,8 +94,6 @@
super.onCreate(icicle);
final Context context = getContext();
- mFooterPreferenceMixin.createFooterPreference().setTitle(
- R.string.restricted_app_detail_footer);
mRestrictedAppListGroup = (PreferenceGroup) findPreference(KEY_PREF_RESTRICTED_APP_LIST);
mAppInfos = getArguments().getParcelableArrayList(EXTRA_APP_INFO_LIST);
mPackageManager = context.getPackageManager();
diff --git a/src/com/android/settings/fuelgauge/SmartBatterySettings.java b/src/com/android/settings/fuelgauge/SmartBatterySettings.java
index 5fddbac..130c1f2 100644
--- a/src/com/android/settings/fuelgauge/SmartBatterySettings.java
+++ b/src/com/android/settings/fuelgauge/SmartBatterySettings.java
@@ -18,7 +18,6 @@
import android.app.settings.SettingsEnums;
import android.content.Context;
-import android.os.Bundle;
import android.provider.SearchIndexableResource;
import com.android.settings.R;
@@ -41,12 +40,6 @@
public static final String TAG = "SmartBatterySettings";
@Override
- public void onCreate(Bundle icicle) {
- super.onCreate(icicle);
- mFooterPreferenceMixin.createFooterPreference().setTitle(R.string.smart_battery_footer);
- }
-
- @Override
public int getMetricsCategory() {
return SettingsEnums.FUELGAUGE_SMART_BATTERY;
}
@@ -75,7 +68,6 @@
Context context, SettingsActivity settingsActivity,
InstrumentedPreferenceFragment fragment) {
final List<AbstractPreferenceController> controllers = new ArrayList<>();
- controllers.add(new SmartBatteryPreferenceController(context));
if (settingsActivity != null && fragment != null) {
controllers.add(
new RestrictAppPreferenceController(fragment));
diff --git a/src/com/android/settings/fuelgauge/TopLevelBatteryPreferenceController.java b/src/com/android/settings/fuelgauge/TopLevelBatteryPreferenceController.java
index c4da670..f6182f6 100644
--- a/src/com/android/settings/fuelgauge/TopLevelBatteryPreferenceController.java
+++ b/src/com/android/settings/fuelgauge/TopLevelBatteryPreferenceController.java
@@ -17,7 +17,6 @@
package com.android.settings.fuelgauge;
import android.content.Context;
-import android.text.BidiFormatter;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
@@ -49,8 +48,8 @@
@Override
public int getAvailabilityStatus() {
return mContext.getResources().getBoolean(R.bool.config_show_top_level_battery)
- ? AVAILABLE_UNSEARCHABLE
- : UNSUPPORTED_ON_DEVICE;
+ ? AVAILABLE_UNSEARCHABLE
+ : UNSUPPORTED_ON_DEVICE;
}
@Override
@@ -79,15 +78,14 @@
return null;
}
CharSequence label;
- final BidiFormatter formatter = BidiFormatter.getInstance();
if (!info.discharging && info.chargeLabel != null) {
label = info.chargeLabel;
} else if (info.remainingLabel == null) {
label = info.batteryPercentString;
} else {
label = context.getString(R.string.power_remaining_settings_home_page,
- formatter.unicodeWrap(info.batteryPercentString),
- formatter.unicodeWrap(info.remainingLabel));
+ info.batteryPercentString,
+ info.remainingLabel);
}
return label;
}
diff --git a/src/com/android/settings/fuelgauge/batterysaver/BatterySaverButtonPreferenceController.java b/src/com/android/settings/fuelgauge/batterysaver/BatterySaverButtonPreferenceController.java
index bb12d1a..56e90ff 100644
--- a/src/com/android/settings/fuelgauge/batterysaver/BatterySaverButtonPreferenceController.java
+++ b/src/com/android/settings/fuelgauge/batterysaver/BatterySaverButtonPreferenceController.java
@@ -16,8 +16,11 @@
package com.android.settings.fuelgauge.batterysaver;
+import android.content.ContentResolver;
import android.content.Context;
+import android.net.Uri;
import android.os.PowerManager;
+import android.provider.SettingsSlicesContract;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
@@ -38,6 +41,7 @@
LifecycleObserver, OnStart, OnStop, BatterySaverReceiver.BatterySaverListener {
private final BatterySaverReceiver mBatterySaverReceiver;
+
private final PowerManager mPowerManager;
private TwoStateButtonPreference mPreference;
@@ -60,6 +64,16 @@
}
@Override
+ public Uri getSliceUri() {
+ return new Uri.Builder()
+ .scheme(ContentResolver.SCHEME_CONTENT)
+ .authority(SettingsSlicesContract.AUTHORITY)
+ .appendPath(SettingsSlicesContract.PATH_SETTING_ACTION)
+ .appendPath(SettingsSlicesContract.KEY_BATTERY_SAVER)
+ .build();
+ }
+
+ @Override
public void onStart() {
mBatterySaverReceiver.setListening(true);
}
diff --git a/src/com/android/settings/fuelgauge/batterysaver/BatterySaverScheduleSettings.java b/src/com/android/settings/fuelgauge/batterysaver/BatterySaverScheduleSettings.java
index 31ee278..507c369 100644
--- a/src/com/android/settings/fuelgauge/batterysaver/BatterySaverScheduleSettings.java
+++ b/src/com/android/settings/fuelgauge/batterysaver/BatterySaverScheduleSettings.java
@@ -35,9 +35,9 @@
import com.android.settings.R;
import com.android.settings.widget.RadioButtonPickerFragment;
-import com.android.settings.widget.RadioButtonPreference;
import com.android.settingslib.fuelgauge.BatterySaverUtils;
import com.android.settingslib.widget.CandidateInfo;
+import com.android.settingslib.widget.RadioButtonPreference;
import com.google.common.collect.Lists;
diff --git a/src/com/android/settings/fuelgauge/batterysaver/BatterySaverSettings.java b/src/com/android/settings/fuelgauge/batterysaver/BatterySaverSettings.java
index be23f72..6216917 100644
--- a/src/com/android/settings/fuelgauge/batterysaver/BatterySaverSettings.java
+++ b/src/com/android/settings/fuelgauge/batterysaver/BatterySaverSettings.java
@@ -18,7 +18,6 @@
import android.app.settings.SettingsEnums;
import android.content.Context;
-import android.os.Bundle;
import android.provider.SearchIndexableResource;
import android.text.Annotation;
import android.text.Spannable;
@@ -49,7 +48,7 @@
@SearchIndexable(forTarget = SearchIndexable.ALL & ~SearchIndexable.ARC)
public class BatterySaverSettings extends DashboardFragment {
private static final String TAG = "BatterySaverSettings";
- public static final String KEY_FOOTER_PREFERENCE = "footer_preference";
+ private static final String KEY_FOOTER_PREFERENCE = "battery_saver_footer_preference";
private SpannableStringBuilder mFooterText;
private String mHelpUri;
diff --git a/src/com/android/settings/gestures/PreventRingingGesturePreferenceController.java b/src/com/android/settings/gestures/PreventRingingGesturePreferenceController.java
index 04f7e476..e4e0bed 100644
--- a/src/com/android/settings/gestures/PreventRingingGesturePreferenceController.java
+++ b/src/com/android/settings/gestures/PreventRingingGesturePreferenceController.java
@@ -31,7 +31,6 @@
import com.android.internal.annotations.VisibleForTesting;
import com.android.settings.R;
import com.android.settings.core.PreferenceControllerMixin;
-import com.android.settings.widget.RadioButtonPreference;
import com.android.settings.widget.VideoPreference;
import com.android.settingslib.core.AbstractPreferenceController;
import com.android.settingslib.core.lifecycle.Lifecycle;
@@ -40,6 +39,7 @@
import com.android.settingslib.core.lifecycle.events.OnPause;
import com.android.settingslib.core.lifecycle.events.OnResume;
import com.android.settingslib.core.lifecycle.events.OnSaveInstanceState;
+import com.android.settingslib.widget.RadioButtonPreference;
public class PreventRingingGesturePreferenceController extends AbstractPreferenceController
implements RadioButtonPreference.OnClickListener, LifecycleObserver, OnSaveInstanceState,
diff --git a/src/com/android/settings/gestures/SystemNavigationGestureSettings.java b/src/com/android/settings/gestures/SystemNavigationGestureSettings.java
index 3def780..5e6d96c 100644
--- a/src/com/android/settings/gestures/SystemNavigationGestureSettings.java
+++ b/src/com/android/settings/gestures/SystemNavigationGestureSettings.java
@@ -42,18 +42,18 @@
import androidx.annotation.VisibleForTesting;
import androidx.preference.PreferenceScreen;
-import com.android.settings.SettingsTutorialDialogWrapperActivity;
import com.android.settings.R;
+import com.android.settings.SettingsTutorialDialogWrapperActivity;
import com.android.settings.dashboard.suggestions.SuggestionFeatureProvider;
import com.android.settings.overlay.FeatureFactory;
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settings.search.Indexable;
import com.android.settings.widget.RadioButtonPickerFragment;
-import com.android.settings.widget.RadioButtonPreference;
import com.android.settings.widget.RadioButtonPreferenceWithExtraWidget;
import com.android.settings.widget.VideoPreference;
import com.android.settingslib.search.SearchIndexable;
import com.android.settingslib.widget.CandidateInfo;
+import com.android.settingslib.widget.RadioButtonPreference;
import java.util.ArrayList;
import java.util.Arrays;
diff --git a/src/com/android/settings/homepage/SettingsHomepageActivity.java b/src/com/android/settings/homepage/SettingsHomepageActivity.java
index fa23101..5e6c54b 100644
--- a/src/com/android/settings/homepage/SettingsHomepageActivity.java
+++ b/src/com/android/settings/homepage/SettingsHomepageActivity.java
@@ -33,6 +33,7 @@
import com.android.settings.R;
import com.android.settings.accounts.AvatarViewMixin;
+import com.android.settings.core.HideNonSystemOverlayMixin;
import com.android.settings.homepage.contextualcards.ContextualCardsFragment;
import com.android.settings.overlay.FeatureFactory;
@@ -54,8 +55,8 @@
.initSearchToolbar(this /* activity */, toolbar, SettingsEnums.SETTINGS_HOMEPAGE);
final ImageView avatarView = findViewById(R.id.account_avatar);
- final AvatarViewMixin avatarViewMixin = new AvatarViewMixin(this, avatarView);
- getLifecycle().addObserver(avatarViewMixin);
+ getLifecycle().addObserver(new AvatarViewMixin(this, avatarView));
+ getLifecycle().addObserver(new HideNonSystemOverlayMixin(this));
if (!getSystemService(ActivityManager.class).isLowRamDevice()) {
// Only allow contextual feature on high ram devices.
diff --git a/src/com/android/settings/homepage/contextualcards/ContextualCardsAdapter.java b/src/com/android/settings/homepage/contextualcards/ContextualCardsAdapter.java
index bca5566..4e010fd 100644
--- a/src/com/android/settings/homepage/contextualcards/ContextualCardsAdapter.java
+++ b/src/com/android/settings/homepage/contextualcards/ContextualCardsAdapter.java
@@ -105,13 +105,11 @@
@Override
public int getSpanSize(int position) {
final int viewType = mContextualCards.get(position).getViewType();
- switch (viewType) {
- case ConditionContextualCardRenderer.VIEW_TYPE_HALF_WIDTH:
- case SliceContextualCardRenderer.VIEW_TYPE_HALF_WIDTH:
- return HALF_WIDTH;
- default:
- return FULL_WIDTH;
+ if (viewType == ConditionContextualCardRenderer.VIEW_TYPE_HALF_WIDTH
+ || viewType == SliceContextualCardRenderer.VIEW_TYPE_HALF_WIDTH) {
+ return HALF_WIDTH;
}
+ return FULL_WIDTH;
}
});
}
diff --git a/src/com/android/settings/homepage/contextualcards/slices/SliceContextualCardRenderer.java b/src/com/android/settings/homepage/contextualcards/slices/SliceContextualCardRenderer.java
index b83a712..9d1b883 100644
--- a/src/com/android/settings/homepage/contextualcards/slices/SliceContextualCardRenderer.java
+++ b/src/com/android/settings/homepage/contextualcards/slices/SliceContextualCardRenderer.java
@@ -84,14 +84,12 @@
@Override
public RecyclerView.ViewHolder createViewHolder(View view, @LayoutRes int viewType) {
- switch (viewType) {
- case VIEW_TYPE_DEFERRED_SETUP:
- return mDeferredSetupCardHelper.createViewHolder(view);
- case VIEW_TYPE_HALF_WIDTH:
- return mHalfCardHelper.createViewHolder(view);
- default:
- return mFullCardHelper.createViewHolder(view);
+ if (viewType == VIEW_TYPE_DEFERRED_SETUP) {
+ return mDeferredSetupCardHelper.createViewHolder(view);
+ } else if (viewType == VIEW_TYPE_HALF_WIDTH) {
+ return mHalfCardHelper.createViewHolder(view);
}
+ return mFullCardHelper.createViewHolder(view);
}
@Override
@@ -132,30 +130,24 @@
return;
}
- switch (holder.getItemViewType()) {
- case VIEW_TYPE_DEFERRED_SETUP:
- mDeferredSetupCardHelper.bindView(holder, card, slice);
- break;
- case VIEW_TYPE_HALF_WIDTH:
- mHalfCardHelper.bindView(holder, card, slice);
- break;
- default:
- mFullCardHelper.bindView(holder, card, slice);
+ if (holder.getItemViewType() == VIEW_TYPE_DEFERRED_SETUP) {
+ mDeferredSetupCardHelper.bindView(holder, card, slice);
+ } else if (holder.getItemViewType() == VIEW_TYPE_HALF_WIDTH) {
+ mHalfCardHelper.bindView(holder, card, slice);
+ } else {
+ mFullCardHelper.bindView(holder, card, slice);
}
if (swipeBackground != null) {
swipeBackground.setVisibility(View.VISIBLE);
}
});
- switch (holder.getItemViewType()) {
- case VIEW_TYPE_DEFERRED_SETUP:
- // Deferred setup is never dismissible.
- break;
- case VIEW_TYPE_HALF_WIDTH:
- initDismissalActions(holder, card);
- break;
- default:
- initDismissalActions(holder, card);
+ if (holder.getItemViewType()
+ == VIEW_TYPE_DEFERRED_SETUP) {// Deferred setup is never dismissible.
+ } else if (holder.getItemViewType() == VIEW_TYPE_HALF_WIDTH) {
+ initDismissalActions(holder, card);
+ } else {
+ initDismissalActions(holder, card);
}
if (card.isPendingDismiss()) {
diff --git a/src/com/android/settings/homepage/contextualcards/slices/SwipeDismissalDelegate.java b/src/com/android/settings/homepage/contextualcards/slices/SwipeDismissalDelegate.java
index 0f78575..1813590 100644
--- a/src/com/android/settings/homepage/contextualcards/slices/SwipeDismissalDelegate.java
+++ b/src/com/android/settings/homepage/contextualcards/slices/SwipeDismissalDelegate.java
@@ -52,21 +52,20 @@
@Override
public int getMovementFlags(@NonNull RecyclerView recyclerView,
@NonNull RecyclerView.ViewHolder viewHolder) {
- switch (viewHolder.getItemViewType()) {
- case SliceContextualCardRenderer.VIEW_TYPE_FULL_WIDTH:
- case SliceContextualCardRenderer.VIEW_TYPE_HALF_WIDTH:
- // Here we are making sure the current displayed view is the initial view of
- // either slice full card or half card, and only allow swipe on these two types.
- if (viewHolder.itemView.findViewById(R.id.dismissal_view).getVisibility()
- == View.VISIBLE) {
- // Disable swiping when we are in the dismissal view
- return 0;
- }
- return makeMovementFlags(0 /*dragFlags*/,
- ItemTouchHelper.LEFT | ItemTouchHelper.RIGHT /*swipeFlags*/);
- default:
+ if (viewHolder.getItemViewType() == SliceContextualCardRenderer.VIEW_TYPE_FULL_WIDTH
+ || viewHolder.getItemViewType()
+ == SliceContextualCardRenderer.VIEW_TYPE_HALF_WIDTH) {// Here we are making sure
+ // the current displayed view is the initial view of
+ // either slice full card or half card, and only allow swipe on these two types.
+ if (viewHolder.itemView.findViewById(R.id.dismissal_view).getVisibility()
+ == View.VISIBLE) {
+ // Disable swiping when we are in the dismissal view
return 0;
+ }
+ return makeMovementFlags(0 /*dragFlags*/,
+ ItemTouchHelper.LEFT | ItemTouchHelper.RIGHT /*swipeFlags*/);
}
+ return 0;
}
@Override
diff --git a/src/com/android/settings/inputmethod/InputMethodPreferenceController.java b/src/com/android/settings/inputmethod/InputMethodPreferenceController.java
new file mode 100644
index 0000000..5c5d0fb
--- /dev/null
+++ b/src/com/android/settings/inputmethod/InputMethodPreferenceController.java
@@ -0,0 +1,101 @@
+/*
+ * 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.inputmethod;
+
+import android.app.admin.DevicePolicyManager;
+import android.content.Context;
+import android.graphics.drawable.Drawable;
+import android.view.inputmethod.InputMethodInfo;
+import android.view.inputmethod.InputMethodManager;
+
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+
+import com.android.settings.core.BasePreferenceController;
+import com.android.settingslib.core.lifecycle.LifecycleObserver;
+import com.android.settingslib.core.lifecycle.events.OnStart;
+import com.android.settingslib.inputmethod.InputMethodPreference;
+
+import java.text.Collator;
+import java.util.ArrayList;
+import java.util.List;
+import com.google.common.annotations.VisibleForTesting;
+
+public class InputMethodPreferenceController extends BasePreferenceController implements
+ LifecycleObserver, OnStart {
+
+ @VisibleForTesting
+ PreferenceScreen mScreen;
+ private Preference mPreference;
+ private InputMethodManager mImm;
+ private DevicePolicyManager mDpm;
+
+ public InputMethodPreferenceController(Context context, String key) {
+ super(context, key);
+ mImm = context.getSystemService(InputMethodManager.class);
+ mDpm = context.getSystemService(DevicePolicyManager.class);
+ }
+
+ @Override
+ public int getAvailabilityStatus() {
+ return AVAILABLE_UNSEARCHABLE;
+ }
+
+ @Override
+ public void displayPreference(PreferenceScreen screen) {
+ super.displayPreference(screen);
+ mScreen = screen;
+ mPreference = mScreen.findPreference(getPreferenceKey());
+ }
+
+ @Override
+ public void onStart() {
+ updateInputMethodPreferenceViews();
+ }
+
+ private void updateInputMethodPreferenceViews() {
+ final List<InputMethodPreference> preferenceList = new ArrayList<>();
+
+ final List<String> permittedList = mDpm.getPermittedInputMethodsForCurrentUser();
+ final List<InputMethodInfo> imis = mImm.getEnabledInputMethodList();
+ final int N = (imis == null ? 0 : imis.size());
+ for (int i = 0; i < N; ++i) {
+ final InputMethodInfo imi = imis.get(i);
+ final boolean isAllowedByOrganization = permittedList == null
+ || permittedList.contains(imi.getPackageName());
+ final Drawable icon = imi.loadIcon(mContext.getPackageManager());
+ final InputMethodPreference pref = new InputMethodPreference(
+ mScreen.getContext(),
+ imi,
+ false, /* isImeEnabler */
+ isAllowedByOrganization,
+ null /* this can be null since isImeEnabler is false */);
+ pref.setIcon(icon);
+ preferenceList.add(pref);
+ }
+ final Collator collator = Collator.getInstance();
+ preferenceList.sort((lhs, rhs) -> lhs.compareTo(rhs, collator));
+ mScreen.removeAll();
+ for (int i = 0; i < N; ++i) {
+ final InputMethodPreference pref = preferenceList.get(i);
+ pref.setOrder(i);
+ mScreen.addPreference(pref);
+ pref.updatePreferenceViews();
+ }
+ mScreen.addPreference(mPreference);
+ }
+}
diff --git a/src/com/android/settings/inputmethod/SpellCheckerForWorkPreferenceController.java b/src/com/android/settings/inputmethod/SpellCheckerForWorkPreferenceController.java
index 327af5b..7988a64 100644
--- a/src/com/android/settings/inputmethod/SpellCheckerForWorkPreferenceController.java
+++ b/src/com/android/settings/inputmethod/SpellCheckerForWorkPreferenceController.java
@@ -18,7 +18,6 @@
import android.app.settings.SettingsEnums;
import android.content.Context;
-import android.view.inputmethod.InputMethodSystemProperty;
import com.android.settings.R;
import com.android.settings.core.WorkProfilePreferenceController;
@@ -42,8 +41,7 @@
@AvailabilityStatus
@Override
public int getAvailabilityStatus() {
- if (!mContext.getResources().getBoolean(R.bool.config_show_spellcheckers_settings)
- || !InputMethodSystemProperty.PER_PROFILE_IME_ENABLED) {
+ if (!mContext.getResources().getBoolean(R.bool.config_show_spellcheckers_settings)) {
return UNSUPPORTED_ON_DEVICE;
}
return super.getAvailabilityStatus();
diff --git a/src/com/android/settings/inputmethod/VirtualKeyboardForWorkPreferenceController.java b/src/com/android/settings/inputmethod/VirtualKeyboardForWorkPreferenceController.java
index 6cdd386..fe81a94 100644
--- a/src/com/android/settings/inputmethod/VirtualKeyboardForWorkPreferenceController.java
+++ b/src/com/android/settings/inputmethod/VirtualKeyboardForWorkPreferenceController.java
@@ -18,7 +18,6 @@
import android.app.settings.SettingsEnums;
import android.content.Context;
-import android.view.inputmethod.InputMethodSystemProperty;
import com.android.settings.R;
import com.android.settings.core.WorkProfilePreferenceController;
@@ -39,8 +38,7 @@
@AvailabilityStatus
@Override
public int getAvailabilityStatus() {
- if (!mContext.getResources().getBoolean(R.bool.config_show_virtual_keyboard_pref)
- || !InputMethodSystemProperty.PER_PROFILE_IME_ENABLED) {
+ if (!mContext.getResources().getBoolean(R.bool.config_show_virtual_keyboard_pref)) {
return UNSUPPORTED_ON_DEVICE;
}
return super.getAvailabilityStatus();
diff --git a/src/com/android/settings/inputmethod/VirtualKeyboardFragment.java b/src/com/android/settings/inputmethod/VirtualKeyboardFragment.java
index ef07d11..61dbd31 100644
--- a/src/com/android/settings/inputmethod/VirtualKeyboardFragment.java
+++ b/src/com/android/settings/inputmethod/VirtualKeyboardFragment.java
@@ -16,58 +16,32 @@
package com.android.settings.inputmethod;
-import android.app.Activity;
-import android.app.admin.DevicePolicyManager;
import android.app.settings.SettingsEnums;
import android.content.Context;
-import android.graphics.drawable.Drawable;
-import android.os.Bundle;
import android.provider.SearchIndexableResource;
-import android.view.inputmethod.InputMethodInfo;
-import android.view.inputmethod.InputMethodManager;
-import androidx.preference.Preference;
-
-import com.android.internal.util.Preconditions;
import com.android.settings.R;
-import com.android.settings.SettingsPreferenceFragment;
+import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settings.search.Indexable;
-import com.android.settingslib.inputmethod.InputMethodAndSubtypeUtilCompat;
-import com.android.settingslib.inputmethod.InputMethodPreference;
import com.android.settingslib.search.SearchIndexable;
-import java.text.Collator;
-import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
@SearchIndexable
-public final class VirtualKeyboardFragment extends SettingsPreferenceFragment implements Indexable {
+public final class VirtualKeyboardFragment extends DashboardFragment {
- private static final String ADD_VIRTUAL_KEYBOARD_SCREEN = "add_virtual_keyboard_screen";
-
- private final ArrayList<InputMethodPreference> mInputMethodPreferenceList = new ArrayList<>();
- private InputMethodManager mImm;
- private DevicePolicyManager mDpm;
- private Preference mAddVirtualKeyboardScreen;
+ private static final String TAG = "VirtualKeyboardFragment";
@Override
- public void onCreatePreferences(Bundle bundle, String s) {
- Activity activity = Preconditions.checkNotNull(getActivity());
- addPreferencesFromResource(R.xml.virtual_keyboard_settings);
- mImm = Preconditions.checkNotNull(activity.getSystemService(InputMethodManager.class));
- mDpm = Preconditions.checkNotNull(activity.getSystemService(DevicePolicyManager.class));
- mAddVirtualKeyboardScreen = Preconditions.checkNotNull(
- findPreference(ADD_VIRTUAL_KEYBOARD_SCREEN));
+ protected int getPreferenceScreenResId() {
+ return R.xml.virtual_keyboard_settings;
}
@Override
- public void onResume() {
- super.onResume();
- // Refresh internal states in mInputMethodSettingValues to keep the latest
- // "InputMethodInfo"s and "InputMethodSubtype"s
- updateInputMethodPreferenceViews();
+ protected String getLogTag() {
+ return TAG;
}
@Override
@@ -75,42 +49,6 @@
return SettingsEnums.VIRTUAL_KEYBOARDS;
}
- private void updateInputMethodPreferenceViews() {
- // Clear existing "InputMethodPreference"s
- mInputMethodPreferenceList.clear();
- List<String> permittedList = mDpm.getPermittedInputMethodsForCurrentUser();
- final Context context = getPrefContext();
- final List<InputMethodInfo> imis = mImm.getEnabledInputMethodList();
- final int N = (imis == null ? 0 : imis.size());
- for (int i = 0; i < N; ++i) {
- final InputMethodInfo imi = imis.get(i);
- final boolean isAllowedByOrganization = permittedList == null
- || permittedList.contains(imi.getPackageName());
- final Drawable icon = imi.loadIcon(context.getPackageManager());
- final InputMethodPreference pref = new InputMethodPreference(
- context,
- imi,
- false, /* isImeEnabler */
- isAllowedByOrganization,
- null /* this can be null since isImeEnabler is false */);
- pref.setIcon(icon);
- mInputMethodPreferenceList.add(pref);
- }
- final Collator collator = Collator.getInstance();
- mInputMethodPreferenceList.sort((lhs, rhs) -> lhs.compareTo(rhs, collator));
- getPreferenceScreen().removeAll();
- for (int i = 0; i < N; ++i) {
- final InputMethodPreference pref = mInputMethodPreferenceList.get(i);
- pref.setOrder(i);
- getPreferenceScreen().addPreference(pref);
- InputMethodAndSubtypeUtilCompat.removeUnnecessaryNonPersistentPreference(pref);
- pref.updatePreferenceViews();
- }
- mAddVirtualKeyboardScreen.setIcon(R.drawable.ic_add_24dp);
- mAddVirtualKeyboardScreen.setOrder(N);
- getPreferenceScreen().addPreference(mAddVirtualKeyboardScreen);
- }
-
public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
new BaseSearchIndexProvider() {
@Override
diff --git a/src/com/android/settings/language/UserDictionaryForWorkPreferenceController.java b/src/com/android/settings/language/UserDictionaryForWorkPreferenceController.java
index 7ff8aec..5c13072 100644
--- a/src/com/android/settings/language/UserDictionaryForWorkPreferenceController.java
+++ b/src/com/android/settings/language/UserDictionaryForWorkPreferenceController.java
@@ -18,7 +18,6 @@
import android.app.settings.SettingsEnums;
import android.content.Context;
-import android.view.inputmethod.InputMethodSystemProperty;
import com.android.settings.R;
import com.android.settings.core.WorkProfilePreferenceController;
@@ -39,13 +38,4 @@
protected int getSourceMetricsCategory() {
return SettingsEnums.SETTINGS_LANGUAGE_CATEGORY;
}
-
- @AvailabilityStatus
- @Override
- public int getAvailabilityStatus() {
- if (!InputMethodSystemProperty.PER_PROFILE_IME_ENABLED) {
- return UNSUPPORTED_ON_DEVICE;
- }
- return super.getAvailabilityStatus();
- }
}
diff --git a/src/com/android/settings/localepicker/LocaleLinearLayoutManager.java b/src/com/android/settings/localepicker/LocaleLinearLayoutManager.java
index 9069812..5fb9440 100644
--- a/src/com/android/settings/localepicker/LocaleLinearLayoutManager.java
+++ b/src/com/android/settings/localepicker/LocaleLinearLayoutManager.java
@@ -117,39 +117,33 @@
final int position = this.getPosition(host);
boolean result = false;
- switch (action) {
- case R.id.action_drag_move_up:
- if (position > 0) {
- mAdapter.onItemMove(position, position - 1);
- result = true;
- }
- break;
- case R.id.action_drag_move_down:
- if (position + 1 < itemCount) {
- mAdapter.onItemMove(position, position + 1);
- result = true;
- }
- break;
- case R.id.action_drag_move_top:
- if (position != 0) {
- mAdapter.onItemMove(position, 0);
- result = true;
- }
- break;
- case R.id.action_drag_move_bottom:
- if (position != itemCount - 1) {
- mAdapter.onItemMove(position, itemCount - 1);
- result = true;
- }
- break;
- case R.id.action_drag_remove:
- if (itemCount > 1) {
- mAdapter.removeItem(position);
- result = true;
- }
- break;
- default:
- return super.performAccessibilityActionForItem(recycler, state, host, action, args);
+ if (action == R.id.action_drag_move_up) {
+ if (position > 0) {
+ mAdapter.onItemMove(position, position - 1);
+ result = true;
+ }
+ } else if (action == R.id.action_drag_move_down) {
+ if (position + 1 < itemCount) {
+ mAdapter.onItemMove(position, position + 1);
+ result = true;
+ }
+ } else if (action == R.id.action_drag_move_top) {
+ if (position != 0) {
+ mAdapter.onItemMove(position, 0);
+ result = true;
+ }
+ } else if (action == R.id.action_drag_move_bottom) {
+ if (position != itemCount - 1) {
+ mAdapter.onItemMove(position, itemCount - 1);
+ result = true;
+ }
+ } else if (action == R.id.action_drag_remove) {
+ if (itemCount > 1) {
+ mAdapter.removeItem(position);
+ result = true;
+ }
+ } else {
+ return super.performAccessibilityActionForItem(recycler, state, host, action, args);
}
if (result) {
diff --git a/src/com/android/settings/location/LocationFooterPreferenceController.java b/src/com/android/settings/location/LocationFooterPreferenceController.java
index 55fea9f..7c39fea 100644
--- a/src/com/android/settings/location/LocationFooterPreferenceController.java
+++ b/src/com/android/settings/location/LocationFooterPreferenceController.java
@@ -28,9 +28,6 @@
import androidx.preference.Preference;
import androidx.preference.PreferenceCategory;
-import com.android.settingslib.core.lifecycle.Lifecycle;
-import com.android.settingslib.core.lifecycle.LifecycleObserver;
-import com.android.settingslib.core.lifecycle.events.OnPause;
import com.android.settingslib.widget.FooterPreference;
import java.util.ArrayList;
@@ -41,24 +38,19 @@
/**
* Preference controller for location footer preference category
*/
-public class LocationFooterPreferenceController extends LocationBasePreferenceController
- implements LifecycleObserver, OnPause {
+public class LocationFooterPreferenceController extends LocationBasePreferenceController {
+
private static final String TAG = "LocationFooter";
private static final String KEY_LOCATION_FOOTER = "location_footer";
private static final Intent INJECT_INTENT =
new Intent(LocationManager.SETTINGS_FOOTER_DISPLAYED_ACTION);
- private final Context mContext;
- private final PackageManager mPackageManager;
- private Collection<ComponentName> mFooterInjectors;
- public LocationFooterPreferenceController(Context context, Lifecycle lifecycle) {
- super(context, lifecycle);
- mContext = context;
- mPackageManager = mContext.getPackageManager();
- mFooterInjectors = new ArrayList<>();
- if (lifecycle != null) {
- lifecycle.addObserver(this);
- }
+ private final PackageManager mPackageManager;
+
+ public LocationFooterPreferenceController(Context context) {
+ // we don't care location mode changes, so pass in a null lifecycle to disable listening
+ super(context, null);
+ mPackageManager = context.getPackageManager();
}
@Override
@@ -67,37 +59,30 @@
}
/**
- * Insert footer preferences. Send a {@link LocationManager#SETTINGS_FOOTER_DISPLAYED_ACTION}
- * broadcast to receivers who have injected a footer
+ * Insert footer preferences.
*/
@Override
public void updateState(Preference preference) {
PreferenceCategory category = (PreferenceCategory) preference;
category.removeAll();
- mFooterInjectors.clear();
Collection<FooterData> footerData = getFooterData();
for (FooterData data : footerData) {
- // Generate a footer preference with the given text
- FooterPreference footerPreference = new FooterPreference(preference.getContext());
- String footerString;
try {
- footerString =
+ String footerString =
mPackageManager
.getResourcesForApplication(data.applicationInfo)
.getString(data.footerStringRes);
+
+ // Generate a footer preference with the given text
+ FooterPreference footerPreference = new FooterPreference(preference.getContext());
+ footerPreference.setTitle(footerString);
+ category.addPreference(footerPreference);
} catch (NameNotFoundException exception) {
Log.w(
TAG,
"Resources not found for application "
+ data.applicationInfo.packageName);
- continue;
}
- footerPreference.setTitle(footerString);
- // Inject the footer
- category.addPreference(footerPreference);
- // Send broadcast to the injector announcing a footer has been injected
- sendBroadcastFooterDisplayed(data.componentName);
- mFooterInjectors.add(data.componentName);
}
}
@@ -117,36 +102,11 @@
}
/**
- * Send a {@link LocationManager#SETTINGS_FOOTER_REMOVED_ACTION} broadcast to footer injectors
- * when LocationFragment is on pause
- */
- @Override
- public void onPause() {
- // Send broadcast to the footer injectors. Notify them the footer is not visible.
- for (ComponentName componentName : mFooterInjectors) {
- final Intent intent = new Intent(LocationManager.SETTINGS_FOOTER_REMOVED_ACTION);
- intent.setComponent(componentName);
- mContext.sendBroadcast(intent);
- }
- }
-
- /**
- * Send a {@link LocationManager#SETTINGS_FOOTER_DISPLAYED_ACTION} broadcast to a footer
- * injector.
- */
- @VisibleForTesting
- void sendBroadcastFooterDisplayed(ComponentName componentName) {
- Intent intent = new Intent(LocationManager.SETTINGS_FOOTER_DISPLAYED_ACTION);
- intent.setComponent(componentName);
- mContext.sendBroadcast(intent);
- }
-
- /**
* Return a list of strings with text provided by ACTION_INJECT_FOOTER broadcast receivers.
*/
- private Collection<FooterData> getFooterData() {
+ private List<FooterData> getFooterData() {
// Fetch footer text from system apps
- final List<ResolveInfo> resolveInfos =
+ List<ResolveInfo> resolveInfos =
mPackageManager.queryBroadcastReceivers(
INJECT_INTENT, PackageManager.GET_META_DATA);
if (resolveInfos == null) {
@@ -158,10 +118,10 @@
Log.d(TAG, "Found broadcast receivers: " + resolveInfos);
}
- final Collection<FooterData> footerDataList = new ArrayList<>(resolveInfos.size());
+ List<FooterData> footerDataList = new ArrayList<>(resolveInfos.size());
for (ResolveInfo resolveInfo : resolveInfos) {
- final ActivityInfo activityInfo = resolveInfo.activityInfo;
- final ApplicationInfo appInfo = activityInfo.applicationInfo;
+ ActivityInfo activityInfo = resolveInfo.activityInfo;
+ ApplicationInfo appInfo = activityInfo.applicationInfo;
// If a non-system app tries to inject footer, ignore it
if ((appInfo.flags & ApplicationInfo.FLAG_SYSTEM) == 0) {
@@ -187,11 +147,7 @@
+ LocationManager.METADATA_SETTINGS_FOOTER_STRING);
continue;
}
- footerDataList.add(
- new FooterData(
- footerTextRes,
- appInfo,
- new ComponentName(activityInfo.packageName, activityInfo.name)));
+ footerDataList.add(new FooterData(footerTextRes, appInfo));
}
return footerDataList;
}
@@ -207,14 +163,9 @@
// Application info of receiver injecting this footer
final ApplicationInfo applicationInfo;
- // The component that injected the footer. It must be a receiver of broadcast
- // LocationManager.SETTINGS_FOOTER_DISPLAYED_ACTION
- final ComponentName componentName;
-
- FooterData(int footerRes, ApplicationInfo appInfo, ComponentName componentName) {
+ FooterData(int footerRes, ApplicationInfo appInfo) {
this.footerStringRes = footerRes;
this.applicationInfo = appInfo;
- this.componentName = componentName;
}
}
}
diff --git a/src/com/android/settings/location/LocationSettings.java b/src/com/android/settings/location/LocationSettings.java
index 7142486..21b031b 100644
--- a/src/com/android/settings/location/LocationSettings.java
+++ b/src/com/android/settings/location/LocationSettings.java
@@ -121,7 +121,7 @@
controllers.add(new RecentLocationRequestPreferenceController(context, fragment, lifecycle));
controllers.add(new LocationScanningPreferenceController(context));
controllers.add(new LocationServicePreferenceController(context, fragment, lifecycle));
- controllers.add(new LocationFooterPreferenceController(context, lifecycle));
+ controllers.add(new LocationFooterPreferenceController(context));
return controllers;
}
diff --git a/src/com/android/settings/location/RecentLocationAccessPreferenceController.java b/src/com/android/settings/location/RecentLocationAccessPreferenceController.java
index 2f0dafd..c835a51 100644
--- a/src/com/android/settings/location/RecentLocationAccessPreferenceController.java
+++ b/src/com/android/settings/location/RecentLocationAccessPreferenceController.java
@@ -64,7 +64,9 @@
@Override
public boolean isAvailable() {
- return false;
+ return Boolean.parseBoolean(
+ DeviceConfig.getProperty(DeviceConfig.NAMESPACE_PRIVACY,
+ Utils.PROPERTY_PERMISSIONS_HUB_ENABLED));
}
@Override
diff --git a/src/com/android/settings/media/MediaOutputIndicatorWorker.java b/src/com/android/settings/media/MediaOutputIndicatorWorker.java
index 0937d4b..7b0b3dd 100644
--- a/src/com/android/settings/media/MediaOutputIndicatorWorker.java
+++ b/src/com/android/settings/media/MediaOutputIndicatorWorker.java
@@ -74,7 +74,8 @@
@Override
public void onActiveDeviceChanged(CachedBluetoothDevice activeDevice, int bluetoothProfile) {
- if (bluetoothProfile == BluetoothProfile.A2DP) {
+ if (bluetoothProfile == BluetoothProfile.A2DP ||
+ bluetoothProfile == BluetoothProfile.HEARING_AID) {
notifySliceChange();
}
}
diff --git a/src/com/android/settings/network/AirplaneModePreferenceController.java b/src/com/android/settings/network/AirplaneModePreferenceController.java
index 5c1913b..b36fd9c 100644
--- a/src/com/android/settings/network/AirplaneModePreferenceController.java
+++ b/src/com/android/settings/network/AirplaneModePreferenceController.java
@@ -17,10 +17,13 @@
import static android.provider.SettingsSlicesContract.KEY_AIRPLANE_MODE;
+import android.content.ContentResolver;
import android.content.Context;
import android.content.Intent;
import android.content.pm.PackageManager;
+import android.net.Uri;
import android.os.SystemProperties;
+import android.provider.SettingsSlicesContract;
import androidx.fragment.app.Fragment;
import androidx.preference.Preference;
@@ -44,6 +47,15 @@
public static final int REQUEST_CODE_EXIT_ECM = 1;
+ /**
+ * Uri for Airplane mode Slice.
+ */
+ public static final Uri SLICE_URI = new Uri.Builder()
+ .scheme(ContentResolver.SCHEME_CONTENT)
+ .authority(SettingsSlicesContract.AUTHORITY)
+ .appendPath(SettingsSlicesContract.PATH_SETTING_ACTION)
+ .appendPath(SettingsSlicesContract.KEY_AIRPLANE_MODE)
+ .build();
private static final String EXIT_ECM_RESULT = "exit_ecm_result";
private Fragment mFragment;
@@ -78,6 +90,11 @@
}
@Override
+ public Uri getSliceUri() {
+ return SLICE_URI;
+ }
+
+ @Override
public void displayPreference(PreferenceScreen screen) {
super.displayPreference(screen);
if (isAvailable()) {
diff --git a/src/com/android/settings/network/NetworkScorerPicker.java b/src/com/android/settings/network/NetworkScorerPicker.java
index 52e4ed9..9ecab3b 100644
--- a/src/com/android/settings/network/NetworkScorerPicker.java
+++ b/src/com/android/settings/network/NetworkScorerPicker.java
@@ -31,7 +31,7 @@
import com.android.settings.R;
import com.android.settings.core.InstrumentedPreferenceFragment;
-import com.android.settings.widget.RadioButtonPreference;
+import com.android.settingslib.widget.RadioButtonPreference;
import java.util.List;
diff --git a/src/com/android/settings/network/OWNERS b/src/com/android/settings/network/OWNERS
new file mode 100644
index 0000000..97e431a
--- /dev/null
+++ b/src/com/android/settings/network/OWNERS
@@ -0,0 +1,5 @@
+# Default reviewers for this and subdirectories.
+andychou@google.com
+bonianchen@google.com
+
+# Emergency approvers in case the above are not available
diff --git a/src/com/android/settings/network/PrivateDnsModeDialogPreference.java b/src/com/android/settings/network/PrivateDnsModeDialogPreference.java
index 1655c69..0086fec 100644
--- a/src/com/android/settings/network/PrivateDnsModeDialogPreference.java
+++ b/src/com/android/settings/network/PrivateDnsModeDialogPreference.java
@@ -207,16 +207,12 @@
@Override
public void onCheckedChanged(RadioGroup group, int checkedId) {
- switch (checkedId) {
- case R.id.private_dns_mode_off:
- mMode = PRIVATE_DNS_MODE_OFF;
- break;
- case R.id.private_dns_mode_opportunistic:
- mMode = PRIVATE_DNS_MODE_OPPORTUNISTIC;
- break;
- case R.id.private_dns_mode_provider:
- mMode = PRIVATE_DNS_MODE_PROVIDER_HOSTNAME;
- break;
+ if (checkedId == R.id.private_dns_mode_off) {
+ mMode = PRIVATE_DNS_MODE_OFF;
+ } else if (checkedId == R.id.private_dns_mode_opportunistic) {
+ mMode = PRIVATE_DNS_MODE_OPPORTUNISTIC;
+ } else if (checkedId == R.id.private_dns_mode_provider) {
+ mMode = PRIVATE_DNS_MODE_PROVIDER_HOSTNAME;
}
updateDialogInfo();
}
diff --git a/src/com/android/settings/network/PrivateDnsPreferenceController.java b/src/com/android/settings/network/PrivateDnsPreferenceController.java
index 47c3a95..84cae88 100644
--- a/src/com/android/settings/network/PrivateDnsPreferenceController.java
+++ b/src/com/android/settings/network/PrivateDnsPreferenceController.java
@@ -126,11 +126,7 @@
case PRIVATE_DNS_MODE_OFF:
return res.getString(R.string.private_dns_mode_off);
case PRIVATE_DNS_MODE_OPPORTUNISTIC:
- // TODO (b/79122154) : create a string specifically for this, instead of
- // hijacking a string from notifications. This is necessary at this time
- // because string freeze is in the past and this string has the right
- // content at this moment.
- return dnsesResolved ? res.getString(R.string.switch_on_text)
+ return dnsesResolved ? res.getString(R.string.private_dns_mode_on)
: res.getString(R.string.private_dns_mode_opportunistic);
case PRIVATE_DNS_MODE_PROVIDER_HOSTNAME:
return dnsesResolved
diff --git a/src/com/android/settings/network/telephony/Enhanced4gLtePreferenceController.java b/src/com/android/settings/network/telephony/Enhanced4gLtePreferenceController.java
index ca45a32..9069c35 100644
--- a/src/com/android/settings/network/telephony/Enhanced4gLtePreferenceController.java
+++ b/src/com/android/settings/network/telephony/Enhanced4gLtePreferenceController.java
@@ -72,6 +72,7 @@
@Override
public int getAvailabilityStatus(int subId) {
+ init(subId);
final PersistableBundle carrierConfig = mCarrierConfigManager.getConfigForSubId(subId);
final boolean isVisible = subId != SubscriptionManager.INVALID_SUBSCRIPTION_ID
&& mImsManager != null && carrierConfig != null
@@ -105,9 +106,9 @@
super.updateState(preference);
final SwitchPreference switchPreference = (SwitchPreference) preference;
final boolean show4GForLTE = mCarrierConfig.getBoolean(
- CarrierConfigManager.KEY_SHOW_4G_FOR_LTE_DATA_ICON_BOOL);
+ CarrierConfigManager.KEY_SHOW_4G_FOR_LTE_DATA_ICON_BOOL);
int variant4glteTitleIndex = mCarrierConfig.getInt(
- CarrierConfigManager.KEY_ENHANCED_4G_LTE_TITLE_VARIANT_INT);
+ CarrierConfigManager.KEY_ENHANCED_4G_LTE_TITLE_VARIANT_INT);
if (variant4glteTitleIndex != VARIANT_TITLE_ADVANCED_CALL) {
variant4glteTitleIndex = show4GForLTE ? VARIANT_TITLE_4G_CALLING : VARIANT_TITLE_VOLTE;
@@ -135,6 +136,9 @@
}
public Enhanced4gLtePreferenceController init(int subId) {
+ if (mSubId == subId) {
+ return this;
+ }
mSubId = subId;
mTelephonyManager = TelephonyManager.from(mContext).createForSubscriptionId(mSubId);
mCarrierConfig = mCarrierConfigManager.getConfigForSubId(mSubId);
diff --git a/src/com/android/settings/network/telephony/MobileNetworkActivity.java b/src/com/android/settings/network/telephony/MobileNetworkActivity.java
index 9912b4e..99de60e 100644
--- a/src/com/android/settings/network/telephony/MobileNetworkActivity.java
+++ b/src/com/android/settings/network/telephony/MobileNetworkActivity.java
@@ -22,6 +22,7 @@
import android.content.Intent;
import android.content.IntentFilter;
import android.os.Bundle;
+import android.os.UserManager;
import android.provider.Settings;
import android.telephony.CarrierConfigManager;
import android.telephony.SubscriptionInfo;
@@ -87,6 +88,10 @@
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
+ final UserManager userManager = this.getSystemService(UserManager.class);
+ if (!userManager.isAdminUser()) {
+ this.finish();
+ }
if (FeatureFlagPersistent.isEnabled(this, FeatureFlags.NETWORK_INTERNET_V2)) {
setContentView(R.layout.mobile_network_settings_container_v2);
diff --git a/src/com/android/settings/network/telephony/MobileNetworkSettings.java b/src/com/android/settings/network/telephony/MobileNetworkSettings.java
index 8d83ef2..0a63e73 100644
--- a/src/com/android/settings/network/telephony/MobileNetworkSettings.java
+++ b/src/com/android/settings/network/telephony/MobileNetworkSettings.java
@@ -119,7 +119,7 @@
MobileNetworkUtils.getSearchableSubscriptionId(context));
if (FeatureFlagPersistent.isEnabled(getContext(), FeatureFlags.NETWORK_INTERNET_V2) &&
- mSubId != SubscriptionManager.INVALID_SUBSCRIPTION_ID) {
+ mSubId != SubscriptionManager.INVALID_SUBSCRIPTION_ID) {
return Arrays.asList(
new DataUsageSummaryPreferenceController(getActivity(), getSettingsLifecycle(),
this, mSubId));
@@ -275,7 +275,10 @@
final ArrayList<SearchIndexableResource> result = new ArrayList<>();
final SearchIndexableResource sir = new SearchIndexableResource(context);
- sir.xmlResId = R.xml.mobile_network_settings;
+ sir.xmlResId = FeatureFlagPersistent.isEnabled(context,
+ FeatureFlags.NETWORK_INTERNET_V2)
+ ? R.xml.mobile_network_settings_v2
+ : R.xml.mobile_network_settings;
result.add(sir);
return result;
}
diff --git a/src/com/android/settings/network/telephony/NetworkScanHelper.java b/src/com/android/settings/network/telephony/NetworkScanHelper.java
index 1117a84..c4839b6 100644
--- a/src/com/android/settings/network/telephony/NetworkScanHelper.java
+++ b/src/com/android/settings/network/telephony/NetworkScanHelper.java
@@ -31,6 +31,7 @@
import com.google.common.util.concurrent.FutureCallback;
import com.google.common.util.concurrent.Futures;
import com.google.common.util.concurrent.ListenableFuture;
+import com.google.common.util.concurrent.MoreExecutors;
import com.google.common.util.concurrent.SettableFuture;
import java.lang.annotation.Retention;
@@ -179,7 +180,7 @@
int errCode = Integer.parseInt(t.getMessage());
onError(errCode);
}
- });
+ }, MoreExecutors.directExecutor());
mExecutor.execute(new NetworkScanSyncTask(
mTelephonyManager, (SettableFuture) mNetworkScanFuture));
} else if (type == NETWORK_SCAN_TYPE_INCREMENTAL_RESULTS) {
diff --git a/src/com/android/settings/nfc/OWNERS b/src/com/android/settings/nfc/OWNERS
index 2017826..4677625 100644
--- a/src/com/android/settings/nfc/OWNERS
+++ b/src/com/android/settings/nfc/OWNERS
@@ -1,5 +1,6 @@
# Default reviewers for this and subdirectories.
-rmojumder@google.com
+jackcwyu@google.com
+georgekgchang@google.com
# Emergency approvers in case the above are not available
zachoverflow@google.com
diff --git a/src/com/android/settings/notification/BubblePreferenceController.java b/src/com/android/settings/notification/BubblePreferenceController.java
index b68f11d..b57a911 100644
--- a/src/com/android/settings/notification/BubblePreferenceController.java
+++ b/src/com/android/settings/notification/BubblePreferenceController.java
@@ -16,7 +16,7 @@
package com.android.settings.notification;
-import static android.provider.Settings.Secure.NOTIFICATION_BUBBLES;
+import static android.provider.Settings.Global.NOTIFICATION_BUBBLES;
import android.annotation.Nullable;
import android.content.Context;
@@ -113,7 +113,7 @@
}
private boolean isGloballyEnabled() {
- return Settings.Secure.getInt(mContext.getContentResolver(),
+ return Settings.Global.getInt(mContext.getContentResolver(),
NOTIFICATION_BUBBLES, SYSTEM_WIDE_OFF) == SYSTEM_WIDE_ON;
}
@@ -124,7 +124,7 @@
backend.setAllowBubbles(pkg, uid, false);
// changing the global settings will cause the observer on the host page to reload
// correct preference state
- Settings.Secure.putInt(mContext.getContentResolver(),
+ Settings.Global.putInt(mContext.getContentResolver(),
NOTIFICATION_BUBBLES, SYSTEM_WIDE_OFF);
}
@@ -134,7 +134,7 @@
backend.setAllowBubbles(pkg, uid, true);
// changing the global settings will cause the observer on the host page to reload
// correct preference state
- Settings.Secure.putInt(mContext.getContentResolver(),
+ Settings.Global.putInt(mContext.getContentResolver(),
NOTIFICATION_BUBBLES, SYSTEM_WIDE_ON);
}
}
diff --git a/src/com/android/settings/notification/BubbleSummaryPreferenceController.java b/src/com/android/settings/notification/BubbleSummaryPreferenceController.java
index b1632c4..cc687cf 100644
--- a/src/com/android/settings/notification/BubbleSummaryPreferenceController.java
+++ b/src/com/android/settings/notification/BubbleSummaryPreferenceController.java
@@ -16,7 +16,7 @@
package com.android.settings.notification;
-import static android.provider.Settings.Secure.NOTIFICATION_BUBBLES;
+import static android.provider.Settings.Global.NOTIFICATION_BUBBLES;
import android.app.settings.SettingsEnums;
import android.content.Context;
@@ -100,7 +100,7 @@
}
private boolean isGloballyEnabled() {
- return Settings.Secure.getInt(mContext.getContentResolver(),
+ return Settings.Global.getInt(mContext.getContentResolver(),
NOTIFICATION_BUBBLES, SYSTEM_WIDE_OFF) == SYSTEM_WIDE_ON;
}
}
diff --git a/src/com/android/settings/notification/GentleNotificationsPreferenceController.java b/src/com/android/settings/notification/GentleNotificationsPreferenceController.java
index ea16e72..67a4707 100644
--- a/src/com/android/settings/notification/GentleNotificationsPreferenceController.java
+++ b/src/com/android/settings/notification/GentleNotificationsPreferenceController.java
@@ -16,8 +16,6 @@
package com.android.settings.notification;
-import static android.provider.Settings.Secure.NOTIFICATION_BUBBLES;
-
import android.content.Context;
import android.provider.Settings;
diff --git a/src/com/android/settings/notification/GlobalBubblePermissionObserverMixin.java b/src/com/android/settings/notification/GlobalBubblePermissionObserverMixin.java
index 398931d..0118a95 100644
--- a/src/com/android/settings/notification/GlobalBubblePermissionObserverMixin.java
+++ b/src/com/android/settings/notification/GlobalBubblePermissionObserverMixin.java
@@ -47,8 +47,8 @@
public void onStart() {
mContext.getContentResolver().registerContentObserver(
- Settings.Secure.getUriFor(
- Settings.Secure.NOTIFICATION_BUBBLES),
+ Settings.Global.getUriFor(
+ Settings.Global.NOTIFICATION_BUBBLES),
false /* notifyForDescendants */,
this /* observer */);
}
diff --git a/src/com/android/settings/notification/RingtonePreferenceControllerBase.java b/src/com/android/settings/notification/RingtonePreferenceControllerBase.java
index c82afb4..29b9266 100644
--- a/src/com/android/settings/notification/RingtonePreferenceControllerBase.java
+++ b/src/com/android/settings/notification/RingtonePreferenceControllerBase.java
@@ -20,6 +20,7 @@
import android.media.Ringtone;
import android.media.RingtoneManager;
import android.net.Uri;
+import android.util.Log;
import androidx.preference.Preference;
@@ -54,11 +55,12 @@
mContext, getRingtoneType());
final CharSequence summary;
- if (ringtoneUri == null) {
- summary = mContext.getString(com.android.internal.R.string.ringtone_silent);
- } else {
+ try {
summary = Ringtone.getTitle(
mContext, ringtoneUri, false /* followSettingsUri */, true /* allowRemote */);
+ } catch (IllegalArgumentException e) {
+ Log.w(TAG, "Error getting ringtone summary.", e);
+ return;
}
if (summary != null) {
ThreadUtils.postOnMainThread(() -> preference.setSummary(summary));
diff --git a/src/com/android/settings/notification/ZenCustomRuleBlockedEffectsSettings.java b/src/com/android/settings/notification/ZenCustomRuleBlockedEffectsSettings.java
index b407445..bb48c26 100644
--- a/src/com/android/settings/notification/ZenCustomRuleBlockedEffectsSettings.java
+++ b/src/com/android/settings/notification/ZenCustomRuleBlockedEffectsSettings.java
@@ -32,8 +32,6 @@
@Override
public void onCreate(Bundle bundle) {
super.onCreate(bundle);
- mFooterPreferenceMixin.createFooterPreference().setTitle(
- R.string.zen_mode_blocked_effects_footer);
}
@Override
diff --git a/src/com/android/settings/notification/ZenModeBackend.java b/src/com/android/settings/notification/ZenModeBackend.java
index 4c9cebe..fe9df18 100644
--- a/src/com/android/settings/notification/ZenModeBackend.java
+++ b/src/com/android/settings/notification/ZenModeBackend.java
@@ -468,14 +468,14 @@
}
}
- public String getStarredContactsSummary() {
+ public String getStarredContactsSummary(Context context) {
List<String> starredContacts = getStarredContacts();
int numStarredContacts = starredContacts.size();
List<String> displayContacts = new ArrayList<>();
if (numStarredContacts == 0) {
- displayContacts.add(mContext.getString(R.string.zen_mode_from_none));
+ displayContacts.add(context.getString(R.string.zen_mode_from_none));
} else {
for (int i = 0; i < 2 && i < numStarredContacts; i++) {
displayContacts.add(starredContacts.get(i));
@@ -484,7 +484,7 @@
if (numStarredContacts == 3) {
displayContacts.add(starredContacts.get(2));
} else if (numStarredContacts > 2) {
- displayContacts.add(mContext.getResources().getQuantityString(
+ displayContacts.add(context.getResources().getQuantityString(
R.plurals.zen_mode_starred_contacts_summary_additional_contacts,
numStarredContacts - 2, numStarredContacts - 2));
}
diff --git a/src/com/android/settings/notification/ZenModeBlockedEffectsSettings.java b/src/com/android/settings/notification/ZenModeBlockedEffectsSettings.java
index 613bd35..9cb3f59 100644
--- a/src/com/android/settings/notification/ZenModeBlockedEffectsSettings.java
+++ b/src/com/android/settings/notification/ZenModeBlockedEffectsSettings.java
@@ -45,8 +45,6 @@
@Override
public void onCreate(Bundle icicle) {
super.onCreate(icicle);
- mFooterPreferenceMixin.createFooterPreference().setTitle(
- R.string.zen_mode_blocked_effects_footer);
}
@Override
diff --git a/src/com/android/settings/notification/ZenModeStarredContactsPreferenceController.java b/src/com/android/settings/notification/ZenModeStarredContactsPreferenceController.java
index e5982eb..05b1474 100644
--- a/src/com/android/settings/notification/ZenModeStarredContactsPreferenceController.java
+++ b/src/com/android/settings/notification/ZenModeStarredContactsPreferenceController.java
@@ -84,7 +84,7 @@
@Override
public CharSequence getSummary() {
- return mBackend.getStarredContactsSummary();
+ return mBackend.getStarredContactsSummary(mContext);
}
@Override
diff --git a/src/com/android/settings/notification/ZenRuleStarredContactsPreferenceController.java b/src/com/android/settings/notification/ZenRuleStarredContactsPreferenceController.java
index 8a227a1..4a6c1c2 100644
--- a/src/com/android/settings/notification/ZenRuleStarredContactsPreferenceController.java
+++ b/src/com/android/settings/notification/ZenRuleStarredContactsPreferenceController.java
@@ -83,7 +83,7 @@
@Override
public CharSequence getSummary() {
- return mBackend.getStarredContactsSummary();
+ return mBackend.getStarredContactsSummary(mContext);
}
@Override
diff --git a/src/com/android/settings/panel/InternetConnectivityPanel.java b/src/com/android/settings/panel/InternetConnectivityPanel.java
index ae72427..db0c5e3 100644
--- a/src/com/android/settings/panel/InternetConnectivityPanel.java
+++ b/src/com/android/settings/panel/InternetConnectivityPanel.java
@@ -23,6 +23,7 @@
import android.provider.Settings;
import com.android.settings.R;
+import com.android.settings.network.AirplaneModePreferenceController;
import com.android.settings.slices.CustomSliceRegistry;
import java.util.ArrayList;
@@ -57,7 +58,7 @@
final List<Uri> uris = new ArrayList<>();
uris.add(CustomSliceRegistry.WIFI_SLICE_URI);
uris.add(CustomSliceRegistry.MOBILE_DATA_SLICE_URI);
- uris.add(CustomSliceRegistry.AIRPLANE_URI);
+ uris.add(AirplaneModePreferenceController.SLICE_URI);
return uris;
}
diff --git a/src/com/android/settings/panel/PanelFragment.java b/src/com/android/settings/panel/PanelFragment.java
index 79d1ac5..54d9e8d 100644
--- a/src/com/android/settings/panel/PanelFragment.java
+++ b/src/com/android/settings/panel/PanelFragment.java
@@ -39,9 +39,9 @@
import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentActivity;
import androidx.lifecycle.LiveData;
-import androidx.slice.Slice;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
+import androidx.slice.Slice;
import androidx.slice.SliceMetadata;
import androidx.slice.widget.SliceLiveData;
@@ -50,9 +50,11 @@
import com.android.settings.overlay.FeatureFactory;
import com.android.settings.panel.PanelLoggingContract.PanelClosedKeys;
import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
+
import com.google.android.setupdesign.DividerItemDecoration;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.List;
public class PanelFragment extends Fragment {
@@ -222,8 +224,9 @@
/**
* Watching for the {@link Slice} to load.
* <p>
- * If the Slice comes back {@code null} or with the Error attribute, remove the
- * Slice data from the list, and mark the Slice as loaded.
+ * If the Slice comes back {@code null} or with the Error attribute, if slice
+ * uri is not in the whitelist, remove the Slice data from the list, otherwise
+ * keep the Slice data.
* <p>
* If the Slice has come back fully loaded, then mark the Slice as loaded. No
* other actions required since we already have the Slice data in the list.
@@ -235,7 +238,12 @@
*/
final SliceMetadata metadata = SliceMetadata.from(getActivity(), slice);
if (slice == null || metadata.isErrorSlice()) {
- mSliceLiveData.remove(sliceLiveData);
+ final List<String> whiteList = Arrays.asList(
+ getResources().getStringArray(
+ R.array.config_panel_keep_observe_uri));
+ if (!whiteList.contains(uri.toString())) {
+ mSliceLiveData.remove(sliceLiveData);
+ }
mPanelSlicesLoaderCountdownLatch.markSliceLoaded(uri);
} else if (metadata.getLoadingState() == SliceMetadata.LOADED_ALL) {
mPanelSlicesLoaderCountdownLatch.markSliceLoaded(uri);
diff --git a/src/com/android/settings/panel/PanelSlicesAdapter.java b/src/com/android/settings/panel/PanelSlicesAdapter.java
index 0f525cc..21e1b3a 100644
--- a/src/com/android/settings/panel/PanelSlicesAdapter.java
+++ b/src/com/android/settings/panel/PanelSlicesAdapter.java
@@ -109,7 +109,7 @@
super(view);
sliceView = view.findViewById(R.id.slice_view);
sliceView.setMode(SliceView.MODE_LARGE);
- sliceView.showTitleItems(true);
+ sliceView.setShowTitleItems(true);
}
public void onBind(LiveData<Slice> sliceLiveData) {
@@ -117,7 +117,7 @@
// Do not show the divider above media devices switcher slice per request
final Slice slice = sliceLiveData.getValue();
- if (slice != null && slice.getUri().equals(MEDIA_OUTPUT_INDICATOR_SLICE_URI)) {
+ if (slice == null || slice.getUri().equals(MEDIA_OUTPUT_INDICATOR_SLICE_URI)) {
mDividerAllowedAbove = false;
}
diff --git a/src/com/android/settings/panel/SettingsPanelActivity.java b/src/com/android/settings/panel/SettingsPanelActivity.java
index 749a46e..8693186 100644
--- a/src/com/android/settings/panel/SettingsPanelActivity.java
+++ b/src/com/android/settings/panel/SettingsPanelActivity.java
@@ -32,6 +32,7 @@
import com.android.internal.annotations.VisibleForTesting;
import com.android.settings.R;
+import com.android.settings.core.HideNonSystemOverlayMixin;
/**
* Dialog Activity to host Settings Slices.
@@ -62,6 +63,7 @@
protected void onCreate(@Nullable Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
createOrUpdatePanel(true /* shouldForceCreation */);
+ getLifecycle().addObserver(new HideNonSystemOverlayMixin(this));
}
@Override
diff --git a/src/com/android/settings/password/ChooseLockGeneric.java b/src/com/android/settings/password/ChooseLockGeneric.java
index 2a7de05..4e2e90d 100644
--- a/src/com/android/settings/password/ChooseLockGeneric.java
+++ b/src/com/android/settings/password/ChooseLockGeneric.java
@@ -74,8 +74,6 @@
import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
import com.android.settingslib.RestrictedLockUtilsInternal;
import com.android.settingslib.RestrictedPreference;
-import com.android.settingslib.widget.FooterPreference;
-import com.android.settingslib.widget.FooterPreferenceMixinCompat;
import java.util.List;
@@ -112,6 +110,7 @@
public static final String MINIMUM_QUALITY_KEY = "minimum_quality";
public static final String HIDE_DISABLED_PREFS = "hide_disabled_prefs";
public static final String TAG_FRP_WARNING_DIALOG = "frp_warning_dialog";
+ public static final String KEY_LOCK_SETTINGS_FOOTER ="lock_settings_footer";
/**
* Boolean extra determining whether a "screen lock options" button should be shown. This
@@ -499,11 +498,12 @@
protected void addPreferences() {
addPreferencesFromResource(R.xml.security_settings_picker);
+ final Preference footer = findPreference(KEY_LOCK_SETTINGS_FOOTER);
if (!TextUtils.isEmpty(mCallerAppName) && !mIsCallingAppAdmin) {
- FooterPreferenceMixinCompat footerMixin =
- new FooterPreferenceMixinCompat(this, getSettingsLifecycle());
- FooterPreference footer = footerMixin.createFooterPreference();
+ footer.setVisible(true);
footer.setTitle(getFooterString());
+ } else {
+ footer.setVisible(false);
}
// Used for testing purposes
diff --git a/src/com/android/settings/password/ConfirmLockPassword.java b/src/com/android/settings/password/ConfirmLockPassword.java
index f2b5a35..2992ebe 100644
--- a/src/com/android/settings/password/ConfirmLockPassword.java
+++ b/src/com/android/settings/password/ConfirmLockPassword.java
@@ -492,15 +492,11 @@
}
public void onClick(View v) {
- switch (v.getId()) {
- case R.id.next_button:
- handleNext();
- break;
-
- case R.id.cancel_button:
- getActivity().setResult(RESULT_CANCELED);
- getActivity().finish();
- break;
+ if (v.getId() == R.id.next_button) {
+ handleNext();
+ } else if (v.getId() == R.id.cancel_button) {
+ getActivity().setResult(RESULT_CANCELED);
+ getActivity().finish();
}
}
diff --git a/src/com/android/settings/password/PasswordUtils.java b/src/com/android/settings/password/PasswordUtils.java
index 1ead492..5b75033 100644
--- a/src/com/android/settings/password/PasswordUtils.java
+++ b/src/com/android/settings/password/PasswordUtils.java
@@ -89,7 +89,8 @@
/* initialPid= */ -1,
getCallingAppPackageName(activityToken),
userId,
- message);
+ message,
+ false);
} catch (RemoteException e) {
Log.v(TAG, "Could not talk to activity manager.", e);
}
diff --git a/src/com/android/settings/privacy/PermissionBarChartPreferenceController.java b/src/com/android/settings/privacy/PermissionBarChartPreferenceController.java
index 28533df..087fdf9 100644
--- a/src/com/android/settings/privacy/PermissionBarChartPreferenceController.java
+++ b/src/com/android/settings/privacy/PermissionBarChartPreferenceController.java
@@ -89,7 +89,10 @@
@Override
public int getAvailabilityStatus() {
- return UNSUPPORTED_ON_DEVICE;
+ return Boolean.parseBoolean(
+ DeviceConfig.getProperty(DeviceConfig.NAMESPACE_PRIVACY,
+ com.android.settings.Utils.PROPERTY_PERMISSIONS_HUB_ENABLED)) ?
+ AVAILABLE_UNSEARCHABLE : UNSUPPORTED_ON_DEVICE;
}
@Override
@@ -120,10 +123,13 @@
return;
}
+ // Add a shadow animation to action bar scroll only when the chart is available.
+ com.android.settings.Utils.setActionBarShadowAnimation(mParent.getActivity(),
+ mParent.getSettingsLifecycle(), mParent.getListView());
// We don't hide chart when we have existing data.
mBarChartPreference.updateLoadingState(mOldUsageInfos.isEmpty() /* isLoading */);
// But we still need to hint user with progress bar that we are updating new usage data.
- mParent.setLoadingEnabled(true /* enabled */);
+ mParent.showPinnedHeader(true);
retrievePermissionUsageData();
}
@@ -159,7 +165,7 @@
}
mBarChartPreference.updateLoadingState(false /* isLoading */);
- mParent.setLoadingEnabled(false /* enabled */);
+ mParent.showPinnedHeader(false);
}
private void retrievePermissionUsageData() {
diff --git a/src/com/android/settings/privacy/PrivacyDashboardFragment.java b/src/com/android/settings/privacy/PrivacyDashboardFragment.java
index fa21f9d..af83ec1 100644
--- a/src/com/android/settings/privacy/PrivacyDashboardFragment.java
+++ b/src/com/android/settings/privacy/PrivacyDashboardFragment.java
@@ -45,11 +45,6 @@
private static final String KEY_NOTIFICATION_WORK_PROFILE_NOTIFICATIONS =
"privacy_lock_screen_work_profile_notifications";
- @VisibleForTesting
- View mProgressHeader;
- @VisibleForTesting
- View mProgressAnimation;
-
@Override
public int getMetricsCategory() {
return SettingsEnums.TOP_LEVEL_PRIVACY;
@@ -84,23 +79,13 @@
@Override
public void onViewCreated(View view, Bundle savedInstanceState) {
super.onViewCreated(view, savedInstanceState);
- Utils.setActionBarShadowAnimation(getActivity(), getSettingsLifecycle(), getListView());
initLoadingBar();
}
@VisibleForTesting
void initLoadingBar() {
- mProgressHeader = setPinnedHeaderView(R.layout.progress_header);
- mProgressAnimation = mProgressHeader.findViewById(R.id.progress_bar_animation);
- setLoadingEnabled(false);
- }
-
- @VisibleForTesting
- void setLoadingEnabled(boolean enabled) {
- if (mProgressHeader != null && mProgressAnimation != null) {
- mProgressHeader.setVisibility(enabled ? View.VISIBLE : View.INVISIBLE);
- mProgressAnimation.setVisibility(enabled ? View.VISIBLE : View.INVISIBLE);
- }
+ setPinnedHeaderView(R.layout.progress_header);
+ showPinnedHeader(false);
}
private static List<AbstractPreferenceController> buildPreferenceControllers(
diff --git a/src/com/android/settings/sim/OWNERS b/src/com/android/settings/sim/OWNERS
new file mode 100644
index 0000000..97e431a
--- /dev/null
+++ b/src/com/android/settings/sim/OWNERS
@@ -0,0 +1,5 @@
+# Default reviewers for this and subdirectories.
+andychou@google.com
+bonianchen@google.com
+
+# Emergency approvers in case the above are not available
diff --git a/src/com/android/settings/sim/SimSelectNotification.java b/src/com/android/settings/sim/SimSelectNotification.java
index fb83a4d..7153d15 100644
--- a/src/com/android/settings/sim/SimSelectNotification.java
+++ b/src/com/android/settings/sim/SimSelectNotification.java
@@ -202,7 +202,7 @@
Notification.Builder builder =
new Notification.Builder(context, SIM_SELECT_NOTIFICATION_CHANNEL)
- .setSmallIcon(R.drawable.ic_sim_card_alert_white_48dp)
+ .setSmallIcon(R.drawable.ic_sim_alert)
.setColor(context.getColor(R.color.sim_noitification))
.setContentTitle(resources.getText(R.string.sim_notification_title))
.setContentText(resources.getText(R.string.sim_notification_summary))
@@ -282,7 +282,7 @@
Notification.Builder builder =
new Notification.Builder(context, SIM_WARNING_NOTIFICATION_CHANNEL)
- .setSmallIcon(R.drawable.ic_sim_card_alert_white_48dp)
+ .setSmallIcon(R.drawable.ic_sim_alert)
.setColor(context.getColor(R.color.sim_noitification))
.setContentTitle(resources.getText(
R.string.sim_combination_warning_notification_title))
diff --git a/src/com/android/settings/slices/CustomSliceRegistry.java b/src/com/android/settings/slices/CustomSliceRegistry.java
index 946a9d3..d5b631a 100644
--- a/src/com/android/settings/slices/CustomSliceRegistry.java
+++ b/src/com/android/settings/slices/CustomSliceRegistry.java
@@ -58,17 +58,7 @@
public class CustomSliceRegistry {
/**
- * Uri for Airplane mode Slice.
- */
- public static final Uri AIRPLANE_URI = new Uri.Builder()
- .scheme(ContentResolver.SCHEME_CONTENT)
- .authority(SettingsSlicesContract.AUTHORITY)
- .appendPath(SettingsSlicesContract.PATH_SETTING_ACTION)
- .appendPath(SettingsSlicesContract.KEY_AIRPLANE_MODE)
- .build();
-
- /**
- * Uri for Contextual Adaptive Sleep Slice
+ * Uri for Contextual Adaptive Sleep Slice
*/
public static final Uri CONTEXTUAL_ADAPTIVE_SLEEP_URI = new Uri.Builder()
.scheme(ContentResolver.SCHEME_CONTENT)
diff --git a/src/com/android/settings/slices/SettingsSliceProvider.java b/src/com/android/settings/slices/SettingsSliceProvider.java
index 9b5fbd8..8a6496f 100644
--- a/src/com/android/settings/slices/SettingsSliceProvider.java
+++ b/src/com/android/settings/slices/SettingsSliceProvider.java
@@ -20,7 +20,6 @@
import android.app.PendingIntent;
import android.app.slice.SliceManager;
-import android.content.ContentResolver;
import android.content.Context;
import android.content.Intent;
import android.content.IntentFilter;
@@ -57,6 +56,7 @@
import java.util.Map;
import java.util.Set;
import java.util.WeakHashMap;
+import java.util.stream.Collectors;
/**
* A {@link SliceProvider} for Settings to enabled inline results in system apps.
@@ -70,7 +70,7 @@
* return an stub {@link Slice} with the correct {@link Uri} immediately. In the background, the
* data corresponding to the key in the {@link Uri} is read by {@link SlicesDatabaseAccessor}, and
* the entire row is converted into a {@link SliceData}. Once complete, it is stored in
- * {@link #mSliceDataCache}, and then an update sent via the Slice framework to the Slice.
+ * {@link #mSliceWeakDataCache}, and then an update sent via the Slice framework to the Slice.
* The {@link Slice} displayed by the Slice-presenter will re-query this Slice-provider and find
* the {@link SliceData} cached to build the full {@link Slice}.
*
@@ -113,10 +113,20 @@
public static final String EXTRA_SLICE_KEY = "com.android.settings.slice.extra.key";
/**
- * Boolean extra to indicate if the Slice is platform-defined.
+ * A list of custom slice uris that are supported publicly. This is a subset of slices defined
+ * in {@link CustomSliceRegistry}. Things here are exposed publicly so all clients with proper
+ * permission can use them.
*/
- public static final String EXTRA_SLICE_PLATFORM_DEFINED =
- "com.android.settings.slice.extra.platform";
+ private static final List<Uri> PUBLICLY_SUPPORTED_CUSTOM_SLICE_URIS =
+ Arrays.asList(
+ CustomSliceRegistry.BLUETOOTH_URI,
+ CustomSliceRegistry.FLASHLIGHT_SLICE_URI,
+ CustomSliceRegistry.LOCATION_SLICE_URI,
+ CustomSliceRegistry.MOBILE_DATA_SLICE_URI,
+ CustomSliceRegistry.WIFI_CALLING_URI,
+ CustomSliceRegistry.WIFI_SLICE_URI,
+ CustomSliceRegistry.ZEN_MODE_SLICE_URI
+ );
private static final KeyValueListParser KEY_VALUE_LIST_PARSER = new KeyValueListParser(',');
@@ -264,37 +274,30 @@
}
final String authority = uri.getAuthority();
- final String pathPrefix = uri.getPath();
- final boolean isPathEmpty = pathPrefix.isEmpty();
-
- // No path nor authority. Return all possible Uris.
- if (isPathEmpty && TextUtils.isEmpty(authority)) {
- final List<String> platformKeys = mSlicesDatabaseAccessor.getSliceKeys(
- true /* isPlatformSlice */);
- final List<String> oemKeys = mSlicesDatabaseAccessor.getSliceKeys(
- false /* isPlatformSlice */);
- descendants.addAll(buildUrisFromKeys(platformKeys, SettingsSlicesContract.AUTHORITY));
- descendants.addAll(buildUrisFromKeys(oemKeys, SettingsSliceProvider.SLICE_AUTHORITY));
- descendants.addAll(getSpecialCaseUris(true /* isPlatformSlice */));
- descendants.addAll(getSpecialCaseUris(false /* isPlatformSlice */));
-
- return descendants;
- }
+ final String path = uri.getPath();
+ final boolean isPathEmpty = path.isEmpty();
// Path is anything but empty, "action", or "intent". Return empty list.
if (!isPathEmpty
- && !TextUtils.equals(pathPrefix, "/" + SettingsSlicesContract.PATH_SETTING_ACTION)
- && !TextUtils.equals(pathPrefix,
- "/" + SettingsSlicesContract.PATH_SETTING_INTENT)) {
+ && !TextUtils.equals(path, "/" + SettingsSlicesContract.PATH_SETTING_ACTION)
+ && !TextUtils.equals(path, "/" + SettingsSlicesContract.PATH_SETTING_INTENT)) {
// Invalid path prefix, there are no valid Uri descendants.
return descendants;
}
- // Can assume authority belongs to the provider. Return all Uris for the authority.
- final boolean isPlatformUri = TextUtils.equals(authority, SettingsSlicesContract.AUTHORITY);
- final List<String> keys = mSlicesDatabaseAccessor.getSliceKeys(isPlatformUri);
- descendants.addAll(buildUrisFromKeys(keys, authority));
- descendants.addAll(getSpecialCaseUris(isPlatformUri));
+ // Add all descendants from db with matching authority.
+ descendants.addAll(mSlicesDatabaseAccessor.getSliceUris(authority));
+
+ if (isPathEmpty && TextUtils.isEmpty(authority)) {
+ // No path nor authority. Return all possible Uris by adding all special slice uri
+ descendants.addAll(PUBLICLY_SUPPORTED_CUSTOM_SLICE_URIS);
+ } else {
+ // Can assume authority belongs to the provider. Return all Uris for the authority.
+ final List<Uri> customSlices = PUBLICLY_SUPPORTED_CUSTOM_SLICE_URIS.stream()
+ .filter(sliceUri -> TextUtils.equals(authority, sliceUri.getAuthority()))
+ .collect(Collectors.toList());
+ descendants.addAll(customSlices);
+ }
grantWhitelistedPackagePermissions(getContext(), descendants);
return descendants;
}
@@ -332,32 +335,6 @@
}
}
- private void startBackgroundWorker(Sliceable sliceable, Uri uri) {
- final Class workerClass = sliceable.getBackgroundWorkerClass();
- if (workerClass == null) {
- return;
- }
-
- if (mPinnedWorkers.containsKey(uri)) {
- return;
- }
-
- Log.d(TAG, "Starting background worker for: " + uri);
- final SliceBackgroundWorker worker = SliceBackgroundWorker.getInstance(
- getContext(), sliceable, uri);
- mPinnedWorkers.put(uri, worker);
- worker.onSlicePinned();
- }
-
- private void stopBackgroundWorker(Uri uri) {
- final SliceBackgroundWorker worker = mPinnedWorkers.get(uri);
- if (worker != null) {
- Log.d(TAG, "Stopping background worker for: " + uri);
- worker.onSliceUnpinned();
- mPinnedWorkers.remove(uri);
- }
- }
-
@Override
public void shutdown() {
ThreadUtils.postOnMainThread(() -> {
@@ -365,23 +342,6 @@
});
}
- private List<Uri> buildUrisFromKeys(List<String> keys, String authority) {
- final List<Uri> descendants = new ArrayList<>();
-
- final Uri.Builder builder = new Uri.Builder()
- .scheme(ContentResolver.SCHEME_CONTENT)
- .authority(authority)
- .appendPath(SettingsSlicesContract.PATH_SETTING_ACTION);
-
- final String newUriPathPrefix = SettingsSlicesContract.PATH_SETTING_ACTION + "/";
- for (String key : keys) {
- builder.path(newUriPathPrefix + key);
- descendants.add(builder.build());
- }
-
- return descendants;
- }
-
@VisibleForTesting
void loadSlice(Uri uri) {
long startBuildTime = System.currentTimeMillis();
@@ -416,38 +376,6 @@
ThreadUtils.postOnBackgroundThread(() -> loadSlice(uri));
}
- /**
- * @return an empty {@link Slice} with {@param uri} to be used as a stub while the real
- * {@link SliceData} is loaded from {@link SlicesDatabaseHelper.Tables#TABLE_SLICES_INDEX}.
- */
- private Slice getSliceStub(Uri uri) {
- // TODO: Switch back to ListBuilder when slice loading states are fixed.
- return new Slice.Builder(uri).build();
- }
-
- private List<Uri> getSpecialCaseUris(boolean isPlatformUri) {
- if (isPlatformUri) {
- return getSpecialCasePlatformUris();
- }
- return getSpecialCaseOemUris();
- }
-
- private List<Uri> getSpecialCasePlatformUris() {
- return Arrays.asList(
- CustomSliceRegistry.WIFI_SLICE_URI,
- CustomSliceRegistry.BLUETOOTH_URI,
- CustomSliceRegistry.LOCATION_SLICE_URI
- );
- }
-
- private List<Uri> getSpecialCaseOemUris() {
- return Arrays.asList(
- CustomSliceRegistry.FLASHLIGHT_SLICE_URI,
- CustomSliceRegistry.MOBILE_DATA_SLICE_URI,
- CustomSliceRegistry.ZEN_MODE_SLICE_URI
- );
- }
-
@VisibleForTesting
/**
* Registers an IntentFilter in SysUI to notify changes to {@param sliceUri} when broadcasts to
@@ -476,7 +404,42 @@
return set;
}
- private String[] parseStringArray(String value) {
+ private void startBackgroundWorker(Sliceable sliceable, Uri uri) {
+ final Class workerClass = sliceable.getBackgroundWorkerClass();
+ if (workerClass == null) {
+ return;
+ }
+
+ if (mPinnedWorkers.containsKey(uri)) {
+ return;
+ }
+
+ Log.d(TAG, "Starting background worker for: " + uri);
+ final SliceBackgroundWorker worker = SliceBackgroundWorker.getInstance(
+ getContext(), sliceable, uri);
+ mPinnedWorkers.put(uri, worker);
+ worker.onSlicePinned();
+ }
+
+ private void stopBackgroundWorker(Uri uri) {
+ final SliceBackgroundWorker worker = mPinnedWorkers.get(uri);
+ if (worker != null) {
+ Log.d(TAG, "Stopping background worker for: " + uri);
+ worker.onSliceUnpinned();
+ mPinnedWorkers.remove(uri);
+ }
+ }
+
+ /**
+ * @return an empty {@link Slice} with {@param uri} to be used as a stub while the real
+ * {@link SliceData} is loaded from {@link SlicesDatabaseHelper.Tables#TABLE_SLICES_INDEX}.
+ */
+ private static Slice getSliceStub(Uri uri) {
+ // TODO: Switch back to ListBuilder when slice loading states are fixed.
+ return new Slice.Builder(uri).build();
+ }
+
+ private static String[] parseStringArray(String value) {
if (value != null) {
String[] parts = value.split(":");
if (parts.length > 0) {
diff --git a/src/com/android/settings/slices/SliceBroadcastReceiver.java b/src/com/android/settings/slices/SliceBroadcastReceiver.java
index fc3d0cc..b44bc22 100644
--- a/src/com/android/settings/slices/SliceBroadcastReceiver.java
+++ b/src/com/android/settings/slices/SliceBroadcastReceiver.java
@@ -23,7 +23,6 @@
import static com.android.settings.slices.SettingsSliceProvider.ACTION_SLIDER_CHANGED;
import static com.android.settings.slices.SettingsSliceProvider.ACTION_TOGGLE_CHANGED;
import static com.android.settings.slices.SettingsSliceProvider.EXTRA_SLICE_KEY;
-import static com.android.settings.slices.SettingsSliceProvider.EXTRA_SLICE_PLATFORM_DEFINED;
import static com.android.settings.wifi.calling.WifiCallingSliceHelper.ACTION_WIFI_CALLING_CHANGED;
import static com.android.settings.wifi.calling.WifiCallingSliceHelper.ACTION_WIFI_CALLING_PREFERENCE_CELLULAR_PREFERRED;
import static com.android.settings.wifi.calling.WifiCallingSliceHelper.ACTION_WIFI_CALLING_PREFERENCE_WIFI_ONLY;
@@ -32,11 +31,9 @@
import android.app.settings.SettingsEnums;
import android.app.slice.Slice;
import android.content.BroadcastReceiver;
-import android.content.ContentResolver;
import android.content.Context;
import android.content.Intent;
import android.net.Uri;
-import android.provider.SettingsSlicesContract;
import android.text.TextUtils;
import android.util.Log;
@@ -58,8 +55,6 @@
public void onReceive(Context context, Intent intent) {
final String action = intent.getAction();
final String key = intent.getStringExtra(EXTRA_SLICE_KEY);
- final boolean isPlatformSlice = intent.getBooleanExtra(EXTRA_SLICE_PLATFORM_DEFINED,
- false /* default */);
if (CustomSliceRegistry.isValidAction(action)) {
final CustomSliceable sliceable =
@@ -68,15 +63,16 @@
sliceable.onNotifyChange(intent);
return;
}
+ final Uri sliceUri = intent.getData();
switch (action) {
case ACTION_TOGGLE_CHANGED:
final boolean isChecked = intent.getBooleanExtra(Slice.EXTRA_TOGGLE_STATE, false);
- handleToggleAction(context, key, isChecked, isPlatformSlice);
+ handleToggleAction(context, sliceUri, key, isChecked);
break;
case ACTION_SLIDER_CHANGED:
final int newPosition = intent.getIntExtra(Slice.EXTRA_RANGE_VALUE, -1);
- handleSliderAction(context, key, newPosition, isPlatformSlice);
+ handleSliderAction(context, sliceUri, key, newPosition);
break;
case ACTION_BLUETOOTH_SLICE_CHANGED:
BluetoothSliceBuilder.handleUriChange(context, intent);
@@ -105,13 +101,12 @@
.handleWifiCallingPreferenceChanged(intent);
break;
case ACTION_COPY:
- handleCopyAction(context, key, isPlatformSlice);
+ handleCopyAction(context, sliceUri, key);
break;
}
}
- private void handleToggleAction(Context context, String key, boolean isChecked,
- boolean isPlatformSlice) {
+ private void handleToggleAction(Context context, Uri sliceUri, String key, boolean isChecked) {
if (TextUtils.isEmpty(key)) {
throw new IllegalStateException("No key passed to Intent for toggle controller");
}
@@ -125,7 +120,7 @@
if (!controller.isAvailable()) {
Log.w(TAG, "Can't update " + key + " since the setting is unavailable");
if (!controller.hasAsyncUpdate()) {
- updateUri(context, key, isPlatformSlice);
+ context.getContentResolver().notifyChange(sliceUri, null /* observer */);
}
return;
}
@@ -136,12 +131,11 @@
toggleController.setChecked(isChecked);
logSliceValueChange(context, key, isChecked ? 1 : 0);
if (!controller.hasAsyncUpdate()) {
- updateUri(context, key, isPlatformSlice);
+ context.getContentResolver().notifyChange(sliceUri, null /* observer */);
}
}
- private void handleSliderAction(Context context, String key, int newPosition,
- boolean isPlatformSlice) {
+ private void handleSliderAction(Context context, Uri sliceUri, String key, int newPosition) {
if (TextUtils.isEmpty(key)) {
throw new IllegalArgumentException(
"No key passed to Intent for slider controller. Use extra: " + EXTRA_SLICE_KEY);
@@ -159,7 +153,7 @@
if (!controller.isAvailable()) {
Log.w(TAG, "Can't update " + key + " since the setting is unavailable");
- updateUri(context, key, isPlatformSlice);
+ context.getContentResolver().notifyChange(sliceUri, null /* observer */);
return;
}
@@ -174,10 +168,10 @@
sliderController.setSliderPosition(newPosition);
logSliceValueChange(context, key, newPosition);
- updateUri(context, key, isPlatformSlice);
+ context.getContentResolver().notifyChange(sliceUri, null /* observer */);
}
- private void handleCopyAction(Context context, String key, boolean isPlatformSlice) {
+ private void handleCopyAction(Context context, Uri sliceUri, String key) {
if (TextUtils.isEmpty(key)) {
throw new IllegalArgumentException("No key passed to Intent for controller");
}
@@ -192,7 +186,7 @@
if (!controller.isAvailable()) {
Log.w(TAG, "Can't update " + key + " since the setting is unavailable");
if (!controller.hasAsyncUpdate()) {
- updateUri(context, key, isPlatformSlice);
+ context.getContentResolver().notifyChange(sliceUri, null /* observer */);
}
return;
}
@@ -217,17 +211,4 @@
final SliceData sliceData = accessor.getSliceDataFromKey(key);
return SliceBuilderUtils.getPreferenceController(context, sliceData);
}
-
- private void updateUri(Context context, String key, boolean isPlatformDefined) {
- final String authority = isPlatformDefined
- ? SettingsSlicesContract.AUTHORITY
- : SettingsSliceProvider.SLICE_AUTHORITY;
- final Uri uri = new Uri.Builder()
- .scheme(ContentResolver.SCHEME_CONTENT)
- .authority(authority)
- .appendPath(SettingsSlicesContract.PATH_SETTING_ACTION)
- .appendPath(key)
- .build();
- context.getContentResolver().notifyChange(uri, null /* observer */);
- }
}
diff --git a/src/com/android/settings/slices/SliceBuilderUtils.java b/src/com/android/settings/slices/SliceBuilderUtils.java
index 0e51032..e82d13e 100644
--- a/src/com/android/settings/slices/SliceBuilderUtils.java
+++ b/src/com/android/settings/slices/SliceBuilderUtils.java
@@ -18,12 +18,10 @@
import static com.android.settings.core.BasePreferenceController.DISABLED_DEPENDENT_SETTING;
import static com.android.settings.slices.SettingsSliceProvider.EXTRA_SLICE_KEY;
-import static com.android.settings.slices.SettingsSliceProvider.EXTRA_SLICE_PLATFORM_DEFINED;
import android.annotation.ColorInt;
import android.app.PendingIntent;
import android.app.settings.SettingsEnums;
-import android.content.ContentResolver;
import android.content.Context;
import android.content.Intent;
import android.net.Uri;
@@ -111,17 +109,6 @@
}
/**
- * @return the {@link SliceData.SliceType} for the {@param controllerClassName} and key.
- */
- @SliceData.SliceType
- public static int getSliceType(Context context, String controllerClassName,
- String controllerKey) {
- BasePreferenceController controller = getPreferenceController(context, controllerClassName,
- controllerKey);
- return controller.getSliceType();
- }
-
- /**
* Splits the Settings Slice Uri path into its two expected components:
* - intent/action
* - key
@@ -170,8 +157,7 @@
final Intent intent = new Intent(action)
.setData(data.getUri())
.setClass(context, SliceBroadcastReceiver.class)
- .putExtra(EXTRA_SLICE_KEY, data.getKey())
- .putExtra(EXTRA_SLICE_PLATFORM_DEFINED, data.isPlatformDefined());
+ .putExtra(EXTRA_SLICE_KEY, data.getKey());
return PendingIntent.getBroadcast(context, 0 /* requestCode */, intent,
PendingIntent.FLAG_CANCEL_CURRENT);
}
@@ -214,17 +200,6 @@
return "";
}
- public static Uri getUri(String path, boolean isPlatformSlice) {
- final String authority = isPlatformSlice
- ? SettingsSlicesContract.AUTHORITY
- : SettingsSliceProvider.SLICE_AUTHORITY;
- return new Uri.Builder()
- .scheme(ContentResolver.SCHEME_CONTENT)
- .authority(authority)
- .appendPath(path)
- .build();
- }
-
public static Intent buildSearchResultPageIntent(Context context, String className, String key,
String screenTitle, int sourceMetricsCategory) {
final Bundle args = new Bundle();
@@ -350,7 +325,7 @@
.build();
}
- private static BasePreferenceController getPreferenceController(Context context,
+ static BasePreferenceController getPreferenceController(Context context,
String controllerClassName, String controllerKey) {
try {
return BasePreferenceController.createInstance(context, controllerClassName);
diff --git a/src/com/android/settings/slices/SliceData.java b/src/com/android/settings/slices/SliceData.java
index f818539..0f3a678 100644
--- a/src/com/android/settings/slices/SliceData.java
+++ b/src/com/android/settings/slices/SliceData.java
@@ -71,8 +71,6 @@
@SliceType
private final int mSliceType;
- private final boolean mIsPlatformDefined;
-
private final String mUnavailableSliceSubtitle;
public String getKey() {
@@ -115,10 +113,6 @@
return mSliceType;
}
- public boolean isPlatformDefined() {
- return mIsPlatformDefined;
- }
-
public String getUnavailableSliceSubtitle() {
return mUnavailableSliceSubtitle;
}
@@ -134,7 +128,6 @@
mUri = builder.mUri;
mPreferenceController = builder.mPrefControllerClassName;
mSliceType = builder.mSliceType;
- mIsPlatformDefined = builder.mIsPlatformDefined;
mUnavailableSliceSubtitle = builder.mUnavailableSliceSubtitle;
}
@@ -173,8 +166,6 @@
private int mSliceType;
- private boolean mIsPlatformDefined;
-
private String mUnavailableSliceSubtitle;
public Builder setKey(String key) {
@@ -227,11 +218,6 @@
return this;
}
- public Builder setPlatformDefined(boolean isPlatformDefined) {
- mIsPlatformDefined = isPlatformDefined;
- return this;
- }
-
public Builder setUnavailableSliceSubtitle(
String unavailableSliceSubtitle) {
mUnavailableSliceSubtitle = unavailableSliceSubtitle;
diff --git a/src/com/android/settings/slices/SliceDataConverter.java b/src/com/android/settings/slices/SliceDataConverter.java
index 7a8ab83..85fa8b0 100644
--- a/src/com/android/settings/slices/SliceDataConverter.java
+++ b/src/com/android/settings/slices/SliceDataConverter.java
@@ -19,7 +19,6 @@
import static com.android.settings.core.PreferenceXmlParserUtils.METADATA_CONTROLLER;
import static com.android.settings.core.PreferenceXmlParserUtils.METADATA_ICON;
import static com.android.settings.core.PreferenceXmlParserUtils.METADATA_KEY;
-import static com.android.settings.core.PreferenceXmlParserUtils.METADATA_PLATFORM_SLICE_FLAG;
import static com.android.settings.core.PreferenceXmlParserUtils.METADATA_SUMMARY;
import static com.android.settings.core.PreferenceXmlParserUtils.METADATA_TITLE;
import static com.android.settings.core.PreferenceXmlParserUtils.METADATA_UNAVAILABLE_SLICE_SUBTITLE;
@@ -27,14 +26,17 @@
import android.accessibilityservice.AccessibilityServiceInfo;
import android.app.settings.SettingsEnums;
import android.content.ComponentName;
+import android.content.ContentResolver;
import android.content.Context;
import android.content.pm.PackageManager;
import android.content.pm.ResolveInfo;
import android.content.pm.ServiceInfo;
import android.content.res.Resources;
import android.content.res.XmlResourceParser;
+import android.net.Uri;
import android.os.Bundle;
import android.provider.SearchIndexableResource;
+import android.provider.SettingsSlicesContract;
import android.text.TextUtils;
import android.util.AttributeSet;
import android.util.Log;
@@ -187,7 +189,6 @@
| MetadataFlag.FLAG_NEED_PREF_TITLE
| MetadataFlag.FLAG_NEED_PREF_ICON
| MetadataFlag.FLAG_NEED_PREF_SUMMARY
- | MetadataFlag.FLAG_NEED_PLATFORM_SLICE_FLAG
| MetadataFlag.FLAG_UNAVAILABLE_SLICE_SUBTITLE);
for (Bundle bundle : metadata) {
@@ -199,17 +200,23 @@
}
final String key = bundle.getString(METADATA_KEY);
+ final BasePreferenceController controller = SliceBuilderUtils
+ .getPreferenceController(mContext, controllerClassName, key);
+ // Only add pre-approved Slices available on the device.
+ if (!controller.isSliceable() || !controller.isAvailable()) {
+ continue;
+ }
final String title = bundle.getString(METADATA_TITLE);
final String summary = bundle.getString(METADATA_SUMMARY);
final int iconResId = bundle.getInt(METADATA_ICON);
- final int sliceType = SliceBuilderUtils.getSliceType(mContext, controllerClassName,
- key);
- final boolean isPlatformSlice = bundle.getBoolean(METADATA_PLATFORM_SLICE_FLAG);
+
+ final int sliceType = controller.getSliceType();
final String unavailableSliceSubtitle = bundle.getString(
METADATA_UNAVAILABLE_SLICE_SUBTITLE);
final SliceData xmlSlice = new SliceData.Builder()
.setKey(key)
+ .setUri(controller.getSliceUri())
.setTitle(title)
.setSummary(summary)
.setIcon(iconResId)
@@ -217,17 +224,10 @@
.setPreferenceControllerClassName(controllerClassName)
.setFragmentName(fragmentName)
.setSliceType(sliceType)
- .setPlatformDefined(isPlatformSlice)
.setUnavailableSliceSubtitle(unavailableSliceSubtitle)
.build();
- final BasePreferenceController controller =
- SliceBuilderUtils.getPreferenceController(mContext, xmlSlice);
-
- // Only add pre-approved Slices available on the device.
- if (controller.isSliceable() && controller.isAvailable()) {
- xmlSliceData.add(xmlSlice);
- }
+ xmlSliceData.add(xmlSlice);
}
} catch (SliceData.InvalidSliceDataException e) {
Log.w(TAG, "Invalid data when building SliceData for " + fragmentName, e);
@@ -294,6 +294,12 @@
sliceDataBuilder.setKey(flattenedName)
.setTitle(title)
+ .setUri(new Uri.Builder()
+ .scheme(ContentResolver.SCHEME_CONTENT)
+ .authority(SettingsSliceProvider.SLICE_AUTHORITY)
+ .appendPath(SettingsSlicesContract.PATH_SETTING_ACTION)
+ .appendPath(flattenedName)
+ .build())
.setIcon(iconResource)
.setSliceType(SliceData.SliceType.SWITCH);
try {
diff --git a/src/com/android/settings/slices/SliceDeepLinkSpringBoard.java b/src/com/android/settings/slices/SliceDeepLinkSpringBoard.java
index 2ff071e..cf8688a 100644
--- a/src/com/android/settings/slices/SliceDeepLinkSpringBoard.java
+++ b/src/com/android/settings/slices/SliceDeepLinkSpringBoard.java
@@ -19,6 +19,7 @@
import android.net.Uri;
import android.os.Bundle;
import android.provider.Settings;
+import android.text.TextUtils;
import android.util.Log;
import com.android.settings.bluetooth.BluetoothSliceBuilder;
@@ -71,6 +72,7 @@
}
private static Uri parse(Uri uri) {
- return Uri.parse(uri.getQueryParameter(EXTRA_SLICE));
+ final String sliceParameter = uri.getQueryParameter(EXTRA_SLICE);
+ return TextUtils.isEmpty(sliceParameter) ? null : Uri.parse(sliceParameter);
}
}
diff --git a/src/com/android/settings/slices/SlicePreference.java b/src/com/android/settings/slices/SlicePreference.java
index a88ae76..acf45ef 100644
--- a/src/com/android/settings/slices/SlicePreference.java
+++ b/src/com/android/settings/slices/SlicePreference.java
@@ -43,7 +43,7 @@
private void init() {
mSliceView = findViewById(R.id.slice_view);
- mSliceView.showTitleItems(true);
+ mSliceView.setShowTitleItems(true);
mSliceView.setScrollable(false);
}
diff --git a/src/com/android/settings/slices/Sliceable.java b/src/com/android/settings/slices/Sliceable.java
index 04a3b50..aab4906 100644
--- a/src/com/android/settings/slices/Sliceable.java
+++ b/src/com/android/settings/slices/Sliceable.java
@@ -22,6 +22,7 @@
import android.content.ClipboardManager;
import android.content.Context;
import android.content.IntentFilter;
+import android.net.Uri;
import android.widget.Toast;
import com.android.settings.R;
@@ -55,6 +56,13 @@
}
/**
+ * Returns uri for this slice (if it's a slice).
+ */
+ default Uri getSliceUri() {
+ return null;
+ }
+
+ /**
* @return {@code true} if the setting update asynchronously.
* <p>
* For example, a Wifi controller would return true, because it needs to update the radio
diff --git a/src/com/android/settings/slices/SlicesDatabaseAccessor.java b/src/com/android/settings/slices/SlicesDatabaseAccessor.java
index 2553a21..4ae9a4c 100644
--- a/src/com/android/settings/slices/SlicesDatabaseAccessor.java
+++ b/src/com/android/settings/slices/SlicesDatabaseAccessor.java
@@ -23,6 +23,7 @@
import android.database.sqlite.SQLiteDatabase;
import android.net.Uri;
import android.os.Binder;
+import android.text.TextUtils;
import android.util.Pair;
import androidx.slice.Slice;
@@ -47,14 +48,10 @@
IndexColumns.ICON_RESOURCE,
IndexColumns.FRAGMENT,
IndexColumns.CONTROLLER,
- IndexColumns.PLATFORM_SLICE,
IndexColumns.SLICE_TYPE,
IndexColumns.UNAVAILABLE_SLICE_SUBTITLE,
};
- // Cursor value for boolean true
- private final int TRUE = 1;
-
private final Context mContext;
private final SlicesDatabaseHelper mHelper;
@@ -91,34 +88,29 @@
}
/**
- * @return a list of keys in the Slices database matching on {@param isPlatformSlice}.
+ * @return a list of Slice {@link Uri}s matching {@param authority}.
*/
- public List<String> getSliceKeys(boolean isPlatformSlice) {
+ public List<Uri> getSliceUris(String authority) {
verifyIndexing();
- final String whereClause;
-
- if (isPlatformSlice) {
- whereClause = IndexColumns.PLATFORM_SLICE + " = 1";
- } else {
- whereClause = IndexColumns.PLATFORM_SLICE + " = 0";
- }
-
+ final List<Uri> uris = new ArrayList<>();
final SQLiteDatabase database = mHelper.getReadableDatabase();
- final String[] columns = new String[]{IndexColumns.KEY};
- final List<String> keys = new ArrayList<>();
-
- try (final Cursor resultCursor = database.query(TABLE_SLICES_INDEX, columns, whereClause,
- null /* selection */, null /* groupBy */, null /* having */, null /* orderBy */)) {
+ final String[] columns = new String[]{IndexColumns.SLICE_URI};
+ try (final Cursor resultCursor = database.query(TABLE_SLICES_INDEX, columns,
+ null /* where */, null /* selection */, null /* groupBy */, null /* having */,
+ null /* orderBy */)) {
if (!resultCursor.moveToFirst()) {
- return keys;
+ return uris;
}
do {
- keys.add(resultCursor.getString(0 /* key index */));
+ final Uri uri = Uri.parse(resultCursor.getString(0 /* SLICE_URI */));
+ if (TextUtils.isEmpty(authority)
+ || TextUtils.equals(authority, uri.getAuthority())) {
+ uris.add(uri);
+ }
} while (resultCursor.moveToNext());
}
-
- return keys;
+ return uris;
}
private Cursor getIndexedSliceData(String path) {
@@ -151,7 +143,7 @@
.toString();
}
- private SliceData buildSliceData(Cursor cursor, Uri uri, boolean isIntentOnly) {
+ private static SliceData buildSliceData(Cursor cursor, Uri uri, boolean isIntentOnly) {
final String key = cursor.getString(cursor.getColumnIndex(IndexColumns.KEY));
final String title = cursor.getString(cursor.getColumnIndex(IndexColumns.TITLE));
final String summary = cursor.getString(cursor.getColumnIndex(IndexColumns.SUMMARY));
@@ -163,8 +155,6 @@
cursor.getColumnIndex(IndexColumns.FRAGMENT));
final String controllerClassName = cursor.getString(
cursor.getColumnIndex(IndexColumns.CONTROLLER));
- final boolean isPlatformDefined = cursor.getInt(
- cursor.getColumnIndex(IndexColumns.PLATFORM_SLICE)) == TRUE;
int sliceType = cursor.getInt(
cursor.getColumnIndex(IndexColumns.SLICE_TYPE));
final String unavailableSliceSubtitle = cursor.getString(
@@ -184,7 +174,6 @@
.setFragmentName(fragmentClassName)
.setPreferenceControllerClassName(controllerClassName)
.setUri(uri)
- .setPlatformDefined(isPlatformDefined)
.setSliceType(sliceType)
.setUnavailableSliceSubtitle(unavailableSliceSubtitle)
.build();
diff --git a/src/com/android/settings/slices/SlicesDatabaseHelper.java b/src/com/android/settings/slices/SlicesDatabaseHelper.java
index 1f9b05e..6c13ef9 100644
--- a/src/com/android/settings/slices/SlicesDatabaseHelper.java
+++ b/src/com/android/settings/slices/SlicesDatabaseHelper.java
@@ -36,7 +36,7 @@
private static final String DATABASE_NAME = "slices_index.db";
private static final String SHARED_PREFS_TAG = "slices_shared_prefs";
- private static final int DATABASE_VERSION = 5;
+ private static final int DATABASE_VERSION = 7;
public interface Tables {
String TABLE_SLICES_INDEX = "slices_index";
@@ -85,11 +85,6 @@
String CONTROLLER = "controller";
/**
- * Boolean flag, {@code true} when the Slice is officially platform-supported.
- */
- String PLATFORM_SLICE = "platform_slice";
-
- /**
* {@link SliceData.SliceType} representing the inline type of the result.
*/
String SLICE_TYPE = "slice_type";
@@ -98,6 +93,11 @@
* Customized subtitle if it's a unavailable slice
*/
String UNAVAILABLE_SLICE_SUBTITLE = "unavailable_slice_subtitle";
+
+ /**
+ * The uri of slice.
+ */
+ String SLICE_URI = "slice_uri";
}
private static final String CREATE_SLICES_TABLE =
@@ -105,6 +105,8 @@
"(" +
IndexColumns.KEY +
", " +
+ IndexColumns.SLICE_URI +
+ ", " +
IndexColumns.TITLE +
", " +
IndexColumns.SUMMARY +
@@ -119,8 +121,6 @@
", " +
IndexColumns.CONTROLLER +
", " +
- IndexColumns.PLATFORM_SLICE +
- ", " +
IndexColumns.SLICE_TYPE +
", " +
IndexColumns.UNAVAILABLE_SLICE_SUBTITLE +
diff --git a/src/com/android/settings/slices/SlicesIndexer.java b/src/com/android/settings/slices/SlicesIndexer.java
index 495eb00..7b49b4b 100644
--- a/src/com/android/settings/slices/SlicesIndexer.java
+++ b/src/com/android/settings/slices/SlicesIndexer.java
@@ -101,6 +101,7 @@
for (SliceData dataRow : indexData) {
values = new ContentValues();
values.put(IndexColumns.KEY, dataRow.getKey());
+ values.put(IndexColumns.SLICE_URI, dataRow.getUri().toSafeString());
values.put(IndexColumns.TITLE, dataRow.getTitle());
values.put(IndexColumns.SUMMARY, dataRow.getSummary());
values.put(IndexColumns.SCREENTITLE, dataRow.getScreenTitle().toString());
@@ -108,7 +109,6 @@
values.put(IndexColumns.ICON_RESOURCE, dataRow.getIconResource());
values.put(IndexColumns.FRAGMENT, dataRow.getFragmentClassName());
values.put(IndexColumns.CONTROLLER, dataRow.getPreferenceController());
- values.put(IndexColumns.PLATFORM_SLICE, dataRow.isPlatformDefined());
values.put(IndexColumns.SLICE_TYPE, dataRow.getSliceType());
values.put(IndexColumns.UNAVAILABLE_SLICE_SUBTITLE,
dataRow.getUnavailableSliceSubtitle());
diff --git a/src/com/android/settings/tts/TextToSpeechSettings.java b/src/com/android/settings/tts/TextToSpeechSettings.java
index d4c7318..b4ff0f4 100644
--- a/src/com/android/settings/tts/TextToSpeechSettings.java
+++ b/src/com/android/settings/tts/TextToSpeechSettings.java
@@ -26,7 +26,10 @@
import android.content.Context;
import android.content.Intent;
import android.os.Bundle;
+import android.os.UserHandle;
+import android.os.UserManager;
import android.provider.SearchIndexableResource;
+import android.provider.Settings.Secure;
import android.speech.tts.TextToSpeech;
import android.speech.tts.TextToSpeech.EngineInfo;
import android.speech.tts.TtsEngines;
@@ -44,11 +47,13 @@
import com.android.settings.SettingsPreferenceFragment;
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settings.search.Indexable;
+import com.android.settings.Utils;
import com.android.settings.widget.GearPreference;
import com.android.settings.widget.SeekBarPreference;
import com.android.settingslib.search.SearchIndexable;
import com.android.settingslib.widget.ActionButtonsPreference;
+import java.text.Collator;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
@@ -148,6 +153,11 @@
*/
private final TextToSpeech.OnInitListener mInitListener = this::onInitEngine;
+ /**
+ * A UserManager used to set settings for both person and work profiles for a user
+ */
+ private UserManager mUserManager;
+
@Override
public int getMetricsCategory() {
return SettingsEnums.TTS_TEXT_TO_SPEECH;
@@ -176,6 +186,9 @@
.setButton2OnClickListener(v -> resetTts())
.setButton1Enabled(true);
+ mUserManager = (UserManager) getActivity()
+ .getApplicationContext().getSystemService(Context.USER_SERVICE);
+
if (savedInstanceState == null) {
mLocalePreference.setEnabled(false);
mLocalePreference.setEntries(new CharSequence[0]);
@@ -509,8 +522,12 @@
}
}
- // Sort it
- Collections.sort(entryPairs, (lhs, rhs) -> lhs.first.compareToIgnoreCase(rhs.first));
+ // Get the primary locale and create a Collator to sort the strings
+ Locale userLocale = getResources().getConfiguration().getLocales().get(0);
+ Collator collator = Collator.getInstance(userLocale);
+
+ // Sort the list
+ Collections.sort(entryPairs, (lhs, rhs) -> collator.compare(lhs.first, rhs.first));
// Get two arrays out of one of pairs
mSelectedLocaleIndex = 0; // Will point to the R.string.tts_lang_use_system value
@@ -670,8 +687,7 @@
private void updateSpeechRate(int speechRateSeekBarProgress) {
mDefaultRate = getValueFromSeekBarProgress(KEY_DEFAULT_RATE, speechRateSeekBarProgress);
try {
- android.provider.Settings.Secure.putInt(
- getContentResolver(), TTS_DEFAULT_RATE, mDefaultRate);
+ updateTTSSetting(TTS_DEFAULT_RATE, mDefaultRate);
if (mTts != null) {
mTts.setSpeechRate(mDefaultRate / 100.0f);
}
@@ -685,8 +701,7 @@
private void updateSpeechPitchValue(int speechPitchSeekBarProgress) {
mDefaultPitch = getValueFromSeekBarProgress(KEY_DEFAULT_PITCH, speechPitchSeekBarProgress);
try {
- android.provider.Settings.Secure.putInt(
- getContentResolver(), TTS_DEFAULT_PITCH, mDefaultPitch);
+ updateTTSSetting(TTS_DEFAULT_PITCH, mDefaultPitch);
if (mTts != null) {
mTts.setPitch(mDefaultPitch / 100.0f);
}
@@ -697,6 +712,16 @@
return;
}
+ private void updateTTSSetting(String key, int value) {
+ Secure.putInt(
+ getContentResolver(), key, value);
+ final int managedProfileUserId =
+ Utils.getManagedProfileId(mUserManager, UserHandle.myUserId());
+ if (managedProfileUserId != UserHandle.USER_NULL) {
+ Secure.putIntForUser(getContentResolver(), key, value, managedProfileUserId);
+ }
+ }
+
private void updateWidgetState(boolean enable) {
getActivity().runOnUiThread(() -> {
mActionButtons.setButton1Enabled(enable);
diff --git a/src/com/android/settings/tts/TtsEnginePreference.java b/src/com/android/settings/tts/TtsEnginePreference.java
deleted file mode 100644
index 8f15db2..0000000
--- a/src/com/android/settings/tts/TtsEnginePreference.java
+++ /dev/null
@@ -1,186 +0,0 @@
-/*
- * Copyright (C) 2011 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.tts;
-
-import android.content.Context;
-import android.content.DialogInterface;
-import android.speech.tts.TextToSpeech.EngineInfo;
-import android.util.Log;
-import android.widget.Checkable;
-import android.widget.CompoundButton;
-import android.widget.RadioButton;
-
-import androidx.appcompat.app.AlertDialog;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceViewHolder;
-
-import com.android.settings.R;
-
-import androidx.annotation.VisibleForTesting;
-
-
-public class TtsEnginePreference extends Preference {
-
- private static final String TAG = "TtsEnginePreference";
-
- /**
- * The engine information for the engine this preference represents.
- * Contains it's name, label etc. which are used for display.
- */
- private final EngineInfo mEngineInfo;
-
- /**
- * The shared radio button state, which button is checked etc.
- */
- private final RadioButtonGroupState mSharedState;
- private RadioButton mRadioButton;
-
- /**
- * When true, the change callbacks on the radio button will not
- * fire.
- */
- private volatile boolean mPreventRadioButtonCallbacks;
-
- private final CompoundButton.OnCheckedChangeListener mRadioChangeListener =
- new CompoundButton.OnCheckedChangeListener() {
- @Override
- public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
- onRadioButtonClicked(buttonView, isChecked);
- }
- };
-
- public TtsEnginePreference(Context context, EngineInfo info, RadioButtonGroupState state) {
- super(context);
-
- setWidgetLayoutResource(R.layout.preference_widget_radiobutton);
- setLayoutResource(R.layout.preference_radio);
- setIconSpaceReserved(false);
-
- mSharedState = state;
- mEngineInfo = info;
- mPreventRadioButtonCallbacks = false;
-
- setKey(mEngineInfo.name);
- setTitle(mEngineInfo.label);
- }
-
- @Override
- public void onBindViewHolder(PreferenceViewHolder view) {
- super.onBindViewHolder(view);
-
- if (mSharedState == null) {
- throw new IllegalStateException("Call to getView() before a call to" +
- "setSharedState()");
- }
-
- final RadioButton rb = view.itemView.findViewById(android.R.id.checkbox);
- rb.setOnCheckedChangeListener(mRadioChangeListener);
-
- boolean isChecked = getKey().equals(mSharedState.getCurrentKey());
- if (isChecked) {
- mSharedState.setCurrentChecked(rb);
- }
-
- mPreventRadioButtonCallbacks = true;
- rb.setChecked(isChecked);
- mPreventRadioButtonCallbacks = false;
- mRadioButton = rb;
- }
-
- @Override
- public void onClick() {
- mRadioButton.setChecked(true);
- }
-
- private boolean shouldDisplayDataAlert() {
- return !mEngineInfo.system;
- }
-
-
- private void displayDataAlert(
- DialogInterface.OnClickListener positiveOnClickListener,
- DialogInterface.OnClickListener negativeOnClickListener) {
- Log.i(TAG, "Displaying data alert for :" + mEngineInfo.name);
-
- AlertDialog.Builder builder = new AlertDialog.Builder(getContext());
- builder.setTitle(android.R.string.dialog_alert_title)
- .setMessage(getContext().getString(
- R.string.tts_engine_security_warning, mEngineInfo.label))
- .setCancelable(true)
- .setPositiveButton(android.R.string.ok, positiveOnClickListener)
- .setNegativeButton(android.R.string.cancel, negativeOnClickListener);
-
- AlertDialog dialog = builder.create();
- dialog.show();
- }
-
-
- private void onRadioButtonClicked(final CompoundButton buttonView,
- boolean isChecked) {
- if (mPreventRadioButtonCallbacks ||
- (mSharedState.getCurrentChecked() == buttonView)) {
- return;
- }
-
- if (isChecked) {
- // Should we alert user? if that's true, delay making engine current one.
- if (shouldDisplayDataAlert()) {
- displayDataAlert(new DialogInterface.OnClickListener() {
- @Override
- public void onClick(DialogInterface dialog, int which) {
- makeCurrentEngine(buttonView);
- }
- }, new DialogInterface.OnClickListener() {
- @Override
- public void onClick(DialogInterface dialog, int which) {
- // Undo the click.
- buttonView.setChecked(false);
- }
- });
- } else {
- // Privileged engine, set it current
- makeCurrentEngine(buttonView);
- }
- }
- }
-
- private void makeCurrentEngine(Checkable current) {
- if (mSharedState.getCurrentChecked() != null) {
- mSharedState.getCurrentChecked().setChecked(false);
- }
- mSharedState.setCurrentChecked(current);
- mSharedState.setCurrentKey(getKey());
- callChangeListener(mSharedState.getCurrentKey());
- }
-
-
- /**
- * Holds all state that is common to this group of radio buttons, such
- * as the currently selected key and the currently checked compound button.
- * (which corresponds to this key).
- */
- public interface RadioButtonGroupState {
- String getCurrentKey();
-
- Checkable getCurrentChecked();
-
- void setCurrentKey(String key);
-
- void setCurrentChecked(Checkable current);
- }
-
-}
diff --git a/src/com/android/settings/tts/TtsEnginePreferenceFragment.java b/src/com/android/settings/tts/TtsEnginePreferenceFragment.java
index 244e5b1..fb8072b 100644
--- a/src/com/android/settings/tts/TtsEnginePreferenceFragment.java
+++ b/src/com/android/settings/tts/TtsEnginePreferenceFragment.java
@@ -4,111 +4,44 @@
import android.app.settings.SettingsEnums;
import android.content.Context;
+import android.content.DialogInterface;
+import android.graphics.drawable.Drawable;
import android.os.Bundle;
import android.provider.SearchIndexableResource;
import android.speech.tts.TextToSpeech;
import android.speech.tts.TextToSpeech.EngineInfo;
import android.speech.tts.TtsEngines;
import android.util.Log;
-import android.widget.Checkable;
-import androidx.preference.PreferenceCategory;
+import androidx.appcompat.app.AlertDialog;
import com.android.settings.R;
-import com.android.settings.SettingsPreferenceFragment;
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settings.search.Indexable;
-import com.android.settings.tts.TtsEnginePreference.RadioButtonGroupState;
+import com.android.settings.widget.RadioButtonPickerFragment;
import com.android.settingslib.search.SearchIndexable;
+import com.android.settingslib.widget.CandidateInfo;
+import java.util.ArrayList;
import java.util.Arrays;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
@SearchIndexable
-public class TtsEnginePreferenceFragment extends SettingsPreferenceFragment
- implements RadioButtonGroupState {
+public class TtsEnginePreferenceFragment extends RadioButtonPickerFragment {
private static final String TAG = "TtsEnginePrefFragment";
- private static final int VOICE_DATA_INTEGRITY_CHECK = 1977;
-
- /** The currently selected engine. */
- private String mCurrentEngine;
-
- /**
- * The engine checkbox that is currently checked. Saves us a bit of effort in deducing the right
- * one from the currently selected engine.
- */
- private Checkable mCurrentChecked;
-
/**
* The previously selected TTS engine. Useful for rollbacks if the users choice is not loaded or
* fails a voice integrity check.
*/
private String mPreviousEngine;
- private PreferenceCategory mEnginePreferenceCategory;
-
private TextToSpeech mTts = null;
private TtsEngines mEnginesHelper = null;
-
- @Override
- public void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- addPreferencesFromResource(R.xml.tts_engine_picker);
-
- mEnginePreferenceCategory =
- (PreferenceCategory) findPreference("tts_engine_preference_category");
- mEnginesHelper = new TtsEngines(getActivity().getApplicationContext());
-
- mTts = new TextToSpeech(getActivity().getApplicationContext(), null);
-
- initSettings();
- }
-
- @Override
- public int getMetricsCategory() {
- return SettingsEnums.TTS_ENGINE_SETTINGS;
- }
-
- @Override
- public void onDestroy() {
- super.onDestroy();
- if (mTts != null) {
- mTts.shutdown();
- mTts = null;
- }
- }
-
- private void initSettings() {
- if (mTts != null) {
- mCurrentEngine = mTts.getCurrentEngine();
- }
-
- mEnginePreferenceCategory.removeAll();
-
- List<EngineInfo> engines = mEnginesHelper.getEngines();
- for (EngineInfo engine : engines) {
- TtsEnginePreference enginePref =
- new TtsEnginePreference(getPrefContext(), engine, this);
- mEnginePreferenceCategory.addPreference(enginePref);
- }
- }
-
- @Override
- public Checkable getCurrentChecked() {
- return mCurrentChecked;
- }
-
- @Override
- public String getCurrentKey() {
- return mCurrentEngine;
- }
-
- @Override
- public void setCurrentChecked(Checkable current) {
- mCurrentChecked = current;
- }
-
+ private Context mContext;
+ private Map<String, EngineCandidateInfo> mEngineMap;
/**
* The initialization listener used when the user changes his choice of engine (as opposed to
* when then screen is being initialized for the first time).
@@ -121,6 +54,116 @@
}
};
+ @Override
+ public void onCreate(Bundle savedInstanceState) {
+ mContext = getContext().getApplicationContext();
+ mEnginesHelper = new TtsEngines(mContext);
+ mEngineMap = new HashMap<>();
+ mTts = new TextToSpeech(mContext, null);
+
+ super.onCreate(savedInstanceState);
+ }
+
+ @Override
+ public void onDestroy() {
+ super.onDestroy();
+ if (mTts != null) {
+ mTts.shutdown();
+ mTts = null;
+ }
+ }
+
+ @Override
+ public int getMetricsCategory() {
+ return SettingsEnums.TTS_ENGINE_SETTINGS;
+ }
+
+ /**
+ * Step 3: We have now bound to the TTS engine the user requested. We will attempt to check
+ * voice data for the engine if we successfully bound to it, or revert to the previous engine if
+ * we didn't.
+ */
+ public void onUpdateEngine(int status) {
+ if (status == TextToSpeech.SUCCESS) {
+ Log.d(TAG, "Updating engine: Successfully bound to the engine: "
+ + mTts.getCurrentEngine());
+ android.provider.Settings.Secure.putString(
+ mContext.getContentResolver(), TTS_DEFAULT_SYNTH, mTts.getCurrentEngine());
+ } else {
+ Log.d(TAG, "Updating engine: Failed to bind to engine, reverting.");
+ if (mPreviousEngine != null) {
+ // This is guaranteed to at least bind, since mPreviousEngine would be
+ // null if the previous bind to this engine failed.
+ mTts = new TextToSpeech(mContext, null, mPreviousEngine);
+ updateCheckedState(mPreviousEngine);
+ }
+ mPreviousEngine = null;
+ }
+ }
+
+ @Override
+ protected void onRadioButtonConfirmed(String selectedKey) {
+ final EngineCandidateInfo info = mEngineMap.get(selectedKey);
+ // Should we alert user? if that's true, delay making engine current one.
+ if (shouldDisplayDataAlert(info)) {
+ displayDataAlert(info, (dialog, which) -> {
+ setDefaultKey(selectedKey);
+ });
+ } else {
+ // Privileged engine, set it current
+ setDefaultKey(selectedKey);
+ }
+ }
+
+ @Override
+ protected List<? extends CandidateInfo> getCandidates() {
+ final List<EngineCandidateInfo> infos = new ArrayList<>();
+ final List<EngineInfo> engines = mEnginesHelper.getEngines();
+ for (EngineInfo engine : engines) {
+ final EngineCandidateInfo info = new EngineCandidateInfo(engine);
+ infos.add(info);
+ mEngineMap.put(engine.name, info);
+ }
+ return infos;
+ }
+
+ @Override
+ protected String getDefaultKey() {
+ return mEnginesHelper.getDefaultEngine();
+ }
+
+ @Override
+ protected boolean setDefaultKey(String key) {
+ updateDefaultEngine(key);
+ updateCheckedState(key);
+ return true;
+ }
+
+ @Override
+ protected int getPreferenceScreenResId() {
+ return R.xml.tts_engine_picker;
+ }
+
+ private boolean shouldDisplayDataAlert(EngineCandidateInfo info) {
+ return !info.isSystem();
+ }
+
+ private void displayDataAlert(EngineCandidateInfo info,
+ DialogInterface.OnClickListener positiveOnClickListener) {
+ Log.i(TAG, "Displaying data alert for :" + info.getKey());
+
+ final AlertDialog dialog = new AlertDialog.Builder(getPrefContext())
+ .setTitle(android.R.string.dialog_alert_title)
+ .setMessage(mContext.getString(
+ R.string.tts_engine_security_warning, info.loadLabel()))
+ .setCancelable(true)
+ .setPositiveButton(android.R.string.ok, positiveOnClickListener)
+ .setNegativeButton(android.R.string.cancel, null)
+ .create();
+
+ dialog.show();
+ }
+
private void updateDefaultEngine(String engine) {
Log.d(TAG, "Updating default synth to : " + engine);
@@ -146,41 +189,36 @@
// Step 3 is continued on #onUpdateEngine (below) which is called when
// the app binds successfully to the engine.
Log.i(TAG, "Updating engine : Attempting to connect to engine: " + engine);
- mTts = new TextToSpeech(getActivity().getApplicationContext(), mUpdateListener, engine);
+ mTts = new TextToSpeech(mContext, mUpdateListener, engine);
Log.i(TAG, "Success");
}
- /**
- * Step 3: We have now bound to the TTS engine the user requested. We will attempt to check
- * voice data for the engine if we successfully bound to it, or revert to the previous engine if
- * we didn't.
- */
- public void onUpdateEngine(int status) {
- if (status == TextToSpeech.SUCCESS) {
- Log.d(
+ public static class EngineCandidateInfo extends CandidateInfo {
+ private final EngineInfo mEngineInfo;
- TAG,
- "Updating engine: Successfully bound to the engine: "
- + mTts.getCurrentEngine());
- android.provider.Settings.Secure.putString(
- getContentResolver(), TTS_DEFAULT_SYNTH, mTts.getCurrentEngine());
- } else {
- Log.d(TAG, "Updating engine: Failed to bind to engine, reverting.");
- if (mPreviousEngine != null) {
- // This is guaranteed to at least bind, since mPreviousEngine would be
- // null if the previous bind to this engine failed.
- mTts =
- new TextToSpeech(
- getActivity().getApplicationContext(), null, mPreviousEngine);
- }
- mPreviousEngine = null;
+ EngineCandidateInfo(EngineInfo engineInfo) {
+ super(true /* enabled */);
+ mEngineInfo = engineInfo;
}
- }
- @Override
- public void setCurrentKey(String key) {
- mCurrentEngine = key;
- updateDefaultEngine(mCurrentEngine);
+ @Override
+ public CharSequence loadLabel() {
+ return mEngineInfo.label;
+ }
+
+ @Override
+ public Drawable loadIcon() {
+ return null;
+ }
+
+ @Override
+ public String getKey() {
+ return mEngineInfo.name;
+ }
+
+ public boolean isSystem() {
+ return mEngineInfo.system;
+ }
}
public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
diff --git a/src/com/android/settings/users/MultiUserFooterPreferenceController.java b/src/com/android/settings/users/MultiUserFooterPreferenceController.java
index 1573bbd..03ed6ce 100644
--- a/src/com/android/settings/users/MultiUserFooterPreferenceController.java
+++ b/src/com/android/settings/users/MultiUserFooterPreferenceController.java
@@ -21,29 +21,18 @@
import androidx.annotation.VisibleForTesting;
import androidx.preference.Preference;
-import com.android.settings.R;
import com.android.settings.core.BasePreferenceController;
-import com.android.settingslib.widget.FooterPreference;
-import com.android.settingslib.widget.FooterPreferenceMixinCompat;
public class MultiUserFooterPreferenceController extends BasePreferenceController {
@VisibleForTesting
final UserCapabilities mUserCaps;
- private FooterPreferenceMixinCompat mFooterMixin;
-
- public MultiUserFooterPreferenceController(Context context) {
- super(context, "dummy_key");
+ public MultiUserFooterPreferenceController(Context context, String key) {
+ super(context, key);
mUserCaps = UserCapabilities.create(context);
}
- public MultiUserFooterPreferenceController setFooterMixin(
- FooterPreferenceMixinCompat footerMixin) {
- mFooterMixin = footerMixin;
- return this;
- }
-
@Override
public int getAvailabilityStatus() {
return (mUserCaps.mEnabled && !mUserCaps.mUserSwitcherEnabled)
@@ -54,8 +43,6 @@
@Override
public void updateState(Preference preference) {
mUserCaps.updateAddUserCapabilities(mContext);
- final FooterPreference pref = mFooterMixin.createFooterPreference();
- pref.setTitle(R.string.user_settings_footer_text);
- pref.setVisible(isAvailable());
+ preference.setVisible(isAvailable());
}
}
diff --git a/src/com/android/settings/users/UserSettings.java b/src/com/android/settings/users/UserSettings.java
index 74e6714..bcf0b29 100644
--- a/src/com/android/settings/users/UserSettings.java
+++ b/src/com/android/settings/users/UserSettings.java
@@ -111,6 +111,7 @@
private static final String KEY_USER_GUEST = "user_guest";
private static final String KEY_ADD_USER = "user_add";
private static final String KEY_ADD_USER_WHEN_LOCKED = "user_settings_add_users_when_locked";
+ private static final String KEY_MULTIUSER_FOOTER = "multiuser_footer";
private static final int MENU_REMOVE_USER = Menu.FIRST;
@@ -233,8 +234,8 @@
mAddUserWhenLockedPreferenceController = new AddUserWhenLockedPreferenceController(
activity, KEY_ADD_USER_WHEN_LOCKED);
- mMultiUserFooterPreferenceController = new MultiUserFooterPreferenceController(activity)
- .setFooterMixin(mFooterPreferenceMixin);
+ mMultiUserFooterPreferenceController = new MultiUserFooterPreferenceController(activity,
+ KEY_MULTIUSER_FOOTER);
final PreferenceScreen screen = getPreferenceScreen();
mAddUserWhenLockedPreferenceController.displayPreference(screen);
@@ -958,7 +959,10 @@
final Preference addUserOnLockScreen = getPreferenceScreen().findPreference(
mAddUserWhenLockedPreferenceController.getPreferenceKey());
mAddUserWhenLockedPreferenceController.updateState(addUserOnLockScreen);
- mMultiUserFooterPreferenceController.updateState(null /* preference */);
+
+ final Preference multiUserFooterPrefence = getPreferenceScreen().findPreference(
+ mMultiUserFooterPreferenceController.getPreferenceKey());
+ mMultiUserFooterPreferenceController.updateState(multiUserFooterPrefence);
mUserListCategory.setVisible(mUserCaps.mUserSwitcherEnabled);
updateAddUser(context);
@@ -1090,21 +1094,18 @@
public void onClick(View v) {
if (v.getTag() instanceof UserPreference) {
int userId = ((UserPreference) v.getTag()).getUserId();
- switch (v.getId()) {
- case UserPreference.DELETE_ID:
- final EnforcedAdmin removeDisallowedAdmin =
- RestrictedLockUtilsInternal.checkIfRestrictionEnforced(getContext(),
- UserManager.DISALLOW_REMOVE_USER, UserHandle.myUserId());
- if (removeDisallowedAdmin != null) {
- RestrictedLockUtils.sendShowAdminSupportDetailsIntent(getContext(),
- removeDisallowedAdmin);
- } else {
- onRemoveUserClicked(userId);
- }
- break;
- case UserPreference.SETTINGS_ID:
- onManageUserClicked(userId, false);
- break;
+ if (v.getId() == UserPreference.DELETE_ID) {
+ final EnforcedAdmin removeDisallowedAdmin =
+ RestrictedLockUtilsInternal.checkIfRestrictionEnforced(getContext(),
+ UserManager.DISALLOW_REMOVE_USER, UserHandle.myUserId());
+ if (removeDisallowedAdmin != null) {
+ RestrictedLockUtils.sendShowAdminSupportDetailsIntent(getContext(),
+ removeDisallowedAdmin);
+ } else {
+ onRemoveUserClicked(userId);
+ }
+ } else if (v.getId() == UserPreference.SETTINGS_ID) {
+ onManageUserClicked(userId, false);
}
}
}
diff --git a/src/com/android/settings/vpn2/ConfigDialogFragment.java b/src/com/android/settings/vpn2/ConfigDialogFragment.java
index c032fe5..57ba8bf 100644
--- a/src/com/android/settings/vpn2/ConfigDialogFragment.java
+++ b/src/com/android/settings/vpn2/ConfigDialogFragment.java
@@ -119,6 +119,10 @@
@Override
public void onClick(DialogInterface dialogInterface, int button) {
ConfigDialog dialog = (ConfigDialog) getDialog();
+ if (dialog == null) {
+ Log.e(TAG, "ConfigDialog object is null");
+ return;
+ }
VpnProfile profile = dialog.getProfile();
if (button == DialogInterface.BUTTON_POSITIVE) {
diff --git a/src/com/android/settings/vpn2/VpnSettings.java b/src/com/android/settings/vpn2/VpnSettings.java
index 874a9b9..83cdf71 100644
--- a/src/com/android/settings/vpn2/VpnSettings.java
+++ b/src/com/android/settings/vpn2/VpnSettings.java
@@ -153,17 +153,15 @@
@Override
public boolean onOptionsItemSelected(MenuItem item) {
- switch (item.getItemId()) {
- case R.id.vpn_create: {
- // Generate a new key. Here we just use the current time.
- long millis = System.currentTimeMillis();
- while (mLegacyVpnPreferences.containsKey(Long.toHexString(millis))) {
- ++millis;
- }
- VpnProfile profile = new VpnProfile(Long.toHexString(millis));
- ConfigDialogFragment.show(this, profile, true /* editing */, false /* exists */);
- return true;
+ // Generate a new key. Here we just use the current time.
+ if (item.getItemId() == R.id.vpn_create) {
+ long millis = System.currentTimeMillis();
+ while (mLegacyVpnPreferences.containsKey(Long.toHexString(millis))) {
+ ++millis;
}
+ VpnProfile profile = new VpnProfile(Long.toHexString(millis));
+ ConfigDialogFragment.show(this, profile, true /* editing */, false /* exists */);
+ return true;
}
return super.onOptionsItemSelected(item);
}
diff --git a/src/com/android/settings/widget/RadioButtonPickerFragment.java b/src/com/android/settings/widget/RadioButtonPickerFragment.java
index 8861c94..3193afb 100644
--- a/src/com/android/settings/widget/RadioButtonPickerFragment.java
+++ b/src/com/android/settings/widget/RadioButtonPickerFragment.java
@@ -38,6 +38,7 @@
import com.android.settings.core.PreferenceXmlParserUtils;
import com.android.settings.core.PreferenceXmlParserUtils.MetadataFlag;
import com.android.settingslib.widget.CandidateInfo;
+import com.android.settingslib.widget.RadioButtonPreference;
import org.xmlpull.v1.XmlPullParserException;
diff --git a/src/com/android/settings/widget/RadioButtonPreference.java b/src/com/android/settings/widget/RadioButtonPreference.java
deleted file mode 100644
index 512fe4e..0000000
--- a/src/com/android/settings/widget/RadioButtonPreference.java
+++ /dev/null
@@ -1,105 +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.widget;
-
-import android.content.Context;
-import android.text.TextUtils;
-import android.util.AttributeSet;
-import android.view.View;
-import android.widget.TextView;
-
-import androidx.core.content.res.TypedArrayUtils;
-import androidx.preference.CheckBoxPreference;
-import androidx.preference.PreferenceViewHolder;
-
-import com.android.settings.R;
-
-/**
- * Check box preference with check box replaced by radio button.
- *
- * Functionally speaking, it's actually a CheckBoxPreference. We only modified
- * the widget to RadioButton to make it "look like" a RadioButtonPreference.
- *
- * In other words, there's no "RadioButtonPreferenceGroup" in this
- * implementation. When you check one RadioButtonPreference, if you want to
- * uncheck all the other preferences, you should do that by code yourself.
- */
-public class RadioButtonPreference extends CheckBoxPreference {
- public interface OnClickListener {
- void onRadioButtonClicked(RadioButtonPreference emiter);
- }
-
- private OnClickListener mListener = null;
- private View appendix;
- private int appendixVisibility = -1;
-
- public RadioButtonPreference(Context context, AttributeSet attrs, int defStyle) {
- super(context, attrs, defStyle);
- setWidgetLayoutResource(R.layout.preference_widget_radiobutton);
- setLayoutResource(R.layout.preference_radio);
- setIconSpaceReserved(false);
- }
-
- public RadioButtonPreference(Context context, AttributeSet attrs) {
- this(context, attrs, TypedArrayUtils.getAttr(context,
- androidx.preference.R.attr.preferenceStyle,
- android.R.attr.preferenceStyle));
- }
-
- public RadioButtonPreference(Context context) {
- this(context, null);
- }
-
- public void setOnClickListener(OnClickListener listener) {
- mListener = listener;
- }
-
- @Override
- public void onClick() {
- if (mListener != null) {
- mListener.onRadioButtonClicked(this);
- }
- }
-
- @Override
- public void onBindViewHolder(PreferenceViewHolder view) {
- super.onBindViewHolder(view);
-
- View summaryContainer = view.findViewById(R.id.summary_container);
- if (summaryContainer != null) {
- summaryContainer.setVisibility(
- TextUtils.isEmpty(getSummary()) ? View.GONE : View.VISIBLE);
- appendix = view.findViewById(R.id.appendix);
- if (appendix != null && appendixVisibility != -1) {
- appendix.setVisibility(appendixVisibility);
- }
- }
-
- TextView title = (TextView) view.findViewById(android.R.id.title);
- if (title != null) {
- title.setSingleLine(false);
- title.setMaxLines(3);
- }
- }
-
- public void setAppendixVisibility(int visibility) {
- if (appendix != null) {
- appendix.setVisibility(visibility);
- }
- appendixVisibility = visibility;
- }
-}
diff --git a/src/com/android/settings/widget/RadioButtonPreferenceWithExtraWidget.java b/src/com/android/settings/widget/RadioButtonPreferenceWithExtraWidget.java
index 19fd923..2b28ec1 100644
--- a/src/com/android/settings/widget/RadioButtonPreferenceWithExtraWidget.java
+++ b/src/com/android/settings/widget/RadioButtonPreferenceWithExtraWidget.java
@@ -23,6 +23,7 @@
import androidx.preference.PreferenceViewHolder;
import com.android.settings.R;
+import com.android.settingslib.widget.RadioButtonPreference;
public class RadioButtonPreferenceWithExtraWidget extends RadioButtonPreference {
public static final int EXTRA_WIDGET_VISIBILITY_GONE = 0;
diff --git a/src/com/android/settings/widget/SwitchBar.java b/src/com/android/settings/widget/SwitchBar.java
index f8743d1..0dd59e6 100644
--- a/src/com/android/settings/widget/SwitchBar.java
+++ b/src/com/android/settings/widget/SwitchBar.java
@@ -249,8 +249,6 @@
mSwitch.setEnabled(false);
mSwitch.setVisibility(View.GONE);
mRestrictedIcon.setVisibility(View.VISIBLE);
- mRestrictedIcon.setFocusable(false);
- mRestrictedIcon.setClickable(false);
} else {
mDisabledByAdmin = false;
mSwitch.setVisibility(View.VISIBLE);
diff --git a/src/com/android/settings/wifi/AddNetworkFragment.java b/src/com/android/settings/wifi/AddNetworkFragment.java
index 81b6c85..2f0ecad 100644
--- a/src/com/android/settings/wifi/AddNetworkFragment.java
+++ b/src/com/android/settings/wifi/AddNetworkFragment.java
@@ -43,7 +43,6 @@
@VisibleForTesting
final static int CANCEL_BUTTON_ID = android.R.id.button2;
final static int SSID_SCANNER_BUTTON_ID = R.id.ssid_scanner_button;
- final static int PASSWORD_SCANNER_BUTTON_ID = R.id.password_scanner_button;
private static final int REQUEST_CODE_WIFI_DPP_ENROLLEE_QR_CODE_SCANNER = 0;
@@ -74,11 +73,9 @@
mSubmitBtn = rootView.findViewById(SUBMIT_BUTTON_ID);
mCancelBtn = rootView.findViewById(CANCEL_BUTTON_ID);
final ImageButton ssidScannerButton = rootView.findViewById(SSID_SCANNER_BUTTON_ID);
- final ImageButton passwordScannerButton = rootView.findViewById(PASSWORD_SCANNER_BUTTON_ID);
mSubmitBtn.setOnClickListener(this);
mCancelBtn.setOnClickListener(this);
ssidScannerButton.setOnClickListener(this);
- passwordScannerButton.setOnClickListener(this);
mUIController = new WifiConfigController(this, rootView, null, getMode());
return rootView;
@@ -92,24 +89,17 @@
@Override
public void onClick(View view) {
- String ssid = null;
+ if (view.getId() == SUBMIT_BUTTON_ID) {
+ handleSubmitAction();
+ } else if (view.getId() == CANCEL_BUTTON_ID) {
+ handleCancelAction();
+ } else if (view.getId() == SSID_SCANNER_BUTTON_ID) {
+ final TextView ssidEditText = getView().findViewById(R.id.ssid);
+ final String ssid = ssidEditText.getText().toString();
- switch (view.getId()) {
- case SUBMIT_BUTTON_ID:
- handleSubmitAction();
- break;
- case CANCEL_BUTTON_ID:
- handleCancelAction();
- break;
- case SSID_SCANNER_BUTTON_ID:
- final TextView ssidEditText = getView().findViewById(R.id.ssid);
- ssid = ssidEditText.getText().toString();
- // No break and flows to case PASSWORD_SCANNER_BUTTON_ID
- case PASSWORD_SCANNER_BUTTON_ID:
- // Launch QR code scanner to join a network.
- startActivityForResult(WifiDppUtils.getEnrolleeQrCodeScannerIntent(ssid),
- REQUEST_CODE_WIFI_DPP_ENROLLEE_QR_CODE_SCANNER);
- break;
+ // Launch QR code scanner to join a network.
+ startActivityForResult(WifiDppUtils.getEnrolleeQrCodeScannerIntent(ssid),
+ REQUEST_CODE_WIFI_DPP_ENROLLEE_QR_CODE_SCANNER);
}
}
diff --git a/src/com/android/settings/wifi/CellularFallbackPreferenceController.java b/src/com/android/settings/wifi/CellularFallbackPreferenceController.java
index 0167789..659ddbe 100644
--- a/src/com/android/settings/wifi/CellularFallbackPreferenceController.java
+++ b/src/com/android/settings/wifi/CellularFallbackPreferenceController.java
@@ -76,4 +76,4 @@
return "1".equals(Settings.Global.getString(mContext.getContentResolver(),
Settings.Global.NETWORK_AVOID_BAD_WIFI));
}
-}
+}
\ No newline at end of file
diff --git a/src/com/android/settings/wifi/ConfigureAccessPointFragment.java b/src/com/android/settings/wifi/ConfigureAccessPointFragment.java
new file mode 100644
index 0000000..a3090a8
--- /dev/null
+++ b/src/com/android/settings/wifi/ConfigureAccessPointFragment.java
@@ -0,0 +1,175 @@
+/*
+ * 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.wifi;
+
+import android.app.ActionBar;
+import android.app.Activity;
+import android.app.settings.SettingsEnums;
+import android.content.Context;
+import android.content.Intent;
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.Button;
+
+import com.android.settings.R;
+import com.android.settings.core.InstrumentedFragment;
+import com.android.settingslib.wifi.AccessPoint;
+
+import androidx.annotation.VisibleForTesting;
+
+/**
+ * Detail page for configuring Wi-Fi network.
+ *
+ * The AccessPoint should be saved to the argument when launching this class in order to properly
+ * render this page.
+ */
+public class ConfigureAccessPointFragment extends InstrumentedFragment implements WifiConfigUiBase {
+
+ public static final String NETWORK_CONFIG_KEY = "network_config_key";
+
+ private static final int SUBMIT_BUTTON_ID = android.R.id.button1;
+ private static final int CANCEL_BUTTON_ID = android.R.id.button2;
+
+ private WifiConfigController mUiController;
+ private Button mSubmitBtn;
+ private Button mCancelBtn;
+ private AccessPoint mAccessPoint;
+
+ @Override
+ public void onAttach(Context context) {
+ super.onAttach(context);
+ mAccessPoint = new AccessPoint(context, getArguments());
+ }
+
+ @Override
+ public int getMetricsCategory() {
+ return SettingsEnums.SETTINGS_WIFI_CONFIGURE_NETWORK;
+ }
+
+ @Override
+ public View onCreateView(LayoutInflater inflater, ViewGroup container,
+ Bundle savedInstanceState) {
+ final View rootView = inflater.inflate(R.layout.wifi_add_network_view,
+ container, false /* attachToRoot */);
+
+ final Button neutral = rootView.findViewById(android.R.id.button3);
+ if (neutral != null) {
+ neutral.setVisibility(View.GONE);
+ }
+
+ mSubmitBtn = rootView.findViewById(SUBMIT_BUTTON_ID);
+ mCancelBtn = rootView.findViewById(CANCEL_BUTTON_ID);
+ mSubmitBtn.setOnClickListener(view -> handleSubmitAction());
+ mCancelBtn.setOnClickListener(view -> handleCancelAction());
+
+ mUiController = new WifiConfigController(this, rootView, mAccessPoint,
+ getMode(), false /* requestFocus */);
+
+ /**
+ * For this add AccessPoint UI, need to remove the Home button, so set related feature as
+ * false.
+ */
+ final ActionBar actionBar = getActivity().getActionBar();
+ if (actionBar != null) {
+ actionBar.setDisplayHomeAsUpEnabled(false);
+ actionBar.setHomeButtonEnabled(false);
+ actionBar.setDisplayShowHomeEnabled(false);
+ }
+
+ return rootView;
+ }
+
+ @Override
+ public void onViewStateRestored(Bundle savedInstanceState) {
+ super.onViewStateRestored(savedInstanceState);
+ mUiController.updatePassword();
+ }
+
+ @Override
+ public int getMode() {
+ return WifiConfigUiBase.MODE_CONNECT;
+ }
+
+ @Override
+ public WifiConfigController getController() {
+ return mUiController;
+ }
+
+ @Override
+ public void dispatchSubmit() {
+ // Do nothing
+ }
+
+ @Override
+ public void setTitle(int id) {
+ getActivity().setTitle(id);
+ }
+
+ @Override
+ public void setTitle(CharSequence title) {
+ getActivity().setTitle(title);
+ }
+
+ @Override
+ public void setSubmitButton(CharSequence text) {
+ mSubmitBtn.setText(text);
+ }
+
+ @Override
+ public void setCancelButton(CharSequence text) {
+ mCancelBtn.setText(text);
+ }
+
+ @Override
+ public void setForgetButton(CharSequence text) {
+ // AddNetwork doesn't need forget button.
+ }
+
+ @Override
+ public Button getSubmitButton() {
+ return mSubmitBtn;
+ }
+
+ @Override
+ public Button getCancelButton() {
+ return mCancelBtn;
+ }
+
+ @Override
+ public Button getForgetButton() {
+ // AddNetwork doesn't need forget button.
+ return null;
+ }
+
+ @VisibleForTesting
+ void handleSubmitAction() {
+ final Intent intent = new Intent();
+ final Activity activity = getActivity();
+ intent.putExtra(NETWORK_CONFIG_KEY, mUiController.getConfig());
+ activity.setResult(Activity.RESULT_OK, intent);
+ activity.finish();
+ }
+
+ @VisibleForTesting
+ void handleCancelAction() {
+ final Activity activity = getActivity();
+ activity.setResult(Activity.RESULT_CANCELED);
+ activity.finish();
+ }
+}
diff --git a/src/com/android/settings/wifi/ConfigureWifiSettings.java b/src/com/android/settings/wifi/ConfigureWifiSettings.java
index 718f7fb..613a2cb 100644
--- a/src/com/android/settings/wifi/ConfigureWifiSettings.java
+++ b/src/com/android/settings/wifi/ConfigureWifiSettings.java
@@ -74,16 +74,8 @@
@Override
protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
- mWifiWakeupPreferenceController = new WifiWakeupPreferenceController(context, this,
- getSettingsLifecycle());
- mUseOpenWifiPreferenceController = new UseOpenWifiPreferenceController(context, this,
- getSettingsLifecycle());
final WifiManager wifiManager = (WifiManager) getSystemService(WIFI_SERVICE);
final List<AbstractPreferenceController> controllers = new ArrayList<>();
- controllers.add(mWifiWakeupPreferenceController);
- controllers.add(new NotifyOpenNetworksPreferenceController(context,
- getSettingsLifecycle()));
- controllers.add(mUseOpenWifiPreferenceController);
controllers.add(new WifiInfoPreferenceController(context, getSettingsLifecycle(),
wifiManager));
controllers.add(new WifiP2pPreferenceController(context, getSettingsLifecycle(),
@@ -92,13 +84,24 @@
}
@Override
+ public void onAttach(Context context) {
+ super.onAttach(context);
+
+
+ mWifiWakeupPreferenceController = use(WifiWakeupPreferenceController.class);
+ mWifiWakeupPreferenceController.setFragment(this);
+
+ mUseOpenWifiPreferenceController = use(UseOpenWifiPreferenceController.class);
+ mUseOpenWifiPreferenceController.setFragment(this);
+ }
+
+ @Override
public void onActivityResult(int requestCode, int resultCode, Intent data) {
- if (requestCode == WIFI_WAKEUP_REQUEST_CODE && mWifiWakeupPreferenceController != null) {
+ if (requestCode == WIFI_WAKEUP_REQUEST_CODE) {
mWifiWakeupPreferenceController.onActivityResult(requestCode, resultCode);
return;
}
- if (requestCode == UseOpenWifiPreferenceController.REQUEST_CODE_OPEN_WIFI_AUTOMATICALLY
- && mUseOpenWifiPreferenceController != null) {
+ if (requestCode == UseOpenWifiPreferenceController.REQUEST_CODE_OPEN_WIFI_AUTOMATICALLY) {
mUseOpenWifiPreferenceController.onActivityResult(requestCode, resultCode);
return;
}
diff --git a/src/com/android/settings/wifi/NetworkRequestDialogActivity.java b/src/com/android/settings/wifi/NetworkRequestDialogActivity.java
index 5d89f77..1f2b221 100644
--- a/src/com/android/settings/wifi/NetworkRequestDialogActivity.java
+++ b/src/com/android/settings/wifi/NetworkRequestDialogActivity.java
@@ -16,23 +16,243 @@
package com.android.settings.wifi;
+import android.app.ProgressDialog;
+import android.content.Intent;
+import android.net.wifi.ScanResult;
+import android.net.wifi.WifiConfiguration;
+import android.net.wifi.WifiInfo;
+import android.net.wifi.WifiManager;
+import android.net.wifi.WifiManager.NetworkRequestMatchCallback;
+import android.net.wifi.WifiManager.NetworkRequestUserSelectionCallback;
import android.os.Bundle;
-
+import android.os.Handler;
+import android.os.Message;
+import android.widget.Toast;
import androidx.annotation.Nullable;
import androidx.fragment.app.FragmentActivity;
+import com.android.settings.R;
+import com.android.settings.wifi.NetworkRequestErrorDialogFragment.ERROR_DIALOG_TYPE;
+import java.util.List;
/**
* When other applications request to have a wifi connection, framework will bring up this activity
- * to let user select which wifi ap wanna to connect. This activity is just a door for framework
- * call, and main functional process is at {@code NetworkRequestDialogFragment}.
+ * to let user select which wifi ap wanna to connect. This activity contains
+ * {@code NetworkRequestDialogFragment}, {@code NetworkRequestSingleSsidDialogFragment} to show UI
+ * and handles framework callback.
*/
-public class NetworkRequestDialogActivity extends FragmentActivity {
+public class NetworkRequestDialogActivity extends FragmentActivity implements
+ NetworkRequestMatchCallback {
+ private static String TAG = "NetworkRequestDialogActivity";
+
+ /** Message sent to stop scanning wifi and pop up timeout dialog. */
+ private static final int MESSAGE_STOP_SCAN_WIFI_LIST = 0;
+
+ /** Delayed time to stop scanning wifi. */
+ private static final int DELAY_TIME_STOP_SCAN_MS = 30 * 1000;
+
+ final static String EXTRA_IS_SPECIFIED_SSID =
+ "com.android.settings.wifi.extra.REQUEST_IS_FOR_SINGLE_NETWORK";
+
+ private NetworkRequestDialogBaseFragment mDialogFragment;
+ private NetworkRequestUserSelectionCallback mUserSelectionCallback;
+ private boolean mIsSpecifiedSsid;
+ private boolean mShowingErrorDialog;
+ private WifiConfiguration mMatchedConfig;
+ private ProgressDialog mProgressDialog;
@Override
protected void onCreate(@Nullable Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
- final NetworkRequestDialogFragment fragment = NetworkRequestDialogFragment.newInstance();
- fragment.show(getSupportFragmentManager(), "NetworkRequestDialogFragment");
+ final Intent intent = getIntent();
+ if (intent != null) {
+ mIsSpecifiedSsid = intent.getBooleanExtra(EXTRA_IS_SPECIFIED_SSID, false);
+ }
+
+ if (mIsSpecifiedSsid) {
+ showProgressDialog(getString(R.string.network_connection_searching_message));
+ } else {
+ mDialogFragment = NetworkRequestDialogFragment.newInstance();
+ mDialogFragment.show(getSupportFragmentManager(), TAG);
+ }
+ }
+
+ private void showProgressDialog(String message) {
+ dismissDialogs();
+
+ mProgressDialog = new ProgressDialog(this);
+ mProgressDialog.setIndeterminate(true);
+ mProgressDialog.setCancelable(false);
+ mProgressDialog.setMessage(message);
+ mProgressDialog.show();
+ }
+
+ private void showSingleSsidRequestDialog(String ssid, boolean isTryAgain) {
+ dismissDialogs();
+
+ mDialogFragment = new NetworkRequestSingleSsidDialogFragment();
+ final Bundle bundle = new Bundle();
+ bundle.putString(NetworkRequestSingleSsidDialogFragment.EXTRA_SSID, ssid);
+ bundle.putBoolean(NetworkRequestSingleSsidDialogFragment.EXTRA_TRYAGAIN, isTryAgain);
+ mDialogFragment.setArguments(bundle);
+ mDialogFragment.show(getSupportFragmentManager(), TAG);
+ }
+
+ private void dismissDialogs() {
+ if (mDialogFragment != null) {
+ mDialogFragment.dismiss();
+ mDialogFragment = null;
+ }
+ if (mProgressDialog != null) {
+ mProgressDialog.dismiss();
+ mProgressDialog = null;
+ }
+ }
+
+ @Override
+ protected void onResume() {
+ super.onResume();
+
+ final WifiManager wifiManager = getSystemService(WifiManager.class);
+ if (wifiManager != null) {
+ wifiManager.registerNetworkRequestMatchCallback(this, mHandler);
+ }
+ // Sets time-out to stop scanning.
+ mHandler.sendEmptyMessageDelayed(MESSAGE_STOP_SCAN_WIFI_LIST, DELAY_TIME_STOP_SCAN_MS);
+ }
+
+ @Override
+ protected void onPause() {
+ mHandler.removeMessages(MESSAGE_STOP_SCAN_WIFI_LIST);
+ final WifiManager wifiManager = getSystemService(WifiManager.class);
+ if (wifiManager != null) {
+ wifiManager.unregisterNetworkRequestMatchCallback(this);
+ }
+
+ super.onPause();
+ }
+
+ private final Handler mHandler = new Handler() {
+ @Override
+ public void handleMessage(Message msg) {
+ switch (msg.what) {
+ case MESSAGE_STOP_SCAN_WIFI_LIST:
+ removeMessages(MESSAGE_STOP_SCAN_WIFI_LIST);
+ stopScanningAndPopErrorDialog(ERROR_DIALOG_TYPE.TIME_OUT);
+ break;
+ default:
+ // Do nothing.
+ break;
+ }
+ }
+ };
+
+ protected void stopScanningAndPopErrorDialog(ERROR_DIALOG_TYPE type) {
+ dismissDialogs();
+
+ // Throws error dialog.
+ final NetworkRequestErrorDialogFragment dialogFragment =
+ NetworkRequestErrorDialogFragment.newInstance();
+ dialogFragment.setRejectCallback(mUserSelectionCallback);
+ final Bundle bundle = new Bundle();
+ bundle.putSerializable(NetworkRequestErrorDialogFragment.DIALOG_TYPE, type);
+ dialogFragment.setArguments(bundle);
+ dialogFragment.show(getSupportFragmentManager(), TAG);
+ mShowingErrorDialog = true;
+ }
+
+ @Override
+ public void onUserSelectionCallbackRegistration(
+ NetworkRequestUserSelectionCallback userSelectionCallback) {
+ if (mIsSpecifiedSsid) {
+ mUserSelectionCallback = userSelectionCallback;
+ return;
+ }
+
+ mDialogFragment.onUserSelectionCallbackRegistration(userSelectionCallback);
+ }
+
+ @Override
+ public void onAbort() {
+ stopScanningAndPopErrorDialog(ERROR_DIALOG_TYPE.ABORT);
+ }
+
+ @Override
+ public void onMatch(List<ScanResult> scanResults) {
+ if (mShowingErrorDialog) {
+ // Don't do anything since error dialog shows.
+ return;
+ }
+
+ mHandler.removeMessages(MESSAGE_STOP_SCAN_WIFI_LIST);
+
+ if (mIsSpecifiedSsid) {
+ // Prevent from throwing same dialog, because onMatch() will be called many times.
+ if (mMatchedConfig == null) {
+ mMatchedConfig = WifiUtils.getWifiConfig(
+ null /* accesspoint */, scanResults.get(0), null /* password */);
+ showSingleSsidRequestDialog(
+ WifiInfo.removeDoubleQuotes(mMatchedConfig.SSID), false /* isTryAgain */);
+ }
+ return;
+ }
+
+ mDialogFragment.onMatch(scanResults);
+ }
+
+ @Override
+ public void onUserSelectionConnectSuccess(WifiConfiguration wificonfiguration) {
+ if (!isFinishing()) {
+ Toast.makeText(this, R.string.network_connection_connect_successful,
+ Toast.LENGTH_SHORT).show();
+ setResult(RESULT_OK);
+ finish();
+ }
+ }
+
+ @Override
+ public void onUserSelectionConnectFailure(WifiConfiguration wificonfiguration) {
+ if (mIsSpecifiedSsid) {
+ showSingleSsidRequestDialog(
+ WifiInfo.removeDoubleQuotes(mMatchedConfig.SSID), true /* isTryAgain */);
+ return;
+ }
+
+ mDialogFragment.onUserSelectionConnectFailure(wificonfiguration);
+ }
+
+ // Called when user click "Connect" button. Called by
+ // {@code NetworkRequestSingleSsidDialogFragment}.
+ public void onClickConnectButton() {
+ if (mUserSelectionCallback != null) {
+ mUserSelectionCallback.select(mMatchedConfig);
+ showProgressDialog(getString(R.string.network_connection_connecting_message));
+ }
+ }
+
+ // Called when user click retry button. Called by {@link NetworkRequestErrorDialogFragment}.
+ public void onClickRescanButton() {
+ // Sets time-out to stop scanning.
+ mHandler.sendEmptyMessageDelayed(MESSAGE_STOP_SCAN_WIFI_LIST, DELAY_TIME_STOP_SCAN_MS);
+
+ mShowingErrorDialog = false;
+
+ if (mIsSpecifiedSsid) {
+ mMatchedConfig = null;
+ showProgressDialog(getString(R.string.network_connection_searching_message));
+ } else {
+ mDialogFragment = NetworkRequestDialogFragment.newInstance();
+ mDialogFragment.show(getSupportFragmentManager(), TAG);
+ }
+ }
+
+ // Called when user click cancel button.
+ public void onCancel() {
+ dismissDialogs();
+
+ if (mUserSelectionCallback != null) {
+ mUserSelectionCallback.reject();
+ }
+ finish();
}
}
diff --git a/src/com/android/settings/wifi/NetworkRequestDialogBaseFragment.java b/src/com/android/settings/wifi/NetworkRequestDialogBaseFragment.java
new file mode 100644
index 0000000..eda3204
--- /dev/null
+++ b/src/com/android/settings/wifi/NetworkRequestDialogBaseFragment.java
@@ -0,0 +1,90 @@
+/*
+ * 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.wifi;
+
+import android.app.settings.SettingsEnums;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.net.wifi.ScanResult;
+import android.net.wifi.WifiConfiguration;
+import android.net.wifi.WifiManager.NetworkRequestUserSelectionCallback;
+import androidx.annotation.NonNull;
+import androidx.annotation.VisibleForTesting;
+import com.android.settings.R;
+import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
+import java.util.List;
+
+/**
+ * This is base fragment of {@link NetworkRequestDialogFragment} and
+ * {@link NetworkRequestSingleSsidDialogFragment} to handle activity callback methods.
+ */
+abstract public class NetworkRequestDialogBaseFragment extends InstrumentedDialogFragment {
+
+ @VisibleForTesting
+ final static String EXTRA_APP_NAME = "com.android.settings.wifi.extra.APP_NAME";
+
+ NetworkRequestDialogActivity mActivity = null;
+
+ protected String getTitle() {
+ final Intent intent = getActivity().getIntent();
+ String appName = "";
+ if (intent != null) {
+ appName = intent.getStringExtra(EXTRA_APP_NAME);
+ }
+
+ return getString(R.string.network_connection_request_dialog_title, appName);
+ }
+
+ @Override
+ public int getMetricsCategory() {
+ return SettingsEnums.WIFI_SCANNING_NEEDED_DIALOG;
+ }
+
+ @Override
+ public void onAttach(Context context) {
+ super.onAttach(context);
+ if (context instanceof NetworkRequestDialogActivity) {
+ mActivity = (NetworkRequestDialogActivity) context;
+ }
+ }
+
+ @Override
+ public void onDetach() {
+ super.onDetach();
+ mActivity = null;
+ }
+
+ @Override
+ public void onCancel(@NonNull DialogInterface dialog) {
+ super.onCancel(dialog);
+
+ if (mActivity != null) {
+ mActivity.onCancel();
+ }
+ }
+
+ protected void onUserSelectionCallbackRegistration(
+ NetworkRequestUserSelectionCallback userSelectionCallback) {
+ }
+
+ protected void onMatch(List<ScanResult> scanResults) {
+ }
+
+ protected void onUserSelectionConnectFailure(WifiConfiguration wificonfiguration) {
+ }
+}
diff --git a/src/com/android/settings/wifi/NetworkRequestDialogFragment.java b/src/com/android/settings/wifi/NetworkRequestDialogFragment.java
index eb7d78f..a88b004 100644
--- a/src/com/android/settings/wifi/NetworkRequestDialogFragment.java
+++ b/src/com/android/settings/wifi/NetworkRequestDialogFragment.java
@@ -16,21 +16,15 @@
package com.android.settings.wifi;
-import android.app.Activity;
import android.app.Dialog;
-import android.app.settings.SettingsEnums;
import android.content.Context;
import android.content.DialogInterface;
-import android.content.Intent;
import android.graphics.drawable.Drawable;
import android.net.wifi.ScanResult;
import android.net.wifi.WifiConfiguration;
-import android.net.wifi.WifiManager;
import android.net.wifi.WifiManager.NetworkRequestMatchCallback;
import android.net.wifi.WifiManager.NetworkRequestUserSelectionCallback;
import android.os.Bundle;
-import android.os.Handler;
-import android.os.Message;
import android.text.TextUtils;
import android.view.LayoutInflater;
import android.view.View;
@@ -40,22 +34,16 @@
import android.widget.Button;
import android.widget.ProgressBar;
import android.widget.TextView;
-import android.widget.Toast;
-
import androidx.annotation.NonNull;
import androidx.annotation.VisibleForTesting;
import androidx.appcompat.app.AlertDialog;
import androidx.preference.internal.PreferenceImageView;
-
import com.android.settings.R;
-import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
-import com.android.settings.wifi.NetworkRequestErrorDialogFragment.ERROR_DIALOG_TYPE;
import com.android.settingslib.Utils;
import com.android.settingslib.core.lifecycle.Lifecycle;
import com.android.settingslib.wifi.AccessPoint;
import com.android.settingslib.wifi.WifiTracker;
import com.android.settingslib.wifi.WifiTrackerFactory;
-
import java.util.ArrayList;
import java.util.List;
@@ -64,11 +52,8 @@
* behaviors of the callback when requesting wifi network, except for error message. When error
* happens, {@link NetworkRequestErrorDialogFragment} will be called to display error message.
*/
-public class NetworkRequestDialogFragment extends InstrumentedDialogFragment implements
- DialogInterface.OnClickListener, NetworkRequestMatchCallback {
-
- /** Message sent to us to stop scanning wifi and pop up timeout dialog. */
- private static final int MESSAGE_STOP_SCAN_WIFI_LIST = 0;
+public class NetworkRequestDialogFragment extends NetworkRequestDialogBaseFragment implements
+ DialogInterface.OnClickListener{
/**
* Spec defines there should be 5 wifi ap on the list at most or just show all if {@code
@@ -77,20 +62,10 @@
private static final int MAX_NUMBER_LIST_ITEM = 5;
private boolean mShowLimitedItem = true;
- /** Delayed time to stop scanning wifi. */
- private static final int DELAY_TIME_STOP_SCAN_MS = 30 * 1000;
-
- @VisibleForTesting
- final static String EXTRA_APP_NAME = "com.android.settings.wifi.extra.APP_NAME";
- final static String EXTRA_IS_SPECIFIED_SSID =
- "com.android.settings.wifi.extra.REQUEST_IS_FOR_SINGLE_NETWORK";
-
private List<AccessPoint> mAccessPointList;
private FilterWifiTracker mFilterWifiTracker;
private AccessPointAdapter mDialogAdapter;
private NetworkRequestUserSelectionCallback mUserSelectionCallback;
- private boolean mIsSpecifiedSsid;
- private boolean mWaitingConnectCallback;
public static NetworkRequestDialogFragment newInstance() {
NetworkRequestDialogFragment dialogFragment = new NetworkRequestDialogFragment();
@@ -108,11 +83,6 @@
final TextView title = customTitle.findViewById(R.id.network_request_title_text);
title.setText(getTitle());
- final Intent intent = getActivity().getIntent();
- if (intent != null) {
- mIsSpecifiedSsid = intent.getBooleanExtra(EXTRA_IS_SPECIFIED_SSID, false);
- }
-
final ProgressBar progressBar = customTitle.findViewById(
R.id.network_request_title_progress);
progressBar.setVisibility(View.VISIBLE);
@@ -128,9 +98,6 @@
// Do nothings, will replace the onClickListener to avoid auto closing dialog.
.setNeutralButton(R.string.network_connection_request_dialog_showall,
null /* OnClickListener */);
- if (mIsSpecifiedSsid) {
- builder.setPositiveButton(R.string.wifi_connect, null /* OnClickListener */);
- }
// Clicking list item is to connect wifi ap.
final AlertDialog dialog = builder.create();
@@ -152,32 +119,10 @@
notifyAdapterRefresh();
neutralBtn.setVisibility(View.GONE);
});
-
- // Replace Positive onClickListener to avoid closing dialog
- if (mIsSpecifiedSsid) {
- final Button positiveBtn = dialog.getButton(AlertDialog.BUTTON_POSITIVE);
- positiveBtn.setOnClickListener(v -> {
- // When clicking connect button, should connect to the first and the only one
- // list item.
- this.onClick(dialog, 0 /* position */);
- });
- // Disable button in first, and enable it after there are some accesspoints in list.
- positiveBtn.setEnabled(false);
- }
});
return dialog;
}
- private String getTitle() {
- final Intent intent = getActivity().getIntent();
- String appName = "";
- if (intent != null) {
- appName = intent.getStringExtra(EXTRA_APP_NAME);
- }
-
- return getString(R.string.network_connection_request_dialog_title, appName);
- }
-
@NonNull
List<AccessPoint> getAccessPointList() {
// Initials list for adapter, in case of display crashing.
@@ -211,9 +156,6 @@
if (wifiConfig != null) {
mUserSelectionCallback.select(wifiConfig);
-
- mWaitingConnectCallback = true;
- updateConnectButton(false);
}
}
}
@@ -221,10 +163,6 @@
@Override
public void onCancel(@NonNull DialogInterface dialog) {
super.onCancel(dialog);
- // Finishes the activity when user clicks back key or outside of the dialog.
- if (getActivity() != null) {
- getActivity().finish();
- }
if (mUserSelectionCallback != null) {
mUserSelectionCallback.reject();
}
@@ -234,13 +172,6 @@
public void onPause() {
super.onPause();
- mHandler.removeMessages(MESSAGE_STOP_SCAN_WIFI_LIST);
- final WifiManager wifiManager = getContext().getApplicationContext()
- .getSystemService(WifiManager.class);
- if (wifiManager != null) {
- wifiManager.unregisterNetworkRequestMatchCallback(this);
- }
-
if (mFilterWifiTracker != null) {
mFilterWifiTracker.onPause();
}
@@ -268,23 +199,6 @@
}
}
- private void updateConnectButton(boolean enabled) {
- // The button is only showed in single SSID mode.
- if (!mIsSpecifiedSsid) {
- return;
- }
-
- final AlertDialog alertDialog = (AlertDialog) getDialog();
- if (alertDialog == null) {
- return;
- }
-
- final Button positiveBtn = alertDialog.getButton(AlertDialog.BUTTON_POSITIVE);
- if (positiveBtn != null) {
- positiveBtn.setEnabled(enabled);
- }
- }
-
private void hideProgressIcon() {
final AlertDialog alertDialog = (AlertDialog) getDialog();
if (alertDialog == null) {
@@ -301,57 +215,12 @@
public void onResume() {
super.onResume();
- final WifiManager wifiManager = getContext().getApplicationContext()
- .getSystemService(WifiManager.class);
- if (wifiManager != null) {
- wifiManager.registerNetworkRequestMatchCallback(this, mHandler);
- }
- // Sets time-out to stop scanning.
- mHandler.sendEmptyMessageDelayed(MESSAGE_STOP_SCAN_WIFI_LIST, DELAY_TIME_STOP_SCAN_MS);
-
if (mFilterWifiTracker == null) {
mFilterWifiTracker = new FilterWifiTracker(getActivity(), getSettingsLifecycle());
}
mFilterWifiTracker.onResume();
}
- private final Handler mHandler = new Handler() {
- @Override
- public void handleMessage(Message msg) {
- switch (msg.what) {
- case MESSAGE_STOP_SCAN_WIFI_LIST:
- removeMessages(MESSAGE_STOP_SCAN_WIFI_LIST);
- stopScanningAndPopErrorDialog(ERROR_DIALOG_TYPE.TIME_OUT);
- break;
- default:
- // Do nothing.
- break;
- }
- }
- };
-
- protected void stopScanningAndPopErrorDialog(ERROR_DIALOG_TYPE type) {
- // Dismisses current dialog.
- final Dialog dialog = getDialog();
- if (dialog != null && dialog.isShowing()) {
- dismiss();
- }
-
- // Throws error dialog.
- final NetworkRequestErrorDialogFragment fragment = NetworkRequestErrorDialogFragment
- .newInstance();
- final Bundle bundle = new Bundle();
- bundle.putSerializable(NetworkRequestErrorDialogFragment.DIALOG_TYPE, type);
- fragment.setArguments(bundle);
- fragment.show(getActivity().getSupportFragmentManager(),
- NetworkRequestDialogFragment.class.getSimpleName());
- }
-
- @Override
- public int getMetricsCategory() {
- return SettingsEnums.WIFI_SCANNING_NEEDED_DIALOG;
- }
-
private class AccessPointAdapter extends ArrayAdapter<AccessPoint> {
private final int mResourceId;
@@ -408,11 +277,6 @@
}
@Override
- public void onAbort() {
- stopScanningAndPopErrorDialog(ERROR_DIALOG_TYPE.ABORT);
- }
-
- @Override
public void onUserSelectionCallbackRegistration(
NetworkRequestUserSelectionCallback userSelectionCallback) {
mUserSelectionCallback = userSelectionCallback;
@@ -422,7 +286,6 @@
public void onMatch(List<ScanResult> scanResults) {
// Shouldn't need to renew cached list, since input result is empty.
if (scanResults != null && scanResults.size() > 0) {
- mHandler.removeMessages(MESSAGE_STOP_SCAN_WIFI_LIST);
renewAccessPointList(scanResults);
notifyAdapterRefresh();
@@ -456,20 +319,8 @@
}
@Override
- public void onUserSelectionConnectSuccess(WifiConfiguration wificonfiguration) {
- final Activity activity = getActivity();
- if (activity != null) {
- Toast.makeText(activity, R.string.network_connection_connect_successful,
- Toast.LENGTH_SHORT).show();
- activity.finish();
- }
- }
-
- @Override
public void onUserSelectionConnectFailure(WifiConfiguration wificonfiguration) {
// Do nothing when selection is failed, let user could try again easily.
- mWaitingConnectCallback = false;
- updateConnectButton(true);
}
private final class FilterWifiTracker {
@@ -526,13 +377,6 @@
if (count > 0) {
hideProgressIcon();
}
- // Enable connect button if there is Accesspoint item, except for the situation that
- // user click but connected status doesn't come back yet.
- if (count < 0) {
- updateConnectButton(false);
- } else if (!mWaitingConnectCallback) {
- updateConnectButton(true);
- }
return result;
}
diff --git a/src/com/android/settings/wifi/NetworkRequestErrorDialogFragment.java b/src/com/android/settings/wifi/NetworkRequestErrorDialogFragment.java
index 261d313..57e1bca 100644
--- a/src/com/android/settings/wifi/NetworkRequestErrorDialogFragment.java
+++ b/src/com/android/settings/wifi/NetworkRequestErrorDialogFragment.java
@@ -19,11 +19,12 @@
import android.app.Dialog;
import android.app.settings.SettingsEnums;
import android.content.DialogInterface;
+import android.net.wifi.WifiManager.NetworkRequestUserSelectionCallback;
import android.os.Bundle;
import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
import androidx.appcompat.app.AlertDialog;
-
import com.android.settings.R;
import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
@@ -36,6 +37,8 @@
public static final String DIALOG_TYPE = "DIALOG_ERROR_TYPE";
public enum ERROR_DIALOG_TYPE {TIME_OUT, ABORT}
+ @Nullable
+ private NetworkRequestUserSelectionCallback mRejectCallback;
public static NetworkRequestErrorDialogFragment newInstance() {
return new NetworkRequestErrorDialogFragment();
@@ -49,7 +52,7 @@
public void onCancel(@NonNull DialogInterface dialog) {
super.onCancel(dialog);
// Wants to finish the activity when user clicks back key or outside of the dialog.
- getActivity().finish();
+ rejectNetworkRequestAndFinish();
}
@Override
@@ -64,11 +67,13 @@
if (msgType == ERROR_DIALOG_TYPE.TIME_OUT) {
builder.setMessage(R.string.network_connection_timeout_dialog_message)
.setPositiveButton(R.string.network_connection_timeout_dialog_ok,
- (dialog, which) -> startScanningDialog())
- .setNegativeButton(R.string.cancel, (dialog, which) -> getActivity().finish());
+ (dialog, which) -> onRescanClick())
+ .setNegativeButton(R.string.cancel,
+ (dialog, which) -> rejectNetworkRequestAndFinish());
} else {
builder.setMessage(R.string.network_connection_errorstate_dialog_message)
- .setPositiveButton(R.string.okay, (dialog, which) -> getActivity().finish());
+ .setPositiveButton(R.string.okay,
+ (dialog, which) -> rejectNetworkRequestAndFinish());
}
return builder.create();
}
@@ -78,9 +83,24 @@
return SettingsEnums.WIFI_SCANNING_NEEDED_DIALOG;
}
- protected void startScanningDialog() {
- final NetworkRequestDialogFragment fragment = NetworkRequestDialogFragment.newInstance();
- fragment.show(getActivity().getSupportFragmentManager(),
- NetworkRequestErrorDialogFragment.class.getSimpleName());
+ // Sets the callback for fragment to reject this request.
+ public void setRejectCallback(NetworkRequestUserSelectionCallback rejectCallback) {
+ mRejectCallback = rejectCallback;
+ }
+
+ protected void onRescanClick() {
+ if (getActivity() != null) {
+ dismiss();
+ ((NetworkRequestDialogActivity)getActivity()).onClickRescanButton();
+ }
+ }
+
+ private void rejectNetworkRequestAndFinish() {
+ if (getActivity() != null) {
+ if (mRejectCallback != null) {
+ mRejectCallback.reject();
+ }
+ getActivity().finish();
+ }
}
}
diff --git a/src/com/android/settings/wifi/NetworkRequestSingleSsidDialogFragment.java b/src/com/android/settings/wifi/NetworkRequestSingleSsidDialogFragment.java
new file mode 100644
index 0000000..7a0ccbe
--- /dev/null
+++ b/src/com/android/settings/wifi/NetworkRequestSingleSsidDialogFragment.java
@@ -0,0 +1,59 @@
+package com.android.settings.wifi;
+
+import android.app.Dialog;
+import android.content.Context;
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.widget.ProgressBar;
+import android.widget.TextView;
+import androidx.appcompat.app.AlertDialog;
+import com.android.settings.R;
+
+/**
+ * This is similar fragment with {@link NetworkRequestDialogFragment} but only for single SSID mode.
+ */
+public class NetworkRequestSingleSsidDialogFragment extends
+ NetworkRequestDialogBaseFragment {
+ public static final String EXTRA_SSID = "DIALOG_REQUEST_SSID";
+ public static final String EXTRA_TRYAGAIN = "DIALOG_IS_TRYAGAIN";
+
+ @Override
+ public Dialog onCreateDialog(Bundle savedInstanceState) {
+ boolean isTryAgain = false;
+ String requestSsid = "";
+ if (getArguments() != null) {
+ isTryAgain = getArguments().getBoolean(EXTRA_TRYAGAIN, true);
+ requestSsid = getArguments().getString(EXTRA_SSID, "");
+ }
+
+ final Context context = getContext();
+ final LayoutInflater inflater = LayoutInflater.from(context);
+
+ final View customTitle = inflater.inflate(R.layout.network_request_dialog_title, null);
+ final TextView title = customTitle.findViewById(R.id.network_request_title_text);
+ title.setText(getTitle());
+ final ProgressBar progressBar = customTitle
+ .findViewById(R.id.network_request_title_progress);
+ progressBar.setVisibility(View.GONE);
+
+ final AlertDialog.Builder builder = new AlertDialog.Builder(context)
+ .setCustomTitle(customTitle)
+ .setMessage(requestSsid)
+ .setPositiveButton(isTryAgain ? R.string.network_connection_timeout_dialog_ok
+ : R.string.wifi_connect, (dialog, which) -> onUserClickConnectButton())
+ .setNeutralButton(R.string.cancel, (dialog, which) -> onCancel(dialog));
+
+ // Don't dismiss dialog when touching outside. User reports it is easy to touch outside.
+ // This causes dialog to close.
+ setCancelable(false);
+
+ return builder.create();
+ }
+
+ private void onUserClickConnectButton() {
+ if (mActivity != null) {
+ mActivity.onClickConnectButton();
+ }
+ }
+}
diff --git a/src/com/android/settings/wifi/NotifyOpenNetworksPreferenceController.java b/src/com/android/settings/wifi/NotifyOpenNetworksPreferenceController.java
index a46a828..6455f5b 100644
--- a/src/com/android/settings/wifi/NotifyOpenNetworksPreferenceController.java
+++ b/src/com/android/settings/wifi/NotifyOpenNetworksPreferenceController.java
@@ -22,38 +22,34 @@
import android.net.Uri;
import android.os.Handler;
import android.provider.Settings;
-import android.text.TextUtils;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
-import androidx.preference.SwitchPreference;
import com.android.settings.core.PreferenceControllerMixin;
-import com.android.settingslib.core.AbstractPreferenceController;
-import com.android.settingslib.core.lifecycle.Lifecycle;
+import com.android.settings.core.TogglePreferenceController;
import com.android.settingslib.core.lifecycle.LifecycleObserver;
import com.android.settingslib.core.lifecycle.events.OnPause;
import com.android.settingslib.core.lifecycle.events.OnResume;
/**
- * {@link AbstractPreferenceController} that controls whether we should notify user when open
+ * {@link TogglePreferenceController} that controls whether we should notify user when open
* network is available.
*/
-public class NotifyOpenNetworksPreferenceController extends AbstractPreferenceController
+public class NotifyOpenNetworksPreferenceController extends TogglePreferenceController
implements PreferenceControllerMixin, LifecycleObserver, OnResume, OnPause {
private static final String KEY_NOTIFY_OPEN_NETWORKS = "notify_open_networks";
private SettingObserver mSettingObserver;
- public NotifyOpenNetworksPreferenceController(Context context, Lifecycle lifecycle) {
- super(context);
- lifecycle.addObserver(this);
+ public NotifyOpenNetworksPreferenceController(Context context) {
+ super(context, KEY_NOTIFY_OPEN_NETWORKS);
}
@Override
public void displayPreference(PreferenceScreen screen) {
super.displayPreference(screen);
- mSettingObserver = new SettingObserver(screen.findPreference(KEY_NOTIFY_OPEN_NETWORKS));
+ mSettingObserver = new SettingObserver(screen.findPreference(getPreferenceKey()));
}
@Override
@@ -71,39 +67,24 @@
}
@Override
- public boolean isAvailable() {
- return true;
+ public int getAvailabilityStatus() {
+ return AVAILABLE;
}
@Override
- public boolean handlePreferenceTreeClick(Preference preference) {
- if (!TextUtils.equals(preference.getKey(), KEY_NOTIFY_OPEN_NETWORKS)) {
- return false;
- }
- if (!(preference instanceof SwitchPreference)) {
- return false;
- }
+ public boolean isChecked() {
+ return Settings.Global.getInt(mContext.getContentResolver(),
+ Settings.Global.WIFI_NETWORKS_AVAILABLE_NOTIFICATION_ON, 0) == 1;
+ }
+
+ @Override
+ public boolean setChecked(boolean isChecked) {
Settings.Global.putInt(mContext.getContentResolver(),
Settings.Global.WIFI_NETWORKS_AVAILABLE_NOTIFICATION_ON,
- ((SwitchPreference) preference).isChecked() ? 1 : 0);
+ isChecked ? 1 : 0);
return true;
}
- @Override
- public String getPreferenceKey() {
- return KEY_NOTIFY_OPEN_NETWORKS;
- }
-
- @Override
- public void updateState(Preference preference) {
- if (!(preference instanceof SwitchPreference)) {
- return;
- }
- final SwitchPreference notifyOpenNetworks = (SwitchPreference) preference;
- notifyOpenNetworks.setChecked(Settings.Global.getInt(mContext.getContentResolver(),
- Settings.Global.WIFI_NETWORKS_AVAILABLE_NOTIFICATION_ON, 0) == 1);
- }
-
class SettingObserver extends ContentObserver {
private final Uri NETWORKS_AVAILABLE_URI = Settings.Global.getUriFor(
Settings.Global.WIFI_NETWORKS_AVAILABLE_NOTIFICATION_ON);
diff --git a/src/com/android/settings/wifi/OWNERS b/src/com/android/settings/wifi/OWNERS
index 3090f13..ab0af7c 100644
--- a/src/com/android/settings/wifi/OWNERS
+++ b/src/com/android/settings/wifi/OWNERS
@@ -1,9 +1,4 @@
# Default reviewers for this and subdirectories.
-asargent@google.com
-easchwar@google.com
-dling@google.com
-jlapenna@google.com
-sghuman@google.com
-zhfan@google.com
-
-# Emergency approvers in case the above are not available
\ No newline at end of file
+govenliu@google.com
+arcwang@google.com
+tmfang@google.com
diff --git a/src/com/android/settings/wifi/UseOpenWifiPreferenceController.java b/src/com/android/settings/wifi/UseOpenWifiPreferenceController.java
index eef2216..27cf1e2 100644
--- a/src/com/android/settings/wifi/UseOpenWifiPreferenceController.java
+++ b/src/com/android/settings/wifi/UseOpenWifiPreferenceController.java
@@ -17,12 +17,10 @@
import androidx.fragment.app.Fragment;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
-import androidx.preference.SwitchPreference;
import com.android.settings.R;
import com.android.settings.core.PreferenceControllerMixin;
-import com.android.settingslib.core.AbstractPreferenceController;
-import com.android.settingslib.core.lifecycle.Lifecycle;
+import com.android.settings.core.TogglePreferenceController;
import com.android.settingslib.core.lifecycle.LifecycleObserver;
import com.android.settingslib.core.lifecycle.events.OnPause;
import com.android.settingslib.core.lifecycle.events.OnResume;
@@ -30,10 +28,10 @@
import java.util.List;
/**
- * {@link AbstractPreferenceController} that controls whether a user wants to enable the "use open
- * networks automatically" feature provider by the current network recommendation provider.
+ * {@link TogglePreferenceController} that controls whether a user wants to enable the "use open
+ * networks automatically" feature provided by the current network recommendation provider.
*/
-public class UseOpenWifiPreferenceController extends AbstractPreferenceController
+public class UseOpenWifiPreferenceController extends TogglePreferenceController
implements PreferenceControllerMixin, Preference.OnPreferenceChangeListener,
LifecycleObserver, OnResume, OnPause {
public static final int REQUEST_CODE_OPEN_WIFI_AUTOMATICALLY = 400;
@@ -41,7 +39,7 @@
private static final String KEY_USE_OPEN_WIFI_AUTOMATICALLY = "use_open_wifi_automatically";
private final ContentResolver mContentResolver;
- private final Fragment mFragment;
+ private Fragment mFragment;
private final NetworkScoreManager mNetworkScoreManager;
private final SettingObserver mSettingObserver;
@@ -49,17 +47,18 @@
private ComponentName mEnableUseWifiComponentName;
private boolean mDoFeatureSupportedScorersExist;
- public UseOpenWifiPreferenceController(Context context, Fragment fragment,
- Lifecycle lifecycle) {
- super(context);
+ public UseOpenWifiPreferenceController(Context context) {
+ super(context, KEY_USE_OPEN_WIFI_AUTOMATICALLY);
mContentResolver = context.getContentResolver();
- mFragment = fragment;
mNetworkScoreManager =
(NetworkScoreManager) context.getSystemService(Context.NETWORK_SCORE_SERVICE);
mSettingObserver = new SettingObserver();
updateEnableUseWifiComponentName();
checkForFeatureSupportedScorers();
- lifecycle.addObserver(this);
+ }
+
+ public void setFragment(Fragment hostFragment) {
+ mFragment = hostFragment;
}
private void updateEnableUseWifiComponentName() {
@@ -86,7 +85,7 @@
@Override
public void displayPreference(PreferenceScreen screen) {
super.displayPreference(screen);
- mPreference = screen.findPreference(KEY_USE_OPEN_WIFI_AUTOMATICALLY);
+ mPreference = screen.findPreference(getPreferenceKey());
}
@Override
@@ -100,67 +99,54 @@
}
@Override
- public boolean isAvailable() {
- return mDoFeatureSupportedScorersExist;
- }
-
- @Override
- public String getPreferenceKey() {
- return KEY_USE_OPEN_WIFI_AUTOMATICALLY;
+ public int getAvailabilityStatus() {
+ return mDoFeatureSupportedScorersExist ? AVAILABLE : CONDITIONALLY_UNAVAILABLE;
}
@Override
public void updateState(Preference preference) {
- if (!(preference instanceof SwitchPreference)) {
- return;
- }
- final SwitchPreference useOpenWifiPreference = (SwitchPreference) preference;
+ super.updateState(preference);
- boolean isScorerSet = mNetworkScoreManager.getActiveScorerPackage() != null;
- boolean doesActiveScorerSupportFeature = mEnableUseWifiComponentName != null;
+ final boolean isScorerSet = mNetworkScoreManager.getActiveScorerPackage() != null;
+ final boolean doesActiveScorerSupportFeature = mEnableUseWifiComponentName != null;
- useOpenWifiPreference.setChecked(isSettingEnabled());
- useOpenWifiPreference.setVisible(isAvailable());
- useOpenWifiPreference.setEnabled(isScorerSet && doesActiveScorerSupportFeature);
-
+ preference.setEnabled(isScorerSet && doesActiveScorerSupportFeature);
if (!isScorerSet) {
- useOpenWifiPreference.setSummary(
- R.string.use_open_wifi_automatically_summary_scoring_disabled);
+ preference.setSummary(R.string.use_open_wifi_automatically_summary_scoring_disabled);
} else if (!doesActiveScorerSupportFeature) {
- useOpenWifiPreference.setSummary(
+ preference.setSummary(
R.string.use_open_wifi_automatically_summary_scorer_unsupported_disabled);
} else {
- useOpenWifiPreference.setSummary(R.string.use_open_wifi_automatically_summary);
+ preference.setSummary(R.string.use_open_wifi_automatically_summary);
}
}
@Override
- public boolean onPreferenceChange(Preference preference, Object newValue) {
- if (!TextUtils.equals(preference.getKey(), KEY_USE_OPEN_WIFI_AUTOMATICALLY)
- || !isAvailable()) {
- return false;
- }
-
- if (isSettingEnabled()) {
- Settings.Global.putString(mContentResolver,
- Settings.Global.USE_OPEN_WIFI_PACKAGE, "");
- return true;
- }
-
- Intent intent = new Intent(NetworkScoreManager.ACTION_CUSTOM_ENABLE);
- intent.setComponent(mEnableUseWifiComponentName);
- mFragment.startActivityForResult(intent, REQUEST_CODE_OPEN_WIFI_AUTOMATICALLY);
- return false; // Updating state is done in onActivityResult.
- }
-
- private boolean isSettingEnabled() {
- String enabledUseOpenWifiPackage = Settings.Global.getString(mContentResolver,
+ public boolean isChecked() {
+ final String enabledUseOpenWifiPackage = Settings.Global.getString(mContentResolver,
Settings.Global.USE_OPEN_WIFI_PACKAGE);
- String currentUseOpenWifiPackage = mEnableUseWifiComponentName == null
+ final String currentUseOpenWifiPackage = mEnableUseWifiComponentName == null
? null : mEnableUseWifiComponentName.getPackageName();
return TextUtils.equals(enabledUseOpenWifiPackage, currentUseOpenWifiPackage);
}
+ @Override
+ public boolean setChecked(boolean isChecked) {
+ if (isChecked) {
+ if (mFragment == null) {
+ throw new IllegalStateException("No fragment to start activity");
+ }
+
+ final Intent intent = new Intent(NetworkScoreManager.ACTION_CUSTOM_ENABLE);
+ intent.setComponent(mEnableUseWifiComponentName);
+ mFragment.startActivityForResult(intent, REQUEST_CODE_OPEN_WIFI_AUTOMATICALLY);
+ return false; // Updating state is done in onActivityResult.
+ } else {
+ Settings.Global.putString(mContentResolver, Settings.Global.USE_OPEN_WIFI_PACKAGE, "");
+ return true;
+ }
+ }
+
public boolean onActivityResult(int requestCode, int resultCode) {
if (requestCode != REQUEST_CODE_OPEN_WIFI_AUTOMATICALLY) {
return false;
diff --git a/src/com/android/settings/wifi/WifiConfigController.java b/src/com/android/settings/wifi/WifiConfigController.java
index 8e0da6b..8c5c5b6 100644
--- a/src/com/android/settings/wifi/WifiConfigController.java
+++ b/src/com/android/settings/wifi/WifiConfigController.java
@@ -35,11 +35,13 @@
import android.net.wifi.WifiEnterpriseConfig.Phase2;
import android.net.wifi.WifiInfo;
import android.net.wifi.WifiManager;
+import android.os.IBinder;
import android.os.UserManager;
import android.security.Credentials;
import android.security.KeyStore;
import android.text.Editable;
import android.text.InputType;
+import android.text.SpannableString;
import android.text.TextUtils;
import android.text.TextWatcher;
import android.util.Log;
@@ -47,6 +49,7 @@
import android.view.View;
import android.view.ViewGroup;
import android.view.inputmethod.EditorInfo;
+import android.view.inputmethod.InputMethodManager;
import android.widget.AdapterView;
import android.widget.ArrayAdapter;
import android.widget.Button;
@@ -59,8 +62,6 @@
import android.widget.Spinner;
import android.widget.TextView;
-import androidx.annotation.VisibleForTesting;
-
import com.android.settings.ProxySelector;
import com.android.settings.R;
import com.android.settings.wifi.details.WifiPrivacyPreferenceController;
@@ -75,6 +76,8 @@
import java.util.Arrays;
import java.util.Iterator;
+import androidx.annotation.VisibleForTesting;
+
/**
* The class for allowing UIs like {@link WifiDialog} and {@link WifiConfigUiBase} to
* share the logic for controlling buttons, text fields, etc.
@@ -122,16 +125,16 @@
/* Phase2 methods supported by PEAP are limited */
- private ArrayAdapter<String> mPhase2PeapAdapter;
+ private ArrayAdapter<CharSequence> mPhase2PeapAdapter;
/* Full list of phase2 methods */
- private ArrayAdapter<String> mPhase2FullAdapter;
+ private ArrayAdapter<CharSequence> mPhase2FullAdapter;
// e.g. AccessPoint.SECURITY_NONE
@VisibleForTesting
int mAccessPointSecurity;
private TextView mPasswordView;
+ private TextView mSaePasswordIdView;
private ImageButton mSsidScanButton;
- private ImageButton mPasswordScanButton;
private String mUnspecifiedCertString;
private String mMultipleCertSetString;
@@ -146,7 +149,7 @@
private TextView mEapDomainView;
private Spinner mPhase2Spinner;
// Associated with mPhase2Spinner, one of mPhase2FullAdapter or mPhase2PeapAdapter
- private ArrayAdapter<String> mPhase2Adapter;
+ private ArrayAdapter<CharSequence> mPhase2Adapter;
private Spinner mEapUserCertSpinner;
private TextView mEapIdentityView;
private TextView mEapAnonymousView;
@@ -173,6 +176,7 @@
private ProxySettings mProxySettings = ProxySettings.UNASSIGNED;
private ProxyInfo mHttpProxy = null;
private StaticIpConfiguration mStaticIpConfiguration = null;
+ private boolean mRequestFocus = true;
private String[] mLevels;
private int mMode;
@@ -187,11 +191,17 @@
public WifiConfigController(WifiConfigUiBase parent, View view, AccessPoint accessPoint,
int mode) {
+ this (parent, view, accessPoint, mode, true /* requestFocus */);
+ }
+
+ public WifiConfigController(WifiConfigUiBase parent, View view, AccessPoint accessPoint,
+ int mode, boolean requestFocus) {
mConfigUi = parent;
mView = view;
mAccessPoint = accessPoint;
mContext = mConfigUi.getContext();
+ mRequestFocus = requestFocus;
// Init Wi-Fi manager
mWifiManager = (WifiManager) mContext.getSystemService(Context.WIFI_SERVICE);
@@ -221,20 +231,13 @@
mLevels = res.getStringArray(R.array.wifi_signal);
if (Utils.isWifiOnly(mContext) || !mContext.getResources().getBoolean(
com.android.internal.R.bool.config_eap_sim_based_auth_supported)) {
- mPhase2PeapAdapter = new ArrayAdapter<String>(
- mContext, android.R.layout.simple_spinner_item,
- res.getStringArray(R.array.wifi_peap_phase2_entries));
+ mPhase2PeapAdapter = getSpinnerAdapter(R.array.wifi_peap_phase2_entries);
} else {
- mPhase2PeapAdapter = new ArrayAdapter<String>(
- mContext, android.R.layout.simple_spinner_item,
- res.getStringArray(R.array.wifi_peap_phase2_entries_with_sim_auth));
+ mPhase2PeapAdapter = getSpinnerAdapterWithEapMethodsTts(
+ R.array.wifi_peap_phase2_entries_with_sim_auth);
}
- mPhase2PeapAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
- mPhase2FullAdapter = new ArrayAdapter<String>(
- mContext, android.R.layout.simple_spinner_item,
- res.getStringArray(R.array.wifi_phase2_entries));
- mPhase2FullAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
+ mPhase2FullAdapter = getSpinnerAdapter(R.array.wifi_phase2_entries);
mUnspecifiedCertString = mContext.getString(R.string.wifi_unspecified);
mMultipleCertSetString = mContext.getString(R.string.wifi_multiple_cert_added);
@@ -245,7 +248,6 @@
mContext.getString(R.string.wifi_do_not_validate_eap_server);
mSsidScanButton = (ImageButton) mView.findViewById(R.id.ssid_scanner_button);
- mPasswordScanButton = (ImageButton) mView.findViewById(R.id.password_scanner_button);
mDialogContainer = mView.findViewById(R.id.dialog_scrollview);
mIpSettingsSpinner = (Spinner) mView.findViewById(R.id.ip_settings);
mIpSettingsSpinner.setOnItemSelectedListener(this);
@@ -271,7 +273,6 @@
if (mAccessPoint == null) { // new network
configureSecuritySpinner();
mConfigUi.setSubmitButton(res.getString(R.string.wifi_save));
- mPasswordScanButton.setVisibility(View.GONE);
} else {
mConfigUi.setTitle(mAccessPoint.getTitle());
@@ -327,7 +328,7 @@
if ((!mAccessPoint.isSaved() && !mAccessPoint.isActive()
&& !mAccessPoint.isPasspointConfig())
|| mMode != WifiConfigUiBase.MODE_VIEW) {
- showSecurityFields(true /* refreshEapMethods */, true /* refreshCertificates */);
+ showSecurityFields(/* refreshEapMethods */ true, /* refreshCertificates */ true);
showIpConfigFields();
showProxyFields();
final CheckBox advancedTogglebox =
@@ -417,9 +418,6 @@
}
}
- if (!WifiDppUtils.isSupportEnrolleeQrCodeScanner(mContext, mAccessPointSecurity)) {
- mPasswordScanButton.setVisibility(View.GONE);
- }
mSsidScanButton.setVisibility(View.GONE);
}
@@ -432,8 +430,10 @@
enableSubmitIfAppropriate();
}
- // After done view show and hide, request focus from parent view
- mView.findViewById(R.id.l_wifidialog).requestFocus();
+ // After done view show and hide, request focus from parameter.
+ if (mRequestFocus) {
+ mView.findViewById(R.id.l_wifidialog).requestFocus();
+ }
}
@VisibleForTesting
@@ -798,6 +798,11 @@
String password = mPasswordView.getText().toString();
config.preSharedKey = '"' + password + '"';
}
+ if (mSaePasswordIdView.length() != 0) {
+ config.saePasswordId = mSaePasswordIdView.getText().toString();
+ } else {
+ config.saePasswordId = null;
+ }
break;
case AccessPoint.SECURITY_OWE:
@@ -980,6 +985,23 @@
}
}
+ if (mSaePasswordIdView == null) {
+ mSaePasswordIdView = (TextView) mView.findViewById(R.id.sae_password_id);
+ mSaePasswordIdView.setOnEditorActionListener(this);
+ mSaePasswordIdView.setOnKeyListener(this);
+ }
+
+ if (mAccessPointSecurity == AccessPoint.SECURITY_SAE) {
+ mView.findViewById(R.id.sae_password_id_layout).setVisibility(View.VISIBLE);
+ if (mAccessPoint != null && mAccessPoint.isSaved()) {
+ if (!TextUtils.isEmpty(mAccessPoint.getConfig().saePasswordId)) {
+ mSaePasswordIdView.setText(mAccessPoint.getConfig().saePasswordId);
+ }
+ }
+ } else {
+ setSaePasswordIdInvisible();
+ }
+
if (mAccessPointSecurity != AccessPoint.SECURITY_EAP &&
mAccessPointSecurity != AccessPoint.SECURITY_EAP_SUITE_B) {
mView.findViewById(R.id.eap).setVisibility(View.GONE);
@@ -987,7 +1009,10 @@
}
mView.findViewById(R.id.eap).setVisibility(View.VISIBLE);
+ // TODO (b/140541213): Maybe we can remove initiateEnterpriseNetworkUi by moving code block
+ boolean initiateEnterpriseNetworkUi = false;
if (mEapMethodSpinner == null) {
+ initiateEnterpriseNetworkUi = true;
mEapMethodSpinner = (Spinner) mView.findViewById(R.id.method);
mEapMethodSpinner.setOnItemSelectedListener(this);
mPhase2Spinner = (Spinner) mView.findViewById(R.id.phase2);
@@ -1012,12 +1037,11 @@
mEapMethodSpinner.setEnabled(false);
} else if (Utils.isWifiOnly(mContext) || !mContext.getResources().getBoolean(
com.android.internal.R.bool.config_eap_sim_based_auth_supported)) {
- eapMethodSpinnerAdapter = getSpinnerAdapter(
- R.array.eap_method_without_sim_auth);
+ eapMethodSpinnerAdapter = getSpinnerAdapter(R.array.eap_method_without_sim_auth);
mEapMethodSpinner.setAdapter(eapMethodSpinnerAdapter);
mEapMethodSpinner.setEnabled(true);
} else {
- eapMethodSpinnerAdapter = getSpinnerAdapter(R.array.wifi_eap_method);
+ eapMethodSpinnerAdapter = getSpinnerAdapterWithEapMethodsTts(R.array.wifi_eap_method);
mEapMethodSpinner.setAdapter(eapMethodSpinnerAdapter);
mEapMethodSpinner.setEnabled(true);
}
@@ -1045,17 +1069,17 @@
}
// Modifying an existing network
- if (mAccessPoint != null && mAccessPoint.isSaved()) {
- final WifiEnterpriseConfig enterpriseConfig = mAccessPoint.getConfig().enterpriseConfig;
- final int eapMethod = enterpriseConfig.getEapMethod();
- final int phase2Method = enterpriseConfig.getPhase2Method();
+ if (initiateEnterpriseNetworkUi && mAccessPoint != null && mAccessPoint.isSaved()) {
+ WifiEnterpriseConfig enterpriseConfig = mAccessPoint.getConfig().enterpriseConfig;
+ int eapMethod = enterpriseConfig.getEapMethod();
+ int phase2Method = enterpriseConfig.getPhase2Method();
mEapMethodSpinner.setSelection(eapMethod);
showEapFieldsByMethod(eapMethod);
switch (eapMethod) {
case Eap.PEAP:
switch (phase2Method) {
case Phase2.NONE:
- mPhase2Spinner.setSelection(WIFI_PEAP_PHASE2_NONE);
+ mPhase2Spinner.setSelection(WIFI_PEAP_PHASE2_NONE);
break;
case Phase2.MSCHAPV2:
mPhase2Spinner.setSelection(WIFI_PEAP_PHASE2_MSCHAPV2);
@@ -1084,7 +1108,7 @@
if (!TextUtils.isEmpty(enterpriseConfig.getCaPath())) {
setSelection(mEapCaCertSpinner, mUseSystemCertsString);
} else {
- final String[] caCerts = enterpriseConfig.getCaCertificateAliases();
+ String[] caCerts = enterpriseConfig.getCaCertificateAliases();
if (caCerts == null) {
setSelection(mEapCaCertSpinner, mDoNotValidateEapServerString);
} else if (caCerts.length == 1) {
@@ -1101,7 +1125,7 @@
}
}
mEapDomainView.setText(enterpriseConfig.getDomainSuffixMatch());
- final String userCert = enterpriseConfig.getClientCertificateAlias();
+ String userCert = enterpriseConfig.getClientCertificateAlias();
if (TextUtils.isEmpty(userCert)) {
setSelection(mEapUserCertSpinner, mDoNotProvideEapUserCertString);
} else {
@@ -1262,6 +1286,11 @@
mView.findViewById(R.id.show_password_layout).setVisibility(View.GONE);
}
+ private void setSaePasswordIdInvisible() {
+ mSaePasswordIdView.setText("");
+ mView.findViewById(R.id.sae_password_id_layout).setVisibility(View.GONE);
+ }
+
private void setEapMethodInvisible() {
mView.findViewById(R.id.eap).setVisibility(View.GONE);
}
@@ -1403,12 +1432,11 @@
} catch (Exception e) {
Log.e(TAG, "can't get the certificate list from KeyStore");
}
-
if (mAccessPointSecurity != AccessPoint.SECURITY_EAP_SUITE_B) {
certs.add(noCertificateString);
}
- // If there are only mUnspecifiedCertString and one item to select, only shows the item
+ // If there is only mUnspecifiedCertString and one item to select, only shows the item
if (certs.size() == 2) {
certs.remove(mUnspecifiedCertString);
spinner.setEnabled(false);
@@ -1416,10 +1444,8 @@
spinner.setEnabled(true);
}
- final ArrayAdapter<String> adapter = new ArrayAdapter<String>(
- context, android.R.layout.simple_spinner_item,
+ final ArrayAdapter<CharSequence> adapter = getSpinnerAdapter(
certs.toArray(new String[certs.size()]));
- adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
spinner.setAdapter(adapter);
}
@@ -1497,6 +1523,9 @@
if (isChecked) {
toggleVisibility = View.VISIBLE;
stringID = R.string.wifi_advanced_toggle_description_expanded;
+
+ // Hide the SoftKeyboard temporary to let user can see most of the expanded items.
+ hideSoftKeyboard(mView.getWindowToken());
} else {
toggleVisibility = View.GONE;
stringID = R.string.wifi_advanced_toggle_description_collapsed;
@@ -1511,7 +1540,7 @@
if (parent == mSecuritySpinner) {
// Convert menu position to actual Wi-Fi security type
mAccessPointSecurity = mSecurityInPosition[position];
- showSecurityFields(true /* refreshEapMethods */, true /* refreshCertificates */);
+ showSecurityFields(/* refreshEapMethods */ true, /* refreshCertificates */ true);
if (WifiDppUtils.isSupportEnrolleeQrCodeScanner(mContext, mAccessPointSecurity)) {
mSsidScanButton.setVisibility(View.VISIBLE);
@@ -1519,9 +1548,9 @@
mSsidScanButton.setVisibility(View.GONE);
}
} else if (parent == mEapMethodSpinner) {
- showSecurityFields(false /* refreshEapMethods */, true /* refreshCertificates */);
+ showSecurityFields(/* refreshEapMethods */ false, /* refreshCertificates */ true);
} else if (parent == mEapCaCertSpinner) {
- showSecurityFields(false /* refreshEapMethods */, false /* refreshCertificates */);
+ showSecurityFields(/* refreshEapMethods */ false, /* refreshCertificates */ false);
} else if (parent == mPhase2Spinner
&& mEapMethodSpinner.getSelectedItemPosition() == WIFI_EAP_METHOD_PEAP) {
showPeapFields();
@@ -1613,14 +1642,92 @@
.setOnCheckedChangeListener(this);
}
+ /**
+ * For each target string in {@code targetStringArray} try to find if it appears in {@code
+ * originalStringArray}, if found then use the corresponding string, which have the same index
+ * of the target string in {@code replacementStringArray}, to replace it. And finally return the
+ * whole new string array back to caller.
+ */
+ @VisibleForTesting
+ CharSequence[] findAndReplaceTargetStrings(CharSequence originalStringArray[],
+ CharSequence targetStringArray[], CharSequence replacementStringArray[]) {
+ // The length of the targetStringArray and replacementStringArray should be the same, each
+ // item in the targetStringArray should have a 1:1 mapping to replacementStringArray, so
+ // just return the original string if the lengths are different.
+ if (targetStringArray.length != replacementStringArray.length) {
+ return originalStringArray;
+ }
+
+ final CharSequence[] returnEntries = new CharSequence[originalStringArray.length];
+ for (int i = 0; i < originalStringArray.length; i++) {
+ returnEntries[i] = originalStringArray[i];
+ for (int j = 0; j < targetStringArray.length; j++) {
+ if (TextUtils.equals(originalStringArray[i], targetStringArray[j])) {
+ returnEntries[i] = replacementStringArray[j];
+ }
+ }
+ }
+ return returnEntries;
+ }
+
private ArrayAdapter<CharSequence> getSpinnerAdapter(
int contentStringArrayResId) {
- final String[] eapMethods = mContext.getResources().getStringArray(
- contentStringArrayResId);
- final ArrayAdapter<CharSequence> spinnerAdapter = new ArrayAdapter<>(mContext,
- android.R.layout.simple_spinner_item, eapMethods);
+ return getSpinnerAdapter(
+ mContext.getResources().getStringArray(contentStringArrayResId));
+ }
+
+ private ArrayAdapter<CharSequence> getSpinnerAdapter(
+ String[] contentStringArray) {
+ ArrayAdapter<CharSequence> spinnerAdapter = new ArrayAdapter<>(mContext,
+ android.R.layout.simple_spinner_item, contentStringArray);
spinnerAdapter.setDropDownViewResource(
android.R.layout.simple_spinner_dropdown_item);
return spinnerAdapter;
}
+
+ /**
+ * This function is to span the TTS strings to each EAP method items in the
+ * spinner to have detail TTS content for the TTS engine usage.
+ */
+ private ArrayAdapter<CharSequence> getSpinnerAdapterWithEapMethodsTts(
+ int contentStringArrayResId) {
+ final Resources res = mContext.getResources();
+ CharSequence[] sourceStrings = res.getStringArray(
+ contentStringArrayResId);
+ CharSequence[] targetStrings = res.getStringArray(
+ R.array.wifi_eap_method_target_strings);
+ CharSequence[] ttsStrings = res.getStringArray(
+ R.array.wifi_eap_method_tts_strings);
+
+ // Replace the target strings with tts strings and save all in a new array.
+ final CharSequence[] newTtsSourceStrings = findAndReplaceTargetStrings(
+ sourceStrings, targetStrings, ttsStrings);
+
+ // Build new TtsSpan text arrays for TalkBack.
+ final CharSequence[] accessibilityArray = createAccessibleEntries(
+ sourceStrings, newTtsSourceStrings);
+
+ // Return a new ArrayAdapter with the new TalkBack array.
+ ArrayAdapter<CharSequence> spinnerAdapter = new ArrayAdapter<>(
+ mContext, android.R.layout.simple_spinner_item, accessibilityArray);
+ spinnerAdapter.setDropDownViewResource(
+ android.R.layout.simple_spinner_dropdown_item);
+ return spinnerAdapter;
+ }
+
+ private SpannableString[] createAccessibleEntries(CharSequence entries[],
+ CharSequence[] contentDescriptions) {
+ final SpannableString[] accessibleEntries = new SpannableString[entries.length];
+ for (int i = 0; i < entries.length; i++) {
+ accessibleEntries[i] = com.android.settings.Utils.createAccessibleSequence(entries[i],
+ contentDescriptions[i].toString());
+ }
+ return accessibleEntries;
+ }
+
+ private void hideSoftKeyboard(IBinder windowToken) {
+ final InputMethodManager inputMethodManager = mContext.getSystemService(
+ InputMethodManager.class);
+ inputMethodManager.hideSoftInputFromWindow(windowToken, 0 /* flags */);
+ }
}
diff --git a/src/com/android/settings/wifi/WifiDialog.java b/src/com/android/settings/wifi/WifiDialog.java
index 875f35d..2a4a664 100644
--- a/src/com/android/settings/wifi/WifiDialog.java
+++ b/src/com/android/settings/wifi/WifiDialog.java
@@ -114,31 +114,22 @@
@Override
protected void onStart() {
+ final ImageButton ssidScannerButton = findViewById(R.id.ssid_scanner_button);
+ if (mHideSubmitButton) {
+ ssidScannerButton.setVisibility(View.GONE);
+ return;
+ }
+
View.OnClickListener onClickScannerButtonListener = v -> {
if (mListener == null) {
return;
}
- String ssid = null;
- if (mAccessPoint == null) {
- final TextView ssidEditText = findViewById(R.id.ssid);
- ssid = ssidEditText.getText().toString();
- } else {
- ssid = mAccessPoint.getSsidStr();
- }
+ final TextView ssidEditText = findViewById(R.id.ssid);
+ final String ssid = ssidEditText.getText().toString();
mListener.onScan(/* WifiDialog */ this, ssid);
};
-
- final ImageButton ssidScannerButton = findViewById(R.id.ssid_scanner_button);
ssidScannerButton.setOnClickListener(onClickScannerButtonListener);
-
- final ImageButton passwordScannerButton = findViewById(R.id.password_scanner_button);
- passwordScannerButton.setOnClickListener(onClickScannerButtonListener);
-
- if (mHideSubmitButton) {
- ssidScannerButton.setVisibility(View.GONE);
- passwordScannerButton.setVisibility(View.GONE);
- }
}
public void onRestoreInstanceState(Bundle savedInstanceState) {
diff --git a/src/com/android/settings/wifi/WifiNoInternetDialog.java b/src/com/android/settings/wifi/WifiNoInternetDialog.java
index eb42097..7cf7fbc 100644
--- a/src/com/android/settings/wifi/WifiNoInternetDialog.java
+++ b/src/com/android/settings/wifi/WifiNoInternetDialog.java
@@ -55,9 +55,9 @@
private boolean mButtonClicked;
private boolean isKnownAction(Intent intent) {
- return intent.getAction().equals(ACTION_PROMPT_UNVALIDATED)
- || intent.getAction().equals(ACTION_PROMPT_LOST_VALIDATION)
- || intent.getAction().equals(ACTION_PROMPT_PARTIAL_CONNECTIVITY);
+ return ACTION_PROMPT_UNVALIDATED.equals(intent.getAction())
+ || ACTION_PROMPT_LOST_VALIDATION.equals(intent.getAction())
+ || ACTION_PROMPT_PARTIAL_CONNECTIVITY.equals(intent.getAction());
}
@Override
diff --git a/src/com/android/settings/wifi/WifiScanModeActivity.java b/src/com/android/settings/wifi/WifiScanModeActivity.java
index 5342729..4dc1b97 100644
--- a/src/com/android/settings/wifi/WifiScanModeActivity.java
+++ b/src/com/android/settings/wifi/WifiScanModeActivity.java
@@ -46,8 +46,8 @@
super.onCreate(savedInstanceState);
Intent intent = getIntent();
if (savedInstanceState == null) {
- if (intent != null && intent.getAction()
- .equals(WifiManager.ACTION_REQUEST_SCAN_ALWAYS_AVAILABLE)) {
+ if (intent != null && WifiManager.ACTION_REQUEST_SCAN_ALWAYS_AVAILABLE
+ .equals(intent.getAction())) {
ApplicationInfo ai;
mApp = getCallingPackage();
try {
diff --git a/src/com/android/settings/wifi/WifiSettings.java b/src/com/android/settings/wifi/WifiSettings.java
index 8c4bfa2..8ac868f 100644
--- a/src/com/android/settings/wifi/WifiSettings.java
+++ b/src/com/android/settings/wifi/WifiSettings.java
@@ -50,10 +50,6 @@
import android.view.View;
import android.widget.Toast;
-import androidx.annotation.VisibleForTesting;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceCategory;
-
import com.android.settings.LinkifyUtils;
import com.android.settings.R;
import com.android.settings.RestrictedSettingsFragment;
@@ -61,8 +57,8 @@
import com.android.settings.core.FeatureFlags;
import com.android.settings.core.SubSettingLauncher;
import com.android.settings.dashboard.SummaryLoader;
-import com.android.settings.datausage.DataUsageUtils;
import com.android.settings.datausage.DataUsagePreference;
+import com.android.settings.datausage.DataUsageUtils;
import com.android.settings.location.ScanningSettings;
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settings.search.Indexable;
@@ -84,6 +80,10 @@
import java.util.ArrayList;
import java.util.List;
+import androidx.annotation.VisibleForTesting;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceCategory;
+
/**
* Two types of UI are provided here.
*
@@ -109,6 +109,8 @@
@VisibleForTesting
static final int ADD_NETWORK_REQUEST = 2;
+ static final int CONFIG_NETWORK_REQUEST = 3;
+
// Instance state keys
private static final String SAVE_DIALOG_MODE = "dialog_mode";
private static final String SAVE_DIALOG_ACCESS_POINT_STATE = "wifi_ap_state";
@@ -224,6 +226,12 @@
public void onCreate(Bundle icicle) {
super.onCreate(icicle);
+ if (FeatureFlagUtils.isEnabled(getContext(), FeatureFlagUtils.SETTINGS_WIFITRACKER2)) {
+ getContext().startActivity(new Intent("android.settings.WIFI_SETTINGS2"));
+ finish();
+ return;
+ }
+
// TODO(b/37429702): Add animations and preference comparator back after initial screen is
// loaded (ODR).
setAnimationAllowed(false);
@@ -421,6 +429,11 @@
mWifiTracker.resumeScanning();
}
return;
+ } else if (requestCode == CONFIG_NETWORK_REQUEST) {
+ if (resultCode == Activity.RESULT_OK) {
+ handleConfigNetworkSubmitEvent(data);
+ }
+ return;
}
final boolean formerlyRestricted = mIsRestricted;
@@ -553,7 +566,10 @@
break;
default:
- showDialog(mSelectedAccessPoint, WifiConfigUiBase.MODE_CONNECT);
+ final Bundle bundle = ((LongPressAccessPointPreference) preference).getExtras();
+ mSelectedAccessPoint.saveWifiState(bundle);
+ launchConfigNewNetworkFragment(mSelectedAccessPoint,
+ WifiConfigUiBase.MODE_CONNECT, bundle);
break;
}
} else if (preference == mAddWifiNetworkPreference) {
@@ -1247,4 +1263,30 @@
return new SummaryProvider(activity, summaryLoader);
}
};
+
+ private void handleConfigNetworkSubmitEvent(Intent data) {
+ final WifiConfiguration wifiConfiguration = data.getParcelableExtra(
+ ConfigureAccessPointFragment.NETWORK_CONFIG_KEY);
+ if (wifiConfiguration != null) {
+ mWifiManager.save(wifiConfiguration, mSaveListener);
+
+ if (mSelectedAccessPoint != null) {
+ connect(wifiConfiguration, false /*isSavedNetwork*/);
+ }
+ mWifiTracker.resumeScanning();
+ }
+ }
+
+ private void launchConfigNewNetworkFragment(AccessPoint accessPoint, int dialogMode,
+ Bundle bundleForArguments) {
+ mDialogMode = dialogMode;
+ final CharSequence title = accessPoint.getTitle();
+ new SubSettingLauncher(getContext())
+ .setTitleText(title)
+ .setDestination(ConfigureAccessPointFragment.class.getName())
+ .setArguments(bundleForArguments)
+ .setSourceMetricsCategory(getMetricsCategory())
+ .setResultListener(this, CONFIG_NETWORK_REQUEST)
+ .launch();
+ }
}
diff --git a/src/com/android/settings/wifi/WifiSettings2.java b/src/com/android/settings/wifi/WifiSettings2.java
new file mode 100644
index 0000000..d715ac0
--- /dev/null
+++ b/src/com/android/settings/wifi/WifiSettings2.java
@@ -0,0 +1,715 @@
+/*
+ * 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.wifi;
+
+import static android.os.UserManager.DISALLOW_CONFIG_WIFI;
+
+import android.app.Activity;
+import android.app.settings.SettingsEnums;
+import android.content.ContentResolver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.res.Resources;
+import android.net.ConnectivityManager;
+import android.net.NetworkScoreManager;
+import android.net.NetworkTemplate;
+import android.net.wifi.WifiConfiguration;
+import android.net.wifi.WifiManager;
+import android.os.Bundle;
+import android.os.Handler;
+import android.os.HandlerThread;
+import android.os.Looper;
+import android.os.PowerManager;
+import android.os.Process;
+import android.os.SimpleClock;
+import android.os.SystemClock;
+import android.provider.Settings;
+import android.util.Log;
+import android.view.ContextMenu;
+import android.view.ContextMenu.ContextMenuInfo;
+import android.view.MenuItem;
+import android.view.View;
+import android.widget.Toast;
+
+import androidx.annotation.VisibleForTesting;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceCategory;
+
+import com.android.settings.LinkifyUtils;
+import com.android.settings.R;
+import com.android.settings.RestrictedSettingsFragment;
+import com.android.settings.SettingsActivity;
+import com.android.settings.core.SubSettingLauncher;
+import com.android.settings.dashboard.SummaryLoader;
+import com.android.settings.datausage.DataUsagePreference;
+import com.android.settings.datausage.DataUsageUtils;
+import com.android.settings.location.ScanningSettings;
+import com.android.settings.search.BaseSearchIndexProvider;
+import com.android.settings.search.Indexable;
+import com.android.settings.search.SearchIndexableRaw;
+import com.android.settings.widget.SummaryUpdater.OnSummaryChangeListener;
+import com.android.settings.widget.SwitchBarController;
+import com.android.settingslib.search.SearchIndexable;
+import com.android.settingslib.wifi.AccessPoint;
+import com.android.settingslib.wifi.LongPressWifiEntryPreference;
+import com.android.settingslib.wifi.WifiSavedConfigUtils;
+import com.android.wifitrackerlib.WifiEntry;
+import com.android.wifitrackerlib.WifiTracker2;
+
+import java.time.Clock;
+import java.time.ZoneOffset;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * UI for Wi-Fi settings screen
+ */
+@SearchIndexable
+public class WifiSettings2 extends RestrictedSettingsFragment
+ implements Indexable, WifiTracker2.WifiTrackerCallback {
+
+ private static final String TAG = "WifiSettings2";
+
+ // Max age of tracked WifiEntries
+ private static final long MAX_SCAN_AGE_MILLIS = 15_000;
+ // Interval between initiating WifiTracker2 scans
+ private static final long SCAN_INTERVAL_MILLIS = 10_000;
+
+ @VisibleForTesting
+ static final int ADD_NETWORK_REQUEST = 2;
+
+ private static final String PREF_KEY_EMPTY_WIFI_LIST = "wifi_empty_list";
+ // TODO(b/70983952): Rename these to use WifiEntry instead of AccessPoint.
+ private static final String PREF_KEY_CONNECTED_ACCESS_POINTS = "connected_access_point";
+ private static final String PREF_KEY_ACCESS_POINTS = "access_points";
+ private static final String PREF_KEY_CONFIGURE_WIFI_SETTINGS = "configure_settings";
+ private static final String PREF_KEY_SAVED_NETWORKS = "saved_networks";
+ private static final String PREF_KEY_STATUS_MESSAGE = "wifi_status_message";
+ @VisibleForTesting
+ static final String PREF_KEY_DATA_USAGE = "wifi_data_usage";
+
+ private static final int REQUEST_CODE_WIFI_DPP_ENROLLEE_QR_CODE_SCANNER = 0;
+
+ private static boolean isVerboseLoggingEnabled() {
+ return WifiTracker2.sVerboseLogging || Log.isLoggable(TAG, Log.VERBOSE);
+ }
+
+ private final Runnable mUpdateWifiEntryPreferencesRunnable = () -> {
+ updateWifiEntryPreferences();
+ };
+ private final Runnable mHideProgressBarRunnable = () -> {
+ setProgressBarVisible(false);
+ };
+
+ protected WifiManager mWifiManager;
+ private WifiManager.ActionListener mConnectListener;
+ private WifiManager.ActionListener mSaveListener;
+ private WifiManager.ActionListener mForgetListener;
+
+ /**
+ * The state of {@link #isUiRestricted()} at {@link #onCreate(Bundle)}}. This is neccesary to
+ * ensure that behavior is consistent if {@link #isUiRestricted()} changes. It could be changed
+ * by the Test DPC tool in AFW mode.
+ */
+ private boolean mIsRestricted;
+
+ private WifiEnabler mWifiEnabler;
+
+ // Worker thread used for WifiTracker2 work
+ private HandlerThread mWorkerThread;
+ private WifiTracker2 mWifiTracker2;
+
+ private WifiDialog mDialog;
+
+ private View mProgressHeader;
+
+ private PreferenceCategory mConnectedWifiEntryPreferenceCategory;
+ private PreferenceCategory mWifiEntryPreferenceCategory;
+ @VisibleForTesting
+ AddWifiNetworkPreference mAddWifiNetworkPreference;
+ @VisibleForTesting
+ Preference mConfigureWifiSettingsPreference;
+ @VisibleForTesting
+ Preference mSavedNetworksPreference;
+ @VisibleForTesting
+ DataUsagePreference mDataUsagePreference;
+ private LinkablePreference mStatusMessagePreference;
+
+ // For Search
+ public static final String DATA_KEY_REFERENCE = "main_toggle_wifi";
+
+ /**
+ * Tracks whether the user initiated a connection via clicking in order to autoscroll to the
+ * network once connected.
+ */
+ private boolean mClickedConnect;
+
+ public WifiSettings2() {
+ super(DISALLOW_CONFIG_WIFI);
+ }
+
+ @Override
+ public void onViewCreated(View view, Bundle savedInstanceState) {
+ super.onViewCreated(view, savedInstanceState);
+ final Activity activity = getActivity();
+ if (activity != null) {
+ mProgressHeader = setPinnedHeaderView(R.layout.progress_header)
+ .findViewById(R.id.progress_bar_animation);
+ setProgressBarVisible(false);
+ }
+ ((SettingsActivity) activity).getSwitchBar().setSwitchBarText(
+ R.string.wifi_settings_master_switch_title,
+ R.string.wifi_settings_master_switch_title);
+ }
+
+ @Override
+ public void onCreate(Bundle icicle) {
+ super.onCreate(icicle);
+
+ // TODO(b/37429702): Add animations and preference comparator back after initial screen is
+ // loaded (ODR).
+ setAnimationAllowed(false);
+
+ addPreferences();
+
+ mIsRestricted = isUiRestricted();
+ }
+
+ private void addPreferences() {
+ addPreferencesFromResource(R.xml.wifi_settings);
+
+ mConnectedWifiEntryPreferenceCategory = findPreference(PREF_KEY_CONNECTED_ACCESS_POINTS);
+ mWifiEntryPreferenceCategory = findPreference(PREF_KEY_ACCESS_POINTS);
+ mConfigureWifiSettingsPreference = findPreference(PREF_KEY_CONFIGURE_WIFI_SETTINGS);
+ mSavedNetworksPreference = findPreference(PREF_KEY_SAVED_NETWORKS);
+ mAddWifiNetworkPreference = new AddWifiNetworkPreference(getPrefContext());
+ mStatusMessagePreference = findPreference(PREF_KEY_STATUS_MESSAGE);
+ mDataUsagePreference = findPreference(PREF_KEY_DATA_USAGE);
+ mDataUsagePreference.setVisible(DataUsageUtils.hasWifiRadio(getContext()));
+ mDataUsagePreference.setTemplate(NetworkTemplate.buildTemplateWifiWildcard(),
+ 0 /*subId*/,
+ null /*service*/);
+ }
+
+ @Override
+ public void onActivityCreated(Bundle savedInstanceState) {
+ super.onActivityCreated(savedInstanceState);
+
+ final Context context = getContext();
+ mWorkerThread = new HandlerThread(TAG +
+ "{" + Integer.toHexString(System.identityHashCode(this)) + "}",
+ Process.THREAD_PRIORITY_BACKGROUND);
+ mWorkerThread.start();
+ final Clock elapsedRealtimeClock = new SimpleClock(ZoneOffset.UTC) {
+ @Override
+ public long millis() {
+ return SystemClock.elapsedRealtime();
+ }
+ };
+ mWifiTracker2 = new WifiTracker2(getSettingsLifecycle(), context,
+ context.getSystemService(WifiManager.class),
+ context.getSystemService(ConnectivityManager.class),
+ context.getSystemService(NetworkScoreManager.class),
+ new Handler(Looper.getMainLooper()),
+ mWorkerThread.getThreadHandler(),
+ elapsedRealtimeClock,
+ MAX_SCAN_AGE_MILLIS,
+ SCAN_INTERVAL_MILLIS,
+ this);
+
+ final Activity activity = getActivity();
+
+ if (activity != null) {
+ mWifiManager = getActivity().getSystemService(WifiManager.class);
+ }
+
+ mConnectListener = new WifiConnectListener(getActivity());
+
+ mSaveListener = new WifiManager.ActionListener() {
+ @Override
+ public void onSuccess() {
+ }
+
+ @Override
+ public void onFailure(int reason) {
+ Activity activity = getActivity();
+ if (activity != null) {
+ Toast.makeText(activity,
+ R.string.wifi_failed_save_message,
+ Toast.LENGTH_SHORT).show();
+ }
+ }
+ };
+
+ mForgetListener = new WifiManager.ActionListener() {
+ @Override
+ public void onSuccess() {
+ }
+
+ @Override
+ public void onFailure(int reason) {
+ Activity activity = getActivity();
+ if (activity != null) {
+ Toast.makeText(activity,
+ R.string.wifi_failed_forget_message,
+ Toast.LENGTH_SHORT).show();
+ }
+ }
+ };
+ registerForContextMenu(getListView());
+ setHasOptionsMenu(true);
+ }
+
+ @Override
+ public void onDestroyView() {
+ if (mWifiEnabler != null) {
+ mWifiEnabler.teardownSwitchController();
+ }
+ mWorkerThread.quit();
+
+ super.onDestroyView();
+ }
+
+ @Override
+ public void onStart() {
+ super.onStart();
+
+ mWifiEnabler = createWifiEnabler();
+
+ if (mIsRestricted) {
+ restrictUi();
+ }
+ }
+
+ private void restrictUi() {
+ if (!isUiRestrictedByOnlyAdmin()) {
+ getEmptyTextView().setText(R.string.wifi_empty_list_user_restricted);
+ }
+ getPreferenceScreen().removeAll();
+ }
+
+ /**
+ * @return new WifiEnabler
+ */
+ private WifiEnabler createWifiEnabler() {
+ final SettingsActivity activity = (SettingsActivity) getActivity();
+ return new WifiEnabler(activity, new SwitchBarController(activity.getSwitchBar()),
+ mMetricsFeatureProvider);
+ }
+
+ @Override
+ public void onResume() {
+ final Activity activity = getActivity();
+ super.onResume();
+
+ // Because RestrictedSettingsFragment's onResume potentially requests authorization,
+ // which changes the restriction state, recalculate it.
+ final boolean alreadyImmutablyRestricted = mIsRestricted;
+ mIsRestricted = isUiRestricted();
+ if (!alreadyImmutablyRestricted && mIsRestricted) {
+ restrictUi();
+ }
+
+ if (mWifiEnabler != null) {
+ mWifiEnabler.resume(activity);
+ }
+ }
+
+ @Override
+ public void onPause() {
+ super.onPause();
+ if (mWifiEnabler != null) {
+ mWifiEnabler.pause();
+ }
+ }
+
+ @Override
+ public void onStop() {
+ getView().removeCallbacks(mUpdateWifiEntryPreferencesRunnable);
+ getView().removeCallbacks(mHideProgressBarRunnable);
+ super.onStop();
+ }
+
+ @Override
+ public void onActivityResult(int requestCode, int resultCode, Intent data) {
+ super.onActivityResult(requestCode, resultCode, data);
+
+ if (requestCode == ADD_NETWORK_REQUEST) {
+ handleAddNetworkRequest(resultCode, data);
+ return;
+ } else if (requestCode == REQUEST_CODE_WIFI_DPP_ENROLLEE_QR_CODE_SCANNER) {
+ if (resultCode == Activity.RESULT_OK) {
+ if (mDialog != null) {
+ mDialog.dismiss();
+ }
+ }
+ return;
+ }
+
+ final boolean formerlyRestricted = mIsRestricted;
+ mIsRestricted = isUiRestricted();
+ if (formerlyRestricted && !mIsRestricted
+ && getPreferenceScreen().getPreferenceCount() == 0) {
+ // De-restrict the ui
+ addPreferences();
+ }
+ }
+
+ @Override
+ public int getMetricsCategory() {
+ return SettingsEnums.WIFI;
+ }
+
+ @Override
+ public void onCreateContextMenu(ContextMenu menu, View view, ContextMenuInfo info) {
+ // TODO(b/70983952): Add context menu options here. This should be driven by the appropriate
+ // "can do action" APIs from WifiEntry.
+ }
+
+ @Override
+ public boolean onContextItemSelected(MenuItem item) {
+ // TODO(b/70983952): Add context menu selection logic here. This should simply call the
+ // appropriate WifiEntry action APIs (connect, forget, disconnect, etc).
+ return false;
+ }
+
+ @Override
+ public boolean onPreferenceTreeClick(Preference preference) {
+ // If the preference has a fragment set, open that
+ if (preference.getFragment() != null) {
+ preference.setOnPreferenceClickListener(null);
+ return super.onPreferenceTreeClick(preference);
+ }
+
+ // TODO(b/70983952) Add WifiEntry click logic. This should be as simple as calling
+ // WifiEntry.connect().
+
+ if (preference == mAddWifiNetworkPreference) {
+ onAddNetworkPressed();
+ } else {
+ return super.onPreferenceTreeClick(preference);
+ }
+ return true;
+ }
+
+ /** Called when the state of Wifi has changed. */
+ @Override
+ public void onWifiStateChanged() {
+ if (mIsRestricted) {
+ return;
+ }
+ final int wifiState = mWifiTracker2.getWifiState();
+
+ if (isVerboseLoggingEnabled()) {
+ Log.i(TAG, "onWifiStateChanged called with wifi state: " + wifiState);
+ }
+
+ switch (wifiState) {
+ case WifiManager.WIFI_STATE_ENABLED:
+ updateWifiEntryPreferences();
+ break;
+
+ case WifiManager.WIFI_STATE_ENABLING:
+ removeConnectedWifiEntryPreference();
+ removeWifiEntryPreference();
+ addMessagePreference(R.string.wifi_starting);
+ setProgressBarVisible(true);
+ break;
+
+ case WifiManager.WIFI_STATE_DISABLING:
+ removeConnectedWifiEntryPreference();
+ removeWifiEntryPreference();
+ addMessagePreference(R.string.wifi_stopping);
+ break;
+
+ case WifiManager.WIFI_STATE_DISABLED:
+ setOffMessage();
+ setAdditionalSettingsSummaries();
+ setProgressBarVisible(false);
+ break;
+ }
+ }
+
+ @Override
+ public void onWifiEntriesChanged() {
+ updateWifiEntryPreferencesDelayed();
+ }
+
+ /**
+ * Updates WifiEntries from {@link WifiManager#getScanResults()}. Adds a delay to have
+ * progress bar displayed before starting to modify entries.
+ */
+ private void updateWifiEntryPreferencesDelayed() {
+ // Safeguard from some delayed event handling
+ if (getActivity() != null && !mIsRestricted &&
+ mWifiTracker2.getWifiState() == WifiManager.WIFI_STATE_ENABLED) {
+ final View view = getView();
+ final Handler handler = view.getHandler();
+ if (handler != null && handler.hasCallbacks(mUpdateWifiEntryPreferencesRunnable)) {
+ return;
+ }
+ setProgressBarVisible(true);
+ view.postDelayed(mUpdateWifiEntryPreferencesRunnable, 300);
+ }
+ }
+
+ private void updateWifiEntryPreferences() {
+ // in case state has changed
+ if (mWifiTracker2.getWifiState() != WifiManager.WIFI_STATE_ENABLED) {
+ return;
+ }
+
+ boolean hasAvailableWifiEntries = false;
+ mStatusMessagePreference.setVisible(false);
+ mConnectedWifiEntryPreferenceCategory.setVisible(true);
+ mWifiEntryPreferenceCategory.setVisible(true);
+
+ int index = 0;
+ cacheRemoveAllPrefs(mWifiEntryPreferenceCategory);
+ List<WifiEntry> wifiEntries = mWifiTracker2.getWifiEntries();
+ for (WifiEntry wifiEntry : wifiEntries) {
+ hasAvailableWifiEntries = true;
+
+ String key = wifiEntry.getKey();
+ LongPressWifiEntryPreference pref =
+ (LongPressWifiEntryPreference) getCachedPreference(key);
+ if (pref != null) {
+ pref.setOrder(index++);
+ continue;
+ }
+
+ pref = createLongPressWifiEntryPreference(wifiEntry);
+ pref.setKey(wifiEntry.getKey());
+ pref.setOrder(index++);
+ pref.refresh();
+ mWifiEntryPreferenceCategory.addPreference(pref);
+ }
+ removeCachedPrefs(mWifiEntryPreferenceCategory);
+
+ if (!hasAvailableWifiEntries) {
+ setProgressBarVisible(true);
+ Preference pref = new Preference(getPrefContext());
+ pref.setSelectable(false);
+ pref.setSummary(R.string.wifi_empty_list_wifi_on);
+ pref.setOrder(index++);
+ pref.setKey(PREF_KEY_EMPTY_WIFI_LIST);
+ mWifiEntryPreferenceCategory.addPreference(pref);
+ } else {
+ // Continuing showing progress bar for an additional delay to overlap with animation
+ getView().postDelayed(mHideProgressBarRunnable, 1700 /* delay millis */);
+ }
+
+ mAddWifiNetworkPreference.setOrder(index++);
+ mWifiEntryPreferenceCategory.addPreference(mAddWifiNetworkPreference);
+ setAdditionalSettingsSummaries();
+ }
+
+ private LongPressWifiEntryPreference createLongPressWifiEntryPreference(WifiEntry wifiEntry) {
+ return new LongPressWifiEntryPreference(getPrefContext(), wifiEntry, this);
+ }
+
+ private void launchAddNetworkFragment() {
+ new SubSettingLauncher(getContext())
+ .setTitleRes(R.string.wifi_add_network)
+ .setDestination(AddNetworkFragment.class.getName())
+ .setSourceMetricsCategory(getMetricsCategory())
+ .setResultListener(this, ADD_NETWORK_REQUEST)
+ .launch();
+ }
+
+ /** Removes all preferences and hide the {@link #mConnectedWifiEntryPreferenceCategory}. */
+ private void removeConnectedWifiEntryPreference() {
+ mConnectedWifiEntryPreferenceCategory.removeAll();
+ mConnectedWifiEntryPreferenceCategory.setVisible(false);
+ }
+
+ private void removeWifiEntryPreference() {
+ mWifiEntryPreferenceCategory.removeAll();
+ mWifiEntryPreferenceCategory.setVisible(false);
+ }
+
+ @VisibleForTesting
+ void setAdditionalSettingsSummaries() {
+ mConfigureWifiSettingsPreference.setSummary(getString(
+ isWifiWakeupEnabled()
+ ? R.string.wifi_configure_settings_preference_summary_wakeup_on
+ : R.string.wifi_configure_settings_preference_summary_wakeup_off));
+
+ final List<AccessPoint> savedNetworks =
+ WifiSavedConfigUtils.getAllConfigs(getContext(), mWifiManager);
+ final int numSavedNetworks = (savedNetworks != null) ? savedNetworks.size() : 0;
+ mSavedNetworksPreference.setVisible(numSavedNetworks > 0);
+ if (numSavedNetworks > 0) {
+ mSavedNetworksPreference.setSummary(
+ getSavedNetworkSettingsSummaryText(savedNetworks, numSavedNetworks));
+ }
+ }
+
+ private String getSavedNetworkSettingsSummaryText(
+ List<AccessPoint> savedNetworks, int numSavedNetworks) {
+ int numSavedPasspointNetworks = 0;
+ for (AccessPoint savedNetwork : savedNetworks) {
+ if (savedNetwork.isPasspointConfig() || savedNetwork.isPasspoint()) {
+ numSavedPasspointNetworks++;
+ }
+ }
+ final int numSavedNormalNetworks = numSavedNetworks - numSavedPasspointNetworks;
+
+ if (numSavedNetworks == numSavedNormalNetworks) {
+ return getResources().getQuantityString(R.plurals.wifi_saved_access_points_summary,
+ numSavedNormalNetworks, numSavedNormalNetworks);
+ } else if (numSavedNetworks == numSavedPasspointNetworks) {
+ return getResources().getQuantityString(
+ R.plurals.wifi_saved_passpoint_access_points_summary,
+ numSavedPasspointNetworks, numSavedPasspointNetworks);
+ } else {
+ return getResources().getQuantityString(R.plurals.wifi_saved_all_access_points_summary,
+ numSavedNetworks, numSavedNetworks);
+ }
+ }
+
+ private boolean isWifiWakeupEnabled() {
+ final Context context = getContext();
+ final PowerManager powerManager = context.getSystemService(PowerManager.class);
+ final ContentResolver contentResolver = context.getContentResolver();
+ return Settings.Global.getInt(contentResolver,
+ Settings.Global.WIFI_WAKEUP_ENABLED, 0) == 1
+ && Settings.Global.getInt(contentResolver,
+ Settings.Global.WIFI_SCAN_ALWAYS_AVAILABLE, 0) == 1
+ && Settings.Global.getInt(contentResolver,
+ Settings.Global.AIRPLANE_MODE_ON, 0) == 0
+ && !powerManager.isPowerSaveMode();
+ }
+
+ private void setOffMessage() {
+ final CharSequence title = getText(R.string.wifi_empty_list_wifi_off);
+ // Don't use WifiManager.isScanAlwaysAvailable() to check the Wi-Fi scanning mode. Instead,
+ // read the system settings directly. Because when the device is in Airplane mode, even if
+ // Wi-Fi scanning mode is on, WifiManager.isScanAlwaysAvailable() still returns "off".
+ final boolean wifiScanningMode = Settings.Global.getInt(getActivity().getContentResolver(),
+ Settings.Global.WIFI_SCAN_ALWAYS_AVAILABLE, 0) == 1;
+ final CharSequence description = wifiScanningMode ? getText(R.string.wifi_scan_notify_text)
+ : getText(R.string.wifi_scan_notify_text_scanning_off);
+ final LinkifyUtils.OnClickListener clickListener =
+ () -> new SubSettingLauncher(getContext())
+ .setDestination(ScanningSettings.class.getName())
+ .setTitleRes(R.string.location_scanning_screen_title)
+ .setSourceMetricsCategory(getMetricsCategory())
+ .launch();
+ mStatusMessagePreference.setText(title, description, clickListener);
+ removeConnectedWifiEntryPreference();
+ removeWifiEntryPreference();
+ mStatusMessagePreference.setVisible(true);
+ }
+
+ private void addMessagePreference(int messageId) {
+ mStatusMessagePreference.setTitle(messageId);
+ mStatusMessagePreference.setVisible(true);
+
+ }
+
+ protected void setProgressBarVisible(boolean visible) {
+ if (mProgressHeader != null) {
+ mProgressHeader.setVisibility(visible ? View.VISIBLE : View.GONE);
+ }
+ }
+
+ @VisibleForTesting
+ void handleAddNetworkRequest(int result, Intent data) {
+ if (result == Activity.RESULT_OK) {
+ handleAddNetworkSubmitEvent(data);
+ }
+ }
+
+ private void handleAddNetworkSubmitEvent(Intent data) {
+ final WifiConfiguration wifiConfiguration = data.getParcelableExtra(
+ AddNetworkFragment.WIFI_CONFIG_KEY);
+ if (wifiConfiguration != null) {
+ mWifiManager.save(wifiConfiguration, mSaveListener);
+ }
+ }
+
+ /**
+ * Called when "add network" button is pressed.
+ */
+ private void onAddNetworkPressed() {
+ launchAddNetworkFragment();
+ }
+
+ @Override
+ public int getHelpResource() {
+ return R.string.help_url_wifi;
+ }
+
+ public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
+ new BaseSearchIndexProvider() {
+ @Override
+ public List<SearchIndexableRaw> getRawDataToIndex(Context context,
+ boolean enabled) {
+ final List<SearchIndexableRaw> result = new ArrayList<>();
+ final Resources res = context.getResources();
+
+ // Add fragment title if we are showing this fragment
+ if (res.getBoolean(R.bool.config_show_wifi_settings)) {
+ SearchIndexableRaw data = new SearchIndexableRaw(context);
+ data.title = res.getString(R.string.wifi_settings);
+ data.screenTitle = res.getString(R.string.wifi_settings);
+ data.keywords = res.getString(R.string.keywords_wifi);
+ data.key = DATA_KEY_REFERENCE;
+ result.add(data);
+ }
+
+ return result;
+ }
+ };
+
+ private static class SummaryProvider
+ implements SummaryLoader.SummaryProvider, OnSummaryChangeListener {
+
+ private final Context mContext;
+ private final SummaryLoader mSummaryLoader;
+
+ @VisibleForTesting
+ WifiSummaryUpdater mSummaryHelper;
+
+ public SummaryProvider(Context context, SummaryLoader summaryLoader) {
+ mContext = context;
+ mSummaryLoader = summaryLoader;
+ mSummaryHelper = new WifiSummaryUpdater(mContext, this);
+ }
+
+
+ @Override
+ public void setListening(boolean listening) {
+ mSummaryHelper.register(listening);
+ }
+
+ @Override
+ public void onSummaryChanged(String summary) {
+ mSummaryLoader.setSummary(this, summary);
+ }
+ }
+
+ public static final SummaryLoader.SummaryProviderFactory SUMMARY_PROVIDER_FACTORY
+ = new SummaryLoader.SummaryProviderFactory() {
+ @Override
+ public SummaryLoader.SummaryProvider createSummaryProvider(Activity activity,
+ SummaryLoader summaryLoader) {
+ return new SummaryProvider(activity, summaryLoader);
+ }
+ };
+}
diff --git a/src/com/android/settings/wifi/WifiWakeupPreferenceController.java b/src/com/android/settings/wifi/WifiWakeupPreferenceController.java
index 11a58af..98c6bae 100644
--- a/src/com/android/settings/wifi/WifiWakeupPreferenceController.java
+++ b/src/com/android/settings/wifi/WifiWakeupPreferenceController.java
@@ -25,7 +25,6 @@
import android.content.IntentFilter;
import android.location.LocationManager;
import android.provider.Settings;
-import android.text.TextUtils;
import androidx.annotation.VisibleForTesting;
import androidx.fragment.app.Fragment;
@@ -34,108 +33,94 @@
import androidx.preference.SwitchPreference;
import com.android.settings.R;
-import com.android.settings.core.PreferenceControllerMixin;
-import com.android.settings.dashboard.DashboardFragment;
+import com.android.settings.core.TogglePreferenceController;
import com.android.settings.utils.AnnotationSpan;
-import com.android.settingslib.core.AbstractPreferenceController;
-import com.android.settingslib.core.lifecycle.Lifecycle;
import com.android.settingslib.core.lifecycle.LifecycleObserver;
import com.android.settingslib.core.lifecycle.events.OnPause;
import com.android.settingslib.core.lifecycle.events.OnResume;
/**
- * {@link PreferenceControllerMixin} that controls whether the Wi-Fi Wakeup feature should be
+ * {@link TogglePreferenceController} that controls whether the Wi-Fi Wakeup feature should be
* enabled.
*/
-public class WifiWakeupPreferenceController extends AbstractPreferenceController implements
+public class WifiWakeupPreferenceController extends TogglePreferenceController implements
LifecycleObserver, OnPause, OnResume {
private static final String TAG = "WifiWakeupPrefController";
private static final String KEY_ENABLE_WIFI_WAKEUP = "enable_wifi_wakeup";
- private final Fragment mFragment;
+ private Fragment mFragment;
@VisibleForTesting
SwitchPreference mPreference;
+
@VisibleForTesting
LocationManager mLocationManager;
+
private final BroadcastReceiver mLocationReceiver = new BroadcastReceiver() {
@Override
public void onReceive(Context context, Intent intent) {
updateState(mPreference);
}
};
+
private final IntentFilter mLocationFilter =
new IntentFilter(LocationManager.MODE_CHANGED_ACTION);
- public WifiWakeupPreferenceController(Context context, DashboardFragment fragment,
- Lifecycle lifecycle) {
- super(context);
- mFragment = fragment;
+ public WifiWakeupPreferenceController(Context context) {
+ super(context, KEY_ENABLE_WIFI_WAKEUP);
mLocationManager = (LocationManager) context.getSystemService(Service.LOCATION_SERVICE);
- lifecycle.addObserver(this);
+ }
+
+ public void setFragment(Fragment hostFragment) {
+ mFragment = hostFragment;
}
@Override
public void displayPreference(PreferenceScreen screen) {
super.displayPreference(screen);
- mPreference = screen.findPreference(KEY_ENABLE_WIFI_WAKEUP);
- updateState(mPreference);
+ mPreference = screen.findPreference(getPreferenceKey());
}
@Override
- public boolean isAvailable() {
- return true;
+ public int getAvailabilityStatus() {
+ return AVAILABLE;
}
@Override
- public boolean handlePreferenceTreeClick(Preference preference) {
- if (!TextUtils.equals(preference.getKey(), KEY_ENABLE_WIFI_WAKEUP)) {
- return false;
- }
- if (!(preference instanceof SwitchPreference)) {
- return false;
- }
+ public boolean isChecked() {
+ return getWifiWakeupEnabled()
+ && getWifiScanningEnabled()
+ && mLocationManager.isLocationEnabled();
+ }
- // TODO(b/132391311): WifiWakeupPreferenceController is essentially reimplementing
- // TogglePreferenceController. Refactor it into TogglePreferenceController.
+ @Override
+ public boolean setChecked(boolean isChecked) {
+ if (isChecked) {
+ if (mFragment == null) {
+ throw new IllegalStateException("No fragment to start activity");
+ }
- // Toggle wifi-wakeup setting between 1/0 based on its current state, and some other checks.
- if (isWifiWakeupAvailable()) {
- setWifiWakeupEnabled(false);
- } else {
if (!mLocationManager.isLocationEnabled()) {
final Intent intent = new Intent(Settings.ACTION_LOCATION_SOURCE_SETTINGS);
mFragment.startActivityForResult(intent, WIFI_WAKEUP_REQUEST_CODE);
- return true;
+ return false;
} else if (!getWifiScanningEnabled()) {
showScanningDialog();
- } else {
- setWifiWakeupEnabled(true);
+ return false;
}
}
- updateState(mPreference);
+ setWifiWakeupEnabled(isChecked);
return true;
}
@Override
- public String getPreferenceKey() {
- return KEY_ENABLE_WIFI_WAKEUP;
- }
-
- @Override
- public void updateState(Preference preference) {
- if (!(preference instanceof SwitchPreference)) {
- return;
- }
- final SwitchPreference enableWifiWakeup = (SwitchPreference) preference;
-
- enableWifiWakeup.setChecked(isWifiWakeupAvailable());
+ public CharSequence getSummary() {
if (!mLocationManager.isLocationEnabled()) {
- preference.setSummary(getNoLocationSummary());
+ return getNoLocationSummary();
} else {
- preference.setSummary(R.string.wifi_wakeup_summary);
+ return mContext.getText(R.string.wifi_wakeup_summary);
}
}
@@ -152,8 +137,8 @@
}
if (mLocationManager.isLocationEnabled() && getWifiScanningEnabled()) {
setWifiWakeupEnabled(true);
+ updateState(mPreference);
}
- updateState(mPreference);
}
private boolean getWifiScanningEnabled() {
@@ -173,15 +158,6 @@
Settings.Global.WIFI_WAKEUP_ENABLED, 0) == 1;
}
- /**
- * Wifi wakeup is available only when both location and Wi-Fi scanning are enabled.
- */
- private boolean isWifiWakeupAvailable() {
- return getWifiWakeupEnabled()
- && getWifiScanningEnabled()
- && mLocationManager.isLocationEnabled();
- }
-
private void setWifiWakeupEnabled(boolean enabled) {
Settings.Global.putInt(mContext.getContentResolver(), Settings.Global.WIFI_WAKEUP_ENABLED,
enabled ? 1 : 0);
diff --git a/src/com/android/settings/wifi/dpp/WifiDppAddDeviceFragment.java b/src/com/android/settings/wifi/dpp/WifiDppAddDeviceFragment.java
index 3a9308e..f7e8936 100644
--- a/src/com/android/settings/wifi/dpp/WifiDppAddDeviceFragment.java
+++ b/src/com/android/settings/wifi/dpp/WifiDppAddDeviceFragment.java
@@ -16,11 +16,9 @@
package com.android.settings.wifi.dpp;
-import android.app.ActionBar;
import android.app.Activity;
import android.app.settings.SettingsEnums;
import android.content.Context;
-import android.content.pm.ActivityInfo;
import android.net.wifi.EasyConnectStatusCallback;
import android.net.wifi.WifiManager;
import android.os.Bundle;
@@ -29,17 +27,13 @@
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
-import android.view.accessibility.AccessibilityEvent;
import android.widget.Button;
import android.widget.ImageView;
-import android.widget.ProgressBar;
import androidx.lifecycle.ViewModelProviders;
import com.android.settings.R;
-import java.util.concurrent.Executor;
-
/**
* After getting Wi-Fi network information and(or) QR code, this fragment config a device to connect
* to the Wi-Fi network.
@@ -47,16 +41,13 @@
public class WifiDppAddDeviceFragment extends WifiDppQrCodeBaseFragment {
private static final String TAG = "WifiDppAddDeviceFragment";
- private ProgressBar mProgressBar;
private ImageView mWifiApPictureView;
private Button mChooseDifferentNetwork;
- private Button mButtonLeft;
- private Button mButtonRight;
private int mLatestStatusCode = WifiDppUtils.EASY_CONNECT_EVENT_FAILURE_NONE;
// Key for Bundle usage
- private static final String KEY_LATEST_ERROR_CODE = "key_latest_error_code";
+ private static final String KEY_LATEST_STATUS_CODE = "key_latest_status_code";
private class EasyConnectConfiguratorStatusCallback extends EasyConnectStatusCallback {
@Override
@@ -83,43 +74,46 @@
}
private void showSuccessUi(boolean isConfigurationChange) {
- setHeaderIconImageResource(R.drawable.ic_devices_check_circle_green);
- mTitle.setText(R.string.wifi_dpp_wifi_shared_with_device);
- mProgressBar.setVisibility(isGoingInitiator() ? View.VISIBLE : View.INVISIBLE);
+ setHeaderIconImageResource(R.drawable.ic_devices_check_circle_green_32dp);
+ setHeaderTitle(R.string.wifi_dpp_wifi_shared_with_device);
+ setProgressBarShown(isEasyConnectHandshaking());
mSummary.setVisibility(View.INVISIBLE);
mWifiApPictureView.setImageResource(R.drawable.wifi_dpp_success);
mChooseDifferentNetwork.setVisibility(View.INVISIBLE);
- mButtonLeft.setText(R.string.wifi_dpp_add_another_device);
- mButtonLeft.setOnClickListener(v -> getFragmentManager().popBackStack());
- mButtonRight.setText(R.string.done);
- mButtonRight.setOnClickListener(v -> {
+ mLeftButton.setText(getContext(), R.string.wifi_dpp_add_another_device);
+ mLeftButton.setOnClickListener(v -> getFragmentManager().popBackStack());
+ mRightButton.setText(getContext(), R.string.done);
+ mRightButton.setOnClickListener(v -> {
final Activity activity = getActivity();
activity.setResult(Activity.RESULT_OK);
activity.finish();
});
+ mRightButton.setVisibility(View.VISIBLE);
if (!isConfigurationChange) {
mLatestStatusCode = WifiDppUtils.EASY_CONNECT_EVENT_SUCCESS;
- changeFocusAndAnnounceChange(mButtonRight, mTitle);
}
}
private void showErrorUi(int code, boolean isConfigurationChange) {
+ CharSequence summaryCharSequence;
switch (code) {
case EasyConnectStatusCallback.EASY_CONNECT_EVENT_FAILURE_INVALID_URI:
- mSummary.setText(R.string.wifi_dpp_could_not_detect_valid_qr_code);
+ summaryCharSequence = getText(R.string.wifi_dpp_qr_code_is_not_valid_format);
break;
case EasyConnectStatusCallback.EASY_CONNECT_EVENT_FAILURE_AUTHENTICATION:
- mSummary.setText(R.string.wifi_dpp_failure_authentication_or_configuration);
+ summaryCharSequence = getText(
+ R.string.wifi_dpp_failure_authentication_or_configuration);
break;
case EasyConnectStatusCallback.EASY_CONNECT_EVENT_FAILURE_NOT_COMPATIBLE:
- mSummary.setText(R.string.wifi_dpp_failure_not_compatible);
+ summaryCharSequence = getText(R.string.wifi_dpp_failure_not_compatible);
break;
case EasyConnectStatusCallback.EASY_CONNECT_EVENT_FAILURE_CONFIGURATION:
- mSummary.setText(R.string.wifi_dpp_failure_authentication_or_configuration);
+ summaryCharSequence = getText(
+ R.string.wifi_dpp_failure_authentication_or_configuration);
break;
case EasyConnectStatusCallback.EASY_CONNECT_EVENT_FAILURE_BUSY:
@@ -140,15 +134,16 @@
return;
case EasyConnectStatusCallback.EASY_CONNECT_EVENT_FAILURE_TIMEOUT:
- mSummary.setText(R.string.wifi_dpp_failure_timeout);
+ summaryCharSequence = getText(R.string.wifi_dpp_failure_timeout);
break;
case EasyConnectStatusCallback.EASY_CONNECT_EVENT_FAILURE_GENERIC:
- mSummary.setText(R.string.wifi_dpp_failure_generic);
+ summaryCharSequence = getText(R.string.wifi_dpp_failure_generic);
break;
case EasyConnectStatusCallback.EASY_CONNECT_EVENT_FAILURE_NOT_SUPPORTED:
- mSummary.setText(getString(R.string.wifi_dpp_failure_not_supported, getSsid()));
+ summaryCharSequence = getString(
+ R.string.wifi_dpp_failure_not_supported, getSsid());
break;
case EasyConnectStatusCallback.EASY_CONNECT_EVENT_FAILURE_INVALID_NETWORK:
@@ -159,27 +154,27 @@
throw(new IllegalStateException("Unexpected Wi-Fi DPP error"));
}
- mTitle.setText(R.string.wifi_dpp_could_not_add_device);
+ setHeaderTitle(R.string.wifi_dpp_could_not_add_device);
+ mSummary.setText(summaryCharSequence);
mWifiApPictureView.setImageResource(R.drawable.wifi_dpp_error);
mChooseDifferentNetwork.setVisibility(View.INVISIBLE);
if (hasRetryButton(code)) {
- mButtonRight.setText(R.string.retry);
+ mRightButton.setText(getContext(), R.string.retry);
} else {
- mButtonRight.setText(R.string.done);
- mButtonRight.setOnClickListener(v -> getActivity().finish());
- mButtonLeft.setVisibility(View.INVISIBLE);
+ mRightButton.setText(getContext(), R.string.done);
+ mRightButton.setOnClickListener(v -> getActivity().finish());
+ mLeftButton.setVisibility(View.INVISIBLE);
}
- if (isGoingInitiator()) {
+ if (isEasyConnectHandshaking()) {
mSummary.setText(R.string.wifi_dpp_sharing_wifi_with_this_device);
}
- mProgressBar.setVisibility(isGoingInitiator() ? View.VISIBLE : View.INVISIBLE);
- mButtonRight.setVisibility(isGoingInitiator() ? View.INVISIBLE : View.VISIBLE);
+ setProgressBarShown(isEasyConnectHandshaking());
+ mRightButton.setVisibility(isEasyConnectHandshaking() ? View.INVISIBLE : View.VISIBLE);
if (!isConfigurationChange) {
mLatestStatusCode = code;
- changeFocusAndAnnounceChange(mButtonRight, mSummary);
}
}
@@ -206,7 +201,7 @@
super.onCreate(savedInstanceState);
if (savedInstanceState != null) {
- mLatestStatusCode = savedInstanceState.getInt(KEY_LATEST_ERROR_CODE);
+ mLatestStatusCode = savedInstanceState.getInt(KEY_LATEST_STATUS_CODE);
}
final WifiDppInitiatorViewModel model =
@@ -215,7 +210,7 @@
model.getStatusCode().observe(this, statusCode -> {
// After configuration change, observe callback will be triggered,
// do nothing for this case if a handshake does not end
- if (model.isGoingInitiator()) {
+ if (model.isWifiDppHandshaking()) {
return;
}
@@ -229,16 +224,6 @@
}
@Override
- public void onActivityCreated(Bundle savedInstanceState) {
- super.onActivityCreated(savedInstanceState);
-
- final ActionBar actionBar = getActivity().getActionBar();
- if (actionBar != null) {
- actionBar.hide();
- }
- }
-
- @Override
public final View onCreateView(LayoutInflater inflater, ViewGroup container,
Bundle savedInstanceState) {
return inflater.inflate(R.layout.wifi_dpp_add_device_fragment, container,
@@ -249,17 +234,15 @@
public void onViewCreated(View view, Bundle savedInstanceState) {
super.onViewCreated(view, savedInstanceState);
- setHeaderIconImageResource(R.drawable.ic_devices_other_opaque_black);
-
- mProgressBar = view.findViewById(R.id.indeterminate_bar);
+ setHeaderIconImageResource(R.drawable.ic_devices_other_32dp);
final WifiQrCode wifiQrCode = ((WifiDppConfiguratorActivity) getActivity())
.getWifiDppQrCode();
final String information = wifiQrCode.getInformation();
if (TextUtils.isEmpty(information)) {
- mTitle.setText(R.string.wifi_dpp_device_found);
+ setHeaderTitle(R.string.wifi_dpp_device_found);
} else {
- mTitle.setText(information);
+ setHeaderTitle(information);
}
updateSummary();
@@ -270,37 +253,33 @@
mClickChooseDifferentNetworkListener.onClickChooseDifferentNetwork()
);
- mButtonLeft = view.findViewById(R.id.button_left);
- mButtonLeft.setText(R.string.cancel);
- mButtonLeft.setOnClickListener(v -> getActivity().finish());
+ mLeftButton.setText(getContext(), R.string.cancel);
+ mLeftButton.setOnClickListener(v -> getActivity().finish());
- mButtonRight = view.findViewById(R.id.button_right);
- mButtonRight.setText(R.string.wifi_dpp_share_wifi);
- mButtonRight.setOnClickListener(v -> {
- mProgressBar.setVisibility(View.VISIBLE);
- mButtonRight.setVisibility(View.INVISIBLE);
+ mRightButton.setText(getContext(), R.string.wifi_dpp_share_wifi);
+ mRightButton.setOnClickListener(v -> {
+ setProgressBarShown(true);
+ mRightButton.setVisibility(View.INVISIBLE);
startWifiDppConfiguratorInitiator();
updateSummary();
- mTitleSummaryContainer.sendAccessibilityEvent(AccessibilityEvent.TYPE_VIEW_FOCUSED);
});
if (savedInstanceState != null) {
if (mLatestStatusCode == WifiDppUtils.EASY_CONNECT_EVENT_SUCCESS) {
showSuccessUi(/* isConfigurationChange */ true);
} else if (mLatestStatusCode == WifiDppUtils.EASY_CONNECT_EVENT_FAILURE_NONE) {
- mProgressBar.setVisibility(isGoingInitiator() ? View.VISIBLE : View.INVISIBLE);
- mButtonRight.setVisibility(isGoingInitiator() ? View.INVISIBLE : View.VISIBLE);
+ setProgressBarShown(isEasyConnectHandshaking());
+ mRightButton.setVisibility(isEasyConnectHandshaking() ?
+ View.INVISIBLE : View.VISIBLE);
} else {
showErrorUi(mLatestStatusCode, /* isConfigurationChange */ true);
}
- } else {
- changeFocusAndAnnounceChange(mButtonRight, mTitleSummaryContainer);
}
}
@Override
public void onSaveInstanceState(Bundle outState) {
- outState.putInt(KEY_LATEST_ERROR_CODE, mLatestStatusCode);
+ outState.putInt(KEY_LATEST_STATUS_CODE, mLatestStatusCode);
super.onSaveInstanceState(outState);
}
@@ -328,9 +307,9 @@
// Container Activity must implement this interface
public interface OnClickChooseDifferentNetworkListener {
- public void onClickChooseDifferentNetwork();
+ void onClickChooseDifferentNetwork();
}
- OnClickChooseDifferentNetworkListener mClickChooseDifferentNetworkListener;
+ private OnClickChooseDifferentNetworkListener mClickChooseDifferentNetworkListener;
@Override
public void onAttach(Context context) {
@@ -347,31 +326,23 @@
}
// Check is Easy Connect handshaking or not
- private boolean isGoingInitiator() {
+ private boolean isEasyConnectHandshaking() {
final WifiDppInitiatorViewModel model =
ViewModelProviders.of(this).get(WifiDppInitiatorViewModel.class);
- return model.isGoingInitiator();
+ return model.isWifiDppHandshaking();
}
private void updateSummary() {
- if (isGoingInitiator()) {
+ if (isEasyConnectHandshaking()) {
mSummary.setText(R.string.wifi_dpp_sharing_wifi_with_this_device);
} else {
mSummary.setText(getString(R.string.wifi_dpp_add_device_to_wifi, getSsid()));
}
}
- /**
- * This fragment will change UI display and text messages for events. To improve Talkback user
- * experienience, using this method to focus on a right component and announce a changed text
- * after an UI changing event.
- *
- * @param focusView The UI component which will be focused
- * @param announceView The UI component's text will be talked
- */
- private void changeFocusAndAnnounceChange(View focusView, View announceView) {
- focusView.sendAccessibilityEvent(AccessibilityEvent.TYPE_VIEW_FOCUSED);
- announceView.sendAccessibilityEvent(AccessibilityEvent.TYPE_WINDOW_STATE_CHANGED);
+ @Override
+ protected boolean isFooterAvailable() {
+ return true;
}
}
diff --git a/src/com/android/settings/wifi/dpp/WifiDppBaseActivity.java b/src/com/android/settings/wifi/dpp/WifiDppBaseActivity.java
new file mode 100644
index 0000000..a7daee6
--- /dev/null
+++ b/src/com/android/settings/wifi/dpp/WifiDppBaseActivity.java
@@ -0,0 +1,52 @@
+/*
+ * 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.wifi.dpp;
+
+import android.content.Intent;
+import android.content.res.Resources;
+import android.os.Bundle;
+
+import androidx.fragment.app.FragmentManager;
+
+import com.android.settings.R;
+import com.android.settings.SetupWizardUtils;
+import com.android.settings.core.InstrumentedActivity;
+
+abstract class WifiDppBaseActivity extends InstrumentedActivity {
+ protected FragmentManager mFragmentManager;
+
+ protected abstract void handleIntent(Intent intent);
+
+ @Override
+ protected void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+
+ setContentView(R.layout.wifi_dpp_activity);
+ mFragmentManager = getSupportFragmentManager();
+
+ if (savedInstanceState == null) {
+ handleIntent(getIntent());
+ }
+ }
+
+ @Override
+ protected void onApplyThemeResource(Resources.Theme theme, int resid, boolean first) {
+ resid = SetupWizardUtils.getTheme(getIntent());
+ theme.applyStyle(R.style.SetupWizardPartnerResource, /* force */ true);
+ super.onApplyThemeResource(theme, resid, first);
+ }
+}
diff --git a/src/com/android/settings/wifi/dpp/WifiDppChooseSavedWifiNetworkFragment.java b/src/com/android/settings/wifi/dpp/WifiDppChooseSavedWifiNetworkFragment.java
index ddba933..a257c2a 100644
--- a/src/com/android/settings/wifi/dpp/WifiDppChooseSavedWifiNetworkFragment.java
+++ b/src/com/android/settings/wifi/dpp/WifiDppChooseSavedWifiNetworkFragment.java
@@ -16,16 +16,12 @@
package com.android.settings.wifi.dpp;
-import android.app.ActionBar;
import android.app.settings.SettingsEnums;
import android.content.Intent;
import android.os.Bundle;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
-import android.view.accessibility.AccessibilityEvent;
-import android.widget.Button;
-import android.widget.ListView;
import androidx.fragment.app.FragmentManager;
import androidx.fragment.app.FragmentTransaction;
@@ -39,10 +35,6 @@
public class WifiDppChooseSavedWifiNetworkFragment extends WifiDppQrCodeBaseFragment {
private static final String TAG_FRAGMENT_WIFI_NETWORK_LIST = "wifi_network_list_fragment";
- private ListView mSavedWifiNetworkList;
- private Button mButtonLeft;
- private Button mButtonRight;
-
@Override
public int getMetricsCategory() {
return SettingsEnums.SETTINGS_WIFI_DPP_CONFIGURATOR;
@@ -52,13 +44,8 @@
public void onActivityCreated(Bundle savedInstanceState) {
super.onActivityCreated(savedInstanceState);
- final ActionBar actionBar = getActivity().getActionBar();
- if (actionBar != null) {
- actionBar.hide();
- }
-
- /** Embeded WifiNetworkListFragment as child fragment within
- * WifiDppChooseSavedWifiNetworkFragment. */
+ // Embedded WifiNetworkListFragment as child fragment within
+ // WifiDppChooseSavedWifiNetworkFragment.
final FragmentManager fragmentManager = getChildFragmentManager();
final WifiNetworkListFragment fragment = new WifiNetworkListFragment();
final Bundle args = getArguments();
@@ -82,14 +69,11 @@
public void onViewCreated(View view, Bundle savedInstanceState) {
super.onViewCreated(view, savedInstanceState);
- setHeaderIconImageResource(R.drawable.ic_wifi_signal_4);
-
- mTitle.setText(R.string.wifi_dpp_choose_network);
+ setHeaderTitle(R.string.wifi_dpp_choose_network);
mSummary.setText(R.string.wifi_dpp_choose_network_to_connect_device);
- mButtonLeft = view.findViewById(R.id.button_left);
- mButtonLeft.setText(R.string.cancel);
- mButtonLeft.setOnClickListener(v -> {
+ mLeftButton.setText(getContext(), R.string.cancel);
+ mLeftButton.setOnClickListener(v -> {
String action = null;
final Intent intent = getActivity().getIntent();
if (intent != null) {
@@ -104,13 +88,11 @@
}
});
- mButtonRight = view.findViewById(R.id.button_right);
- mButtonRight.setVisibility(View.GONE);
+ mRightButton.setVisibility(View.GONE);
+ }
- if (savedInstanceState == null) {
- // For Talkback to describe this fragment
- mTitleSummaryContainer.sendAccessibilityEvent(
- AccessibilityEvent.TYPE_WINDOW_STATE_CHANGED);
- }
+ @Override
+ protected boolean isFooterAvailable() {
+ return true;
}
}
diff --git a/src/com/android/settings/wifi/dpp/WifiDppConfiguratorActivity.java b/src/com/android/settings/wifi/dpp/WifiDppConfiguratorActivity.java
index cc80b0c..cb72a6d 100644
--- a/src/com/android/settings/wifi/dpp/WifiDppConfiguratorActivity.java
+++ b/src/com/android/settings/wifi/dpp/WifiDppConfiguratorActivity.java
@@ -16,7 +16,6 @@
package com.android.settings.wifi.dpp;
-import android.app.ActionBar;
import android.app.settings.SettingsEnums;
import android.content.Intent;
import android.net.Uri;
@@ -28,12 +27,9 @@
import android.util.Log;
import androidx.annotation.VisibleForTesting;
-import androidx.fragment.app.Fragment;
-import androidx.fragment.app.FragmentManager;
import androidx.fragment.app.FragmentTransaction;
import com.android.settings.R;
-import com.android.settings.core.InstrumentedActivity;
import java.util.List;
@@ -54,18 +50,17 @@
* For intent action {@link Settings#ACTION_PROCESS_WIFI_EASY_CONNECT_URI}, specify Wi-Fi
* Easy Connect bootstrapping information string in Intent's data URI.
*/
-public class WifiDppConfiguratorActivity extends InstrumentedActivity implements
+public class WifiDppConfiguratorActivity extends WifiDppBaseActivity implements
WifiNetworkConfig.Retriever,
- WifiDppQrCodeGeneratorFragment.OnQrCodeGeneratorFragmentAddButtonClickedListener,
WifiDppQrCodeScannerFragment.OnScanWifiDppSuccessListener,
WifiDppAddDeviceFragment.OnClickChooseDifferentNetworkListener,
WifiNetworkListFragment.OnChooseNetworkListener {
private static final String TAG = "WifiDppConfiguratorActivity";
- public static final String ACTION_CONFIGURATOR_QR_CODE_SCANNER =
+ static final String ACTION_CONFIGURATOR_QR_CODE_SCANNER =
"android.settings.WIFI_DPP_CONFIGURATOR_QR_CODE_SCANNER";
- public static final String ACTION_CONFIGURATOR_QR_CODE_GENERATOR =
+ static final String ACTION_CONFIGURATOR_QR_CODE_GENERATOR =
"android.settings.WIFI_DPP_CONFIGURATOR_QR_CODE_GENERATOR";
// Key for Bundle usage
@@ -77,8 +72,6 @@
private static final String KEY_WIFI_NETWORK_ID = "key_wifi_network_id";
private static final String KEY_IS_HOTSPOT = "key_is_hotspot";
- private FragmentManager mFragmentManager;
-
/** The Wi-Fi network which will be configured */
private WifiNetworkConfig mWifiNetworkConfig;
@@ -97,9 +90,6 @@
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
- setContentView(R.layout.wifi_dpp_activity);
- mFragmentManager = getSupportFragmentManager();
-
if (savedInstanceState != null) {
String qrCode = savedInstanceState.getString(KEY_QR_CODE);
@@ -114,28 +104,27 @@
mWifiNetworkConfig = WifiNetworkConfig.getValidConfigOrNull(security, ssid,
preSharedKey, hiddenSsid, networkId, isHotspot);
- } else {
- handleIntent(getIntent());
- }
-
- ActionBar actionBar = getActionBar();
- if (actionBar != null) {
- actionBar.setElevation(0);
- actionBar.setDisplayShowTitleEnabled(false);
}
}
- private void handleIntent(Intent intent) {
+ @Override
+ protected void handleIntent(Intent intent) {
+ String action = intent != null ? intent.getAction() : null;
+ if (action == null) {
+ finish();
+ return;
+ }
+
boolean cancelActivity = false;
WifiNetworkConfig config;
- switch (intent.getAction()) {
+ switch (action) {
case ACTION_CONFIGURATOR_QR_CODE_SCANNER:
config = WifiNetworkConfig.getValidConfigOrNull(intent);
if (config == null) {
cancelActivity = true;
} else {
mWifiNetworkConfig = config;
- showQrCodeScannerFragment(/* addToBackStack= */ false);
+ showQrCodeScannerFragment();
}
break;
case ACTION_CONFIGURATOR_QR_CODE_GENERATOR:
@@ -178,7 +167,7 @@
}
}
- private void showQrCodeScannerFragment(boolean addToBackStack) {
+ private void showQrCodeScannerFragment() {
WifiDppQrCodeScannerFragment fragment =
(WifiDppQrCodeScannerFragment) mFragmentManager.findFragmentByTag(
WifiDppUtils.TAG_FRAGMENT_QR_CODE_SCANNER);
@@ -199,9 +188,6 @@
fragmentTransaction.replace(R.id.fragment_container, fragment,
WifiDppUtils.TAG_FRAGMENT_QR_CODE_SCANNER);
- if (addToBackStack) {
- fragmentTransaction.addToBackStack(/* name */ null);
- }
fragmentTransaction.commit();
}
@@ -293,7 +279,7 @@
return mWifiNetworkConfig;
}
- public WifiQrCode getWifiDppQrCode() {
+ WifiQrCode getWifiDppQrCode() {
return mWifiDppQrCode;
}
@@ -322,19 +308,6 @@
}
@Override
- public boolean onNavigateUp() {
- if (!mFragmentManager.popBackStackImmediate()) {
- finish();
- }
- return true;
- }
-
- @Override
- public void onQrCodeGeneratorFragmentAddButtonClicked() {
- showQrCodeScannerFragment(/* addToBackStack */ true);
- }
-
- @Override
public void onScanWifiDppSuccess(WifiQrCode wifiQrCode) {
mWifiDppQrCode = wifiQrCode;
diff --git a/src/com/android/settings/wifi/dpp/WifiDppEnrolleeActivity.java b/src/com/android/settings/wifi/dpp/WifiDppEnrolleeActivity.java
index 2229895..c5f1e81 100644
--- a/src/com/android/settings/wifi/dpp/WifiDppEnrolleeActivity.java
+++ b/src/com/android/settings/wifi/dpp/WifiDppEnrolleeActivity.java
@@ -16,20 +16,13 @@
package com.android.settings.wifi.dpp;
-import android.app.ActionBar;
import android.app.settings.SettingsEnums;
import android.content.Intent;
-import android.os.Bundle;
import android.util.Log;
-import androidx.fragment.app.Fragment;
-import androidx.fragment.app.FragmentManager;
import androidx.fragment.app.FragmentTransaction;
import com.android.settings.R;
-import com.android.settings.core.InstrumentedActivity;
-
-import com.google.android.setupcompat.util.WizardManagerHelper;
/**
* To provision "this" device with specified Wi-Fi network.
@@ -37,47 +30,30 @@
* To use intent action {@code ACTION_ENROLLEE_QR_CODE_SCANNER}, specify the SSID string of the
* Wi-Fi network to be provisioned in {@code WifiDppUtils.EXTRA_WIFI_SSID}.
*/
-public class WifiDppEnrolleeActivity extends InstrumentedActivity implements
+public class WifiDppEnrolleeActivity extends WifiDppBaseActivity implements
WifiDppQrCodeScannerFragment.OnScanWifiDppSuccessListener {
private static final String TAG = "WifiDppEnrolleeActivity";
- public static final String ACTION_ENROLLEE_QR_CODE_SCANNER =
+ static final String ACTION_ENROLLEE_QR_CODE_SCANNER =
"android.settings.WIFI_DPP_ENROLLEE_QR_CODE_SCANNER";
- private FragmentManager mFragmentManager;
-
@Override
public int getMetricsCategory() {
return SettingsEnums.SETTINGS_WIFI_DPP_ENROLLEE;
}
@Override
- protected void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
-
- if (WizardManagerHelper.isAnySetupWizard(getIntent())) {
- setTheme(R.style.LightTheme_SettingsBase_SetupWizard);
+ protected void handleIntent(Intent intent) {
+ String action = intent != null ? intent.getAction() : null;
+ if (action == null) {
+ finish();
+ return;
}
- setContentView(R.layout.wifi_dpp_activity);
- mFragmentManager = getSupportFragmentManager();
-
- if (savedInstanceState == null) {
- handleIntent(getIntent());
- }
-
- ActionBar actionBar = getActionBar();
- if (actionBar != null) {
- actionBar.setElevation(0);
- actionBar.setDisplayShowTitleEnabled(false);
- }
- }
-
- private void handleIntent(Intent intent) {
- switch (intent.getAction()) {
+ switch (action) {
case ACTION_ENROLLEE_QR_CODE_SCANNER:
String ssid = intent.getStringExtra(WifiDppUtils.EXTRA_WIFI_SSID);
- showQrCodeScannerFragment(/* addToBackStack */ false, ssid);
+ showQrCodeScannerFragment(ssid);
break;
default:
Log.e(TAG, "Launch with an invalid action");
@@ -85,7 +61,7 @@
}
}
- private void showQrCodeScannerFragment(boolean addToBackStack, String ssid) {
+ private void showQrCodeScannerFragment(String ssid) {
WifiDppQrCodeScannerFragment fragment =
(WifiDppQrCodeScannerFragment) mFragmentManager.findFragmentByTag(
WifiDppUtils.TAG_FRAGMENT_QR_CODE_SCANNER);
@@ -106,19 +82,10 @@
fragmentTransaction.replace(R.id.fragment_container, fragment,
WifiDppUtils.TAG_FRAGMENT_QR_CODE_SCANNER);
- if (addToBackStack) {
- fragmentTransaction.addToBackStack(/* name */ null);
- }
fragmentTransaction.commit();
}
@Override
- public boolean onNavigateUp(){
- finish();
- return true;
- }
-
- @Override
public void onScanWifiDppSuccess(WifiQrCode wifiQrCode) {
// Do nothing
}
diff --git a/src/com/android/settings/wifi/dpp/WifiDppInitiatorViewModel.java b/src/com/android/settings/wifi/dpp/WifiDppInitiatorViewModel.java
index 24e5ebe..f48ec7c 100644
--- a/src/com/android/settings/wifi/dpp/WifiDppInitiatorViewModel.java
+++ b/src/com/android/settings/wifi/dpp/WifiDppInitiatorViewModel.java
@@ -26,13 +26,13 @@
public class WifiDppInitiatorViewModel extends AndroidViewModel {
private MutableLiveData<Integer> mEnrolleeSuccessNetworkId;
private MutableLiveData<Integer> mStatusCode;
- private boolean mIsGoingInitiator;
+ private boolean mIsWifiDppHandshaking;
public WifiDppInitiatorViewModel(Application application) {
super(application);
}
- public MutableLiveData<Integer> getEnrolleeSuccessNetworkId() {
+ MutableLiveData<Integer> getEnrolleeSuccessNetworkId() {
if (mEnrolleeSuccessNetworkId == null) {
mEnrolleeSuccessNetworkId = new MutableLiveData<>();
}
@@ -40,7 +40,7 @@
return mEnrolleeSuccessNetworkId;
}
- public MutableLiveData<Integer> getStatusCode() {
+ MutableLiveData<Integer> getStatusCode() {
if (mStatusCode == null) {
mStatusCode = new MutableLiveData<>();
}
@@ -48,12 +48,12 @@
return mStatusCode;
}
- public boolean isGoingInitiator() {
- return mIsGoingInitiator;
+ boolean isWifiDppHandshaking() {
+ return mIsWifiDppHandshaking;
}
- public void startEasyConnectAsConfiguratorInitiator(String qrCode, int networkId) {
- mIsGoingInitiator = true;
+ void startEasyConnectAsConfiguratorInitiator(String qrCode, int networkId) {
+ mIsWifiDppHandshaking = true;
final WifiManager wifiManager = getApplication().getSystemService(WifiManager.class);
wifiManager.startEasyConnectAsConfiguratorInitiator(qrCode, networkId,
@@ -61,8 +61,8 @@
new EasyConnectDelegateCallback());
}
- public void startEasyConnectAsEnrolleeInitiator(String qrCode) {
- mIsGoingInitiator = true;
+ void startEasyConnectAsEnrolleeInitiator(String qrCode) {
+ mIsWifiDppHandshaking = true;
final WifiManager wifiManager = getApplication().getSystemService(WifiManager.class);
wifiManager.startEasyConnectAsEnrolleeInitiator(qrCode, getApplication().getMainExecutor(),
@@ -72,19 +72,19 @@
private class EasyConnectDelegateCallback extends EasyConnectStatusCallback {
@Override
public void onEnrolleeSuccess(int newNetworkId) {
- mIsGoingInitiator = false;
+ mIsWifiDppHandshaking = false;
mEnrolleeSuccessNetworkId.setValue(newNetworkId);
}
@Override
public void onConfiguratorSuccess(int code) {
- mIsGoingInitiator = false;
+ mIsWifiDppHandshaking = false;
mStatusCode.setValue(WifiDppUtils.EASY_CONNECT_EVENT_SUCCESS);
}
@Override
public void onFailure(int code) {
- mIsGoingInitiator = false;
+ mIsWifiDppHandshaking = false;
mStatusCode.setValue(code);
}
diff --git a/src/com/android/settings/wifi/dpp/WifiDppQrCodeBaseFragment.java b/src/com/android/settings/wifi/dpp/WifiDppQrCodeBaseFragment.java
index eafbe68..e0a1e39 100644
--- a/src/com/android/settings/wifi/dpp/WifiDppQrCodeBaseFragment.java
+++ b/src/com/android/settings/wifi/dpp/WifiDppQrCodeBaseFragment.java
@@ -16,14 +16,22 @@
package com.android.settings.wifi.dpp;
+import android.content.res.Resources;
+import android.graphics.drawable.Drawable;
import android.os.Bundle;
+import android.util.Log;
import android.view.View;
-import android.widget.ImageView;
import android.widget.TextView;
+import androidx.annotation.DrawableRes;
+
import com.android.settings.R;
import com.android.settings.core.InstrumentedFragment;
+import com.google.android.setupcompat.template.FooterBarMixin;
+import com.google.android.setupcompat.template.FooterButton;
+import com.google.android.setupdesign.GlifLayout;
+
/**
* There are below 4 fragments for Wi-Fi DPP UI flow, to reduce redundant code of UI components,
* this parent fragment instantiates common UI components
@@ -34,37 +42,64 @@
* {@code WifiDppAddDeviceFragment}
*/
public abstract class WifiDppQrCodeBaseFragment extends InstrumentedFragment {
- private ImageView mHeaderIcon;
- private ImageView mDevicesCheckCircleGreenHeaderIcon;
- protected TextView mTitle;
+ private static final String TAG = "WifiDppQrCodeBaseFragment";
+
+ private GlifLayout mGlifLayout;
protected TextView mSummary;
- protected View mTitleSummaryContainer;
+ protected FooterButton mLeftButton;
+ protected FooterButton mRightButton;
@Override
public void onViewCreated(View view, Bundle savedInstanceState) {
super.onViewCreated(view, savedInstanceState);
- mHeaderIcon = view.findViewById(android.R.id.icon);
- mDevicesCheckCircleGreenHeaderIcon =
- view.findViewById(R.id.devices_check_circle_green_icon);
- mTitle = view.findViewById(android.R.id.title);
+ mGlifLayout = (GlifLayout) view;
mSummary = view.findViewById(android.R.id.summary);
- // This is the LinearLayout which groups mTitle and mSummary for Talkback to announce the
- // content in a way that reflects its natural groupings.
- mTitleSummaryContainer = view.findViewById(R.id.title_summary_container);
+ if (isFooterAvailable()) {
+ mLeftButton = new FooterButton.Builder(getContext())
+ .setButtonType(FooterButton.ButtonType.CANCEL)
+ .setTheme(R.style.SudGlifButton_Secondary)
+ .build();
+ mGlifLayout.getMixin(FooterBarMixin.class).setSecondaryButton(mLeftButton);
+
+ mRightButton = new FooterButton.Builder(getContext())
+ .setButtonType(FooterButton.ButtonType.NEXT)
+ .setTheme(R.style.SudGlifButton_Primary)
+ .build();
+ mGlifLayout.getMixin(FooterBarMixin.class).setPrimaryButton(mRightButton);
+ }
+
+ mGlifLayout.getHeaderTextView().setAccessibilityLiveRegion(
+ View.ACCESSIBILITY_LIVE_REGION_POLITE);
}
- protected void setHeaderIconImageResource(int resId) {
- // ic_devices_check_circle_green is a LayerDrawable,
- // it has different size from other VectorDrawable icons
- if (resId == R.drawable.ic_devices_check_circle_green) {
- mHeaderIcon.setVisibility(View.GONE);
- mDevicesCheckCircleGreenHeaderIcon.setVisibility(View.VISIBLE);
- } else {
- mDevicesCheckCircleGreenHeaderIcon.setVisibility(View.GONE);
- mHeaderIcon.setImageResource(resId);
- mHeaderIcon.setVisibility(View.VISIBLE);
- }
+ protected void setHeaderIconImageResource(@DrawableRes int iconResId) {
+ mGlifLayout.setIcon(getDrawable(iconResId));
}
+
+ private Drawable getDrawable(@DrawableRes int iconResId) {
+ Drawable buttonIcon = null;
+
+ try {
+ buttonIcon = getContext().getDrawable(iconResId);
+ } catch (Resources.NotFoundException exception) {
+ Log.e(TAG, "Resource does not exist: " + iconResId);
+ }
+ return buttonIcon;
+ }
+
+ protected void setHeaderTitle(String title) {
+ mGlifLayout.setHeaderText(title);
+ }
+
+ protected void setHeaderTitle(int resId, Object... formatArgs) {
+ mGlifLayout.setHeaderText(getString(resId, formatArgs));
+ }
+
+ protected void setProgressBarShown(boolean shown) {
+ mGlifLayout.setProgressBarShown(shown);
+ }
+
+ protected abstract boolean isFooterAvailable();
}
diff --git a/src/com/android/settings/wifi/dpp/WifiDppQrCodeGeneratorFragment.java b/src/com/android/settings/wifi/dpp/WifiDppQrCodeGeneratorFragment.java
index d388931..603ea10 100644
--- a/src/com/android/settings/wifi/dpp/WifiDppQrCodeGeneratorFragment.java
+++ b/src/com/android/settings/wifi/dpp/WifiDppQrCodeGeneratorFragment.java
@@ -16,9 +16,7 @@
package com.android.settings.wifi.dpp;
-import android.app.ActionBar;
import android.app.settings.SettingsEnums;
-import android.content.Context;
import android.graphics.Bitmap;
import android.os.Bundle;
import android.text.TextUtils;
@@ -45,7 +43,6 @@
private static final String TAG = "WifiDppQrCodeGeneratorFragment";
private ImageView mQrCodeView;
- private TextView mPasswordView;
private String mQrCode;
@Override
@@ -53,44 +50,17 @@
return SettingsEnums.SETTINGS_WIFI_DPP_CONFIGURATOR;
}
- // Container Activity must implement this interface
- public interface OnQrCodeGeneratorFragmentAddButtonClickedListener {
- public void onQrCodeGeneratorFragmentAddButtonClicked();
- }
- OnQrCodeGeneratorFragmentAddButtonClickedListener mListener;
-
@Override
public void onActivityCreated(Bundle savedInstanceState) {
super.onActivityCreated(savedInstanceState);
- // setTitle for Talkback
+ // setTitle for TalkBack
final WifiNetworkConfig wifiNetworkConfig = getWifiNetworkConfigFromHostActivity();
if (wifiNetworkConfig.isHotspot()) {
getActivity().setTitle(R.string.wifi_dpp_share_hotspot);
} else {
getActivity().setTitle(R.string.wifi_dpp_share_wifi);
}
-
- setHasOptionsMenu(true);
- final ActionBar actionBar = getActivity().getActionBar();
- if (actionBar != null) {
- actionBar.setDisplayHomeAsUpEnabled(true);
- actionBar.show();
- }
- }
-
- @Override
- public void onAttach(Context context) {
- super.onAttach(context);
-
- mListener = (OnQrCodeGeneratorFragmentAddButtonClickedListener) context;
- }
-
- @Override
- public void onDetach() {
- mListener = null;
-
- super.onDetach();
}
@Override
@@ -116,31 +86,29 @@
mQrCodeView = view.findViewById(R.id.qrcode_view);
- setHeaderIconImageResource(R.drawable.ic_qrcode_24dp);
-
final WifiNetworkConfig wifiNetworkConfig = getWifiNetworkConfigFromHostActivity();
if (wifiNetworkConfig.isHotspot()) {
- mTitle.setText(R.string.wifi_dpp_share_hotspot);
+ setHeaderTitle(R.string.wifi_dpp_share_hotspot);
} else {
- mTitle.setText(R.string.wifi_dpp_share_wifi);
+ setHeaderTitle(R.string.wifi_dpp_share_wifi);
}
final String password = wifiNetworkConfig.getPreSharedKey();
- mPasswordView = view.findViewById(R.id.password);
+ TextView passwordView = view.findViewById(R.id.password);
if (TextUtils.isEmpty(password)) {
mSummary.setText(getString(
R.string.wifi_dpp_scan_open_network_qr_code_with_another_device,
wifiNetworkConfig.getSsid()));
- mPasswordView.setVisibility(View.GONE);
+ passwordView.setVisibility(View.GONE);
} else {
mSummary.setText(getString(R.string.wifi_dpp_scan_qr_code_with_another_device,
wifiNetworkConfig.getSsid()));
if (wifiNetworkConfig.isHotspot()) {
- mPasswordView.setText(getString(R.string.wifi_dpp_hotspot_password, password));
+ passwordView.setText(getString(R.string.wifi_dpp_hotspot_password, password));
} else {
- mPasswordView.setText(getString(R.string.wifi_dpp_wifi_password, password));
+ passwordView.setText(getString(R.string.wifi_dpp_wifi_password, password));
}
}
@@ -155,11 +123,11 @@
final Bitmap bmp = QrCodeGenerator.encodeQrCode(mQrCode, qrcodeSize);
mQrCodeView.setImageBitmap(bmp);
} catch (WriterException e) {
- Log.e(TAG, "Error generatting QR code bitmap " + e);
+ Log.e(TAG, "Error generating QR code bitmap " + e);
}
}
- WifiNetworkConfig getWifiNetworkConfigFromHostActivity() {
+ private WifiNetworkConfig getWifiNetworkConfigFromHostActivity() {
final WifiNetworkConfig wifiNetworkConfig = ((WifiNetworkConfig.Retriever) getActivity())
.getWifiNetworkConfig();
if (!WifiNetworkConfig.isValidConfig(wifiNetworkConfig)) {
@@ -168,4 +136,9 @@
return wifiNetworkConfig;
}
+
+ @Override
+ protected boolean isFooterAvailable() {
+ return false;
+ }
}
diff --git a/src/com/android/settings/wifi/dpp/WifiDppQrCodeScannerFragment.java b/src/com/android/settings/wifi/dpp/WifiDppQrCodeScannerFragment.java
index c37bdc0a..b3bd9c6 100644
--- a/src/com/android/settings/wifi/dpp/WifiDppQrCodeScannerFragment.java
+++ b/src/com/android/settings/wifi/dpp/WifiDppQrCodeScannerFragment.java
@@ -16,11 +16,9 @@
package com.android.settings.wifi.dpp;
-import android.app.ActionBar;
import android.app.Activity;
import android.app.settings.SettingsEnums;
import android.content.Context;
-import android.content.pm.ActivityInfo;
import android.content.Intent;
import android.graphics.Matrix;
import android.graphics.Rect;
@@ -42,7 +40,6 @@
import android.view.View;
import android.view.ViewGroup;
import android.view.accessibility.AccessibilityEvent;
-import android.widget.ProgressBar;
import android.widget.TextView;
import androidx.annotation.StringRes;
@@ -59,7 +56,6 @@
import com.android.settingslib.wifi.WifiTracker;
import com.android.settingslib.wifi.WifiTrackerFactory;
-import java.util.ArrayList;
import java.util.List;
public class WifiDppQrCodeScannerFragment extends WifiDppQrCodeBaseFragment implements
@@ -91,7 +87,6 @@
private static final int ARG_RESTART_CAMERA = 1;
- private ProgressBar mProgressBar;
private QrCamera mCamera;
private TextureView mTextureView;
private QrDecorateView mDecorateView;
@@ -136,7 +131,7 @@
SHOW_ERROR_MESSAGE_INTERVAL);
if (msg.arg1 == ARG_RESTART_CAMERA) {
- mProgressBar.setVisibility(View.INVISIBLE);
+ setProgressBarShown(false);
mDecorateView.setFocused(false);
restartCamera();
}
@@ -150,7 +145,7 @@
mScanWifiDppSuccessListener.onScanWifiDppSuccess((WifiQrCode)msg.obj);
if (!mIsConfiguratorMode) {
- mProgressBar.setVisibility(View.VISIBLE);
+ setProgressBarShown(true);
startWifiDppEnrolleeInitiator((WifiQrCode)msg.obj);
updateEnrolleeSummary();
mSummary.sendAccessibilityEvent(
@@ -207,7 +202,6 @@
break;
default:
- return;
}
}
};
@@ -252,7 +246,7 @@
model.getEnrolleeSuccessNetworkId().observe(this, networkId -> {
// After configuration change, observe callback will be triggered,
// do nothing for this case if a handshake does not end
- if (model.isGoingInitiator()) {
+ if (model.isWifiDppHandshaking()) {
return;
}
@@ -262,7 +256,7 @@
model.getStatusCode().observe(this, statusCode -> {
// After configuration change, observe callback will be triggered,
// do nothing for this case if a handshake does not end
- if (model.isGoingInitiator()) {
+ if (model.isWifiDppHandshaking()) {
return;
}
@@ -285,7 +279,7 @@
public void onResume() {
super.onResume();
- if (!isGoingInitiator()) {
+ if (!isWifiDppHandshaking()) {
restartCamera();
}
}
@@ -301,9 +295,9 @@
// Container Activity must implement this interface
public interface OnScanWifiDppSuccessListener {
- public void onScanWifiDppSuccess(WifiQrCode wifiQrCode);
+ void onScanWifiDppSuccess(WifiQrCode wifiQrCode);
}
- OnScanWifiDppSuccessListener mScanWifiDppSuccessListener;
+ private OnScanWifiDppSuccessListener mScanWifiDppSuccessListener;
/**
* Configurator container activity of the fragment should create instance with this constructor.
@@ -318,7 +312,7 @@
* Enrollee container activity of the fragment should create instance with this constructor and
* specify the SSID string of the WI-Fi network to be provisioned.
*/
- public WifiDppQrCodeScannerFragment(String ssid) {
+ WifiDppQrCodeScannerFragment(String ssid) {
super();
mIsConfiguratorMode = false;
@@ -332,18 +326,12 @@
mWifiTracker = WifiTrackerFactory.create(getActivity(), /* wifiListener */ this,
getSettingsLifecycle(), /* includeSaved */ false, /* includeScans */ true);
- // setTitle for Talkback
+ // setTitle for TalkBack
if (mIsConfiguratorMode) {
getActivity().setTitle(R.string.wifi_dpp_add_device_to_network);
} else {
getActivity().setTitle(R.string.wifi_dpp_scan_qr_code);
}
-
- final ActionBar actionBar = getActivity().getActionBar();
- if (actionBar != null) {
- actionBar.setDisplayHomeAsUpEnabled(true);
- actionBar.show();
- }
}
@Override
@@ -371,18 +359,15 @@
public void onViewCreated(View view, Bundle savedInstanceState) {
super.onViewCreated(view, savedInstanceState);
- mTextureView = (TextureView) view.findViewById(R.id.preview_view);
+ mTextureView = view.findViewById(R.id.preview_view);
mTextureView.setSurfaceTextureListener(this);
- mDecorateView = (QrDecorateView) view.findViewById(R.id.decorate_view);
+ mDecorateView = view.findViewById(R.id.decorate_view);
- setHeaderIconImageResource(R.drawable.ic_scan_24dp);
-
- mProgressBar = view.findViewById(R.id.indeterminate_bar);
- mProgressBar.setVisibility(isGoingInitiator() ? View.VISIBLE : View.INVISIBLE);
+ setProgressBarShown(isWifiDppHandshaking());
if (mIsConfiguratorMode) {
- mTitle.setText(R.string.wifi_dpp_add_device_to_network);
+ setHeaderTitle(R.string.wifi_dpp_add_device_to_network);
WifiNetworkConfig wifiNetworkConfig = ((WifiNetworkConfig.Retriever) getActivity())
.getWifiNetworkConfig();
@@ -392,7 +377,7 @@
mSummary.setText(getString(R.string.wifi_dpp_center_qr_code,
wifiNetworkConfig.getSsid()));
} else {
- mTitle.setText(R.string.wifi_dpp_scan_qr_code);
+ setHeaderTitle(R.string.wifi_dpp_scan_qr_code);
updateEnrolleeSummary();
}
@@ -448,24 +433,14 @@
try {
mWifiQrCode = new WifiQrCode(qrCode);
} catch (IllegalArgumentException e) {
- showErrorMessage(R.string.wifi_dpp_could_not_detect_valid_qr_code);
+ showErrorMessage(R.string.wifi_dpp_qr_code_is_not_valid_format);
return false;
}
- final String scheme = mWifiQrCode.getScheme();
-
- // When SSID is specified for enrollee, avoid to connect to the Wi-Fi of different SSID
- if (!mIsConfiguratorMode && WifiQrCode.SCHEME_ZXING_WIFI_NETWORK_CONFIG.equals(scheme)) {
- final String ssidQrCode = mWifiQrCode.getWifiNetworkConfig().getSsid();
- if (!TextUtils.isEmpty(mSsid) && !mSsid.equals(ssidQrCode)) {
- showErrorMessage(R.string.wifi_dpp_could_not_detect_valid_qr_code);
- return false;
- }
- }
-
// It's impossible to provision other device with ZXing Wi-Fi Network config format
+ final String scheme = mWifiQrCode.getScheme();
if (mIsConfiguratorMode && WifiQrCode.SCHEME_ZXING_WIFI_NETWORK_CONFIG.equals(scheme)) {
- showErrorMessage(R.string.wifi_dpp_could_not_detect_valid_qr_code);
+ showErrorMessage(R.string.wifi_dpp_qr_code_is_not_valid_format);
return false;
}
@@ -515,7 +490,7 @@
if (mCamera == null) {
mCamera = new QrCamera(getContext(), this);
- if (isGoingInitiator()) {
+ if (isWifiDppHandshaking()) {
if (mDecorateView != null) {
mDecorateView.setFocused(true);
}
@@ -586,10 +561,10 @@
public void onFailure(int code) {
Log.d(TAG, "EasyConnectEnrolleeStatusCallback.onFailure " + code);
- int errorMessageResId = 0;
+ int errorMessageResId;
switch (code) {
case EasyConnectStatusCallback.EASY_CONNECT_EVENT_FAILURE_INVALID_URI:
- errorMessageResId = R.string.wifi_dpp_could_not_detect_valid_qr_code;
+ errorMessageResId = R.string.wifi_dpp_qr_code_is_not_valid_format;
break;
case EasyConnectStatusCallback.EASY_CONNECT_EVENT_FAILURE_AUTHENTICATION:
@@ -673,11 +648,11 @@
}
// Check is Easy Connect handshaking or not
- private boolean isGoingInitiator() {
+ private boolean isWifiDppHandshaking() {
final WifiDppInitiatorViewModel model =
ViewModelProviders.of(this).get(WifiDppInitiatorViewModel.class);
- return model.isGoingInitiator();
+ return model.isWifiDppHandshaking();
}
/**
@@ -702,7 +677,7 @@
}
private void updateEnrolleeSummary() {
- if (isGoingInitiator()) {
+ if (isWifiDppHandshaking()) {
mSummary.setText(R.string.wifi_dpp_connecting);
} else {
String description;
@@ -740,4 +715,9 @@
protected boolean isDecodeTaskAlive() {
return mCamera != null && mCamera.isDecodeTaskAlive();
}
+
+ @Override
+ protected boolean isFooterAvailable() {
+ return false;
+ }
}
diff --git a/src/com/android/settings/wifi/dpp/WifiDppUtils.java b/src/com/android/settings/wifi/dpp/WifiDppUtils.java
index 2a958e8..5481909 100644
--- a/src/com/android/settings/wifi/dpp/WifiDppUtils.java
+++ b/src/com/android/settings/wifi/dpp/WifiDppUtils.java
@@ -29,7 +29,6 @@
import android.os.VibrationEffect;
import android.os.Vibrator;
import android.text.TextUtils;
-import android.util.FeatureFlagUtils;
import com.android.settings.R;
@@ -48,62 +47,62 @@
/**
* The fragment tag specified to FragmentManager for container activities to manage fragments.
*/
- public static final String TAG_FRAGMENT_QR_CODE_SCANNER = "qr_code_scanner_fragment";
+ static final String TAG_FRAGMENT_QR_CODE_SCANNER = "qr_code_scanner_fragment";
/**
* @see #TAG_FRAGMENT_QR_CODE_SCANNER
*/
- public static final String TAG_FRAGMENT_QR_CODE_GENERATOR = "qr_code_generator_fragment";
+ static final String TAG_FRAGMENT_QR_CODE_GENERATOR = "qr_code_generator_fragment";
/**
* @see #TAG_FRAGMENT_QR_CODE_SCANNER
*/
- public static final String TAG_FRAGMENT_CHOOSE_SAVED_WIFI_NETWORK =
+ static final String TAG_FRAGMENT_CHOOSE_SAVED_WIFI_NETWORK =
"choose_saved_wifi_network_fragment";
/**
* @see #TAG_FRAGMENT_QR_CODE_SCANNER
*/
- public static final String TAG_FRAGMENT_ADD_DEVICE = "add_device_fragment";
+ static final String TAG_FRAGMENT_ADD_DEVICE = "add_device_fragment";
/** The data is from {@code com.android.settingslib.wifi.AccessPoint.securityToString} */
- public static final String EXTRA_WIFI_SECURITY = "security";
+ static final String EXTRA_WIFI_SECURITY = "security";
/** The data corresponding to {@code WifiConfiguration} SSID */
- public static final String EXTRA_WIFI_SSID = "ssid";
+ static final String EXTRA_WIFI_SSID = "ssid";
/** The data corresponding to {@code WifiConfiguration} preSharedKey */
- public static final String EXTRA_WIFI_PRE_SHARED_KEY = "preSharedKey";
+ static final String EXTRA_WIFI_PRE_SHARED_KEY = "preSharedKey";
/** The data corresponding to {@code WifiConfiguration} hiddenSSID */
- public static final String EXTRA_WIFI_HIDDEN_SSID = "hiddenSsid";
+ static final String EXTRA_WIFI_HIDDEN_SSID = "hiddenSsid";
/** The data corresponding to {@code WifiConfiguration} networkId */
- public static final String EXTRA_WIFI_NETWORK_ID = "networkId";
+ static final String EXTRA_WIFI_NETWORK_ID = "networkId";
/** The data to recognize if it's a Wi-Fi hotspot for configuration */
- public static final String EXTRA_IS_HOTSPOT = "isHotspot";
+ static final String EXTRA_IS_HOTSPOT = "isHotspot";
/** Used by {@link android.provider.Settings#ACTION_PROCESS_WIFI_EASY_CONNECT_URI} to
* indicate test mode UI should be shown. Test UI does not make API calls. Value is a boolean.*/
- public static final String EXTRA_TEST = "test";
+ static final String EXTRA_TEST = "test";
/**
* Default status code for Easy Connect
*/
- public static final int EASY_CONNECT_EVENT_FAILURE_NONE = 0;
+ static final int EASY_CONNECT_EVENT_FAILURE_NONE = 0;
/**
* Success status code for Easy Connect.
*/
- public static final int EASY_CONNECT_EVENT_SUCCESS = 1;
+ static final int EASY_CONNECT_EVENT_SUCCESS = 1;
private static final Duration VIBRATE_DURATION_QR_CODE_RECOGNITION = Duration.ofMillis(3);
/**
* Returns whether the device support WiFi DPP.
*/
- public static boolean isWifiDppEnabled(Context context) {
+ static boolean isWifiDppEnabled(Context context) {
final WifiManager manager = context.getSystemService(WifiManager.class);
return manager.isEasyConnectSupported();
}
@@ -130,10 +129,10 @@
private static String getPresharedKey(WifiManager wifiManager,
WifiConfiguration wifiConfiguration) {
- final List<WifiConfiguration> privilegedWifiConfiguratios =
+ final List<WifiConfiguration> privilegedWifiConfigurations =
wifiManager.getPrivilegedConfiguredNetworks();
- for (WifiConfiguration privilegedWifiConfiguration : privilegedWifiConfiguratios) {
+ for (WifiConfiguration privilegedWifiConfiguration : privilegedWifiConfigurations) {
if (privilegedWifiConfiguration.networkId == wifiConfiguration.networkId) {
// WEP uses a shared key hence the AuthAlgorithm.SHARED is used
// to identify it.
diff --git a/src/com/android/settings/wifi/dpp/WifiNetworkConfig.java b/src/com/android/settings/wifi/dpp/WifiNetworkConfig.java
index 7423561..3c3aa7d 100644
--- a/src/com/android/settings/wifi/dpp/WifiNetworkConfig.java
+++ b/src/com/android/settings/wifi/dpp/WifiNetworkConfig.java
@@ -81,7 +81,7 @@
* WifiNetworkConfig for configuration
*/
public interface Retriever {
- public WifiNetworkConfig getWifiNetworkConfig();
+ WifiNetworkConfig getWifiNetworkConfig();
}
/**
@@ -90,7 +90,7 @@
* android.settings.WIFI_DPP_CONFIGURATOR_QR_CODE_GENERATOR
* android.settings.WIFI_DPP_CONFIGURATOR_QR_CODE_SCANNER
*/
- public static WifiNetworkConfig getValidConfigOrNull(Intent intent) {
+ static WifiNetworkConfig getValidConfigOrNull(Intent intent) {
final String security = intent.getStringExtra(WifiDppUtils.EXTRA_WIFI_SECURITY);
final String ssid = intent.getStringExtra(WifiDppUtils.EXTRA_WIFI_SSID);
final String preSharedKey = intent.getStringExtra(WifiDppUtils.EXTRA_WIFI_PRE_SHARED_KEY);
@@ -103,7 +103,7 @@
return getValidConfigOrNull(security, ssid, preSharedKey, hiddenSsid, networkId, isHotspot);
}
- public static WifiNetworkConfig getValidConfigOrNull(String security, String ssid,
+ static WifiNetworkConfig getValidConfigOrNull(String security, String ssid,
String preSharedKey, boolean hiddenSsid, int networkId, boolean isHotspot) {
if (!isValidConfig(security, ssid, preSharedKey, hiddenSsid)) {
return null;
@@ -113,7 +113,7 @@
isHotspot);
}
- public static boolean isValidConfig(WifiNetworkConfig config) {
+ static boolean isValidConfig(WifiNetworkConfig config) {
if (config == null) {
return false;
} else {
@@ -122,7 +122,7 @@
}
}
- public static boolean isValidConfig(String security, String ssid, String preSharedKey,
+ static boolean isValidConfig(String security, String ssid, String preSharedKey,
boolean hiddenSsid) {
if (!TextUtils.isEmpty(security) && !SECURITY_NO_PASSWORD.equals(security)) {
if (TextUtils.isEmpty(preSharedKey)) {
@@ -162,9 +162,9 @@
* Construct a barcode string for WiFi network login.
* See https://en.wikipedia.org/wiki/QR_code#WiFi_network_login
*/
- public String getQrCode() {
+ String getQrCode() {
final String empty = "";
- String barcode = new StringBuilder("WIFI:")
+ return new StringBuilder("WIFI:")
.append("S:")
.append(escapeSpecialCharacters(mSsid))
.append(";")
@@ -179,7 +179,6 @@
.append(mHiddenSsid)
.append(";;")
.toString();
- return barcode;
}
public String getSecurity() {
@@ -233,9 +232,6 @@
/**
* This is a simplified method from {@code WifiConfigController.getConfig()}
*
- * TODO (b/129021867): WifiConfiguration is a deprecated class, should replace it with
- * {@code android.net.wifi.WifiNetworkSuggestion}
- *
* @return When it's a open network, returns 2 WifiConfiguration in the List, the 1st is
* open network and the 2nd is enhanced open network. Returns 1 WifiConfiguration in the
* List for all other supported Wi-Fi securities.
diff --git a/src/com/android/settings/wifi/dpp/WifiNetworkListFragment.java b/src/com/android/settings/wifi/dpp/WifiNetworkListFragment.java
index 372bc44..c854828 100644
--- a/src/com/android/settings/wifi/dpp/WifiNetworkListFragment.java
+++ b/src/com/android/settings/wifi/dpp/WifiNetworkListFragment.java
@@ -40,7 +40,6 @@
import com.android.settingslib.wifi.WifiTracker;
import com.android.settingslib.wifi.WifiTrackerFactory;
-import java.util.Collections;
import java.util.List;
import java.util.stream.Collectors;
@@ -51,7 +50,7 @@
private static final String WIFI_CONFIG_KEY = "wifi_config_key";
private static final String PREF_KEY_ACCESS_POINTS = "access_points";
- static final int ADD_NETWORK_REQUEST = 1;
+ private static final int ADD_NETWORK_REQUEST = 1;
private PreferenceCategory mAccessPointsPreferenceCategory;
private AccessPointPreference.UserBadgeCache mUserBadgeCache;
@@ -67,10 +66,9 @@
// Container Activity must implement this interface
public interface OnChooseNetworkListener {
- public void onChooseNetwork(WifiNetworkConfig wifiNetworkConfig);
+ void onChooseNetwork(WifiNetworkConfig wifiNetworkConfig);
}
-
- OnChooseNetworkListener mOnChooseNetworkListener;
+ private OnChooseNetworkListener mOnChooseNetworkListener;
@Override
public int getMetricsCategory() {
@@ -139,8 +137,7 @@
public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
addPreferencesFromResource(R.xml.wifi_dpp_network_list);
- mAccessPointsPreferenceCategory = (PreferenceCategory) findPreference(
- PREF_KEY_ACCESS_POINTS);
+ mAccessPointsPreferenceCategory = findPreference(PREF_KEY_ACCESS_POINTS);
mFakeNetworkPreference = new Preference(getPrefContext());
mFakeNetworkPreference.setIcon(R.drawable.ic_wifi_signal_0);
@@ -254,12 +251,8 @@
private boolean isValidForDppConfiguration(AccessPoint accessPoint) {
final int security = accessPoint.getSecurity();
- // DPP 1.0 only support SAE and PSK.
- if (!(security == AccessPoint.SECURITY_PSK || security == AccessPoint.SECURITY_SAE)) {
- return false;
- }
-
- return true;
+ // DPP 1.0 only support PSK and SAE.
+ return security == AccessPoint.SECURITY_PSK || security == AccessPoint.SECURITY_SAE;
}
private void launchAddNetworkFragment() {
diff --git a/src/com/android/settings/wifi/dpp/WifiQrCode.java b/src/com/android/settings/wifi/dpp/WifiQrCode.java
index 40ae111..2b4c3ed 100644
--- a/src/com/android/settings/wifi/dpp/WifiQrCode.java
+++ b/src/com/android/settings/wifi/dpp/WifiQrCode.java
@@ -48,26 +48,26 @@
*
*/
public class WifiQrCode {
- public static final String SCHEME_DPP = "DPP";
- public static final String SCHEME_ZXING_WIFI_NETWORK_CONFIG = "WIFI";
- public static final String PREFIX_DPP = "DPP:";
- public static final String PREFIX_ZXING_WIFI_NETWORK_CONFIG = "WIFI:";
+ static final String SCHEME_DPP = "DPP";
+ static final String SCHEME_ZXING_WIFI_NETWORK_CONFIG = "WIFI";
+ static final String PREFIX_DPP = "DPP:";
+ static final String PREFIX_ZXING_WIFI_NETWORK_CONFIG = "WIFI:";
- public static final String PREFIX_DPP_PUBLIC_KEY = "K:";
- public static final String PREFIX_DPP_INFORMATION = "I:";
+ static final String PREFIX_DPP_PUBLIC_KEY = "K:";
+ static final String PREFIX_DPP_INFORMATION = "I:";
- public static final String PREFIX_ZXING_SECURITY = "T:";
- public static final String PREFIX_ZXING_SSID = "S:";
- public static final String PREFIX_ZXING_PASSWORD = "P:";
- public static final String PREFIX_ZXING_HIDDEN_SSID = "H:";
+ static final String PREFIX_ZXING_SECURITY = "T:";
+ static final String PREFIX_ZXING_SSID = "S:";
+ static final String PREFIX_ZXING_PASSWORD = "P:";
+ static final String PREFIX_ZXING_HIDDEN_SSID = "H:";
- public static final String DELIMITER_QR_CODE = ";";
+ static final String DELIMITER_QR_CODE = ";";
// Ignores password if security is SECURITY_NO_PASSWORD or absent
- public static final String SECURITY_NO_PASSWORD = "nopass"; //open network or OWE
- public static final String SECURITY_WEP = "WEP";
- public static final String SECURITY_WPA_PSK = "WPA";
- public static final String SECURITY_SAE = "SAE";
+ static final String SECURITY_NO_PASSWORD = "nopass"; //open network or OWE
+ static final String SECURITY_WEP = "WEP";
+ static final String SECURITY_WPA_PSK = "WPA";
+ static final String SECURITY_SAE = "SAE";
private String mQrCode;
@@ -104,7 +104,7 @@
/** Parses Wi-Fi DPP QR code string */
private void parseWifiDppQrCode(String qrCode) throws IllegalArgumentException {
- List keyValueList = getKeyValueList(qrCode, PREFIX_DPP, DELIMITER_QR_CODE);
+ List<String> keyValueList = getKeyValueList(qrCode, PREFIX_DPP, DELIMITER_QR_CODE);
String publicKey = getValueOrNull(keyValueList, PREFIX_DPP_PUBLIC_KEY);
if (TextUtils.isEmpty(publicKey)) {
@@ -117,7 +117,7 @@
/** Parses ZXing reader library's Wi-Fi Network config format */
private void parseZxingWifiQrCode(String qrCode) throws IllegalArgumentException {
- List keyValueList = getKeyValueList(qrCode, PREFIX_ZXING_WIFI_NETWORK_CONFIG,
+ List<String> keyValueList = getKeyValueList(qrCode, PREFIX_ZXING_WIFI_NETWORK_CONFIG,
DELIMITER_QR_CODE);
String security = getValueOrNull(keyValueList, PREFIX_ZXING_SECURITY);
@@ -155,8 +155,7 @@
// Should not treat \delimiter as a delimiter
String regex = "(?<!\\\\)" + Pattern.quote(delimiter);
- List<String> result = Arrays.asList(keyValueString.split(regex));
- return result;
+ return Arrays.asList(keyValueString.split(regex));
}
private String getValueOrNull(List<String> keyValueList, String prefix) {
@@ -195,7 +194,7 @@
return sb.toString();
}
- public String getQrCode() {
+ String getQrCode() {
return mQrCode;
}
@@ -221,7 +220,7 @@
}
/** Available when {@code getScheme()} returns SCHEME_ZXING_WIFI_NETWORK_CONFIG */
- public WifiNetworkConfig getWifiNetworkConfig() {
+ WifiNetworkConfig getWifiNetworkConfig() {
if (mWifiNetworkConfig == null) {
return null;
}
@@ -229,7 +228,7 @@
return new WifiNetworkConfig(mWifiNetworkConfig);
}
- public static WifiQrCode getValidWifiDppQrCodeOrNull(String qrCode) {
+ static WifiQrCode getValidWifiDppQrCodeOrNull(String qrCode) {
WifiQrCode wifiQrCode;
try {
wifiQrCode = new WifiQrCode(qrCode);
diff --git a/src/com/android/settings/wifi/p2p/WifiP2pSettings.java b/src/com/android/settings/wifi/p2p/WifiP2pSettings.java
index f1ac6cd..7253760 100644
--- a/src/com/android/settings/wifi/p2p/WifiP2pSettings.java
+++ b/src/com/android/settings/wifi/p2p/WifiP2pSettings.java
@@ -42,9 +42,11 @@
import android.text.InputFilter;
import android.text.TextUtils;
import android.util.Log;
+import android.view.LayoutInflater;
import android.view.Menu;
import android.view.MenuInflater;
import android.view.MenuItem;
+import android.view.View;
import android.widget.EditText;
import android.widget.Toast;
@@ -495,7 +497,9 @@
.create();
return dialog;
} else if (id == DIALOG_RENAME) {
- mDeviceNameText = new EditText(getActivity());
+ final LayoutInflater layoutInflater = LayoutInflater.from(getPrefContext());
+ final View root = layoutInflater.inflate(R.layout.dialog_edittext, null /* root */);
+ mDeviceNameText = root.findViewById(R.id.edittext);
mDeviceNameText.setFilters(new InputFilter[] {new InputFilter.LengthFilter(30)});
if (mSavedDeviceName != null) {
mDeviceNameText.setText(mSavedDeviceName);
@@ -507,7 +511,7 @@
mSavedDeviceName = null;
AlertDialog dialog = new AlertDialog.Builder(getActivity())
.setTitle(R.string.wifi_p2p_menu_rename)
- .setView(mDeviceNameText)
+ .setView(root)
.setPositiveButton(getActivity().getString(R.string.dlg_ok), mRenameListener)
.setNegativeButton(getActivity().getString(R.string.dlg_cancel), null)
.create();
diff --git a/src/com/android/settings/wifi/qrcode/QrCamera.java b/src/com/android/settings/wifi/qrcode/QrCamera.java
index c682587..f0afd60 100644
--- a/src/com/android/settings/wifi/qrcode/QrCamera.java
+++ b/src/com/android/settings/wifi/qrcode/QrCamera.java
@@ -68,9 +68,9 @@
* size is 1920x1440, MAX_RATIO_DIFF 0.1 could allow picture size of 720x480 or 352x288 or
* 176x44 but not 1920x1080.
*/
- private static double MAX_RATIO_DIFF = 0.1;
+ private static final double MAX_RATIO_DIFF = 0.1;
- private static long AUTOFOCUS_INTERVAL_MS = 1500L;
+ private static final long AUTOFOCUS_INTERVAL_MS = 1500L;
private static Map<DecodeHintType, List<BarcodeFormat>> HINTS = new ArrayMap<>();
private static List<BarcodeFormat> FORMATS = new ArrayList<>();
@@ -217,7 +217,7 @@
final int rotateDegrees = (mCameraOrientation - degrees + 360) % 360;
mCamera.setDisplayOrientation(rotateDegrees);
mCamera.startPreview();
- if (mParameters.getFocusMode() == Parameters.FOCUS_MODE_AUTO) {
+ if (Parameters.FOCUS_MODE_AUTO.equals(mParameters.getFocusMode())) {
mCamera.autoFocus(/* Camera.AutoFocusCallback */ null);
sendMessageDelayed(obtainMessage(MSG_AUTO_FOCUS), AUTOFOCUS_INTERVAL_MS);
}
@@ -241,7 +241,7 @@
final Semaphore imageGot = new Semaphore(0);
while (true) {
// This loop will try to capture preview image continuously until a valid QR Code
- // decoded. The caller can also call {@link #stop()} to inturrupts scanning loop.
+ // decoded. The caller can also call {@link #stop()} to interrupts scanning loop.
mCamera.setOneShotPreviewCallback(
(imageData, camera) -> {
mImage = getFrameImage(imageData);
@@ -300,7 +300,7 @@
return false;
}
setCameraParameter();
- setTransformationMatrix(mScannerCallback.getViewSize());
+ setTransformationMatrix();
if (!startPreview()) {
Log.e(TAG, "Error to init Camera");
mCamera = null;
@@ -317,13 +317,10 @@
}
}
- /** Set transfom matrix to crop and center the preview picture */
- private void setTransformationMatrix(Size viewSize) {
- // Check aspect ratio, can only handle square view.
- final int viewRatio = (int)getRatio(viewSize.getWidth(), viewSize.getHeight());
-
+ /** Set transform matrix to crop and center the preview picture */
+ private void setTransformationMatrix() {
final boolean isPortrait = mContext.get().getResources().getConfiguration().orientation
- == Configuration.ORIENTATION_PORTRAIT ? true : false;
+ == Configuration.ORIENTATION_PORTRAIT;
final int previewWidth = isPortrait ? mPreviewSize.getWidth() : mPreviewSize.getHeight();
final int previewHeight = isPortrait ? mPreviewSize.getHeight() : mPreviewSize.getWidth();
@@ -357,7 +354,7 @@
switch (msg.what) {
case MSG_AUTO_FOCUS:
// Calling autoFocus(null) will only trigger the camera to focus once. In order
- // to make the camera continuously auto focus during scanning, need to periodly
+ // to make the camera continuously auto focus during scanning, need to periodically
// trigger it.
mCamera.autoFocus(/* Camera.AutoFocusCallback */ null);
sendMessageDelayed(obtainMessage(MSG_AUTO_FOCUS), AUTOFOCUS_INTERVAL_MS);
diff --git a/src/com/android/settings/wifi/savedaccesspoints/SavedNetworkComparator.java b/src/com/android/settings/wifi/savedaccesspoints/SavedNetworkComparator.java
index cff4387..e66ef23 100644
--- a/src/com/android/settings/wifi/savedaccesspoints/SavedNetworkComparator.java
+++ b/src/com/android/settings/wifi/savedaccesspoints/SavedNetworkComparator.java
@@ -30,7 +30,7 @@
@Override
public int compare(AccessPoint ap1, AccessPoint ap2) {
return mCollator.compare(
- nullToEmpty(ap1.getConfigName()), nullToEmpty(ap2.getConfigName()));
+ nullToEmpty(ap1.getTitle()), nullToEmpty(ap2.getTitle()));
}
private String nullToEmpty(String string) {
diff --git a/src/com/android/settings/wifi/tether/WifiTetherApBandPreferenceController.java b/src/com/android/settings/wifi/tether/WifiTetherApBandPreferenceController.java
index 3a85f7b..388cbf2 100644
--- a/src/com/android/settings/wifi/tether/WifiTetherApBandPreferenceController.java
+++ b/src/com/android/settings/wifi/tether/WifiTetherApBandPreferenceController.java
@@ -90,7 +90,7 @@
mBandIndex = validateSelection(Integer.parseInt((String) newValue));
Log.d(TAG, "Band preference changed, updating band index to " + mBandIndex);
preference.setSummary(getConfigSummary());
- mListener.onTetherConfigUpdated();
+ mListener.onTetherConfigUpdated(this);
return true;
}
diff --git a/src/com/android/settings/wifi/tether/WifiTetherBasePreferenceController.java b/src/com/android/settings/wifi/tether/WifiTetherBasePreferenceController.java
index 94e9209..2a5dea9 100644
--- a/src/com/android/settings/wifi/tether/WifiTetherBasePreferenceController.java
+++ b/src/com/android/settings/wifi/tether/WifiTetherBasePreferenceController.java
@@ -30,7 +30,7 @@
implements PreferenceControllerMixin, Preference.OnPreferenceChangeListener {
public interface OnTetherConfigUpdateListener {
- void onTetherConfigUpdated();
+ void onTetherConfigUpdated(AbstractPreferenceController context);
}
protected final WifiManager mWifiManager;
diff --git a/src/com/android/settings/wifi/tether/WifiTetherPasswordPreferenceController.java b/src/com/android/settings/wifi/tether/WifiTetherPasswordPreferenceController.java
index 8d9e858..81239a8 100644
--- a/src/com/android/settings/wifi/tether/WifiTetherPasswordPreferenceController.java
+++ b/src/com/android/settings/wifi/tether/WifiTetherPasswordPreferenceController.java
@@ -65,7 +65,7 @@
public boolean onPreferenceChange(Preference preference, Object newValue) {
mPassword = (String) newValue;
updatePasswordDisplay((EditTextPreference) mPreference);
- mListener.onTetherConfigUpdated();
+ mListener.onTetherConfigUpdated(this);
return true;
}
diff --git a/src/com/android/settings/wifi/tether/WifiTetherSSIDPreferenceController.java b/src/com/android/settings/wifi/tether/WifiTetherSSIDPreferenceController.java
index 1197db4..a35450f 100644
--- a/src/com/android/settings/wifi/tether/WifiTetherSSIDPreferenceController.java
+++ b/src/com/android/settings/wifi/tether/WifiTetherSSIDPreferenceController.java
@@ -93,7 +93,7 @@
public boolean onPreferenceChange(Preference preference, Object newValue) {
mSSID = (String) newValue;
updateSsidDisplay((EditTextPreference) preference);
- mListener.onTetherConfigUpdated();
+ mListener.onTetherConfigUpdated(this);
return true;
}
diff --git a/src/com/android/settings/wifi/tether/WifiTetherSecurityPreferenceController.java b/src/com/android/settings/wifi/tether/WifiTetherSecurityPreferenceController.java
index f97a209..9ce05ed 100644
--- a/src/com/android/settings/wifi/tether/WifiTetherSecurityPreferenceController.java
+++ b/src/com/android/settings/wifi/tether/WifiTetherSecurityPreferenceController.java
@@ -45,7 +45,7 @@
public boolean onPreferenceChange(Preference preference, Object newValue) {
mSecurityValue = Integer.parseInt((String) newValue);
preference.setSummary(getSummaryForSecurityType(mSecurityValue));
- mListener.onTetherConfigUpdated();
+ mListener.onTetherConfigUpdated(this);
return true;
}
diff --git a/src/com/android/settings/wifi/tether/WifiTetherSettings.java b/src/com/android/settings/wifi/tether/WifiTetherSettings.java
index aecc053..3636eb8 100644
--- a/src/com/android/settings/wifi/tether/WifiTetherSettings.java
+++ b/src/com/android/settings/wifi/tether/WifiTetherSettings.java
@@ -30,9 +30,8 @@
import android.os.UserManager;
import android.provider.SearchIndexableResource;
import android.util.Log;
-
import androidx.annotation.VisibleForTesting;
-
+import androidx.preference.PreferenceGroup;
import com.android.settings.R;
import com.android.settings.SettingsActivity;
import com.android.settings.dashboard.RestrictedDashboardFragment;
@@ -42,7 +41,6 @@
import com.android.settingslib.TetherUtil;
import com.android.settingslib.core.AbstractPreferenceController;
import com.android.settingslib.search.SearchIndexable;
-
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
@@ -54,6 +52,9 @@
private static final String TAG = "WifiTetherSettings";
private static final IntentFilter TETHER_STATE_CHANGE_FILTER;
private static final String KEY_WIFI_TETHER_SCREEN = "wifi_tether_settings_screen";
+ private static final int EXPANDED_CHILD_COUNT_WITH_SECURITY_NON = 2;
+ private static final int EXPANDED_CHILD_COUNT_DEFAULT = 3;
+
@VisibleForTesting
static final String KEY_WIFI_TETHER_NETWORK_NAME = "wifi_tether_network_name";
@VisibleForTesting
@@ -185,7 +186,7 @@
}
@Override
- public void onTetherConfigUpdated() {
+ public void onTetherConfigUpdated(AbstractPreferenceController context) {
final WifiConfiguration config = buildNewConfig();
mPasswordPreferenceController.updateVisibility(config.getAuthType());
@@ -201,6 +202,10 @@
mSwitchBarController.stopTether();
}
mWifiManager.setWifiApConfiguration(config);
+
+ if (context instanceof WifiTetherSecurityPreferenceController) {
+ reConfigInitialExpandedChildCount();
+ }
}
private WifiConfiguration buildNewConfig() {
@@ -285,4 +290,23 @@
}
}
}
+
+ private void reConfigInitialExpandedChildCount() {
+ final PreferenceGroup screen = getPreferenceScreen();
+ if (mSecurityPreferenceController.getSecurityType() == WifiConfiguration.KeyMgmt.NONE) {
+ screen.setInitialExpandedChildrenCount(EXPANDED_CHILD_COUNT_WITH_SECURITY_NON);
+ return;
+ }
+ screen.setInitialExpandedChildrenCount(EXPANDED_CHILD_COUNT_DEFAULT);
+ }
+
+ @Override
+ public int getInitialExpandedChildCount() {
+ if (mSecurityPreferenceController == null) {
+ return EXPANDED_CHILD_COUNT_DEFAULT;
+ }
+
+ return (mSecurityPreferenceController.getSecurityType() == WifiConfiguration.KeyMgmt.NONE) ?
+ EXPANDED_CHILD_COUNT_WITH_SECURITY_NON : EXPANDED_CHILD_COUNT_DEFAULT;
+ }
}
diff --git a/tests/Android.mk b/tests/Android.mk
deleted file mode 100644
index fd297e3..0000000
--- a/tests/Android.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-include $(CLEAR_VARS)
-
-# Include all makefiles in subdirectories
-include $(call all-makefiles-under,$(LOCAL_PATH))
diff --git a/tests/anomaly-tester/Android.bp b/tests/anomaly-tester/Android.bp
new file mode 100644
index 0000000..29181af
--- /dev/null
+++ b/tests/anomaly-tester/Android.bp
@@ -0,0 +1,24 @@
+android_test {
+ name: "AnomalyTester",
+
+ certificate: "platform",
+
+ libs: ["android.test.runner"],
+
+ static_libs: [
+ "androidx.test.rules",
+ "mockito-target",
+ "ub-uiautomator",
+ "truth-prebuilt",
+ ],
+
+ srcs: ["**/*.java"],
+
+ optimize: {
+ enabled: false,
+ },
+
+ platform_apis: true,
+
+ instrumentation_for: "Settings",
+}
diff --git a/tests/anomaly-tester/Android.mk b/tests/anomaly-tester/Android.mk
deleted file mode 100644
index 4dffeab..0000000
--- a/tests/anomaly-tester/Android.mk
+++ /dev/null
@@ -1,26 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_MODULE_TAGS := tests
-LOCAL_CERTIFICATE := platform
-
-LOCAL_JAVA_LIBRARIES := android.test.runner
-
-LOCAL_STATIC_JAVA_LIBRARIES := \
- androidx.test.rules \
- mockito-target \
- ub-uiautomator \
- truth-prebuilt \
-
-LOCAL_SRC_FILES := $(call all-subdir-java-files)
-
-LOCAL_PROGUARD_ENABLED := disabled
-
-LOCAL_PACKAGE_NAME := AnomalyTester
-LOCAL_PRIVATE_PLATFORM_APIS := true
-
-LOCAL_INSTRUMENTATION_FOR := Settings
-
-LOCAL_USE_AAPT2 := true
-
-include $(BUILD_PACKAGE)
diff --git a/tests/robotests/Android.bp b/tests/robotests/Android.bp
new file mode 100644
index 0000000..28c987b
--- /dev/null
+++ b/tests/robotests/Android.bp
@@ -0,0 +1,77 @@
+//############################################################
+// Build SettingsRoboTestStub.apk which includes test-only resources.#
+//############################################################
+
+android_app {
+ name: "SettingsRoboTestStub",
+ defaults: [
+ "SettingsLibDefaults",
+ "SettingsLib-search-defaults",
+ ],
+ platform_apis: true,
+ certificate: "platform",
+ privileged: true,
+
+ resource_dirs: ["res"],
+
+ static_libs: [
+ "Settings-core",
+ "androidx-constraintlayout_constraintlayout",
+ "androidx.slice_slice-builders",
+ "androidx.slice_slice-core",
+ "androidx.slice_slice-view",
+ "androidx.core_core",
+ "androidx.appcompat_appcompat",
+ "androidx.cardview_cardview",
+ "androidx.preference_preference",
+ "androidx.recyclerview_recyclerview",
+ "com.google.android.material_material",
+ "setupcompat",
+ "setupdesign",
+ "androidx-constraintlayout_constraintlayout-solver",
+ "androidx.lifecycle_lifecycle-runtime",
+ "androidx.lifecycle_lifecycle-extensions",
+ "guava",
+ "jsr305",
+ "settings-contextual-card-protos-lite",
+ "settings-log-bridge-protos-lite",
+ "contextualcards",
+ "settings-logtags",
+ "zxing-core-1.7",
+ ],
+
+ aaptflags: ["--extra-packages com.android.settings"],
+
+ libs: [
+ "telephony-common",
+ "ims-common",
+ ],
+}
+
+//############################################################
+// Settings Robolectric test target. #
+//############################################################
+android_robolectric_test {
+ name: "SettingsRoboTests",
+ srcs: [
+ "src/**/*.java",
+ ],
+
+ static_libs: [
+ "SettingsLib-robo-testutils",
+ ],
+
+ java_resource_dirs: ["config"],
+
+ instrumentation_for: "SettingsRoboTestStub",
+
+ test_options: {
+ timeout: 36000,
+ },
+
+ coverage_libs: [
+ "Settings-core",
+ "SettingsLib",
+ "SettingsLib-search",
+ ],
+}
diff --git a/tests/robotests/Android.mk b/tests/robotests/Android.mk
deleted file mode 100644
index 727da06..0000000
--- a/tests/robotests/Android.mk
+++ /dev/null
@@ -1,111 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-
-SETTINGS_AOSP_PATH := packages/apps/Settings
-
-#############################################################
-# Build SettingsRoboTestStub.apk which includes test-only resources.#
-#############################################################
-include $(CLEAR_VARS)
-
-LOCAL_PACKAGE_NAME := SettingsRoboTestStub
-LOCAL_PRIVATE_PLATFORM_APIS := true
-LOCAL_CERTIFICATE := platform
-LOCAL_PRIVILEGED_MODULE := true
-LOCAL_MODULE_TAGS := optional
-LOCAL_USE_AAPT2 := true
-
-RELATIVE_SETTINGS_AOSP_PATH := ../../../../../$(SETTINGS_AOSP_PATH)
-
-LOCAL_MANIFEST_FILE := $(RELATIVE_SETTINGS_AOSP_PATH)/AndroidManifest.xml
-
-LOCAL_SRC_FILES := $(call all-java-files-under, $(RELATIVE_SETTINGS_AOSP_PATH)/src)
-
-LOCAL_RESOURCE_DIR += \
- $(LOCAL_PATH)/res \
- $(SETTINGS_AOSP_PATH)/res
-
-LOCAL_STATIC_ANDROID_LIBRARIES := \
- androidx-constraintlayout_constraintlayout \
- androidx.slice_slice-builders \
- androidx.slice_slice-core \
- androidx.slice_slice-view \
- androidx.core_core \
- androidx.appcompat_appcompat \
- androidx.cardview_cardview \
- androidx.preference_preference \
- androidx.recyclerview_recyclerview \
- com.google.android.material_material \
- setupcompat \
- setupdesign
-
-LOCAL_JAVA_LIBRARIES := \
- telephony-common \
- ims-common
-
-LOCAL_STATIC_JAVA_LIBRARIES := \
- androidx-constraintlayout_constraintlayout-solver \
- androidx.lifecycle_lifecycle-runtime \
- androidx.lifecycle_lifecycle-extensions \
- guava \
- jsr305 \
- settings-contextual-card-protos-lite \
- settings-log-bridge-protos-lite \
- contextualcards \
- settings-logtags \
- zxing-core-1.7
-
-include frameworks/base/packages/SettingsLib/common.mk
-include frameworks/base/packages/SettingsLib/search/common.mk
-
-include $(BUILD_PACKAGE)
-
-#############################################################
-# Settings Robolectric test target. #
-#############################################################
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := SettingsRoboTests
-LOCAL_MODULE_CLASS := JAVA_LIBRARIES
-
-LOCAL_SRC_FILES := $(call all-java-files-under, src) \
- $(call all-java-files-under, ../../../../../frameworks/base/packages/SettingsLib/tests/robotests/src/com/android/settingslib/testutils)
-
-LOCAL_JAVA_RESOURCE_DIRS := config
-
-LOCAL_JAVA_LIBRARIES := \
- robolectric_android-all-stub \
- Robolectric_all-target \
- mockito-robolectric-prebuilt \
- truth-prebuilt
-
-LOCAL_INSTRUMENTATION_FOR := SettingsRoboTestStub
-
-LOCAL_MODULE_TAGS := optional
-
-# Generate test_config.properties
-include external/robolectric-shadows/gen_test_config.mk
-
-include $(BUILD_STATIC_JAVA_LIBRARY)
-
-#############################################################
-# Settings runner target to run the previous target. #
-#############################################################
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := RunSettingsRoboTests
-
-LOCAL_JAVA_LIBRARIES := \
- SettingsRoboTests \
- robolectric_android-all-stub \
- Robolectric_all-target \
- mockito-robolectric-prebuilt \
- truth-prebuilt
-
-LOCAL_TEST_PACKAGE := SettingsRoboTestStub
-
-LOCAL_INSTRUMENT_SOURCE_DIRS := $(dir $(LOCAL_PATH))../src \
- frameworks/base/packages/SettingsLib/search/src \
-
-LOCAL_ROBOTEST_TIMEOUT := 36000
-
-include external/robolectric-shadows/run_robotests.mk
diff --git a/tests/robotests/AndroidManifest.xml b/tests/robotests/AndroidManifest.xml
new file mode 100644
index 0000000..e0050ef
--- /dev/null
+++ b/tests/robotests/AndroidManifest.xml
@@ -0,0 +1,8 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
+ coreApp="true"
+ package="com.android.settings">
+
+ <application/>
+
+</manifest>
diff --git a/tests/robotests/assets/grandfather_not_implementing_index_provider b/tests/robotests/assets/grandfather_not_implementing_index_provider
index 5d4abad..20c1792 100644
--- a/tests/robotests/assets/grandfather_not_implementing_index_provider
+++ b/tests/robotests/assets/grandfather_not_implementing_index_provider
@@ -7,6 +7,7 @@
com.android.settings.accessibility.ToggleSelectToSpeakPreferenceFragmentForSetupWizard
com.android.settings.accounts.AccountDetailDashboardFragment
com.android.settings.accounts.AccountSyncSettings
+com.android.settings.accounts.ChooseAccountFragment
com.android.settings.applications.appinfo.AppInfoDashboardFragment
com.android.settings.applications.appinfo.DrawOverlayDetails
com.android.settings.applications.appinfo.ExternalSourcesDetails
@@ -77,10 +78,10 @@
com.android.settings.vpn2.AppManagementFragment
com.android.settings.vpn2.VpnSettings
com.android.settings.wallpaper.WallpaperTypeSettings
-com.android.settings.wifi.calling.WifiCallingSettingsForSub
com.android.settings.wifi.ChangeWifiStateDetails
+com.android.settings.wifi.calling.WifiCallingSettingsForSub
com.android.settings.wifi.details.WifiNetworkDetailsFragment
+com.android.settings.wifi.dpp.WifiNetworkListFragment
com.android.settings.wifi.p2p.WifiP2pSettings
com.android.settings.wifi.savedaccesspoints.SavedAccessPointsWifiSettings
-com.android.settings.wifi.WifiInfo
-com.android.settings.wifi.dpp.WifiNetworkListFragment
+com.android.settings.wifi.WifiInfo
\ No newline at end of file
diff --git a/tests/robotests/assets/grandfather_slice_controller_not_in_xml b/tests/robotests/assets/grandfather_slice_controller_not_in_xml
index fd1cef2..55ecffe 100644
--- a/tests/robotests/assets/grandfather_slice_controller_not_in_xml
+++ b/tests/robotests/assets/grandfather_slice_controller_not_in_xml
@@ -1,7 +1,9 @@
+com.android.settings.accessibility.AccessibilitySlicePreferenceController
+com.android.settings.core.TogglePreferenceControllerTest$FakeToggle
+com.android.settings.biometrics.face.FaceSettingsAttentionPreferenceController
+com.android.settings.network.telephony.MmsMessagePreferenceController
+com.android.settings.network.telephony.DataDuringCallsPreferenceController
com.android.settings.testutils.FakeToggleController
com.android.settings.testutils.FakeSliderController
com.android.settings.testutils.FakeInvalidSliderController
-com.android.settings.core.TogglePreferenceControllerTest$FakeToggle
-com.android.settings.accessibility.AccessibilitySlicePreferenceController
-com.android.settings.network.telephony.MmsMessagePreferenceController
-com.android.settings.network.telephony.DataDuringCallsPreferenceController
+
diff --git a/tests/robotests/res/values-af/config.xml b/tests/robotests/res/values-af/config.xml
deleted file mode 100644
index 98b33cc..0000000
--- a/tests/robotests/res/values-af/config.xml
+++ /dev/null
@@ -1,21 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="config_work_policy_info_intent_action" msgid="246568924991550952">"ACTION_SHOW_WORK_POLICY_INFO"</string>
-</resources>
diff --git a/tests/robotests/res/values-am/config.xml b/tests/robotests/res/values-am/config.xml
deleted file mode 100644
index 98b33cc..0000000
--- a/tests/robotests/res/values-am/config.xml
+++ /dev/null
@@ -1,21 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="config_work_policy_info_intent_action" msgid="246568924991550952">"ACTION_SHOW_WORK_POLICY_INFO"</string>
-</resources>
diff --git a/tests/robotests/res/values-ar/config.xml b/tests/robotests/res/values-ar/config.xml
deleted file mode 100644
index 98b33cc..0000000
--- a/tests/robotests/res/values-ar/config.xml
+++ /dev/null
@@ -1,21 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="config_work_policy_info_intent_action" msgid="246568924991550952">"ACTION_SHOW_WORK_POLICY_INFO"</string>
-</resources>
diff --git a/tests/robotests/res/values-as/config.xml b/tests/robotests/res/values-as/config.xml
deleted file mode 100644
index 98b33cc..0000000
--- a/tests/robotests/res/values-as/config.xml
+++ /dev/null
@@ -1,21 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="config_work_policy_info_intent_action" msgid="246568924991550952">"ACTION_SHOW_WORK_POLICY_INFO"</string>
-</resources>
diff --git a/tests/robotests/res/values-az/config.xml b/tests/robotests/res/values-az/config.xml
deleted file mode 100644
index 98b33cc..0000000
--- a/tests/robotests/res/values-az/config.xml
+++ /dev/null
@@ -1,21 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="config_work_policy_info_intent_action" msgid="246568924991550952">"ACTION_SHOW_WORK_POLICY_INFO"</string>
-</resources>
diff --git a/tests/robotests/res/values-b+sr+Latn/config.xml b/tests/robotests/res/values-b+sr+Latn/config.xml
deleted file mode 100644
index 98b33cc..0000000
--- a/tests/robotests/res/values-b+sr+Latn/config.xml
+++ /dev/null
@@ -1,21 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="config_work_policy_info_intent_action" msgid="246568924991550952">"ACTION_SHOW_WORK_POLICY_INFO"</string>
-</resources>
diff --git a/tests/robotests/res/values-be/config.xml b/tests/robotests/res/values-be/config.xml
deleted file mode 100644
index 98b33cc..0000000
--- a/tests/robotests/res/values-be/config.xml
+++ /dev/null
@@ -1,21 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="config_work_policy_info_intent_action" msgid="246568924991550952">"ACTION_SHOW_WORK_POLICY_INFO"</string>
-</resources>
diff --git a/tests/robotests/res/values-bg/config.xml b/tests/robotests/res/values-bg/config.xml
deleted file mode 100644
index 98b33cc..0000000
--- a/tests/robotests/res/values-bg/config.xml
+++ /dev/null
@@ -1,21 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="config_work_policy_info_intent_action" msgid="246568924991550952">"ACTION_SHOW_WORK_POLICY_INFO"</string>
-</resources>
diff --git a/tests/robotests/res/values-bn/config.xml b/tests/robotests/res/values-bn/config.xml
deleted file mode 100644
index 98b33cc..0000000
--- a/tests/robotests/res/values-bn/config.xml
+++ /dev/null
@@ -1,21 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="config_work_policy_info_intent_action" msgid="246568924991550952">"ACTION_SHOW_WORK_POLICY_INFO"</string>
-</resources>
diff --git a/tests/robotests/res/values-bs/config.xml b/tests/robotests/res/values-bs/config.xml
deleted file mode 100644
index 98b33cc..0000000
--- a/tests/robotests/res/values-bs/config.xml
+++ /dev/null
@@ -1,21 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="config_work_policy_info_intent_action" msgid="246568924991550952">"ACTION_SHOW_WORK_POLICY_INFO"</string>
-</resources>
diff --git a/tests/robotests/res/values-ca/config.xml b/tests/robotests/res/values-ca/config.xml
deleted file mode 100644
index 98b33cc..0000000
--- a/tests/robotests/res/values-ca/config.xml
+++ /dev/null
@@ -1,21 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="config_work_policy_info_intent_action" msgid="246568924991550952">"ACTION_SHOW_WORK_POLICY_INFO"</string>
-</resources>
diff --git a/tests/robotests/res/values-cs/config.xml b/tests/robotests/res/values-cs/config.xml
deleted file mode 100644
index 98b33cc..0000000
--- a/tests/robotests/res/values-cs/config.xml
+++ /dev/null
@@ -1,21 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="config_work_policy_info_intent_action" msgid="246568924991550952">"ACTION_SHOW_WORK_POLICY_INFO"</string>
-</resources>
diff --git a/tests/robotests/res/values-da/config.xml b/tests/robotests/res/values-da/config.xml
deleted file mode 100644
index 98b33cc..0000000
--- a/tests/robotests/res/values-da/config.xml
+++ /dev/null
@@ -1,21 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="config_work_policy_info_intent_action" msgid="246568924991550952">"ACTION_SHOW_WORK_POLICY_INFO"</string>
-</resources>
diff --git a/tests/robotests/res/values-de/config.xml b/tests/robotests/res/values-de/config.xml
deleted file mode 100644
index 98b33cc..0000000
--- a/tests/robotests/res/values-de/config.xml
+++ /dev/null
@@ -1,21 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="config_work_policy_info_intent_action" msgid="246568924991550952">"ACTION_SHOW_WORK_POLICY_INFO"</string>
-</resources>
diff --git a/tests/robotests/res/values-el/config.xml b/tests/robotests/res/values-el/config.xml
deleted file mode 100644
index 98b33cc..0000000
--- a/tests/robotests/res/values-el/config.xml
+++ /dev/null
@@ -1,21 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="config_work_policy_info_intent_action" msgid="246568924991550952">"ACTION_SHOW_WORK_POLICY_INFO"</string>
-</resources>
diff --git a/tests/robotests/res/values-en-rAU/config.xml b/tests/robotests/res/values-en-rAU/config.xml
deleted file mode 100644
index 98b33cc..0000000
--- a/tests/robotests/res/values-en-rAU/config.xml
+++ /dev/null
@@ -1,21 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="config_work_policy_info_intent_action" msgid="246568924991550952">"ACTION_SHOW_WORK_POLICY_INFO"</string>
-</resources>
diff --git a/tests/robotests/res/values-en-rCA/config.xml b/tests/robotests/res/values-en-rCA/config.xml
deleted file mode 100644
index 98b33cc..0000000
--- a/tests/robotests/res/values-en-rCA/config.xml
+++ /dev/null
@@ -1,21 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="config_work_policy_info_intent_action" msgid="246568924991550952">"ACTION_SHOW_WORK_POLICY_INFO"</string>
-</resources>
diff --git a/tests/robotests/res/values-en-rGB/config.xml b/tests/robotests/res/values-en-rGB/config.xml
deleted file mode 100644
index 98b33cc..0000000
--- a/tests/robotests/res/values-en-rGB/config.xml
+++ /dev/null
@@ -1,21 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="config_work_policy_info_intent_action" msgid="246568924991550952">"ACTION_SHOW_WORK_POLICY_INFO"</string>
-</resources>
diff --git a/tests/robotests/res/values-en-rIN/config.xml b/tests/robotests/res/values-en-rIN/config.xml
deleted file mode 100644
index 98b33cc..0000000
--- a/tests/robotests/res/values-en-rIN/config.xml
+++ /dev/null
@@ -1,21 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="config_work_policy_info_intent_action" msgid="246568924991550952">"ACTION_SHOW_WORK_POLICY_INFO"</string>
-</resources>
diff --git a/tests/robotests/res/values-en-rXC/config.xml b/tests/robotests/res/values-en-rXC/config.xml
deleted file mode 100644
index 2bc5fbf..0000000
--- a/tests/robotests/res/values-en-rXC/config.xml
+++ /dev/null
@@ -1,21 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="config_work_policy_info_intent_action" msgid="246568924991550952">"ACTION_SHOW_WORK_POLICY_INFO"</string>
-</resources>
diff --git a/tests/robotests/res/values-es-rUS/config.xml b/tests/robotests/res/values-es-rUS/config.xml
deleted file mode 100644
index 98b33cc..0000000
--- a/tests/robotests/res/values-es-rUS/config.xml
+++ /dev/null
@@ -1,21 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="config_work_policy_info_intent_action" msgid="246568924991550952">"ACTION_SHOW_WORK_POLICY_INFO"</string>
-</resources>
diff --git a/tests/robotests/res/values-es/config.xml b/tests/robotests/res/values-es/config.xml
deleted file mode 100644
index 98b33cc..0000000
--- a/tests/robotests/res/values-es/config.xml
+++ /dev/null
@@ -1,21 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="config_work_policy_info_intent_action" msgid="246568924991550952">"ACTION_SHOW_WORK_POLICY_INFO"</string>
-</resources>
diff --git a/tests/robotests/res/values-et/config.xml b/tests/robotests/res/values-et/config.xml
deleted file mode 100644
index 98b33cc..0000000
--- a/tests/robotests/res/values-et/config.xml
+++ /dev/null
@@ -1,21 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="config_work_policy_info_intent_action" msgid="246568924991550952">"ACTION_SHOW_WORK_POLICY_INFO"</string>
-</resources>
diff --git a/tests/robotests/res/values-eu/config.xml b/tests/robotests/res/values-eu/config.xml
deleted file mode 100644
index 98b33cc..0000000
--- a/tests/robotests/res/values-eu/config.xml
+++ /dev/null
@@ -1,21 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="config_work_policy_info_intent_action" msgid="246568924991550952">"ACTION_SHOW_WORK_POLICY_INFO"</string>
-</resources>
diff --git a/tests/robotests/res/values-fa/config.xml b/tests/robotests/res/values-fa/config.xml
deleted file mode 100644
index 98b33cc..0000000
--- a/tests/robotests/res/values-fa/config.xml
+++ /dev/null
@@ -1,21 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="config_work_policy_info_intent_action" msgid="246568924991550952">"ACTION_SHOW_WORK_POLICY_INFO"</string>
-</resources>
diff --git a/tests/robotests/res/values-fi/config.xml b/tests/robotests/res/values-fi/config.xml
deleted file mode 100644
index 98b33cc..0000000
--- a/tests/robotests/res/values-fi/config.xml
+++ /dev/null
@@ -1,21 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="config_work_policy_info_intent_action" msgid="246568924991550952">"ACTION_SHOW_WORK_POLICY_INFO"</string>
-</resources>
diff --git a/tests/robotests/res/values-fr-rCA/config.xml b/tests/robotests/res/values-fr-rCA/config.xml
deleted file mode 100644
index 98b33cc..0000000
--- a/tests/robotests/res/values-fr-rCA/config.xml
+++ /dev/null
@@ -1,21 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="config_work_policy_info_intent_action" msgid="246568924991550952">"ACTION_SHOW_WORK_POLICY_INFO"</string>
-</resources>
diff --git a/tests/robotests/res/values-fr/config.xml b/tests/robotests/res/values-fr/config.xml
deleted file mode 100644
index 98b33cc..0000000
--- a/tests/robotests/res/values-fr/config.xml
+++ /dev/null
@@ -1,21 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="config_work_policy_info_intent_action" msgid="246568924991550952">"ACTION_SHOW_WORK_POLICY_INFO"</string>
-</resources>
diff --git a/tests/robotests/res/values-gl/config.xml b/tests/robotests/res/values-gl/config.xml
deleted file mode 100644
index 98b33cc..0000000
--- a/tests/robotests/res/values-gl/config.xml
+++ /dev/null
@@ -1,21 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="config_work_policy_info_intent_action" msgid="246568924991550952">"ACTION_SHOW_WORK_POLICY_INFO"</string>
-</resources>
diff --git a/tests/robotests/res/values-gu/config.xml b/tests/robotests/res/values-gu/config.xml
deleted file mode 100644
index 98b33cc..0000000
--- a/tests/robotests/res/values-gu/config.xml
+++ /dev/null
@@ -1,21 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="config_work_policy_info_intent_action" msgid="246568924991550952">"ACTION_SHOW_WORK_POLICY_INFO"</string>
-</resources>
diff --git a/tests/robotests/res/values-hi/config.xml b/tests/robotests/res/values-hi/config.xml
deleted file mode 100644
index 98b33cc..0000000
--- a/tests/robotests/res/values-hi/config.xml
+++ /dev/null
@@ -1,21 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="config_work_policy_info_intent_action" msgid="246568924991550952">"ACTION_SHOW_WORK_POLICY_INFO"</string>
-</resources>
diff --git a/tests/robotests/res/values-hr/config.xml b/tests/robotests/res/values-hr/config.xml
deleted file mode 100644
index 98b33cc..0000000
--- a/tests/robotests/res/values-hr/config.xml
+++ /dev/null
@@ -1,21 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="config_work_policy_info_intent_action" msgid="246568924991550952">"ACTION_SHOW_WORK_POLICY_INFO"</string>
-</resources>
diff --git a/tests/robotests/res/values-hu/config.xml b/tests/robotests/res/values-hu/config.xml
deleted file mode 100644
index 98b33cc..0000000
--- a/tests/robotests/res/values-hu/config.xml
+++ /dev/null
@@ -1,21 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="config_work_policy_info_intent_action" msgid="246568924991550952">"ACTION_SHOW_WORK_POLICY_INFO"</string>
-</resources>
diff --git a/tests/robotests/res/values-hy/config.xml b/tests/robotests/res/values-hy/config.xml
deleted file mode 100644
index 98b33cc..0000000
--- a/tests/robotests/res/values-hy/config.xml
+++ /dev/null
@@ -1,21 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="config_work_policy_info_intent_action" msgid="246568924991550952">"ACTION_SHOW_WORK_POLICY_INFO"</string>
-</resources>
diff --git a/tests/robotests/res/values-in/config.xml b/tests/robotests/res/values-in/config.xml
deleted file mode 100644
index 98b33cc..0000000
--- a/tests/robotests/res/values-in/config.xml
+++ /dev/null
@@ -1,21 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="config_work_policy_info_intent_action" msgid="246568924991550952">"ACTION_SHOW_WORK_POLICY_INFO"</string>
-</resources>
diff --git a/tests/robotests/res/values-is/config.xml b/tests/robotests/res/values-is/config.xml
deleted file mode 100644
index 98b33cc..0000000
--- a/tests/robotests/res/values-is/config.xml
+++ /dev/null
@@ -1,21 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="config_work_policy_info_intent_action" msgid="246568924991550952">"ACTION_SHOW_WORK_POLICY_INFO"</string>
-</resources>
diff --git a/tests/robotests/res/values-it/config.xml b/tests/robotests/res/values-it/config.xml
deleted file mode 100644
index 98b33cc..0000000
--- a/tests/robotests/res/values-it/config.xml
+++ /dev/null
@@ -1,21 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="config_work_policy_info_intent_action" msgid="246568924991550952">"ACTION_SHOW_WORK_POLICY_INFO"</string>
-</resources>
diff --git a/tests/robotests/res/values-iw/config.xml b/tests/robotests/res/values-iw/config.xml
deleted file mode 100644
index 98b33cc..0000000
--- a/tests/robotests/res/values-iw/config.xml
+++ /dev/null
@@ -1,21 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="config_work_policy_info_intent_action" msgid="246568924991550952">"ACTION_SHOW_WORK_POLICY_INFO"</string>
-</resources>
diff --git a/tests/robotests/res/values-ja/config.xml b/tests/robotests/res/values-ja/config.xml
deleted file mode 100644
index 544445f..0000000
--- a/tests/robotests/res/values-ja/config.xml
+++ /dev/null
@@ -1,21 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="config_work_policy_info_intent_action" msgid="246568924991550952">"仕事に関するポリシーの情報を表示するアクション"</string>
-</resources>
diff --git a/tests/robotests/res/values-ka/config.xml b/tests/robotests/res/values-ka/config.xml
deleted file mode 100644
index 98b33cc..0000000
--- a/tests/robotests/res/values-ka/config.xml
+++ /dev/null
@@ -1,21 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="config_work_policy_info_intent_action" msgid="246568924991550952">"ACTION_SHOW_WORK_POLICY_INFO"</string>
-</resources>
diff --git a/tests/robotests/res/values-kk/config.xml b/tests/robotests/res/values-kk/config.xml
deleted file mode 100644
index 98b33cc..0000000
--- a/tests/robotests/res/values-kk/config.xml
+++ /dev/null
@@ -1,21 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="config_work_policy_info_intent_action" msgid="246568924991550952">"ACTION_SHOW_WORK_POLICY_INFO"</string>
-</resources>
diff --git a/tests/robotests/res/values-km/config.xml b/tests/robotests/res/values-km/config.xml
deleted file mode 100644
index 98b33cc..0000000
--- a/tests/robotests/res/values-km/config.xml
+++ /dev/null
@@ -1,21 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="config_work_policy_info_intent_action" msgid="246568924991550952">"ACTION_SHOW_WORK_POLICY_INFO"</string>
-</resources>
diff --git a/tests/robotests/res/values-kn/config.xml b/tests/robotests/res/values-kn/config.xml
deleted file mode 100644
index 98b33cc..0000000
--- a/tests/robotests/res/values-kn/config.xml
+++ /dev/null
@@ -1,21 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="config_work_policy_info_intent_action" msgid="246568924991550952">"ACTION_SHOW_WORK_POLICY_INFO"</string>
-</resources>
diff --git a/tests/robotests/res/values-ko/config.xml b/tests/robotests/res/values-ko/config.xml
deleted file mode 100644
index 98b33cc..0000000
--- a/tests/robotests/res/values-ko/config.xml
+++ /dev/null
@@ -1,21 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="config_work_policy_info_intent_action" msgid="246568924991550952">"ACTION_SHOW_WORK_POLICY_INFO"</string>
-</resources>
diff --git a/tests/robotests/res/values-ky/config.xml b/tests/robotests/res/values-ky/config.xml
deleted file mode 100644
index 98b33cc..0000000
--- a/tests/robotests/res/values-ky/config.xml
+++ /dev/null
@@ -1,21 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="config_work_policy_info_intent_action" msgid="246568924991550952">"ACTION_SHOW_WORK_POLICY_INFO"</string>
-</resources>
diff --git a/tests/robotests/res/values-lo/config.xml b/tests/robotests/res/values-lo/config.xml
deleted file mode 100644
index 98b33cc..0000000
--- a/tests/robotests/res/values-lo/config.xml
+++ /dev/null
@@ -1,21 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="config_work_policy_info_intent_action" msgid="246568924991550952">"ACTION_SHOW_WORK_POLICY_INFO"</string>
-</resources>
diff --git a/tests/robotests/res/values-lt/config.xml b/tests/robotests/res/values-lt/config.xml
deleted file mode 100644
index 98b33cc..0000000
--- a/tests/robotests/res/values-lt/config.xml
+++ /dev/null
@@ -1,21 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="config_work_policy_info_intent_action" msgid="246568924991550952">"ACTION_SHOW_WORK_POLICY_INFO"</string>
-</resources>
diff --git a/tests/robotests/res/values-lv/config.xml b/tests/robotests/res/values-lv/config.xml
deleted file mode 100644
index 98b33cc..0000000
--- a/tests/robotests/res/values-lv/config.xml
+++ /dev/null
@@ -1,21 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="config_work_policy_info_intent_action" msgid="246568924991550952">"ACTION_SHOW_WORK_POLICY_INFO"</string>
-</resources>
diff --git a/tests/robotests/res/values-mcc999-af/config.xml b/tests/robotests/res/values-mcc999-af/config.xml
deleted file mode 100644
index d580909..0000000
--- a/tests/robotests/res/values-mcc999-af/config.xml
+++ /dev/null
@@ -1,21 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="config_grayscale_settings_intent" msgid="4905213640015135149">"voorneme:#Intent;action=test.test;end"</string>
-</resources>
diff --git a/tests/robotests/res/values-mcc999-am/config.xml b/tests/robotests/res/values-mcc999-am/config.xml
deleted file mode 100644
index af1ca58..0000000
--- a/tests/robotests/res/values-mcc999-am/config.xml
+++ /dev/null
@@ -1,21 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="config_grayscale_settings_intent" msgid="4905213640015135149">"intent:#Intent;action=test.test;end"</string>
-</resources>
diff --git a/tests/robotests/res/values-mcc999-ar/config.xml b/tests/robotests/res/values-mcc999-ar/config.xml
deleted file mode 100644
index af1ca58..0000000
--- a/tests/robotests/res/values-mcc999-ar/config.xml
+++ /dev/null
@@ -1,21 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="config_grayscale_settings_intent" msgid="4905213640015135149">"intent:#Intent;action=test.test;end"</string>
-</resources>
diff --git a/tests/robotests/res/values-mcc999-as/config.xml b/tests/robotests/res/values-mcc999-as/config.xml
deleted file mode 100644
index af1ca58..0000000
--- a/tests/robotests/res/values-mcc999-as/config.xml
+++ /dev/null
@@ -1,21 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="config_grayscale_settings_intent" msgid="4905213640015135149">"intent:#Intent;action=test.test;end"</string>
-</resources>
diff --git a/tests/robotests/res/values-mcc999-az/config.xml b/tests/robotests/res/values-mcc999-az/config.xml
deleted file mode 100644
index af1ca58..0000000
--- a/tests/robotests/res/values-mcc999-az/config.xml
+++ /dev/null
@@ -1,21 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="config_grayscale_settings_intent" msgid="4905213640015135149">"intent:#Intent;action=test.test;end"</string>
-</resources>
diff --git a/tests/robotests/res/values-mcc999-b+sr+Latn/config.xml b/tests/robotests/res/values-mcc999-b+sr+Latn/config.xml
deleted file mode 100644
index af1ca58..0000000
--- a/tests/robotests/res/values-mcc999-b+sr+Latn/config.xml
+++ /dev/null
@@ -1,21 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="config_grayscale_settings_intent" msgid="4905213640015135149">"intent:#Intent;action=test.test;end"</string>
-</resources>
diff --git a/tests/robotests/res/values-mcc999-be/config.xml b/tests/robotests/res/values-mcc999-be/config.xml
deleted file mode 100644
index af1ca58..0000000
--- a/tests/robotests/res/values-mcc999-be/config.xml
+++ /dev/null
@@ -1,21 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="config_grayscale_settings_intent" msgid="4905213640015135149">"intent:#Intent;action=test.test;end"</string>
-</resources>
diff --git a/tests/robotests/res/values-mcc999-bg/config.xml b/tests/robotests/res/values-mcc999-bg/config.xml
deleted file mode 100644
index af1ca58..0000000
--- a/tests/robotests/res/values-mcc999-bg/config.xml
+++ /dev/null
@@ -1,21 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="config_grayscale_settings_intent" msgid="4905213640015135149">"intent:#Intent;action=test.test;end"</string>
-</resources>
diff --git a/tests/robotests/res/values-mcc999-bn/config.xml b/tests/robotests/res/values-mcc999-bn/config.xml
deleted file mode 100644
index af1ca58..0000000
--- a/tests/robotests/res/values-mcc999-bn/config.xml
+++ /dev/null
@@ -1,21 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="config_grayscale_settings_intent" msgid="4905213640015135149">"intent:#Intent;action=test.test;end"</string>
-</resources>
diff --git a/tests/robotests/res/values-mcc999-bs/config.xml b/tests/robotests/res/values-mcc999-bs/config.xml
deleted file mode 100644
index af1ca58..0000000
--- a/tests/robotests/res/values-mcc999-bs/config.xml
+++ /dev/null
@@ -1,21 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="config_grayscale_settings_intent" msgid="4905213640015135149">"intent:#Intent;action=test.test;end"</string>
-</resources>
diff --git a/tests/robotests/res/values-mcc999-ca/config.xml b/tests/robotests/res/values-mcc999-ca/config.xml
deleted file mode 100644
index af1ca58..0000000
--- a/tests/robotests/res/values-mcc999-ca/config.xml
+++ /dev/null
@@ -1,21 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="config_grayscale_settings_intent" msgid="4905213640015135149">"intent:#Intent;action=test.test;end"</string>
-</resources>
diff --git a/tests/robotests/res/values-mcc999-cs/config.xml b/tests/robotests/res/values-mcc999-cs/config.xml
deleted file mode 100644
index af1ca58..0000000
--- a/tests/robotests/res/values-mcc999-cs/config.xml
+++ /dev/null
@@ -1,21 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="config_grayscale_settings_intent" msgid="4905213640015135149">"intent:#Intent;action=test.test;end"</string>
-</resources>
diff --git a/tests/robotests/res/values-mcc999-da/config.xml b/tests/robotests/res/values-mcc999-da/config.xml
deleted file mode 100644
index af1ca58..0000000
--- a/tests/robotests/res/values-mcc999-da/config.xml
+++ /dev/null
@@ -1,21 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="config_grayscale_settings_intent" msgid="4905213640015135149">"intent:#Intent;action=test.test;end"</string>
-</resources>
diff --git a/tests/robotests/res/values-mcc999-de/config.xml b/tests/robotests/res/values-mcc999-de/config.xml
deleted file mode 100644
index af1ca58..0000000
--- a/tests/robotests/res/values-mcc999-de/config.xml
+++ /dev/null
@@ -1,21 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="config_grayscale_settings_intent" msgid="4905213640015135149">"intent:#Intent;action=test.test;end"</string>
-</resources>
diff --git a/tests/robotests/res/values-mcc999-el/config.xml b/tests/robotests/res/values-mcc999-el/config.xml
deleted file mode 100644
index af1ca58..0000000
--- a/tests/robotests/res/values-mcc999-el/config.xml
+++ /dev/null
@@ -1,21 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="config_grayscale_settings_intent" msgid="4905213640015135149">"intent:#Intent;action=test.test;end"</string>
-</resources>
diff --git a/tests/robotests/res/values-mcc999-en-rAU/config.xml b/tests/robotests/res/values-mcc999-en-rAU/config.xml
deleted file mode 100644
index af1ca58..0000000
--- a/tests/robotests/res/values-mcc999-en-rAU/config.xml
+++ /dev/null
@@ -1,21 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="config_grayscale_settings_intent" msgid="4905213640015135149">"intent:#Intent;action=test.test;end"</string>
-</resources>
diff --git a/tests/robotests/res/values-mcc999-en-rCA/config.xml b/tests/robotests/res/values-mcc999-en-rCA/config.xml
deleted file mode 100644
index af1ca58..0000000
--- a/tests/robotests/res/values-mcc999-en-rCA/config.xml
+++ /dev/null
@@ -1,21 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="config_grayscale_settings_intent" msgid="4905213640015135149">"intent:#Intent;action=test.test;end"</string>
-</resources>
diff --git a/tests/robotests/res/values-mcc999-en-rGB/config.xml b/tests/robotests/res/values-mcc999-en-rGB/config.xml
deleted file mode 100644
index af1ca58..0000000
--- a/tests/robotests/res/values-mcc999-en-rGB/config.xml
+++ /dev/null
@@ -1,21 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="config_grayscale_settings_intent" msgid="4905213640015135149">"intent:#Intent;action=test.test;end"</string>
-</resources>
diff --git a/tests/robotests/res/values-mcc999-en-rIN/config.xml b/tests/robotests/res/values-mcc999-en-rIN/config.xml
deleted file mode 100644
index af1ca58..0000000
--- a/tests/robotests/res/values-mcc999-en-rIN/config.xml
+++ /dev/null
@@ -1,21 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="config_grayscale_settings_intent" msgid="4905213640015135149">"intent:#Intent;action=test.test;end"</string>
-</resources>
diff --git a/tests/robotests/res/values-mcc999-en-rXC/config.xml b/tests/robotests/res/values-mcc999-en-rXC/config.xml
deleted file mode 100644
index d2b910a..0000000
--- a/tests/robotests/res/values-mcc999-en-rXC/config.xml
+++ /dev/null
@@ -1,21 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="config_grayscale_settings_intent" msgid="4905213640015135149">"intent:#Intent;action=test.test;end"</string>
-</resources>
diff --git a/tests/robotests/res/values-mcc999-es-rUS/config.xml b/tests/robotests/res/values-mcc999-es-rUS/config.xml
deleted file mode 100644
index af1ca58..0000000
--- a/tests/robotests/res/values-mcc999-es-rUS/config.xml
+++ /dev/null
@@ -1,21 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="config_grayscale_settings_intent" msgid="4905213640015135149">"intent:#Intent;action=test.test;end"</string>
-</resources>
diff --git a/tests/robotests/res/values-mcc999-es/config.xml b/tests/robotests/res/values-mcc999-es/config.xml
deleted file mode 100644
index af1ca58..0000000
--- a/tests/robotests/res/values-mcc999-es/config.xml
+++ /dev/null
@@ -1,21 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="config_grayscale_settings_intent" msgid="4905213640015135149">"intent:#Intent;action=test.test;end"</string>
-</resources>
diff --git a/tests/robotests/res/values-mcc999-et/config.xml b/tests/robotests/res/values-mcc999-et/config.xml
deleted file mode 100644
index af1ca58..0000000
--- a/tests/robotests/res/values-mcc999-et/config.xml
+++ /dev/null
@@ -1,21 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="config_grayscale_settings_intent" msgid="4905213640015135149">"intent:#Intent;action=test.test;end"</string>
-</resources>
diff --git a/tests/robotests/res/values-mcc999-eu/config.xml b/tests/robotests/res/values-mcc999-eu/config.xml
deleted file mode 100644
index af1ca58..0000000
--- a/tests/robotests/res/values-mcc999-eu/config.xml
+++ /dev/null
@@ -1,21 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="config_grayscale_settings_intent" msgid="4905213640015135149">"intent:#Intent;action=test.test;end"</string>
-</resources>
diff --git a/tests/robotests/res/values-mcc999-fa/config.xml b/tests/robotests/res/values-mcc999-fa/config.xml
deleted file mode 100644
index af1ca58..0000000
--- a/tests/robotests/res/values-mcc999-fa/config.xml
+++ /dev/null
@@ -1,21 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="config_grayscale_settings_intent" msgid="4905213640015135149">"intent:#Intent;action=test.test;end"</string>
-</resources>
diff --git a/tests/robotests/res/values-mcc999-fi/config.xml b/tests/robotests/res/values-mcc999-fi/config.xml
deleted file mode 100644
index af1ca58..0000000
--- a/tests/robotests/res/values-mcc999-fi/config.xml
+++ /dev/null
@@ -1,21 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="config_grayscale_settings_intent" msgid="4905213640015135149">"intent:#Intent;action=test.test;end"</string>
-</resources>
diff --git a/tests/robotests/res/values-mcc999-fr-rCA/config.xml b/tests/robotests/res/values-mcc999-fr-rCA/config.xml
deleted file mode 100644
index af1ca58..0000000
--- a/tests/robotests/res/values-mcc999-fr-rCA/config.xml
+++ /dev/null
@@ -1,21 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="config_grayscale_settings_intent" msgid="4905213640015135149">"intent:#Intent;action=test.test;end"</string>
-</resources>
diff --git a/tests/robotests/res/values-mcc999-fr/config.xml b/tests/robotests/res/values-mcc999-fr/config.xml
deleted file mode 100644
index af1ca58..0000000
--- a/tests/robotests/res/values-mcc999-fr/config.xml
+++ /dev/null
@@ -1,21 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="config_grayscale_settings_intent" msgid="4905213640015135149">"intent:#Intent;action=test.test;end"</string>
-</resources>
diff --git a/tests/robotests/res/values-mcc999-gl/config.xml b/tests/robotests/res/values-mcc999-gl/config.xml
deleted file mode 100644
index af1ca58..0000000
--- a/tests/robotests/res/values-mcc999-gl/config.xml
+++ /dev/null
@@ -1,21 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="config_grayscale_settings_intent" msgid="4905213640015135149">"intent:#Intent;action=test.test;end"</string>
-</resources>
diff --git a/tests/robotests/res/values-mcc999-gu/config.xml b/tests/robotests/res/values-mcc999-gu/config.xml
deleted file mode 100644
index 420b771..0000000
--- a/tests/robotests/res/values-mcc999-gu/config.xml
+++ /dev/null
@@ -1,21 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="config_grayscale_settings_intent" msgid="4905213640015135149">"ઇન્ટેન્ટ:#Intent;action=test.test;end"</string>
-</resources>
diff --git a/tests/robotests/res/values-mcc999-hi/config.xml b/tests/robotests/res/values-mcc999-hi/config.xml
deleted file mode 100644
index af1ca58..0000000
--- a/tests/robotests/res/values-mcc999-hi/config.xml
+++ /dev/null
@@ -1,21 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="config_grayscale_settings_intent" msgid="4905213640015135149">"intent:#Intent;action=test.test;end"</string>
-</resources>
diff --git a/tests/robotests/res/values-mcc999-hr/config.xml b/tests/robotests/res/values-mcc999-hr/config.xml
deleted file mode 100644
index af1ca58..0000000
--- a/tests/robotests/res/values-mcc999-hr/config.xml
+++ /dev/null
@@ -1,21 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="config_grayscale_settings_intent" msgid="4905213640015135149">"intent:#Intent;action=test.test;end"</string>
-</resources>
diff --git a/tests/robotests/res/values-mcc999-hu/config.xml b/tests/robotests/res/values-mcc999-hu/config.xml
deleted file mode 100644
index af1ca58..0000000
--- a/tests/robotests/res/values-mcc999-hu/config.xml
+++ /dev/null
@@ -1,21 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="config_grayscale_settings_intent" msgid="4905213640015135149">"intent:#Intent;action=test.test;end"</string>
-</resources>
diff --git a/tests/robotests/res/values-mcc999-hy/config.xml b/tests/robotests/res/values-mcc999-hy/config.xml
deleted file mode 100644
index af1ca58..0000000
--- a/tests/robotests/res/values-mcc999-hy/config.xml
+++ /dev/null
@@ -1,21 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="config_grayscale_settings_intent" msgid="4905213640015135149">"intent:#Intent;action=test.test;end"</string>
-</resources>
diff --git a/tests/robotests/res/values-mcc999-in/config.xml b/tests/robotests/res/values-mcc999-in/config.xml
deleted file mode 100644
index af1ca58..0000000
--- a/tests/robotests/res/values-mcc999-in/config.xml
+++ /dev/null
@@ -1,21 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="config_grayscale_settings_intent" msgid="4905213640015135149">"intent:#Intent;action=test.test;end"</string>
-</resources>
diff --git a/tests/robotests/res/values-mcc999-is/config.xml b/tests/robotests/res/values-mcc999-is/config.xml
deleted file mode 100644
index af1ca58..0000000
--- a/tests/robotests/res/values-mcc999-is/config.xml
+++ /dev/null
@@ -1,21 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="config_grayscale_settings_intent" msgid="4905213640015135149">"intent:#Intent;action=test.test;end"</string>
-</resources>
diff --git a/tests/robotests/res/values-mcc999-it/config.xml b/tests/robotests/res/values-mcc999-it/config.xml
deleted file mode 100644
index af1ca58..0000000
--- a/tests/robotests/res/values-mcc999-it/config.xml
+++ /dev/null
@@ -1,21 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="config_grayscale_settings_intent" msgid="4905213640015135149">"intent:#Intent;action=test.test;end"</string>
-</resources>
diff --git a/tests/robotests/res/values-mcc999-iw/config.xml b/tests/robotests/res/values-mcc999-iw/config.xml
deleted file mode 100644
index af1ca58..0000000
--- a/tests/robotests/res/values-mcc999-iw/config.xml
+++ /dev/null
@@ -1,21 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="config_grayscale_settings_intent" msgid="4905213640015135149">"intent:#Intent;action=test.test;end"</string>
-</resources>
diff --git a/tests/robotests/res/values-mcc999-ja/config.xml b/tests/robotests/res/values-mcc999-ja/config.xml
deleted file mode 100644
index af1ca58..0000000
--- a/tests/robotests/res/values-mcc999-ja/config.xml
+++ /dev/null
@@ -1,21 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="config_grayscale_settings_intent" msgid="4905213640015135149">"intent:#Intent;action=test.test;end"</string>
-</resources>
diff --git a/tests/robotests/res/values-mcc999-ka/config.xml b/tests/robotests/res/values-mcc999-ka/config.xml
deleted file mode 100644
index af1ca58..0000000
--- a/tests/robotests/res/values-mcc999-ka/config.xml
+++ /dev/null
@@ -1,21 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="config_grayscale_settings_intent" msgid="4905213640015135149">"intent:#Intent;action=test.test;end"</string>
-</resources>
diff --git a/tests/robotests/res/values-mcc999-kk/config.xml b/tests/robotests/res/values-mcc999-kk/config.xml
deleted file mode 100644
index af1ca58..0000000
--- a/tests/robotests/res/values-mcc999-kk/config.xml
+++ /dev/null
@@ -1,21 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="config_grayscale_settings_intent" msgid="4905213640015135149">"intent:#Intent;action=test.test;end"</string>
-</resources>
diff --git a/tests/robotests/res/values-mcc999-km/config.xml b/tests/robotests/res/values-mcc999-km/config.xml
deleted file mode 100644
index af1ca58..0000000
--- a/tests/robotests/res/values-mcc999-km/config.xml
+++ /dev/null
@@ -1,21 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="config_grayscale_settings_intent" msgid="4905213640015135149">"intent:#Intent;action=test.test;end"</string>
-</resources>
diff --git a/tests/robotests/res/values-mcc999-kn/config.xml b/tests/robotests/res/values-mcc999-kn/config.xml
deleted file mode 100644
index af1ca58..0000000
--- a/tests/robotests/res/values-mcc999-kn/config.xml
+++ /dev/null
@@ -1,21 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="config_grayscale_settings_intent" msgid="4905213640015135149">"intent:#Intent;action=test.test;end"</string>
-</resources>
diff --git a/tests/robotests/res/values-mcc999-ko/config.xml b/tests/robotests/res/values-mcc999-ko/config.xml
deleted file mode 100644
index af1ca58..0000000
--- a/tests/robotests/res/values-mcc999-ko/config.xml
+++ /dev/null
@@ -1,21 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="config_grayscale_settings_intent" msgid="4905213640015135149">"intent:#Intent;action=test.test;end"</string>
-</resources>
diff --git a/tests/robotests/res/values-mcc999-ky/config.xml b/tests/robotests/res/values-mcc999-ky/config.xml
deleted file mode 100644
index af1ca58..0000000
--- a/tests/robotests/res/values-mcc999-ky/config.xml
+++ /dev/null
@@ -1,21 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="config_grayscale_settings_intent" msgid="4905213640015135149">"intent:#Intent;action=test.test;end"</string>
-</resources>
diff --git a/tests/robotests/res/values-mcc999-lo/config.xml b/tests/robotests/res/values-mcc999-lo/config.xml
deleted file mode 100644
index af1ca58..0000000
--- a/tests/robotests/res/values-mcc999-lo/config.xml
+++ /dev/null
@@ -1,21 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="config_grayscale_settings_intent" msgid="4905213640015135149">"intent:#Intent;action=test.test;end"</string>
-</resources>
diff --git a/tests/robotests/res/values-mcc999-lt/config.xml b/tests/robotests/res/values-mcc999-lt/config.xml
deleted file mode 100644
index af1ca58..0000000
--- a/tests/robotests/res/values-mcc999-lt/config.xml
+++ /dev/null
@@ -1,21 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="config_grayscale_settings_intent" msgid="4905213640015135149">"intent:#Intent;action=test.test;end"</string>
-</resources>
diff --git a/tests/robotests/res/values-mcc999-lv/config.xml b/tests/robotests/res/values-mcc999-lv/config.xml
deleted file mode 100644
index af1ca58..0000000
--- a/tests/robotests/res/values-mcc999-lv/config.xml
+++ /dev/null
@@ -1,21 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="config_grayscale_settings_intent" msgid="4905213640015135149">"intent:#Intent;action=test.test;end"</string>
-</resources>
diff --git a/tests/robotests/res/values-mcc999-mk/config.xml b/tests/robotests/res/values-mcc999-mk/config.xml
deleted file mode 100644
index af1ca58..0000000
--- a/tests/robotests/res/values-mcc999-mk/config.xml
+++ /dev/null
@@ -1,21 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="config_grayscale_settings_intent" msgid="4905213640015135149">"intent:#Intent;action=test.test;end"</string>
-</resources>
diff --git a/tests/robotests/res/values-mcc999-ml/config.xml b/tests/robotests/res/values-mcc999-ml/config.xml
deleted file mode 100644
index af1ca58..0000000
--- a/tests/robotests/res/values-mcc999-ml/config.xml
+++ /dev/null
@@ -1,21 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="config_grayscale_settings_intent" msgid="4905213640015135149">"intent:#Intent;action=test.test;end"</string>
-</resources>
diff --git a/tests/robotests/res/values-mcc999-mn/config.xml b/tests/robotests/res/values-mcc999-mn/config.xml
deleted file mode 100644
index ff4010b..0000000
--- a/tests/robotests/res/values-mcc999-mn/config.xml
+++ /dev/null
@@ -1,21 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="config_grayscale_settings_intent" msgid="4905213640015135149">"оролдох:#Intent;action=test.test;end"</string>
-</resources>
diff --git a/tests/robotests/res/values-mcc999-mr/config.xml b/tests/robotests/res/values-mcc999-mr/config.xml
deleted file mode 100644
index af1ca58..0000000
--- a/tests/robotests/res/values-mcc999-mr/config.xml
+++ /dev/null
@@ -1,21 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="config_grayscale_settings_intent" msgid="4905213640015135149">"intent:#Intent;action=test.test;end"</string>
-</resources>
diff --git a/tests/robotests/res/values-mcc999-ms/config.xml b/tests/robotests/res/values-mcc999-ms/config.xml
deleted file mode 100644
index af1ca58..0000000
--- a/tests/robotests/res/values-mcc999-ms/config.xml
+++ /dev/null
@@ -1,21 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="config_grayscale_settings_intent" msgid="4905213640015135149">"intent:#Intent;action=test.test;end"</string>
-</resources>
diff --git a/tests/robotests/res/values-mcc999-my/config.xml b/tests/robotests/res/values-mcc999-my/config.xml
deleted file mode 100644
index af1ca58..0000000
--- a/tests/robotests/res/values-mcc999-my/config.xml
+++ /dev/null
@@ -1,21 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="config_grayscale_settings_intent" msgid="4905213640015135149">"intent:#Intent;action=test.test;end"</string>
-</resources>
diff --git a/tests/robotests/res/values-mcc999-nb/config.xml b/tests/robotests/res/values-mcc999-nb/config.xml
deleted file mode 100644
index af1ca58..0000000
--- a/tests/robotests/res/values-mcc999-nb/config.xml
+++ /dev/null
@@ -1,21 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="config_grayscale_settings_intent" msgid="4905213640015135149">"intent:#Intent;action=test.test;end"</string>
-</resources>
diff --git a/tests/robotests/res/values-mcc999-ne/config.xml b/tests/robotests/res/values-mcc999-ne/config.xml
deleted file mode 100644
index af1ca58..0000000
--- a/tests/robotests/res/values-mcc999-ne/config.xml
+++ /dev/null
@@ -1,21 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="config_grayscale_settings_intent" msgid="4905213640015135149">"intent:#Intent;action=test.test;end"</string>
-</resources>
diff --git a/tests/robotests/res/values-mcc999-nl/config.xml b/tests/robotests/res/values-mcc999-nl/config.xml
deleted file mode 100644
index af1ca58..0000000
--- a/tests/robotests/res/values-mcc999-nl/config.xml
+++ /dev/null
@@ -1,21 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="config_grayscale_settings_intent" msgid="4905213640015135149">"intent:#Intent;action=test.test;end"</string>
-</resources>
diff --git a/tests/robotests/res/values-mcc999-or/config.xml b/tests/robotests/res/values-mcc999-or/config.xml
deleted file mode 100644
index af1ca58..0000000
--- a/tests/robotests/res/values-mcc999-or/config.xml
+++ /dev/null
@@ -1,21 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="config_grayscale_settings_intent" msgid="4905213640015135149">"intent:#Intent;action=test.test;end"</string>
-</resources>
diff --git a/tests/robotests/res/values-mcc999-pa/config.xml b/tests/robotests/res/values-mcc999-pa/config.xml
deleted file mode 100644
index af1ca58..0000000
--- a/tests/robotests/res/values-mcc999-pa/config.xml
+++ /dev/null
@@ -1,21 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="config_grayscale_settings_intent" msgid="4905213640015135149">"intent:#Intent;action=test.test;end"</string>
-</resources>
diff --git a/tests/robotests/res/values-mcc999-pl/config.xml b/tests/robotests/res/values-mcc999-pl/config.xml
deleted file mode 100644
index af1ca58..0000000
--- a/tests/robotests/res/values-mcc999-pl/config.xml
+++ /dev/null
@@ -1,21 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="config_grayscale_settings_intent" msgid="4905213640015135149">"intent:#Intent;action=test.test;end"</string>
-</resources>
diff --git a/tests/robotests/res/values-mcc999-pt-rBR/config.xml b/tests/robotests/res/values-mcc999-pt-rBR/config.xml
deleted file mode 100644
index af1ca58..0000000
--- a/tests/robotests/res/values-mcc999-pt-rBR/config.xml
+++ /dev/null
@@ -1,21 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="config_grayscale_settings_intent" msgid="4905213640015135149">"intent:#Intent;action=test.test;end"</string>
-</resources>
diff --git a/tests/robotests/res/values-mcc999-pt-rPT/config.xml b/tests/robotests/res/values-mcc999-pt-rPT/config.xml
deleted file mode 100644
index af1ca58..0000000
--- a/tests/robotests/res/values-mcc999-pt-rPT/config.xml
+++ /dev/null
@@ -1,21 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="config_grayscale_settings_intent" msgid="4905213640015135149">"intent:#Intent;action=test.test;end"</string>
-</resources>
diff --git a/tests/robotests/res/values-mcc999-pt/config.xml b/tests/robotests/res/values-mcc999-pt/config.xml
deleted file mode 100644
index af1ca58..0000000
--- a/tests/robotests/res/values-mcc999-pt/config.xml
+++ /dev/null
@@ -1,21 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="config_grayscale_settings_intent" msgid="4905213640015135149">"intent:#Intent;action=test.test;end"</string>
-</resources>
diff --git a/tests/robotests/res/values-mcc999-ro/config.xml b/tests/robotests/res/values-mcc999-ro/config.xml
deleted file mode 100644
index af1ca58..0000000
--- a/tests/robotests/res/values-mcc999-ro/config.xml
+++ /dev/null
@@ -1,21 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="config_grayscale_settings_intent" msgid="4905213640015135149">"intent:#Intent;action=test.test;end"</string>
-</resources>
diff --git a/tests/robotests/res/values-mcc999-ru/config.xml b/tests/robotests/res/values-mcc999-ru/config.xml
deleted file mode 100644
index af1ca58..0000000
--- a/tests/robotests/res/values-mcc999-ru/config.xml
+++ /dev/null
@@ -1,21 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="config_grayscale_settings_intent" msgid="4905213640015135149">"intent:#Intent;action=test.test;end"</string>
-</resources>
diff --git a/tests/robotests/res/values-mcc999-si/config.xml b/tests/robotests/res/values-mcc999-si/config.xml
deleted file mode 100644
index af1ca58..0000000
--- a/tests/robotests/res/values-mcc999-si/config.xml
+++ /dev/null
@@ -1,21 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="config_grayscale_settings_intent" msgid="4905213640015135149">"intent:#Intent;action=test.test;end"</string>
-</resources>
diff --git a/tests/robotests/res/values-mcc999-sk/config.xml b/tests/robotests/res/values-mcc999-sk/config.xml
deleted file mode 100644
index af1ca58..0000000
--- a/tests/robotests/res/values-mcc999-sk/config.xml
+++ /dev/null
@@ -1,21 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="config_grayscale_settings_intent" msgid="4905213640015135149">"intent:#Intent;action=test.test;end"</string>
-</resources>
diff --git a/tests/robotests/res/values-mcc999-sl/config.xml b/tests/robotests/res/values-mcc999-sl/config.xml
deleted file mode 100644
index af1ca58..0000000
--- a/tests/robotests/res/values-mcc999-sl/config.xml
+++ /dev/null
@@ -1,21 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="config_grayscale_settings_intent" msgid="4905213640015135149">"intent:#Intent;action=test.test;end"</string>
-</resources>
diff --git a/tests/robotests/res/values-mcc999-sq/config.xml b/tests/robotests/res/values-mcc999-sq/config.xml
deleted file mode 100644
index af1ca58..0000000
--- a/tests/robotests/res/values-mcc999-sq/config.xml
+++ /dev/null
@@ -1,21 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="config_grayscale_settings_intent" msgid="4905213640015135149">"intent:#Intent;action=test.test;end"</string>
-</resources>
diff --git a/tests/robotests/res/values-mcc999-sr/config.xml b/tests/robotests/res/values-mcc999-sr/config.xml
deleted file mode 100644
index af1ca58..0000000
--- a/tests/robotests/res/values-mcc999-sr/config.xml
+++ /dev/null
@@ -1,21 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="config_grayscale_settings_intent" msgid="4905213640015135149">"intent:#Intent;action=test.test;end"</string>
-</resources>
diff --git a/tests/robotests/res/values-mcc999-sv/config.xml b/tests/robotests/res/values-mcc999-sv/config.xml
deleted file mode 100644
index af1ca58..0000000
--- a/tests/robotests/res/values-mcc999-sv/config.xml
+++ /dev/null
@@ -1,21 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="config_grayscale_settings_intent" msgid="4905213640015135149">"intent:#Intent;action=test.test;end"</string>
-</resources>
diff --git a/tests/robotests/res/values-mcc999-sw/config.xml b/tests/robotests/res/values-mcc999-sw/config.xml
deleted file mode 100644
index af1ca58..0000000
--- a/tests/robotests/res/values-mcc999-sw/config.xml
+++ /dev/null
@@ -1,21 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="config_grayscale_settings_intent" msgid="4905213640015135149">"intent:#Intent;action=test.test;end"</string>
-</resources>
diff --git a/tests/robotests/res/values-mcc999-ta/config.xml b/tests/robotests/res/values-mcc999-ta/config.xml
deleted file mode 100644
index af1ca58..0000000
--- a/tests/robotests/res/values-mcc999-ta/config.xml
+++ /dev/null
@@ -1,21 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="config_grayscale_settings_intent" msgid="4905213640015135149">"intent:#Intent;action=test.test;end"</string>
-</resources>
diff --git a/tests/robotests/res/values-mcc999-te/config.xml b/tests/robotests/res/values-mcc999-te/config.xml
deleted file mode 100644
index af1ca58..0000000
--- a/tests/robotests/res/values-mcc999-te/config.xml
+++ /dev/null
@@ -1,21 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="config_grayscale_settings_intent" msgid="4905213640015135149">"intent:#Intent;action=test.test;end"</string>
-</resources>
diff --git a/tests/robotests/res/values-mcc999-th/config.xml b/tests/robotests/res/values-mcc999-th/config.xml
deleted file mode 100644
index af1ca58..0000000
--- a/tests/robotests/res/values-mcc999-th/config.xml
+++ /dev/null
@@ -1,21 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="config_grayscale_settings_intent" msgid="4905213640015135149">"intent:#Intent;action=test.test;end"</string>
-</resources>
diff --git a/tests/robotests/res/values-mcc999-tl/config.xml b/tests/robotests/res/values-mcc999-tl/config.xml
deleted file mode 100644
index af1ca58..0000000
--- a/tests/robotests/res/values-mcc999-tl/config.xml
+++ /dev/null
@@ -1,21 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="config_grayscale_settings_intent" msgid="4905213640015135149">"intent:#Intent;action=test.test;end"</string>
-</resources>
diff --git a/tests/robotests/res/values-mcc999-tr/config.xml b/tests/robotests/res/values-mcc999-tr/config.xml
deleted file mode 100644
index af1ca58..0000000
--- a/tests/robotests/res/values-mcc999-tr/config.xml
+++ /dev/null
@@ -1,21 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="config_grayscale_settings_intent" msgid="4905213640015135149">"intent:#Intent;action=test.test;end"</string>
-</resources>
diff --git a/tests/robotests/res/values-mcc999-uk/config.xml b/tests/robotests/res/values-mcc999-uk/config.xml
deleted file mode 100644
index af1ca58..0000000
--- a/tests/robotests/res/values-mcc999-uk/config.xml
+++ /dev/null
@@ -1,21 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="config_grayscale_settings_intent" msgid="4905213640015135149">"intent:#Intent;action=test.test;end"</string>
-</resources>
diff --git a/tests/robotests/res/values-mcc999-ur/config.xml b/tests/robotests/res/values-mcc999-ur/config.xml
deleted file mode 100644
index af1ca58..0000000
--- a/tests/robotests/res/values-mcc999-ur/config.xml
+++ /dev/null
@@ -1,21 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="config_grayscale_settings_intent" msgid="4905213640015135149">"intent:#Intent;action=test.test;end"</string>
-</resources>
diff --git a/tests/robotests/res/values-mcc999-uz/config.xml b/tests/robotests/res/values-mcc999-uz/config.xml
deleted file mode 100644
index af1ca58..0000000
--- a/tests/robotests/res/values-mcc999-uz/config.xml
+++ /dev/null
@@ -1,21 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="config_grayscale_settings_intent" msgid="4905213640015135149">"intent:#Intent;action=test.test;end"</string>
-</resources>
diff --git a/tests/robotests/res/values-mcc999-vi/config.xml b/tests/robotests/res/values-mcc999-vi/config.xml
deleted file mode 100644
index af1ca58..0000000
--- a/tests/robotests/res/values-mcc999-vi/config.xml
+++ /dev/null
@@ -1,21 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="config_grayscale_settings_intent" msgid="4905213640015135149">"intent:#Intent;action=test.test;end"</string>
-</resources>
diff --git a/tests/robotests/res/values-mcc999-zh-rCN/config.xml b/tests/robotests/res/values-mcc999-zh-rCN/config.xml
deleted file mode 100644
index af1ca58..0000000
--- a/tests/robotests/res/values-mcc999-zh-rCN/config.xml
+++ /dev/null
@@ -1,21 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="config_grayscale_settings_intent" msgid="4905213640015135149">"intent:#Intent;action=test.test;end"</string>
-</resources>
diff --git a/tests/robotests/res/values-mcc999-zh-rHK/config.xml b/tests/robotests/res/values-mcc999-zh-rHK/config.xml
deleted file mode 100644
index af1ca58..0000000
--- a/tests/robotests/res/values-mcc999-zh-rHK/config.xml
+++ /dev/null
@@ -1,21 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="config_grayscale_settings_intent" msgid="4905213640015135149">"intent:#Intent;action=test.test;end"</string>
-</resources>
diff --git a/tests/robotests/res/values-mcc999-zh-rTW/config.xml b/tests/robotests/res/values-mcc999-zh-rTW/config.xml
deleted file mode 100644
index af1ca58..0000000
--- a/tests/robotests/res/values-mcc999-zh-rTW/config.xml
+++ /dev/null
@@ -1,21 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="config_grayscale_settings_intent" msgid="4905213640015135149">"intent:#Intent;action=test.test;end"</string>
-</resources>
diff --git a/tests/robotests/res/values-mcc999-zu/config.xml b/tests/robotests/res/values-mcc999-zu/config.xml
deleted file mode 100644
index b82db98..0000000
--- a/tests/robotests/res/values-mcc999-zu/config.xml
+++ /dev/null
@@ -1,21 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="config_grayscale_settings_intent" msgid="4905213640015135149">"inhloso:#Intent;action=test.test;end"</string>
-</resources>
diff --git a/tests/robotests/res/values-mcc999/config.xml b/tests/robotests/res/values-mcc999/config.xml
index a6a84c9..0dec65f 100644
--- a/tests/robotests/res/values-mcc999/config.xml
+++ b/tests/robotests/res/values-mcc999/config.xml
@@ -87,7 +87,7 @@
<string name="config_contextual_card_feedback_email" translatable="false">test@test.test</string>
<!-- Grayscale settings intent -->
- <string name="config_grayscale_settings_intent" translate="false">intent:#Intent;action=test.test;end</string>
+ <string name="config_grayscale_settings_intent" translatable="false">intent:#Intent;action=test.test;end</string>
<!-- List containing the injected tile keys which are suppressed. -->
<string-array name="config_suppress_injected_tile_keys" translatable="false">
diff --git a/tests/robotests/res/values-mk/config.xml b/tests/robotests/res/values-mk/config.xml
deleted file mode 100644
index 98b33cc..0000000
--- a/tests/robotests/res/values-mk/config.xml
+++ /dev/null
@@ -1,21 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="config_work_policy_info_intent_action" msgid="246568924991550952">"ACTION_SHOW_WORK_POLICY_INFO"</string>
-</resources>
diff --git a/tests/robotests/res/values-ml/config.xml b/tests/robotests/res/values-ml/config.xml
deleted file mode 100644
index 98b33cc..0000000
--- a/tests/robotests/res/values-ml/config.xml
+++ /dev/null
@@ -1,21 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="config_work_policy_info_intent_action" msgid="246568924991550952">"ACTION_SHOW_WORK_POLICY_INFO"</string>
-</resources>
diff --git a/tests/robotests/res/values-mn/config.xml b/tests/robotests/res/values-mn/config.xml
deleted file mode 100644
index 98b33cc..0000000
--- a/tests/robotests/res/values-mn/config.xml
+++ /dev/null
@@ -1,21 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="config_work_policy_info_intent_action" msgid="246568924991550952">"ACTION_SHOW_WORK_POLICY_INFO"</string>
-</resources>
diff --git a/tests/robotests/res/values-mr/config.xml b/tests/robotests/res/values-mr/config.xml
deleted file mode 100644
index 98b33cc..0000000
--- a/tests/robotests/res/values-mr/config.xml
+++ /dev/null
@@ -1,21 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="config_work_policy_info_intent_action" msgid="246568924991550952">"ACTION_SHOW_WORK_POLICY_INFO"</string>
-</resources>
diff --git a/tests/robotests/res/values-ms/config.xml b/tests/robotests/res/values-ms/config.xml
deleted file mode 100644
index 98b33cc..0000000
--- a/tests/robotests/res/values-ms/config.xml
+++ /dev/null
@@ -1,21 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="config_work_policy_info_intent_action" msgid="246568924991550952">"ACTION_SHOW_WORK_POLICY_INFO"</string>
-</resources>
diff --git a/tests/robotests/res/values-my/config.xml b/tests/robotests/res/values-my/config.xml
deleted file mode 100644
index 98b33cc..0000000
--- a/tests/robotests/res/values-my/config.xml
+++ /dev/null
@@ -1,21 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="config_work_policy_info_intent_action" msgid="246568924991550952">"ACTION_SHOW_WORK_POLICY_INFO"</string>
-</resources>
diff --git a/tests/robotests/res/values-nb/config.xml b/tests/robotests/res/values-nb/config.xml
deleted file mode 100644
index 98b33cc..0000000
--- a/tests/robotests/res/values-nb/config.xml
+++ /dev/null
@@ -1,21 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="config_work_policy_info_intent_action" msgid="246568924991550952">"ACTION_SHOW_WORK_POLICY_INFO"</string>
-</resources>
diff --git a/tests/robotests/res/values-ne/config.xml b/tests/robotests/res/values-ne/config.xml
deleted file mode 100644
index 98b33cc..0000000
--- a/tests/robotests/res/values-ne/config.xml
+++ /dev/null
@@ -1,21 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="config_work_policy_info_intent_action" msgid="246568924991550952">"ACTION_SHOW_WORK_POLICY_INFO"</string>
-</resources>
diff --git a/tests/robotests/res/values-nl/config.xml b/tests/robotests/res/values-nl/config.xml
deleted file mode 100644
index 98b33cc..0000000
--- a/tests/robotests/res/values-nl/config.xml
+++ /dev/null
@@ -1,21 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="config_work_policy_info_intent_action" msgid="246568924991550952">"ACTION_SHOW_WORK_POLICY_INFO"</string>
-</resources>
diff --git a/tests/robotests/res/values-or/config.xml b/tests/robotests/res/values-or/config.xml
deleted file mode 100644
index 98b33cc..0000000
--- a/tests/robotests/res/values-or/config.xml
+++ /dev/null
@@ -1,21 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="config_work_policy_info_intent_action" msgid="246568924991550952">"ACTION_SHOW_WORK_POLICY_INFO"</string>
-</resources>
diff --git a/tests/robotests/res/values-pa/config.xml b/tests/robotests/res/values-pa/config.xml
deleted file mode 100644
index 98b33cc..0000000
--- a/tests/robotests/res/values-pa/config.xml
+++ /dev/null
@@ -1,21 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="config_work_policy_info_intent_action" msgid="246568924991550952">"ACTION_SHOW_WORK_POLICY_INFO"</string>
-</resources>
diff --git a/tests/robotests/res/values-pl/config.xml b/tests/robotests/res/values-pl/config.xml
deleted file mode 100644
index 98b33cc..0000000
--- a/tests/robotests/res/values-pl/config.xml
+++ /dev/null
@@ -1,21 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="config_work_policy_info_intent_action" msgid="246568924991550952">"ACTION_SHOW_WORK_POLICY_INFO"</string>
-</resources>
diff --git a/tests/robotests/res/values-pt-rBR/config.xml b/tests/robotests/res/values-pt-rBR/config.xml
deleted file mode 100644
index 98b33cc..0000000
--- a/tests/robotests/res/values-pt-rBR/config.xml
+++ /dev/null
@@ -1,21 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="config_work_policy_info_intent_action" msgid="246568924991550952">"ACTION_SHOW_WORK_POLICY_INFO"</string>
-</resources>
diff --git a/tests/robotests/res/values-pt-rPT/config.xml b/tests/robotests/res/values-pt-rPT/config.xml
deleted file mode 100644
index 98b33cc..0000000
--- a/tests/robotests/res/values-pt-rPT/config.xml
+++ /dev/null
@@ -1,21 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="config_work_policy_info_intent_action" msgid="246568924991550952">"ACTION_SHOW_WORK_POLICY_INFO"</string>
-</resources>
diff --git a/tests/robotests/res/values-pt/config.xml b/tests/robotests/res/values-pt/config.xml
deleted file mode 100644
index 98b33cc..0000000
--- a/tests/robotests/res/values-pt/config.xml
+++ /dev/null
@@ -1,21 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="config_work_policy_info_intent_action" msgid="246568924991550952">"ACTION_SHOW_WORK_POLICY_INFO"</string>
-</resources>
diff --git a/tests/robotests/res/values-ro/config.xml b/tests/robotests/res/values-ro/config.xml
deleted file mode 100644
index 98b33cc..0000000
--- a/tests/robotests/res/values-ro/config.xml
+++ /dev/null
@@ -1,21 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="config_work_policy_info_intent_action" msgid="246568924991550952">"ACTION_SHOW_WORK_POLICY_INFO"</string>
-</resources>
diff --git a/tests/robotests/res/values-ru/config.xml b/tests/robotests/res/values-ru/config.xml
deleted file mode 100644
index 98b33cc..0000000
--- a/tests/robotests/res/values-ru/config.xml
+++ /dev/null
@@ -1,21 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="config_work_policy_info_intent_action" msgid="246568924991550952">"ACTION_SHOW_WORK_POLICY_INFO"</string>
-</resources>
diff --git a/tests/robotests/res/values-si/config.xml b/tests/robotests/res/values-si/config.xml
deleted file mode 100644
index 98b33cc..0000000
--- a/tests/robotests/res/values-si/config.xml
+++ /dev/null
@@ -1,21 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="config_work_policy_info_intent_action" msgid="246568924991550952">"ACTION_SHOW_WORK_POLICY_INFO"</string>
-</resources>
diff --git a/tests/robotests/res/values-sk/config.xml b/tests/robotests/res/values-sk/config.xml
deleted file mode 100644
index c9e0f3b..0000000
--- a/tests/robotests/res/values-sk/config.xml
+++ /dev/null
@@ -1,21 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="config_work_policy_info_intent_action" msgid="246568924991550952">"AKCIA_NA_ZOBRAZENIE_INFORMÁCIÍ_O_PRACOVNÝCH_PRAVIDLÁCH"</string>
-</resources>
diff --git a/tests/robotests/res/values-sl/config.xml b/tests/robotests/res/values-sl/config.xml
deleted file mode 100644
index 98b33cc..0000000
--- a/tests/robotests/res/values-sl/config.xml
+++ /dev/null
@@ -1,21 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="config_work_policy_info_intent_action" msgid="246568924991550952">"ACTION_SHOW_WORK_POLICY_INFO"</string>
-</resources>
diff --git a/tests/robotests/res/values-sq/config.xml b/tests/robotests/res/values-sq/config.xml
deleted file mode 100644
index 98b33cc..0000000
--- a/tests/robotests/res/values-sq/config.xml
+++ /dev/null
@@ -1,21 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="config_work_policy_info_intent_action" msgid="246568924991550952">"ACTION_SHOW_WORK_POLICY_INFO"</string>
-</resources>
diff --git a/tests/robotests/res/values-sr/config.xml b/tests/robotests/res/values-sr/config.xml
deleted file mode 100644
index 98b33cc..0000000
--- a/tests/robotests/res/values-sr/config.xml
+++ /dev/null
@@ -1,21 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="config_work_policy_info_intent_action" msgid="246568924991550952">"ACTION_SHOW_WORK_POLICY_INFO"</string>
-</resources>
diff --git a/tests/robotests/res/values-sv/config.xml b/tests/robotests/res/values-sv/config.xml
deleted file mode 100644
index 98b33cc..0000000
--- a/tests/robotests/res/values-sv/config.xml
+++ /dev/null
@@ -1,21 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="config_work_policy_info_intent_action" msgid="246568924991550952">"ACTION_SHOW_WORK_POLICY_INFO"</string>
-</resources>
diff --git a/tests/robotests/res/values-sw/config.xml b/tests/robotests/res/values-sw/config.xml
deleted file mode 100644
index 7e61ab0..0000000
--- a/tests/robotests/res/values-sw/config.xml
+++ /dev/null
@@ -1,21 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="config_work_policy_info_intent_action" msgid="246568924991550952">"KITENDO_ONYESHA_KAZI_SERA_MAELEZO"</string>
-</resources>
diff --git a/tests/robotests/res/values-ta/config.xml b/tests/robotests/res/values-ta/config.xml
deleted file mode 100644
index 98b33cc..0000000
--- a/tests/robotests/res/values-ta/config.xml
+++ /dev/null
@@ -1,21 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="config_work_policy_info_intent_action" msgid="246568924991550952">"ACTION_SHOW_WORK_POLICY_INFO"</string>
-</resources>
diff --git a/tests/robotests/res/values-te/config.xml b/tests/robotests/res/values-te/config.xml
deleted file mode 100644
index 98b33cc..0000000
--- a/tests/robotests/res/values-te/config.xml
+++ /dev/null
@@ -1,21 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="config_work_policy_info_intent_action" msgid="246568924991550952">"ACTION_SHOW_WORK_POLICY_INFO"</string>
-</resources>
diff --git a/tests/robotests/res/values-th/config.xml b/tests/robotests/res/values-th/config.xml
deleted file mode 100644
index 98b33cc..0000000
--- a/tests/robotests/res/values-th/config.xml
+++ /dev/null
@@ -1,21 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="config_work_policy_info_intent_action" msgid="246568924991550952">"ACTION_SHOW_WORK_POLICY_INFO"</string>
-</resources>
diff --git a/tests/robotests/res/values-tl/config.xml b/tests/robotests/res/values-tl/config.xml
deleted file mode 100644
index 98b33cc..0000000
--- a/tests/robotests/res/values-tl/config.xml
+++ /dev/null
@@ -1,21 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="config_work_policy_info_intent_action" msgid="246568924991550952">"ACTION_SHOW_WORK_POLICY_INFO"</string>
-</resources>
diff --git a/tests/robotests/res/values-tr/config.xml b/tests/robotests/res/values-tr/config.xml
deleted file mode 100644
index 98b33cc..0000000
--- a/tests/robotests/res/values-tr/config.xml
+++ /dev/null
@@ -1,21 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="config_work_policy_info_intent_action" msgid="246568924991550952">"ACTION_SHOW_WORK_POLICY_INFO"</string>
-</resources>
diff --git a/tests/robotests/res/values-uk/config.xml b/tests/robotests/res/values-uk/config.xml
deleted file mode 100644
index 98b33cc..0000000
--- a/tests/robotests/res/values-uk/config.xml
+++ /dev/null
@@ -1,21 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="config_work_policy_info_intent_action" msgid="246568924991550952">"ACTION_SHOW_WORK_POLICY_INFO"</string>
-</resources>
diff --git a/tests/robotests/res/values-ur/config.xml b/tests/robotests/res/values-ur/config.xml
deleted file mode 100644
index 98b33cc..0000000
--- a/tests/robotests/res/values-ur/config.xml
+++ /dev/null
@@ -1,21 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="config_work_policy_info_intent_action" msgid="246568924991550952">"ACTION_SHOW_WORK_POLICY_INFO"</string>
-</resources>
diff --git a/tests/robotests/res/values-uz/config.xml b/tests/robotests/res/values-uz/config.xml
deleted file mode 100644
index 98b33cc..0000000
--- a/tests/robotests/res/values-uz/config.xml
+++ /dev/null
@@ -1,21 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="config_work_policy_info_intent_action" msgid="246568924991550952">"ACTION_SHOW_WORK_POLICY_INFO"</string>
-</resources>
diff --git a/tests/robotests/res/values-vi/config.xml b/tests/robotests/res/values-vi/config.xml
deleted file mode 100644
index 98b33cc..0000000
--- a/tests/robotests/res/values-vi/config.xml
+++ /dev/null
@@ -1,21 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="config_work_policy_info_intent_action" msgid="246568924991550952">"ACTION_SHOW_WORK_POLICY_INFO"</string>
-</resources>
diff --git a/tests/robotests/res/values-zh-rCN/config.xml b/tests/robotests/res/values-zh-rCN/config.xml
deleted file mode 100644
index 98b33cc..0000000
--- a/tests/robotests/res/values-zh-rCN/config.xml
+++ /dev/null
@@ -1,21 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="config_work_policy_info_intent_action" msgid="246568924991550952">"ACTION_SHOW_WORK_POLICY_INFO"</string>
-</resources>
diff --git a/tests/robotests/res/values-zh-rHK/config.xml b/tests/robotests/res/values-zh-rHK/config.xml
deleted file mode 100644
index 98b33cc..0000000
--- a/tests/robotests/res/values-zh-rHK/config.xml
+++ /dev/null
@@ -1,21 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="config_work_policy_info_intent_action" msgid="246568924991550952">"ACTION_SHOW_WORK_POLICY_INFO"</string>
-</resources>
diff --git a/tests/robotests/res/values-zh-rTW/config.xml b/tests/robotests/res/values-zh-rTW/config.xml
deleted file mode 100644
index 98b33cc..0000000
--- a/tests/robotests/res/values-zh-rTW/config.xml
+++ /dev/null
@@ -1,21 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="config_work_policy_info_intent_action" msgid="246568924991550952">"ACTION_SHOW_WORK_POLICY_INFO"</string>
-</resources>
diff --git a/tests/robotests/res/values-zu/config.xml b/tests/robotests/res/values-zu/config.xml
deleted file mode 100644
index 98b33cc..0000000
--- a/tests/robotests/res/values-zu/config.xml
+++ /dev/null
@@ -1,21 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="config_work_policy_info_intent_action" msgid="246568924991550952">"ACTION_SHOW_WORK_POLICY_INFO"</string>
-</resources>
diff --git a/tests/robotests/res/values/config.xml b/tests/robotests/res/values/config.xml
index ca2c61d..004ecb7 100644
--- a/tests/robotests/res/values/config.xml
+++ b/tests/robotests/res/values/config.xml
@@ -26,5 +26,5 @@
<dimen name="restricted_icon_size">24dp</dimen>
<!-- Fake string to avoid empty intent action -->
- <string name="config_work_policy_info_intent_action">ACTION_SHOW_WORK_POLICY_INFO</string>
+ <string name="config_work_policy_info_intent_action" translatable="false">ACTION_SHOW_WORK_POLICY_INFO</string>
</resources>
diff --git a/tests/robotests/res/values/overlayable_icons_test.xml b/tests/robotests/res/values/overlayable_icons_test.xml
deleted file mode 100644
index 0dab9cf..0000000
--- a/tests/robotests/res/values/overlayable_icons_test.xml
+++ /dev/null
@@ -1,99 +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.
--->
-<resources>
- <!-- overlayable_icons references all of the drawables in this package
- that are being overlayed by resource overlays. If you remove/rename
- any of these resources, you must also change the resource overlay icons.-->
- <array name="overlayable_icons">
- <item>@drawable/drag_handle</item>
- <item>@drawable/ic_add_24dp</item>
- <item>@drawable/ic_airplanemode_active</item>
- <item>@drawable/ic_android</item>
- <item>@drawable/ic_apps</item>
- <item>@drawable/ic_arrow_back</item>
- <item>@drawable/ic_arrow_down_24dp</item>
- <item>@drawable/ic_battery_charging_full</item>
- <item>@drawable/ic_battery_status_good_24dp</item>
- <item>@drawable/ic_battery_status_maybe_24dp</item>
- <item>@drawable/ic_call_24dp</item>
- <item>@drawable/ic_cancel</item>
- <item>@drawable/ic_cast_24dp</item>
- <item>@drawable/ic_cellular_off</item>
- <item>@drawable/ic_chevron_right_24dp</item>
- <item>@drawable/ic_content_copy_grey600_24dp</item>
- <item>@drawable/ic_data_saver</item>
- <item>@drawable/ic_delete</item>
- <item>@drawable/ic_devices_other</item>
- <item>@drawable/ic_devices_other_opaque_black</item>
- <item>@drawable/ic_do_not_disturb_on_24dp</item>
- <item>@drawable/ic_eject_24dp</item>
- <item>@drawable/ic_expand_less</item>
- <item>@drawable/ic_expand_more_inverse</item>
- <item>@drawable/ic_find_in_page_24px</item>
- <item>@drawable/ic_folder_vd_theme_24</item>
- <item>@drawable/ic_friction_lock_closed</item>
- <item>@drawable/ic_gray_scale_24dp</item>
- <item>@drawable/ic_headset_24dp</item>
- <item>@drawable/ic_help</item>
- <item>@drawable/ic_help_actionbar</item>
- <item>@drawable/ic_homepage_search</item>
- <item>@drawable/ic_info_outline_24</item>
- <item>@drawable/ic_local_movies</item>
- <item>@drawable/ic_local_phone_24_lib</item>
- <item>@drawable/ic_media_stream</item>
- <item>@drawable/ic_media_stream_off</item>
- <item>@drawable/ic_network_cell</item>
- <item>@drawable/ic_notifications</item>
- <item>@drawable/ic_notifications_off_24dp</item>
- <item>@drawable/ic_phone_info</item>
- <item>@drawable/ic_photo_library</item>
- <item>@drawable/ic_search_24dp</item>
- <item>@drawable/ic_settings_accent</item>
- <item>@drawable/ic_settings_accessibility</item>
- <item>@drawable/ic_settings_accounts</item>
- <item>@drawable/ic_settings_backup</item>
- <item>@drawable/ic_settings_battery_white</item>
- <item>@drawable/ic_settings_data_usage</item>
- <item>@drawable/ic_settings_date_time</item>
- <item>@drawable/ic_settings_delete</item>
- <item>@drawable/ic_settings_disable</item>
- <item>@drawable/ic_settings_display_white</item>
- <item>@drawable/ic_settings_enable</item>
- <item>@drawable/ic_settings_home</item>
- <item>@drawable/ic_settings_language</item>
- <item>@drawable/ic_settings_location</item>
- <item>@drawable/ic_settings_multiuser</item>
- <item>@drawable/ic_settings_night_display</item>
- <item>@drawable/ic_settings_open</item>
- <item>@drawable/ic_settings_print</item>
- <item>@drawable/ic_settings_privacy</item>
- <item>@drawable/ic_settings_security_white</item>
- <item>@drawable/ic_settings_sim</item>
- <item>@drawable/ic_settings_system_dashboard_white</item>
- <item>@drawable/ic_settings_wireless</item>
- <item>@drawable/ic_storage</item>
- <item>@drawable/ic_storage_white</item>
- <item>@drawable/ic_suggestion_night_display</item>
- <item>@drawable/ic_sync</item>
- <item>@drawable/ic_sync_problem_24dp</item>
- <item>@drawable/ic_system_update</item>
- <item>@drawable/ic_videogame_vd_theme_24</item>
- <item>@drawable/ic_volume_ringer_vibrate</item>
- <item>@drawable/ic_volume_up_24dp</item>
- <item>@drawable/ic_vpn_key</item>
- <item>@drawable/ic_wifi_tethering</item>
- </array>
-</resources>
diff --git a/tests/robotests/res/xml-mcc999/location_settings.xml b/tests/robotests/res/xml-mcc999/location_settings.xml
index 4e5733f..d2dc132 100644
--- a/tests/robotests/res/xml-mcc999/location_settings.xml
+++ b/tests/robotests/res/xml-mcc999/location_settings.xml
@@ -26,7 +26,6 @@
android:summary="summary"
settings:controller="com.android.settings.slices.FakePreferenceController"
settings:keywords="a, b, c"
- settings:platform_slice="true"
settings:unavailableSliceSubtitle="subtitleOfUnavailableSlice"/>
</PreferenceScreen>
\ No newline at end of file
diff --git a/tests/robotests/res/xml-mcc999/night_display_settings.xml b/tests/robotests/res/xml-mcc999/night_display_settings.xml
index c23a2cf..6196372 100644
--- a/tests/robotests/res/xml-mcc999/night_display_settings.xml
+++ b/tests/robotests/res/xml-mcc999/night_display_settings.xml
@@ -27,8 +27,7 @@
android:icon="@drawable/ic_android"
android:summary="summary"
settings:controller="com.android.settings.slices.FakePreferenceController"
- settings:keywords="keyword"
- settings:platform_slice="true"/>
+ settings:keywords="keyword"/>
<Preference
android:key="key2"
@@ -37,7 +36,6 @@
android:summary="summary"
settings:controller="com.android.settings.slices.FakePreferenceController"
settings:keywords="keyword"
- settings:platform_slice="true"
settings:unavailableSliceSubtitle="subtitleOfUnavailable"/>
</PreferenceScreen>
\ No newline at end of file
diff --git a/tests/robotests/src/com/android/settings/SettingsActivityTest.java b/tests/robotests/src/com/android/settings/SettingsActivityTest.java
index dd39f12..7906803 100644
--- a/tests/robotests/src/com/android/settings/SettingsActivityTest.java
+++ b/tests/robotests/src/com/android/settings/SettingsActivityTest.java
@@ -16,6 +16,8 @@
package com.android.settings;
+import static com.android.settings.SettingsActivity.EXTRA_SHOW_FRAGMENT;
+
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.ArgumentMatchers.anyInt;
@@ -34,6 +36,7 @@
import androidx.fragment.app.FragmentTransaction;
import com.android.settings.core.OnActivityResultListener;
+import com.android.settings.testutils.FakeFeatureFactory;
import org.junit.Before;
import org.junit.Test;
@@ -83,6 +86,17 @@
}
@Test
+ public void getSharedPreferences_intentExtraIsNull_shouldNotCrash() {
+ final Intent intent = new Intent();
+ intent.putExtra(EXTRA_SHOW_FRAGMENT, (String)null);
+ doReturn(intent).when(mActivity).getIntent();
+ doReturn(mContext.getPackageName()).when(mActivity).getPackageName();
+ FakeFeatureFactory.setupForTest();
+
+ mActivity.getSharedPreferences(mContext.getPackageName() + "_preferences", 0);
+ }
+
+ @Test
public void onActivityResult_shouldDelegateToListener() {
final List<Fragment> fragments = new ArrayList<>();
fragments.add(new Fragment());
diff --git a/tests/robotests/src/com/android/settings/SettingsPreferenceFragmentTest.java b/tests/robotests/src/com/android/settings/SettingsPreferenceFragmentTest.java
index cce0155..cb53f69 100644
--- a/tests/robotests/src/com/android/settings/SettingsPreferenceFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/SettingsPreferenceFragmentTest.java
@@ -29,6 +29,7 @@
import android.content.Context;
import android.os.Bundle;
import android.view.View;
+import android.widget.FrameLayout;
import androidx.fragment.app.FragmentActivity;
import androidx.preference.Preference;
@@ -37,6 +38,7 @@
import androidx.preference.PreferenceScreen;
import com.android.settings.testutils.FakeFeatureFactory;
+import com.android.settings.testutils.shadow.ShadowFragment;
import com.android.settings.widget.WorkOnlyCategory;
import org.junit.Before;
@@ -46,6 +48,7 @@
import org.mockito.MockitoAnnotations;
import org.robolectric.RobolectricTestRunner;
import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
import org.robolectric.util.ReflectionHelpers;
@RunWith(RobolectricTestRunner.class)
@@ -147,6 +150,7 @@
}
@Test
+ @Config(shadows = ShadowFragment.class)
public void onCreate_hasExtraFragmentKey_shouldExpandPreferences() {
doReturn(mContext.getTheme()).when(mActivity).getTheme();
doReturn(mContext.getResources()).when(mFragment).getResources();
@@ -161,6 +165,7 @@
}
@Test
+ @Config(shadows = ShadowFragment.class)
public void onCreate_noPreferenceScreen_shouldNotCrash() {
doReturn(mContext.getTheme()).when(mActivity).getTheme();
doReturn(mContext.getResources()).when(mFragment).getResources();
@@ -187,6 +192,24 @@
verify(workOnlyCategory).setVisible(false);
}
+ @Test
+ public void showPinnedHeader_shouldBeVisible() {
+ mFragment.mPinnedHeaderFrameLayout = new FrameLayout(mContext);
+
+ mFragment.showPinnedHeader(true);
+
+ assertThat(mFragment.mPinnedHeaderFrameLayout.getVisibility()).isEqualTo(View.VISIBLE);
+ }
+
+ @Test
+ public void hidePinnedHeader_shouldBeInvisible() {
+ mFragment.mPinnedHeaderFrameLayout = new FrameLayout(mContext);
+
+ mFragment.showPinnedHeader(false);
+
+ assertThat(mFragment.mPinnedHeaderFrameLayout.getVisibility()).isEqualTo(View.INVISIBLE);
+ }
+
public static class TestFragment extends SettingsPreferenceFragment {
@Override
diff --git a/tests/robotests/src/com/android/settings/accessibility/AccessibilityDetailsSettingsFragmentTest.java b/tests/robotests/src/com/android/settings/accessibility/AccessibilityDetailsSettingsFragmentTest.java
index 9d5a5b8..9ad00eb 100644
--- a/tests/robotests/src/com/android/settings/accessibility/AccessibilityDetailsSettingsFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/accessibility/AccessibilityDetailsSettingsFragmentTest.java
@@ -32,6 +32,9 @@
import android.view.accessibility.AccessibilityManager;
import androidx.fragment.app.FragmentActivity;
+
+import com.android.settings.testutils.shadow.ShadowFragment;
+
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -39,6 +42,7 @@
import org.mockito.MockitoAnnotations;
import org.robolectric.RobolectricTestRunner;
import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
import org.robolectric.shadow.api.Shadow;
import org.robolectric.shadows.ShadowAccessibilityManager;
import org.xmlpull.v1.XmlPullParserException;
@@ -47,6 +51,7 @@
import java.util.ArrayList;
import java.util.List;
+@Config(shadows = ShadowFragment.class)
@RunWith(RobolectricTestRunner.class)
public class AccessibilityDetailsSettingsFragmentTest {
private final static String PACKAGE_NAME = "com.foo.bar";
diff --git a/tests/robotests/src/com/android/settings/accessibility/AccessibilityHearingAidPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accessibility/AccessibilityHearingAidPreferenceControllerTest.java
index 3f4e82d..0b739f4 100644
--- a/tests/robotests/src/com/android/settings/accessibility/AccessibilityHearingAidPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/accessibility/AccessibilityHearingAidPreferenceControllerTest.java
@@ -111,7 +111,7 @@
@Test
public void onHearingAidStateChanged_connected_updateHearingAidSummary() {
when(mHearingAidProfile.getConnectedDevices()).thenReturn(generateHearingAidDeviceList());
- mPreferenceController.onResume();
+ mPreferenceController.onStart();
Intent intent = new Intent(BluetoothHearingAid.ACTION_CONNECTION_STATE_CHANGED);
intent.putExtra(BluetoothHearingAid.EXTRA_STATE, BluetoothHearingAid.STATE_CONNECTED);
sendIntent(intent);
@@ -121,7 +121,7 @@
@Test
public void onHearingAidStateChanged_disconnected_updateHearingAidSummary() {
- mPreferenceController.onResume();
+ mPreferenceController.onStart();
Intent intent = new Intent(BluetoothHearingAid.ACTION_CONNECTION_STATE_CHANGED);
intent.putExtra(BluetoothHearingAid.EXTRA_STATE, BluetoothHearingAid.STATE_DISCONNECTED);
sendIntent(intent);
@@ -132,7 +132,7 @@
@Test
public void onBluetoothStateChanged_bluetoothOff_updateHearingAidSummary() {
- mPreferenceController.onResume();
+ mPreferenceController.onStart();
Intent intent = new Intent(BluetoothAdapter.ACTION_STATE_CHANGED);
intent.putExtra(BluetoothAdapter.EXTRA_STATE, BluetoothAdapter.STATE_OFF);
sendIntent(intent);
@@ -173,11 +173,11 @@
HEARING_AID_PREFERENCE);
mPreferenceController.setPreference(mHearingAidPreference);
//not call registerReceiver()
- mPreferenceController.onResume();
+ mPreferenceController.onStart();
verify(mContext, never()).registerReceiver(any(), any());
//not call unregisterReceiver()
- mPreferenceController.onPause();
+ mPreferenceController.onStop();
verify(mContext, never()).unregisterReceiver(any());
}
diff --git a/tests/robotests/src/com/android/settings/accessibility/AccessibilitySettingsTest.java b/tests/robotests/src/com/android/settings/accessibility/AccessibilitySettingsTest.java
index 5813bd8..325e7f9 100644
--- a/tests/robotests/src/com/android/settings/accessibility/AccessibilitySettingsTest.java
+++ b/tests/robotests/src/com/android/settings/accessibility/AccessibilitySettingsTest.java
@@ -21,14 +21,10 @@
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.spy;
-import android.app.UiModeManager;
-import android.content.ContentResolver;
import android.content.Context;
-import android.os.Vibrator;
import android.provider.DeviceConfig;
import android.provider.Settings;
-
-import androidx.preference.Preference;
+import android.view.accessibility.AccessibilityManager;
import com.android.settings.R;
import com.android.settings.testutils.XmlTestUtils;
@@ -41,30 +37,27 @@
import org.robolectric.RobolectricTestRunner;
import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config;
+import org.robolectric.shadow.api.Shadow;
+import org.robolectric.shadows.ShadowAccessibilityManager;
+import java.util.ArrayList;
import java.util.List;
@RunWith(RobolectricTestRunner.class)
public class AccessibilitySettingsTest {
- private static final String VIBRATION_PREFERENCE_SCREEN = "vibration_preference_screen";
- private static final String ACCESSIBILITY_CONTROL_TIMEOUT_PREFERENCE =
- "accessibility_control_timeout_preference_fragment";
- private static final String DARK_UI_MODE_PREFERENCE =
- "dark_ui_mode_accessibility";
private Context mContext;
- private ContentResolver mContentResolver;
private AccessibilitySettings mSettings;
- private UiModeManager mUiModeManager;
+ private ShadowAccessibilityManager mShadowAccessibilityManager;
@Before
public void setup() {
MockitoAnnotations.initMocks(this);
mContext = RuntimeEnvironment.application;
- mContentResolver = mContext.getContentResolver();
mSettings = spy(new AccessibilitySettings());
+ mShadowAccessibilityManager = Shadow.extract(AccessibilityManager.getInstance(mContext));
+ mShadowAccessibilityManager.setInstalledAccessibilityServiceList(new ArrayList<>());
doReturn(mContext).when(mSettings).getContext();
- mUiModeManager = mContext.getSystemService(UiModeManager.class);
}
@Test
@@ -78,74 +71,13 @@
}
@Test
- public void testUpdateVibrationSummary_shouldUpdateSummary() {
- final Preference vibrationPreferenceScreen = new Preference(mContext);
- doReturn(vibrationPreferenceScreen).when(mSettings).findPreference(
- VIBRATION_PREFERENCE_SCREEN);
-
- vibrationPreferenceScreen.setKey(VIBRATION_PREFERENCE_SCREEN);
-
- Settings.System.putInt(mContext.getContentResolver(),
- Settings.System.NOTIFICATION_VIBRATION_INTENSITY,
- Vibrator.VIBRATION_INTENSITY_OFF);
-
- Settings.System.putInt(mContext.getContentResolver(),
- Settings.System.HAPTIC_FEEDBACK_INTENSITY,
- Vibrator.VIBRATION_INTENSITY_OFF);
-
- mSettings.updateVibrationSummary(vibrationPreferenceScreen);
- assertThat(vibrationPreferenceScreen.getSummary()).isEqualTo(
- VibrationIntensityPreferenceController.getIntensityString(mContext,
- Vibrator.VIBRATION_INTENSITY_OFF));
- }
-
- @Test
- public void testUpdateAccessibilityTimeoutSummary_shouldUpdateSummary() {
- String[] testingValues = {null, "0", "10000", "30000", "60000", "120000"};
- int[] exceptedResIds = {R.string.accessibility_timeout_default,
- R.string.accessibility_timeout_default,
- R.string.accessibility_timeout_10secs,
- R.string.accessibility_timeout_30secs,
- R.string.accessibility_timeout_1min,
- R.string.accessibility_timeout_2mins
- };
-
- for (int i = 0; i < testingValues.length; i++) {
- Settings.Secure.putString(mContentResolver,
- Settings.Secure.ACCESSIBILITY_INTERACTIVE_UI_TIMEOUT_MS, testingValues[i]);
-
- verifyAccessibilityTimeoutSummary(ACCESSIBILITY_CONTROL_TIMEOUT_PREFERENCE,
- exceptedResIds[i]);
- }
- }
-
- @Test
- public void testUpdateAccessibilityControlTimeoutSummary_invalidData_shouldUpdateSummary() {
- String[] testingValues = {"-9009", "98277466643738977979666555536362343", "Hello,a prank"};
-
- for (String value : testingValues) {
- Settings.Secure.putString(mContentResolver,
- Settings.Secure.ACCESSIBILITY_NON_INTERACTIVE_UI_TIMEOUT_MS, value);
-
- verifyAccessibilityTimeoutSummary(ACCESSIBILITY_CONTROL_TIMEOUT_PREFERENCE,
- R.string.accessibility_timeout_default);
-
- Settings.Secure.putString(mContentResolver,
- Settings.Secure.ACCESSIBILITY_INTERACTIVE_UI_TIMEOUT_MS, value);
-
- verifyAccessibilityTimeoutSummary(ACCESSIBILITY_CONTROL_TIMEOUT_PREFERENCE,
- R.string.accessibility_timeout_default);
- }
- }
-
- @Test
@Config(shadows = {ShadowDeviceConfig.class})
public void testIsRampingRingerEnabled_bothFlagsOn_Enabled() {
Settings.Global.putInt(
mContext.getContentResolver(), Settings.Global.APPLY_RAMPING_RINGER, 1 /* ON */);
DeviceConfig.setProperty(DeviceConfig.NAMESPACE_TELEPHONY,
AccessibilitySettings.RAMPING_RINGER_ENABLED, "true", false /* makeDefault*/);
- assertThat(AccessibilitySettings.isRampingRingerEnabled(mContext)).isTrue();
+ assertThat(AccessibilitySettings.isRampingRingerEnabled(mContext)).isTrue();
}
@Test
@@ -153,7 +85,7 @@
public void testIsRampingRingerEnabled_settingsFlagOff_Disabled() {
Settings.Global.putInt(
mContext.getContentResolver(), Settings.Global.APPLY_RAMPING_RINGER, 0 /* OFF */);
- assertThat(AccessibilitySettings.isRampingRingerEnabled(mContext)).isFalse();
+ assertThat(AccessibilitySettings.isRampingRingerEnabled(mContext)).isFalse();
}
@Test
@@ -161,27 +93,6 @@
public void testIsRampingRingerEnabled_deviceConfigFlagOff_Disabled() {
DeviceConfig.setProperty(DeviceConfig.NAMESPACE_TELEPHONY,
AccessibilitySettings.RAMPING_RINGER_ENABLED, "false", false /* makeDefault*/);
- assertThat(AccessibilitySettings.isRampingRingerEnabled(mContext)).isFalse();
- }
-
- private void verifyAccessibilityTimeoutSummary(String preferenceKey, int resId) {
- final Preference preference = new Preference(mContext);
- doReturn(preference).when(mSettings).findPreference(preferenceKey);
- preference.setKey(preferenceKey);
- mSettings.updateAccessibilityTimeoutSummary(mContentResolver, preference);
-
- assertThat(preference.getSummary()).isEqualTo(mContext.getResources().getString(resId));
- }
-
- private String modeToDescription(int mode) {
- String[] values = mContext.getResources().getStringArray(R.array.dark_ui_mode_entries);
- switch (mode) {
- case UiModeManager.MODE_NIGHT_YES:
- return values[0];
- case UiModeManager.MODE_NIGHT_NO:
- case UiModeManager.MODE_NIGHT_AUTO:
- default:
- return values[1];
- }
+ assertThat(AccessibilitySettings.isRampingRingerEnabled(mContext)).isFalse();
}
}
diff --git a/tests/robotests/src/com/android/settings/accessibility/AccessibilityShortcutPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accessibility/AccessibilityShortcutPreferenceControllerTest.java
new file mode 100644
index 0000000..ad4195e
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/accessibility/AccessibilityShortcutPreferenceControllerTest.java
@@ -0,0 +1,156 @@
+/*
+ * 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.accessibility;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.accessibilityservice.AccessibilityServiceInfo;
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.pm.ApplicationInfo;
+import android.content.pm.ResolveInfo;
+import android.content.pm.ServiceInfo;
+import android.provider.Settings;
+import android.view.accessibility.AccessibilityManager;
+
+import com.android.settings.R;
+import com.android.settings.core.BasePreferenceController;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+import org.robolectric.annotation.Implementation;
+import org.robolectric.annotation.Implements;
+import org.robolectric.shadow.api.Shadow;
+import org.robolectric.shadows.ShadowAccessibilityManager;
+import org.xmlpull.v1.XmlPullParserException;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+
+@RunWith(RobolectricTestRunner.class)
+public class AccessibilityShortcutPreferenceControllerTest {
+ private final static String PACKAGE_NAME = "com.foo.bar";
+ private final static String CLASS_NAME = PACKAGE_NAME + ".fake_a11y_service";
+ private final static String COMPONENT_NAME = PACKAGE_NAME + "/" + CLASS_NAME;
+ private final static String SERVICE_NAME = "fake_a11y_service";
+ private final static int ON = 1;
+ private final static int OFF = 0;
+
+ private Context mContext;
+ private AccessibilityShortcutPreferenceController mController;
+ private ShadowAccessibilityManager mShadowAccessibilityManager;
+
+ @Before
+ public void setUp() {
+ mContext = RuntimeEnvironment.application;
+ mController = new AccessibilityShortcutPreferenceController(mContext, "shortcut_key");
+ mShadowAccessibilityManager = Shadow.extract(AccessibilityManager.getInstance(mContext));
+ mShadowAccessibilityManager.setInstalledAccessibilityServiceList(getMockServiceList());
+ }
+
+ @Test
+ public void getAvailabilityStatus_hasInstalledA11yServices_shouldReturnAvailable() {
+ assertThat(mController.getAvailabilityStatus())
+ .isEqualTo(BasePreferenceController.AVAILABLE);
+ }
+
+ @Test
+ public void getAvailabilityStatus_noInstalledServices_shouldReturnDisabledDependentSetting() {
+ mShadowAccessibilityManager.setInstalledAccessibilityServiceList(new ArrayList<>());
+
+ assertThat(mController.getAvailabilityStatus())
+ .isEqualTo(BasePreferenceController.DISABLED_DEPENDENT_SETTING);
+ }
+
+ @Test
+ @Config(shadows = {ShadowAccessibilityShortcutPreferenceFragment.class})
+ public void getSummary_enabledAndSelectedA11yServices_shouldReturnSelectedServiceName() {
+ ShadowAccessibilityShortcutPreferenceFragment.setServiceName(SERVICE_NAME);
+ Settings.Secure.putInt(mContext.getContentResolver(),
+ Settings.Secure.ACCESSIBILITY_SHORTCUT_ENABLED, ON);
+
+ assertThat(mController.getSummary()).isEqualTo(SERVICE_NAME);
+ }
+
+ @Test
+ public void getSummary_enabledAndNoA11yServices_shouldReturnNoServiceInstalled() {
+ mShadowAccessibilityManager.setInstalledAccessibilityServiceList(new ArrayList<>());
+ Settings.Secure.putInt(mContext.getContentResolver(),
+ Settings.Secure.ACCESSIBILITY_SHORTCUT_ENABLED, ON);
+
+ assertThat(mController.getSummary())
+ .isEqualTo(mContext.getString(R.string.accessibility_no_services_installed));
+ }
+
+ @Test
+ public void getSummary_disabledShortcut_shouldReturnOffSummary() {
+ Settings.Secure.putInt(mContext.getContentResolver(),
+ Settings.Secure.ACCESSIBILITY_SHORTCUT_ENABLED, OFF);
+
+ assertThat(mController.getSummary())
+ .isEqualTo(mContext.getString(R.string.accessibility_feature_state_off));
+ }
+
+ @Implements(AccessibilityShortcutPreferenceFragment.class)
+ private static class ShadowAccessibilityShortcutPreferenceFragment {
+ private static String sSelectedServiceName;
+
+ public static void setServiceName(String selectedServiceName) {
+ sSelectedServiceName = selectedServiceName;
+ }
+
+ @Implementation
+ protected static CharSequence getServiceName(Context context) {
+ return sSelectedServiceName;
+ }
+ }
+
+ private AccessibilityServiceInfo getMockAccessibilityServiceInfo() {
+ final ApplicationInfo applicationInfo = new ApplicationInfo();
+ final ServiceInfo serviceInfo = new ServiceInfo();
+ applicationInfo.packageName = PACKAGE_NAME;
+ serviceInfo.packageName = PACKAGE_NAME;
+ serviceInfo.name = CLASS_NAME;
+ serviceInfo.applicationInfo = applicationInfo;
+
+ final ResolveInfo resolveInfo = new ResolveInfo();
+ resolveInfo.serviceInfo = serviceInfo;
+
+ try {
+ final AccessibilityServiceInfo info = new AccessibilityServiceInfo(resolveInfo,
+ mContext);
+ ComponentName componentName = ComponentName.unflattenFromString(COMPONENT_NAME);
+ info.setComponentName(componentName);
+ return info;
+ } catch (XmlPullParserException | IOException e) {
+ // Do nothing
+ }
+
+ return null;
+ }
+
+ private List<AccessibilityServiceInfo> getMockServiceList() {
+ final List<AccessibilityServiceInfo> infoList = new ArrayList<>();
+ infoList.add(getMockAccessibilityServiceInfo());
+ return infoList;
+ }
+}
diff --git a/tests/robotests/src/com/android/settings/accessibility/AccessibilityTimeoutControllerTest.java b/tests/robotests/src/com/android/settings/accessibility/AccessibilityTimeoutControllerTest.java
index 7891664..7fefef6 100644
--- a/tests/robotests/src/com/android/settings/accessibility/AccessibilityTimeoutControllerTest.java
+++ b/tests/robotests/src/com/android/settings/accessibility/AccessibilityTimeoutControllerTest.java
@@ -31,8 +31,8 @@
import androidx.preference.PreferenceScreen;
import com.android.settings.R;
-import com.android.settings.widget.RadioButtonPreference;
import com.android.settingslib.core.lifecycle.Lifecycle;
+import com.android.settingslib.widget.RadioButtonPreference;
import org.junit.Before;
import org.junit.Test;
diff --git a/tests/robotests/src/com/android/settings/accessibility/AccessibilityTimeoutPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accessibility/AccessibilityTimeoutPreferenceControllerTest.java
new file mode 100644
index 0000000..50f311e
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/accessibility/AccessibilityTimeoutPreferenceControllerTest.java
@@ -0,0 +1,80 @@
+/*
+ * 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.accessibility;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.content.Context;
+import android.provider.Settings;
+
+import com.android.settings.R;
+import com.android.settings.core.BasePreferenceController;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.RuntimeEnvironment;
+
+@RunWith(RobolectricTestRunner.class)
+public class AccessibilityTimeoutPreferenceControllerTest {
+
+ private Context mContext;
+ private AccessibilityTimeoutPreferenceController mController;
+
+ @Before
+ public void setUp() {
+ mContext = RuntimeEnvironment.application;
+ mController = new AccessibilityTimeoutPreferenceController(mContext, "control_timeout");
+ }
+
+ @Test
+ public void getAvailabilityStatus_shouldReturnAvailable() {
+ assertThat(mController.getAvailabilityStatus()).isEqualTo(
+ BasePreferenceController.AVAILABLE);
+ }
+
+ @Test
+ public void getSummary_byDefault_shouldReturnDefaultSummary() {
+ final String[] timeoutSummarys = mContext.getResources().getStringArray(
+ R.array.accessibility_timeout_summaries);
+ Settings.Secure.putString(mContext.getContentResolver(),
+ Settings.Secure.ACCESSIBILITY_INTERACTIVE_UI_TIMEOUT_MS, "0");
+
+ assertThat(mController.getSummary()).isEqualTo(timeoutSummarys[0]);
+ }
+
+ @Test
+ public void getSummary_invalidTimeout_shouldReturnDefaultSummary() {
+ final String[] timeoutSummarys = mContext.getResources().getStringArray(
+ R.array.accessibility_timeout_summaries);
+ Settings.Secure.putString(mContext.getContentResolver(),
+ Settings.Secure.ACCESSIBILITY_INTERACTIVE_UI_TIMEOUT_MS, "invalid_timeout");
+
+ assertThat(mController.getSummary()).isEqualTo(timeoutSummarys[0]);
+ }
+
+ @Test
+ public void getSummary_validTimeout_shouldReturnValidSummary() {
+ final String[] timeoutSummarys = mContext.getResources().getStringArray(
+ R.array.accessibility_timeout_summaries);
+ Settings.Secure.putString(mContext.getContentResolver(),
+ Settings.Secure.ACCESSIBILITY_INTERACTIVE_UI_TIMEOUT_MS, "60000");
+
+ assertThat(mController.getSummary()).isEqualTo(timeoutSummarys[3]);
+ }
+}
diff --git a/tests/robotests/src/com/android/settings/accessibility/AccessibilityUtilTest.java b/tests/robotests/src/com/android/settings/accessibility/AccessibilityUtilTest.java
new file mode 100644
index 0000000..70d86d0
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/accessibility/AccessibilityUtilTest.java
@@ -0,0 +1,71 @@
+/*
+ * 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.accessibility;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.content.Context;
+import android.provider.Settings;
+
+import com.android.settings.R;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.RuntimeEnvironment;
+
+@RunWith(RobolectricTestRunner.class)
+public class AccessibilityUtilTest {
+ private static final int ON = 1;
+ private static final int OFF = 0;
+ private static final String SECURE_TEST_KEY = "secure_test_key";
+ private Context mContext;
+
+ @Before
+ public void setUp() {
+ mContext = RuntimeEnvironment.application;
+ }
+
+ @Test
+ public void getSummary_hasValueAndEqualsToOne_shouldReturnOnString() {
+ Settings.Secure.putInt(mContext.getContentResolver(), SECURE_TEST_KEY, ON);
+
+ final CharSequence result = AccessibilityUtil.getSummary(mContext, SECURE_TEST_KEY);
+
+ assertThat(result)
+ .isEqualTo(mContext.getText(R.string.accessibility_feature_state_on));
+ }
+
+ @Test
+ public void getSummary_hasValueAndEqualsToZero_shouldReturnOffString() {
+ Settings.Secure.putInt(mContext.getContentResolver(), SECURE_TEST_KEY, OFF);
+
+ final CharSequence result = AccessibilityUtil.getSummary(mContext, SECURE_TEST_KEY);
+
+ assertThat(result)
+ .isEqualTo(mContext.getText(R.string.accessibility_feature_state_off));
+ }
+
+ @Test
+ public void getSummary_noValue_shouldReturnOffString() {
+ final CharSequence result = AccessibilityUtil.getSummary(mContext, SECURE_TEST_KEY);
+
+ assertThat(result)
+ .isEqualTo(mContext.getText(R.string.accessibility_feature_state_off));
+ }
+}
diff --git a/tests/robotests/src/com/android/settings/accessibility/AutoclickPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accessibility/AutoclickPreferenceControllerTest.java
new file mode 100644
index 0000000..b8be23e
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/accessibility/AutoclickPreferenceControllerTest.java
@@ -0,0 +1,73 @@
+/*
+ * 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.accessibility;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.content.Context;
+import android.provider.Settings;
+import android.view.accessibility.AccessibilityManager;
+
+import com.android.settings.R;
+import com.android.settings.core.BasePreferenceController;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.RuntimeEnvironment;
+
+@RunWith(RobolectricTestRunner.class)
+public class AutoclickPreferenceControllerTest {
+
+ private Context mContext;
+ private AutoclickPreferenceController mController;
+
+ @Before
+ public void setUp() {
+ mContext = RuntimeEnvironment.application;
+ mController = new AutoclickPreferenceController(mContext, "auto_click");
+ }
+
+ @Test
+ public void getAvailabilityStatus_shouldReturnAvailableUnsearchable() {
+ assertThat(mController.getAvailabilityStatus())
+ .isEqualTo(BasePreferenceController.AVAILABLE_UNSEARCHABLE);
+ }
+
+ @Test
+ public void getSummary_disabledAutoclick_shouldReturnOffSummary() {
+ Settings.Secure.putInt(mContext.getContentResolver(),
+ Settings.Secure.ACCESSIBILITY_AUTOCLICK_ENABLED, 0);
+
+ assertThat(mController.getSummary())
+ .isEqualTo(mContext.getText(R.string.accessibility_feature_state_off));
+ }
+
+ @Test
+ public void getSummary_enabledAutoclick_shouldReturnOnSummary() {
+ final int autoclickDelayDefault = AccessibilityManager.AUTOCLICK_DELAY_DEFAULT;
+ Settings.Secure.putInt(mContext.getContentResolver(),
+ Settings.Secure.ACCESSIBILITY_AUTOCLICK_ENABLED, 1);
+ Settings.Secure.putInt(mContext.getContentResolver(),
+ Settings.Secure.ACCESSIBILITY_AUTOCLICK_DELAY, autoclickDelayDefault);
+
+ assertThat(mController.getSummary())
+ .isEqualTo(ToggleAutoclickPreferenceFragment.getAutoclickPreferenceSummary(
+ mContext.getResources(), autoclickDelayDefault));
+ }
+}
diff --git a/tests/robotests/src/com/android/settings/accessibility/CaptioningPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accessibility/CaptioningPreferenceControllerTest.java
new file mode 100644
index 0000000..0dbb347
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/accessibility/CaptioningPreferenceControllerTest.java
@@ -0,0 +1,70 @@
+/*
+ * 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.accessibility;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.content.Context;
+import android.provider.Settings;
+
+import com.android.settings.R;
+import com.android.settings.core.BasePreferenceController;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.RuntimeEnvironment;
+
+@RunWith(RobolectricTestRunner.class)
+public class CaptioningPreferenceControllerTest {
+ private static final int ON = 1;
+ private static final int OFF = 0;
+
+ private Context mContext;
+ private CaptioningPreferenceController mController;
+
+ @Before
+ public void setUp() {
+ mContext = RuntimeEnvironment.application;
+ mController = new CaptioningPreferenceController(mContext, "captioning_pref");
+ }
+
+ @Test
+ public void getAvailabilityStatus_byDefault_shouldReturnAvailable() {
+ assertThat(mController.getAvailabilityStatus())
+ .isEqualTo(BasePreferenceController.AVAILABLE);
+ }
+
+ @Test
+ public void getSummary_enabledCaptions_shouldReturnOnSummary() {
+ Settings.Secure.putInt(mContext.getContentResolver(),
+ Settings.Secure.ACCESSIBILITY_CAPTIONING_ENABLED, ON);
+
+ assertThat(mController.getSummary()).isEqualTo(
+ mContext.getText(R.string.accessibility_feature_state_on));
+ }
+
+ @Test
+ public void getSummary_disabledCaptions_shouldReturnOffSummary() {
+ Settings.Secure.putInt(mContext.getContentResolver(),
+ Settings.Secure.ACCESSIBILITY_CAPTIONING_ENABLED, OFF);
+
+ assertThat(mController.getSummary()).isEqualTo(
+ mContext.getText(R.string.accessibility_feature_state_off));
+ }
+}
diff --git a/tests/robotests/src/com/android/settings/accessibility/DaltonizerPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accessibility/DaltonizerPreferenceControllerTest.java
new file mode 100644
index 0000000..e236cd4
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/accessibility/DaltonizerPreferenceControllerTest.java
@@ -0,0 +1,70 @@
+/*
+ * 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.accessibility;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.content.Context;
+import android.provider.Settings;
+
+import com.android.settings.R;
+import com.android.settings.core.BasePreferenceController;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.RuntimeEnvironment;
+
+@RunWith(RobolectricTestRunner.class)
+public class DaltonizerPreferenceControllerTest {
+ private static final int ON = 1;
+ private static final int OFF = 0;
+
+ private Context mContext;
+ private DaltonizerPreferenceController mController;
+
+ @Before
+ public void setUp() {
+ mContext = RuntimeEnvironment.application;
+ mController = new DaltonizerPreferenceController(mContext, "color_correction");
+ }
+
+ @Test
+ public void getAvailabilityStatus_shouldReturnAvailableUnsearchable() {
+ assertThat(mController.getAvailabilityStatus())
+ .isEqualTo(BasePreferenceController.AVAILABLE_UNSEARCHABLE);
+ }
+
+ @Test
+ public void getSummary_enabledColorCorrection_shouldReturnOnSummary() {
+ Settings.Secure.putInt(mContext.getContentResolver(),
+ Settings.Secure.ACCESSIBILITY_DISPLAY_DALTONIZER_ENABLED, ON);
+
+ assertThat(mController.getSummary())
+ .isEqualTo(mContext.getText(R.string.accessibility_feature_state_on));
+ }
+
+ @Test
+ public void getSummary_disabledColorCorrection_shouldReturnOffSummary() {
+ Settings.Secure.putInt(mContext.getContentResolver(),
+ Settings.Secure.ACCESSIBILITY_DISPLAY_DALTONIZER_ENABLED, OFF);
+
+ assertThat(mController.getSummary())
+ .isEqualTo(mContext.getText(R.string.accessibility_feature_state_off));
+ }
+}
diff --git a/tests/robotests/src/com/android/settings/accessibility/DisableAnimationsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accessibility/DisableAnimationsPreferenceControllerTest.java
new file mode 100644
index 0000000..245fb74
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/accessibility/DisableAnimationsPreferenceControllerTest.java
@@ -0,0 +1,103 @@
+/*
+ * 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.accessibility;
+
+import static com.android.settings.accessibility.DisableAnimationsPreferenceController.ANIMATION_OFF_VALUE;
+import static com.android.settings.accessibility.DisableAnimationsPreferenceController.ANIMATION_ON_VALUE;
+import static com.android.settings.accessibility.DisableAnimationsPreferenceController.TOGGLE_ANIMATION_TARGETS;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.content.Context;
+import android.provider.Settings;
+
+import androidx.preference.SwitchPreference;
+
+import com.android.settings.core.BasePreferenceController;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.RuntimeEnvironment;
+
+@RunWith(RobolectricTestRunner.class)
+public class DisableAnimationsPreferenceControllerTest {
+
+ private Context mContext;
+ private SwitchPreference mPreference;
+ private DisableAnimationsPreferenceController mController;
+
+ @Before
+ public void setUp() {
+ mContext = RuntimeEnvironment.application;
+ mPreference = new SwitchPreference(mContext);
+ mController = new DisableAnimationsPreferenceController(mContext, "disable_animation");
+ }
+
+ @Test
+ public void getAvailabilityStatus_shouldReturnAvailable() {
+ assertThat(mController.getAvailabilityStatus()).isEqualTo(
+ BasePreferenceController.AVAILABLE);
+ }
+
+ @Test
+ public void isChecked_enabledAnimation_shouldReturnFalse() {
+ for (String animationPreference : TOGGLE_ANIMATION_TARGETS) {
+ Settings.Global.putString(mContext.getContentResolver(), animationPreference,
+ ANIMATION_ON_VALUE);
+ }
+
+ mController.updateState(mPreference);
+
+ assertThat(mController.isChecked()).isFalse();
+ assertThat(mPreference.isChecked()).isFalse();
+ }
+
+ @Test
+ public void isChecked_disabledAnimation_shouldReturnTrue() {
+ for (String animationPreference : TOGGLE_ANIMATION_TARGETS) {
+ Settings.Global.putString(mContext.getContentResolver(), animationPreference,
+ ANIMATION_OFF_VALUE);
+ }
+
+ mController.updateState(mPreference);
+
+ assertThat(mController.isChecked()).isTrue();
+ assertThat(mPreference.isChecked()).isTrue();
+ }
+
+ @Test
+ public void setChecked_disabledAnimation_shouldDisableAnimationTargets() {
+ mController.setChecked(true);
+
+ for (String animationSetting : TOGGLE_ANIMATION_TARGETS) {
+ assertThat(Settings.Global.getString(mContext.getContentResolver(), animationSetting))
+ .isEqualTo(ANIMATION_OFF_VALUE);
+ }
+ }
+
+ @Test
+ public void setChecked_enabledAnimation_shouldEnableAnimationTargets() {
+ mController.setChecked(false);
+
+ for (String animationSetting : TOGGLE_ANIMATION_TARGETS) {
+ assertThat(Settings.Global.getString(mContext.getContentResolver(), animationSetting))
+ .isEqualTo(ANIMATION_ON_VALUE);
+ }
+ }
+}
diff --git a/tests/robotests/src/com/android/settings/accessibility/HighTextContrastPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accessibility/HighTextContrastPreferenceControllerTest.java
new file mode 100644
index 0000000..6eaf7a7
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/accessibility/HighTextContrastPreferenceControllerTest.java
@@ -0,0 +1,96 @@
+/*
+ * 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.accessibility;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.content.Context;
+import android.provider.Settings;
+
+import androidx.preference.SwitchPreference;
+
+import com.android.settings.core.BasePreferenceController;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.RuntimeEnvironment;
+
+@RunWith(RobolectricTestRunner.class)
+public class HighTextContrastPreferenceControllerTest {
+
+ private static final int ON = 1;
+ private static final int OFF = 0;
+ private static final int UNKNOWN = -1;
+
+ private Context mContext;
+ private SwitchPreference mPreference;
+ private HighTextContrastPreferenceController mController;
+
+ @Before
+ public void setUp() {
+ mContext = RuntimeEnvironment.application;
+ mPreference = new SwitchPreference(mContext);
+ mController = new HighTextContrastPreferenceController(mContext, "text_contrast");
+ }
+
+ @Test
+ public void getAvailabilityStatus_byDefault_shouldReturnAvailable() {
+ assertThat(mController.getAvailabilityStatus()).isEqualTo(
+ BasePreferenceController.AVAILABLE);
+ }
+
+ @Test
+ public void isChecked_enabledTextContrast_shouldReturnTrue() {
+ Settings.Secure.putInt(mContext.getContentResolver(),
+ Settings.Secure.ACCESSIBILITY_HIGH_TEXT_CONTRAST_ENABLED, ON);
+
+ mController.updateState(mPreference);
+
+ assertThat(mController.isChecked()).isTrue();
+ assertThat(mPreference.isChecked()).isTrue();
+ }
+
+ @Test
+ public void isChecked_disabledTextContrast_shouldReturnFalse() {
+ Settings.Secure.putInt(mContext.getContentResolver(),
+ Settings.Secure.ACCESSIBILITY_HIGH_TEXT_CONTRAST_ENABLED, OFF);
+
+ mController.updateState(mPreference);
+
+ assertThat(mController.isChecked()).isFalse();
+ assertThat(mPreference.isChecked()).isFalse();
+ }
+
+ @Test
+ public void setChecked_setTrue_shouldEnableTextContrast() {
+ mController.setChecked(true);
+
+ assertThat(Settings.Secure.getInt(mContext.getContentResolver(),
+ Settings.Secure.ACCESSIBILITY_HIGH_TEXT_CONTRAST_ENABLED, UNKNOWN)).isEqualTo(ON);
+
+ }
+
+ @Test
+ public void setChecked_setFalse_shouldDisableTextContrast() {
+ mController.setChecked(false);
+
+ assertThat(Settings.Secure.getInt(mContext.getContentResolver(),
+ Settings.Secure.ACCESSIBILITY_HIGH_TEXT_CONTRAST_ENABLED, UNKNOWN)).isEqualTo(OFF);
+ }
+}
diff --git a/tests/robotests/src/com/android/settings/accessibility/LargePointerIconPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accessibility/LargePointerIconPreferenceControllerTest.java
new file mode 100644
index 0000000..1f7f5ad
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/accessibility/LargePointerIconPreferenceControllerTest.java
@@ -0,0 +1,96 @@
+/*
+ * 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.accessibility;
+
+import static com.android.settings.accessibility.LargePointerIconPreferenceController.OFF;
+import static com.android.settings.accessibility.LargePointerIconPreferenceController.ON;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.content.Context;
+import android.provider.Settings;
+
+import androidx.preference.SwitchPreference;
+
+import com.android.settings.core.BasePreferenceController;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.RuntimeEnvironment;
+
+@RunWith(RobolectricTestRunner.class)
+public class LargePointerIconPreferenceControllerTest {
+
+ private static final int UNKNOWN = -1;
+
+ private Context mContext;
+ private SwitchPreference mPreference;
+ private LargePointerIconPreferenceController mController;
+
+ @Before
+ public void setUp() {
+ mContext = RuntimeEnvironment.application;
+ mPreference = new SwitchPreference(mContext);
+ mController = new LargePointerIconPreferenceController(mContext, "large_pointer");
+ }
+
+ @Test
+ public void getAvailabilityStatus_shouldReturnAvailable() {
+ assertThat(mController.getAvailabilityStatus()).isEqualTo(
+ BasePreferenceController.AVAILABLE);
+ }
+
+ @Test
+ public void isChecked_enabledLargePointer_shouldReturnTrue() {
+ Settings.Secure.putInt(mContext.getContentResolver(),
+ Settings.Secure.ACCESSIBILITY_LARGE_POINTER_ICON, ON);
+
+ mController.updateState(mPreference);
+
+ assertThat(mController.isChecked()).isTrue();
+ assertThat(mPreference.isChecked()).isTrue();
+ }
+
+ @Test
+ public void isChecked_disabledLargePointer_shouldReturnFalse() {
+ Settings.Secure.putInt(mContext.getContentResolver(),
+ Settings.Secure.ACCESSIBILITY_LARGE_POINTER_ICON, OFF);
+
+ mController.updateState(mPreference);
+
+ assertThat(mController.isChecked()).isFalse();
+ assertThat(mPreference.isChecked()).isFalse();
+ }
+
+ @Test
+ public void setChecked_enabled_shouldEnableLargePointer() {
+ mController.setChecked(true);
+
+ assertThat(Settings.Secure.getInt(mContext.getContentResolver(),
+ Settings.Secure.ACCESSIBILITY_LARGE_POINTER_ICON, UNKNOWN)).isEqualTo(ON);
+ }
+
+ @Test
+ public void setChecked_disabled_shouldDisableLargePointer() {
+ mController.setChecked(false);
+
+ assertThat(Settings.Secure.getInt(mContext.getContentResolver(),
+ Settings.Secure.ACCESSIBILITY_LARGE_POINTER_ICON, UNKNOWN)).isEqualTo(OFF);
+ }
+}
diff --git a/tests/robotests/src/com/android/settings/accessibility/LockScreenRotationPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accessibility/LockScreenRotationPreferenceControllerTest.java
new file mode 100644
index 0000000..ef8f569
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/accessibility/LockScreenRotationPreferenceControllerTest.java
@@ -0,0 +1,107 @@
+/*
+ * 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.accessibility;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.content.Context;
+import android.os.UserHandle;
+import android.provider.Settings;
+
+import androidx.preference.SwitchPreference;
+
+import com.android.internal.view.RotationPolicy;
+import com.android.settings.core.BasePreferenceController;
+import com.android.settings.testutils.shadow.ShadowRotationPolicy;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+
+@RunWith(RobolectricTestRunner.class)
+public class LockScreenRotationPreferenceControllerTest {
+
+ private Context mContext;
+ private SwitchPreference mPreference;
+ private LockScreenRotationPreferenceController mController;
+
+ @Before
+ public void setUp() {
+ mContext = RuntimeEnvironment.application;
+ mPreference = new SwitchPreference(mContext);
+ mController = new LockScreenRotationPreferenceController(mContext, "lock_screen");
+ }
+
+ @Test
+ @Config(shadows = {ShadowRotationPolicy.class})
+ public void getAvailabilityStatus_supportedRotation_shouldReturnAvailable() {
+ ShadowRotationPolicy.setRotationSupported(true /* supported */);
+
+ assertThat(mController.getAvailabilityStatus()).isEqualTo(
+ BasePreferenceController.AVAILABLE);
+ }
+
+ @Test
+ @Config(shadows = {ShadowRotationPolicy.class})
+ public void getAvailabilityStatus_unsupportedRotation_shouldReturnUnsupportedOnDevice() {
+ ShadowRotationPolicy.setRotationSupported(false /* supported */);
+
+ assertThat(mController.getAvailabilityStatus()).isEqualTo(
+ BasePreferenceController.UNSUPPORTED_ON_DEVICE);
+ }
+
+ @Test
+ @Config(shadows = {ShadowRotationPolicy.class})
+ public void setChecked_enabled() {
+ mController.setChecked(true /* isChecked */);
+
+ assertThat(mController.isChecked()).isTrue();
+ assertThat(RotationPolicy.isRotationLocked(mContext)).isFalse();
+ }
+
+ @Test
+ @Config(shadows = {ShadowRotationPolicy.class})
+ public void setChecked_disabled() {
+ mController.setChecked(false /* isChecked */);
+
+ assertThat(mController.isChecked()).isFalse();
+ assertThat(RotationPolicy.isRotationLocked(mContext)).isTrue();
+ }
+
+ @Test
+ public void updateState_settingIsOn_shouldTurnOnToggle() {
+ Settings.System.putIntForUser(mContext.getContentResolver(),
+ Settings.System.ACCELEROMETER_ROTATION, 1, UserHandle.USER_CURRENT);
+
+ mController.updateState(mPreference);
+
+ assertThat(mPreference.isChecked()).isTrue();
+ }
+
+ @Test
+ public void updateState_settingIsOff_shouldTurnOffToggle() {
+ Settings.System.putIntForUser(mContext.getContentResolver(),
+ Settings.System.ACCELEROMETER_ROTATION, 0, UserHandle.USER_CURRENT);
+
+ mController.updateState(mPreference);
+
+ assertThat(mPreference.isChecked()).isFalse();
+ }
+}
diff --git a/tests/robotests/src/com/android/settings/accessibility/MagnificationPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accessibility/MagnificationPreferenceControllerTest.java
new file mode 100644
index 0000000..d462c2a
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/accessibility/MagnificationPreferenceControllerTest.java
@@ -0,0 +1,48 @@
+/*
+ * 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.accessibility;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.content.Context;
+
+import com.android.settings.core.BasePreferenceController;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.RuntimeEnvironment;
+
+@RunWith(RobolectricTestRunner.class)
+public class MagnificationPreferenceControllerTest {
+
+ private Context mContext;
+ private MagnificationPreferenceController mController;
+
+ @Before
+ public void setUp() {
+ mContext = RuntimeEnvironment.application;
+ mController = new MagnificationPreferenceController(mContext, "magnification");
+ }
+
+ @Test
+ public void getAvailabilityStatus_shouldReturnAvailable() {
+ assertThat(mController.getAvailabilityStatus()).isEqualTo(
+ BasePreferenceController.AVAILABLE);
+ }
+}
diff --git a/tests/robotests/src/com/android/settings/accessibility/MasterMonoPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accessibility/MasterMonoPreferenceControllerTest.java
new file mode 100644
index 0000000..ee54b88
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/accessibility/MasterMonoPreferenceControllerTest.java
@@ -0,0 +1,96 @@
+/*
+ * 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.accessibility;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.content.Context;
+import android.os.UserHandle;
+import android.provider.Settings;
+
+import androidx.preference.SwitchPreference;
+
+import com.android.settings.core.BasePreferenceController;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.RuntimeEnvironment;
+
+@RunWith(RobolectricTestRunner.class)
+public class MasterMonoPreferenceControllerTest {
+
+ private static final int ON = 1;
+ private static final int OFF = 0;
+ private static final int UNKNOWN = -1;
+
+ private Context mContext;
+ private SwitchPreference mPreference;
+ private MasterMonoPreferenceController mController;
+
+ @Before
+ public void setUp() {
+ mContext = RuntimeEnvironment.application;
+ mPreference = new SwitchPreference(mContext);
+ mController = new MasterMonoPreferenceController(mContext, "master_mono");
+ }
+
+ @Test
+ public void getAvailabilityStatus_byDefault_shouldReturnAvailable() {
+ assertThat(mController.getAvailabilityStatus()).isEqualTo(
+ BasePreferenceController.AVAILABLE);
+ }
+
+ @Test
+ public void isChecked_enabledMonoAudio_shouldReturnTrue() {
+ Settings.System.putIntForUser(mContext.getContentResolver(),
+ Settings.System.MASTER_MONO, ON, UserHandle.USER_CURRENT);
+
+ mController.updateState(mPreference);
+
+ assertThat(mController.isChecked()).isTrue();
+ assertThat(mPreference.isChecked()).isTrue();
+ }
+
+ @Test
+ public void isChecked_disabledMonoAudio_shouldReturnFalse() {
+ Settings.System.putIntForUser(mContext.getContentResolver(),
+ Settings.System.MASTER_MONO, OFF, UserHandle.USER_CURRENT);
+
+ mController.updateState(mPreference);
+
+ assertThat(mController.isChecked()).isFalse();
+ assertThat(mPreference.isChecked()).isFalse();
+ }
+
+ @Test
+ public void setChecked_setTrue_shouldEnableMonoAudio() {
+ mController.setChecked(true);
+
+ assertThat(Settings.System.getIntForUser(mContext.getContentResolver(),
+ Settings.System.MASTER_MONO, UNKNOWN, UserHandle.USER_CURRENT)).isEqualTo(ON);
+ }
+
+ @Test
+ public void setChecked_setFalse_shouldDisableMonoAudio() {
+ mController.setChecked(false);
+
+ assertThat(Settings.System.getIntForUser(mContext.getContentResolver(),
+ Settings.System.MASTER_MONO, UNKNOWN, UserHandle.USER_CURRENT)).isEqualTo(OFF);
+ }
+}
diff --git a/tests/robotests/src/com/android/settings/accessibility/PowerButtonEndsCallPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accessibility/PowerButtonEndsCallPreferenceControllerTest.java
new file mode 100644
index 0000000..3258cbd
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/accessibility/PowerButtonEndsCallPreferenceControllerTest.java
@@ -0,0 +1,129 @@
+/*
+ * 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.accessibility;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.content.Context;
+import android.provider.Settings;
+
+import androidx.preference.SwitchPreference;
+
+import com.android.settings.core.BasePreferenceController;
+import com.android.settings.testutils.shadow.ShadowKeyCharacterMap;
+import com.android.settings.testutils.shadow.ShadowUtils;
+
+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 org.robolectric.annotation.Config;
+
+@RunWith(RobolectricTestRunner.class)
+@Config(shadows = {ShadowUtils.class, ShadowKeyCharacterMap.class})
+public class PowerButtonEndsCallPreferenceControllerTest {
+
+ private static final int UNKNOWN = -1;
+
+ private Context mContext;
+ private SwitchPreference mPreference;
+ private PowerButtonEndsCallPreferenceController mController;
+
+ @Before
+ public void setUp() {
+ mContext = RuntimeEnvironment.application;
+ mPreference = new SwitchPreference(mContext);
+ mController = new PowerButtonEndsCallPreferenceController(mContext, "power_button");
+ }
+
+ @After
+ public void tearDown() {
+ ShadowUtils.reset();
+ ShadowKeyCharacterMap.reset();
+ }
+
+ @Test
+ public void getAvailabilityStatus_hasPowerKeyAndVoiceCapable_shouldReturnAvailable() {
+ ShadowKeyCharacterMap.setDevicehasKey(true);
+ ShadowUtils.setIsVoiceCapable(true);
+
+ assertThat(mController.getAvailabilityStatus())
+ .isEqualTo(BasePreferenceController.AVAILABLE);
+ }
+
+ @Test
+ public void getAvailabilityStatus_noVoiceCapable_shouldReturnUnsupportedOnDevice() {
+ ShadowKeyCharacterMap.setDevicehasKey(true);
+ ShadowUtils.setIsVoiceCapable(false);
+
+ assertThat(mController.getAvailabilityStatus())
+ .isEqualTo(BasePreferenceController.UNSUPPORTED_ON_DEVICE);
+ }
+
+ @Test
+ public void getAvailabilityStatus_noPowerKey_shouldReturnUnsupportedOnDevice() {
+ ShadowKeyCharacterMap.setDevicehasKey(false);
+ ShadowUtils.setIsVoiceCapable(true);
+
+ assertThat(mController.getAvailabilityStatus())
+ .isEqualTo(BasePreferenceController.UNSUPPORTED_ON_DEVICE);
+ }
+
+ @Test
+ public void isChecked_enabledHangUp_shouldReturnTrue() {
+ Settings.Secure.putInt(mContext.getContentResolver(),
+ Settings.Secure.INCALL_POWER_BUTTON_BEHAVIOR,
+ Settings.Secure.INCALL_POWER_BUTTON_BEHAVIOR_HANGUP);
+
+ mController.updateState(mPreference);
+
+ assertThat(mController.isChecked()).isTrue();
+ assertThat(mPreference.isChecked()).isTrue();
+ }
+
+ @Test
+ public void isChecked_disabledHangUp_shouldReturnFalse() {
+ Settings.Secure.putInt(mContext.getContentResolver(),
+ Settings.Secure.INCALL_POWER_BUTTON_BEHAVIOR,
+ Settings.Secure.INCALL_POWER_BUTTON_BEHAVIOR_SCREEN_OFF);
+
+ mController.updateState(mPreference);
+
+ assertThat(mController.isChecked()).isFalse();
+ assertThat(mPreference.isChecked()).isFalse();
+ }
+
+ @Test
+ public void setChecked_enabled_shouldEnableHangUp() {
+ mController.setChecked(true);
+
+ assertThat(Settings.Secure.getInt(mContext.getContentResolver(),
+ Settings.Secure.INCALL_POWER_BUTTON_BEHAVIOR, UNKNOWN))
+ .isEqualTo(Settings.Secure.INCALL_POWER_BUTTON_BEHAVIOR_HANGUP);
+ }
+
+ @Test
+ public void setChecked_disabled_shouldDisableHangUp() {
+ mController.setChecked(false);
+
+ assertThat(Settings.Secure.getInt(mContext.getContentResolver(),
+ Settings.Secure.INCALL_POWER_BUTTON_BEHAVIOR, UNKNOWN))
+ .isEqualTo(Settings.Secure.INCALL_POWER_BUTTON_BEHAVIOR_SCREEN_OFF);
+ }
+}
diff --git a/tests/robotests/src/com/android/settings/accessibility/SelectLongPressTimeoutPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accessibility/SelectLongPressTimeoutPreferenceControllerTest.java
new file mode 100644
index 0000000..1bdfb41
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/accessibility/SelectLongPressTimeoutPreferenceControllerTest.java
@@ -0,0 +1,78 @@
+/*
+ * 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.accessibility;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.content.Context;
+import android.provider.Settings;
+
+import com.android.settings.core.BasePreferenceController;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.RuntimeEnvironment;
+
+@RunWith(RobolectricTestRunner.class)
+public class SelectLongPressTimeoutPreferenceControllerTest {
+ private static final int VALID_VALUE = 1500;
+ private static final int INVALID_VALUE = 0;
+ private static final int DEFAULT_VALUE = 400;
+
+ private Context mContext;
+ private SelectLongPressTimeoutPreferenceController mController;
+
+ @Before
+ public void setUp() {
+ mContext = RuntimeEnvironment.application;
+ mController = new SelectLongPressTimeoutPreferenceController(mContext, "press_timeout");
+ }
+
+ @Test
+ public void getAvailabilityStatus_byDefault_shouldReturnAvailable() {
+ assertThat(mController.getAvailabilityStatus())
+ .isEqualTo(BasePreferenceController.AVAILABLE);
+ }
+
+ @Test
+ public void getSummary_byDefault_shouldReturnShort() {
+ Settings.Secure.putInt(mContext.getContentResolver(),
+ Settings.Secure.LONG_PRESS_TIMEOUT, DEFAULT_VALUE);
+ final String expected = "Short";
+
+ assertThat(mController.getSummary()).isEqualTo(expected);
+ }
+
+ @Test
+ public void getSummary_validValue_shouldReturnLong() {
+ Settings.Secure.putInt(mContext.getContentResolver(),
+ Settings.Secure.LONG_PRESS_TIMEOUT, VALID_VALUE);
+ final String expected = "Long";
+
+ assertThat(mController.getSummary()).isEqualTo(expected);
+ }
+
+ @Test
+ public void getSummary_invalidValue_shouldReturnNull() {
+ Settings.Secure.putInt(mContext.getContentResolver(),
+ Settings.Secure.LONG_PRESS_TIMEOUT, INVALID_VALUE);
+
+ assertThat(mController.getSummary()).isNull();
+ }
+}
diff --git a/tests/robotests/src/com/android/settings/accessibility/VibrationPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accessibility/VibrationPreferenceControllerTest.java
new file mode 100644
index 0000000..e4d0f45
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/accessibility/VibrationPreferenceControllerTest.java
@@ -0,0 +1,87 @@
+/*
+ * 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.accessibility;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.content.Context;
+import android.os.Vibrator;
+import android.provider.Settings;
+
+import com.android.settings.R;
+import com.android.settings.core.BasePreferenceController;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.RuntimeEnvironment;
+
+@RunWith(RobolectricTestRunner.class)
+public class VibrationPreferenceControllerTest {
+
+ private static final String VIBRATION_ON = "On";
+ private static final String VIBRATION_OFF = "Off";
+
+ private Context mContext;
+ private VibrationPreferenceController mController;
+
+ @Before
+ public void setUp() {
+ mContext = RuntimeEnvironment.application;
+ mController = new VibrationPreferenceController(mContext, "vibration_pref");
+ }
+
+ @Test
+ public void getAvailabilityStatus_byDefault_shouldReturnAvailable() {
+ assertThat(mController.getAvailabilityStatus())
+ .isEqualTo(BasePreferenceController.AVAILABLE);
+ }
+
+ @Test
+ public void getSummary_disabledVibration_shouldReturnOffSummary() {
+ Settings.System.putInt(mContext.getContentResolver(),
+ Settings.System.RING_VIBRATION_INTENSITY, Vibrator.VIBRATION_INTENSITY_OFF);
+ Settings.System.putInt(mContext.getContentResolver(),
+ Settings.System.NOTIFICATION_VIBRATION_INTENSITY, Vibrator.VIBRATION_INTENSITY_OFF);
+ Settings.System.putInt(mContext.getContentResolver(),
+ Settings.System.HAPTIC_FEEDBACK_INTENSITY, Vibrator.VIBRATION_INTENSITY_OFF);
+ final String expectedResult = mContext.getString(R.string.switch_off_text);
+
+ assertThat(mController.getSummary()).isEqualTo(expectedResult);
+ }
+
+ @Test
+ public void getSummary_enabledSomeVibration_shouldReturnVibrationOnSummary() {
+ Settings.System.putInt(mContext.getContentResolver(),
+ Settings.System.RING_VIBRATION_INTENSITY, Vibrator.VIBRATION_INTENSITY_MEDIUM);
+ Settings.System.putInt(mContext.getContentResolver(),
+ Settings.System.VIBRATE_WHEN_RINGING, 1);
+ Settings.System.putInt(mContext.getContentResolver(),
+ Settings.System.NOTIFICATION_VIBRATION_INTENSITY, Vibrator.VIBRATION_INTENSITY_OFF);
+ Settings.System.putInt(mContext.getContentResolver(),
+ Settings.System.HAPTIC_FEEDBACK_INTENSITY, Vibrator.VIBRATION_INTENSITY_MEDIUM);
+ Settings.System.putInt(mContext.getContentResolver(),
+ Settings.System.HAPTIC_FEEDBACK_ENABLED, 1);
+ final String expectedResult = mContext.getString(R.string.accessibility_vibration_summary,
+ VIBRATION_ON /* ring */,
+ VIBRATION_OFF /* notification */,
+ VIBRATION_ON /* touch */);
+
+ assertThat(mController.getSummary()).isEqualTo(expectedResult);
+ }
+}
diff --git a/tests/robotests/src/com/android/settings/accounts/AccountDashboardFragmentTest.java b/tests/robotests/src/com/android/settings/accounts/AccountDashboardFragmentTest.java
index 0060875..c07f915 100644
--- a/tests/robotests/src/com/android/settings/accounts/AccountDashboardFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/accounts/AccountDashboardFragmentTest.java
@@ -15,8 +15,16 @@
*/
package com.android.settings.accounts;
+import static android.app.ActivityManager.LOCK_TASK_MODE_NONE;
+import static android.app.ActivityManager.LOCK_TASK_MODE_PINNED;
+
import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.spy;
+
+import android.app.ActivityManager;
+import android.content.Context;
import android.provider.SearchIndexableResource;
import com.android.settingslib.drawer.CategoryKey;
@@ -26,6 +34,8 @@
import org.junit.runner.RunWith;
import org.robolectric.RobolectricTestRunner;
import org.robolectric.RuntimeEnvironment;
+import org.robolectric.shadow.api.Shadow;
+import org.robolectric.shadows.ShadowActivityManager;
import java.util.List;
@@ -33,10 +43,12 @@
public class AccountDashboardFragmentTest {
private AccountDashboardFragment mFragment;
+ private Context mContext;
@Before
public void setUp() {
mFragment = new AccountDashboardFragment();
+ mContext = RuntimeEnvironment.application;
}
@Test
@@ -53,4 +65,26 @@
assertThat(indexRes).isNotNull();
assertThat(indexRes.get(0).xmlResId).isEqualTo(mFragment.getPreferenceScreenResId());
}
+
+ @Test
+ public void isLockTaskModePinned_disableLockTaskMode_shouldReturnFalse() {
+ final AccountDashboardFragment fragment = spy(mFragment);
+ doReturn(mContext).when(fragment).getContext();
+ final ShadowActivityManager activityManager =
+ Shadow.extract(mContext.getSystemService(ActivityManager.class));
+ activityManager.setLockTaskModeState(LOCK_TASK_MODE_NONE);
+
+ assertThat(fragment.isLockTaskModePinned()).isFalse();
+ }
+
+ @Test
+ public void isLockTaskModePinned_hasTaskPinned_shouldReturnTrue() {
+ final AccountDashboardFragment fragment = spy(mFragment);
+ doReturn(mContext).when(fragment).getContext();
+ final ShadowActivityManager activityManager =
+ Shadow.extract(mContext.getSystemService(ActivityManager.class));
+ activityManager.setLockTaskModeState(LOCK_TASK_MODE_PINNED);
+
+ assertThat(fragment.isLockTaskModePinned()).isTrue();
+ }
}
diff --git a/tests/robotests/src/com/android/settings/accounts/AccountHeaderPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accounts/AccountHeaderPreferenceControllerTest.java
index 50814ee..8fb40bf 100644
--- a/tests/robotests/src/com/android/settings/accounts/AccountHeaderPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/accounts/AccountHeaderPreferenceControllerTest.java
@@ -36,7 +36,7 @@
import com.android.settings.R;
import com.android.settings.testutils.FakeFeatureFactory;
-import com.android.settingslib.accounts.AuthenticatorHelper;
+import com.android.settings.testutils.shadow.ShadowAuthenticationHelper;
import com.android.settingslib.core.lifecycle.Lifecycle;
import com.android.settingslib.widget.LayoutPreference;
@@ -48,11 +48,9 @@
import org.robolectric.RobolectricTestRunner;
import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config;
-import org.robolectric.annotation.Implementation;
-import org.robolectric.annotation.Implements;
@RunWith(RobolectricTestRunner.class)
-@Config(shadows = AccountHeaderPreferenceControllerTest.ShadowAuthenticatorHelper.class)
+@Config(shadows = ShadowAuthenticationHelper.class)
public class AccountHeaderPreferenceControllerTest {
@Mock
@@ -109,12 +107,4 @@
assertThat(label).isEqualTo(account.name);
}
-
- @Implements(AuthenticatorHelper.class)
- public static class ShadowAuthenticatorHelper {
- @Implementation
- protected void onAccountsUpdated(Account[] accounts) {
-
- }
- }
}
diff --git a/tests/robotests/src/com/android/settings/accounts/AvatarViewMixinTest.java b/tests/robotests/src/com/android/settings/accounts/AvatarViewMixinTest.java
index 8c75e33..8dbf2a8 100644
--- a/tests/robotests/src/com/android/settings/accounts/AvatarViewMixinTest.java
+++ b/tests/robotests/src/com/android/settings/accounts/AvatarViewMixinTest.java
@@ -131,6 +131,17 @@
}
@Test
+ @Config(qualifiers = "mcc999")
+ public void onStart_noAccount_mAccountNameShouldBeNull() {
+ final AvatarViewMixin avatarViewMixin = new AvatarViewMixin(mActivity, mImageView);
+ avatarViewMixin.mAccountName = DUMMY_ACCOUNT;
+
+ avatarViewMixin.onStart();
+
+ assertThat(avatarViewMixin.mAccountName).isNull();
+ }
+
+ @Test
public void queryProviderAuthority_useShadowPackagteManager_returnNull() {
final AvatarViewMixin avatarViewMixin = new AvatarViewMixin(mActivity, mImageView);
diff --git a/tests/robotests/src/com/android/settings/accounts/EnterpriseDisclosurePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accounts/EnterpriseDisclosurePreferenceControllerTest.java
index b9c62c2..b10a729 100644
--- a/tests/robotests/src/com/android/settings/accounts/EnterpriseDisclosurePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/accounts/EnterpriseDisclosurePreferenceControllerTest.java
@@ -18,46 +18,37 @@
import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.never;
import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
import android.content.Context;
-import androidx.preference.PreferenceManager;
-import androidx.preference.PreferenceScreen;
+import androidx.preference.Preference;
import com.android.settings.core.BasePreferenceController;
-import com.android.settingslib.widget.FooterPreferenceMixinCompat;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.mockito.MockitoAnnotations;
import org.robolectric.RobolectricTestRunner;
import org.robolectric.RuntimeEnvironment;
@RunWith(RobolectricTestRunner.class)
public class EnterpriseDisclosurePreferenceControllerTest {
-
private static final String TEST_DISCLOSURE = "This is a test disclosure.";
- private ChooseAccountFragment mFragment;
private Context mContext;
private EnterpriseDisclosurePreferenceController mController;
- private FooterPreferenceMixinCompat mFooterPreferenceMixin;
- private PreferenceManager mPreferenceManager;
- private PreferenceScreen mPreferenceScreen;
+ private Preference mPreference;
@Before
public void setUp() {
- MockitoAnnotations.initMocks(this);
mContext = RuntimeEnvironment.application;
- mController = spy(new EnterpriseDisclosurePreferenceController(mContext));
- mFragment = spy(new ChooseAccountFragment());
- mFooterPreferenceMixin = new FooterPreferenceMixinCompat(mFragment,
- mFragment.getSettingsLifecycle());
- mPreferenceManager = new PreferenceManager(mContext);
- mPreferenceScreen = mPreferenceManager.createPreferenceScreen(mContext);
+ mController = spy(new EnterpriseDisclosurePreferenceController(mContext, "my_key"));
+ mPreference = spy(new Preference(mContext));
}
@Test
@@ -77,24 +68,20 @@
}
@Test
- public void displayPreference_hasDisclosure_shouldSetTitle() {
+ public void updateState_hasDisclosure_shouldSetTitle() {
doReturn(TEST_DISCLOSURE).when(mController).getDisclosure();
- doReturn(mPreferenceScreen).when(mFragment).getPreferenceScreen();
- doReturn(mPreferenceManager).when(mFragment).getPreferenceManager();
- mController.setFooterPreferenceMixin(mFooterPreferenceMixin);
- mController.displayPreference(mPreferenceScreen);
+ mController.updateState(mPreference);
- assertThat(mPreferenceScreen.getPreferenceCount()).isEqualTo(1);
- assertThat(mPreferenceScreen.getPreference(0).getTitle()).isEqualTo(TEST_DISCLOSURE);
+ assertThat(mPreference.getTitle()).isEqualTo(TEST_DISCLOSURE);
}
@Test
- public void displayPreference_noDisclosure_shouldBeInvisible() {
+ public void updateState_noDisclosure_shouldBeInvisible() {
doReturn(null).when(mController).getDisclosure();
- mController.displayPreference(mPreferenceScreen);
+ mController.updateState(mPreference);
- assertThat(mPreferenceScreen.getPreferenceCount()).isEqualTo(0);
+ verify(mPreference, never()).setTitle(any());
}
}
diff --git a/tests/robotests/src/com/android/settings/accounts/RemoveAccountPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accounts/RemoveAccountPreferenceControllerTest.java
index d98d30a..c2efd0d 100644
--- a/tests/robotests/src/com/android/settings/accounts/RemoveAccountPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/accounts/RemoveAccountPreferenceControllerTest.java
@@ -54,6 +54,7 @@
import com.android.settings.testutils.shadow.ShadowAccountManager;
import com.android.settings.testutils.shadow.ShadowContentResolver;
import com.android.settings.testutils.shadow.ShadowDevicePolicyManager;
+import com.android.settings.testutils.shadow.ShadowFragment;
import com.android.settings.testutils.shadow.ShadowUserManager;
import com.android.settingslib.widget.LayoutPreference;
@@ -64,6 +65,7 @@
import org.mockito.ArgumentCaptor;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
+import org.robolectric.Robolectric;
import org.robolectric.RobolectricTestRunner;
import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config;
@@ -113,8 +115,8 @@
when(mAccountManager.getAuthenticatorTypesAsUser(anyInt()))
.thenReturn(new AuthenticatorDescription[0]);
when(mAccountManager.getAccountsAsUser(anyInt())).thenReturn(new Account[0]);
- mController = new RemoveAccountPreferenceController(RuntimeEnvironment.application,
- mFragment);
+ mController = new RemoveAccountPreferenceController(
+ Robolectric.setupActivity(Activity.class), mFragment);
}
@After
@@ -169,7 +171,8 @@
}
@Test
- @Config(shadows = {ShadowAccountManager.class, ShadowContentResolver.class})
+ @Config(shadows = {ShadowAccountManager.class, ShadowContentResolver.class,
+ ShadowFragment.class})
public void confirmRemove_shouldRemoveAccount()
throws AuthenticatorException, OperationCanceledException, IOException {
when(mFragment.isAdded()).thenReturn(true);
@@ -201,7 +204,8 @@
}
@Test
- @Config(shadows = {ShadowAccountManager.class, ShadowContentResolver.class})
+ @Config(shadows = {ShadowAccountManager.class, ShadowContentResolver.class,
+ ShadowFragment.class})
public void confirmRemove_activityGone_shouldSilentlyRemoveAccount()
throws AuthenticatorException, OperationCanceledException, IOException {
final Account account = new Account("Account11", "com.acct1");
diff --git a/tests/robotests/src/com/android/settings/accounts/TopLevelAccountEntryPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accounts/TopLevelAccountEntryPreferenceControllerTest.java
index ced3db1..8fe8e19 100644
--- a/tests/robotests/src/com/android/settings/accounts/TopLevelAccountEntryPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/accounts/TopLevelAccountEntryPreferenceControllerTest.java
@@ -16,19 +16,12 @@
package com.android.settings.accounts;
-import static com.android.settings.accounts.TopLevelAccountEntryPreferenceControllerTest
- .ShadowAuthenticationHelper.LABELS;
-import static com.android.settings.accounts.TopLevelAccountEntryPreferenceControllerTest
- .ShadowAuthenticationHelper.TYPES;
-
import static com.google.common.truth.Truth.assertThat;
import android.content.Context;
-import android.os.UserHandle;
-import android.text.TextUtils;
import com.android.settings.R;
-import com.android.settingslib.accounts.AuthenticatorHelper;
+import com.android.settings.testutils.shadow.ShadowAuthenticationHelper;
import org.junit.After;
import org.junit.Before;
@@ -37,21 +30,22 @@
import org.robolectric.RobolectricTestRunner;
import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config;
-import org.robolectric.annotation.Implementation;
-import org.robolectric.annotation.Implements;
-import org.robolectric.annotation.Resetter;
@RunWith(RobolectricTestRunner.class)
-@Config(shadows = {TopLevelAccountEntryPreferenceControllerTest.ShadowAuthenticationHelper.class})
+@Config(shadows = {ShadowAuthenticationHelper.class})
public class TopLevelAccountEntryPreferenceControllerTest {
private TopLevelAccountEntryPreferenceController mController;
private Context mContext;
+ private String[] LABELS;
+ private String[] TYPES;
@Before
public void setUp() {
mContext = RuntimeEnvironment.application;
mController = new TopLevelAccountEntryPreferenceController(mContext, "test_key");
+ LABELS = ShadowAuthenticationHelper.getLabels();
+ TYPES = ShadowAuthenticationHelper.getTypes();
}
@After
@@ -60,7 +54,6 @@
}
@Test
-
public void updateSummary_hasAccount_shouldDisplayUpTo3AccountTypes() {
assertThat(mController.getSummary())
.isEqualTo(LABELS[0] + ", " + LABELS[1] + ", and " + LABELS[2]);
@@ -83,44 +76,4 @@
// should only show the 2 accounts with labels
assertThat(mController.getSummary()).isEqualTo(LABELS[0] + " and " + LABELS[1]);
}
-
- @Implements(AuthenticatorHelper.class)
- public static class ShadowAuthenticationHelper {
-
- static final String[] TYPES = {"type1", "type2", "type3", "type4"};
- static final String[] LABELS = {"LABEL1", "LABEL2", "LABEL3", "LABEL4"};
- private static String[] sEnabledAccount = TYPES;
-
- protected void __constructor__(Context context, UserHandle userHandle,
- AuthenticatorHelper.OnAccountsUpdateListener listener) {
- }
-
- private static void setEnabledAccount(String[] enabledAccount) {
- sEnabledAccount = enabledAccount;
- }
-
- @Resetter
- public static void reset() {
- sEnabledAccount = TYPES;
- }
-
- @Implementation
- protected String[] getEnabledAccountTypes() {
- return sEnabledAccount;
- }
-
- @Implementation
- protected CharSequence getLabelForType(Context context, final String accountType) {
- if (TextUtils.equals(accountType, TYPES[0])) {
- return LABELS[0];
- } else if (TextUtils.equals(accountType, TYPES[1])) {
- return LABELS[1];
- } else if (TextUtils.equals(accountType, TYPES[2])) {
- return LABELS[2];
- } else if (TextUtils.equals(accountType, TYPES[3])) {
- return LABELS[3];
- }
- return null;
- }
- }
}
diff --git a/tests/robotests/src/com/android/settings/applications/ApplicationFeatureProviderImplTest.java b/tests/robotests/src/com/android/settings/applications/ApplicationFeatureProviderImplTest.java
index fcb7518..12b93cd 100644
--- a/tests/robotests/src/com/android/settings/applications/ApplicationFeatureProviderImplTest.java
+++ b/tests/robotests/src/com/android/settings/applications/ApplicationFeatureProviderImplTest.java
@@ -27,6 +27,7 @@
import android.content.Intent;
import android.content.pm.ActivityInfo;
import android.content.pm.ApplicationInfo;
+import android.content.pm.ComponentInfo;
import android.content.pm.IPackageManager;
import android.content.pm.PackageManager;
import android.content.pm.ResolveInfo;
@@ -36,11 +37,12 @@
import android.os.UserHandle;
import android.os.UserManager;
-import com.android.settings.R;
+import com.android.internal.telephony.euicc.EuiccConnector;
import com.android.settings.testutils.ApplicationTestUtils;
import com.android.settingslib.testutils.shadow.ShadowDefaultDialerManager;
import com.android.settingslib.testutils.shadow.ShadowSmsApplication;
+import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -49,6 +51,8 @@
import org.robolectric.RobolectricTestRunner;
import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config;
+import org.robolectric.annotation.Implementation;
+import org.robolectric.annotation.Implements;
import org.robolectric.shadows.ShadowApplication;
import org.robolectric.util.ReflectionHelpers;
@@ -105,6 +109,12 @@
mPackageManagerService, mDevicePolicyManager);
}
+ @After
+ @Config(shadows = {ShadowEuiccConnector.class})
+ public void tearDown() {
+ ShadowEuiccConnector.reset();
+ }
+
private void verifyCalculateNumberOfPolicyInstalledApps(boolean async) {
setUpUsersAndInstalledApps();
@@ -165,7 +175,7 @@
.thenReturn(PackageManager.INSTALL_REASON_POLICY);
mAppCount = -1;
- mProvider.calculateNumberOfAppsWithAdminGrantedPermissions(new String[] {PERMISSION}, async,
+ mProvider.calculateNumberOfAppsWithAdminGrantedPermissions(new String[]{PERMISSION}, async,
(num) -> mAppCount = num);
if (async) {
ShadowApplication.runBackgroundTasks();
@@ -202,7 +212,7 @@
.thenReturn(PackageManager.INSTALL_REASON_POLICY);
mAppList = null;
- mProvider.listAppsWithAdminGrantedPermissions(new String[] {PERMISSION},
+ mProvider.listAppsWithAdminGrantedPermissions(new String[]{PERMISSION},
(list) -> mAppList = list);
assertThat(mAppList).isNotNull();
assertThat(mAppList.size()).isEqualTo(2);
@@ -251,10 +261,10 @@
new ApplicationInfo(app2.activityInfo.applicationInfo)));
assertThat(mProvider.findPersistentPreferredActivities(MAIN_USER_ID,
- new Intent[] {viewIntent, editIntent, sendIntent}))
+ new Intent[]{viewIntent, editIntent, sendIntent}))
.isEqualTo(expectedMainUserActivities);
assertThat(mProvider.findPersistentPreferredActivities(MANAGED_PROFILE_ID,
- new Intent[] {viewIntent, editIntent, sendIntent}))
+ new Intent[]{viewIntent, editIntent, sendIntent}))
.isEqualTo(expectedManagedUserActivities);
}
@@ -283,6 +293,33 @@
}
@Test
+ @Config(shadows = {ShadowSmsApplication.class, ShadowDefaultDialerManager.class,
+ ShadowEuiccConnector.class})
+ public void getKeepEnabledPackages_hasEuiccComponent_shouldContainEuiccPackage() {
+ final String testDialer = "com.android.test.defaultdialer";
+ final String testSms = "com.android.test.defaultsms";
+ final String testLocationHistory = "com.android.test.location.history";
+ final String testEuicc = "com.android.test.euicc";
+
+ ShadowSmsApplication.setDefaultSmsApplication(new ComponentName(testSms, "receiver"));
+ ShadowDefaultDialerManager.setDefaultDialerApplication(testDialer);
+ final ComponentInfo componentInfo = new ComponentInfo();
+ componentInfo.packageName = testEuicc;
+ ShadowEuiccConnector.setBestComponent(componentInfo);
+
+ // Spy the real context to mock LocationManager.
+ Context spyContext = spy(RuntimeEnvironment.application);
+ when(mLocationManager.getExtraLocationControllerPackage()).thenReturn(testLocationHistory);
+ when(spyContext.getSystemService(Context.LOCATION_SERVICE)).thenReturn(mLocationManager);
+
+ ReflectionHelpers.setField(mProvider, "mContext", spyContext);
+
+ final Set<String> keepEnabledPackages = mProvider.getKeepEnabledPackages();
+
+ assertThat(keepEnabledPackages).contains(testEuicc);
+ }
+
+ @Test
@Config(shadows = {ShadowSmsApplication.class, ShadowDefaultDialerManager.class})
public void getKeepEnabledPackages_shouldContainSettingsIntelligence() {
final String testDialer = "com.android.test.defaultdialer";
@@ -354,4 +391,23 @@
resolveInfo.activityInfo = activityInfo;
return resolveInfo;
}
+
+ @Implements(EuiccConnector.class)
+ public static class ShadowEuiccConnector {
+
+ private static ComponentInfo sBestComponent;
+
+ @Implementation
+ protected static ComponentInfo findBestComponent(PackageManager packageManager) {
+ return sBestComponent;
+ }
+
+ public static void setBestComponent(ComponentInfo componentInfo) {
+ sBestComponent = componentInfo;
+ }
+
+ public static void reset() {
+ sBestComponent = null;
+ }
+ }
}
diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/AppButtonsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/AppButtonsPreferenceControllerTest.java
index e42c3d2..ca2a800 100644
--- a/tests/robotests/src/com/android/settings/applications/appinfo/AppButtonsPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/applications/appinfo/AppButtonsPreferenceControllerTest.java
@@ -16,11 +16,13 @@
package com.android.settings.applications.appinfo;
+import static com.android.settings.applications.appinfo.AppButtonsPreferenceController.KEY_REMOVE_TASK_WHEN_FINISHING;
+
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.anyInt;
import static org.mockito.ArgumentMatchers.anyBoolean;
+import static org.mockito.ArgumentMatchers.anyInt;
import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.doAnswer;
@@ -39,8 +41,8 @@
import android.app.settings.SettingsEnums;
import android.content.Context;
import android.content.Intent;
-import android.content.om.OverlayManager;
import android.content.om.OverlayInfo;
+import android.content.om.OverlayManager;
import android.content.pm.ApplicationInfo;
import android.content.pm.PackageInfo;
import android.content.pm.PackageManager;
@@ -49,6 +51,8 @@
import android.util.ArraySet;
import android.view.View;
+import androidx.preference.PreferenceScreen;
+
import com.android.settings.R;
import com.android.settings.SettingsActivity;
import com.android.settings.core.InstrumentedPreferenceFragment;
@@ -59,7 +63,6 @@
import com.android.settingslib.core.lifecycle.Lifecycle;
import com.android.settingslib.widget.ActionButtonsPreference;
-import java.util.Set;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -70,12 +73,15 @@
import org.mockito.MockitoAnnotations;
import org.mockito.stubbing.Answer;
import org.robolectric.RobolectricTestRunner;
+import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config;
import org.robolectric.annotation.Implementation;
import org.robolectric.annotation.Implements;
import org.robolectric.annotation.Resetter;
import org.robolectric.util.ReflectionHelpers;
+import java.util.Set;
+
@RunWith(RobolectricTestRunner.class)
public class AppButtonsPreferenceControllerTest {
@@ -112,10 +118,9 @@
@Mock
private UserManager mUserManager;
@Mock
- private Application mApplication;
- @Mock
private PackageInfo mPackageInfo;
+ private Context mContext;
private Intent mUninstallIntent;
private ActionButtonsPreference mButtonPrefs;
private AppButtonsPreferenceController mController;
@@ -125,14 +130,15 @@
MockitoAnnotations.initMocks(this);
FakeFeatureFactory.setupForTest();
+ mContext = RuntimeEnvironment.application;
doReturn(mDpm).when(mSettingsActivity).getSystemService(Context.DEVICE_POLICY_SERVICE);
doReturn(mUserManager).when(mSettingsActivity).getSystemService(Context.USER_SERVICE);
doReturn(mPackageManger).when(mSettingsActivity).getPackageManager();
doReturn(mAm).when(mSettingsActivity).getSystemService(Context.ACTIVITY_SERVICE);
doReturn(mOverlayManager).when(mSettingsActivity).
- getSystemService(OverlayManager.class);
+ getSystemService(OverlayManager.class);
doReturn(mAppEntry).when(mState).getEntry(anyString(), anyInt());
- when(mSettingsActivity.getApplication()).thenReturn(mApplication);
+ doReturn(mContext).when(mSettingsActivity).getApplicationContext();
when(mSettingsActivity.getResources().getString(anyInt())).thenReturn(RESOURCE_STRING);
mController = spy(new AppButtonsPreferenceController(mSettingsActivity, mFragment,
@@ -162,6 +168,21 @@
}
@Test
+ @Config(shadows = ShadowAppUtils.class)
+ public void isAvailable_validPackageName_isTrue() {
+ assertThat(mController.isAvailable()).isTrue();
+ }
+
+ @Test
+ public void isAvailable_nullPackageName_isFalse() {
+ final AppButtonsPreferenceController controller = spy(
+ new AppButtonsPreferenceController(mSettingsActivity, mFragment,
+ mLifecycle, null, mState, REQUEST_UNINSTALL, REQUEST_REMOVE_DEVICE_ADMIN));
+
+ assertThat(controller.isAvailable()).isFalse();
+ }
+
+ @Test
public void retrieveAppEntry_hasAppEntry_notNull()
throws PackageManager.NameNotFoundException {
doReturn(mPackageInfo).when(mPackageManger).getPackageInfo(anyString(), anyInt());
@@ -306,10 +327,10 @@
@Test
public void updateUninstallButton_isNonSystemRro_setButtonDisable()
- throws RemoteException {
+ throws RemoteException {
when(mAppInfo.isResourceOverlay()).thenReturn(true);
when(mOverlayManager.getOverlayInfo(anyString(), any()))
- .thenReturn(OVERLAY_ENABLED);
+ .thenReturn(OVERLAY_ENABLED);
mController.updateUninstallButton();
@@ -318,10 +339,10 @@
@Test
public void updateUninstallButton_isNonSystemRro_setButtonEnable()
- throws RemoteException {
+ throws RemoteException {
when(mAppInfo.isResourceOverlay()).thenReturn(true);
when(mOverlayManager.getOverlayInfo(anyString(), any()))
- .thenReturn(OVERLAY_DISABLED);
+ .thenReturn(OVERLAY_DISABLED);
mController.updateUninstallButton();
@@ -423,7 +444,7 @@
@Test
public void onPackageListChanged_available_shouldRefreshUi() {
doReturn(AppButtonsPreferenceController.AVAILABLE)
- .when(mController).getAvailabilityStatus();
+ .when(mController).getAvailabilityStatus();
doReturn(true).when(mController).refreshUi();
mController.onPackageListChanged();
@@ -434,7 +455,7 @@
@Test
public void onPackageListChanged_notAvailable_shouldNotRefreshUiAndNoCrash() {
doReturn(AppButtonsPreferenceController.DISABLED_FOR_USER)
- .when(mController).getAvailabilityStatus();
+ .when(mController).getAvailabilityStatus();
mController.onPackageListChanged();
@@ -450,6 +471,30 @@
AppButtonsPreferenceController.DISABLED_FOR_USER);
}
+ @Test
+ public void handleActivityResult_onAppUninstall_removeTask() {
+ mController.handleActivityResult(REQUEST_UNINSTALL, 0, new Intent());
+
+ ArgumentCaptor<Intent> argumentCaptor = ArgumentCaptor.forClass(Intent.class);
+ verify(mSettingsActivity).finishPreferencePanel(anyInt(), argumentCaptor.capture());
+
+ final Intent i = argumentCaptor.getValue();
+ assertThat(i).isNotNull();
+ assertThat(i.getBooleanExtra(KEY_REMOVE_TASK_WHEN_FINISHING, false)).isTrue();
+ }
+
+ @Test
+ public void handleActivityResult_onAppNotUninstall_persistTask() {
+ mController.handleActivityResult(REQUEST_UNINSTALL + 1, 0, new Intent());
+
+ ArgumentCaptor<Intent> argumentCaptor = ArgumentCaptor.forClass(Intent.class);
+ verify(mSettingsActivity).finishPreferencePanel(anyInt(), argumentCaptor.capture());
+
+ final Intent i = argumentCaptor.getValue();
+ assertThat(i).isNotNull();
+ assertThat(i.getBooleanExtra(KEY_REMOVE_TASK_WHEN_FINISHING, false)).isFalse();
+ }
+
/**
* The test fragment which implements
* {@link ButtonActionDialogFragment.AppButtonsDialogListener}
diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/DefaultAppShortcutPreferenceControllerBaseTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/DefaultAppShortcutPreferenceControllerBaseTest.java
index 81d52d2..7a4c610 100644
--- a/tests/robotests/src/com/android/settings/applications/appinfo/DefaultAppShortcutPreferenceControllerBaseTest.java
+++ b/tests/robotests/src/com/android/settings/applications/appinfo/DefaultAppShortcutPreferenceControllerBaseTest.java
@@ -85,8 +85,8 @@
}
@Test
- public void constructor_callsIsApplicationQualifiedForRole() {
- verify(mRoleControllerManager).isApplicationQualifiedForRole(eq(TEST_ROLE_NAME), eq(
+ public void constructor_callsIsApplicationVisibleForRole() {
+ verify(mRoleControllerManager).isApplicationVisibleForRole(eq(TEST_ROLE_NAME), eq(
TEST_PACKAGE_NAME), any(Executor.class), any(Consumer.class));
}
@@ -108,7 +108,7 @@
@Test
public void
getAvailabilityStatus_noCallbackForIsRoleNotVisible_shouldReturnUnsupported() {
- setApplicationIsQualifiedForRole(true);
+ setApplicationIsVisibleForRole(true);
assertThat(mController.getAvailabilityStatus()).isEqualTo(
DefaultAppShortcutPreferenceControllerBase.UNSUPPORTED_ON_DEVICE);
@@ -117,7 +117,7 @@
@Test
public void getAvailabilityStatus_RoleIsNotVisible_shouldReturnUnsupported() {
setRoleIsVisible(false);
- setApplicationIsQualifiedForRole(true);
+ setApplicationIsVisibleForRole(true);
assertThat(mController.getAvailabilityStatus()).isEqualTo(
DefaultAppShortcutPreferenceControllerBase.UNSUPPORTED_ON_DEVICE);
@@ -125,7 +125,7 @@
@Test
public void
- getAvailabilityStatus_noCallbackForIsApplicationQualifiedForRole_shouldReturnUnsupported() {
+ getAvailabilityStatus_noCallbackForIsApplicationVisibleForRole_shouldReturnUnsupported() {
setRoleIsVisible(true);
assertThat(mController.getAvailabilityStatus()).isEqualTo(
@@ -133,18 +133,18 @@
}
@Test
- public void getAvailabilityStatus_applicationIsNotQualifiedForRole_shouldReturnUnsupported() {
+ public void getAvailabilityStatus_applicationIsNotVisibleForRole_shouldReturnUnsupported() {
setRoleIsVisible(true);
- setApplicationIsQualifiedForRole(false);
+ setApplicationIsVisibleForRole(false);
assertThat(mController.getAvailabilityStatus()).isEqualTo(
DefaultAppShortcutPreferenceControllerBase.UNSUPPORTED_ON_DEVICE);
}
@Test
- public void getAvailabilityStatus_RoleVisibleAndApplicationQualified_shouldReturnAvailable() {
+ public void getAvailabilityStatus_RoleVisibleAndApplicationVisible_shouldReturnAvailable() {
setRoleIsVisible(true);
- setApplicationIsQualifiedForRole(true);
+ setApplicationIsVisibleForRole(true);
assertThat(mController.getAvailabilityStatus()).isEqualTo(
DefaultAppShortcutPreferenceControllerBase.AVAILABLE);
@@ -159,13 +159,13 @@
callback.accept(visible);
}
- private void setApplicationIsQualifiedForRole(boolean qualified) {
+ private void setApplicationIsVisibleForRole(boolean visible) {
final ArgumentCaptor<Consumer<Boolean>> callbackCaptor = ArgumentCaptor.forClass(
Consumer.class);
- verify(mRoleControllerManager).isApplicationQualifiedForRole(eq(TEST_ROLE_NAME), eq(
+ verify(mRoleControllerManager).isApplicationVisibleForRole(eq(TEST_ROLE_NAME), eq(
TEST_PACKAGE_NAME), any(Executor.class), callbackCaptor.capture());
final Consumer<Boolean> callback = callbackCaptor.getValue();
- callback.accept(qualified);
+ callback.accept(visible);
}
@Test
diff --git a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAppPickerFragmentTest.java b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAppPickerFragmentTest.java
index ee05d29..55c2009 100644
--- a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAppPickerFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAppPickerFragmentTest.java
@@ -31,8 +31,8 @@
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.testutils.FakeFeatureFactory;
-import com.android.settings.widget.RadioButtonPreference;
import com.android.settingslib.applications.DefaultAppInfo;
+import com.android.settingslib.widget.RadioButtonPreference;
import org.junit.Before;
import org.junit.Test;
diff --git a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAutofillPickerTest.java b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAutofillPickerTest.java
index 81a16d5..9ec7f0b 100644
--- a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAutofillPickerTest.java
+++ b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAutofillPickerTest.java
@@ -40,6 +40,7 @@
import androidx.preference.PreferenceScreen;
import com.android.settings.testutils.FakeFeatureFactory;
+import com.android.settings.testutils.shadow.ShadowFragment;
import com.android.settings.testutils.shadow.ShadowSecureSettings;
import com.android.settingslib.applications.DefaultAppInfo;
@@ -133,6 +134,7 @@
}
@Test
+ @Config(shadows = ShadowFragment.class)
public void mUserId_shouldDeriveUidFromManagedCaller() {
setupUserManager();
setupCaller();
@@ -145,6 +147,7 @@
}
@Test
+ @Config(shadows = ShadowFragment.class)
public void mUserId_shouldDeriveUidFromMainCaller() {
setupUserManager();
setupCaller();
@@ -157,6 +160,7 @@
}
@Test
+ @Config(shadows = ShadowFragment.class)
public void mUserId_shouldDeriveUidFromManagedClick() {
setupUserManager();
setupClick(/* forWork= */ true);
@@ -169,6 +173,7 @@
}
@Test
+ @Config(shadows = ShadowFragment.class)
public void mUserId_shouldDeriveUidFromMainClick() {
setupUserManager();
setupClick(/* forWork= */ false);
diff --git a/tests/robotests/src/com/android/settings/applications/manageapplications/ManageApplicationsTest.java b/tests/robotests/src/com/android/settings/applications/manageapplications/ManageApplicationsTest.java
index 58b1408..3d864cc 100644
--- a/tests/robotests/src/com/android/settings/applications/manageapplications/ManageApplicationsTest.java
+++ b/tests/robotests/src/com/android/settings/applications/manageapplications/ManageApplicationsTest.java
@@ -494,6 +494,36 @@
assertThat(mFragment.mRecyclerView.getPaddingTop()).isEqualTo(0);
}
+ @Test
+ public void onSaveInstanceState_noSearchView_shouldNotSetBundleValue() {
+ final Bundle bundle = new Bundle();
+ ReflectionHelpers.setField(mFragment, "mResetAppsHelper", mock(ResetAppsHelper.class));
+ ReflectionHelpers.setField(mFragment, "mFilter", mock(AppFilterItem.class));
+ ReflectionHelpers.setField(mFragment, "mApplications",
+ mock(ManageApplications.ApplicationsAdapter.class));
+
+ mFragment.onSaveInstanceState(bundle);
+
+ assertThat(bundle.containsKey(ManageApplications.EXTRA_EXPAND_SEARCH_VIEW)).isFalse();
+ }
+
+ @Test
+ public void onSaveInstanceState_searchViewSet_shouldSetBundleValue() {
+ final SearchView searchView = mock(SearchView.class);
+ final Bundle bundle = new Bundle();
+ ReflectionHelpers.setField(mFragment, "mResetAppsHelper", mock(ResetAppsHelper.class));
+ ReflectionHelpers.setField(mFragment, "mFilter", mock(AppFilterItem.class));
+ ReflectionHelpers.setField(mFragment, "mApplications",
+ mock(ManageApplications.ApplicationsAdapter.class));
+ ReflectionHelpers.setField(mFragment, "mSearchView", searchView);
+ when(searchView.isIconified()).thenReturn(true);
+
+ mFragment.onSaveInstanceState(bundle);
+
+ assertThat(bundle.containsKey(ManageApplications.EXTRA_EXPAND_SEARCH_VIEW)).isTrue();
+ assertThat(bundle.getBoolean(ManageApplications.EXTRA_EXPAND_SEARCH_VIEW)).isFalse();
+ }
+
private void setUpOptionMenus() {
when(mMenu.findItem(anyInt())).thenAnswer(invocation -> {
final Object[] args = invocation.getArguments();
diff --git a/tests/robotests/src/com/android/settings/applications/specialaccess/deviceadmin/DeviceAdminListPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/specialaccess/deviceadmin/DeviceAdminListPreferenceControllerTest.java
index 18b4f18..3b20dd4 100644
--- a/tests/robotests/src/com/android/settings/applications/specialaccess/deviceadmin/DeviceAdminListPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/applications/specialaccess/deviceadmin/DeviceAdminListPreferenceControllerTest.java
@@ -33,37 +33,26 @@
import androidx.lifecycle.LifecycleOwner;
import com.android.settingslib.core.lifecycle.Lifecycle;
-import com.android.settingslib.widget.FooterPreferenceMixinCompat;
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;
@RunWith(RobolectricTestRunner.class)
public class DeviceAdminListPreferenceControllerTest {
-
- @Mock
- private FooterPreferenceMixinCompat mFooterPreferenceMixin;
private Context mContext;
- private DeviceAdminListPreferenceController mController;
- private LifecycleOwner mLifecycleOwner;
private Lifecycle mLifecycle;
@Before
public void setUp() {
- MockitoAnnotations.initMocks(this);
mContext = spy(RuntimeEnvironment.application);
- mLifecycleOwner = () -> mLifecycle;
- mLifecycle = new Lifecycle(mLifecycleOwner);
+ final LifecycleOwner lifecycleOwner = () -> mLifecycle;
+ mLifecycle = new Lifecycle(lifecycleOwner);
- mController = spy(new DeviceAdminListPreferenceController(mContext, "test_key")
- .setFooterPreferenceMixin(mFooterPreferenceMixin));
- mLifecycle.addObserver(mController);
+ mLifecycle.addObserver(new DeviceAdminListPreferenceController(mContext, "test_key"));
}
@Test
diff --git a/tests/robotests/src/com/android/settings/biometrics/fingerprint/DeleteFingerprintDialogTest.java b/tests/robotests/src/com/android/settings/biometrics/fingerprint/DeleteFingerprintDialogTest.java
index 0681e1c..e825c01 100644
--- a/tests/robotests/src/com/android/settings/biometrics/fingerprint/DeleteFingerprintDialogTest.java
+++ b/tests/robotests/src/com/android/settings/biometrics/fingerprint/DeleteFingerprintDialogTest.java
@@ -23,12 +23,12 @@
import android.app.Dialog;
import android.hardware.fingerprint.Fingerprint;
+import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentActivity;
import com.android.settings.biometrics.fingerprint.FingerprintSettings.FingerprintSettingsFragment;
import com.android.settings.biometrics.fingerprint.FingerprintSettings
.FingerprintSettingsFragment.DeleteFingerprintDialog;
-import com.android.settings.testutils.shadow.ShadowFragment;
import org.junit.Before;
import org.junit.Test;
@@ -37,10 +37,12 @@
import org.mockito.MockitoAnnotations;
import org.robolectric.RobolectricTestRunner;
import org.robolectric.annotation.Config;
+import org.robolectric.annotation.Implementation;
+import org.robolectric.annotation.Implements;
import org.robolectric.shadows.androidx.fragment.FragmentController;
@RunWith(RobolectricTestRunner.class)
-@Config(shadows = ShadowFragment.class)
+@Config(shadows = DeleteFingerprintDialogTest.ShadowFragment.class)
public class DeleteFingerprintDialogTest {
@Mock
@@ -75,4 +77,19 @@
verify(mTarget, never()).deleteFingerPrint(mFingerprint);
}
+
+ @Implements(Fragment.class)
+ public static class ShadowFragment {
+ private Fragment mTargetFragment;
+
+ @Implementation
+ protected void setTargetFragment(Fragment fragment, int requestCode) {
+ mTargetFragment = fragment;
+ }
+
+ @Implementation
+ protected Fragment getTargetFragment() {
+ return mTargetFragment;
+ }
+ }
}
diff --git a/tests/robotests/src/com/android/settings/bluetooth/AvailableMediaBluetoothDeviceUpdaterTest.java b/tests/robotests/src/com/android/settings/bluetooth/AvailableMediaBluetoothDeviceUpdaterTest.java
index 29640d6..4348e1b 100644
--- a/tests/robotests/src/com/android/settings/bluetooth/AvailableMediaBluetoothDeviceUpdaterTest.java
+++ b/tests/robotests/src/com/android/settings/bluetooth/AvailableMediaBluetoothDeviceUpdaterTest.java
@@ -91,7 +91,8 @@
mBluetoothDeviceUpdater = spy(new AvailableMediaBluetoothDeviceUpdater(mContext,
mDashboardFragment, mDevicePreferenceCallback));
mBluetoothDeviceUpdater.setPrefContext(mContext);
- mPreference = new BluetoothDevicePreference(mContext, mCachedBluetoothDevice, false);
+ mPreference = new BluetoothDevicePreference(mContext, mCachedBluetoothDevice, false,
+ BluetoothDevicePreference.SortType.TYPE_DEFAULT);
doNothing().when(mBluetoothDeviceUpdater).addPreference(any());
doNothing().when(mBluetoothDeviceUpdater).removePreference(any());
}
diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsMacAddressControllerTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsMacAddressControllerTest.java
index 9798745..749a182 100644
--- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsMacAddressControllerTest.java
+++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsMacAddressControllerTest.java
@@ -15,6 +15,8 @@
*/
package com.android.settings.bluetooth;
+import static com.android.settings.bluetooth.BluetoothDetailsMacAddressController.KEY_DEVICE_DETAILS_FOOTER;
+
import static com.google.common.truth.Truth.assertThat;
import com.android.settingslib.widget.FooterPreference;
@@ -25,22 +27,24 @@
@RunWith(RobolectricTestRunner.class)
public class BluetoothDetailsMacAddressControllerTest extends BluetoothDetailsControllerTestBase {
+ private BluetoothDetailsMacAddressController mController;
- private BluetoothDetailsMacAddressController mController;
+ @Override
+ public void setUp() {
+ super.setUp();
+ mController =
+ new BluetoothDetailsMacAddressController(mContext, mFragment, mCachedDevice,
+ mLifecycle);
+ setupDevice(mDeviceConfig);
+ mScreen.addPreference(new FooterPreference.Builder(mContext).setKey(
+ KEY_DEVICE_DETAILS_FOOTER).setTitle(KEY_DEVICE_DETAILS_FOOTER).build());
+ }
- @Override
- public void setUp() {
- super.setUp();
- mController =
- new BluetoothDetailsMacAddressController(mContext, mFragment, mCachedDevice, mLifecycle);
- setupDevice(mDeviceConfig);
- }
-
- @Test
- public void macAddress() {
- showScreen(mController);
- FooterPreference footer =
- (FooterPreference) mScreen.findPreference(mController.getPreferenceKey());
- assertThat(footer.getTitle().toString()).endsWith(mDeviceConfig.getAddress());
- }
+ @Test
+ public void macAddress() {
+ showScreen(mController);
+ FooterPreference footer =
+ (FooterPreference) mScreen.findPreference(mController.getPreferenceKey());
+ assertThat(footer.getTitle().toString()).endsWith(mDeviceConfig.getAddress());
+ }
}
diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDevicePreferenceTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDevicePreferenceTest.java
index 92f2354..f12e06e 100644
--- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDevicePreferenceTest.java
+++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDevicePreferenceTest.java
@@ -24,7 +24,6 @@
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
-import android.bluetooth.BluetoothClass;
import android.bluetooth.BluetoothDevice;
import android.content.Context;
import android.os.UserManager;
@@ -48,19 +47,36 @@
import org.robolectric.annotation.Config;
import org.robolectric.util.ReflectionHelpers;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
+
@RunWith(RobolectricTestRunner.class)
@Config(shadows = {ShadowAlertDialogCompat.class})
public class BluetoothDevicePreferenceTest {
private static final boolean SHOW_DEVICES_WITHOUT_NAMES = true;
private static final String MAC_ADDRESS = "04:52:C7:0B:D8:3C";
+ private static final String MAC_ADDRESS_2 = "05:52:C7:0B:D8:3C";
+ private static final String MAC_ADDRESS_3 = "06:52:C7:0B:D8:3C";
+ private static final String MAC_ADDRESS_4 = "07:52:C7:0B:D8:3C";
+ private static final Comparator<BluetoothDevicePreference> COMPARATOR =
+ Comparator.naturalOrder();
private Context mContext;
@Mock
private CachedBluetoothDevice mCachedBluetoothDevice;
+ @Mock
+ private CachedBluetoothDevice mCachedDevice1;
+ @Mock
+ private CachedBluetoothDevice mCachedDevice2;
+ @Mock
+ private CachedBluetoothDevice mCachedDevice3;
private FakeFeatureFactory mFakeFeatureFactory;
private MetricsFeatureProvider mMetricsFeatureProvider;
private BluetoothDevicePreference mPreference;
+ private List<BluetoothDevicePreference> mPreferenceList = new ArrayList<>();
@Before
public void setUp() {
@@ -70,8 +86,11 @@
mFakeFeatureFactory = FakeFeatureFactory.setupForTest();
mMetricsFeatureProvider = mFakeFeatureFactory.getMetricsFeatureProvider();
when(mCachedBluetoothDevice.getAddress()).thenReturn(MAC_ADDRESS);
+ when(mCachedDevice1.getAddress()).thenReturn(MAC_ADDRESS_2);
+ when(mCachedDevice2.getAddress()).thenReturn(MAC_ADDRESS_3);
+ when(mCachedDevice3.getAddress()).thenReturn(MAC_ADDRESS_4);
mPreference = new BluetoothDevicePreference(mContext, mCachedBluetoothDevice,
- SHOW_DEVICES_WITHOUT_NAMES);
+ SHOW_DEVICES_WITHOUT_NAMES, BluetoothDevicePreference.SortType.TYPE_DEFAULT);
}
@Test
@@ -170,7 +189,8 @@
doReturn(false).when(mCachedBluetoothDevice).hasHumanReadableName();
BluetoothDevicePreference preference =
new BluetoothDevicePreference(mContext, mCachedBluetoothDevice,
- SHOW_DEVICES_WITHOUT_NAMES);
+ SHOW_DEVICES_WITHOUT_NAMES,
+ BluetoothDevicePreference.SortType.TYPE_DEFAULT);
assertThat(preference.isVisible()).isTrue();
}
@@ -179,7 +199,8 @@
public void isVisible_hideDeviceWithoutNames_invisible() {
doReturn(false).when(mCachedBluetoothDevice).hasHumanReadableName();
BluetoothDevicePreference preference =
- new BluetoothDevicePreference(mContext, mCachedBluetoothDevice, false);
+ new BluetoothDevicePreference(mContext, mCachedBluetoothDevice,
+ false, BluetoothDevicePreference.SortType.TYPE_DEFAULT);
assertThat(preference.isVisible()).isFalse();
}
@@ -190,4 +211,54 @@
assertThat(mPreference.mNeedNotifyHierarchyChanged).isTrue();
}
+
+ @Test
+ public void compareTo_sortTypeFIFO() {
+ final BluetoothDevicePreference preference3 = new BluetoothDevicePreference(mContext,
+ mCachedDevice3, SHOW_DEVICES_WITHOUT_NAMES,
+ BluetoothDevicePreference.SortType.TYPE_FIFO);
+ final BluetoothDevicePreference preference2 = new BluetoothDevicePreference(mContext,
+ mCachedDevice2, SHOW_DEVICES_WITHOUT_NAMES,
+ BluetoothDevicePreference.SortType.TYPE_FIFO);
+ final BluetoothDevicePreference preference1 = new BluetoothDevicePreference(mContext,
+ mCachedDevice1, SHOW_DEVICES_WITHOUT_NAMES,
+ BluetoothDevicePreference.SortType.TYPE_FIFO);
+
+ mPreferenceList.add(preference1);
+ mPreferenceList.add(preference2);
+ mPreferenceList.add(preference3);
+ Collections.sort(mPreferenceList, COMPARATOR);
+
+ assertThat(mPreferenceList.get(0).getCachedDevice().getAddress())
+ .isEqualTo(preference3.getCachedDevice().getAddress());
+ assertThat(mPreferenceList.get(1).getCachedDevice().getAddress())
+ .isEqualTo(preference2.getCachedDevice().getAddress());
+ assertThat(mPreferenceList.get(2).getCachedDevice().getAddress())
+ .isEqualTo(preference1.getCachedDevice().getAddress());
+ }
+
+ @Test
+ public void compareTo_sortTypeDefault() {
+ final BluetoothDevicePreference preference3 = new BluetoothDevicePreference(mContext,
+ mCachedDevice3, SHOW_DEVICES_WITHOUT_NAMES,
+ BluetoothDevicePreference.SortType.TYPE_DEFAULT);
+ final BluetoothDevicePreference preference2 = new BluetoothDevicePreference(mContext,
+ mCachedDevice2, SHOW_DEVICES_WITHOUT_NAMES,
+ BluetoothDevicePreference.SortType.TYPE_DEFAULT);
+ final BluetoothDevicePreference preference1 = new BluetoothDevicePreference(mContext,
+ mCachedDevice1, SHOW_DEVICES_WITHOUT_NAMES,
+ BluetoothDevicePreference.SortType.TYPE_DEFAULT);
+
+ mPreferenceList.add(preference1);
+ mPreferenceList.add(preference2);
+ mPreferenceList.add(preference3);
+ Collections.sort(mPreferenceList, COMPARATOR);
+
+ assertThat(mPreferenceList.get(0).getCachedDevice().getAddress())
+ .isEqualTo(preference1.getCachedDevice().getAddress());
+ assertThat(mPreferenceList.get(1).getCachedDevice().getAddress())
+ .isEqualTo(preference2.getCachedDevice().getAddress());
+ assertThat(mPreferenceList.get(2).getCachedDevice().getAddress())
+ .isEqualTo(preference3.getCachedDevice().getAddress());
+ }
}
diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceUpdaterTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceUpdaterTest.java
index 1066552..66bf959 100644
--- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceUpdaterTest.java
+++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceUpdaterTest.java
@@ -99,7 +99,8 @@
when(mCachedBluetoothDevice.getAddress()).thenReturn(MAC_ADDRESS);
when(mSubBluetoothDevice.getAddress()).thenReturn(SUB_MAC_ADDRESS);
- mPreference = new BluetoothDevicePreference(mContext, mCachedBluetoothDevice, false);
+ mPreference = new BluetoothDevicePreference(mContext, mCachedBluetoothDevice,
+ false, BluetoothDevicePreference.SortType.TYPE_DEFAULT);
mBluetoothDeviceUpdater =
new BluetoothDeviceUpdater(mDashboardFragment, mDevicePreferenceCallback,
mLocalManager) {
diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothSwitchPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothSwitchPreferenceControllerTest.java
index f40cc69..3c5a91d 100644
--- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothSwitchPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothSwitchPreferenceControllerTest.java
@@ -19,6 +19,7 @@
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
import android.content.Context;
import android.provider.Settings;
@@ -47,6 +48,8 @@
private RestrictionUtils mRestrictionUtils;
@Mock
private SwitchWidgetController mSwitchController;
+ @Mock
+ private AlwaysDiscoverable mAlwaysDiscoverable;
private FooterPreference mFooterPreference;
private Context mContext;
@@ -62,6 +65,7 @@
mController =
new BluetoothSwitchPreferenceController(mContext, mRestrictionUtils,
mSwitchController, mFooterPreference);
+ mController.mAlwaysDiscoverable = mAlwaysDiscoverable;
}
@Test
@@ -103,4 +107,18 @@
assertThat(mFooterPreference.getTitle()).isEqualTo(BLUETOOTH_INFO_STRING);
}
+
+ @Test
+ public void onStart_shouldStartAlwaysDiscoverable() {
+ mController.onStart();
+
+ verify(mAlwaysDiscoverable).start();
+ }
+
+ @Test
+ public void onStop_shouldStopAlwaysDiscoverable() {
+ mController.onStop();
+
+ verify(mAlwaysDiscoverable).stop();
+ }
}
diff --git a/tests/robotests/src/com/android/settings/bluetooth/ConnectedBluetoothDeviceUpdaterTest.java b/tests/robotests/src/com/android/settings/bluetooth/ConnectedBluetoothDeviceUpdaterTest.java
index 615f67a..13e138c 100644
--- a/tests/robotests/src/com/android/settings/bluetooth/ConnectedBluetoothDeviceUpdaterTest.java
+++ b/tests/robotests/src/com/android/settings/bluetooth/ConnectedBluetoothDeviceUpdaterTest.java
@@ -239,7 +239,8 @@
@Test
public void addPreference_addPreference_shouldHideSecondTarget() {
BluetoothDevicePreference btPreference =
- new BluetoothDevicePreference(mContext, mCachedBluetoothDevice, true);
+ new BluetoothDevicePreference(mContext, mCachedBluetoothDevice,
+ true, BluetoothDevicePreference.SortType.TYPE_DEFAULT);
mBluetoothDeviceUpdater.mPreferenceMap.put(mBluetoothDevice, btPreference);
mBluetoothDeviceUpdater.addPreference(mCachedBluetoothDevice);
diff --git a/tests/robotests/src/com/android/settings/bluetooth/SavedBluetoothDeviceUpdaterTest.java b/tests/robotests/src/com/android/settings/bluetooth/SavedBluetoothDeviceUpdaterTest.java
index ac7692d..4cc9b87 100644
--- a/tests/robotests/src/com/android/settings/bluetooth/SavedBluetoothDeviceUpdaterTest.java
+++ b/tests/robotests/src/com/android/settings/bluetooth/SavedBluetoothDeviceUpdaterTest.java
@@ -72,7 +72,8 @@
mBluetoothDeviceUpdater = spy(new SavedBluetoothDeviceUpdater(mContext, mDashboardFragment,
mDevicePreferenceCallback));
mBluetoothDeviceUpdater.setPrefContext(mContext);
- mPreference = new BluetoothDevicePreference(mContext, mCachedBluetoothDevice, false);
+ mPreference = new BluetoothDevicePreference(mContext, mCachedBluetoothDevice,
+ false, BluetoothDevicePreference.SortType.TYPE_DEFAULT);
doNothing().when(mBluetoothDeviceUpdater).addPreference(any());
doNothing().when(mBluetoothDeviceUpdater).removePreference(any());
}
diff --git a/tests/robotests/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragmentTest.java b/tests/robotests/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragmentTest.java
index 2328375..778bb79 100644
--- a/tests/robotests/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragmentTest.java
@@ -51,6 +51,7 @@
ShadowConnectivityManager.class, ShadowBluetoothAdapter.class})
public class ConnectedDeviceDashboardFragmentTest {
private static final String KEY_NEARBY_DEVICES = "bt_nearby_slice";
+ private static final String KEY_DISCOVERABLE_FOOTER = "discoverable_footer";
@Mock
private PackageManager mPackageManager;
@@ -81,7 +82,7 @@
.getNonIndexableKeys(mContext);
assertThat(niks).containsExactly(KEY_CONNECTED_DEVICES, KEY_AVAILABLE_DEVICES,
- KEY_NEARBY_DEVICES);
+ KEY_NEARBY_DEVICES, KEY_DISCOVERABLE_FOOTER);
}
@Test
diff --git a/tests/robotests/src/com/android/settings/connecteddevice/DiscoverableFooterPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/connecteddevice/DiscoverableFooterPreferenceControllerTest.java
index 3cc125b..065b924 100644
--- a/tests/robotests/src/com/android/settings/connecteddevice/DiscoverableFooterPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/connecteddevice/DiscoverableFooterPreferenceControllerTest.java
@@ -30,14 +30,11 @@
import android.text.BidiFormatter;
import android.text.TextUtils;
-import androidx.preference.PreferenceScreen;
-
import com.android.settings.R;
import com.android.settings.bluetooth.AlwaysDiscoverable;
import com.android.settings.core.BasePreferenceController;
import com.android.settings.testutils.shadow.ShadowBluetoothAdapter;
import com.android.settingslib.widget.FooterPreference;
-import com.android.settingslib.widget.FooterPreferenceMixinCompat;
import org.junit.Before;
import org.junit.Test;
@@ -49,6 +46,7 @@
import org.robolectric.Shadows;
import org.robolectric.annotation.Config;
import org.robolectric.shadows.ShadowApplication;
+import org.robolectric.util.ReflectionHelpers;
import java.util.ArrayList;
import java.util.List;
@@ -56,16 +54,12 @@
@RunWith(RobolectricTestRunner.class)
@Config(shadows = ShadowBluetoothAdapter.class)
public class DiscoverableFooterPreferenceControllerTest {
+
private static final String DEVICE_NAME = "device name";
- private static final String KEY = "discoverable_footer_preference";
@Mock
private PackageManager mPackageManager;
@Mock
- private PreferenceScreen mScreen;
- @Mock
- private FooterPreferenceMixinCompat mFooterPreferenceMixin;
- @Mock
private AlwaysDiscoverable mAlwaysDiscoverable;
private Context mContext;
@@ -82,10 +76,13 @@
doReturn(mPackageManager).when(mContext).getPackageManager();
mDiscoverableFooterPreferenceController =
- new DiscoverableFooterPreferenceController(mContext);
- mPreference = spy(new FooterPreference(mContext));
- mDiscoverableFooterPreferenceController.init(mFooterPreferenceMixin, mPreference,
- mAlwaysDiscoverable);
+ new DiscoverableFooterPreferenceController(mContext, "key");
+ mPreference = new FooterPreference(mContext);
+ ReflectionHelpers
+ .setField(mDiscoverableFooterPreferenceController, "mPreference", mPreference);
+ ReflectionHelpers
+ .setField(mDiscoverableFooterPreferenceController,
+ "mAlwaysDiscoverable", mAlwaysDiscoverable);
mBluetoothChangedReceiver = mDiscoverableFooterPreferenceController
.mBluetoothChangedReceiver;
}
@@ -99,33 +96,25 @@
}
@Test
- public void getAvailabilityStatus_BluetoothFeature_returnAvailable() {
+ public void getAvailabilityStatus_BluetoothFeature_returnAvailableUnsearchable() {
when(mPackageManager.hasSystemFeature(PackageManager.FEATURE_BLUETOOTH)).thenReturn(true);
assertThat(mDiscoverableFooterPreferenceController.getAvailabilityStatus()).isEqualTo(
- BasePreferenceController.AVAILABLE);
+ BasePreferenceController.AVAILABLE_UNSEARCHABLE);
}
@Test
- public void displayPreference() {
- when(mFooterPreferenceMixin.createFooterPreference()).thenReturn(mPreference);
- mDiscoverableFooterPreferenceController.displayPreference(mScreen);
+ public void onStart_shouldRegisterBluetoothChanged() {
+ mDiscoverableFooterPreferenceController.onStart();
- verify(mPreference).setKey(KEY);
- verify(mScreen).addPreference(mPreference);
- }
-
- @Test
- public void onResume() {
- mDiscoverableFooterPreferenceController.onResume();
assertThat(getRegisteredBroadcastReceivers()).contains(mBluetoothChangedReceiver);
verify(mAlwaysDiscoverable).start();
}
@Test
- public void onPause() {
- mDiscoverableFooterPreferenceController.onResume();
- mDiscoverableFooterPreferenceController.onPause();
+ public void onStop_shouldUnregisterBluetoothChanged() {
+ mDiscoverableFooterPreferenceController.onStart();
+ mDiscoverableFooterPreferenceController.onStop();
assertThat(getRegisteredBroadcastReceivers()).doesNotContain(mBluetoothChangedReceiver);
verify(mAlwaysDiscoverable).stop();
@@ -147,6 +136,22 @@
assertThat(mPreference.getTitle()).isEqualTo(generateTitle(null));
}
+ @Test
+ public void onStart_localBluetoothManagerNull_shouldNotCrash() {
+ mDiscoverableFooterPreferenceController.mLocalManager = null;
+
+ // Shouldn't crash
+ mDiscoverableFooterPreferenceController.onStart();
+ }
+
+ @Test
+ public void onStop_localBluetoothManagerNull_shouldNotCrash() {
+ mDiscoverableFooterPreferenceController.mLocalManager = null;
+
+ // Shouldn't crash
+ mDiscoverableFooterPreferenceController.onStop();
+ }
+
private CharSequence generateTitle(String deviceName) {
if (deviceName == null) {
return mContext.getString(R.string.bluetooth_off_footer);
@@ -176,22 +181,4 @@
}
return registeredBroadcastReceivers;
}
-
- @Test
- public void onResume_localBluetoothManagerNull_shouldNotCrash() {
- mDiscoverableFooterPreferenceController.mLocalManager = null;
- mDiscoverableFooterPreferenceController.init(mFooterPreferenceMixin, mPreference, null);
-
- // Shouldn't crash
- mDiscoverableFooterPreferenceController.onResume();
- }
-
- @Test
- public void onPause_localBluetoothManagerNull_shouldNotCrash() {
- mDiscoverableFooterPreferenceController.mLocalManager = null;
- mDiscoverableFooterPreferenceController.init(mFooterPreferenceMixin, mPreference, null);
-
- // Shouldn't crash
- mDiscoverableFooterPreferenceController.onPause();
- }
}
\ No newline at end of file
diff --git a/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDetailsDataRoleControllerTest.java b/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDetailsDataRoleControllerTest.java
index 91e680b..a52207f 100644
--- a/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDetailsDataRoleControllerTest.java
+++ b/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDetailsDataRoleControllerTest.java
@@ -38,8 +38,8 @@
import androidx.preference.PreferenceScreen;
import com.android.settings.R;
-import com.android.settings.widget.RadioButtonPreference;
import com.android.settingslib.core.lifecycle.Lifecycle;
+import com.android.settingslib.widget.RadioButtonPreference;
import org.junit.Before;
import org.junit.Test;
diff --git a/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDetailsFunctionsControllerTest.java b/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDetailsFunctionsControllerTest.java
index 11fa613..3a6eec0 100644
--- a/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDetailsFunctionsControllerTest.java
+++ b/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDetailsFunctionsControllerTest.java
@@ -31,12 +31,16 @@
import android.content.Context;
import android.hardware.usb.UsbManager;
-import android.hardware.usb.UsbPort;
import android.net.ConnectivityManager;
+import androidx.fragment.app.FragmentActivity;
+import androidx.preference.PreferenceCategory;
+import androidx.preference.PreferenceManager;
+import androidx.preference.PreferenceScreen;
+
import com.android.settings.testutils.shadow.ShadowUtils;
-import com.android.settings.widget.RadioButtonPreference;
import com.android.settingslib.core.lifecycle.Lifecycle;
+import com.android.settingslib.widget.RadioButtonPreference;
import org.junit.Before;
import org.junit.Test;
@@ -51,11 +55,6 @@
import java.util.Iterator;
import java.util.List;
-import androidx.fragment.app.FragmentActivity;
-import androidx.preference.PreferenceCategory;
-import androidx.preference.PreferenceManager;
-import androidx.preference.PreferenceScreen;
-
@RunWith(RobolectricTestRunner.class)
public class UsbDetailsFunctionsControllerTest {
diff --git a/tests/robotests/src/com/android/settings/dashboard/DashboardFeatureProviderImplTest.java b/tests/robotests/src/com/android/settings/dashboard/DashboardFeatureProviderImplTest.java
index 1c51b81..7084856 100644
--- a/tests/robotests/src/com/android/settings/dashboard/DashboardFeatureProviderImplTest.java
+++ b/tests/robotests/src/com/android/settings/dashboard/DashboardFeatureProviderImplTest.java
@@ -249,7 +249,7 @@
}
@Test
- @Config(shadows = {ShadowTileUtils.class, ShadowThreadUtils.class})
+ @Config(shadows = {ShadowTileUtils.class})
public void bindPreference_hasSummaryUri_shouldLoadSummaryFromContentProvider() {
final Preference preference = new Preference(RuntimeEnvironment.application);
final Tile tile = new Tile(mActivityInfo, CategoryKey.CATEGORY_HOMEPAGE);
@@ -263,6 +263,20 @@
}
@Test
+ @Config(shadows = {ShadowTileUtils.class})
+ public void bindPreference_hasTitleUri_shouldLoadFromContentProvider() {
+ final Preference preference = new Preference(RuntimeEnvironment.application);
+ final Tile tile = new Tile(mActivityInfo, CategoryKey.CATEGORY_HOMEPAGE);
+ mActivityInfo.metaData.putString(TileUtils.META_DATA_PREFERENCE_TITLE_URI,
+ "content://com.android.settings/tile_title");
+
+ mImpl.bindPreferenceToTile(mActivity, mForceRoundedIcon, MetricsEvent.VIEW_UNKNOWN,
+ preference, tile, null /*key */, Preference.DEFAULT_ORDER);
+
+ assertThat(preference.getTitle()).isEqualTo(ShadowTileUtils.MOCK_SUMMARY);
+ }
+
+ @Test
public void bindPreference_withNullKeyTileKey_shouldUseTileKey() {
final Preference preference = new Preference(RuntimeEnvironment.application);
mActivityInfo.metaData.putString(META_DATA_PREFERENCE_KEYHINT, "key");
@@ -274,7 +288,7 @@
}
@Test
- @Config(shadows = {ShadowTileUtils.class, ShadowThreadUtils.class})
+ @Config(shadows = {ShadowTileUtils.class})
public void bindPreference_withIconUri_shouldLoadIconFromContentProvider() {
final Preference preference = new Preference(RuntimeEnvironment.application);
mActivityInfo.packageName = RuntimeEnvironment.application.getPackageName();
@@ -341,7 +355,8 @@
final Intent launchIntent = shadowActivity.getNextStartedActivityForResult().intent;
assertThat(launchIntent.getAction())
.isEqualTo("TestAction");
- assertThat(launchIntent.getIntExtra(MetricsFeatureProvider.EXTRA_SOURCE_METRICS_CATEGORY, 0))
+ assertThat(
+ launchIntent.getIntExtra(MetricsFeatureProvider.EXTRA_SOURCE_METRICS_CATEGORY, 0))
.isEqualTo(MetricsEvent.SETTINGS_GESTURES);
}
@@ -433,7 +448,7 @@
final ArgumentCaptor<UserHandle> argument = ArgumentCaptor.forClass(UserHandle.class);
verify(mActivity)
- .startActivityForResultAsUser(any(Intent.class), anyInt(), argument.capture());
+ .startActivityForResultAsUser(any(Intent.class), anyInt(), argument.capture());
assertThat(argument.getValue().getIdentifier()).isEqualTo(userId);
verify(mActivity, never()).getSupportFragmentManager();
}
@@ -452,7 +467,7 @@
mImpl.openTileIntent(mActivity, tile);
verify(mActivity, never())
- .startActivityForResultAsUser(any(Intent.class), anyInt(), any(UserHandle.class));
+ .startActivityForResultAsUser(any(Intent.class), anyInt(), any(UserHandle.class));
verify(mActivity).getSupportFragmentManager();
}
}
diff --git a/tests/robotests/src/com/android/settings/dashboard/SummaryLoaderTest.java b/tests/robotests/src/com/android/settings/dashboard/SummaryLoaderTest.java
index 9a5bef2..236b18a 100644
--- a/tests/robotests/src/com/android/settings/dashboard/SummaryLoaderTest.java
+++ b/tests/robotests/src/com/android/settings/dashboard/SummaryLoaderTest.java
@@ -16,21 +16,16 @@
package com.android.settings.dashboard;
-import static com.android.settingslib.drawer.TileUtils.META_DATA_PREFERENCE_KEYHINT;
-
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.Mockito.verifyZeroInteractions;
-import static org.mockito.Mockito.when;
import android.app.Activity;
import android.content.Context;
import android.content.pm.ActivityInfo;
-import android.os.Bundle;
import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settingslib.drawer.CategoryKey;
-import com.android.settingslib.drawer.DashboardCategory;
import com.android.settingslib.drawer.Tile;
import org.junit.Before;
@@ -89,26 +84,4 @@
assertThat(mCallbackInvoked).isTrue();
}
-
- @Test
- public void testUpdateSummaryToCache_hasCache_shouldUpdate() {
- final String testSummary = "test_summary";
- final DashboardCategory category = new DashboardCategory(CategoryKey.CATEGORY_HOMEPAGE);
- final ActivityInfo activityInfo = new ActivityInfo();
- activityInfo.packageName = "pkg";
- activityInfo.name = "cls";
- activityInfo.metaData = new Bundle();
- activityInfo.metaData.putString(META_DATA_PREFERENCE_KEYHINT, "123");
- final Tile tile = new Tile(activityInfo, category.key);
-
- category.addTile(tile);
- when(mFeatureFactory.dashboardFeatureProvider.getDashboardKeyForTile(tile))
- .thenReturn(tile.getKey(RuntimeEnvironment.application));
-
- mSummaryLoader.updateSummaryIfNeeded(mContext, tile, testSummary);
- tile.overrideSummary(null);
- mSummaryLoader.updateSummaryToCache(category);
-
- assertThat(tile.getSummary(mContext)).isEqualTo(testSummary);
- }
}
diff --git a/tests/robotests/src/com/android/settings/datausage/AppDataUsageTest.java b/tests/robotests/src/com/android/settings/datausage/AppDataUsageTest.java
index 6cecd98..ded7d10 100644
--- a/tests/robotests/src/com/android/settings/datausage/AppDataUsageTest.java
+++ b/tests/robotests/src/com/android/settings/datausage/AppDataUsageTest.java
@@ -53,6 +53,7 @@
import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settings.testutils.shadow.ShadowDataUsageUtils;
import com.android.settings.testutils.shadow.ShadowEntityHeaderController;
+import com.android.settings.testutils.shadow.ShadowFragment;
import com.android.settings.testutils.shadow.ShadowRestrictedLockUtilsInternal;
import com.android.settings.widget.EntityHeaderController;
import com.android.settingslib.AppItem;
@@ -102,6 +103,7 @@
}
@Test
+ @Config(shadows = ShadowFragment.class)
public void onCreate_appUid_shouldGetAppLabelFromAppInfo() throws NameNotFoundException {
mFragment = spy(new AppDataUsage());
final FragmentActivity activity = spy(Robolectric.setupActivity(FragmentActivity.class));
@@ -109,17 +111,17 @@
doReturn(activity).when(mFragment).getActivity();
doReturn(RuntimeEnvironment.application).when(mFragment).getContext();
ReflectionHelpers.setField(mFragment, "mDashboardFeatureProvider",
- FakeFeatureFactory.setupForTest().dashboardFeatureProvider);
+ FakeFeatureFactory.setupForTest().dashboardFeatureProvider);
final String packageName = "testPackage";
final int uid = (Process.FIRST_APPLICATION_UID + Process.LAST_APPLICATION_UID) / 2;
- doReturn(new String[] {packageName}).when(mPackageManager).getPackagesForUid(uid);
+ doReturn(new String[]{packageName}).when(mPackageManager).getPackagesForUid(uid);
final String label = "testLabel";
final AppItem appItem = new AppItem(uid);
appItem.uids.put(uid, true);
final ApplicationInfo info = spy(new ApplicationInfo());
doReturn(label).when(info).loadLabel(mPackageManager);
when(mPackageManager.getApplicationInfoAsUser(
- eq(packageName), anyInt() /* flags */, anyInt() /* userId */)).thenReturn(info);
+ eq(packageName), anyInt() /* flags */, anyInt() /* userId */)).thenReturn(info);
final Bundle args = new Bundle();
args.putParcelable(AppDataUsage.ARG_APP_ITEM, appItem);
args.putInt(AppInfoBase.ARG_PACKAGE_UID, uid);
@@ -131,10 +133,11 @@
}
@Test
+ @Config(shadows = ShadowFragment.class)
public void onCreate_notAppUid_shouldGetAppLabelFromUidDetailProvider() {
mFragment = spy(new AppDataUsage());
ReflectionHelpers.setField(mFragment, "mDashboardFeatureProvider",
- FakeFeatureFactory.setupForTest().dashboardFeatureProvider);
+ FakeFeatureFactory.setupForTest().dashboardFeatureProvider);
doReturn(Robolectric.setupActivity(FragmentActivity.class)).when(mFragment).getActivity();
doReturn(RuntimeEnvironment.application).when(mFragment).getContext();
final UidDetailProvider uidDetailProvider = mock(UidDetailProvider.class);
@@ -144,7 +147,7 @@
final UidDetail uidDetail = new UidDetail();
uidDetail.label = label;
when(uidDetailProvider.getUidDetail(eq(uid), anyBoolean() /* blocking */)).
- thenReturn(uidDetail);
+ thenReturn(uidDetail);
final AppItem appItem = new AppItem(uid);
appItem.uids.put(uid, true);
final Bundle args = new Bundle();
@@ -166,7 +169,7 @@
mFragment = spy(new AppDataUsage());
when(mFragment.getPreferenceManager())
- .thenReturn(mock(PreferenceManager.class, RETURNS_DEEP_STUBS));
+ .thenReturn(mock(PreferenceManager.class, RETURNS_DEEP_STUBS));
doReturn(mock(PreferenceScreen.class)).when(mFragment).getPreferenceScreen();
ReflectionHelpers.setField(mFragment, "mAppItem", mock(AppItem.class));
@@ -177,7 +180,7 @@
@Test
public void bindAppHeader_workApp_shouldSetWorkAppUid()
- throws PackageManager.NameNotFoundException {
+ throws PackageManager.NameNotFoundException {
final int fakeUserId = 100;
mFragment = spy(new AppDataUsage());
@@ -198,7 +201,7 @@
when(mHeaderController.setHasAppInfoLink(anyBoolean())).thenReturn(mHeaderController);
when(mFragment.getPreferenceManager())
- .thenReturn(mock(PreferenceManager.class, RETURNS_DEEP_STUBS));
+ .thenReturn(mock(PreferenceManager.class, RETURNS_DEEP_STUBS));
doReturn(mock(PreferenceScreen.class)).when(mFragment).getPreferenceScreen();
mFragment.onViewCreated(new View(RuntimeEnvironment.application), new Bundle());
@@ -276,7 +279,7 @@
final long foregroundBytes = 5678L;
final List<NetworkCycleDataForUid> appUsage = new ArrayList<>();
appUsage.add(new NetworkCycleDataForUid.Builder()
- .setBackgroundUsage(backgroundBytes).setForegroundUsage(foregroundBytes).build());
+ .setBackgroundUsage(backgroundBytes).setForegroundUsage(foregroundBytes).build());
ReflectionHelpers.setField(mFragment, "mUsageData", appUsage);
final Preference backgroundPref = mock(Preference.class);
ReflectionHelpers.setField(mFragment, "mBackgroundUsage", backgroundPref);
@@ -291,7 +294,7 @@
verify(cycle).setVisible(true);
verify(totalPref).setSummary(
- DataUsageUtils.formatDataUsage(context, backgroundBytes + foregroundBytes));
+ DataUsageUtils.formatDataUsage(context, backgroundBytes + foregroundBytes));
verify(backgroundPref).setSummary(DataUsageUtils.formatDataUsage(context, backgroundBytes));
verify(foregroundPref).setSummary(DataUsageUtils.formatDataUsage(context, foregroundBytes));
}
@@ -306,12 +309,12 @@
ReflectionHelpers.setField(mFragment, "mContext", context);
ReflectionHelpers.setField(mFragment, "mAppItem", appItem);
ReflectionHelpers.setField(mFragment, "mTemplate",
- NetworkTemplate.buildTemplateWifiWildcard());
+ NetworkTemplate.buildTemplateWifiWildcard());
final long end = System.currentTimeMillis();
final long start = end - (DateUtils.WEEK_IN_MILLIS * 4);
final NetworkCycleDataForUidLoader loader = (NetworkCycleDataForUidLoader)
- mFragment.mUidDataCallbacks.onCreateLoader(0, Bundle.EMPTY);
+ mFragment.mUidDataCallbacks.onCreateLoader(0, Bundle.EMPTY);
final List<Integer> uids = loader.getUids();
assertThat(uids).hasSize(1);
@@ -331,12 +334,12 @@
ReflectionHelpers.setField(mFragment, "mContext", context);
ReflectionHelpers.setField(mFragment, "mAppItem", appItem);
ReflectionHelpers.setField(mFragment, "mTemplate",
- NetworkTemplate.buildTemplateWifiWildcard());
+ NetworkTemplate.buildTemplateWifiWildcard());
final long end = System.currentTimeMillis();
final long start = end - (DateUtils.WEEK_IN_MILLIS * 4);
final NetworkCycleDataForUidLoader loader = (NetworkCycleDataForUidLoader)
- mFragment.mUidDataCallbacks.onCreateLoader(0, Bundle.EMPTY);
+ mFragment.mUidDataCallbacks.onCreateLoader(0, Bundle.EMPTY);
final List<Integer> uids = loader.getUids();
assertThat(uids).hasSize(3);
@@ -362,10 +365,10 @@
ReflectionHelpers.setField(mFragment, "mCycles", testCycles);
ReflectionHelpers.setField(mFragment, "mAppItem", appItem);
ReflectionHelpers.setField(mFragment, "mTemplate",
- NetworkTemplate.buildTemplateWifiWildcard());
+ NetworkTemplate.buildTemplateWifiWildcard());
final NetworkCycleDataForUidLoader loader = (NetworkCycleDataForUidLoader)
- mFragment.mUidDataCallbacks.onCreateLoader(0 /* id */, Bundle.EMPTY /* args */);
+ mFragment.mUidDataCallbacks.onCreateLoader(0 /* id */, Bundle.EMPTY /* args */);
final ArrayList<Long> cycles = loader.getCycles();
assertThat(cycles).hasSize(2);
@@ -409,13 +412,14 @@
}
@Test
- @Config(shadows = {ShadowDataUsageUtils.class, ShadowSubscriptionManager.class})
+ @Config(shadows = {ShadowDataUsageUtils.class, ShadowSubscriptionManager.class,
+ ShadowFragment.class})
public void onCreate_noNetworkTemplateAndInvalidDataSubscription_shouldUseWifiTemplate() {
ShadowDataUsageUtils.IS_MOBILE_DATA_SUPPORTED = true;
ShadowDataUsageUtils.IS_WIFI_SUPPORTED = true;
ShadowDataUsageUtils.HAS_SIM = false;
ShadowSubscriptionManager.setDefaultDataSubscriptionId(
- SubscriptionManager.INVALID_SUBSCRIPTION_ID);
+ SubscriptionManager.INVALID_SUBSCRIPTION_ID);
mFragment = spy(new AppDataUsage());
doReturn(Robolectric.setupActivity(FragmentActivity.class)).when(mFragment).getActivity();
doReturn(RuntimeEnvironment.application).when(mFragment).getContext();
@@ -424,7 +428,7 @@
doReturn(new UidDetail()).when(uidDetailProvider).getUidDetail(anyInt(), anyBoolean());
ReflectionHelpers.setField(mFragment, "mDashboardFeatureProvider",
- FakeFeatureFactory.setupForTest().dashboardFeatureProvider);
+ FakeFeatureFactory.setupForTest().dashboardFeatureProvider);
final Bundle args = new Bundle();
args.putInt(AppInfoBase.ARG_PACKAGE_UID, 123123);
mFragment.setArguments(args);
@@ -432,6 +436,6 @@
mFragment.onCreate(Bundle.EMPTY);
assertThat(mFragment.mTemplate.getMatchRule())
- .isEqualTo(NetworkTemplate.MATCH_WIFI_WILDCARD);
+ .isEqualTo(NetworkTemplate.MATCH_WIFI_WILDCARD);
}
}
diff --git a/tests/robotests/src/com/android/settings/datausage/BillingCycleSettingsTest.java b/tests/robotests/src/com/android/settings/datausage/BillingCycleSettingsTest.java
index 33ae064..eea6388 100644
--- a/tests/robotests/src/com/android/settings/datausage/BillingCycleSettingsTest.java
+++ b/tests/robotests/src/com/android/settings/datausage/BillingCycleSettingsTest.java
@@ -45,9 +45,8 @@
import androidx.preference.PreferenceManager;
import androidx.preference.SwitchPreference;
+import com.android.settings.testutils.shadow.ShadowFragment;
import com.android.settingslib.NetworkPolicyEditor;
-import com.android.settingslib.widget.FooterPreference;
-import com.android.settingslib.widget.FooterPreferenceMixinCompat;
import org.junit.Before;
import org.junit.Test;
@@ -56,7 +55,7 @@
import org.mockito.MockitoAnnotations;
import org.robolectric.RobolectricTestRunner;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.util.ReflectionHelpers;
+import org.robolectric.annotation.Config;
@RunWith(RobolectricTestRunner.class)
public class BillingCycleSettingsTest {
@@ -142,6 +141,7 @@
}
@Test
+ @Config(shadows = ShadowFragment.class)
public void onCreate_emptyArguments_shouldSetDefaultNetworkTemplate() {
final BillingCycleSettings billingCycleSettings = spy(new BillingCycleSettings());
when(billingCycleSettings.getContext()).thenReturn(mContext);
@@ -159,9 +159,6 @@
when(mConnectivityManager.isNetworkSupported(anyInt())).thenReturn(true);
final SwitchPreference preference = mock(SwitchPreference.class);
when(billingCycleSettings.findPreference(anyString())).thenReturn(preference);
- final FooterPreferenceMixinCompat footer = mock(FooterPreferenceMixinCompat.class);
- ReflectionHelpers.setField(billingCycleSettings, "mFooterPreferenceMixin", footer);
- when(footer.createFooterPreference()).thenReturn(mock(FooterPreference.class));
billingCycleSettings.onCreate(Bundle.EMPTY);
diff --git a/tests/robotests/src/com/android/settings/datetime/timezone/TimeZoneInfoPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/datetime/timezone/TimeZoneInfoPreferenceControllerTest.java
index 5bbd01e..563bf8d 100644
--- a/tests/robotests/src/com/android/settings/datetime/timezone/TimeZoneInfoPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/datetime/timezone/TimeZoneInfoPreferenceControllerTest.java
@@ -16,13 +16,16 @@
package com.android.settings.datetime.timezone;
-import static org.junit.Assert.assertEquals;
-import static org.mockito.Mockito.spy;
+import static com.android.settings.core.BasePreferenceController.AVAILABLE_UNSEARCHABLE;
+import static com.android.settings.core.BasePreferenceController.UNSUPPORTED_ON_DEVICE;
-import androidx.preference.Preference;
+import static com.google.common.truth.Truth.assertThat;
+
+import android.content.Context;
import com.android.settings.datetime.timezone.TimeZoneInfo.Formatter;
+import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.robolectric.RobolectricTestRunner;
@@ -34,20 +37,38 @@
@RunWith(RobolectricTestRunner.class)
public class TimeZoneInfoPreferenceControllerTest {
- @Test
- public void updateState_matchExpectedFormattedText() {
- Date now = new Date(0L); // 00:00 1/1/1970
- Formatter formatter = new Formatter(Locale.US, now);
+ private TimeZoneInfo mTimeZoneInfo;
+ private TimeZoneInfoPreferenceController mController;
- TimeZoneInfo timeZoneInfo = formatter.format("America/Los_Angeles");
- TimeZoneInfoPreferenceController controller =
- new TimeZoneInfoPreferenceController(RuntimeEnvironment.application);
- controller.mDate = now;
- controller.setTimeZoneInfo(timeZoneInfo);
- Preference preference = spy(new Preference(RuntimeEnvironment.application));
- controller.updateState(preference);
- assertEquals("Uses Pacific Time (GMT-08:00). "
- + "Pacific Daylight Time starts on April 26, 1970.",
- preference.getTitle().toString());
+ @Before
+ public void setUp() {
+ final Context context = RuntimeEnvironment.application;
+ final Date now = new Date(0L); // 00:00 1/1/1970
+ final Formatter formatter = new Formatter(Locale.US, now);
+ mTimeZoneInfo = formatter.format("America/Los_Angeles");
+ mController = new TimeZoneInfoPreferenceController(context, "key");
+ mController.mDate = now;
+ mController.setTimeZoneInfo(mTimeZoneInfo);
+ }
+
+ @Test
+ public void getSummary_matchExpectedFormattedText() {
+ assertThat(mController.getSummary().toString()).isEqualTo(
+ "Uses Pacific Time (GMT-08:00). "
+ + "Pacific Daylight Time starts on April 26, 1970.");
+ }
+
+ @Test
+ public void getAvailabilityStatus_timeZoneInfoSet_shouldReturnAVAILABLE_UNSEARCHABLE() {
+ mController.setTimeZoneInfo(mTimeZoneInfo);
+
+ assertThat(mController.getAvailabilityStatus()).isEqualTo(AVAILABLE_UNSEARCHABLE);
+ }
+
+ @Test
+ public void getAvailabilityStatus_noTimeZoneInfoSet_shouldReturnUNSUPPORTED_ON_DEVICE() {
+ mController.setTimeZoneInfo(null);
+
+ assertThat(mController.getAvailabilityStatus()).isEqualTo(UNSUPPORTED_ON_DEVICE);
}
}
diff --git a/tests/robotests/src/com/android/settings/development/BubbleGlobalPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/BubbleGlobalPreferenceControllerTest.java
index 11ca63f..9e52a88 100644
--- a/tests/robotests/src/com/android/settings/development/BubbleGlobalPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/BubbleGlobalPreferenceControllerTest.java
@@ -16,7 +16,7 @@
package com.android.settings.development;
-import static android.provider.Settings.Secure.NOTIFICATION_BUBBLES;
+import static android.provider.Settings.Global.NOTIFICATION_BUBBLES;
import static com.android.settings.development.BubbleGlobalPreferenceController.OFF;
import static com.android.settings.development.BubbleGlobalPreferenceController.ON;
@@ -77,7 +77,7 @@
@Test
public void updateState_settingEnabled_preferenceShouldBeChecked() {
- Settings.Secure.putInt(mContext.getContentResolver(),
+ Settings.Global.putInt(mContext.getContentResolver(),
NOTIFICATION_BUBBLES, 1 /* enabled */);
mController.updateState(mPreference);
@@ -86,7 +86,7 @@
@Test
public void updateState_settingReset_defaultDisabled_preferenceShouldNotBeChecked() {
- Settings.Secure.putInt(mContext.getContentResolver(),
+ Settings.Global.putInt(mContext.getContentResolver(),
NOTIFICATION_BUBBLES, 0 /* enabled */);
mController.updateState(mPreference);
@@ -104,7 +104,7 @@
}
private boolean isSettingEnabled() {
- return Settings.Secure.getInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES,
+ return Settings.Global.getInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES,
OFF /* default off */) == ON;
}
diff --git a/tests/robotests/src/com/android/settings/development/OemUnlockPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/OemUnlockPreferenceControllerTest.java
index a9c2d79..c762349 100644
--- a/tests/robotests/src/com/android/settings/development/OemUnlockPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/OemUnlockPreferenceControllerTest.java
@@ -32,7 +32,7 @@
import android.content.Context;
import android.content.pm.PackageManager;
import android.content.res.Resources;
-import android.os.Build;
+import android.os.SystemProperties;
import android.os.UserManager;
import android.service.oemlock.OemLockManager;
import android.telephony.TelephonyManager;
@@ -49,12 +49,14 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RobolectricTestRunner;
-import org.robolectric.annotation.Config;
-import org.robolectric.util.ReflectionHelpers;
@RunWith(RobolectricTestRunner.class)
public class OemUnlockPreferenceControllerTest {
+ private static final String OEM_UNLOCK_SUPPORTED_KEY = "ro.oem_unlock_supported";
+ private static final String UNSUPPORTED = "-9999";
+ private static final String SUPPORTED = "1";
+
@Mock
private Context mContext;
@Mock
@@ -80,6 +82,7 @@
@Before
public void setup() {
MockitoAnnotations.initMocks(this);
+ SystemProperties.set(OEM_UNLOCK_SUPPORTED_KEY, SUPPORTED);
when(mContext.getPackageManager()).thenReturn(mPackageManager);
when(mContext.getPackageManager().hasSystemFeature(PackageManager
.FEATURE_TELEPHONY_CARRIERLOCK)).thenReturn(true);
@@ -96,20 +99,14 @@
}
@Test
- @Config(qualifiers = "mcc999")
- public void OemUnlockPreferenceController_shouldNotCrashInEmulatorEngBuild() {
- ReflectionHelpers.setStaticField(Build.class, "IS_EMULATOR", true);
- ReflectionHelpers.setStaticField(Build.class, "IS_ENG", true);
+ public void OemUnlockPreferenceController_oemUnlockUnsupported_shouldNotCrash() {
+ SystemProperties.set(OEM_UNLOCK_SUPPORTED_KEY, UNSUPPORTED);
new OemUnlockPreferenceController(mContext, mActivity, mFragment);
}
@Test
- @Config(qualifiers = "mcc999")
- public void OemUnlockPreferenceController_shouldNotCrashInOtherBuild() {
- ReflectionHelpers.setStaticField(Build.class, "IS_EMULATOR", false);
- ReflectionHelpers.setStaticField(Build.class, "IS_ENG", false);
-
+ public void OemUnlockPreferenceController_oemUnlockSupported_shouldNotCrash() {
new OemUnlockPreferenceController(mContext, mActivity, mFragment);
}
diff --git a/tests/robotests/src/com/android/settings/development/gamedriver/GameDriverFooterPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/gamedriver/GameDriverFooterPreferenceControllerTest.java
index 133791e..17b7b36 100644
--- a/tests/robotests/src/com/android/settings/development/gamedriver/GameDriverFooterPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/gamedriver/GameDriverFooterPreferenceControllerTest.java
@@ -21,6 +21,7 @@
import static com.android.settings.development.gamedriver.GameDriverEnableForAllAppsPreferenceController.GAME_DRIVER_ALL_APPS;
import static com.android.settings.development.gamedriver.GameDriverEnableForAllAppsPreferenceController.GAME_DRIVER_DEFAULT;
import static com.android.settings.development.gamedriver.GameDriverEnableForAllAppsPreferenceController.GAME_DRIVER_OFF;
+
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.Mockito.spy;
@@ -62,7 +63,7 @@
MockitoAnnotations.initMocks(this);
mContext = RuntimeEnvironment.application;
mResolver = mContext.getContentResolver();
- mController = spy(new GameDriverFooterPreferenceController(mContext));
+ mController = spy(new GameDriverFooterPreferenceController(mContext, "key"));
when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);
}
@@ -104,20 +105,4 @@
verify(mGameDriverContentObserver).unregister(mResolver);
}
-
- @Test
- public void updateState_available_visible() {
- when(mController.getAvailabilityStatus()).thenReturn(AVAILABLE_UNSEARCHABLE);
- mController.updateState(mPreference);
-
- verify(mPreference).setVisible(true);
- }
-
- @Test
- public void updateState_unavailable_invisible() {
- when(mController.getAvailabilityStatus()).thenReturn(CONDITIONALLY_UNAVAILABLE);
- mController.updateState(mPreference);
-
- verify(mPreference).setVisible(false);
- }
}
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/TopLevelStoragePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/TopLevelStoragePreferenceControllerTest.java
index 6a19203..7d7be6c 100644
--- a/tests/robotests/src/com/android/settings/deviceinfo/TopLevelStoragePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/deviceinfo/TopLevelStoragePreferenceControllerTest.java
@@ -29,6 +29,8 @@
import android.os.storage.VolumeInfo;
import android.text.format.Formatter;
+import androidx.preference.Preference;
+
import com.android.settings.R;
import com.android.settingslib.deviceinfo.StorageManagerVolumeProvider;
@@ -77,14 +79,15 @@
when(mStorageManagerVolumeProvider
.getFreeBytes(nullable(StorageStatsManager.class), nullable(VolumeInfo.class)))
.thenReturn(0L);
-
ReflectionHelpers.setField(mController,
"mStorageManagerVolumeProvider", mStorageManagerVolumeProvider);
-
final String percentage = NumberFormat.getPercentInstance().format(1);
final String freeSpace = Formatter.formatFileSize(RuntimeEnvironment.application, 0);
- assertThat(mController.getSummary()).isEqualTo(
- RuntimeEnvironment.application.getString(
- R.string.storage_summary, percentage, freeSpace));
+ final Preference preference = new Preference(mContext);
+
+ mController.updateState(preference);
+
+ assertThat(preference.getSummary()).isEqualTo(
+ mContext.getString(R.string.storage_summary, percentage, freeSpace));
}
}
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/aboutphone/MyDeviceInfoFragmentTest.java b/tests/robotests/src/com/android/settings/deviceinfo/aboutphone/MyDeviceInfoFragmentTest.java
index 90dcf71..572f1d8 100644
--- a/tests/robotests/src/com/android/settings/deviceinfo/aboutphone/MyDeviceInfoFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/deviceinfo/aboutphone/MyDeviceInfoFragmentTest.java
@@ -18,98 +18,54 @@
import static com.android.settings.SettingsActivity.EXTRA_FRAGMENT_ARG_KEY;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.doNothing;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
+import static com.google.common.truth.Truth.assertThat;
-import android.content.Context;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+
import android.content.Intent;
import android.os.Bundle;
-import android.telephony.TelephonyManager;
-import android.util.ArrayMap;
-
-import androidx.fragment.app.FragmentActivity;
-import androidx.preference.PreferenceScreen;
import com.android.settings.deviceinfo.BuildNumberPreferenceController;
-import com.android.settings.testutils.FakeFeatureFactory;
-import com.android.settings.testutils.shadow.ShadowConnectivityManager;
-import com.android.settings.testutils.shadow.ShadowUserManager;
-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 org.robolectric.annotation.Config;
-import org.robolectric.shadows.ShadowApplication;
+import org.robolectric.shadows.androidx.fragment.FragmentController;
import org.robolectric.util.ReflectionHelpers;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
@RunWith(RobolectricTestRunner.class)
-@Config(shadows = {ShadowConnectivityManager.class, ShadowUserManager.class})
public class MyDeviceInfoFragmentTest {
- @Mock
- private FragmentActivity mActivity;
- @Mock
- private PreferenceScreen mScreen;
- @Mock
- private TelephonyManager mTelephonyManager;
-
- private Context mContext;
- private MyDeviceInfoFragment mSettings;
-
- @Before
- public void setUp() {
- MockitoAnnotations.initMocks(this);
- FakeFeatureFactory.setupForTest();
- mContext = RuntimeEnvironment.application;
- mSettings = spy(new MyDeviceInfoFragment());
-
- when(mSettings.getActivity()).thenReturn(mActivity);
- when(mSettings.getContext()).thenReturn(mContext);
- when(mActivity.getTheme()).thenReturn(mContext.getTheme());
- when(mActivity.getResources()).thenReturn(mContext.getResources());
- doNothing().when(mSettings).onCreatePreferences(any(), any());
-
- doReturn(mScreen).when(mSettings).getPreferenceScreen();
- when(mSettings.getPreferenceScreen()).thenReturn(mScreen);
- ShadowApplication.getInstance()
- .setSystemService(Context.TELEPHONY_SERVICE, mTelephonyManager);
- }
+ private MyDeviceInfoFragment mMyDeviceInfoFragment;
@Test
- public void onCreate_fromSearch_shouldNotOverrideInitialExpandedCount() {
+ public void onCreate_fromSearch_shouldExpandAllPreferences() {
final Bundle args = new Bundle();
args.putString(EXTRA_FRAGMENT_ARG_KEY, "search_key");
- mSettings.setArguments(args);
+ mMyDeviceInfoFragment = FragmentController.of(new MyDeviceInfoFragment(), args)
+ .create()
+ .get();
- mSettings.onCreate(null /* icicle */);
-
- verify(mScreen).setInitialExpandedChildrenCount(Integer.MAX_VALUE);
+ assertThat(mMyDeviceInfoFragment.getPreferenceScreen().getInitialExpandedChildrenCount())
+ .isEqualTo(Integer.MAX_VALUE);
}
@Test
public void onActivityResult_shouldCallBuildNumberPreferenceController() {
+ mMyDeviceInfoFragment = FragmentController.of(new MyDeviceInfoFragment())
+ .create()
+ .get();
+
final BuildNumberPreferenceController controller =
mock(BuildNumberPreferenceController.class);
- ReflectionHelpers.setField(mSettings, "mBuildNumberPreferenceController", controller);
+ ReflectionHelpers.setField(
+ mMyDeviceInfoFragment, "mBuildNumberPreferenceController", controller);
final int requestCode = 1;
final int resultCode = 2;
final Intent data = new Intent();
- mSettings.onActivityResult(requestCode, resultCode, data);
+ mMyDeviceInfoFragment.onActivityResult(requestCode, resultCode, data);
verify(controller).onActivityResult(requestCode, resultCode, data);
}
diff --git a/tests/robotests/src/com/android/settings/display/NightDisplayFooterPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/NightDisplayFooterPreferenceControllerTest.java
index 18aff9d..efb26fa 100644
--- a/tests/robotests/src/com/android/settings/display/NightDisplayFooterPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/display/NightDisplayFooterPreferenceControllerTest.java
@@ -14,6 +14,9 @@
package com.android.settings.display;
+import static com.android.settings.core.BasePreferenceController.AVAILABLE_UNSEARCHABLE;
+import static com.android.settings.core.BasePreferenceController.UNSUPPORTED_ON_DEVICE;
+
import static com.google.common.truth.Truth.assertThat;
import com.android.settings.testutils.shadow.SettingsShadowResources;
@@ -34,7 +37,8 @@
@Before
public void setUp() {
- mController = new NightDisplayFooterPreferenceController(RuntimeEnvironment.application);
+ mController =
+ new NightDisplayFooterPreferenceController(RuntimeEnvironment.application, "key");
}
@After
@@ -43,16 +47,18 @@
}
@Test
- public void isAvailable_configuredAvailable() {
+ public void getAvailabilityStatus_configuredAvailable_shouldReturnAVAILABLE_UNSEARCHABLE() {
SettingsShadowResources.overrideResource(
com.android.internal.R.bool.config_nightDisplayAvailable, true);
- assertThat(mController.isAvailable()).isTrue();
+
+ assertThat(mController.getAvailabilityStatus()).isEqualTo(AVAILABLE_UNSEARCHABLE);
}
@Test
- public void isAvailable_configuredUnavailable() {
+ public void getAvailabilityStatus_configuredUnavailable_shouldReturnUNSUPPORTED_ON_DEVICE() {
SettingsShadowResources.overrideResource(
com.android.internal.R.bool.config_nightDisplayAvailable, false);
- assertThat(mController.isAvailable()).isFalse();
+
+ assertThat(mController.getAvailabilityStatus()).isEqualTo(UNSUPPORTED_ON_DEVICE);
}
}
diff --git a/tests/robotests/src/com/android/settings/display/WallpaperPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/WallpaperPreferenceControllerTest.java
index c9a6978..d6ad52d2 100644
--- a/tests/robotests/src/com/android/settings/display/WallpaperPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/display/WallpaperPreferenceControllerTest.java
@@ -123,7 +123,7 @@
assertThat(mController.getKeywords())
.contains(mContext.getString(R.string.keywords_wallpaper));
assertThat(mController.getKeywords())
- .doesNotContain(mContext.getString(R.string.theme_customization_category));
+ .doesNotContain(mContext.getString(R.string.keywords_styles));
}
@Test
@@ -136,7 +136,7 @@
assertThat(mController.getKeywords())
.contains(mContext.getString(R.string.keywords_wallpaper));
assertThat(mController.getKeywords())
- .contains(mContext.getString(R.string.theme_customization_category));
+ .contains(mContext.getString(R.string.keywords_styles));
}
@Test
diff --git a/tests/robotests/src/com/android/settings/flashlight/FlashlightSliceTest.java b/tests/robotests/src/com/android/settings/flashlight/FlashlightSliceTest.java
index 224d2ee..02f1a23 100644
--- a/tests/robotests/src/com/android/settings/flashlight/FlashlightSliceTest.java
+++ b/tests/robotests/src/com/android/settings/flashlight/FlashlightSliceTest.java
@@ -20,6 +20,8 @@
import static com.google.common.truth.Truth.assertThat;
import android.content.Context;
+import android.hardware.camera2.CameraCharacteristics;
+import android.hardware.camera2.CameraManager;
import android.provider.Settings;
import androidx.slice.Slice;
@@ -35,6 +37,11 @@
import org.junit.runner.RunWith;
import org.robolectric.RobolectricTestRunner;
import org.robolectric.RuntimeEnvironment;
+import org.robolectric.Shadows;
+import org.robolectric.annotation.Config;
+import org.robolectric.shadow.api.Shadow;
+import org.robolectric.shadows.ShadowCameraCharacteristics;
+import org.robolectric.shadows.ShadowCameraManager;
import java.util.List;
@@ -42,10 +49,12 @@
public class FlashlightSliceTest {
private Context mContext;
+ private ShadowCameraManager mShadowCameraManager;
@Before
public void setUp() {
mContext = RuntimeEnvironment.application;
+ mShadowCameraManager = Shadows.shadowOf(mContext.getSystemService(CameraManager.class));
// Set-up specs for SliceMetadata.
SliceProvider.setSpecs(SliceLiveData.SUPPORTED_SPECS);
@@ -64,4 +73,22 @@
final List<SliceAction> toggles = metadata.getToggles();
assertThat(toggles).hasSize(1);
}
+
+ @Test
+ public void isFlashlightAvailable_nullSecureAttr_noFlashUnit_returnFalse() {
+ assertThat(FlashlightSlice.isFlashlightAvailable(mContext)).isFalse();
+ }
+
+ @Test
+ public void isFlashlightAvailable_nullSecureAttr_hasFlashUnit_returnTrue() {
+ final CameraCharacteristics characteristics =
+ ShadowCameraCharacteristics.newCameraCharacteristics();
+ final ShadowCameraCharacteristics shadowCharacteristics = Shadow.extract(characteristics);
+ shadowCharacteristics.set(CameraCharacteristics.FLASH_INFO_AVAILABLE, true);
+ shadowCharacteristics
+ .set(CameraCharacteristics.LENS_FACING, CameraCharacteristics.LENS_FACING_BACK);
+ mShadowCameraManager.addCamera("camera_id", characteristics);
+
+ assertThat(FlashlightSlice.isFlashlightAvailable(mContext)).isTrue();
+ }
}
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceControllerTest.java
index 5be7274..63e8a80 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceControllerTest.java
@@ -85,7 +85,6 @@
private BatteryMeterView mBatteryMeterView;
private TextView mBatteryPercentText;
private TextView mSummary;
- private TextView mSummary2;
private LayoutPreference mBatteryLayoutPref;
private Intent mBatteryIntent;
private LifecycleOwner mLifecycleOwner;
@@ -102,7 +101,6 @@
mBatteryPercentText = new TextView(mContext);
mSummary = new TextView(mContext);
ShadowEntityHeaderController.setUseMock(mEntityHeaderController);
- mSummary2 = new TextView(mContext);
mBatteryIntent = new Intent();
mBatteryIntent.putExtra(BatteryManager.EXTRA_LEVEL, BATTERY_LEVEL);
@@ -126,7 +124,6 @@
mController.mBatteryMeterView = mBatteryMeterView;
mController.mBatteryPercentText = mBatteryPercentText;
mController.mSummary1 = mSummary;
- mController.mSummary2 = mSummary2;
}
@After
@@ -190,7 +187,6 @@
@Test
public void quickUpdateHeaderPreference_onlyUpdateBatteryLevelAndChargingState() {
mSummary.setText(BATTERY_STATUS);
- mSummary2.setText(BATTERY_STATUS);
mController.quickUpdateHeaderPreference();
@@ -198,7 +194,6 @@
assertThat(mBatteryMeterView.getCharging()).isTrue();
assertThat(mBatteryPercentText.getText().toString()).isEqualTo("60 %");
assertThat(mSummary.getText()).isEqualTo(BATTERY_STATUS);
- assertThat(mSummary2.getText()).isEqualTo(BATTERY_STATUS);
}
@Test
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageBaseTest.java b/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageBaseTest.java
index cd1b178..e66c7e1 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageBaseTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageBaseTest.java
@@ -57,7 +57,7 @@
mFragment = spy(new TestFragment());
mFragment.setBatteryStatsHelper(mBatteryStatsHelper);
- doReturn(mLoaderManager).when(mFragment).getLoaderManager();
+ doReturn(mLoaderManager).when(LoaderManager.getInstance(any()));
}
@Test
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageSummaryTest.java b/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageSummaryTest.java
index 4d77bdd..7839e1a 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageSummaryTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageSummaryTest.java
@@ -265,20 +265,17 @@
}
}).when(mFeatureFactory.powerUsageFeatureProvider).getEnhancedEstimateDebugString(any());
- doReturn(new TextView(mRealContext)).when(mBatteryLayoutPref).findViewById(R.id.summary2);
doReturn(new TextView(mRealContext)).when(mBatteryLayoutPref).findViewById(R.id.summary1);
mFragment.onLongClick(new View(mRealContext));
TextView summary1 = mFragment.mBatteryLayoutPref.findViewById(R.id.summary1);
- TextView summary2 = mFragment.mBatteryLayoutPref.findViewById(R.id.summary2);
Robolectric.flushBackgroundThreadScheduler();
- assertThat(summary2.getText().toString()).contains(NEW_ML_EST_SUFFIX);
+ assertThat(summary1.getText().toString()).contains(NEW_ML_EST_SUFFIX);
assertThat(summary1.getText().toString()).contains(OLD_EST_SUFFIX);
}
@Test
public void debugMode() {
doReturn(true).when(mFeatureFactory.powerUsageFeatureProvider).isEstimateDebugEnabled();
- doReturn(new TextView(mRealContext)).when(mBatteryLayoutPref).findViewById(R.id.summary2);
mFragment.restartBatteryInfoLoader();
ArgumentCaptor<View.OnLongClickListener> listener = ArgumentCaptor.forClass(
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/RestrictAppPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/RestrictAppPreferenceControllerTest.java
index 7868768..774fba2 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/RestrictAppPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/RestrictAppPreferenceControllerTest.java
@@ -23,8 +23,10 @@
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
import android.app.Activity;
import android.app.AppOpsManager;
@@ -34,6 +36,8 @@
import android.os.UserManager;
import androidx.preference.Preference;
+import androidx.preference.PreferenceManager;
+import androidx.preference.PreferenceScreen;
import com.android.settings.R;
import com.android.settings.core.InstrumentedPreferenceFragment;
@@ -46,10 +50,10 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.Robolectric;
+import org.robolectric.RobolectricTestRunner;
import java.util.ArrayList;
import java.util.List;
-import org.robolectric.RobolectricTestRunner;
@RunWith(RobolectricTestRunner.class)
public class RestrictAppPreferenceControllerTest {
@@ -70,25 +74,23 @@
private AppOpsManager.PackageOps mAllowedPackageOps;
private AppOpsManager.PackageOps mOtherUserPackageOps;
private List<AppOpsManager.PackageOps> mPackageOpsList;
- private RestrictAppPreferenceController mRestrictAppPreferenceController;
private Preference mPreference;
+ private PreferenceScreen mPreferenceScreen;
private Context mContext;
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
- final AppOpsManager.OpEntry allowOpEntry = new AppOpsManager.OpEntry(
- AppOpsManager.OP_RUN_ANY_IN_BACKGROUND, false, AppOpsManager.MODE_ALLOWED,
- null /*accessTimes*/, null /*rejectTimes*/, null /*durations*/,
- null /* proxyUids */, null /* proxyPackages */);
final List<AppOpsManager.OpEntry> allowOps = new ArrayList<>();
- allowOps.add(allowOpEntry);
- final AppOpsManager.OpEntry restrictedOpEntry = new AppOpsManager.OpEntry(
- AppOpsManager.OP_RUN_ANY_IN_BACKGROUND, false, AppOpsManager.MODE_IGNORED,
- null /*accessTimes*/, null /*rejectTimes*/, null /*durations*/,
- null /* proxyUids */, null /* proxyPackages */);
+ allowOps.add(new AppOpsManager.OpEntry(
+ AppOpsManager.OP_RUN_ANY_IN_BACKGROUND, false, AppOpsManager.MODE_ALLOWED,
+ null /*accessTimes*/, null /*rejectTimes*/, null /*durations*/,
+ null /* proxyUids */, null /* proxyPackages */));
final List<AppOpsManager.OpEntry> restrictedOps = new ArrayList<>();
- restrictedOps.add(restrictedOpEntry);
+ restrictedOps.add(new AppOpsManager.OpEntry(
+ AppOpsManager.OP_RUN_ANY_IN_BACKGROUND, false, AppOpsManager.MODE_IGNORED,
+ null /*accessTimes*/, null /*rejectTimes*/, null /*durations*/,
+ null /* proxyUids */, null /* proxyPackages */));
mAllowedPackageOps = new AppOpsManager.PackageOps(
ALLOWED_PACKAGE_NAME, ALLOWED_UID, allowOps);
mRestrictedPackageOps = new AppOpsManager.PackageOps(
@@ -100,11 +102,15 @@
doReturn(mAppOpsManager).when(mContext).getSystemService(Context.APP_OPS_SERVICE);
doReturn(mUserManager).when(mContext).getSystemService(UserManager.class);
doReturn(mContext).when(mFragment).getContext();
- mRestrictAppPreferenceController =
- new RestrictAppPreferenceController(mFragment);
+
mPackageOpsList = new ArrayList<>();
mPreference = new Preference(mContext);
- mPreference.setKey(mRestrictAppPreferenceController.getPreferenceKey());
+ mPreference.setKey(RestrictAppPreferenceController.KEY_RESTRICT_APP);
+ mPreferenceScreen = spy(new PreferenceScreen(mContext, null));
+ when(mPreferenceScreen.getPreferenceManager()).thenReturn(mock(PreferenceManager.class));
+ when(mPreferenceScreen.getContext()).thenReturn(mContext);
+ when(mPreferenceScreen.findPreference(
+ RestrictAppPreferenceController.KEY_RESTRICT_APP)).thenReturn(mPreference);
final List<UserHandle> userHandles = new ArrayList<>();
userHandles.add(new UserHandle(0));
@@ -112,40 +118,49 @@
}
@Test
- public void testUpdateState_oneApp_showCorrectSummary() {
+ public void updateState_oneApp_showCorrectSummary() {
mPackageOpsList.add(mRestrictedPackageOps);
doReturn(mPackageOpsList).when(mAppOpsManager).getPackagesForOps(any(int[].class));
- mRestrictAppPreferenceController.updateState(mPreference);
+ final RestrictAppPreferenceController controller = new RestrictAppPreferenceController(
+ mFragment);
+ controller.displayPreference(mPreferenceScreen);
+ controller.updateState(mPreference);
assertThat(mPreference.getSummary()).isEqualTo("Limiting battery usage for 1 app");
}
@Test
- public void testUpdateState_twoRestrictedAppsForPrimaryUser_visibleAndShowCorrectSummary() {
+ public void updateState_twoRestrictedAppsForPrimaryUser_visibleAndShowCorrectSummary() {
mPackageOpsList.add(mRestrictedPackageOps);
mPackageOpsList.add(mRestrictedPackageOps);
mPackageOpsList.add(mAllowedPackageOps);
mPackageOpsList.add(mOtherUserPackageOps);
doReturn(mPackageOpsList).when(mAppOpsManager).getPackagesForOps(any(int[].class));
- mRestrictAppPreferenceController.updateState(mPreference);
+ final RestrictAppPreferenceController controller = new RestrictAppPreferenceController(
+ mFragment);
+ controller.displayPreference(mPreferenceScreen);
+ controller.updateState(mPreference);
assertThat(mPreference.getSummary()).isEqualTo("Limiting battery usage for 2 apps");
assertThat(mPreference.isVisible()).isTrue();
}
@Test
- public void testUpdateState_oneRestrictedAppForTwoUsers_showSummaryAndContainCorrectApp() {
+ public void updateState_oneRestrictedAppForTwoUsers_showSummaryAndContainCorrectApp() {
// Two packageOps share same package name but different uid.
mPackageOpsList.add(mRestrictedPackageOps);
mPackageOpsList.add(mOtherUserPackageOps);
doReturn(mPackageOpsList).when(mAppOpsManager).getPackagesForOps(any(int[].class));
- mRestrictAppPreferenceController.updateState(mPreference);
+ final RestrictAppPreferenceController controller = new RestrictAppPreferenceController(
+ mFragment);
+ controller.displayPreference(mPreferenceScreen);
+ controller.updateState(mPreference);
assertThat(mPreference.getSummary()).isEqualTo("Limiting battery usage for 1 app");
- assertThat(mRestrictAppPreferenceController.mAppInfos).containsExactly(
+ assertThat(controller.mAppInfos).containsExactly(
new AppInfo.Builder()
.setUid(RESTRICTED_UID)
.setPackageName(RESTRICTED_PACKAGE_NAME)
@@ -153,20 +168,25 @@
}
@Test
- public void testUpdateState_zeroRestrictApp_inVisible() {
+ public void updateState_zeroRestrictApp_inVisible() {
mPackageOpsList.add(mAllowedPackageOps);
doReturn(mPackageOpsList).when(mAppOpsManager).getPackagesForOps(any(int[].class));
- mRestrictAppPreferenceController.updateState(mPreference);
+ final RestrictAppPreferenceController controller = new RestrictAppPreferenceController(
+ mFragment);
+ controller.displayPreference(mPreferenceScreen);
+ controller.updateState(mPreference);
assertThat(mPreference.isVisible()).isFalse();
}
@Test
- public void testHandlePreferenceTreeClick_startFragment() {
+ public void handlePreferenceTreeClick_startFragment() {
final ArgumentCaptor<Intent> intent = ArgumentCaptor.forClass(Intent.class);
- mRestrictAppPreferenceController.handlePreferenceTreeClick(mPreference);
+ final RestrictAppPreferenceController controller = new RestrictAppPreferenceController(
+ mFragment);
+ controller.handlePreferenceTreeClick(mPreference);
verify(mContext).startActivity(intent.capture());
assertThat(intent.getValue().getStringExtra(EXTRA_SHOW_FRAGMENT))
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterysaver/BatterySaverButtonPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterysaver/BatterySaverButtonPreferenceControllerTest.java
index 3509330..8609599 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/batterysaver/BatterySaverButtonPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/batterysaver/BatterySaverButtonPreferenceControllerTest.java
@@ -26,6 +26,7 @@
import android.content.Context;
import android.os.PowerManager;
+import android.provider.SettingsSlicesContract;
import android.widget.Button;
import androidx.preference.PreferenceScreen;
@@ -73,6 +74,12 @@
}
@Test
+ public void getSliceUri_shouldUsePlatformAuthority() {
+ assertThat(mController.getSliceUri().getAuthority())
+ .isEqualTo(SettingsSlicesContract.AUTHORITY);
+ }
+
+ @Test
public void updateState_lowPowerOn_preferenceIsChecked() {
when(mPowerManager.isPowerSaveMode()).thenReturn(true);
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/AnomalyCleanupJobServiceTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/AnomalyCleanupJobServiceTest.java
index 32ea9e0..6f1e37a 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/AnomalyCleanupJobServiceTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/AnomalyCleanupJobServiceTest.java
@@ -27,14 +27,16 @@
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
+import android.app.JobSchedulerImpl;
+import android.app.job.IJobScheduler;
import android.app.job.JobInfo;
import android.app.job.JobParameters;
import android.app.job.JobScheduler;
import android.content.Context;
+import android.os.Binder;
import com.android.settings.R;
import com.android.settings.testutils.DatabaseTestUtils;
-import com.android.settings.testutils.shadow.ShadowThreadUtils;
import org.junit.After;
import org.junit.Before;
@@ -45,13 +47,11 @@
import org.robolectric.Robolectric;
import org.robolectric.RobolectricTestRunner;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
import java.util.List;
import java.util.concurrent.TimeUnit;
@RunWith(RobolectricTestRunner.class)
-@Config(shadows = ShadowThreadUtils.class)
public class AnomalyCleanupJobServiceTest {
private static final int UID = 1234;
private static final String PACKAGE_NAME = "com.android.package";
@@ -70,7 +70,7 @@
MockitoAnnotations.initMocks(this);
mContext = spy(RuntimeEnvironment.application);
- mJobScheduler = spy(mContext.getSystemService(JobScheduler.class));
+ mJobScheduler = spy(new JobSchedulerImpl(IJobScheduler.Stub.asInterface(new Binder())));
when(mContext.getSystemService(JobScheduler.class)).thenReturn(mJobScheduler);
}
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/AnomalyConfigJobServiceTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/AnomalyConfigJobServiceTest.java
index 30cab77..c6aaa32 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/AnomalyConfigJobServiceTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/AnomalyConfigJobServiceTest.java
@@ -30,10 +30,13 @@
import static org.mockito.Mockito.when;
import static org.robolectric.RuntimeEnvironment.application;
+import android.app.JobSchedulerImpl;
import android.app.StatsManager;
+import android.app.job.IJobScheduler;
import android.app.job.JobInfo;
import android.app.job.JobScheduler;
import android.content.Context;
+import android.os.Binder;
import android.provider.Settings;
import com.android.settings.R;
@@ -66,7 +69,7 @@
MockitoAnnotations.initMocks(this);
mContext = spy(RuntimeEnvironment.application);
- mJobScheduler = spy(mContext.getSystemService(JobScheduler.class));
+ mJobScheduler = spy(new JobSchedulerImpl(IJobScheduler.Stub.asInterface(new Binder())));
when(mContext.getSystemService(JobScheduler.class)).thenReturn(mJobScheduler);
mJobService = spy(new AnomalyConfigJobService());
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/AnomalyDetectionJobServiceTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/AnomalyDetectionJobServiceTest.java
index ba67793..e839717 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/AnomalyDetectionJobServiceTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/AnomalyDetectionJobServiceTest.java
@@ -38,7 +38,9 @@
import static org.mockito.Mockito.when;
import static org.robolectric.RuntimeEnvironment.application;
+import android.app.JobSchedulerImpl;
import android.app.StatsManager;
+import android.app.job.IJobScheduler;
import android.app.job.JobInfo;
import android.app.job.JobParameters;
import android.app.job.JobScheduler;
@@ -46,6 +48,7 @@
import android.app.settings.SettingsEnums;
import android.content.Context;
import android.content.Intent;
+import android.os.Binder;
import android.os.Bundle;
import android.os.Process;
import android.os.StatsDimensionsValue;
@@ -105,12 +108,16 @@
private AnomalyDetectionJobService mAnomalyDetectionJobService;
private FakeFeatureFactory mFeatureFactory;
private Context mContext;
+ private JobScheduler mJobScheduler;
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
- mContext = RuntimeEnvironment.application;
+ mContext = spy(RuntimeEnvironment.application);
+ mJobScheduler = spy(new JobSchedulerImpl(IJobScheduler.Stub.asInterface(new Binder())));
+ when(mContext.getSystemService(JobScheduler.class)).thenReturn(mJobScheduler);
+
mPolicy = new BatteryTipPolicy(mContext);
mBundle = new Bundle();
mBundle.putParcelable(StatsManager.EXTRA_STATS_DIMENSIONS_VALUE, mStatsDimensionsValue);
@@ -125,9 +132,9 @@
@Test
public void scheduleCleanUp() {
- AnomalyDetectionJobService.scheduleAnomalyDetection(application, new Intent());
+ AnomalyDetectionJobService.scheduleAnomalyDetection(mContext, new Intent());
- JobScheduler jobScheduler = application.getSystemService(JobScheduler.class);
+ JobScheduler jobScheduler = mContext.getSystemService(JobScheduler.class);
List<JobInfo> pendingJobs = jobScheduler.getAllPendingJobs();
assertThat(pendingJobs).hasSize(1);
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryTipDialogFragmentTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryTipDialogFragmentTest.java
index df9a194..331fb34 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryTipDialogFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryTipDialogFragmentTest.java
@@ -22,6 +22,9 @@
import static org.mockito.Mockito.spy;
import android.content.Context;
+import android.content.pm.ApplicationInfo;
+import android.content.pm.PackageInfo;
+import android.graphics.drawable.ColorDrawable;
import android.text.format.DateUtils;
import androidx.appcompat.app.AlertDialog;
@@ -38,6 +41,7 @@
import com.android.settings.testutils.shadow.ShadowUtils;
import com.android.settingslib.fuelgauge.EstimateKt;
+import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -45,7 +49,9 @@
import org.robolectric.Robolectric;
import org.robolectric.RobolectricTestRunner;
import org.robolectric.RuntimeEnvironment;
+import org.robolectric.Shadows;
import org.robolectric.annotation.Config;
+import org.robolectric.shadows.ShadowPackageManager;
import org.robolectric.shadows.androidx.fragment.FragmentController;
import java.util.ArrayList;
@@ -69,6 +75,7 @@
private UnrestrictAppTip mUnrestrictAppTip;
private SummaryTip mSummaryTip;
private AppInfo mAppInfo;
+ private ShadowPackageManager mPackageManager;
@Before
public void setUp() {
@@ -78,6 +85,18 @@
FakeFeatureFactory.setupForTest();
ShadowUtils.setApplicationLabel(PACKAGE_NAME, DISPLAY_NAME);
+ mPackageManager = Shadows.shadowOf(mContext.getPackageManager());
+
+ final ApplicationInfo applicationInfo = new ApplicationInfo();
+ applicationInfo.name = DISPLAY_NAME;
+ applicationInfo.packageName = PACKAGE_NAME;
+
+ final PackageInfo packageInfo = new PackageInfo();
+ packageInfo.packageName = PACKAGE_NAME;
+ packageInfo.applicationInfo = applicationInfo;
+ mPackageManager.addPackage(packageInfo);
+ mPackageManager.setApplicationIcon(PACKAGE_NAME, new ColorDrawable());
+
List<AppInfo> highUsageTips = new ArrayList<>();
mAppInfo = new AppInfo.Builder()
.setScreenOnTimeMs(SCREEN_TIME_MS)
@@ -99,6 +118,11 @@
EstimateKt.AVERAGE_TIME_TO_DISCHARGE_UNKNOWN));
}
+ @After
+ public void tearDown() {
+ mPackageManager.removePackage(PACKAGE_NAME);
+ }
+
@Test
public void testOnCreateDialog_highUsageTip_fireHighUsageDialog() {
Robolectric.getForegroundThreadScheduler().pause();
diff --git a/tests/robotests/src/com/android/settings/gestures/PreventRingingGesturePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/gestures/PreventRingingGesturePreferenceControllerTest.java
index 956d8bf..24a8490 100644
--- a/tests/robotests/src/com/android/settings/gestures/PreventRingingGesturePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/gestures/PreventRingingGesturePreferenceControllerTest.java
@@ -29,7 +29,7 @@
import androidx.preference.Preference;
import androidx.preference.PreferenceCategory;
-import com.android.settings.widget.RadioButtonPreference;
+import com.android.settingslib.widget.RadioButtonPreference;
import org.junit.Before;
import org.junit.Test;
diff --git a/tests/robotests/src/com/android/settings/homepage/SettingsHomepageActivityTest.java b/tests/robotests/src/com/android/settings/homepage/SettingsHomepageActivityTest.java
index dcb32c4..db12580 100644
--- a/tests/robotests/src/com/android/settings/homepage/SettingsHomepageActivityTest.java
+++ b/tests/robotests/src/com/android/settings/homepage/SettingsHomepageActivityTest.java
@@ -16,20 +16,42 @@
package com.android.settings.homepage;
+import static android.view.WindowManager.LayoutParams.SYSTEM_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS;
+
import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.os.Build;
import android.view.View;
+import android.view.Window;
+import android.view.WindowManager;
import android.widget.FrameLayout;
import com.android.settings.R;
+import com.android.settings.core.HideNonSystemOverlayMixin;
+import com.android.settings.homepage.contextualcards.slices.BatteryFixSliceTest;
+import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
+import org.mockito.ArgumentCaptor;
+import org.mockito.MockitoAnnotations;
import org.robolectric.Robolectric;
import org.robolectric.RobolectricTestRunner;
+import org.robolectric.android.controller.ActivityController;
+import org.robolectric.annotation.Config;
+import org.robolectric.util.ReflectionHelpers;
@RunWith(RobolectricTestRunner.class)
public class SettingsHomepageActivityTest {
+ @Before
+ public void setUp() {
+ MockitoAnnotations.initMocks(this);
+ }
@Test
public void setHomepageContainerPaddingTop_shouldBeSetPaddingTop() {
@@ -55,4 +77,55 @@
assertThat(frameLayout.getLayoutTransition()).isNotNull();
}
+
+ @Test
+ @Config(shadows = {
+ BatteryFixSliceTest.ShadowBatteryStatsHelperLoader.class,
+ BatteryFixSliceTest.ShadowBatteryTipLoader.class
+ })
+ public void onStart_isNotDebuggable_shouldHideSystemOverlay() {
+ ReflectionHelpers.setStaticField(Build.class, "IS_DEBUGGABLE", false);
+
+ final ActivityController<SettingsHomepageActivity> activityController =
+ Robolectric.buildActivity(SettingsHomepageActivity.class).create();
+ final SettingsHomepageActivity activity = spy(activityController.get());
+ final Window window = mock(Window.class);
+ when(activity.getWindow()).thenReturn(window);
+ activity.getLifecycle().addObserver(new HideNonSystemOverlayMixin(activity));
+
+ activityController.start();
+
+ verify(window).addSystemFlags(SYSTEM_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS);
+ }
+
+ @Test
+ @Config(shadows = {
+ BatteryFixSliceTest.ShadowBatteryStatsHelperLoader.class,
+ BatteryFixSliceTest.ShadowBatteryTipLoader.class,
+ })
+ public void onStop_isNotDebuggable_shouldRemoveHideSystemOverlay() {
+ ReflectionHelpers.setStaticField(Build.class, "IS_DEBUGGABLE", false);
+
+ final ActivityController<SettingsHomepageActivity> activityController =
+ Robolectric.buildActivity(SettingsHomepageActivity.class).create();
+ final SettingsHomepageActivity activity = spy(activityController.get());
+ final Window window = mock(Window.class);
+ when(activity.getWindow()).thenReturn(window);
+ activity.getLifecycle().addObserver(new HideNonSystemOverlayMixin(activity));
+
+ activityController.start();
+
+ verify(window).addSystemFlags(SYSTEM_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS);
+
+ final WindowManager.LayoutParams layoutParams = new WindowManager.LayoutParams();
+ when(window.getAttributes()).thenReturn(layoutParams);
+
+ activityController.stop();
+ final ArgumentCaptor<WindowManager.LayoutParams> paramCaptor = ArgumentCaptor.forClass(
+ WindowManager.LayoutParams.class);
+
+ verify(window).setAttributes(paramCaptor.capture());
+ assertThat(paramCaptor.getValue().privateFlags
+ & SYSTEM_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS).isEqualTo(0);
+ }
}
diff --git a/tests/robotests/src/com/android/settings/homepage/contextualcards/CardContentProviderTest.java b/tests/robotests/src/com/android/settings/homepage/contextualcards/CardContentProviderTest.java
index 5bdb8d3..d13c97c 100644
--- a/tests/robotests/src/com/android/settings/homepage/contextualcards/CardContentProviderTest.java
+++ b/tests/robotests/src/com/android/settings/homepage/contextualcards/CardContentProviderTest.java
@@ -38,11 +38,9 @@
import org.robolectric.Robolectric;
import org.robolectric.RobolectricTestRunner;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
import org.robolectric.util.ReflectionHelpers;
@RunWith(RobolectricTestRunner.class)
-@Config(shadows = ShadowThreadUtils.class)
public class CardContentProviderTest {
private Context mContext;
diff --git a/tests/robotests/src/com/android/settings/homepage/contextualcards/legacysuggestion/LegacySuggestionContextualCardControllerTest.java b/tests/robotests/src/com/android/settings/homepage/contextualcards/legacysuggestion/LegacySuggestionContextualCardControllerTest.java
index a2d4d09..69242fe 100644
--- a/tests/robotests/src/com/android/settings/homepage/contextualcards/legacysuggestion/LegacySuggestionContextualCardControllerTest.java
+++ b/tests/robotests/src/com/android/settings/homepage/contextualcards/legacysuggestion/LegacySuggestionContextualCardControllerTest.java
@@ -25,7 +25,6 @@
import com.android.settings.homepage.contextualcards.ContextualCardUpdateListener;
import com.android.settings.testutils.FakeFeatureFactory;
-import com.android.settings.testutils.shadow.ShadowThreadUtils;
import com.android.settingslib.suggestions.SuggestionController;
import org.junit.Before;
@@ -38,7 +37,6 @@
import org.robolectric.annotation.Config;
@RunWith(RobolectricTestRunner.class)
-@Config(shadows = ShadowThreadUtils.class)
public class LegacySuggestionContextualCardControllerTest {
@Mock
diff --git a/tests/robotests/src/com/android/settings/homepage/contextualcards/slices/ContextualAdaptiveSleepSliceTest.java b/tests/robotests/src/com/android/settings/homepage/contextualcards/slices/ContextualAdaptiveSleepSliceTest.java
index ff60aab..0a88d64 100644
--- a/tests/robotests/src/com/android/settings/homepage/contextualcards/slices/ContextualAdaptiveSleepSliceTest.java
+++ b/tests/robotests/src/com/android/settings/homepage/contextualcards/slices/ContextualAdaptiveSleepSliceTest.java
@@ -123,7 +123,7 @@
}
@Test
- public void getSlice_DoNotShowIfTurnedOn() {
+ public void getSlice_DoNotShowIFTurnedOn() {
Settings.System.putInt(mContext.getContentResolver(), Settings.System.ADAPTIVE_SLEEP, 1);
final Slice slice = mContextualAdaptiveSleepSlice.getSlice();
diff --git a/tests/robotests/src/com/android/settings/inputmethod/InputMethodPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/inputmethod/InputMethodPreferenceControllerTest.java
new file mode 100644
index 0000000..c678f92
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/inputmethod/InputMethodPreferenceControllerTest.java
@@ -0,0 +1,87 @@
+/*
+ * 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.inputmethod;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+import android.view.inputmethod.InputMethodInfo;
+
+import androidx.preference.Preference;
+import androidx.preference.PreferenceManager;
+import androidx.preference.PreferenceScreen;
+
+import com.android.settings.testutils.shadow.ShadowInputMethodManagerWithMethodList;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+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 = ShadowInputMethodManagerWithMethodList.class)
+public class InputMethodPreferenceControllerTest {
+
+ private InputMethodPreferenceController mController;
+ private Context mContext;
+ private PreferenceScreen mScreen;
+ private Preference mPreference;
+
+ @Before
+ public void setUp() {
+ mContext = RuntimeEnvironment.application;
+ mScreen = spy(new PreferenceScreen(mContext, null));
+ mPreference = new Preference(mContext);
+ mController = new InputMethodPreferenceController(mContext, "key");
+
+ when(mScreen.getPreferenceManager()).thenReturn(mock(PreferenceManager.class));
+ when(mScreen.getContext()).thenReturn(mContext);
+ when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);
+
+ mController.displayPreference(mScreen);
+ }
+
+ @Test
+ public void onStart_NoInputMethod_shouldHaveOnePreference() {
+ mController.onStart();
+
+ assertThat(mScreen.getPreferenceCount()).isEqualTo(1);
+ }
+
+ @Test
+ public void onStart_hasInputMethod_shouldHaveCorrectPreferences() {
+ final List<InputMethodInfo> imis = new ArrayList<>();
+ imis.add(mock(InputMethodInfo.class));
+ imis.add(mock(InputMethodInfo.class));
+ when(imis.get(0).getPackageName()).thenReturn("name1");
+ when(imis.get(1).getPackageName()).thenReturn("name2");
+ ShadowInputMethodManagerWithMethodList.getShadow().setEnabledInputMethodList(imis);
+
+ mController.onStart();
+
+ assertThat(mScreen.getPreferenceCount()).isEqualTo(3);
+ }
+}
diff --git a/tests/robotests/src/com/android/settings/location/LocationEnablerTest.java b/tests/robotests/src/com/android/settings/location/LocationEnablerTest.java
index fbae2f4..4e1e600 100644
--- a/tests/robotests/src/com/android/settings/location/LocationEnablerTest.java
+++ b/tests/robotests/src/com/android/settings/location/LocationEnablerTest.java
@@ -158,10 +158,6 @@
Settings.Secure.LOCATION_MODE, Settings.Secure.LOCATION_MODE_OFF);
mEnabler.setLocationEnabled(true);
- verify(mContext).sendBroadcastAsUser(
- argThat(actionMatches(LocationManager.MODE_CHANGING_ACTION)),
- eq(UserHandle.of(ActivityManager.getCurrentUser())),
- eq(WRITE_SECURE_SETTINGS));
assertThat(Settings.Secure.getInt(mContext.getContentResolver(),
Settings.Secure.LOCATION_CHANGER, Settings.Secure.LOCATION_CHANGER_UNKNOWN))
.isEqualTo(Settings.Secure.LOCATION_CHANGER_SYSTEM_SETTINGS);
diff --git a/tests/robotests/src/com/android/settings/location/LocationFooterPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/location/LocationFooterPreferenceControllerTest.java
index 2abef4e..dc3d40a 100644
--- a/tests/robotests/src/com/android/settings/location/LocationFooterPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/location/LocationFooterPreferenceControllerTest.java
@@ -22,11 +22,9 @@
import static org.mockito.Mockito.doNothing;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
-import android.content.ComponentName;
import android.content.Context;
import android.content.Intent;
import android.content.pm.ActivityInfo;
@@ -38,12 +36,9 @@
import android.location.LocationManager;
import android.os.Bundle;
-import androidx.lifecycle.LifecycleOwner;
import androidx.preference.Preference;
import androidx.preference.PreferenceCategory;
-import com.android.settingslib.core.lifecycle.Lifecycle;
-
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -65,22 +60,17 @@
private PackageManager mPackageManager;
@Mock
private Resources mResources;
- private Context mContext;
private LocationFooterPreferenceController mController;
- private LifecycleOwner mLifecycleOwner;
- private Lifecycle mLifecycle;
private static final int TEST_RES_ID = 1234;
private static final String TEST_TEXT = "text";
@Before
public void setUp() throws NameNotFoundException {
MockitoAnnotations.initMocks(this);
- mContext = spy(RuntimeEnvironment.application);
- when(mContext.getPackageManager()).thenReturn(mPackageManager);
- mLifecycleOwner = () -> mLifecycle;
- mLifecycle = new Lifecycle(mLifecycleOwner);
- when(mPreferenceCategory.getContext()).thenReturn(mContext);
- mController = spy(new LocationFooterPreferenceController(mContext, mLifecycle));
+ Context context = spy(RuntimeEnvironment.application);
+ when(context.getPackageManager()).thenReturn(mPackageManager);
+ when(mPreferenceCategory.getContext()).thenReturn(context);
+ mController = spy(new LocationFooterPreferenceController(context));
when(mPackageManager.getResourcesForApplication(any(ApplicationInfo.class)))
.thenReturn(mResources);
when(mResources.getString(TEST_RES_ID)).thenReturn(TEST_TEXT);
@@ -119,32 +109,6 @@
}
@Test
- public void sendBroadcastFooterInject() {
- ArgumentCaptor<Intent> intent = ArgumentCaptor.forClass(Intent.class);
- final ActivityInfo activityInfo =
- getTestResolveInfo(/*isSystemApp*/ true, /*hasRequiredMetadata*/ true).activityInfo;
- mController.sendBroadcastFooterDisplayed(
- new ComponentName(activityInfo.packageName, activityInfo.name));
- verify(mContext).sendBroadcast(intent.capture());
- assertThat(intent.getValue().getAction())
- .isEqualTo(LocationManager.SETTINGS_FOOTER_DISPLAYED_ACTION);
- }
-
- @Test
- public void updateState_sendBroadcast() {
- final List<ResolveInfo> testResolveInfos = new ArrayList<>();
- testResolveInfos.add(
- getTestResolveInfo(/*isSystemApp*/ true, /*hasRequiredMetadata*/ true));
- when(mPackageManager.queryBroadcastReceivers(any(), anyInt()))
- .thenReturn(testResolveInfos);
- mController.updateState(mPreferenceCategory);
- ArgumentCaptor<Intent> intent = ArgumentCaptor.forClass(Intent.class);
- verify(mContext).sendBroadcast(intent.capture());
- assertThat(intent.getValue().getAction())
- .isEqualTo(LocationManager.SETTINGS_FOOTER_DISPLAYED_ACTION);
- }
-
- @Test
public void updateState_addPreferences() {
final List<ResolveInfo> testResolveInfos = new ArrayList<>();
testResolveInfos.add(
@@ -166,32 +130,6 @@
.thenReturn(testResolveInfos);
mController.updateState(mPreferenceCategory);
verify(mPreferenceCategory, never()).addPreference(any(Preference.class));
- verify(mContext, never()).sendBroadcast(any(Intent.class));
- }
-
- @Test
- public void updateState_thenOnPause_sendBroadcasts() {
- final List<ResolveInfo> testResolveInfos = new ArrayList<>();
- testResolveInfos.add(
- getTestResolveInfo(/*isSystemApp*/ true, /*hasRequiredMetadata*/ true));
- when(mPackageManager.queryBroadcastReceivers(any(Intent.class), anyInt()))
- .thenReturn(testResolveInfos);
- mController.updateState(mPreferenceCategory);
- ArgumentCaptor<Intent> intent = ArgumentCaptor.forClass(Intent.class);
- verify(mContext).sendBroadcast(intent.capture());
- assertThat(intent.getValue().getAction())
- .isEqualTo(LocationManager.SETTINGS_FOOTER_DISPLAYED_ACTION);
-
- mController.onPause();
- verify(mContext, times(2)).sendBroadcast(intent.capture());
- assertThat(intent.getValue().getAction())
- .isEqualTo(LocationManager.SETTINGS_FOOTER_REMOVED_ACTION);
- }
-
- @Test
- public void onPause_doNotSendBroadcast() {
- mController.onPause();
- verify(mContext, never()).sendBroadcast(any(Intent.class));
}
/**
diff --git a/tests/robotests/src/com/android/settings/location/RecentLocationAccessPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/location/RecentLocationAccessPreferenceControllerTest.java
index aeda699..71a80de 100644
--- a/tests/robotests/src/com/android/settings/location/RecentLocationAccessPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/location/RecentLocationAccessPreferenceControllerTest.java
@@ -92,4 +92,75 @@
// We have not yet set the property to show the Permissions Hub.
assertThat(mController.isAvailable()).isEqualTo(false);
}
+
+ @Test
+ public void isAvailable_permissionHubEnabled_shouldReturnTrue() {
+ DeviceConfig.setProperty(DeviceConfig.NAMESPACE_PRIVACY,
+ Utils.PROPERTY_PERMISSIONS_HUB_ENABLED, "true", true);
+
+ assertThat(mController.isAvailable()).isEqualTo(true);
+ }
+
+ /** Verifies the title text, details text are correct, and the click listener is set. */
+ @Test
+ @Ignore
+ public void updateState_whenAppListIsEmpty_shouldDisplayTitleTextAndDetailsText() {
+ doReturn(new ArrayList<>()).when(mRecentLocationApps).getAppListSorted();
+ mController.displayPreference(mScreen);
+ mController.updateState(mLayoutPreference);
+
+ final TextView title = mAppEntitiesHeaderView.findViewById(R.id.header_title);
+ assertThat(title.getText()).isEqualTo(
+ mContext.getText(R.string.location_category_recent_location_access));
+ final TextView details = mAppEntitiesHeaderView.findViewById(R.id.header_details);
+ assertThat(details.getText()).isEqualTo(
+ mContext.getText(R.string.location_recent_location_access_view_details));
+ assertThat(details.hasOnClickListeners()).isTrue();
+ }
+
+ @Test
+ public void updateState_whenAppListMoreThanThree_shouldDisplayTopThreeApps() {
+ final List<RecentLocationAccesses.Access> accesses = createMockAccesses(6);
+ doReturn(accesses).when(mRecentLocationApps).getAppListSorted();
+ mController.displayPreference(mScreen);
+ mController.updateState(mLayoutPreference);
+
+ // The widget can display the top 3 apps from the list when there're more than 3.
+ final View app1View = mAppEntitiesHeaderView.findViewById(R.id.app1_view);
+ final ImageView appIconView1 = app1View.findViewById(R.id.app_icon);
+ final TextView appTitle1 = app1View.findViewById(R.id.app_title);
+
+ assertThat(app1View.getVisibility()).isEqualTo(View.VISIBLE);
+ assertThat(appIconView1.getDrawable()).isNotNull();
+ assertThat(appTitle1.getText()).isEqualTo("appTitle0");
+
+ final View app2View = mAppEntitiesHeaderView.findViewById(R.id.app2_view);
+ final ImageView appIconView2 = app2View.findViewById(R.id.app_icon);
+ final TextView appTitle2 = app2View.findViewById(R.id.app_title);
+
+ assertThat(app2View.getVisibility()).isEqualTo(View.VISIBLE);
+ assertThat(appIconView2.getDrawable()).isNotNull();
+ assertThat(appTitle2.getText()).isEqualTo("appTitle1");
+
+ final View app3View = mAppEntitiesHeaderView.findViewById(R.id.app3_view);
+ final ImageView appIconView3 = app3View.findViewById(R.id.app_icon);
+ final TextView appTitle3 = app3View.findViewById(R.id.app_title);
+
+ assertThat(app3View.getVisibility()).isEqualTo(View.VISIBLE);
+ assertThat(appIconView3.getDrawable()).isNotNull();
+ assertThat(appTitle3.getText()).isEqualTo("appTitle2");
+ }
+
+ private List<RecentLocationAccesses.Access> createMockAccesses(int count) {
+ final List<RecentLocationAccesses.Access> accesses = new ArrayList<>();
+ for (int i = 0; i < count; i++) {
+ final Drawable icon = mock(Drawable.class);
+ // Add mock accesses
+ final RecentLocationAccesses.Access access = new RecentLocationAccesses.Access(
+ "packageName", android.os.Process.myUserHandle(), icon,
+ "appTitle" + i, "appSummary" + i, 1000 - i);
+ accesses.add(access);
+ }
+ return accesses;
+ }
}
diff --git a/tests/robotests/src/com/android/settings/network/AirplaneModePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/AirplaneModePreferenceControllerTest.java
index a645bfa..fb297fb 100644
--- a/tests/robotests/src/com/android/settings/network/AirplaneModePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/network/AirplaneModePreferenceControllerTest.java
@@ -86,6 +86,12 @@
}
@Test
+ public void getSliceUri_shouldUsePlatformAuthority() {
+ assertThat(mController.getSliceUri().getAuthority())
+ .isEqualTo(SettingsSlicesContract.AUTHORITY);
+ }
+
+ @Test
@Config(qualifiers = "mcc999")
public void airplaneModePreference_shouldNotBeAvailable_ifSetToNotVisible() {
assertThat(mController.getAvailabilityStatus())
@@ -182,9 +188,7 @@
}
@Test
- public void isSliceableCorrectKey_returnsTrue() {
- final AirplaneModePreferenceController controller =
- new AirplaneModePreferenceController(mContext,"toggle_airplane");
- assertThat(controller.isSliceable()).isTrue();
+ public void isSliceable_returnsTrue() {
+ assertThat(mController.isSliceable()).isTrue();
}
}
diff --git a/tests/robotests/src/com/android/settings/network/ApnEditorTest.java b/tests/robotests/src/com/android/settings/network/ApnEditorTest.java
index dc14418..6a714d7 100644
--- a/tests/robotests/src/com/android/settings/network/ApnEditorTest.java
+++ b/tests/robotests/src/com/android/settings/network/ApnEditorTest.java
@@ -46,6 +46,7 @@
import com.android.settings.R;
import com.android.settings.network.ApnEditor.ApnData;
+import com.android.settings.testutils.shadow.ShadowFragment;
import org.junit.Before;
import org.junit.Test;
@@ -58,6 +59,7 @@
import org.robolectric.Robolectric;
import org.robolectric.RobolectricTestRunner;
import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
@RunWith(RobolectricTestRunner.class)
public class ApnEditorTest {
@@ -455,6 +457,7 @@
}
@Test
+ @Config(shadows = ShadowFragment.class)
public void onCreate_noAction_shouldFinishAndNoCrash() {
doNothing().when(mApnEditorUT).addPreferencesFromResource(anyInt());
diff --git a/tests/robotests/src/com/android/settings/network/NetworkScorerPickerTest.java b/tests/robotests/src/com/android/settings/network/NetworkScorerPickerTest.java
index 7607f91..c4e953c 100644
--- a/tests/robotests/src/com/android/settings/network/NetworkScorerPickerTest.java
+++ b/tests/robotests/src/com/android/settings/network/NetworkScorerPickerTest.java
@@ -34,7 +34,7 @@
import androidx.preference.PreferenceScreen;
import com.android.settings.R;
-import com.android.settings.widget.RadioButtonPreference;
+import com.android.settingslib.widget.RadioButtonPreference;
import com.google.android.collect.Lists;
diff --git a/tests/robotests/src/com/android/settings/network/PrivateDnsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/PrivateDnsPreferenceControllerTest.java
index 15fa5de..efb77eb 100644
--- a/tests/robotests/src/com/android/settings/network/PrivateDnsPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/network/PrivateDnsPreferenceControllerTest.java
@@ -213,7 +213,7 @@
when(lp.getValidatedPrivateDnsServers()).thenReturn(NON_EMPTY_ADDRESS_LIST);
updateLinkProperties(lp);
mController.updateState(mPreference);
- verify(mPreference).setSummary(getResourceString(R.string.switch_on_text));
+ verify(mPreference).setSummary(getResourceString(R.string.private_dns_mode_on));
reset(mPreference);
lp = mock(LinkProperties.class);
diff --git a/tests/robotests/src/com/android/settings/network/telephony/WifiCallingPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/telephony/WifiCallingPreferenceControllerTest.java
index f795d61..57541af 100644
--- a/tests/robotests/src/com/android/settings/network/telephony/WifiCallingPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/network/telephony/WifiCallingPreferenceControllerTest.java
@@ -127,7 +127,7 @@
}
@Test
- public void updateState_nonRoaming_wfcCellularPreferred() {
+ public void updateState_wfcNonRoamingByConfig() {
assertNull(mController.mSimCallManager);
mCarrierConfig.putBoolean(
CarrierConfigManager.KEY_USE_WFC_HOME_NETWORK_MODE_IN_ROAMING_NETWORK_BOOL, true);
@@ -147,7 +147,7 @@
}
@Test
- public void updateState_roaming_wfcWifiPreferred() {
+ public void updateState_wfcRoamingByConfig() {
assertNull(mController.mSimCallManager);
// useWfcHomeModeForRoaming is false by default. In order to check wfc in roaming mode. We
// need the device roaming, and not using home mode in roaming network.
diff --git a/tests/robotests/src/com/android/settings/nfc/NfcPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/nfc/NfcPreferenceControllerTest.java
index b7efc22..b6c8f37 100644
--- a/tests/robotests/src/com/android/settings/nfc/NfcPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/nfc/NfcPreferenceControllerTest.java
@@ -163,6 +163,7 @@
assertThat(keys).hasSize(1);
}
+
@Test
public void setChecked_True_nfcShouldEnable() {
mNfcController.setChecked(true);
@@ -209,7 +210,7 @@
@Test
public void shouldTurnOffNFCInAirplaneMode_airplaneModeRadiosContainsNfc_shouldReturnTrue() {
Settings.Global.putString(mContext.getContentResolver(),
- Settings.Global.AIRPLANE_MODE_RADIOS, Settings.Global.RADIO_NFC);
+ Settings.Global.AIRPLANE_MODE_RADIOS, Settings.Global.RADIO_NFC);
assertThat(NfcPreferenceController.shouldTurnOffNFCInAirplaneMode(mContext)).isTrue();
}
@@ -217,14 +218,15 @@
@Test
public void shouldTurnOffNFCInAirplaneMode_airplaneModeRadiosWithoutNfc_shouldReturnFalse() {
Settings.Global.putString(mContext.getContentResolver(),
- Settings.Global.AIRPLANE_MODE_RADIOS, "");
+ Settings.Global.AIRPLANE_MODE_RADIOS, "");
assertThat(NfcPreferenceController.shouldTurnOffNFCInAirplaneMode(mContext)).isFalse();
}
@Test
public void ncfSliceWorker_nfcBroadcast_noExtra_sliceDoesntUpdate() {
- final NfcSliceWorker worker = spy(new NfcSliceWorker(mContext, getDummyUri()));
+ final NfcSliceWorker worker = spy(
+ new NfcSliceWorker(mContext, mNfcController.getSliceUri()));
final NfcUpdateReceiver receiver = worker.new NfcUpdateReceiver(worker);
final Intent triggerIntent = new Intent(NfcAdapter.ACTION_ADAPTER_STATE_CHANGED);
@@ -235,7 +237,8 @@
@Test
public void ncfSliceWorker_nfcBroadcast_turningOn_sliceDoesntUpdate() {
- final NfcSliceWorker worker = spy(new NfcSliceWorker(mContext, getDummyUri()));
+ final NfcSliceWorker worker = spy(
+ new NfcSliceWorker(mContext, mNfcController.getSliceUri()));
final NfcUpdateReceiver receiver = worker.new NfcUpdateReceiver(worker);
final Intent triggerIntent = new Intent(NfcAdapter.ACTION_ADAPTER_STATE_CHANGED);
triggerIntent.putExtra(NfcAdapter.EXTRA_ADAPTER_STATE, NfcAdapter.STATE_TURNING_ON);
@@ -247,7 +250,8 @@
@Test
public void ncfSliceWorker_nfcBroadcast_turningOff_sliceDoesntUpdate() {
- final NfcSliceWorker worker = spy(new NfcSliceWorker(mContext, getDummyUri()));
+ final NfcSliceWorker worker = spy(
+ new NfcSliceWorker(mContext, mNfcController.getSliceUri()));
final NfcUpdateReceiver receiver = worker.new NfcUpdateReceiver(worker);
final Intent triggerIntent = new Intent(NfcAdapter.ACTION_ADAPTER_STATE_CHANGED);
triggerIntent.putExtra(NfcAdapter.EXTRA_ADAPTER_STATE, NfcAdapter.STATE_TURNING_OFF);
@@ -259,7 +263,8 @@
@Test
public void ncfSliceWorker_nfcBroadcast_nfcOn_sliceUpdates() {
- final NfcSliceWorker worker = spy(new NfcSliceWorker(mContext, getDummyUri()));
+ final NfcSliceWorker worker = spy(
+ new NfcSliceWorker(mContext, mNfcController.getSliceUri()));
final NfcUpdateReceiver receiver = worker.new NfcUpdateReceiver(worker);
final Intent triggerIntent = new Intent(NfcAdapter.ACTION_ADAPTER_STATE_CHANGED);
triggerIntent.putExtra(NfcAdapter.EXTRA_ADAPTER_STATE, NfcAdapter.STATE_ON);
@@ -271,7 +276,8 @@
@Test
public void ncfSliceWorker_nfcBroadcast_nfcOff_sliceUpdates() {
- final NfcSliceWorker worker = spy(new NfcSliceWorker(mContext, getDummyUri()));
+ final NfcSliceWorker worker = spy(
+ new NfcSliceWorker(mContext, mNfcController.getSliceUri()));
final NfcUpdateReceiver receiver = worker.new NfcUpdateReceiver(worker);
final Intent triggerIntent = new Intent(NfcAdapter.ACTION_ADAPTER_STATE_CHANGED);
triggerIntent.putExtra(NfcAdapter.EXTRA_ADAPTER_STATE, NfcAdapter.STATE_OFF);
@@ -280,8 +286,4 @@
verify(worker).updateSlice();
}
-
- private Uri getDummyUri() {
- return SliceBuilderUtils.getUri("action/nfc", false);
- }
}
diff --git a/tests/robotests/src/com/android/settings/notification/BubblePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/BubblePreferenceControllerTest.java
index aafefb5..470cc27 100644
--- a/tests/robotests/src/com/android/settings/notification/BubblePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/BubblePreferenceControllerTest.java
@@ -20,7 +20,7 @@
import static android.app.NotificationManager.IMPORTANCE_HIGH;
import static android.app.NotificationManager.IMPORTANCE_LOW;
import static android.app.NotificationManager.IMPORTANCE_NONE;
-import static android.provider.Settings.Secure.NOTIFICATION_BUBBLES;
+import static android.provider.Settings.Global.NOTIFICATION_BUBBLES;
import static com.android.settings.notification.BubblePreferenceController.SYSTEM_WIDE_OFF;
import static com.android.settings.notification.BubblePreferenceController.SYSTEM_WIDE_ON;
@@ -103,7 +103,7 @@
@Test
public void testIsAvailable_notIfAppBlocked() {
- Settings.Secure.putInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES, SYSTEM_WIDE_ON);
+ Settings.Global.putInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES, SYSTEM_WIDE_ON);
NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
appRow.banned = true;
mController.onResume(appRow, mock(NotificationChannel.class), null, null);
@@ -112,7 +112,7 @@
@Test
public void testIsAvailable_notIfChannelBlocked() {
- Settings.Secure.putInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES, SYSTEM_WIDE_ON);
+ Settings.Global.putInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES, SYSTEM_WIDE_ON);
NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
NotificationChannel channel = mock(NotificationChannel.class);
when(channel.getImportance()).thenReturn(IMPORTANCE_NONE);
@@ -122,7 +122,7 @@
@Test
public void testIsAvailable_channel_notIfAppOff() {
- Settings.Secure.putInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES, SYSTEM_WIDE_ON);
+ Settings.Global.putInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES, SYSTEM_WIDE_ON);
NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
appRow.allowBubbles = false;
NotificationChannel channel = mock(NotificationChannel.class);
@@ -136,7 +136,7 @@
public void testIsNotAvailable_ifOffGlobally_app() {
NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
mController.onResume(appRow, null, null, null);
- Settings.Secure.putInt(mContext.getContentResolver(),
+ Settings.Global.putInt(mContext.getContentResolver(),
NOTIFICATION_BUBBLES, SYSTEM_WIDE_OFF);
assertFalse(mController.isAvailable());
@@ -148,7 +148,7 @@
NotificationChannel channel = mock(NotificationChannel.class);
when(channel.getImportance()).thenReturn(IMPORTANCE_HIGH);
mController.onResume(appRow, channel, null, null);
- Settings.Secure.putInt(mContext.getContentResolver(),
+ Settings.Global.putInt(mContext.getContentResolver(),
NOTIFICATION_BUBBLES, SYSTEM_WIDE_OFF);
assertFalse(mController.isAvailable());
@@ -158,7 +158,7 @@
public void testIsAvailable_app_evenIfOffGlobally() {
NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
mAppPageController.onResume(appRow, null, null, null);
- Settings.Secure.putInt(mContext.getContentResolver(),
+ Settings.Global.putInt(mContext.getContentResolver(),
NOTIFICATION_BUBBLES, SYSTEM_WIDE_OFF);
assertTrue(mAppPageController.isAvailable());
@@ -168,7 +168,7 @@
public void testIsAvailable_app() {
NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
mController.onResume(appRow, null, null, null);
- Settings.Secure.putInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES, SYSTEM_WIDE_ON);
+ Settings.Global.putInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES, SYSTEM_WIDE_ON);
assertTrue(mController.isAvailable());
}
@@ -181,7 +181,7 @@
when(channel.getImportance()).thenReturn(IMPORTANCE_HIGH);
when(channel.getId()).thenReturn(DEFAULT_CHANNEL_ID);
mController.onResume(appRow, channel, null, null);
- Settings.Secure.putInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES, SYSTEM_WIDE_ON);
+ Settings.Global.putInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES, SYSTEM_WIDE_ON);
assertTrue(mController.isAvailable());
}
@@ -193,7 +193,7 @@
NotificationChannel channel = mock(NotificationChannel.class);
when(channel.getImportance()).thenReturn(IMPORTANCE_HIGH);
mController.onResume(appRow, channel, null, null);
- Settings.Secure.putInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES, SYSTEM_WIDE_ON);
+ Settings.Global.putInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES, SYSTEM_WIDE_ON);
assertTrue(mController.isAvailable());
}
@@ -205,7 +205,7 @@
NotificationChannel channel = mock(NotificationChannel.class);
when(channel.getImportance()).thenReturn(IMPORTANCE_HIGH);
mController.onResume(appRow, channel, null, null);
- Settings.Secure.putInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES, SYSTEM_WIDE_ON);
+ Settings.Global.putInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES, SYSTEM_WIDE_ON);
assertFalse(mController.isAvailable());
}
@@ -225,7 +225,7 @@
@Test
public void testUpdateState_channelNotBlockable() {
- Settings.Secure.putInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES, SYSTEM_WIDE_ON);
+ Settings.Global.putInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES, SYSTEM_WIDE_ON);
NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
NotificationChannel channel = mock(NotificationChannel.class);
when(channel.isImportanceLockedByCriticalDeviceFunction()).thenReturn(true);
@@ -239,7 +239,7 @@
@Test
public void testUpdateState_channel() {
- Settings.Secure.putInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES, SYSTEM_WIDE_ON);
+ Settings.Global.putInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES, SYSTEM_WIDE_ON);
NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
NotificationChannel channel = mock(NotificationChannel.class);
when(channel.canBubble()).thenReturn(true);
@@ -259,7 +259,7 @@
@Test
public void testUpdateState_app() {
- Settings.Secure.putInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES, SYSTEM_WIDE_ON);
+ Settings.Global.putInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES, SYSTEM_WIDE_ON);
NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
appRow.label = "App!";
appRow.allowBubbles = true;
@@ -281,7 +281,7 @@
@Test
public void testUpdateState_app_offGlobally() {
- Settings.Secure.putInt(mContext.getContentResolver(),
+ Settings.Global.putInt(mContext.getContentResolver(),
NOTIFICATION_BUBBLES, SYSTEM_WIDE_OFF);
NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
appRow.label = "App!";
@@ -295,7 +295,7 @@
@Test
public void testOnPreferenceChange_on_channel() {
- Settings.Secure.putInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES, SYSTEM_WIDE_ON);
+ Settings.Global.putInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES, SYSTEM_WIDE_ON);
NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
appRow.allowBubbles = true;
NotificationChannel channel =
@@ -315,7 +315,7 @@
@Test
public void testOnPreferenceChange_off_channel() {
- Settings.Secure.putInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES, SYSTEM_WIDE_ON);
+ Settings.Global.putInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES, SYSTEM_WIDE_ON);
NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
appRow.allowBubbles = true;
NotificationChannel channel =
@@ -335,7 +335,7 @@
@Test
public void testOnPreferenceChange_on_app() {
- Settings.Secure.putInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES, SYSTEM_WIDE_ON);
+ Settings.Global.putInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES, SYSTEM_WIDE_ON);
NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
appRow.allowBubbles = false;
mController.onResume(appRow, null, null, null);
@@ -353,7 +353,7 @@
@Test
public void testOnPreferenceChange_off_app() {
- Settings.Secure.putInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES, SYSTEM_WIDE_ON);
+ Settings.Global.putInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES, SYSTEM_WIDE_ON);
NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
appRow.allowBubbles = true;
mController.onResume(appRow, null, null, null);
@@ -371,7 +371,7 @@
@Test
public void testOnPreferenceChange_on_app_offGlobally() {
- Settings.Secure.putInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES,
+ Settings.Global.putInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES,
SYSTEM_WIDE_OFF);
NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
appRow.allowBubbles = false;
diff --git a/tests/robotests/src/com/android/settings/notification/BubbleSummaryPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/BubbleSummaryPreferenceControllerTest.java
index 04c8e4e..2710203 100644
--- a/tests/robotests/src/com/android/settings/notification/BubbleSummaryPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/BubbleSummaryPreferenceControllerTest.java
@@ -20,7 +20,7 @@
import static android.app.NotificationManager.IMPORTANCE_HIGH;
import static android.app.NotificationManager.IMPORTANCE_LOW;
import static android.app.NotificationManager.IMPORTANCE_NONE;
-import static android.provider.Settings.Secure.NOTIFICATION_BUBBLES;
+import static android.provider.Settings.Global.NOTIFICATION_BUBBLES;
import static com.android.settings.notification.BubbleSummaryPreferenceController.SYSTEM_WIDE_OFF;
import static com.android.settings.notification.BubbleSummaryPreferenceController.SYSTEM_WIDE_ON;
@@ -98,7 +98,7 @@
NotificationChannel channel = mock(NotificationChannel.class);
when(channel.getImportance()).thenReturn(IMPORTANCE_HIGH);
mController.onResume(appRow, channel, null, null);
- Settings.Secure.putInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES,
+ Settings.Global.putInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES,
SYSTEM_WIDE_OFF);
assertFalse(mController.isAvailable());
@@ -108,7 +108,7 @@
public void testIsAvailable_app() {
NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
mController.onResume(appRow, null, null, null);
- Settings.Secure.putInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES, SYSTEM_WIDE_ON);
+ Settings.Global.putInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES, SYSTEM_WIDE_ON);
assertTrue(mController.isAvailable());
}
@@ -117,7 +117,7 @@
public void testIsNotAvailable_app_globalOff() {
NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
mController.onResume(appRow, null, null, null);
- Settings.Secure.putInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES,
+ Settings.Global.putInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES,
SYSTEM_WIDE_OFF);
assertFalse(mController.isAvailable());
@@ -131,7 +131,7 @@
when(channel.getImportance()).thenReturn(IMPORTANCE_HIGH);
when(channel.getId()).thenReturn(DEFAULT_CHANNEL_ID);
mController.onResume(appRow, channel, null, null);
- Settings.Secure.putInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES, SYSTEM_WIDE_ON);
+ Settings.Global.putInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES, SYSTEM_WIDE_ON);
assertTrue(mController.isAvailable());
}
@@ -149,18 +149,18 @@
@Test
public void testGetSummary() {
- Settings.Secure.putInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES, SYSTEM_WIDE_ON);
+ Settings.Global.putInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES, SYSTEM_WIDE_ON);
NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
appRow.allowBubbles = true;
mController.onResume(appRow, null, null, null);
assertEquals("On", mController.getSummary());
- Settings.Secure.putInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES,
+ Settings.Global.putInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES,
SYSTEM_WIDE_OFF);
assertEquals("Off", mController.getSummary());
- Settings.Secure.putInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES, SYSTEM_WIDE_ON);
+ Settings.Global.putInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES, SYSTEM_WIDE_ON);
appRow.allowBubbles = false;
mController.onResume(appRow, null, null, null);
diff --git a/tests/robotests/src/com/android/settings/notification/GentleNotificationsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/GentleNotificationsPreferenceControllerTest.java
index 4821322..bd01379 100644
--- a/tests/robotests/src/com/android/settings/notification/GentleNotificationsPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/GentleNotificationsPreferenceControllerTest.java
@@ -16,8 +16,6 @@
package com.android.settings.notification;
-import static android.provider.Settings.Secure.NOTIFICATION_BUBBLES;
-
import static com.android.settings.notification.BadgingNotificationPreferenceController.OFF;
import static com.android.settings.notification.BadgingNotificationPreferenceController.ON;
diff --git a/tests/robotests/src/com/android/settings/notification/RingtonePreferenceControllerBaseTest.java b/tests/robotests/src/com/android/settings/notification/RingtonePreferenceControllerBaseTest.java
index 2fb1738..8fd3973 100644
--- a/tests/robotests/src/com/android/settings/notification/RingtonePreferenceControllerBaseTest.java
+++ b/tests/robotests/src/com/android/settings/notification/RingtonePreferenceControllerBaseTest.java
@@ -64,16 +64,6 @@
verify(preference).setSummary(anyString());
}
- @Test
- public void updateState_nullRingtone_shouldNotGetTitle() {
- Preference preference = mock(Preference.class);
- Settings.System.putString(mContext.getContentResolver(), Settings.System.RINGTONE, null);
-
- mController.updateState(preference);
-
- verify(preference, never()).setSummary(anyString());
- }
-
private class RingtonePreferenceControllerBaseTestable
extends RingtonePreferenceControllerBase {
RingtonePreferenceControllerBaseTestable(Context context) {
diff --git a/tests/robotests/src/com/android/settings/panel/InternetConnectivityPanelTest.java b/tests/robotests/src/com/android/settings/panel/InternetConnectivityPanelTest.java
index 42867fb..d9f56de 100644
--- a/tests/robotests/src/com/android/settings/panel/InternetConnectivityPanelTest.java
+++ b/tests/robotests/src/com/android/settings/panel/InternetConnectivityPanelTest.java
@@ -21,6 +21,7 @@
import android.net.Uri;
+import com.android.settings.network.AirplaneModePreferenceController;
import com.android.settings.slices.CustomSliceRegistry;
import org.junit.Before;
@@ -47,7 +48,7 @@
final List<Uri> uris = mPanel.getSlices();
assertThat(uris).containsExactly(
- CustomSliceRegistry.AIRPLANE_URI,
+ AirplaneModePreferenceController.SLICE_URI,
CustomSliceRegistry.MOBILE_DATA_SLICE_URI,
CustomSliceRegistry.WIFI_SLICE_URI);
}
diff --git a/tests/robotests/src/com/android/settings/panel/SettingsPanelActivityTest.java b/tests/robotests/src/com/android/settings/panel/SettingsPanelActivityTest.java
index 8ad2156..a4b7aa5 100644
--- a/tests/robotests/src/com/android/settings/panel/SettingsPanelActivityTest.java
+++ b/tests/robotests/src/com/android/settings/panel/SettingsPanelActivityTest.java
@@ -16,6 +16,8 @@
package com.android.settings.panel;
+import static android.view.WindowManager.LayoutParams.SYSTEM_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS;
+
import static com.android.settings.panel.SettingsPanelActivity.KEY_MEDIA_PACKAGE_NAME;
import static com.android.settings.panel.SettingsPanelActivity.KEY_PANEL_TYPE_ARGUMENT;
@@ -28,17 +30,23 @@
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
-import android.app.settings.SettingsEnums;
import android.content.Intent;
-import android.view.MotionEvent;
+import android.os.Build;
+import android.view.Window;
+import android.view.WindowManager;
+import com.android.settings.core.HideNonSystemOverlayMixin;
import com.android.settings.testutils.FakeFeatureFactory;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
+import org.mockito.ArgumentCaptor;
+import org.mockito.MockitoAnnotations;
import org.robolectric.Robolectric;
import org.robolectric.RobolectricTestRunner;
+import org.robolectric.android.controller.ActivityController;
+import org.robolectric.util.ReflectionHelpers;
@RunWith(RobolectricTestRunner.class)
public class SettingsPanelActivityTest {
@@ -50,6 +58,7 @@
@Before
public void setUp() {
+ MockitoAnnotations.initMocks(this);
mFakeFeatureFactory = FakeFeatureFactory.setupForTest();
mSettingsPanelActivity = spy(
Robolectric.buildActivity(FakeSettingsPanelActivity.class).create().get());
@@ -87,4 +96,47 @@
assertThat(activity.mBundle.getString(KEY_PANEL_TYPE_ARGUMENT))
.isEqualTo("com.android.settings.panel.action.MEDIA_OUTPUT");
}
+
+ @Test
+ public void onStart_isNotDebuggable_shouldHideSystemOverlay() {
+ ReflectionHelpers.setStaticField(Build.class, "IS_DEBUGGABLE", false);
+
+ final ActivityController<SettingsPanelActivity> activityController =
+ Robolectric.buildActivity(SettingsPanelActivity.class).create();
+ final SettingsPanelActivity activity = spy(activityController.get());
+ final Window window = mock(Window.class);
+ when(activity.getWindow()).thenReturn(window);
+ activity.getLifecycle().addObserver(new HideNonSystemOverlayMixin(activity));
+
+ activityController.start();
+
+ verify(window).addSystemFlags(SYSTEM_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS);
+ }
+
+ @Test
+ public void onStop_isNotDebuggable_shouldRemoveHideSystemOverlay() {
+ ReflectionHelpers.setStaticField(Build.class, "IS_DEBUGGABLE", false);
+
+ final ActivityController<SettingsPanelActivity> activityController =
+ Robolectric.buildActivity(SettingsPanelActivity.class).create();
+ final SettingsPanelActivity activity = spy(activityController.get());
+ final Window window = mock(Window.class);
+ when(activity.getWindow()).thenReturn(window);
+ activity.getLifecycle().addObserver(new HideNonSystemOverlayMixin(activity));
+
+ activityController.start();
+
+ verify(window).addSystemFlags(SYSTEM_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS);
+
+ final WindowManager.LayoutParams layoutParams = new WindowManager.LayoutParams();
+ when(window.getAttributes()).thenReturn(layoutParams);
+
+ activityController.stop();
+ final ArgumentCaptor<WindowManager.LayoutParams> paramCaptor = ArgumentCaptor.forClass(
+ WindowManager.LayoutParams.class);
+
+ verify(window).setAttributes(paramCaptor.capture());
+ assertThat(paramCaptor.getValue().privateFlags
+ & SYSTEM_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS).isEqualTo(0);
+ }
}
diff --git a/tests/robotests/src/com/android/settings/password/ChooseLockGenericTest.java b/tests/robotests/src/com/android/settings/password/ChooseLockGenericTest.java
index 673c334..1bdadb2 100644
--- a/tests/robotests/src/com/android/settings/password/ChooseLockGenericTest.java
+++ b/tests/robotests/src/com/android/settings/password/ChooseLockGenericTest.java
@@ -22,6 +22,7 @@
import static android.app.admin.DevicePolicyManager.PASSWORD_COMPLEXITY_MEDIUM;
import static android.app.admin.DevicePolicyManager.PASSWORD_COMPLEXITY_NONE;
+import static com.android.settings.password.ChooseLockGeneric.ChooseLockGenericFragment.KEY_LOCK_SETTINGS_FOOTER;
import static com.android.settings.password.ChooseLockSettingsHelper.EXTRA_KEY_CALLER_APP_NAME;
import static com.android.settings.password.ChooseLockSettingsHelper.EXTRA_KEY_IS_CALLING_APP_ADMIN;
import static com.android.settings.password.ChooseLockSettingsHelper.EXTRA_KEY_REQUESTED_MIN_COMPLEXITY;
@@ -136,7 +137,7 @@
mActivity.getString(R.string.unlock_footer_high_complexity_requested, "app name");
mFragment.updatePreferencesOrFinish(false /* isRecreatingActivity */);
- FooterPreference footer = mFragment.findPreference(FooterPreference.KEY_FOOTER);
+ FooterPreference footer = mFragment.findPreference(KEY_LOCK_SETTINGS_FOOTER);
assertThat(footer.getTitle()).isEqualTo(expectedTitle);
}
@@ -152,7 +153,7 @@
mActivity.getString(R.string.unlock_footer_medium_complexity_requested, "app name");
mFragment.updatePreferencesOrFinish(false /* isRecreatingActivity */);
- FooterPreference footer = mFragment.findPreference(FooterPreference.KEY_FOOTER);
+ FooterPreference footer = mFragment.findPreference(KEY_LOCK_SETTINGS_FOOTER);
assertThat(footer.getTitle()).isEqualTo(expectedTitle);
}
@@ -168,7 +169,7 @@
mActivity.getString(R.string.unlock_footer_low_complexity_requested, "app name");
mFragment.updatePreferencesOrFinish(false /* isRecreatingActivity */);
- FooterPreference footer = mFragment.findPreference(FooterPreference.KEY_FOOTER);
+ FooterPreference footer = mFragment.findPreference(KEY_LOCK_SETTINGS_FOOTER);
assertThat(footer.getTitle()).isEqualTo(expectedTitle);
}
@@ -184,19 +185,19 @@
mActivity.getString(R.string.unlock_footer_none_complexity_requested, "app name");
mFragment.updatePreferencesOrFinish(/* isRecreatingActivity= */ false);
- FooterPreference footer = mFragment.findPreference(FooterPreference.KEY_FOOTER);
+ FooterPreference footer = mFragment.findPreference(KEY_LOCK_SETTINGS_FOOTER);
assertThat(footer.getTitle()).isEqualTo(expectedTitle);
}
@Test
- public void updatePreferencesOrFinish_callingAppIsAdmin_noFooter() {
+ public void updatePreferencesOrFinish_callingAppIsAdmin_footerInvisible() {
initActivity(new Intent().putExtra(EXTRA_KEY_IS_CALLING_APP_ADMIN, true));
mFragment.updatePreferencesOrFinish(/* isRecreatingActivity= */ false);
- FooterPreference footer = mFragment.findPreference(FooterPreference.KEY_FOOTER);
- assertThat(footer).isNull();
+ FooterPreference footer = mFragment.findPreference(KEY_LOCK_SETTINGS_FOOTER);
+ assertThat(footer.isVisible()).isFalse();
}
@Test
diff --git a/tests/robotests/src/com/android/settings/privacy/AccessibilityUsagePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/privacy/AccessibilityUsagePreferenceControllerTest.java
index d75bf4b..33109b0 100644
--- a/tests/robotests/src/com/android/settings/privacy/AccessibilityUsagePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/privacy/AccessibilityUsagePreferenceControllerTest.java
@@ -65,6 +65,8 @@
@Test
public void getAvailabilityStatus_noEnabledServices_shouldReturnUnsupported() {
+ DeviceConfig.setProperty(DeviceConfig.NAMESPACE_PRIVACY,
+ Utils.PROPERTY_PERMISSIONS_HUB_ENABLED, "true", true);
mAccessibilityManager.setEnabledAccessibilityServiceList(new ArrayList<>());
AccessibilityUsagePreferenceController controller =
new AccessibilityUsagePreferenceController(mContext, "test_key");
@@ -74,6 +76,8 @@
@Test
public void getAvailabilityStatus_enabledServices_shouldReturnAvailable() {
+ DeviceConfig.setProperty(DeviceConfig.NAMESPACE_PRIVACY,
+ Utils.PROPERTY_PERMISSIONS_HUB_ENABLED, "false", true);
mAccessibilityManager.setEnabledAccessibilityServiceList(
new ArrayList<>(Arrays.asList(new AccessibilityServiceInfo())));
AccessibilityUsagePreferenceController controller =
diff --git a/tests/robotests/src/com/android/settings/privacy/PermissionBarChartPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/privacy/PermissionBarChartPreferenceControllerTest.java
index 1335db5..5501aa4 100644
--- a/tests/robotests/src/com/android/settings/privacy/PermissionBarChartPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/privacy/PermissionBarChartPreferenceControllerTest.java
@@ -103,8 +103,7 @@
.create().start().get());
mController.setFragment(mFragment);
mPreference = spy(new BarChartPreference(context));
- when(mScreen.findPreference(mController.getPreferenceKey()))
- .thenReturn((BarChartPreference) mPreference);
+ when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);
}
@After
@@ -117,4 +116,147 @@
// We have not yet set the property to show the Permissions Hub.
assertThat(mController.getAvailabilityStatus()).isEqualTo(UNSUPPORTED_ON_DEVICE);
}
+
+ @Test
+ public void getAvailabilityStatus_permissionHubEnabled_shouldReturnAvailableUnsearchable() {
+ DeviceConfig.setProperty(DeviceConfig.NAMESPACE_PRIVACY,
+ Utils.PROPERTY_PERMISSIONS_HUB_ENABLED,
+ "true", true);
+
+ assertThat(mController.getAvailabilityStatus()).isEqualTo(AVAILABLE_UNSEARCHABLE);
+ }
+
+ @Test
+ public void displayPreference_shouldInitializeBarChart() {
+ mController.displayPreference(mScreen);
+
+ verify(mPreference).initializeBarChart(any(BarChartInfo.class));
+ }
+
+ @Test
+ public void displayPreference_usageInfosSet_shouldSetBarViewInfos() {
+ final RuntimePermissionUsageInfo info1 =
+ new RuntimePermissionUsageInfo("permission 1", 10);
+ mController.mOldUsageInfos.add(info1);
+
+ mController.displayPreference(mScreen);
+
+ verify(mPreference).setBarViewInfos(any(BarViewInfo[].class));
+ verify(mPreference).initializeBarChart(any(BarChartInfo.class));
+ }
+
+ @Test
+ public void onPermissionUsageResult_differentPermissionResultSet_shouldSetBarViewInfos() {
+ final List<RuntimePermissionUsageInfo> infos1 = new ArrayList<>();
+ final RuntimePermissionUsageInfo info1 =
+ new RuntimePermissionUsageInfo("permission 1", 10);
+ infos1.add(info1);
+ mController.displayPreference(mScreen);
+ mController.onPermissionUsageResult(infos1);
+
+ verify(mPreference).setBarViewInfos(any(BarViewInfo[].class));
+
+ final List<RuntimePermissionUsageInfo> infos2 = new ArrayList<>();
+ final RuntimePermissionUsageInfo info2 =
+ new RuntimePermissionUsageInfo("permission 2", 20);
+ infos2.add(info2);
+ mController.onPermissionUsageResult(infos2);
+
+ verify(mPreference, times(2)).setBarViewInfos(any(BarViewInfo[].class));
+ }
+
+ @Test
+ public void onPermissionUsageResult_samePermissionResultSet_shouldNotSetBarViewInfos() {
+ final List<RuntimePermissionUsageInfo> mInfos = new ArrayList<>();
+ final RuntimePermissionUsageInfo info1 =
+ new RuntimePermissionUsageInfo("permission 1", 10);
+ mInfos.add(info1);
+ mController.displayPreference(mScreen);
+ mController.onPermissionUsageResult(mInfos);
+
+ mController.onPermissionUsageResult(mInfos);
+
+ verify(mPreference, times(1)).setBarViewInfos(any(BarViewInfo[].class));
+ }
+
+ @Test
+ public void onStart_usageInfosNotSetAndPermissionHubEnabled_shouldShowProgressBar() {
+ DeviceConfig.setProperty(DeviceConfig.NAMESPACE_PRIVACY,
+ Utils.PROPERTY_PERMISSIONS_HUB_ENABLED,
+ "true", true);
+ mController.displayPreference(mScreen);
+
+ mController.onStart();
+
+ assertThat(mFragment.getActivity().getActionBar().getElevation()).isZero();
+ verify(mFragment).showPinnedHeader(true);
+ verify(mPreference).updateLoadingState(true /* isLoading */);
+ }
+
+ @Test
+ public void onStart_usageInfosSetAndPermissionHubEnabled_shouldNotUpdatePrefLoadingState() {
+ DeviceConfig.setProperty(DeviceConfig.NAMESPACE_PRIVACY,
+ Utils.PROPERTY_PERMISSIONS_HUB_ENABLED,
+ "true", true);
+ final RuntimePermissionUsageInfo info1 =
+ new RuntimePermissionUsageInfo("permission 1", 10);
+ mController.mOldUsageInfos.add(info1);
+ mController.displayPreference(mScreen);
+
+ mController.onStart();
+
+ assertThat(mFragment.getActivity().getActionBar().getElevation()).isZero();
+ verify(mFragment).showPinnedHeader(true);
+ verify(mPreference).updateLoadingState(false /* isLoading */);
+ }
+
+ @Test
+ public void onStart_permissionHubDisabled_shouldNotShowProgressBar() {
+ DeviceConfig.setProperty(DeviceConfig.NAMESPACE_PRIVACY,
+ Utils.PROPERTY_PERMISSIONS_HUB_ENABLED,
+ "false", true);
+
+ mController.onStart();
+
+ assertThat(mFragment.getActivity().getActionBar().getElevation()).isNonZero();
+ verify(mFragment, never()).showPinnedHeader(true);
+ verify(mPreference, never()).updateLoadingState(true /* isLoading */);
+ }
+
+ @Test
+ public void onPermissionUsageResult_shouldHideProgressBar() {
+ final List<RuntimePermissionUsageInfo> infos1 = new ArrayList<>();
+ final RuntimePermissionUsageInfo info1 =
+ new RuntimePermissionUsageInfo("permission 1", 10);
+ infos1.add(info1);
+ mController.displayPreference(mScreen);
+
+ mController.onPermissionUsageResult(infos1);
+
+ verify(mFragment).showPinnedHeader(false);
+ verify(mPreference).updateLoadingState(false /* isLoading */);
+ }
+
+ @Test
+ public void onPermissionUsageResult_shouldBeSorted() {
+ final List<RuntimePermissionUsageInfo> infos = new ArrayList<>();
+ infos.add(new RuntimePermissionUsageInfo(PHONE, 10));
+ infos.add(new RuntimePermissionUsageInfo(LOCATION, 10));
+ infos.add(new RuntimePermissionUsageInfo(CAMERA, 10));
+ infos.add(new RuntimePermissionUsageInfo(SMS, 1));
+ infos.add(new RuntimePermissionUsageInfo(MICROPHONE, 10));
+ infos.add(new RuntimePermissionUsageInfo(CONTACTS, 42));
+ infos.add(new RuntimePermissionUsageInfo(CALENDAR, 10));
+ mController.displayPreference(mScreen);
+
+ mController.onPermissionUsageResult(infos);
+
+ assertThat(infos.get(0).getName()).isEqualTo(CONTACTS);
+ assertThat(infos.get(1).getName()).isEqualTo(LOCATION);
+ assertThat(infos.get(2).getName()).isEqualTo(MICROPHONE);
+ assertThat(infos.get(3).getName()).isEqualTo(CAMERA);
+ assertThat(infos.get(4).getName()).isEqualTo(CALENDAR);
+ assertThat(infos.get(5).getName()).isEqualTo(PHONE);
+ assertThat(infos.get(6).getName()).isEqualTo(SMS);
+ }
}
diff --git a/tests/robotests/src/com/android/settings/privacy/PrivacyDashboardFragmentTest.java b/tests/robotests/src/com/android/settings/privacy/PrivacyDashboardFragmentTest.java
index 80f3900..256fcd4 100644
--- a/tests/robotests/src/com/android/settings/privacy/PrivacyDashboardFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/privacy/PrivacyDashboardFragmentTest.java
@@ -16,8 +16,6 @@
package com.android.settings.privacy;
-import static com.google.common.truth.Truth.assertThat;
-
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verify;
@@ -27,7 +25,6 @@
import android.content.pm.UserInfo;
import android.os.Bundle;
import android.os.UserManager;
-import android.permission.PermissionControllerManager;
import android.view.View;
import android.view.accessibility.AccessibilityManager;
@@ -57,8 +54,6 @@
@Mock
private LockPatternUtils mLockPatternUtils;
- @Mock
- private PermissionControllerManager mPCM;
private Context mContext;
private PrivacyDashboardFragment mFragment;
@@ -80,32 +75,9 @@
}
@Test
- public void onViewCreated_shouldSetActionBarShadowAnimation() {
- mFragment.onViewCreated(new View(mContext), new Bundle());
-
- assertThat(mFragment.getActivity().getActionBar().getElevation()).isEqualTo(0.f);
- }
-
- @Test
public void onViewCreated_shouldInitLinearProgressBar() {
mFragment.onViewCreated(new View(mContext), new Bundle());
verify(mFragment).initLoadingBar();
}
-
- @Test
- public void updateLinearProgressbar_isVisible_shouldShowProgressBar() {
- mFragment.setLoadingEnabled(true /* enabled */);
-
- assertThat(mFragment.mProgressHeader.getVisibility()).isEqualTo(View.VISIBLE);
- assertThat(mFragment.mProgressAnimation.getVisibility()).isEqualTo(View.VISIBLE);
- }
-
- @Test
- public void updateLinearProgressbar_isInVisible_shouldHideProgressBar() {
- mFragment.setLoadingEnabled(false /* enabled */);
-
- assertThat(mFragment.mProgressHeader.getVisibility()).isEqualTo(View.INVISIBLE);
- assertThat(mFragment.mProgressAnimation.getVisibility()).isEqualTo(View.INVISIBLE);
- }
}
diff --git a/tests/robotests/src/com/android/settings/slices/SettingsSliceProviderTest.java b/tests/robotests/src/com/android/settings/slices/SettingsSliceProviderTest.java
index 96aaf46..ab4ece2 100644
--- a/tests/robotests/src/com/android/settings/slices/SettingsSliceProviderTest.java
+++ b/tests/robotests/src/com/android/settings/slices/SettingsSliceProviderTest.java
@@ -34,10 +34,8 @@
import android.app.PendingIntent;
import android.app.slice.SliceManager;
import android.content.ContentResolver;
-import android.content.ContentValues;
import android.content.Context;
import android.content.Intent;
-import android.database.sqlite.SQLiteDatabase;
import android.net.Uri;
import android.os.StrictMode;
import android.provider.Settings;
@@ -49,7 +47,6 @@
import androidx.slice.SliceProvider;
import androidx.slice.widget.SliceLiveData;
-import com.android.settings.R;
import com.android.settings.testutils.DatabaseTestUtils;
import com.android.settings.testutils.FakeToggleController;
import com.android.settings.testutils.shadow.ShadowBluetoothAdapter;
@@ -89,22 +86,27 @@
* TODO Investigate using ShadowContentResolver.registerProviderInternal(String, ContentProvider)
*/
@RunWith(RobolectricTestRunner.class)
-@Config(shadows = {ShadowUserManager.class, ShadowThreadUtils.class, ShadowUtils.class,
+@Config(shadows = {ShadowUserManager.class, ShadowUtils.class,
SlicesDatabaseAccessorTest.ShadowApplicationPackageManager.class,
ShadowBluetoothAdapter.class, ShadowLockPatternUtils.class,
SettingsSliceProviderTest.ShadowWifiScanWorker.class})
public class SettingsSliceProviderTest {
private static final String KEY = "KEY";
- private static final String INTENT_PATH =
- SettingsSlicesContract.PATH_SETTING_INTENT + "/" + KEY;
- private static final String TITLE = "title";
- private static final String SUMMARY = "summary";
- private static final String SCREEN_TITLE = "screen title";
- private static final String FRAGMENT_NAME = "fragment name";
- private static final int ICON = R.drawable.ic_settings_accent;
+ private static final Uri INTENT_SLICE_URI =
+ new Uri.Builder().scheme(SCHEME_CONTENT)
+ .authority(SettingsSliceProvider.SLICE_AUTHORITY)
+ .appendPath(SettingsSlicesContract.PATH_SETTING_INTENT)
+ .appendPath(KEY)
+ .build();
+ private static final Uri ACTION_SLICE_URI =
+ new Uri.Builder().scheme(SCHEME_CONTENT)
+ .authority(SettingsSlicesContract.AUTHORITY)
+ .appendPath(SettingsSlicesContract.PATH_SETTING_ACTION)
+ .appendPath(KEY)
+ .build();
+
private static final Uri URI = Uri.parse("content://com.android.settings.slices/test");
- private static final String PREF_CONTROLLER = FakeToggleController.class.getName();
private Context mContext;
private SettingsSliceProvider mProvider;
@@ -120,7 +122,8 @@
private static final List<Uri> SPECIAL_CASE_OEM_URIS = Arrays.asList(
CustomSliceRegistry.ZEN_MODE_SLICE_URI,
CustomSliceRegistry.FLASHLIGHT_SLICE_URI,
- CustomSliceRegistry.MOBILE_DATA_SLICE_URI
+ CustomSliceRegistry.MOBILE_DATA_SLICE_URI,
+ CustomSliceRegistry.WIFI_CALLING_URI
);
@Before
@@ -154,47 +157,44 @@
@Test
public void testInitialSliceReturned_emptySlice() {
- insertSpecialCase(KEY);
- final Uri uri = SliceBuilderUtils.getUri(INTENT_PATH, false);
- Slice slice = mProvider.onBindSlice(uri);
+ SliceTestUtils.insertSliceToDb(mContext, KEY);
+ Slice slice = mProvider.onBindSlice(INTENT_SLICE_URI);
- assertThat(slice.getUri()).isEqualTo(uri);
+ assertThat(slice.getUri()).isEqualTo(INTENT_SLICE_URI);
assertThat(slice.getItems()).isEmpty();
}
@Test
public void testLoadSlice_returnsSliceFromAccessor() {
- insertSpecialCase(KEY);
- final Uri uri = SliceBuilderUtils.getUri(INTENT_PATH, false);
+ SliceTestUtils.insertSliceToDb(mContext, KEY);
- mProvider.loadSlice(uri);
- SliceData data = mProvider.mSliceWeakDataCache.get(uri);
+ mProvider.loadSlice(INTENT_SLICE_URI);
+ SliceData data = mProvider.mSliceWeakDataCache.get(INTENT_SLICE_URI);
assertThat(data.getKey()).isEqualTo(KEY);
- assertThat(data.getTitle()).isEqualTo(TITLE);
+ assertThat(data.getTitle()).isEqualTo(SliceTestUtils.FAKE_TITLE);
}
@Test
public void loadSlice_registersIntentFilter() {
- insertSpecialCase(KEY);
- final Uri uri = SliceBuilderUtils.getUri(INTENT_PATH, false);
+ SliceTestUtils.insertSliceToDb(mContext, KEY);
- mProvider.loadSlice(uri);
+ mProvider.loadSlice(INTENT_SLICE_URI);
- verify(mProvider).registerIntentToUri(eq(FakeToggleController.INTENT_FILTER), eq(uri));
+ verify(mProvider)
+ .registerIntentToUri(eq(FakeToggleController.INTENT_FILTER), eq(INTENT_SLICE_URI));
}
@Test
public void loadSlice_registersBackgroundListener() {
- insertSpecialCase(KEY);
- final Uri uri = SliceBuilderUtils.getUri(INTENT_PATH, false);
+ SliceTestUtils.insertSliceToDb(mContext, KEY);
- mProvider.loadSlice(uri);
+ mProvider.loadSlice(INTENT_SLICE_URI);
Robolectric.flushForegroundThreadScheduler();
Robolectric.flushBackgroundThreadScheduler();
- assertThat(mProvider.mPinnedWorkers.get(uri).getClass())
+ assertThat(mProvider.mPinnedWorkers.get(INTENT_SLICE_URI).getClass())
.isEqualTo(FakeToggleController.TestWorker.class);
}
@@ -203,7 +203,7 @@
SliceData data = getDummyData();
mProvider.mSliceWeakDataCache.put(data.getUri(), data);
mProvider.onBindSlice(data.getUri());
- insertSpecialCase(data.getKey());
+ SliceTestUtils.insertSliceToDb(mContext, data.getKey());
SliceData cachedData = mProvider.mSliceWeakDataCache.get(data.getUri());
@@ -255,27 +255,26 @@
@Test
public void getDescendantUris_fullActionUri_returnsSelf() {
- final Uri uri = SliceBuilderUtils.getUri(
- SettingsSlicesContract.PATH_SETTING_ACTION + "/key", true);
+ final Collection<Uri> descendants = mProvider.onGetSliceDescendants(ACTION_SLICE_URI);
- final Collection<Uri> descendants = mProvider.onGetSliceDescendants(uri);
-
- assertThat(descendants).containsExactly(uri);
+ assertThat(descendants).containsExactly(ACTION_SLICE_URI);
}
@Test
public void getDescendantUris_fullIntentUri_returnsSelf() {
- final Uri uri = SliceBuilderUtils.getUri(
- SettingsSlicesContract.PATH_SETTING_ACTION + "/key", true);
- final Collection<Uri> descendants = mProvider.onGetSliceDescendants(uri);
+ final Collection<Uri> descendants = mProvider.onGetSliceDescendants(ACTION_SLICE_URI);
- assertThat(descendants).containsExactly(uri);
+ assertThat(descendants).containsExactly(ACTION_SLICE_URI);
}
@Test
public void getDescendantUris_wrongPath_returnsEmpty() {
- final Uri uri = SliceBuilderUtils.getUri("invalid_path", true);
+ final Uri uri = new Uri.Builder()
+ .scheme(SCHEME_CONTENT)
+ .authority(SettingsSlicesContract.AUTHORITY)
+ .appendPath("invalid_path")
+ .build();
final Collection<Uri> descendants = mProvider.onGetSliceDescendants(uri);
@@ -285,7 +284,7 @@
@Test
public void getDescendantUris_invalidPath_returnsEmpty() {
final String key = "platform_key";
- insertSpecialCase(key, true /* isPlatformSlice */);
+ SliceTestUtils.insertSliceToDb(mContext, key, true /* isPlatformSlice */);
final Uri uri = new Uri.Builder()
.scheme(SCHEME_CONTENT)
.authority(SettingsSlicesContract.AUTHORITY)
@@ -300,7 +299,7 @@
@Test
public void getDescendantUris_platformSlice_doesNotReturnOEMSlice() {
- insertSpecialCase("oem_key", false /* isPlatformSlice */);
+ SliceTestUtils.insertSliceToDb(mContext, "oem_key", false /* isPlatformSlice */);
final Uri uri = new Uri.Builder()
.scheme(SCHEME_CONTENT)
.authority(SettingsSlicesContract.AUTHORITY)
@@ -314,7 +313,7 @@
@Test
public void getDescendantUris_oemSlice_doesNotReturnPlatformSlice() {
- insertSpecialCase("platform_key", true /* isPlatformSlice */);
+ SliceTestUtils.insertSliceToDb(mContext, "platform_key", true /* isPlatformSlice */);
final Uri uri = new Uri.Builder()
.scheme(SCHEME_CONTENT)
.authority(SettingsSliceProvider.SLICE_AUTHORITY)
@@ -329,7 +328,7 @@
@Test
public void getDescendantUris_oemSlice_returnsOEMUriDescendant() {
final String key = "oem_key";
- insertSpecialCase(key, false /* isPlatformSlice */);
+ SliceTestUtils.insertSliceToDb(mContext, key, false /* isPlatformSlice */);
final Uri uri = new Uri.Builder()
.scheme(SCHEME_CONTENT)
.authority(SettingsSliceProvider.SLICE_AUTHORITY)
@@ -352,7 +351,7 @@
@Test
public void getDescendantUris_oemSliceNoPath_returnsOEMUriDescendant() {
final String key = "oem_key";
- insertSpecialCase(key, false /* isPlatformSlice */);
+ SliceTestUtils.insertSliceToDb(mContext, key, false /* isPlatformSlice */);
final Uri uri = new Uri.Builder()
.scheme(SCHEME_CONTENT)
.authority(SettingsSliceProvider.SLICE_AUTHORITY)
@@ -374,7 +373,7 @@
@Test
public void getDescendantUris_platformSlice_returnsPlatformUriDescendant() {
final String key = "platform_key";
- insertSpecialCase(key, true /* isPlatformSlice */);
+ SliceTestUtils.insertSliceToDb(mContext, key, true /* isPlatformSlice */);
final Uri uri = new Uri.Builder()
.scheme(SCHEME_CONTENT)
.authority(SettingsSlicesContract.AUTHORITY)
@@ -397,7 +396,7 @@
@Test
public void getDescendantUris_platformSliceNoPath_returnsPlatformUriDescendant() {
final String key = "platform_key";
- insertSpecialCase(key, true /* isPlatformSlice */);
+ SliceTestUtils.insertSliceToDb(mContext, key, true /* isPlatformSlice */);
final Uri uri = new Uri.Builder()
.scheme(SCHEME_CONTENT)
.authority(SettingsSlicesContract.AUTHORITY)
@@ -420,8 +419,8 @@
public void getDescendantUris_noAuthorityNorPath_returnsAllUris() {
final String platformKey = "platform_key";
final String oemKey = "oemKey";
- insertSpecialCase(platformKey, true /* isPlatformSlice */);
- insertSpecialCase(oemKey, false /* isPlatformSlice */);
+ SliceTestUtils.insertSliceToDb(mContext, platformKey, true /* isPlatformSlice */);
+ SliceTestUtils.insertSliceToDb(mContext, oemKey, false /* isPlatformSlice */);
final Uri uri = new Uri.Builder()
.scheme(SCHEME_CONTENT)
.build();
@@ -486,31 +485,6 @@
mProvider.onSlicePinned(uri);
}
- @Implements(WifiScanWorker.class)
- public static class ShadowWifiScanWorker {
- private static WifiTracker mWifiTracker;
-
- @Implementation
- protected void onSlicePinned() {
- mWifiTracker = mock(WifiTracker.class);
- mWifiTracker.onStart();
- }
-
- @Implementation
- protected void onSliceUnpinned() {
- mWifiTracker.onStop();
- }
-
- @Implementation
- protected void close() {
- mWifiTracker.onDestroy();
- }
-
- static WifiTracker getWifiTracker() {
- return mWifiTracker;
- }
- }
-
@Test
public void onSlicePinned_backgroundWorker_started() {
mProvider.onSlicePinned(CustomSliceRegistry.WIFI_SLICE_URI);
@@ -557,45 +531,44 @@
.grantSlicePermission("com.android.settings.slice_whitelist_package", uris.get(0));
}
- private void insertSpecialCase(String key) {
- insertSpecialCase(key, true);
- }
-
- private void insertSpecialCase(String key, boolean isPlatformSlice) {
- final ContentValues values = new ContentValues();
- values.put(SlicesDatabaseHelper.IndexColumns.KEY, key);
- values.put(SlicesDatabaseHelper.IndexColumns.TITLE, TITLE);
- values.put(SlicesDatabaseHelper.IndexColumns.SUMMARY, "s");
- values.put(SlicesDatabaseHelper.IndexColumns.SCREENTITLE, "s");
- values.put(SlicesDatabaseHelper.IndexColumns.ICON_RESOURCE, R.drawable.ic_settings_accent);
- values.put(SlicesDatabaseHelper.IndexColumns.FRAGMENT, "test");
- values.put(SlicesDatabaseHelper.IndexColumns.CONTROLLER, PREF_CONTROLLER);
- values.put(SlicesDatabaseHelper.IndexColumns.PLATFORM_SLICE, isPlatformSlice);
- values.put(SlicesDatabaseHelper.IndexColumns.SLICE_TYPE, SliceData.SliceType.INTENT);
- final SQLiteDatabase db = SlicesDatabaseHelper.getInstance(mContext).getWritableDatabase();
- db.beginTransaction();
- try {
- db.replaceOrThrow(SlicesDatabaseHelper.Tables.TABLE_SLICES_INDEX, null, values);
- db.setTransactionSuccessful();
- } finally {
- db.endTransaction();
- }
- db.close();
- }
-
private static SliceData getDummyData() {
return new SliceData.Builder()
.setKey(KEY)
- .setTitle(TITLE)
- .setSummary(SUMMARY)
- .setScreenTitle(SCREEN_TITLE)
- .setIcon(ICON)
- .setFragmentName(FRAGMENT_NAME)
.setUri(URI)
- .setPreferenceControllerClassName(PREF_CONTROLLER)
+ .setTitle(SliceTestUtils.FAKE_TITLE)
+ .setSummary(SliceTestUtils.FAKE_SUMMARY)
+ .setScreenTitle(SliceTestUtils.FAKE_SCREEN_TITLE)
+ .setIcon(SliceTestUtils.FAKE_ICON)
+ .setFragmentName(SliceTestUtils.FAKE_FRAGMENT_NAME)
+ .setPreferenceControllerClassName(SliceTestUtils.FAKE_CONTROLLER_NAME)
.build();
}
+ @Implements(WifiScanWorker.class)
+ public static class ShadowWifiScanWorker {
+ private static WifiTracker mWifiTracker;
+
+ @Implementation
+ protected void onSlicePinned() {
+ mWifiTracker = mock(WifiTracker.class);
+ mWifiTracker.onStart();
+ }
+
+ @Implementation
+ protected void onSliceUnpinned() {
+ mWifiTracker.onStop();
+ }
+
+ @Implementation
+ protected void close() {
+ mWifiTracker.onDestroy();
+ }
+
+ static WifiTracker getWifiTracker() {
+ return mWifiTracker;
+ }
+ }
+
@Implements(value = StrictMode.class)
public static class ShadowStrictMode {
diff --git a/tests/robotests/src/com/android/settings/slices/SliceBroadcastReceiverTest.java b/tests/robotests/src/com/android/settings/slices/SliceBroadcastReceiverTest.java
index 4e62b03..df3d84f 100644
--- a/tests/robotests/src/com/android/settings/slices/SliceBroadcastReceiverTest.java
+++ b/tests/robotests/src/com/android/settings/slices/SliceBroadcastReceiverTest.java
@@ -43,7 +43,6 @@
import com.android.settings.search.SearchFeatureProviderImpl;
import com.android.settings.testutils.DatabaseTestUtils;
import com.android.settings.testutils.FakeFeatureFactory;
-import com.android.settings.testutils.FakeIndexProvider;
import com.android.settings.testutils.FakeSliderController;
import com.android.settings.testutils.FakeToggleController;
@@ -57,13 +56,6 @@
@RunWith(RobolectricTestRunner.class)
public class SliceBroadcastReceiverTest {
- private final String fakeTitle = "title";
- private final String fakeSummary = "summary";
- private final String fakeScreenTitle = "screen_title";
- private final int fakeIcon = 1234;
- private final String fakeFragmentClassName = FakeIndexProvider.class.getName();
- private final Class fakeControllerName = FakeToggleController.class;
-
private Context mContext;
private SQLiteDatabase mDb;
private SliceBroadcastReceiver mReceiver;
@@ -90,21 +82,18 @@
@Test
public void onReceive_toggleChanged() {
final String key = "key";
- final Uri uri = new Uri.Builder()
- .scheme(ContentResolver.SCHEME_CONTENT)
- .authority(SettingsSliceProvider.SLICE_AUTHORITY)
- .appendPath(SettingsSlicesContract.PATH_SETTING_ACTION)
- .appendPath(key)
- .build();
+ final Uri uri = buildUri(key);
mSearchFeatureProvider.getSearchIndexableResources().getProviderValues().clear();
insertSpecialCase(key);
final ContentResolver resolver = mock(ContentResolver.class);
doReturn(resolver).when(mContext).getContentResolver();
// Turn on toggle setting
- FakeToggleController fakeToggleController = new FakeToggleController(mContext, key);
+ final FakeToggleController fakeToggleController = new FakeToggleController(mContext, key);
fakeToggleController.setChecked(true);
- Intent intent = new Intent(SettingsSliceProvider.ACTION_TOGGLE_CHANGED);
- intent.putExtra(SettingsSliceProvider.EXTRA_SLICE_KEY, key);
+
+ final Intent intent = new Intent(SettingsSliceProvider.ACTION_TOGGLE_CHANGED)
+ .putExtra(SettingsSliceProvider.EXTRA_SLICE_KEY, key)
+ .setData(uri);
assertThat(fakeToggleController.isChecked()).isTrue();
@@ -128,6 +117,8 @@
doReturn(resolver).when(mContext).getContentResolver();
final String key = "key";
+ final Uri expectedUri = buildUri(key);
+
mSearchFeatureProvider.getSearchIndexableResources().getProviderValues().clear();
insertSpecialCase(key);
@@ -135,8 +126,9 @@
fakeToggleController.setChecked(true);
// Set the toggle setting update synchronously.
fakeToggleController.setAsyncUpdate(false);
- Intent intent = new Intent(SettingsSliceProvider.ACTION_TOGGLE_CHANGED);
- intent.putExtra(SettingsSliceProvider.EXTRA_SLICE_KEY, key);
+ final Intent intent = new Intent(SettingsSliceProvider.ACTION_TOGGLE_CHANGED)
+ .putExtra(SettingsSliceProvider.EXTRA_SLICE_KEY, key)
+ .setData(expectedUri);
assertThat(fakeToggleController.isChecked()).isTrue();
@@ -145,12 +137,6 @@
assertThat(fakeToggleController.isChecked()).isFalse();
- final Uri expectedUri = new Uri.Builder()
- .scheme(ContentResolver.SCHEME_CONTENT)
- .authority(SettingsSliceProvider.SLICE_AUTHORITY)
- .appendPath(SettingsSlicesContract.PATH_SETTING_ACTION)
- .appendPath(key)
- .build();
verify(resolver).notifyChange(expectedUri, null);
}
@@ -163,16 +149,11 @@
final String key = "key";
mSearchFeatureProvider.getSearchIndexableResources().getProviderValues().clear();
- insertSpecialCase(key);
+ insertSpecialCase(AsyncToggleController.class.getName(), key);
- FakeToggleController fakeToggleController = new FakeToggleController(mContext, key);
- fakeToggleController.setChecked(true);
- // Set the toggle setting update asynchronously.
- fakeToggleController.setAsyncUpdate(true);
- Intent intent = new Intent(SettingsSliceProvider.ACTION_TOGGLE_CHANGED);
- intent.putExtra(SettingsSliceProvider.EXTRA_SLICE_KEY, key);
-
- assertThat(fakeToggleController.isChecked()).isTrue();
+ final Intent intent = new Intent(SettingsSliceProvider.ACTION_TOGGLE_CHANGED)
+ .putExtra(SettingsSliceProvider.EXTRA_SLICE_KEY, key)
+ .setData(buildUri(key));
// Toggle setting
mReceiver.onReceive(mContext, intent);
@@ -183,26 +164,22 @@
@Test
public void onReceive_sliderChanged() {
final String key = "key";
- final Uri uri = new Uri.Builder()
- .scheme(ContentResolver.SCHEME_CONTENT)
- .authority(SettingsSliceProvider.SLICE_AUTHORITY)
- .appendPath(SettingsSlicesContract.PATH_SETTING_ACTION)
- .appendPath(key)
- .build();
+ final Uri uri = buildUri(key);
final ContentResolver resolver = mock(ContentResolver.class);
doReturn(resolver).when(mContext).getContentResolver();
final int position = FakeSliderController.MAX_VALUE - 1;
final int oldPosition = FakeSliderController.MAX_VALUE;
mSearchFeatureProvider.getSearchIndexableResources().getProviderValues().clear();
- insertSpecialCase(FakeSliderController.class, key);
+ insertSpecialCase(FakeSliderController.class.getName(), key);
// Set slider setting
FakeSliderController fakeSliderController = new FakeSliderController(mContext, key);
fakeSliderController.setSliderPosition(oldPosition);
// Build action
- Intent intent = new Intent(SettingsSliceProvider.ACTION_SLIDER_CHANGED);
- intent.putExtra(Slice.EXTRA_RANGE_VALUE, position);
- intent.putExtra(SettingsSliceProvider.EXTRA_SLICE_KEY, key);
+ final Intent intent = new Intent(SettingsSliceProvider.ACTION_SLIDER_CHANGED)
+ .putExtra(Slice.EXTRA_RANGE_VALUE, position)
+ .putExtra(SettingsSliceProvider.EXTRA_SLICE_KEY, key)
+ .setData(uri);
assertThat(fakeSliderController.getSliderPosition()).isEqualTo(oldPosition);
@@ -225,12 +202,12 @@
final String key = "key";
final int position = 0;
mSearchFeatureProvider.getSearchIndexableResources().getProviderValues().clear();
- insertSpecialCase(FakeToggleController.class, key);
+ insertSpecialCase(key);
// Build action
- Intent intent = new Intent(SettingsSliceProvider.ACTION_SLIDER_CHANGED);
- intent.putExtra(Slice.EXTRA_RANGE_VALUE, position);
- intent.putExtra(SettingsSliceProvider.EXTRA_SLICE_KEY, key);
+ final Intent intent = new Intent(SettingsSliceProvider.ACTION_SLIDER_CHANGED)
+ .putExtra(Slice.EXTRA_RANGE_VALUE, position)
+ .putExtra(SettingsSliceProvider.EXTRA_SLICE_KEY, key);
// Trigger the exception.
mReceiver.onReceive(mContext, intent);
@@ -272,29 +249,25 @@
// Insert Fake Toggle into Database
final String key = "key";
+ final Uri expectedUri = buildUri(key);
mSearchFeatureProvider.getSearchIndexableResources().getProviderValues().clear();
- insertSpecialCase(FakeToggleController.class, key);
+ insertSpecialCase(key);
// Turn on toggle setting
final FakeToggleController fakeToggleController = new FakeToggleController(mContext, key);
fakeToggleController.setChecked(true);
// Build Action
- final Intent intent = new Intent(SettingsSliceProvider.ACTION_TOGGLE_CHANGED);
- intent.putExtra(SettingsSliceProvider.EXTRA_SLICE_KEY, key);
+ final Intent intent = new Intent(SettingsSliceProvider.ACTION_TOGGLE_CHANGED)
+ .putExtra(SettingsSliceProvider.EXTRA_SLICE_KEY, key)
+ .setData(expectedUri);
// Trigger Slice change
mReceiver.onReceive(mContext, intent);
// Check the value is the same and the Uri has been notified.
assertThat(fakeToggleController.isChecked()).isTrue();
- final Uri expectedUri = new Uri.Builder()
- .scheme(ContentResolver.SCHEME_CONTENT)
- .authority(SettingsSliceProvider.SLICE_AUTHORITY)
- .appendPath(SettingsSlicesContract.PATH_SETTING_ACTION)
- .appendPath(key)
- .build();
- verify(resolver).notifyChange(eq(expectedUri), eq(null));
+ verify(resolver).notifyChange(expectedUri, null);
}
@Test
@@ -310,47 +283,65 @@
// Insert Fake Slider into Database
final String key = "key";
+ final Uri expectedUri = buildUri(key);
+
final int position = FakeSliderController.MAX_VALUE - 1;
final int oldPosition = FakeSliderController.MAX_VALUE;
mSearchFeatureProvider.getSearchIndexableResources().getProviderValues().clear();
- insertSpecialCase(FakeSliderController.class, key);
+ insertSpecialCase(FakeSliderController.class.getName(), key);
// Set slider setting
final FakeSliderController fakeSliderController = new FakeSliderController(mContext, key);
fakeSliderController.setSliderPosition(oldPosition);
// Build action
- final Intent intent = new Intent(SettingsSliceProvider.ACTION_SLIDER_CHANGED);
- intent.putExtra(Slice.EXTRA_RANGE_VALUE, position);
- intent.putExtra(SettingsSliceProvider.EXTRA_SLICE_KEY, key);
+ final Intent intent = new Intent(SettingsSliceProvider.ACTION_SLIDER_CHANGED)
+ .putExtra(Slice.EXTRA_RANGE_VALUE, position)
+ .putExtra(SettingsSliceProvider.EXTRA_SLICE_KEY, key)
+ .setData(expectedUri);
// Trigger Slice change
mReceiver.onReceive(mContext, intent);
// Check position is the same and the Uri has been notified.
assertThat(fakeSliderController.getSliderPosition()).isEqualTo(oldPosition);
- final Uri expectedUri = new Uri.Builder()
+ verify(resolver).notifyChange(eq(expectedUri), eq(null));
+ }
+
+ private void insertSpecialCase(String key) {
+ insertSpecialCase(SliceTestUtils.FAKE_CONTROLLER_NAME, key);
+ }
+
+ private void insertSpecialCase(String controllerClass, String key) {
+ ContentValues values = new ContentValues();
+ values.put(SlicesDatabaseHelper.IndexColumns.KEY, key);
+ values.put(SlicesDatabaseHelper.IndexColumns.TITLE, SliceTestUtils.FAKE_TITLE);
+ values.put(SlicesDatabaseHelper.IndexColumns.SUMMARY, SliceTestUtils.FAKE_SUMMARY);
+ values.put(SlicesDatabaseHelper.IndexColumns.SCREENTITLE, SliceTestUtils.FAKE_SCREEN_TITLE);
+ values.put(SlicesDatabaseHelper.IndexColumns.ICON_RESOURCE, SliceTestUtils.FAKE_ICON);
+ values.put(SlicesDatabaseHelper.IndexColumns.FRAGMENT, SliceTestUtils.FAKE_FRAGMENT_NAME);
+ values.put(SlicesDatabaseHelper.IndexColumns.CONTROLLER, controllerClass);
+ values.put(SlicesDatabaseHelper.IndexColumns.SLICE_URI, buildUri(key).toSafeString());
+ mDb.replaceOrThrow(SlicesDatabaseHelper.Tables.TABLE_SLICES_INDEX, null, values);
+ }
+
+ private static Uri buildUri(String key) {
+ return new Uri.Builder()
.scheme(ContentResolver.SCHEME_CONTENT)
.authority(SettingsSliceProvider.SLICE_AUTHORITY)
.appendPath(SettingsSlicesContract.PATH_SETTING_ACTION)
.appendPath(key)
.build();
- verify(resolver).notifyChange(eq(expectedUri), eq(null));
}
- private void insertSpecialCase(String key) {
- insertSpecialCase(fakeControllerName, key);
- }
+ public static class AsyncToggleController extends FakeToggleController {
+ public AsyncToggleController(Context context, String preferenceKey) {
+ super(context, preferenceKey);
+ }
- private void insertSpecialCase(Class controllerClass, String key) {
- ContentValues values = new ContentValues();
- values.put(SlicesDatabaseHelper.IndexColumns.KEY, key);
- values.put(SlicesDatabaseHelper.IndexColumns.TITLE, fakeTitle);
- values.put(SlicesDatabaseHelper.IndexColumns.SUMMARY, fakeSummary);
- values.put(SlicesDatabaseHelper.IndexColumns.SCREENTITLE, fakeScreenTitle);
- values.put(SlicesDatabaseHelper.IndexColumns.ICON_RESOURCE, fakeIcon);
- values.put(SlicesDatabaseHelper.IndexColumns.FRAGMENT, fakeFragmentClassName);
- values.put(SlicesDatabaseHelper.IndexColumns.CONTROLLER, controllerClass.getName());
- mDb.replaceOrThrow(SlicesDatabaseHelper.Tables.TABLE_SLICES_INDEX, null, values);
+ @Override
+ public boolean hasAsyncUpdate() {
+ return true;
+ }
}
}
\ No newline at end of file
diff --git a/tests/robotests/src/com/android/settings/slices/SliceBuilderUtilsTest.java b/tests/robotests/src/com/android/settings/slices/SliceBuilderUtilsTest.java
index 1db7c8d..fc82abb 100644
--- a/tests/robotests/src/com/android/settings/slices/SliceBuilderUtilsTest.java
+++ b/tests/robotests/src/com/android/settings/slices/SliceBuilderUtilsTest.java
@@ -137,58 +137,6 @@
}
@Test
- public void testUriBuilder_oemAuthority_intentPath_returnsValidSliceUri() {
- final Uri expectedUri = new Uri.Builder()
- .scheme(ContentResolver.SCHEME_CONTENT)
- .authority(SettingsSliceProvider.SLICE_AUTHORITY)
- .appendPath(INTENT_PATH)
- .build();
-
- final Uri actualUri = SliceBuilderUtils.getUri(INTENT_PATH, false);
-
- assertThat(actualUri).isEqualTo(expectedUri);
- }
-
- @Test
- public void testUriBuilder_oemAuthority_actionPath_returnsValidSliceUri() {
- final Uri expectedUri = new Uri.Builder()
- .scheme(ContentResolver.SCHEME_CONTENT)
- .authority(SettingsSliceProvider.SLICE_AUTHORITY)
- .appendPath(ACTION_PATH)
- .build();
-
- final Uri actualUri = SliceBuilderUtils.getUri(ACTION_PATH, false);
-
- assertThat(actualUri).isEqualTo(expectedUri);
- }
-
- @Test
- public void testUriBuilder_platformAuthority_intentPath_returnsValidSliceUri() {
- final Uri expectedUri = new Uri.Builder()
- .scheme(ContentResolver.SCHEME_CONTENT)
- .authority(SettingsSlicesContract.AUTHORITY)
- .appendPath(ACTION_PATH)
- .build();
-
- final Uri actualUri = SliceBuilderUtils.getUri(ACTION_PATH, true);
-
- assertThat(actualUri).isEqualTo(expectedUri);
- }
-
- @Test
- public void testUriBuilder_platformAuthority_actionPath_returnsValidSliceUri() {
- final Uri expectedUri = new Uri.Builder()
- .scheme(ContentResolver.SCHEME_CONTENT)
- .authority(SettingsSlicesContract.AUTHORITY)
- .appendPath(ACTION_PATH)
- .build();
-
- final Uri actualUri = SliceBuilderUtils.getUri(ACTION_PATH, true);
-
- assertThat(actualUri).isEqualTo(expectedUri);
- }
-
- @Test
public void testGetPreferenceController_buildsMatchingController() {
final BasePreferenceController controller =
SliceBuilderUtils.getPreferenceController(mContext, getDummyData());
diff --git a/tests/robotests/src/com/android/settings/slices/SliceDataConverterTest.java b/tests/robotests/src/com/android/settings/slices/SliceDataConverterTest.java
index ea7bac5..63da4d0 100644
--- a/tests/robotests/src/com/android/settings/slices/SliceDataConverterTest.java
+++ b/tests/robotests/src/com/android/settings/slices/SliceDataConverterTest.java
@@ -119,11 +119,11 @@
assertThat(fakeSlice.getScreenTitle()).isEqualTo(FAKE_SCREEN_TITLE);
assertThat(fakeSlice.getKeywords()).isNull();
assertThat(fakeSlice.getIconResource()).isNotNull();
- assertThat(fakeSlice.getUri()).isNull();
+ assertThat(fakeSlice.getUri().toSafeString())
+ .isEqualTo("content://com.android.settings.slices/action/key");
assertThat(fakeSlice.getFragmentClassName()).isEqualTo(FAKE_FRAGMENT_CLASSNAME);
assertThat(fakeSlice.getPreferenceController()).isEqualTo(FAKE_CONTROLLER_NAME);
assertThat(fakeSlice.getSliceType()).isEqualTo(SliceData.SliceType.SLIDER);
- assertThat(fakeSlice.isPlatformDefined()).isTrue(); // from XML
assertThat(fakeSlice.getUnavailableSliceSubtitle()).isEqualTo(
"subtitleOfUnavailableSlice"); // from XML
}
@@ -135,7 +135,7 @@
assertThat(fakeSlice.getScreenTitle()).isEqualTo(
mContext.getString(R.string.accessibility_settings));
assertThat(fakeSlice.getIconResource()).isEqualTo(FAKE_ICON);
- assertThat(fakeSlice.getUri()).isNull();
+ assertThat(fakeSlice.getUri()).isNotNull();
assertThat(fakeSlice.getFragmentClassName()).isEqualTo(ACCESSIBILITY_FRAGMENT);
assertThat(fakeSlice.getPreferenceController()).isEqualTo(A11Y_CONTROLLER_NAME);
}
diff --git a/tests/robotests/src/com/android/settings/slices/SliceDataTest.java b/tests/robotests/src/com/android/settings/slices/SliceDataTest.java
index 6775e05..6074fe3 100644
--- a/tests/robotests/src/com/android/settings/slices/SliceDataTest.java
+++ b/tests/robotests/src/com/android/settings/slices/SliceDataTest.java
@@ -37,7 +37,6 @@
private final Uri URI = Uri.parse("content://com.android.settings.slices/test");
private final String PREF_CONTROLLER = "com.android.settings.slices.tester";
private final int SLICE_TYPE = SliceData.SliceType.SWITCH;
- private final boolean IS_PLATFORM_DEFINED = true;
private final String UNAVAILABLE_SLICE_SUBTITLE = "subtitleOfUnavailableSlice";
@Test
@@ -53,7 +52,6 @@
.setUri(URI)
.setPreferenceControllerClassName(PREF_CONTROLLER)
.setSliceType(SLICE_TYPE)
- .setPlatformDefined(IS_PLATFORM_DEFINED)
.setUnavailableSliceSubtitle(UNAVAILABLE_SLICE_SUBTITLE);
SliceData data = builder.build();
@@ -68,7 +66,6 @@
assertThat(data.getUri()).isEqualTo(URI);
assertThat(data.getPreferenceController()).isEqualTo(PREF_CONTROLLER);
assertThat(data.getSliceType()).isEqualTo(SLICE_TYPE);
- assertThat(data.isPlatformDefined()).isEqualTo(IS_PLATFORM_DEFINED);
assertThat(data.getUnavailableSliceSubtitle()).isEqualTo(UNAVAILABLE_SLICE_SUBTITLE);
}
diff --git a/tests/robotests/src/com/android/settings/slices/SliceTestUtils.java b/tests/robotests/src/com/android/settings/slices/SliceTestUtils.java
new file mode 100644
index 0000000..4f5b3a1
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/slices/SliceTestUtils.java
@@ -0,0 +1,76 @@
+/*
+ * 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.slices;
+
+import android.content.ContentResolver;
+import android.content.ContentValues;
+import android.content.Context;
+import android.database.sqlite.SQLiteDatabase;
+import android.net.Uri;
+import android.provider.SettingsSlicesContract;
+
+import com.android.settings.testutils.FakeIndexProvider;
+import com.android.settings.testutils.FakeToggleController;
+
+class SliceTestUtils {
+
+ public static final String FAKE_TITLE = "title";
+ public static final String FAKE_SUMMARY = "summary";
+ public static final String FAKE_SCREEN_TITLE = "screen_title";
+ public static final String FAKE_KEYWORDS = "a, b, c";
+ public static final int FAKE_ICON = 1234;
+ public static final String FAKE_FRAGMENT_NAME = FakeIndexProvider.class.getName();
+ public static final String FAKE_CONTROLLER_NAME = FakeToggleController.class.getName();
+
+
+ public static void insertSliceToDb(Context context, String key) {
+ insertSliceToDb(context, key, true /* isPlatformSlice */);
+ }
+
+ public static void insertSliceToDb(Context context, String key, boolean isPlatformSlice) {
+ insertSliceToDb(context, key, isPlatformSlice, null /*customizedUnavailableSliceSubtitle*/);
+ }
+
+ public static void insertSliceToDb(Context context, String key, boolean isPlatformSlice,
+ String customizedUnavailableSliceSubtitle) {
+ final SQLiteDatabase db = SlicesDatabaseHelper.getInstance(context).getWritableDatabase();
+ ContentValues values = new ContentValues();
+ values.put(SlicesDatabaseHelper.IndexColumns.KEY, key);
+ values.put(SlicesDatabaseHelper.IndexColumns.SLICE_URI,
+ new Uri.Builder()
+ .scheme(ContentResolver.SCHEME_CONTENT)
+ .authority(isPlatformSlice
+ ? SettingsSlicesContract.AUTHORITY
+ : SettingsSliceProvider.SLICE_AUTHORITY)
+ .appendPath(SettingsSlicesContract.PATH_SETTING_ACTION)
+ .appendPath(key)
+ .build().toSafeString());
+ values.put(SlicesDatabaseHelper.IndexColumns.TITLE, FAKE_TITLE);
+ values.put(SlicesDatabaseHelper.IndexColumns.SUMMARY, FAKE_SUMMARY);
+ values.put(SlicesDatabaseHelper.IndexColumns.SCREENTITLE, FAKE_SCREEN_TITLE);
+ values.put(SlicesDatabaseHelper.IndexColumns.KEYWORDS, FAKE_KEYWORDS);
+ values.put(SlicesDatabaseHelper.IndexColumns.ICON_RESOURCE, FAKE_ICON);
+ values.put(SlicesDatabaseHelper.IndexColumns.FRAGMENT, FAKE_FRAGMENT_NAME);
+ values.put(SlicesDatabaseHelper.IndexColumns.CONTROLLER, FAKE_CONTROLLER_NAME);
+ values.put(SlicesDatabaseHelper.IndexColumns.SLICE_TYPE, SliceData.SliceType.INTENT);
+ values.put(SlicesDatabaseHelper.IndexColumns.UNAVAILABLE_SLICE_SUBTITLE,
+ customizedUnavailableSliceSubtitle);
+
+ db.replaceOrThrow(SlicesDatabaseHelper.Tables.TABLE_SLICES_INDEX, null, values);
+ db.close();
+ }
+}
diff --git a/tests/robotests/src/com/android/settings/slices/SlicesDatabaseAccessorTest.java b/tests/robotests/src/com/android/settings/slices/SlicesDatabaseAccessorTest.java
index de2c51f..bed5a27 100644
--- a/tests/robotests/src/com/android/settings/slices/SlicesDatabaseAccessorTest.java
+++ b/tests/robotests/src/com/android/settings/slices/SlicesDatabaseAccessorTest.java
@@ -23,10 +23,12 @@
import android.app.ApplicationPackageManager;
import android.content.ComponentName;
+import android.content.ContentResolver;
import android.content.ContentValues;
import android.content.Context;
import android.database.sqlite.SQLiteDatabase;
import android.net.Uri;
+import android.provider.SettingsSlicesContract;
import android.view.accessibility.AccessibilityManager;
import com.android.settings.search.SearchFeatureProvider;
@@ -61,16 +63,8 @@
ShadowBluetoothAdapter.class, ShadowLockPatternUtils.class})
public class SlicesDatabaseAccessorTest {
- private final String FAKE_TITLE = "title";
- private final String FAKE_SUMMARY = "summary";
- private final String FAKE_SCREEN_TITLE = "screen_title";
- private final String FAKE_KEYWORDS = "a, b, c";
- private final int FAKE_ICON = 1234;
- private final String FAKE_FRAGMENT_NAME = FakeIndexProvider.class.getName();
- private final String FAKE_CONTROLLER_NAME = FakePreferenceController.class.getName();
private Context mContext;
- private SQLiteDatabase mDb;
private SlicesDatabaseAccessor mAccessor;
@Before
@@ -78,7 +72,6 @@
mContext = RuntimeEnvironment.application;
ShadowUserManager.getShadow().setIsAdminUser(true);
mAccessor = spy(new SlicesDatabaseAccessor(mContext));
- mDb = SlicesDatabaseHelper.getInstance(mContext).getWritableDatabase();
SlicesDatabaseHelper.getInstance(mContext).setIndexedState();
// Register the fake a11y Service
@@ -95,39 +88,39 @@
@Test
public void testGetSliceDataFromKey_validKey_validSliceReturned() {
String key = "key";
- insertSpecialCase(key);
+ SliceTestUtils.insertSliceToDb(mContext, key);
SliceData data = mAccessor.getSliceDataFromKey(key);
assertThat(data.getKey()).isEqualTo(key);
- assertThat(data.getTitle()).isEqualTo(FAKE_TITLE);
- assertThat(data.getSummary()).isEqualTo(FAKE_SUMMARY);
- assertThat(data.getScreenTitle()).isEqualTo(FAKE_SCREEN_TITLE);
- assertThat(data.getKeywords()).isEqualTo(FAKE_KEYWORDS);
- assertThat(data.getIconResource()).isEqualTo(FAKE_ICON);
- assertThat(data.getFragmentClassName()).isEqualTo(FAKE_FRAGMENT_NAME);
+ assertThat(data.getTitle()).isEqualTo(SliceTestUtils.FAKE_TITLE);
+ assertThat(data.getSummary()).isEqualTo(SliceTestUtils.FAKE_SUMMARY);
+ assertThat(data.getScreenTitle()).isEqualTo(SliceTestUtils.FAKE_SCREEN_TITLE);
+ assertThat(data.getKeywords()).isEqualTo(SliceTestUtils.FAKE_KEYWORDS);
+ assertThat(data.getIconResource()).isEqualTo(SliceTestUtils.FAKE_ICON);
+ assertThat(data.getFragmentClassName()).isEqualTo(SliceTestUtils.FAKE_FRAGMENT_NAME);
assertThat(data.getUri()).isNull();
- assertThat(data.getPreferenceController()).isEqualTo(FAKE_CONTROLLER_NAME);
+ assertThat(data.getPreferenceController()).isEqualTo(SliceTestUtils.FAKE_CONTROLLER_NAME);
assertThat(data.getUnavailableSliceSubtitle()).isNull();
}
@Test
public void testGetSliceDataFromKey_allowDynamicSummary_validSliceReturned() {
String key = "key";
- insertSpecialCase(key, true /* isPlatformSlice */,
+ SliceTestUtils.insertSliceToDb(mContext, key, true /* isPlatformSlice */,
null /* customizedUnavailableSliceSubtitle */);
SliceData data = mAccessor.getSliceDataFromKey(key);
assertThat(data.getKey()).isEqualTo(key);
- assertThat(data.getTitle()).isEqualTo(FAKE_TITLE);
- assertThat(data.getSummary()).isEqualTo(FAKE_SUMMARY);
- assertThat(data.getScreenTitle()).isEqualTo(FAKE_SCREEN_TITLE);
- assertThat(data.getKeywords()).isEqualTo(FAKE_KEYWORDS);
- assertThat(data.getIconResource()).isEqualTo(FAKE_ICON);
- assertThat(data.getFragmentClassName()).isEqualTo(FAKE_FRAGMENT_NAME);
+ assertThat(data.getTitle()).isEqualTo(SliceTestUtils.FAKE_TITLE);
+ assertThat(data.getSummary()).isEqualTo(SliceTestUtils.FAKE_SUMMARY);
+ assertThat(data.getScreenTitle()).isEqualTo(SliceTestUtils.FAKE_SCREEN_TITLE);
+ assertThat(data.getKeywords()).isEqualTo(SliceTestUtils.FAKE_KEYWORDS);
+ assertThat(data.getIconResource()).isEqualTo(SliceTestUtils.FAKE_ICON);
+ assertThat(data.getFragmentClassName()).isEqualTo(SliceTestUtils.FAKE_FRAGMENT_NAME);
assertThat(data.getUri()).isNull();
- assertThat(data.getPreferenceController()).isEqualTo(FAKE_CONTROLLER_NAME);
+ assertThat(data.getPreferenceController()).isEqualTo(SliceTestUtils.FAKE_CONTROLLER_NAME);
}
@Test(expected = IllegalStateException.class)
@@ -139,36 +132,45 @@
@Test
public void testGetSliceFromUri_validUri_validSliceReturned() {
- String key = "key";
- String path = "intent/" + key;
- insertSpecialCase(key);
- Uri uri = SliceBuilderUtils.getUri(path, false);
+ final String key = "key";
+ SliceTestUtils.insertSliceToDb(mContext, key);
+
+ final Uri uri = new Uri.Builder()
+ .scheme(ContentResolver.SCHEME_CONTENT)
+ .authority(SettingsSliceProvider.SLICE_AUTHORITY)
+ .appendPath("action")
+ .appendPath(key)
+ .build();
SliceData data = mAccessor.getSliceDataFromUri(uri);
assertThat(data.getKey()).isEqualTo(key);
- assertThat(data.getTitle()).isEqualTo(FAKE_TITLE);
- assertThat(data.getSummary()).isEqualTo(FAKE_SUMMARY);
- assertThat(data.getScreenTitle()).isEqualTo(FAKE_SCREEN_TITLE);
- assertThat(data.getKeywords()).isEqualTo(FAKE_KEYWORDS);
- assertThat(data.getIconResource()).isEqualTo(FAKE_ICON);
- assertThat(data.getFragmentClassName()).isEqualTo(FAKE_FRAGMENT_NAME);
+ assertThat(data.getTitle()).isEqualTo(SliceTestUtils.FAKE_TITLE);
+ assertThat(data.getSummary()).isEqualTo(SliceTestUtils.FAKE_SUMMARY);
+ assertThat(data.getScreenTitle()).isEqualTo(SliceTestUtils.FAKE_SCREEN_TITLE);
+ assertThat(data.getKeywords()).isEqualTo(SliceTestUtils.FAKE_KEYWORDS);
+ assertThat(data.getIconResource()).isEqualTo(SliceTestUtils.FAKE_ICON);
+ assertThat(data.getFragmentClassName()).isEqualTo(SliceTestUtils.FAKE_FRAGMENT_NAME);
assertThat(data.getUri()).isEqualTo(uri);
- assertThat(data.getPreferenceController()).isEqualTo(FAKE_CONTROLLER_NAME);
+ assertThat(data.getPreferenceController()).isEqualTo(SliceTestUtils.FAKE_CONTROLLER_NAME);
}
@Test(expected = IllegalStateException.class)
public void testGetSliceFromUri_invalidUri_errorThrown() {
- Uri uri = SliceBuilderUtils.getUri("intent/durr", false);
+ final Uri uri = new Uri.Builder()
+ .scheme(ContentResolver.SCHEME_CONTENT)
+ .authority(SettingsSliceProvider.SLICE_AUTHORITY)
+ .appendPath("intent")
+ .appendPath("durr")
+ .build();
mAccessor.getSliceDataFromUri(uri);
}
@Test
public void getDescendantUris_platformSlice_doesNotReturnOEMSlice() {
final String key = "oem_key";
- final boolean isPlatformSlice = false;
- insertSpecialCase(key, isPlatformSlice);
- final List<String> keys = mAccessor.getSliceKeys(!isPlatformSlice);
+ SliceTestUtils.insertSliceToDb(mContext, key, false /* isPlatformSlice */);
+ final List<Uri> keys = mAccessor.getSliceUris(SettingsSlicesContract.AUTHORITY);
assertThat(keys).isEmpty();
}
@@ -176,9 +178,8 @@
@Test
public void getDescendantUris_oemSlice_doesNotReturnPlatformSlice() {
final String key = "platform_key";
- final boolean isPlatformSlice = true;
- insertSpecialCase(key, isPlatformSlice);
- final List<String> keys = mAccessor.getSliceKeys(!isPlatformSlice);
+ SliceTestUtils.insertSliceToDb(mContext, key, true /* isPlatformSlice */);
+ final List<Uri> keys = mAccessor.getSliceUris(SettingsSliceProvider.SLICE_AUTHORITY);
assertThat(keys).isEmpty();
}
@@ -186,21 +187,21 @@
@Test
public void getDescendantUris_oemSlice_returnsOEMUriDescendant() {
final String key = "oem_key";
- final boolean isPlatformSlice = false;
- insertSpecialCase(key, isPlatformSlice);
- final List<String> keys = mAccessor.getSliceKeys(isPlatformSlice);
+ SliceTestUtils.insertSliceToDb(mContext, key, false /* isPlatformSlice */);
+ final List<Uri> keys = mAccessor.getSliceUris(SettingsSliceProvider.SLICE_AUTHORITY);
- assertThat(keys).containsExactly(key);
+ assertThat(keys).containsExactly(
+ Uri.parse("content://com.android.settings.slices/action/oem_key"));
}
@Test
public void getDescendantUris_platformSlice_returnsPlatformUriDescendant() {
final String key = "platform_key";
- final boolean isPlatformSlice = true;
- insertSpecialCase(key, isPlatformSlice);
- final List<String> keys = mAccessor.getSliceKeys(isPlatformSlice);
+ SliceTestUtils.insertSliceToDb(mContext, key, true /* isPlatformSlice */);
+ final List<Uri> keys = mAccessor.getSliceUris(SettingsSlicesContract.AUTHORITY);
- assertThat(keys).containsExactly(key);
+ assertThat(keys).containsExactly(
+ Uri.parse("content://android.settings.slices/action/platform_key"));
}
@Test
@@ -209,7 +210,7 @@
// Force new indexing
Locale.setDefault(new Locale("ca"));
final SearchFeatureProvider provider = new SearchFeatureProviderImpl();
- final SlicesFeatureProvider sliceProvider = spy(new SlicesFeatureProviderImpl());
+ final SlicesFeatureProvider sliceProvider = new SlicesFeatureProviderImpl();
final FakeFeatureFactory factory = FakeFeatureFactory.setupForTest();
factory.searchFeatureProvider = provider;
factory.slicesFeatureProvider = sliceProvider;
@@ -219,7 +220,7 @@
FakeIndexProvider.class);
final SlicesDatabaseAccessor accessor = new SlicesDatabaseAccessor(mContext);
- final List<String> keys = accessor.getSliceKeys(true);
+ final List<Uri> keys = accessor.getSliceUris(SettingsSliceProvider.SLICE_AUTHORITY);
assertThat(keys).isNotEmpty();
}
@@ -227,20 +228,20 @@
@Test
public void testGetSliceDataFromKey_defaultUnavailableSlice_validSliceReturned() {
String key = "key";
- insertSpecialCase(key, true /* isPlatformSlice */,
+ SliceTestUtils.insertSliceToDb(mContext, key, true /* isPlatformSlice */,
null /* customizedUnavailableSliceSubtitle */);
SliceData data = mAccessor.getSliceDataFromKey(key);
assertThat(data.getKey()).isEqualTo(key);
- assertThat(data.getTitle()).isEqualTo(FAKE_TITLE);
- assertThat(data.getSummary()).isEqualTo(FAKE_SUMMARY);
- assertThat(data.getScreenTitle()).isEqualTo(FAKE_SCREEN_TITLE);
- assertThat(data.getKeywords()).isEqualTo(FAKE_KEYWORDS);
- assertThat(data.getIconResource()).isEqualTo(FAKE_ICON);
- assertThat(data.getFragmentClassName()).isEqualTo(FAKE_FRAGMENT_NAME);
+ assertThat(data.getTitle()).isEqualTo(SliceTestUtils.FAKE_TITLE);
+ assertThat(data.getSummary()).isEqualTo(SliceTestUtils.FAKE_SUMMARY);
+ assertThat(data.getScreenTitle()).isEqualTo(SliceTestUtils.FAKE_SCREEN_TITLE);
+ assertThat(data.getKeywords()).isEqualTo(SliceTestUtils.FAKE_KEYWORDS);
+ assertThat(data.getIconResource()).isEqualTo(SliceTestUtils.FAKE_ICON);
+ assertThat(data.getFragmentClassName()).isEqualTo(SliceTestUtils.FAKE_FRAGMENT_NAME);
assertThat(data.getUri()).isNull();
- assertThat(data.getPreferenceController()).isEqualTo(FAKE_CONTROLLER_NAME);
+ assertThat(data.getPreferenceController()).isEqualTo(SliceTestUtils.FAKE_CONTROLLER_NAME);
assertThat(data.getUnavailableSliceSubtitle()).isNull();
}
@@ -248,49 +249,22 @@
public void testGetSliceDataFromKey_customizeSubtitleOfUnavailableSlice_validSliceReturned() {
String key = "key";
String subtitle = "subtitle";
- insertSpecialCase(key, true /* isPlatformSlice */, subtitle);
+ SliceTestUtils.insertSliceToDb(mContext, key, true /* isPlatformSlice */, subtitle);
SliceData data = mAccessor.getSliceDataFromKey(key);
assertThat(data.getKey()).isEqualTo(key);
- assertThat(data.getTitle()).isEqualTo(FAKE_TITLE);
- assertThat(data.getSummary()).isEqualTo(FAKE_SUMMARY);
- assertThat(data.getScreenTitle()).isEqualTo(FAKE_SCREEN_TITLE);
- assertThat(data.getKeywords()).isEqualTo(FAKE_KEYWORDS);
- assertThat(data.getIconResource()).isEqualTo(FAKE_ICON);
- assertThat(data.getFragmentClassName()).isEqualTo(FAKE_FRAGMENT_NAME);
+ assertThat(data.getTitle()).isEqualTo(SliceTestUtils.FAKE_TITLE);
+ assertThat(data.getSummary()).isEqualTo(SliceTestUtils.FAKE_SUMMARY);
+ assertThat(data.getScreenTitle()).isEqualTo(SliceTestUtils.FAKE_SCREEN_TITLE);
+ assertThat(data.getKeywords()).isEqualTo(SliceTestUtils.FAKE_KEYWORDS);
+ assertThat(data.getIconResource()).isEqualTo(SliceTestUtils.FAKE_ICON);
+ assertThat(data.getFragmentClassName()).isEqualTo(SliceTestUtils.FAKE_FRAGMENT_NAME);
assertThat(data.getUri()).isNull();
- assertThat(data.getPreferenceController()).isEqualTo(FAKE_CONTROLLER_NAME);
+ assertThat(data.getPreferenceController()).isEqualTo(SliceTestUtils.FAKE_CONTROLLER_NAME);
assertThat(data.getUnavailableSliceSubtitle()).isEqualTo(subtitle);
}
- private void insertSpecialCase(String key) {
- insertSpecialCase(key, true);
- }
-
- private void insertSpecialCase(String key, boolean isPlatformSlice) {
- insertSpecialCase(key, isPlatformSlice, null /*customizedUnavailableSliceSubtitle*/);
- }
-
- private void insertSpecialCase(String key, boolean isPlatformSlice,
- String customizedUnavailableSliceSubtitle) {
- ContentValues values = new ContentValues();
- values.put(SlicesDatabaseHelper.IndexColumns.KEY, key);
- values.put(SlicesDatabaseHelper.IndexColumns.TITLE, FAKE_TITLE);
- values.put(SlicesDatabaseHelper.IndexColumns.SUMMARY, FAKE_SUMMARY);
- values.put(SlicesDatabaseHelper.IndexColumns.SCREENTITLE, FAKE_SCREEN_TITLE);
- values.put(SlicesDatabaseHelper.IndexColumns.KEYWORDS, FAKE_KEYWORDS);
- values.put(SlicesDatabaseHelper.IndexColumns.ICON_RESOURCE, FAKE_ICON);
- values.put(SlicesDatabaseHelper.IndexColumns.FRAGMENT, FAKE_FRAGMENT_NAME);
- values.put(SlicesDatabaseHelper.IndexColumns.CONTROLLER, FAKE_CONTROLLER_NAME);
- values.put(SlicesDatabaseHelper.IndexColumns.PLATFORM_SLICE, isPlatformSlice);
- values.put(SlicesDatabaseHelper.IndexColumns.SLICE_TYPE, SliceData.SliceType.INTENT);
- values.put(SlicesDatabaseHelper.IndexColumns.UNAVAILABLE_SLICE_SUBTITLE,
- customizedUnavailableSliceSubtitle);
-
- mDb.replaceOrThrow(SlicesDatabaseHelper.Tables.TABLE_SLICES_INDEX, null, values);
- }
-
@Implements(ApplicationPackageManager.class)
public static class ShadowApplicationPackageManager extends
org.robolectric.shadows.ShadowApplicationPackageManager {
diff --git a/tests/robotests/src/com/android/settings/slices/SlicesDatabaseHelperTest.java b/tests/robotests/src/com/android/settings/slices/SlicesDatabaseHelperTest.java
index 585c75d..fad9c25 100644
--- a/tests/robotests/src/com/android/settings/slices/SlicesDatabaseHelperTest.java
+++ b/tests/robotests/src/com/android/settings/slices/SlicesDatabaseHelperTest.java
@@ -65,6 +65,7 @@
String[] expectedNames = {
IndexColumns.KEY,
+ IndexColumns.SLICE_URI,
IndexColumns.TITLE,
IndexColumns.SUMMARY,
IndexColumns.SCREENTITLE,
@@ -72,7 +73,6 @@
IndexColumns.ICON_RESOURCE,
IndexColumns.FRAGMENT,
IndexColumns.CONTROLLER,
- IndexColumns.PLATFORM_SLICE,
IndexColumns.SLICE_TYPE,
IndexColumns.UNAVAILABLE_SLICE_SUBTITLE,
};
diff --git a/tests/robotests/src/com/android/settings/slices/SlicesIndexerTest.java b/tests/robotests/src/com/android/settings/slices/SlicesIndexerTest.java
index 8fd58c4..1501e45 100644
--- a/tests/robotests/src/com/android/settings/slices/SlicesIndexerTest.java
+++ b/tests/robotests/src/com/android/settings/slices/SlicesIndexerTest.java
@@ -52,7 +52,6 @@
private final int ICON = 1234; // I declare a thumb war
private final Uri URI = Uri.parse("content://com.android.settings.slices/test");
private final String PREF_CONTROLLER = "com.android.settings.slices.tester";
- private final boolean PLATFORM_DEFINED = true;
private final int SLICE_TYPE = SliceData.SliceType.SLIDER;
private final String UNAVAILABLE_SLICE_SUBTITLE = "subtitleOfUnavailableSlice";
@@ -136,9 +135,6 @@
assertThat(
cursor.getString(cursor.getColumnIndex(IndexColumns.CONTROLLER)))
.isEqualTo(PREF_CONTROLLER);
- assertThat(cursor.getInt(
- cursor.getColumnIndex(IndexColumns.PLATFORM_SLICE)))
- .isEqualTo(1 /* true */);
assertThat(cursor.getInt(cursor.getColumnIndex(IndexColumns.SLICE_TYPE)))
.isEqualTo(SLICE_TYPE);
assertThat(cursor.getString(
@@ -176,7 +172,6 @@
.setIcon(ICON)
.setUri(URI)
.setPreferenceControllerClassName(PREF_CONTROLLER)
- .setPlatformDefined(PLATFORM_DEFINED)
.setSliceType(SLICE_TYPE)
.setUnavailableSliceSubtitle(UNAVAILABLE_SLICE_SUBTITLE);
diff --git a/tests/robotests/src/com/android/settings/testutils/FakeToggleController.java b/tests/robotests/src/com/android/settings/testutils/FakeToggleController.java
index e785487..8bceb13 100644
--- a/tests/robotests/src/com/android/settings/testutils/FakeToggleController.java
+++ b/tests/robotests/src/com/android/settings/testutils/FakeToggleController.java
@@ -49,7 +49,7 @@
@Override
public boolean isChecked() {
return Settings.System.getInt(mContext.getContentResolver(),
- SETTING_KEY, OFF) == ON;
+ SETTING_KEY, OFF) == ON;
}
@Override
@@ -103,7 +103,7 @@
}
@Override
- public void close() throws IOException {
+ public void close() {
}
}
}
diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowAuthenticationHelper.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowAuthenticationHelper.java
new file mode 100644
index 0000000..cb7da56
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowAuthenticationHelper.java
@@ -0,0 +1,80 @@
+/*
+ * 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.testutils.shadow;
+
+import android.content.Context;
+import android.graphics.drawable.Drawable;
+import android.os.UserHandle;
+import android.text.TextUtils;
+
+import com.android.settingslib.accounts.AuthenticatorHelper;
+
+import org.robolectric.annotation.Implementation;
+import org.robolectric.annotation.Implements;
+import org.robolectric.annotation.Resetter;
+
+@Implements(AuthenticatorHelper.class)
+public class ShadowAuthenticationHelper {
+ static final String[] TYPES = {"type1", "type2", "type3", "type4"};
+ static final String[] LABELS = {"LABEL1", "LABEL2", "LABEL3", "LABEL4"};
+ private static String[] sEnabledAccount = TYPES;
+
+ protected void __constructor__(Context context, UserHandle userHandle,
+ AuthenticatorHelper.OnAccountsUpdateListener listener) {
+ }
+
+ public static void setEnabledAccount(String[] enabledAccount) {
+ sEnabledAccount = enabledAccount;
+ }
+
+ @Resetter
+ public static void reset() {
+ sEnabledAccount = TYPES;
+ }
+
+ @Implementation
+ protected String[] getEnabledAccountTypes() {
+ return sEnabledAccount;
+ }
+
+ @Implementation
+ protected CharSequence getLabelForType(Context context, final String accountType) {
+ if (TextUtils.equals(accountType, TYPES[0])) {
+ return LABELS[0];
+ } else if (TextUtils.equals(accountType, TYPES[1])) {
+ return LABELS[1];
+ } else if (TextUtils.equals(accountType, TYPES[2])) {
+ return LABELS[2];
+ } else if (TextUtils.equals(accountType, TYPES[3])) {
+ return LABELS[3];
+ }
+ return null;
+ }
+
+ @Implementation
+ protected Drawable getDrawableForType(Context context, final String accountType) {
+ return context.getPackageManager().getDefaultActivityIcon();
+ }
+
+ public static String[] getTypes() {
+ return TYPES;
+ }
+
+ public static String[] getLabels() {
+ return LABELS;
+ }
+}
diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowFragment.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowFragment.java
index a70d4d6..4c50e1a 100644
--- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowFragment.java
+++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowFragment.java
@@ -16,6 +16,8 @@
package com.android.settings.testutils.shadow;
+import android.os.Bundle;
+
import androidx.fragment.app.Fragment;
import org.robolectric.annotation.Implementation;
@@ -27,6 +29,11 @@
private Fragment mTargetFragment;
@Implementation
+ public void onCreate(Bundle icicle) {
+ // do nothing
+ }
+
+ @Implementation
protected void setTargetFragment(Fragment fragment, int requestCode) {
mTargetFragment = fragment;
}
diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowInputMethodManagerWithMethodList.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowInputMethodManagerWithMethodList.java
index 9802247..4ebb9da 100644
--- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowInputMethodManagerWithMethodList.java
+++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowInputMethodManagerWithMethodList.java
@@ -35,6 +35,7 @@
public class ShadowInputMethodManagerWithMethodList extends ShadowInputMethodManager {
private List<InputMethodInfo> mInputMethodInfos = Collections.emptyList();
+ private List<InputMethodInfo> mEnabledInputMethodInfos = Collections.emptyList();
@Implementation
public static InputMethodManager getInstance() {
@@ -46,11 +47,26 @@
return mInputMethodInfos;
}
+ @Implementation
+ protected List<InputMethodInfo> getEnabledInputMethodList() {
+ return mEnabledInputMethodInfos;
+ }
+
+ @Implementation
+ protected List<InputMethodInfo> getEnabledInputMethodSubtypeList(InputMethodInfo imi,
+ boolean allowsImplicitlySelectedSubtypes) {
+ return Collections.emptyList();
+ }
+
// Non-Android setter.
public void setInputMethodList(List<InputMethodInfo> inputMethodInfos) {
mInputMethodInfos = inputMethodInfos;
}
+ public void setEnabledInputMethodList(List<InputMethodInfo> inputMethodInfos) {
+ mEnabledInputMethodInfos = inputMethodInfos;
+ }
+
public static ShadowInputMethodManagerWithMethodList getShadow() {
return (ShadowInputMethodManagerWithMethodList) Shadow.extract(
RuntimeEnvironment.application.getSystemService(InputMethodManager.class));
diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowKeyCharacterMap.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowKeyCharacterMap.java
new file mode 100644
index 0000000..59c05ff
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowKeyCharacterMap.java
@@ -0,0 +1,41 @@
+/*
+ * 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.testutils.shadow;
+
+import android.view.KeyCharacterMap;
+
+import org.robolectric.annotation.Implementation;
+import org.robolectric.annotation.Implements;
+
+@Implements(KeyCharacterMap.class)
+public class ShadowKeyCharacterMap extends org.robolectric.shadows.ShadowKeyCharacterMap{
+
+ private static boolean sIsDeviceHasKey;
+
+ public static void reset() {
+ sIsDeviceHasKey = false;
+ }
+
+ public static void setDevicehasKey(boolean isDeviceHasKey) {
+ sIsDeviceHasKey = isDeviceHasKey;
+ }
+
+ @Implementation
+ protected static boolean deviceHasKey(int keyCode) {
+ return sIsDeviceHasKey;
+ }
+}
diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowRotationPolicy.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowRotationPolicy.java
index a99c80e..1f1e2be 100644
--- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowRotationPolicy.java
+++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowRotationPolicy.java
@@ -35,6 +35,11 @@
}
@Implementation
+ protected static void setRotationLockForAccessibility(Context context, final boolean enabled) {
+ rotationLockEnabled = enabled;
+ }
+
+ @Implementation
protected static boolean isRotationLocked(Context context) {
return rotationLockEnabled;
}
diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowTtsEngines.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowTtsEngines.java
new file mode 100644
index 0000000..e102e30
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowTtsEngines.java
@@ -0,0 +1,87 @@
+/*
+ * 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.testutils.shadow;
+
+import android.content.Intent;
+import android.speech.tts.TextToSpeech;
+import android.speech.tts.TtsEngines;
+
+import org.robolectric.annotation.Implementation;
+import org.robolectric.annotation.Implements;
+import org.robolectric.annotation.Resetter;
+
+import java.util.List;
+import java.util.Locale;
+
+@Implements(TtsEngines.class)
+public class ShadowTtsEngines {
+ private static TtsEngines sInstance;
+
+ public static void setInstance(TtsEngines ttsEngines) {
+ sInstance = ttsEngines;
+ }
+
+ @Resetter
+ public static void reset() {
+ sInstance = null;
+ }
+
+ @Implementation
+ protected List<TextToSpeech.EngineInfo> getEngines() {
+ return sInstance.getEngines();
+ }
+
+ @Implementation
+ protected TextToSpeech.EngineInfo getEngineInfo(String packageName) {
+ return sInstance.getEngineInfo(packageName);
+ }
+
+ @Implementation
+ protected String getDefaultEngine() {
+ return sInstance.getDefaultEngine();
+ }
+
+ @Implementation
+ protected Intent getSettingsIntent(String engine) {
+ return sInstance.getSettingsIntent(engine);
+ }
+
+ @Implementation
+ protected boolean isEngineInstalled(String engine) {
+ return sInstance.isEngineInstalled(engine);
+ }
+
+ @Implementation
+ protected boolean isLocaleSetToDefaultForEngine(String engineName) {
+ return sInstance.isLocaleSetToDefaultForEngine(engineName);
+ }
+
+ @Implementation
+ protected Locale getLocalePrefForEngine(String engineName) {
+ return sInstance.getLocalePrefForEngine(engineName);
+ }
+
+ @Implementation
+ protected synchronized void updateLocalePrefForEngine(String engineName, Locale newLocale) {
+ sInstance.updateLocalePrefForEngine(engineName, newLocale);
+ }
+
+ @Implementation
+ protected Locale parseLocaleString(String localeString) {
+ return sInstance.parseLocaleString(localeString);
+ }
+}
\ No newline at end of file
diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowUtils.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowUtils.java
index f8644d9..cf96aba 100644
--- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowUtils.java
+++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowUtils.java
@@ -39,6 +39,7 @@
private static ComponentName sDeviceOwnerComponentName;
private static Map<String, String> sAppNameMap;
private static boolean sIsSystemAlertWindowEnabled;
+ private static boolean sIsVoiceCapable;
@Implementation
protected static int enforceSameOwner(Context context, int userId) {
@@ -58,6 +59,7 @@
sFingerprintManager = null;
sIsUserAMonkey = false;
sIsDemoUser = false;
+ sIsVoiceCapable = false;
}
public static void setIsDemoUser(boolean isDemoUser) {
@@ -123,4 +125,13 @@
public static void setIsSystemAlertWindowEnabled(boolean enabled) {
sIsSystemAlertWindowEnabled = enabled;
}
+
+ @Implementation
+ protected static boolean isVoiceCapable(Context context) {
+ return sIsVoiceCapable;
+ }
+
+ public static void setIsVoiceCapable(boolean isVoiceCapable) {
+ sIsVoiceCapable = isVoiceCapable;
+ }
}
diff --git a/tests/robotests/src/com/android/settings/tts/TtsEnginePreferenceFragmentTest.java b/tests/robotests/src/com/android/settings/tts/TtsEnginePreferenceFragmentTest.java
new file mode 100644
index 0000000..00b8e86
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/tts/TtsEnginePreferenceFragmentTest.java
@@ -0,0 +1,129 @@
+/*
+ * 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.tts;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.content.pm.ResolveInfo;
+import android.content.pm.ServiceInfo;
+import android.os.Bundle;
+import android.speech.tts.TextToSpeech;
+import android.speech.tts.TtsEngines;
+
+import com.android.settings.testutils.shadow.ShadowTtsEngines;
+
+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 org.robolectric.annotation.Config;
+import org.robolectric.shadow.api.Shadow;
+import org.robolectric.shadows.ShadowPackageManager;
+import org.robolectric.shadows.androidx.fragment.FragmentController;
+
+@RunWith(RobolectricTestRunner.class)
+public class TtsEnginePreferenceFragmentTest {
+
+ private Context mContext;
+ private TtsEnginePreferenceFragment mTtsEnginePreferenceFragment;
+
+ @Before
+ public void setUp() {
+ mContext = RuntimeEnvironment.application;
+
+ final ResolveInfo info = new ResolveInfo();
+ final ServiceInfo serviceInfo = spy(new ServiceInfo());
+ serviceInfo.packageName = mContext.getPackageName();
+ serviceInfo.name = mContext.getClass().getName();
+ info.serviceInfo = serviceInfo;
+ doReturn("title").when(serviceInfo).loadLabel(any(PackageManager.class));
+ doReturn(1).when(serviceInfo).getIconResource();
+
+ final ShadowPackageManager spm = Shadow.extract(mContext.getPackageManager());
+ spm.addResolveInfoForIntent(
+ new Intent(TextToSpeech.Engine.INTENT_ACTION_TTS_SERVICE), info);
+ }
+
+ @After
+ public void tearDown() {
+ ShadowTtsEngines.reset();
+ }
+
+ @Test
+ public void getCandidates_AddEngines_returnCorrectEngines() {
+ mTtsEnginePreferenceFragment = FragmentController.of(new TtsEnginePreferenceFragment(),
+ new Bundle())
+ .create()
+ .get();
+
+ assertThat(mTtsEnginePreferenceFragment.getCandidates().size()).isEqualTo(1);
+ }
+
+ @Test
+ @Config(shadows = {ShadowTtsEngines.class})
+ public void getDefaultKey_validKey_returnCorrectKey() {
+ final String TEST_ENGINE = "test_engine";
+ final TtsEngines engine = mock(TtsEngines.class);
+ ShadowTtsEngines.setInstance(engine);
+ mTtsEnginePreferenceFragment = FragmentController.of(new TtsEnginePreferenceFragment(),
+ new Bundle())
+ .create()
+ .get();
+ when(engine.getDefaultEngine()).thenReturn(TEST_ENGINE);
+
+ assertThat(mTtsEnginePreferenceFragment.getDefaultKey()).isEqualTo(TEST_ENGINE);
+ }
+
+ @Test
+ @Config(shadows = {ShadowTtsEngines.class})
+ public void setDefaultKey_validKey_callingTtsEngineFunction() {
+ final TtsEngines engine = mock(TtsEngines.class);
+ ShadowTtsEngines.setInstance(engine);
+ mTtsEnginePreferenceFragment = FragmentController.of(new TtsEnginePreferenceFragment(),
+ new Bundle())
+ .create()
+ .get();
+
+ mTtsEnginePreferenceFragment.setDefaultKey(mContext.getPackageName());
+
+ verify(engine).isEngineInstalled(mContext.getPackageName());
+ }
+
+ @Test
+ public void setDefaultKey_validKey_updateCheckedState() {
+ mTtsEnginePreferenceFragment = spy(FragmentController.of(new TtsEnginePreferenceFragment(),
+ new Bundle())
+ .create()
+ .get());
+
+ mTtsEnginePreferenceFragment.setDefaultKey(mContext.getPackageName());
+
+ verify(mTtsEnginePreferenceFragment).updateCheckedState(mContext.getPackageName());
+ }
+}
diff --git a/tests/robotests/src/com/android/settings/tts/TtsEnginePreferenceTest.java b/tests/robotests/src/com/android/settings/tts/TtsEnginePreferenceTest.java
deleted file mode 100644
index 5cd9488..0000000
--- a/tests/robotests/src/com/android/settings/tts/TtsEnginePreferenceTest.java
+++ /dev/null
@@ -1,98 +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.tts;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import android.content.Context;
-import android.speech.tts.TextToSpeech;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.Checkable;
-
-import androidx.preference.PreferenceViewHolder;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
-
-@RunWith(RobolectricTestRunner.class)
-public class TtsEnginePreferenceTest {
-
- private static final String KEY = "test_key";
-
- private TtsEnginePreference mPreference;
- private Context mContext;
- private PreferenceViewHolder mViewHolder;
- private View mRootView;
- private FakeRadioButtonGroupState mState;
-
- @Before
- public void setUp() {
- mContext = RuntimeEnvironment.application;
-
- final TextToSpeech.EngineInfo info = new TextToSpeech.EngineInfo();
- info.system = true;
- mState = new FakeRadioButtonGroupState();
- mPreference = new TtsEnginePreference(mContext, info, mState);
- mPreference.setKey(KEY);
-
- // Create preference view holder
- final LayoutInflater inflater = LayoutInflater.from(mContext);
- mRootView = View.inflate(mContext, mPreference.getLayoutResource(), null /* parent */);
- final ViewGroup widgetFrame = mRootView.findViewById(android.R.id.widget_frame);
- inflater.inflate(mPreference.getWidgetLayoutResource(), widgetFrame);
- mViewHolder = PreferenceViewHolder.createInstanceForTests(mRootView);
- }
-
- @Test
- public void onClick_shouldInvokeOnCheckedChangeListener() {
- mPreference.onBindViewHolder(mViewHolder);
-
- mPreference.onClick();
-
- assertThat(mState.getCurrentKey()).isEqualTo(mPreference.getKey());
- }
-
- public static class FakeRadioButtonGroupState implements
- TtsEnginePreference.RadioButtonGroupState {
-
- private String mKey;
-
- @Override
- public Checkable getCurrentChecked() {
- return null;
- }
-
- @Override
- public String getCurrentKey() {
- return mKey;
- }
-
- @Override
- public void setCurrentChecked(Checkable current) {
- }
-
- @Override
- public void setCurrentKey(String key) {
- mKey = key;
- }
- }
-}
diff --git a/tests/robotests/src/com/android/settings/users/EditUserInfoControllerTest.java b/tests/robotests/src/com/android/settings/users/EditUserInfoControllerTest.java
index b9dfbbb..a6a76f8 100644
--- a/tests/robotests/src/com/android/settings/users/EditUserInfoControllerTest.java
+++ b/tests/robotests/src/com/android/settings/users/EditUserInfoControllerTest.java
@@ -18,7 +18,6 @@
import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.ArgumentMatchers.same;
import static org.mockito.Mockito.mock;
@@ -26,18 +25,20 @@
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
-import android.content.Context;
import android.content.Intent;
import android.graphics.drawable.Drawable;
-import android.view.LayoutInflater;
-import android.view.View;
import android.widget.EditText;
import android.widget.ImageView;
+import androidx.appcompat.app.AlertDialog;
import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentActivity;
import com.android.settings.R;
+import com.android.settings.testutils.shadow.ShadowAlertDialogCompat;
+
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
import org.junit.Before;
import org.junit.Test;
@@ -47,20 +48,15 @@
import org.mockito.MockitoAnnotations;
import org.robolectric.RobolectricTestRunner;
import org.robolectric.android.controller.ActivityController;
+import org.robolectric.annotation.Config;
@RunWith(RobolectricTestRunner.class)
public class EditUserInfoControllerTest {
+ private static final int MAX_USER_NAME_LENGTH = 100;
+
@Mock
private Fragment mFragment;
@Mock
- private LayoutInflater mInflater;
- @Mock(answer = Answers.RETURNS_DEEP_STUBS)
- private View mDialogContent;
- @Mock
- private EditText mUserName;
- @Mock
- private ImageView mPhotoView;
- @Mock
private Drawable mCurrentIcon;
private FragmentActivity mActivity;
@@ -86,12 +82,6 @@
MockitoAnnotations.initMocks(this);
mActivity = spy(ActivityController.of(new FragmentActivity()).get());
when(mFragment.getActivity()).thenReturn(mActivity);
- when(mActivity.getLayoutInflater()).thenReturn(mInflater);
- when(mInflater.inflate(eq(R.layout.edit_user_info_dialog_content), any())).thenReturn(
- mDialogContent);
- when(mDialogContent.findViewById(eq(R.id.user_name))).thenReturn(mUserName);
- when(mDialogContent.findViewById(eq(R.id.user_photo))).thenReturn(mPhotoView);
- when(mPhotoView.getContext()).thenReturn((Context) mActivity);
mController = new TestEditUserInfoController();
}
@@ -106,4 +96,21 @@
assertThat(photoController).isNotNull();
verify(photoController).onActivityResult(eq(0), eq(0), same(resultData));
}
+
+ @Test
+ @Config(shadows = ShadowAlertDialogCompat.class)
+ public void userNameView_inputLongName_shouldBeConstrained() {
+ // generate a string of 200 'A's
+ final String longName = Stream.generate(
+ () -> String.valueOf('A')).limit(200).collect(Collectors.joining());
+ final AlertDialog dialog = (AlertDialog) mController.createDialog(mFragment, mCurrentIcon,
+ "test user", R.string.profile_info_settings_title, null,
+ android.os.Process.myUserHandle());
+ final EditText userName = ShadowAlertDialogCompat.shadowOf(dialog).getView()
+ .findViewById(R.id.user_name);
+
+ userName.setText(longName);
+
+ assertThat(userName.getText().length()).isEqualTo(MAX_USER_NAME_LENGTH);
+ }
}
diff --git a/tests/robotests/src/com/android/settings/users/MultiUserFooterPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/users/MultiUserFooterPreferenceControllerTest.java
index 8342cf0..69825b4 100644
--- a/tests/robotests/src/com/android/settings/users/MultiUserFooterPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/users/MultiUserFooterPreferenceControllerTest.java
@@ -40,7 +40,7 @@
@Before
public void setUp() {
mContext = RuntimeEnvironment.application;
- mController = new MultiUserFooterPreferenceController(mContext);
+ mController = new MultiUserFooterPreferenceController(mContext, "footer");
}
@Test
diff --git a/tests/robotests/src/com/android/settings/webview/WebViewAppPickerTest.java b/tests/robotests/src/com/android/settings/webview/WebViewAppPickerTest.java
index 10cf413..8749514 100644
--- a/tests/robotests/src/com/android/settings/webview/WebViewAppPickerTest.java
+++ b/tests/robotests/src/com/android/settings/webview/WebViewAppPickerTest.java
@@ -41,9 +41,9 @@
import androidx.fragment.app.FragmentActivity;
-import com.android.settings.widget.RadioButtonPreference;
import com.android.settingslib.applications.DefaultAppInfo;
import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
+import com.android.settingslib.widget.RadioButtonPreference;
import org.junit.After;
import org.junit.Before;
diff --git a/tests/robotests/src/com/android/settings/widget/RadioButtonPickerFragmentTest.java b/tests/robotests/src/com/android/settings/widget/RadioButtonPickerFragmentTest.java
index 56a5f7a..4b551bd 100644
--- a/tests/robotests/src/com/android/settings/widget/RadioButtonPickerFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/widget/RadioButtonPickerFragmentTest.java
@@ -32,6 +32,7 @@
import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settingslib.applications.DefaultAppInfo;
+import com.android.settingslib.widget.RadioButtonPreference;
import org.junit.Before;
import org.junit.Test;
diff --git a/tests/robotests/src/com/android/settings/widget/RadioButtonPreferenceTest.java b/tests/robotests/src/com/android/settings/widget/RadioButtonPreferenceTest.java
deleted file mode 100644
index c7b7e47..0000000
--- a/tests/robotests/src/com/android/settings/widget/RadioButtonPreferenceTest.java
+++ /dev/null
@@ -1,106 +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.widget;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.junit.Assert.assertEquals;
-
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
-import android.app.Application;
-import android.view.LayoutInflater;
-import android.view.View;
-
-import androidx.preference.PreferenceViewHolder;
-
-import com.android.settings.R;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
-
-@RunWith(RobolectricTestRunner.class)
-public class RadioButtonPreferenceTest {
-
- private Application mContext;
- private RadioButtonPreference mPreference;
-
- @Before
- public void setUp() {
- mContext = RuntimeEnvironment.application;
- mPreference = new RadioButtonPreference(mContext);
- }
-
- @Test
- public void shouldHaveRadioPreferenceLayout() {
- assertThat(mPreference.getLayoutResource()).isEqualTo(R.layout.preference_radio);
- }
-
- @Test
- public void iconSpaceReservedShouldBeFalse() {
- assertThat(mPreference.isIconSpaceReserved()).isFalse();
- }
-
- @Test
- public void summary_containerShouldBeVisible() {
- mPreference.setSummary("some summary");
- View summaryContainer = new View(mContext);
- View view = mock(View.class);
- when(view.findViewById(R.id.summary_container)).thenReturn(summaryContainer);
- PreferenceViewHolder preferenceViewHolder =
- PreferenceViewHolder.createInstanceForTests(view);
- mPreference.onBindViewHolder(preferenceViewHolder);
- assertEquals(View.VISIBLE, summaryContainer.getVisibility());
- }
-
- @Test
- public void emptySummary_containerShouldBeGone() {
- mPreference.setSummary("");
- View summaryContainer = new View(mContext);
- View view = mock(View.class);
- when(view.findViewById(R.id.summary_container)).thenReturn(summaryContainer);
- PreferenceViewHolder preferenceViewHolder =
- PreferenceViewHolder.createInstanceForTests(view);
- mPreference.onBindViewHolder(preferenceViewHolder);
- assertEquals(View.GONE, summaryContainer.getVisibility());
- }
-
- @Test
- public void nullSummary_containerShouldBeGone() {
- mPreference.setSummary(null);
- View summaryContainer = new View(mContext);
- View view = mock(View.class);
- when(view.findViewById(R.id.summary_container)).thenReturn(summaryContainer);
- PreferenceViewHolder preferenceViewHolder =
- PreferenceViewHolder.createInstanceForTests(view);
- mPreference.onBindViewHolder(preferenceViewHolder);
- assertEquals(View.GONE, summaryContainer.getVisibility());
- }
-
- @Test
- public void hideAppendix_shouldBeGone() {
- mPreference.setAppendixVisibility(View.GONE);
- View view = LayoutInflater.from(mContext).inflate(R.layout.preference_radio, null);
- PreferenceViewHolder holder = PreferenceViewHolder.createInstanceForTests(view);
- mPreference.onBindViewHolder(holder);
- assertThat(holder.findViewById(R.id.appendix).getVisibility()).isEqualTo(View.GONE);
- }
-}
diff --git a/tests/robotests/src/com/android/settings/wifi/ConfigureAccessPointFragmentTest.java b/tests/robotests/src/com/android/settings/wifi/ConfigureAccessPointFragmentTest.java
new file mode 100644
index 0000000..5a12a88
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/wifi/ConfigureAccessPointFragmentTest.java
@@ -0,0 +1,93 @@
+/*
+ * 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.wifi;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+
+import android.app.settings.SettingsEnums;
+import android.os.Bundle;
+
+import com.android.settings.testutils.shadow.ShadowConnectivityManager;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.annotation.Config;
+import org.robolectric.shadows.androidx.fragment.FragmentController;
+
+@RunWith(RobolectricTestRunner.class)
+@Config(shadows = ShadowConnectivityManager.class)
+public class ConfigureAccessPointFragmentTest {
+
+ private static final String KEY_SSID = "key_ssid";
+ private static final String KEY_SECURITY = "key_security";
+
+ private ConfigureAccessPointFragment mConfigureAccessPointFragment;
+
+ @Before
+ public void setUp() {
+ MockitoAnnotations.initMocks(this);
+ Bundle bundle = new Bundle();
+
+ bundle.putString(KEY_SSID, "Test AP");
+ bundle.putInt(KEY_SECURITY, 1 /* WEP */);
+ mConfigureAccessPointFragment = spy(new ConfigureAccessPointFragment());
+ mConfigureAccessPointFragment.setArguments(bundle);
+ FragmentController.setupFragment(mConfigureAccessPointFragment);
+ }
+
+ @Test
+ public void getMetricsCategory_shouldReturnConfigureNetwork() {
+ assertThat(mConfigureAccessPointFragment.getMetricsCategory()).isEqualTo(
+ SettingsEnums.SETTINGS_WIFI_CONFIGURE_NETWORK);
+ }
+
+ @Test
+ public void getMode_shouldBeModeConnected() {
+ assertThat(mConfigureAccessPointFragment.getMode()).isEqualTo(
+ WifiConfigUiBase.MODE_CONNECT);
+ }
+
+ @Test
+ public void launchFragment_shouldShowSubmitButton() {
+ assertThat(mConfigureAccessPointFragment.getSubmitButton()).isNotNull();
+ }
+
+ @Test
+ public void launchFragment_shouldShowCancelButton() {
+ assertThat(mConfigureAccessPointFragment.getCancelButton()).isNotNull();
+ }
+
+ @Test
+ public void onClickSubmitButton_shouldHandleSubmitAction() {
+ mConfigureAccessPointFragment.getSubmitButton().performClick();
+
+ verify(mConfigureAccessPointFragment).handleSubmitAction();
+ }
+
+ @Test
+ public void onClickCancelButton_shouldHandleCancelAction() {
+ mConfigureAccessPointFragment.getCancelButton().performClick();
+
+ verify(mConfigureAccessPointFragment).handleCancelAction();
+ }
+}
diff --git a/tests/robotests/src/com/android/settings/wifi/NetworkRequestDialogActivityTest.java b/tests/robotests/src/com/android/settings/wifi/NetworkRequestDialogActivityTest.java
index 4c7d02d..c744647 100644
--- a/tests/robotests/src/com/android/settings/wifi/NetworkRequestDialogActivityTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/NetworkRequestDialogActivityTest.java
@@ -18,11 +18,22 @@
import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+import android.content.Context;
+import android.net.wifi.WifiConfiguration;
+import android.net.wifi.WifiManager;
+import android.os.Bundle;
+
+import androidx.annotation.Nullable;
import androidx.appcompat.app.AlertDialog;
import com.android.settings.testutils.shadow.ShadowAlertDialogCompat;
+import com.android.settings.wifi.NetworkRequestErrorDialogFragment.ERROR_DIALOG_TYPE;
import com.android.settingslib.wifi.WifiTracker;
import com.android.settingslib.wifi.WifiTrackerFactory;
@@ -31,25 +42,88 @@
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.ShadowLooper;
@RunWith(RobolectricTestRunner.class)
@Config(shadows = ShadowAlertDialogCompat.class)
public class NetworkRequestDialogActivityTest {
+ NetworkRequestDialogActivity mActivity;
+ WifiManager mWifiManager;
+ Context mContext;
+
@Before
public void setUp() {
- // Mocks fake WifiTracker, in case of exception in NetworkRequestDialogFragment.onResume().
+ mContext = spy(RuntimeEnvironment.application);
+
WifiTracker wifiTracker = mock(WifiTracker.class);
WifiTrackerFactory.setTestingWifiTracker(wifiTracker);
+
+ NetworkRequestDialogActivity activity =
+ Robolectric.setupActivity(NetworkRequestDialogActivity.class);
+ mActivity = spy(activity);
+
+ mWifiManager = mock(WifiManager.class);
+ when(mActivity.getSystemService(Context.WIFI_SERVICE)).thenReturn(mWifiManager);
}
@Test
- public void launchActivity_shouldShowNetworkRequestDialog() {
- Robolectric.setupActivity(NetworkRequestDialogActivity.class);
-
- final AlertDialog alertDialog = ShadowAlertDialogCompat.getLatestAlertDialog();
+ public void LaunchActivity_shouldShowNetworkRequestDialog() {
+ AlertDialog alertDialog = ShadowAlertDialogCompat.getLatestAlertDialog();
assertThat(alertDialog.isShowing()).isTrue();
}
+
+ @Test
+ public void onResume_shouldRegisterCallback() {
+ mActivity.onResume();
+
+ verify(mWifiManager).registerNetworkRequestMatchCallback(any(), any());
+ }
+
+ @Test
+ public void onPause_shouldUnRegisterCallback() {
+ mActivity.onPause();
+
+ verify(mWifiManager).unregisterNetworkRequestMatchCallback(mActivity);
+ }
+
+ @Test
+ public void onResumeAndWaitTimeout_shouldCallTimeoutDialog() {
+ FakeNetworkRequestDialogActivity fakeActivity =
+ Robolectric.setupActivity(FakeNetworkRequestDialogActivity.class);
+
+ fakeActivity.onResume();
+ ShadowLooper.getShadowMainLooper().runToEndOfTasks();
+
+ assertThat(fakeActivity.bCalledStopAndPop).isTrue();
+ assertThat(fakeActivity.errorType).isEqualTo(ERROR_DIALOG_TYPE.TIME_OUT);
+ }
+
+ public static class FakeNetworkRequestDialogActivity extends NetworkRequestDialogActivity {
+ boolean bCalledStopAndPop = false;
+ ERROR_DIALOG_TYPE errorType = null;
+
+ @Override
+ protected void onCreate(@Nullable Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ }
+
+ @Override
+ public void stopScanningAndPopErrorDialog(ERROR_DIALOG_TYPE type) {
+ bCalledStopAndPop = true;
+ errorType = type;
+ }
+ }
+
+ @Test
+ public void updateAccessPointList_onUserSelectionConnectSuccess_shouldFinishActivity() {
+ final WifiConfiguration config = new WifiConfiguration();
+ config.SSID = "Test AP 3";
+ mActivity.onUserSelectionConnectSuccess(config);
+
+ verify(mActivity).finish();
+ }
}
diff --git a/tests/robotests/src/com/android/settings/wifi/NetworkRequestDialogFragmentTest.java b/tests/robotests/src/com/android/settings/wifi/NetworkRequestDialogFragmentTest.java
index 4202143..4f75794 100644
--- a/tests/robotests/src/com/android/settings/wifi/NetworkRequestDialogFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/NetworkRequestDialogFragmentTest.java
@@ -17,8 +17,6 @@
package com.android.settings.wifi;
import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.times;
@@ -29,25 +27,20 @@
import android.content.DialogInterface;
import android.content.Intent;
import android.net.wifi.ScanResult;
-import android.net.wifi.WifiConfiguration;
import android.net.wifi.WifiManager;
import android.net.wifi.WifiManager.NetworkRequestUserSelectionCallback;
import android.os.Bundle;
import android.view.View;
import android.widget.Button;
import android.widget.TextView;
-
import androidx.appcompat.app.AlertDialog;
-import androidx.fragment.app.FragmentActivity;
-
import com.android.settings.R;
import com.android.settings.testutils.shadow.ShadowAlertDialogCompat;
-import com.android.settings.wifi.NetworkRequestErrorDialogFragment.ERROR_DIALOG_TYPE;
import com.android.settingslib.wifi.AccessPoint;
-
+import com.android.settingslib.wifi.WifiTracker;
+import com.android.settingslib.wifi.WifiTrackerFactory;
import java.util.ArrayList;
import java.util.List;
-
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -56,11 +49,6 @@
import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config;
-import com.android.settingslib.wifi.WifiTracker;
-import com.android.settingslib.wifi.WifiTrackerFactory;
-
-import org.robolectric.shadows.ShadowLooper;
-
@RunWith(RobolectricTestRunner.class)
@Config(shadows = ShadowAlertDialogCompat.class)
public class NetworkRequestDialogFragmentTest {
@@ -69,14 +57,14 @@
private static final String KEY_SECURITY = "key_security";
private static final String TEST_APP_NAME = "TestAppName";
- private FragmentActivity mActivity;
+ private NetworkRequestDialogActivity mActivity;
private NetworkRequestDialogFragment networkRequestDialogFragment;
private Context mContext;
private WifiTracker mWifiTracker;
@Before
public void setUp() {
- mActivity = Robolectric.buildActivity(FragmentActivity.class,
+ mActivity = Robolectric.buildActivity(NetworkRequestDialogActivity.class,
new Intent().putExtra(NetworkRequestDialogFragment.EXTRA_APP_NAME,
TEST_APP_NAME)).setup().get();
networkRequestDialogFragment = spy(NetworkRequestDialogFragment.newInstance());
@@ -119,73 +107,6 @@
}
@Test
- public void onResumeAndWaitTimeout_shouldCallTimeoutDialog() {
- FakeNetworkRequestDialogFragment fakeFragment = new FakeNetworkRequestDialogFragment();
- FakeNetworkRequestDialogFragment spyFakeFragment = spy(fakeFragment);
- spyFakeFragment.show(mActivity.getSupportFragmentManager(), null);
-
- assertThat(fakeFragment.bCalledStopAndPop).isFalse();
-
- ShadowLooper.getShadowMainLooper().runToEndOfTasks();
-
- assertThat(fakeFragment.bCalledStopAndPop).isTrue();
- assertThat(fakeFragment.errorType).isEqualTo(ERROR_DIALOG_TYPE.TIME_OUT);
- }
-
- class FakeNetworkRequestDialogFragment extends NetworkRequestDialogFragment {
- boolean bCalledStopAndPop = false;
- ERROR_DIALOG_TYPE errorType = null;
-
- @Override
- public void stopScanningAndPopErrorDialog(ERROR_DIALOG_TYPE type) {
- bCalledStopAndPop = true;
- errorType = type;
- }
- }
-
- @Test
- public void onResume_shouldRegisterCallback() {
- when(networkRequestDialogFragment.getContext()).thenReturn(mContext);
- Context applicationContext = spy(RuntimeEnvironment.application.getApplicationContext());
- when(mContext.getApplicationContext()).thenReturn(applicationContext);
- WifiManager wifiManager = mock(WifiManager.class);
- when(applicationContext.getSystemService(Context.WIFI_SERVICE)).thenReturn(wifiManager);
-
- networkRequestDialogFragment.onResume();
-
- verify(wifiManager).registerNetworkRequestMatchCallback(any(), any());
- }
-
- @Test
- public void onPause_shouldUnRegisterCallback() {
- when(networkRequestDialogFragment.getContext()).thenReturn(mContext);
- Context applicationContext = spy(RuntimeEnvironment.application.getApplicationContext());
- when(mContext.getApplicationContext()).thenReturn(applicationContext);
- WifiManager wifiManager = mock(WifiManager.class);
- when(applicationContext.getSystemService(Context.WIFI_SERVICE)).thenReturn(wifiManager);
-
- networkRequestDialogFragment.onPause();
-
- verify(wifiManager).unregisterNetworkRequestMatchCallback(networkRequestDialogFragment);
- }
-
- @Test
- public void updateAccessPointList_onUserSelectionConnectSuccess_shouldFinishActivity() {
- // Assert
- final FragmentActivity spyActivity = spy(mActivity);
- when(networkRequestDialogFragment.getActivity()).thenReturn(spyActivity);
- networkRequestDialogFragment.show(spyActivity.getSupportFragmentManager(), "onUserSelectionConnectSuccess");
-
- // Action
- final WifiConfiguration config = new WifiConfiguration();
- config.SSID = "Test AP 3";
- networkRequestDialogFragment.onUserSelectionConnectSuccess(config);
-
- // Check
- verify(spyActivity).finish();
- }
-
- @Test
public void onUserSelectionCallbackRegistration_onClick_shouldCallSelect() {
// Assert.
final int indexClickItem = 3;
diff --git a/tests/robotests/src/com/android/settings/wifi/NetworkRequestErrorDialogFragmentTest.java b/tests/robotests/src/com/android/settings/wifi/NetworkRequestErrorDialogFragmentTest.java
index 303f6af..c4bdda8 100644
--- a/tests/robotests/src/com/android/settings/wifi/NetworkRequestErrorDialogFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/NetworkRequestErrorDialogFragmentTest.java
@@ -17,22 +17,21 @@
package com.android.settings.wifi;
import static com.google.common.truth.Truth.assertThat;
-
+import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verify;
import static org.mockito.internal.verification.VerificationModeFactory.times;
import android.content.DialogInterface;
+import android.net.wifi.WifiManager.NetworkRequestUserSelectionCallback;
import android.os.Bundle;
import android.widget.Button;
-
import androidx.appcompat.app.AlertDialog;
-import androidx.fragment.app.FragmentActivity;
-
import com.android.settings.R;
import com.android.settings.testutils.shadow.ShadowAlertDialogCompat;
import com.android.settings.wifi.NetworkRequestErrorDialogFragment.ERROR_DIALOG_TYPE;
-
+import com.android.settingslib.wifi.WifiTracker;
+import com.android.settingslib.wifi.WifiTrackerFactory;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -45,12 +44,15 @@
@Config(shadows = ShadowAlertDialogCompat.class)
public class NetworkRequestErrorDialogFragmentTest {
- private FragmentActivity mActivity;
+ private NetworkRequestDialogActivity mActivity;
private NetworkRequestErrorDialogFragment mFragment;
@Before
public void setUp() {
- mActivity = Robolectric.setupActivity(FragmentActivity.class);
+ WifiTracker wifiTracker = mock(WifiTracker.class);
+ WifiTrackerFactory.setTestingWifiTracker(wifiTracker);
+
+ mActivity = Robolectric.setupActivity(NetworkRequestDialogActivity.class);
mFragment = spy(NetworkRequestErrorDialogFragment.newInstance());
mFragment.show(mActivity.getSupportFragmentManager(), null);
}
@@ -97,7 +99,7 @@
assertThat(positiveButton).isNotNull();
positiveButton.performClick();
- verify(mFragment, times(1)).startScanningDialog();
+ verify(mFragment, times(1)).onRescanClick();
}
@Test
@@ -111,4 +113,17 @@
negativeButton.performClick();
assertThat(alertDialog.isShowing()).isFalse();
}
+
+ @Test
+ public void clickNegativeButton_shouldCallReject() {
+ final NetworkRequestUserSelectionCallback rejectCallback =
+ mock(NetworkRequestUserSelectionCallback.class);
+ mFragment.setRejectCallback(rejectCallback);
+
+ final AlertDialog alertDialog = ShadowAlertDialogCompat.getLatestAlertDialog();
+ final Button negativeButton = alertDialog.getButton(DialogInterface.BUTTON_NEGATIVE);
+ negativeButton.performClick();
+
+ verify(rejectCallback, times(1)).reject();
+ }
}
diff --git a/tests/robotests/src/com/android/settings/wifi/NotifyOpenNetworkPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/NotifyOpenNetworksPreferenceControllerTest.java
similarity index 73%
rename from tests/robotests/src/com/android/settings/wifi/NotifyOpenNetworkPreferenceControllerTest.java
rename to tests/robotests/src/com/android/settings/wifi/NotifyOpenNetworksPreferenceControllerTest.java
index 2cf7b21..f9271a6 100644
--- a/tests/robotests/src/com/android/settings/wifi/NotifyOpenNetworkPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/NotifyOpenNetworksPreferenceControllerTest.java
@@ -29,8 +29,6 @@
import androidx.preference.Preference;
import androidx.preference.SwitchPreference;
-import com.android.settingslib.core.lifecycle.Lifecycle;
-
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -39,7 +37,7 @@
import org.robolectric.RuntimeEnvironment;
@RunWith(RobolectricTestRunner.class)
-public class NotifyOpenNetworkPreferenceControllerTest {
+public class NotifyOpenNetworksPreferenceControllerTest {
private Context mContext;
private NotifyOpenNetworksPreferenceController mController;
@@ -48,7 +46,7 @@
public void setUp() {
MockitoAnnotations.initMocks(this);
mContext = RuntimeEnvironment.application;
- mController = new NotifyOpenNetworksPreferenceController(mContext, mock(Lifecycle.class));
+ mController = new NotifyOpenNetworksPreferenceController(mContext);
}
@Test
@@ -57,33 +55,30 @@
}
@Test
- public void handlePreferenceTreeClick_nonMatchingKey_shouldDoNothing() {
- final SwitchPreference pref = new SwitchPreference(mContext);
+ public void setChecked_withTrue_shouldUpdateSetting() {
+ Settings.Global.putInt(mContext.getContentResolver(),
+ WIFI_NETWORKS_AVAILABLE_NOTIFICATION_ON, 0);
- assertThat(mController.handlePreferenceTreeClick(pref)).isFalse();
- }
+ mController.setChecked(true);
- @Test
- public void handlePreferenceTreeClick_nonMatchingType_shouldDoNothing() {
- final Preference pref = new Preference(mContext);
- pref.setKey(mController.getPreferenceKey());
-
- assertThat(mController.handlePreferenceTreeClick(pref)).isFalse();
- }
-
- @Test
- public void handlePreferenceTreeClick_matchingKeyAndType_shouldUpdateSetting() {
- final SwitchPreference pref = new SwitchPreference(mContext);
- pref.setChecked(true);
- pref.setKey(mController.getPreferenceKey());
-
- assertThat(mController.handlePreferenceTreeClick(pref)).isTrue();
assertThat(Settings.Global.getInt(mContext.getContentResolver(),
WIFI_NETWORKS_AVAILABLE_NOTIFICATION_ON, 0))
.isEqualTo(1);
}
@Test
+ public void setChecked_withFalse_shouldUpdateSetting() {
+ Settings.Global.putInt(mContext.getContentResolver(),
+ WIFI_NETWORKS_AVAILABLE_NOTIFICATION_ON, 1);
+
+ mController.setChecked(false);
+
+ assertThat(Settings.Global.getInt(mContext.getContentResolver(),
+ WIFI_NETWORKS_AVAILABLE_NOTIFICATION_ON, 0))
+ .isEqualTo(0);
+ }
+
+ @Test
public void updateState_preferenceSetCheckedWhenSettingsAreEnabled() {
final SwitchPreference preference = mock(SwitchPreference.class);
Settings.Global.putInt(mContext.getContentResolver(),
diff --git a/tests/robotests/src/com/android/settings/wifi/UseOpenWifiPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/UseOpenWifiPreferenceControllerTest.java
index 47f1c26..beaa1a6 100644
--- a/tests/robotests/src/com/android/settings/wifi/UseOpenWifiPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/UseOpenWifiPreferenceControllerTest.java
@@ -43,7 +43,6 @@
import androidx.preference.SwitchPreference;
import com.android.settings.R;
-import com.android.settingslib.core.lifecycle.Lifecycle;
import com.google.common.collect.Lists;
@@ -77,8 +76,6 @@
}
@Mock
- private Lifecycle mLifecycle;
- @Mock
private Fragment mFragment;
@Mock
private NetworkScoreManager mNetworkScoreManager;
@@ -97,7 +94,8 @@
}
private void createController() {
- mController = new UseOpenWifiPreferenceController(mContext, mFragment, mLifecycle);
+ mController = new UseOpenWifiPreferenceController(mContext);
+ mController.setFragment(mFragment);
}
/**
@@ -146,52 +144,28 @@
}
@Test
- public void onPreferenceChange_nonMatchingKey_shouldDoNothing() {
- createController();
-
- final SwitchPreference pref = new SwitchPreference(mContext);
-
- assertThat(mController.onPreferenceChange(pref, null)).isFalse();
- }
-
- @Test
- public void onPreferenceChange_notAvailable_shouldDoNothing() {
- createController();
-
- final Preference pref = new Preference(mContext);
- pref.setKey(mController.getPreferenceKey());
-
- assertThat(mController.onPreferenceChange(pref, null)).isFalse();
- }
-
- @Test
- public void onPreferenceChange_matchingKeyAndAvailable_enableShouldStartEnableActivity() {
+ public void setChecked_withTrue_enableShouldStartEnableActivity() {
setupScorers(Lists.newArrayList(sAppData, sAppDataNoActivity));
createController();
- final SwitchPreference pref = new SwitchPreference(mContext);
- pref.setKey(mController.getPreferenceKey());
+ mController.setChecked(true);
- assertThat(mController.onPreferenceChange(pref, null)).isFalse();
verify(mFragment).startActivityForResult(mIntentCaptor.capture(),
eq(REQUEST_CODE_OPEN_WIFI_AUTOMATICALLY));
- Intent activityIntent = mIntentCaptor.getValue();
+ final Intent activityIntent = mIntentCaptor.getValue();
assertThat(activityIntent.getComponent()).isEqualTo(sEnableActivityComponent);
assertThat(activityIntent.getAction()).isEqualTo(NetworkScoreManager.ACTION_CUSTOM_ENABLE);
}
@Test
- public void onPreferenceChange_matchingKeyAndAvailable_disableShouldUpdateSetting() {
+ public void setChecked_withFalse_disableShouldUpdateSetting() {
setupScorers(Lists.newArrayList(sAppData, sAppDataNoActivity));
Settings.Global.putString(mContext.getContentResolver(), USE_OPEN_WIFI_PACKAGE,
sEnableActivityComponent.getPackageName());
-
createController();
- final SwitchPreference pref = new SwitchPreference(mContext);
- pref.setKey(mController.getPreferenceKey());
+ mController.setChecked(false);
- assertThat(mController.onPreferenceChange(pref, null)).isTrue();
assertThat(Settings.Global.getString(mContext.getContentResolver(), USE_OPEN_WIFI_PACKAGE))
.isEqualTo("");
}
diff --git a/tests/robotests/src/com/android/settings/wifi/WifiConfigControllerTest.java b/tests/robotests/src/com/android/settings/wifi/WifiConfigControllerTest.java
index dd7ecde..e692fed 100644
--- a/tests/robotests/src/com/android/settings/wifi/WifiConfigControllerTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/WifiConfigControllerTest.java
@@ -27,14 +27,19 @@
import static org.mockito.Mockito.when;
import android.content.Context;
+import android.content.res.Resources;
import android.net.wifi.WifiConfiguration;
+import android.net.wifi.WifiEnterpriseConfig;
+import android.net.wifi.WifiEnterpriseConfig.Eap;
import android.net.wifi.WifiManager;
import android.os.ServiceSpecificException;
import android.security.KeyStore;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
+import android.view.inputmethod.InputMethodManager;
import android.widget.ArrayAdapter;
+import android.widget.CheckBox;
import android.widget.Spinner;
import android.widget.TextView;
@@ -50,7 +55,9 @@
import org.mockito.MockitoAnnotations;
import org.robolectric.RobolectricTestRunner;
import org.robolectric.RuntimeEnvironment;
+import org.robolectric.Shadows;
import org.robolectric.annotation.Config;
+import org.robolectric.shadows.ShadowInputMethodManager;
@RunWith(RobolectricTestRunner.class)
@Config(shadows = ShadowConnectivityManager.class)
@@ -447,6 +454,45 @@
}
@Test
+ public void replaceTtsString_whenTargetMatched_shouldSuccess() {
+ final CharSequence[] display = {"PEAP", "AKA1", "AKA2'"};
+ final CharSequence[] target = {"AKA1", "AKA2'"};
+ final CharSequence[] ttsString = {"AKA1_TTS", "AKA2_TTS"};
+
+ final CharSequence[] resultTts = mController.findAndReplaceTargetStrings(display, target,
+ ttsString);
+
+ assertThat(resultTts[0]).isEqualTo("PEAP");
+ assertThat(resultTts[1]).isEqualTo("AKA1_TTS");
+ assertThat(resultTts[2]).isEqualTo("AKA2_TTS");
+ }
+
+ @Test
+ public void replaceTtsString_whenNoTargetStringMatched_originalStringShouldNotChanged() {
+ final CharSequence[] display = {"PEAP", "AKA1", "AKA2"};
+ final CharSequence[] target = {"WEP1", "WEP2'"};
+ final CharSequence[] ttsString = {"WEP1_TTS", "WEP2_TTS"};
+
+ final CharSequence[] resultTts = mController.findAndReplaceTargetStrings(display, target,
+ ttsString);
+
+ assertThat(resultTts[0]).isEqualTo("PEAP");
+ assertThat(resultTts[1]).isEqualTo("AKA1");
+ assertThat(resultTts[2]).isEqualTo("AKA2");
+ }
+
+ @Test
+ public void checktEapMethodTargetAndTtsArraylength_shouldHaveSameCount() {
+ final Resources resources = mContext.getResources();
+ final String[] targetStringArray = resources.getStringArray(
+ R.array.wifi_eap_method_target_strings);
+ final String[] ttsStringArray = resources.getStringArray(
+ R.array.wifi_eap_method_tts_strings);
+
+ assertThat(targetStringArray.length).isEqualTo(ttsStringArray.length);
+ }
+
+ @Test
public void selectSecurity_wpa3Eap192bit_eapMethodTls() {
final WifiManager wifiManager = mock(WifiManager.class);
when(wifiManager.isWpa3SuiteBSupported()).thenReturn(true);
@@ -463,10 +509,41 @@
}
}
- mController.onItemSelected(securitySpinner, null /* view */, wpa3Eap192bitPosition,
- 0 /* id */);
+ mController.onItemSelected(securitySpinner, /* view */ null, wpa3Eap192bitPosition,
+ /* id */ 0);
final int selectedItemPosition = eapMethodSpinner.getSelectedItemPosition();
assertThat(eapMethodSpinner.getSelectedItem().toString()).isEqualTo("TLS");
}
+
+ @Test
+ public void checkImeStatus_whenAdvancedToggled_shouldBeHide() {
+ final InputMethodManager inputMethodManager = mContext
+ .getSystemService(InputMethodManager.class);
+ final ShadowInputMethodManager shadowImm = Shadows.shadowOf(inputMethodManager);
+ final CheckBox advButton = mView.findViewById(R.id.wifi_advanced_togglebox);
+
+ inputMethodManager.showSoftInput(null /* view */, 0 /* flags */);
+ advButton.performClick();
+
+ assertThat(shadowImm.isSoftInputVisible()).isFalse();
+ }
+
+ @Test
+ public void selectEapMethod_savedAccessPoint_shouldGetCorrectPosition() {
+ when(mAccessPoint.isSaved()).thenReturn(true);
+ when(mAccessPoint.getSecurity()).thenReturn(AccessPoint.SECURITY_EAP);
+ final WifiConfiguration mockWifiConfig = mock(WifiConfiguration.class);
+ final WifiEnterpriseConfig mockWifiEnterpriseConfig = mock(WifiEnterpriseConfig.class);
+ when(mockWifiEnterpriseConfig.getEapMethod()).thenReturn(Eap.PEAP);
+ mockWifiConfig.enterpriseConfig = mockWifiEnterpriseConfig ;
+ when(mAccessPoint.getConfig()).thenReturn(mockWifiConfig);
+ mController = new TestWifiConfigController(mConfigUiBase, mView, mAccessPoint,
+ WifiConfigUiBase.MODE_MODIFY);
+ final Spinner eapMethodSpinner = mView.findViewById(R.id.method);
+
+ eapMethodSpinner.setSelection(Eap.TLS);
+
+ assertThat(eapMethodSpinner.getSelectedItemPosition()).isEqualTo(Eap.TLS);
+ }
}
diff --git a/tests/robotests/src/com/android/settings/wifi/WifiDialogActivityTest.java b/tests/robotests/src/com/android/settings/wifi/WifiDialogActivityTest.java
index 15a0780..41d1bbe 100644
--- a/tests/robotests/src/com/android/settings/wifi/WifiDialogActivityTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/WifiDialogActivityTest.java
@@ -27,7 +27,6 @@
import com.android.settings.testutils.shadow.ShadowAlertDialogCompat;
import com.android.settings.testutils.shadow.ShadowConnectivityManager;
import com.android.settings.testutils.shadow.ShadowWifiManager;
-import com.android.settings.wifi.dpp.WifiDppEnrolleeActivity;
import com.google.android.setupcompat.util.WizardManagerHelper;
@@ -38,7 +37,6 @@
import org.mockito.MockitoAnnotations;
import org.robolectric.Robolectric;
import org.robolectric.RobolectricTestRunner;
-import org.robolectric.android.controller.ActivityController;
import org.robolectric.annotation.Config;
import org.robolectric.util.ReflectionHelpers;
@@ -113,23 +111,4 @@
assertThat(dialog.getContext().getThemeResId())
.isEqualTo(R.style.SuwAlertDialogThemeCompat_Light);
}
-
- @Test
- public void onScan_whenLaunchFromDeferredSetup_shouldApplyLightTheme() {
- ActivityController<WifiDppEnrolleeActivity> controller = Robolectric.buildActivity(
- WifiDppEnrolleeActivity.class,
- new Intent()
- .setAction(WifiDppEnrolleeActivity.ACTION_ENROLLEE_QR_CODE_SCANNER)
- .putExtra(WizardManagerHelper.EXTRA_IS_FIRST_RUN, true)
- .putExtra(WizardManagerHelper.EXTRA_IS_SETUP_FLOW, true)
- );
- controller.create();
-
- Intent intent = controller.getIntent();
- assertThat(intent.getBooleanExtra(WizardManagerHelper.EXTRA_IS_FIRST_RUN, false)).isTrue();
- assertThat(intent.getBooleanExtra(WizardManagerHelper.EXTRA_IS_SETUP_FLOW, false)).isTrue();
-
- assertThat(controller.get().getThemeResId()).
- isEqualTo(R.style.LightTheme_SettingsBase_SetupWizard);
- }
}
diff --git a/tests/robotests/src/com/android/settings/wifi/WifiNoInternetDialogTest.java b/tests/robotests/src/com/android/settings/wifi/WifiNoInternetDialogTest.java
new file mode 100644
index 0000000..af7a2a3
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/wifi/WifiNoInternetDialogTest.java
@@ -0,0 +1,31 @@
+/*
+ * 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.wifi;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.Robolectric;
+import org.robolectric.RobolectricTestRunner;
+
+@RunWith(RobolectricTestRunner.class)
+public class WifiNoInternetDialogTest {
+ @Test
+ public void launchActivity_noIntentAction_shouldNotFatalException() {
+ WifiNoInternetDialog wifiNoInternetDialog =
+ Robolectric.setupActivity(WifiNoInternetDialog.class);
+ }
+}
diff --git a/tests/robotests/src/com/android/settings/wifi/WifiScanModeActivityTest.java b/tests/robotests/src/com/android/settings/wifi/WifiScanModeActivityTest.java
new file mode 100644
index 0000000..3e6ba00
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/wifi/WifiScanModeActivityTest.java
@@ -0,0 +1,31 @@
+/*
+ * 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.wifi;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.Robolectric;
+import org.robolectric.RobolectricTestRunner;
+
+@RunWith(RobolectricTestRunner.class)
+public class WifiScanModeActivityTest {
+ @Test
+ public void launchActivity_noIntentAction_shouldNotFatalException() {
+ WifiScanModeActivity wifiScanModeActivity =
+ Robolectric.setupActivity(WifiScanModeActivity.class);
+ }
+}
diff --git a/tests/robotests/src/com/android/settings/wifi/WifiSettings2Test.java b/tests/robotests/src/com/android/settings/wifi/WifiSettings2Test.java
new file mode 100644
index 0000000..7ce05e1
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/wifi/WifiSettings2Test.java
@@ -0,0 +1,291 @@
+/*
+ * 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.wifi;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.doNothing;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.app.Activity;
+import android.content.ContentResolver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.res.Resources;
+import android.net.wifi.WifiConfiguration;
+import android.net.wifi.WifiManager;
+import android.net.wifi.hotspot2.PasspointConfiguration;
+import android.net.wifi.hotspot2.pps.HomeSp;
+import android.os.Bundle;
+import android.os.PowerManager;
+import android.os.UserManager;
+import android.provider.Settings;
+
+import android.view.ContextMenu;
+import android.view.View;
+import androidx.fragment.app.FragmentActivity;
+import androidx.preference.Preference;
+
+import com.android.settings.R;
+import com.android.settings.datausage.DataUsagePreference;
+import com.android.settings.search.SearchIndexableRaw;
+import com.android.settings.testutils.shadow.ShadowDataUsageUtils;
+import com.android.settings.testutils.shadow.ShadowFragment;
+import com.android.settingslib.wifi.AccessPoint;
+
+import java.util.ArrayList;
+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;
+
+import java.util.List;
+
+@RunWith(RobolectricTestRunner.class)
+public class WifiSettings2Test {
+
+ private static final int NUM_NETWORKS = 4;
+
+ @Mock
+ private PowerManager mPowerManager;
+ @Mock
+ private DataUsagePreference mDataUsagePreference;
+ @Mock
+ private WifiManager mWifiManager;
+ private Context mContext;
+ private WifiSettings2 mWifiSettings2;
+
+ @Before
+ public void setUp() {
+ MockitoAnnotations.initMocks(this);
+ mContext = spy(RuntimeEnvironment.application);
+
+ mWifiSettings2 = spy(new WifiSettings2());
+ doReturn(mContext).when(mWifiSettings2).getContext();
+ doReturn(mPowerManager).when(mContext).getSystemService(PowerManager.class);
+ mWifiSettings2.mAddWifiNetworkPreference = new AddWifiNetworkPreference(mContext);
+ mWifiSettings2.mSavedNetworksPreference = new Preference(mContext);
+ mWifiSettings2.mConfigureWifiSettingsPreference = new Preference(mContext);
+ mWifiSettings2.mWifiManager = mWifiManager;
+ }
+
+ @Test
+ public void testSearchIndexProvider_shouldIndexFragmentTitle() {
+ final List<SearchIndexableRaw> indexRes =
+ WifiSettings.SEARCH_INDEX_DATA_PROVIDER.getRawDataToIndex(mContext,
+ true /* enabled */);
+
+ assertThat(indexRes).isNotNull();
+ assertThat(indexRes.get(0).key).isEqualTo(WifiSettings.DATA_KEY_REFERENCE);
+ }
+
+ @Test
+ @Config(qualifiers = "mcc999")
+ public void testSearchIndexProvider_ifWifiSettingsNotVisible_shouldNotIndexFragmentTitle() {
+ final List<SearchIndexableRaw> indexRes =
+ WifiSettings.SEARCH_INDEX_DATA_PROVIDER.getRawDataToIndex(mContext,
+ true /* enabled */);
+
+ assertThat(indexRes).isEmpty();
+ }
+
+ @Test
+ public void addNetworkFragmentSendResult_onActivityResult_shouldHandleEvent() {
+ final WifiSettings wifiSettings = spy(new WifiSettings());
+ final Intent intent = new Intent();
+ doNothing().when(wifiSettings).handleAddNetworkRequest(anyInt(), any(Intent.class));
+
+ wifiSettings.onActivityResult(WifiSettings.ADD_NETWORK_REQUEST, Activity.RESULT_OK, intent);
+
+ verify(wifiSettings).handleAddNetworkRequest(anyInt(), any(Intent.class));
+ }
+
+ private List<WifiConfiguration> createMockWifiConfigurations(int count) {
+ final List<WifiConfiguration> mockConfigs = new ArrayList<>();
+ for (int i = 0; i < count; i++) {
+ mockConfigs.add(new WifiConfiguration());
+ }
+ return mockConfigs;
+ }
+
+ private List<PasspointConfiguration> createMockPasspointConfigurations(int count) {
+ final List<PasspointConfiguration> mockConfigs = new ArrayList<>();
+ for (int i = 0; i < count; i++) {
+ final HomeSp sp = new HomeSp();
+ sp.setFqdn("fqdn");
+ final PasspointConfiguration config = new PasspointConfiguration();
+ config.setHomeSp(sp);
+ mockConfigs.add(config);
+ }
+ return mockConfigs;
+ }
+
+ @Test
+ public void setAdditionalSettingsSummaries_hasSavedNetwork_preferenceVisible() {
+ when(mWifiManager.getConfiguredNetworks())
+ .thenReturn(createMockWifiConfigurations(NUM_NETWORKS));
+
+ mWifiSettings2.setAdditionalSettingsSummaries();
+
+ assertThat(mWifiSettings2.mSavedNetworksPreference.isVisible()).isTrue();
+ assertThat(mWifiSettings2.mSavedNetworksPreference.getSummary()).isEqualTo(
+ mContext.getResources().getQuantityString(
+ R.plurals.wifi_saved_access_points_summary,
+ NUM_NETWORKS, NUM_NETWORKS));
+ }
+
+ @Test
+ public void setAdditionalSettingsSummaries_hasSavedPasspointNetwork_preferenceVisible() {
+ when(mWifiManager.getPasspointConfigurations())
+ .thenReturn(createMockPasspointConfigurations(NUM_NETWORKS));
+
+ mWifiSettings2.setAdditionalSettingsSummaries();
+
+ assertThat(mWifiSettings2.mSavedNetworksPreference.isVisible()).isTrue();
+ assertThat(mWifiSettings2.mSavedNetworksPreference.getSummary()).isEqualTo(
+ mContext.getResources().getQuantityString(
+ R.plurals.wifi_saved_passpoint_access_points_summary,
+ NUM_NETWORKS, NUM_NETWORKS));
+ }
+
+ @Test
+ public void setAdditionalSettingsSummaries_hasTwoKindsSavedNetwork_preferenceVisible() {
+ when(mWifiManager.getConfiguredNetworks())
+ .thenReturn(createMockWifiConfigurations(NUM_NETWORKS));
+ when(mWifiManager.getPasspointConfigurations())
+ .thenReturn(createMockPasspointConfigurations(NUM_NETWORKS));
+
+ mWifiSettings2.setAdditionalSettingsSummaries();
+
+ assertThat(mWifiSettings2.mSavedNetworksPreference.isVisible()).isTrue();
+ assertThat(mWifiSettings2.mSavedNetworksPreference.getSummary()).isEqualTo(
+ mContext.getResources().getQuantityString(
+ R.plurals.wifi_saved_all_access_points_summary,
+ NUM_NETWORKS*2, NUM_NETWORKS*2));
+ }
+
+ @Test
+ public void setAdditionalSettingsSummaries_noSavedNetwork_preferenceInvisible() {
+ when(mWifiManager.getConfiguredNetworks())
+ .thenReturn(createMockWifiConfigurations(0 /* count */));
+
+ mWifiSettings2.setAdditionalSettingsSummaries();
+
+ assertThat(mWifiSettings2.mSavedNetworksPreference.isVisible()).isFalse();
+ }
+
+ @Test
+ public void setAdditionalSettingsSummaries_wifiWakeupEnabled_displayOn() {
+ final ContentResolver contentResolver = mContext.getContentResolver();
+ Settings.Global.putInt(contentResolver, Settings.Global.WIFI_WAKEUP_ENABLED, 1);
+ Settings.Global.putInt(contentResolver, Settings.Global.WIFI_SCAN_ALWAYS_AVAILABLE, 1);
+ Settings.Global.putInt(contentResolver, Settings.Global.AIRPLANE_MODE_ON, 0);
+ when(mPowerManager.isPowerSaveMode()).thenReturn(false);
+
+ mWifiSettings2.setAdditionalSettingsSummaries();
+
+ assertThat(mWifiSettings2.mConfigureWifiSettingsPreference.getSummary()).isEqualTo(
+ mContext.getString(R.string.wifi_configure_settings_preference_summary_wakeup_on));
+ }
+
+ @Test
+ public void setAdditionalSettingsSummaries_wifiWakeupDisabled_displayOff() {
+ final ContentResolver contentResolver = mContext.getContentResolver();
+ Settings.Global.putInt(contentResolver, Settings.Global.WIFI_WAKEUP_ENABLED, 0);
+
+ mWifiSettings2.setAdditionalSettingsSummaries();
+
+ assertThat(mWifiSettings2.mConfigureWifiSettingsPreference.getSummary()).isEqualTo(
+ mContext.getString(R.string.wifi_configure_settings_preference_summary_wakeup_off));
+ }
+
+ @Test
+ public void checkAddWifiNetworkPrefernce_preferenceVisible() {
+ assertThat(mWifiSettings2.mAddWifiNetworkPreference.isVisible()).isTrue();
+ assertThat(mWifiSettings2.mAddWifiNetworkPreference.getTitle()).isEqualTo(
+ mContext.getString(R.string.wifi_add_network));
+ }
+
+ private void setUpForOnCreate() {
+ final FragmentActivity activity = mock(FragmentActivity.class);
+ when(mWifiSettings2.getActivity()).thenReturn(activity);
+ final Resources.Theme theme = mContext.getTheme();
+ when(activity.getTheme()).thenReturn(theme);
+ UserManager userManager = mock(UserManager.class);
+ when(activity.getSystemService(Context.USER_SERVICE))
+ .thenReturn(userManager);
+
+ when(mWifiSettings2.findPreference(WifiSettings.PREF_KEY_DATA_USAGE))
+ .thenReturn(mDataUsagePreference);
+ }
+
+ @Test
+ @Config(shadows = {ShadowDataUsageUtils.class, ShadowFragment.class})
+ public void checkDataUsagePreference_perferenceInvisibleIfWifiNotSupported() {
+ setUpForOnCreate();
+ ShadowDataUsageUtils.IS_WIFI_SUPPORTED = false;
+
+ mWifiSettings2.onCreate(Bundle.EMPTY);
+
+ verify(mDataUsagePreference).setVisible(false);
+ }
+
+ @Test
+ @Config(shadows = {ShadowDataUsageUtils.class, ShadowFragment.class})
+ public void checkDataUsagePreference_perferenceVisibleIfWifiSupported() {
+ setUpForOnCreate();
+ ShadowDataUsageUtils.IS_WIFI_SUPPORTED = true;
+
+ mWifiSettings2.onCreate(Bundle.EMPTY);
+
+ verify(mDataUsagePreference).setVisible(true);
+ verify(mDataUsagePreference).setTemplate(any(), eq(0) /*subId*/, eq(null) /*service*/);
+ }
+
+// TODO(b/70983952): Add test for context menu
+// @Test
+// public void onCreateContextMenu_shouldHaveForgetMenuForConnectedAccessPreference() {
+// final FragmentActivity mockActivity = mock(FragmentActivity.class);
+// when(mockActivity.getApplicationContext()).thenReturn(mContext);
+// when(mWifiSettings2.getActivity()).thenReturn(mockActivity);
+//
+// final AccessPoint accessPoint = mock(AccessPoint.class);
+// when(accessPoint.isConnectable()).thenReturn(false);
+// when(accessPoint.isSaved()).thenReturn(true);
+// when(accessPoint.isActive()).thenReturn(true);
+//
+// final ConnectedAccessPointPreference connectedPreference =
+// mWifiSettings2.createConnectedAccessPointPreference(accessPoint, mContext);
+// final View view = mock(View.class);
+// when(view.getTag()).thenReturn(connectedPreference);
+//
+// final ContextMenu menu = mock(ContextMenu.class);
+// mWifiSettings2.onCreateContextMenu(menu, view, null /* info */);
+//
+// verify(menu).add(anyInt(), eq(WifiSettings.MENU_ID_FORGET), anyInt(), anyInt());
+// }
+}
diff --git a/tests/robotests/src/com/android/settings/wifi/WifiSettingsTest.java b/tests/robotests/src/com/android/settings/wifi/WifiSettingsTest.java
index d2e3566..a16a576 100644
--- a/tests/robotests/src/com/android/settings/wifi/WifiSettingsTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/WifiSettingsTest.java
@@ -50,6 +50,7 @@
import com.android.settings.datausage.DataUsagePreference;
import com.android.settings.search.SearchIndexableRaw;
import com.android.settings.testutils.shadow.ShadowDataUsageUtils;
+import com.android.settings.testutils.shadow.ShadowFragment;
import com.android.settingslib.wifi.AccessPoint;
import com.android.settingslib.wifi.WifiTracker;
@@ -247,7 +248,7 @@
}
@Test
- @Config(shadows = {ShadowDataUsageUtils.class})
+ @Config(shadows = {ShadowDataUsageUtils.class, ShadowFragment.class})
public void checkDataUsagePreference_perferenceInvisibleIfWifiNotSupported() {
setUpForOnCreate();
ShadowDataUsageUtils.IS_WIFI_SUPPORTED = false;
@@ -258,7 +259,7 @@
}
@Test
- @Config(shadows = {ShadowDataUsageUtils.class})
+ @Config(shadows = {ShadowDataUsageUtils.class, ShadowFragment.class})
public void checkDataUsagePreference_perferenceVisibleIfWifiSupported() {
setUpForOnCreate();
ShadowDataUsageUtils.IS_WIFI_SUPPORTED = true;
diff --git a/tests/robotests/src/com/android/settings/wifi/WifiWakeupPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/WifiWakeupPreferenceControllerTest.java
index 81ba9a2..4266c84 100644
--- a/tests/robotests/src/com/android/settings/wifi/WifiWakeupPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/WifiWakeupPreferenceControllerTest.java
@@ -35,7 +35,6 @@
import com.android.settings.R;
import com.android.settings.dashboard.DashboardFragment;
-import com.android.settingslib.core.lifecycle.Lifecycle;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -55,14 +54,13 @@
private LocationManager mLocationManager;
@Mock
private SwitchPreference mPreference;
- @Mock
- private Lifecycle mLifecycle;
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
mContext = RuntimeEnvironment.application;
- mController = new WifiWakeupPreferenceController(mContext, mFragment, mLifecycle);
+ mController = new WifiWakeupPreferenceController(mContext);
+ mController.setFragment(mFragment);
mController.mLocationManager = mLocationManager;
mController.mPreference = mPreference;
@@ -71,42 +69,29 @@
}
@Test
- public void handlePreferenceTreeClick_nonMatchingKey_shouldDoNothing() {
- final SwitchPreference pref = new SwitchPreference(mContext);
+ public void setChecked_scanEnableLocationEnable_wifiWakeupEnable() {
+ Settings.Global.putInt(mContext.getContentResolver(), WIFI_WAKEUP_ENABLED, 0);
+ Settings.Global.putInt(mContext.getContentResolver(), WIFI_SCAN_ALWAYS_AVAILABLE, 1);
+ doReturn(true).when(mLocationManager).isLocationEnabled();
- assertThat(mController.handlePreferenceTreeClick(pref)).isFalse();
- }
+ mController.setChecked(true);
- @Test
- public void handlePreferenceTreeClick_nonMatchingType_shouldDoNothing() {
- final Preference pref = new Preference(mContext);
- pref.setKey(mController.getPreferenceKey());
-
- assertThat(mController.handlePreferenceTreeClick(pref)).isFalse();
- }
-
- @Test
- public void handlePreferenceTreeClick_matchingKeyAndType_shouldUpdateSetting() {
- final SwitchPreference pref = new SwitchPreference(mContext);
- pref.setChecked(true);
- pref.setKey(mController.getPreferenceKey());
-
- assertThat(mController.handlePreferenceTreeClick(pref)).isTrue();
assertThat(Settings.Global.getInt(mContext.getContentResolver(), WIFI_WAKEUP_ENABLED, 0))
.isEqualTo(1);
}
@Test
- public void handlePreferenceTreeClick_wifiWakeupEnableScanningDisable_wifiWakeupEnable() {
+ public void updateState_wifiWakeupEnableScanningDisable_wifiWakeupDisabled() {
+ final SwitchPreference preference = new SwitchPreference(mContext);
Settings.Global.putInt(mContext.getContentResolver(), WIFI_WAKEUP_ENABLED, 1);
Settings.Global.putInt(mContext.getContentResolver(), WIFI_SCAN_ALWAYS_AVAILABLE, 0);
doReturn(true).when(mLocationManager).isLocationEnabled();
- mController.handlePreferenceTreeClick(mPreference);
- final boolean isWifiWakeupEnabled = Settings.Global.getInt(mContext.getContentResolver(),
- Settings.Global.WIFI_WAKEUP_ENABLED, 0) == 1;
+ mController.updateState(preference);
- assertThat(isWifiWakeupEnabled).isTrue();
+ assertThat(preference.isChecked()).isFalse();
+ assertThat(preference.getSummary())
+ .isEqualTo(mContext.getString(R.string.wifi_wakeup_summary));
}
@Test
@@ -114,6 +99,7 @@
final SwitchPreference preference = new SwitchPreference(mContext);
Settings.Global.putInt(mContext.getContentResolver(), WIFI_WAKEUP_ENABLED, 1);
Settings.Global.putInt(mContext.getContentResolver(), WIFI_SCAN_ALWAYS_AVAILABLE, 1);
+ doReturn(true).when(mLocationManager).isLocationEnabled();
mController.updateState(preference);
diff --git a/tests/robotests/src/com/android/settings/wifi/calling/WifiCallingDisclaimerFragmentTest.java b/tests/robotests/src/com/android/settings/wifi/calling/WifiCallingDisclaimerFragmentTest.java
index 25fa737..d7b79b1 100644
--- a/tests/robotests/src/com/android/settings/wifi/calling/WifiCallingDisclaimerFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/calling/WifiCallingDisclaimerFragmentTest.java
@@ -41,6 +41,7 @@
import com.android.settings.R;
import com.android.settings.testutils.shadow.ShadowDisclaimerItemFactory;
+import com.android.settings.testutils.shadow.ShadowFragment;
import java.util.ArrayList;
import java.util.List;
@@ -57,7 +58,7 @@
import org.robolectric.RobolectricTestRunner;
@RunWith(RobolectricTestRunner.class)
-@Config(shadows = ShadowDisclaimerItemFactory.class)
+@Config(shadows = {ShadowDisclaimerItemFactory.class, ShadowFragment.class})
public class WifiCallingDisclaimerFragmentTest {
@Mock
diff --git a/tests/robotests/src/com/android/settings/wifi/calling/WifiCallingSettingsForSubTest.java b/tests/robotests/src/com/android/settings/wifi/calling/WifiCallingSettingsForSubTest.java
index ae88231..6fc2551 100644
--- a/tests/robotests/src/com/android/settings/wifi/calling/WifiCallingSettingsForSubTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/calling/WifiCallingSettingsForSubTest.java
@@ -55,6 +55,7 @@
import com.android.settings.SettingsActivity;
import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settings.testutils.shadow.SettingsShadowResources;
+import com.android.settings.testutils.shadow.ShadowFragment;
import com.android.settings.widget.SwitchBar;
import com.android.settings.widget.ToggleSwitch;
@@ -67,7 +68,9 @@
import org.robolectric.RobolectricTestRunner;
import org.robolectric.RuntimeEnvironment;
import org.robolectric.util.ReflectionHelpers;
+import org.robolectric.annotation.Config;
+@Config(shadows = ShadowFragment.class)
@RunWith(RobolectricTestRunner.class)
public class WifiCallingSettingsForSubTest {
private static final String BUTTON_WFC_MODE = "wifi_calling_mode";
diff --git a/tests/robotests/src/com/android/settings/wifi/dpp/WifiDppConfiguratorActivityTest.java b/tests/robotests/src/com/android/settings/wifi/dpp/WifiDppConfiguratorActivityTest.java
new file mode 100644
index 0000000..0c9bf37
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/wifi/dpp/WifiDppConfiguratorActivityTest.java
@@ -0,0 +1,31 @@
+/*
+ * 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.wifi.dpp;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.Robolectric;
+import org.robolectric.RobolectricTestRunner;
+
+@RunWith(RobolectricTestRunner.class)
+public class WifiDppConfiguratorActivityTest {
+ @Test
+ public void launchActivity_noIntentAction_shouldNotFatalException() {
+ WifiDppConfiguratorActivity wifiDppConfiguratorActivity =
+ Robolectric.setupActivity(WifiDppConfiguratorActivity.class);
+ }
+}
diff --git a/tests/robotests/src/com/android/settings/wifi/dpp/WifiDppEnrolleeActivityTest.java b/tests/robotests/src/com/android/settings/wifi/dpp/WifiDppEnrolleeActivityTest.java
new file mode 100644
index 0000000..819b7f4
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/wifi/dpp/WifiDppEnrolleeActivityTest.java
@@ -0,0 +1,31 @@
+/*
+ * 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.wifi.dpp;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.Robolectric;
+import org.robolectric.RobolectricTestRunner;
+
+@RunWith(RobolectricTestRunner.class)
+public class WifiDppEnrolleeActivityTest {
+ @Test
+ public void launchActivity_noIntentAction_shouldNotFatalException() {
+ WifiDppEnrolleeActivity wifiDppEnrolleeActivity =
+ Robolectric.setupActivity(WifiDppEnrolleeActivity.class);
+ }
+}
diff --git a/tests/robotests/src/com/android/settings/wifi/savedaccesspoints/SavedAccessPointsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/savedaccesspoints/SavedAccessPointsPreferenceControllerTest.java
index 51944d8..196c97b 100644
--- a/tests/robotests/src/com/android/settings/wifi/savedaccesspoints/SavedAccessPointsPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/savedaccesspoints/SavedAccessPointsPreferenceControllerTest.java
@@ -29,15 +29,14 @@
import android.content.Context;
import android.net.wifi.WifiConfiguration;
-
import android.net.wifi.WifiManager;
+
import androidx.preference.PreferenceCategory;
import androidx.preference.PreferenceScreen;
import com.android.settings.core.FeatureFlags;
import com.android.settings.development.featureflags.FeatureFlagPersistent;
import com.android.settings.testutils.shadow.ShadowAccessPoint;
-import com.android.settings.testutils.shadow.ShadowThreadUtils;
import com.android.settings.testutils.shadow.ShadowWifiManager;
import com.android.settingslib.wifi.AccessPointPreference;
@@ -52,7 +51,7 @@
import org.robolectric.annotation.Config;
@RunWith(RobolectricTestRunner.class)
-@Config(shadows = {ShadowThreadUtils.class, ShadowWifiManager.class})
+@Config(shadows = {ShadowWifiManager.class})
public class SavedAccessPointsPreferenceControllerTest {
@Mock
diff --git a/tests/robotests/src/com/android/settings/wifi/savedaccesspoints/SubscribedAccessPointsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/savedaccesspoints/SubscribedAccessPointsPreferenceControllerTest.java
index 26933d8..581f531 100644
--- a/tests/robotests/src/com/android/settings/wifi/savedaccesspoints/SubscribedAccessPointsPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/savedaccesspoints/SubscribedAccessPointsPreferenceControllerTest.java
@@ -26,24 +26,19 @@
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
-import static org.robolectric.Shadows.shadowOf;
import android.content.Context;
-import android.content.pm.FeatureInfo;
-import android.content.pm.PackageManager;
import android.net.wifi.WifiConfiguration;
-
+import android.net.wifi.WifiManager;
import android.net.wifi.hotspot2.PasspointConfiguration;
import android.net.wifi.hotspot2.pps.HomeSp;
-import android.net.wifi.WifiEnterpriseConfig;
-import android.net.wifi.WifiManager;
+
import androidx.preference.PreferenceCategory;
import androidx.preference.PreferenceScreen;
import com.android.settings.core.FeatureFlags;
import com.android.settings.development.featureflags.FeatureFlagPersistent;
import com.android.settings.testutils.shadow.ShadowAccessPoint;
-import com.android.settings.testutils.shadow.ShadowThreadUtils;
import com.android.settings.testutils.shadow.ShadowWifiManager;
import com.android.settingslib.wifi.AccessPointPreference;
@@ -58,7 +53,7 @@
import org.robolectric.annotation.Config;
@RunWith(RobolectricTestRunner.class)
-@Config(shadows = {ShadowThreadUtils.class, ShadowWifiManager.class})
+@Config(shadows = {ShadowWifiManager.class})
public class SubscribedAccessPointsPreferenceControllerTest {
@Mock
diff --git a/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherApBandPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherApBandPreferenceControllerTest.java
index 6bc2869..590d386 100644
--- a/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherApBandPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherApBandPreferenceControllerTest.java
@@ -128,19 +128,19 @@
mController.onPreferenceChange(mPreference, "-1");
assertThat(mController.getBandIndex()).isEqualTo(1);
assertThat(mPreference.getSummary()).isEqualTo(FIVE_GHZ_STRING);
- verify(mListener, times(1)).onTetherConfigUpdated();
+ verify(mListener, times(1)).onTetherConfigUpdated(mController);
// set to 5 Ghz
mController.onPreferenceChange(mPreference, "1");
assertThat(mController.getBandIndex()).isEqualTo(1);
assertThat(mPreference.getSummary()).isEqualTo(FIVE_GHZ_STRING);
- verify(mListener, times(2)).onTetherConfigUpdated();
+ verify(mListener, times(2)).onTetherConfigUpdated(mController);
// set to 2 Ghz
mController.onPreferenceChange(mPreference, "0");
assertThat(mController.getBandIndex()).isEqualTo(0);
assertThat(mPreference.getSummary()).isEqualTo(TWO_GHZ_STRING);
- verify(mListener, times(3)).onTetherConfigUpdated();
+ verify(mListener, times(3)).onTetherConfigUpdated(mController);
}
@Test
@@ -155,19 +155,19 @@
mController.onPreferenceChange(mPreference, "-1");
assertThat(mController.getBandIndex()).isEqualTo(-1);
assertThat(mPreference.getSummary()).isEqualTo(ALL_BANDS);
- verify(mListener, times(1)).onTetherConfigUpdated();
+ verify(mListener, times(1)).onTetherConfigUpdated(mController);
// should revert to the default for 5 Ghz only since this is not supported with this config
mController.onPreferenceChange(mPreference, "1");
assertThat(mController.getBandIndex()).isEqualTo(-1);
assertThat(mPreference.getSummary()).isEqualTo(ALL_BANDS);
- verify(mListener, times(2)).onTetherConfigUpdated();
+ verify(mListener, times(2)).onTetherConfigUpdated(mController);
// set to 2 Ghz
mController.onPreferenceChange(mPreference, "0");
assertThat(mController.getBandIndex()).isEqualTo(0);
assertThat(mPreference.getSummary()).isEqualTo(TWO_GHZ_STRING);
- verify(mListener, times(3)).onTetherConfigUpdated();
+ verify(mListener, times(3)).onTetherConfigUpdated(mController);
}
@Test
diff --git a/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherPasswordPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherPasswordPreferenceControllerTest.java
index 62fb277..07e7821 100644
--- a/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherPasswordPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherPasswordPreferenceControllerTest.java
@@ -99,7 +99,7 @@
assertThat(mController.getPasswordValidated(WifiConfiguration.KeyMgmt.WPA2_PSK))
.isEqualTo(VALID_PASS2);
- verify(mListener, times(2)).onTetherConfigUpdated();
+ verify(mListener, times(2)).onTetherConfigUpdated(mController);
}
@Test
diff --git a/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherSSIDPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherSSIDPreferenceControllerTest.java
index 3d15197..974dc2f 100644
--- a/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherSSIDPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherSSIDPreferenceControllerTest.java
@@ -102,7 +102,7 @@
mController.onPreferenceChange(mPreference, "0");
assertThat(mController.getSSID()).isEqualTo("0");
- verify(mListener, times(2)).onTetherConfigUpdated();
+ verify(mListener, times(2)).onTetherConfigUpdated(mController);
}
@Test
diff --git a/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherSettingsTest.java b/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherSettingsTest.java
index cdc74b3..e501689 100644
--- a/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherSettingsTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherSettingsTest.java
@@ -39,6 +39,7 @@
import androidx.preference.PreferenceScreen;
import com.android.settings.testutils.FakeFeatureFactory;
+import com.android.settings.testutils.shadow.ShadowFragment;
import com.android.settings.testutils.shadow.ShadowWifiManager;
import org.junit.Before;
@@ -115,6 +116,7 @@
}
@Test
+ @Config(shadows = ShadowFragment.class)
public void startFragment_notAdminUser_shouldRemoveAllPreferences() {
final WifiTetherSettings settings = spy(new WifiTetherSettings());
final FragmentActivity activity = mock(FragmentActivity.class);
diff --git a/tests/uitests/Android.bp b/tests/uitests/Android.bp
new file mode 100644
index 0000000..8a3e374
--- /dev/null
+++ b/tests/uitests/Android.bp
@@ -0,0 +1,41 @@
+// 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.
+
+android_test {
+ name: "SettingsUITests",
+ platform_apis: true,
+ certificate: "platform",
+ test_suites: ["device-tests"],
+ srcs: ["src/**/*.java"],
+
+ libs: [
+ "android.test.runner",
+ "android.test.base",
+ ],
+
+ static_libs: [
+ "androidx.test.rules",
+ "app-helpers-core",
+ "launcher-helper-lib",
+ "metrics-helper-lib",
+ "platform-test-annotations",
+ "settings-helper",
+ "sysui-helper",
+ "timeresult-helper-lib",
+ "truth-prebuilt",
+ "ub-uiautomator",
+ ],
+
+ //sdk_version: "current",
+}
diff --git a/tests/uitests/Android.mk b/tests/uitests/Android.mk
deleted file mode 100644
index fb7258c..0000000
--- a/tests/uitests/Android.mk
+++ /dev/null
@@ -1,43 +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.
-
-LOCAL_PATH := $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_PACKAGE_NAME := SettingsUITests
-LOCAL_PRIVATE_PLATFORM_APIS := true
-LOCAL_CERTIFICATE := platform
-LOCAL_COMPATIBILITY_SUITE := device-tests
-LOCAL_SRC_FILES := $(call all-java-files-under, src)
-LOCAL_MODULE_TAGS := tests
-
-LOCAL_JAVA_LIBRARIES := \
- android.test.runner \
- android.test.base
-
-LOCAL_STATIC_JAVA_LIBRARIES := \
- androidx.test.rules \
- app-helpers-core \
- launcher-helper-lib \
- metrics-helper-lib \
- platform-test-annotations \
- settings-helper \
- sysui-helper \
- timeresult-helper-lib \
- truth-prebuilt \
- ub-uiautomator \
-
-#LOCAL_SDK_VERSION := current
-
-include $(BUILD_PACKAGE)
diff --git a/tests/unit/Android.bp b/tests/unit/Android.bp
new file mode 100644
index 0000000..43bf02c
--- /dev/null
+++ b/tests/unit/Android.bp
@@ -0,0 +1,32 @@
+android_test {
+ name: "SettingsUnitTests",
+
+ certificate: "platform",
+
+ libs: [
+ "android.test.runner",
+ "telephony-common",
+ "ims-common",
+ "android.test.base",
+ "android.test.mock",
+ ],
+
+ static_libs: [
+ "androidx.test.rules",
+ "androidx.test.espresso.core",
+ "androidx.test.espresso.contrib-nodeps",
+ "androidx.test.espresso.intents-nodeps",
+ "mockito-target-minus-junit4",
+ "platform-test-annotations",
+ "truth-prebuilt",
+ "ub-uiautomator",
+ ],
+
+ // Include all test java files.
+ srcs: ["src/**/*.java"],
+
+ platform_apis: true,
+ test_suites: ["device-tests"],
+
+ instrumentation_for: "Settings",
+}
diff --git a/tests/unit/Android.mk b/tests/unit/Android.mk
deleted file mode 100644
index 35d2205..0000000
--- a/tests/unit/Android.mk
+++ /dev/null
@@ -1,35 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-# We only want this apk build for tests.
-LOCAL_MODULE_TAGS := tests
-LOCAL_CERTIFICATE := platform
-
-LOCAL_JAVA_LIBRARIES := \
- android.test.runner \
- telephony-common \
- ims-common \
- android.test.base \
- android.test.mock \
-
-
-LOCAL_STATIC_JAVA_LIBRARIES := \
- androidx.test.rules \
- androidx.test.espresso.core \
- androidx.test.espresso.contrib-nodeps \
- androidx.test.espresso.intents-nodeps \
- mockito-target-minus-junit4 \
- platform-test-annotations \
- truth-prebuilt \
- ub-uiautomator
-
-# Include all test java files.
-LOCAL_SRC_FILES := $(call all-java-files-under, src)
-
-LOCAL_PACKAGE_NAME := SettingsUnitTests
-LOCAL_PRIVATE_PLATFORM_APIS := true
-LOCAL_COMPATIBILITY_SUITE := device-tests
-
-LOCAL_INSTRUMENTATION_FOR := Settings
-
-include $(BUILD_PACKAGE)
diff --git a/tests/unit/src/com/android/settings/core/LifecycleEventHandlingTest.java b/tests/unit/src/com/android/settings/core/LifecycleEventHandlingTest.java
index 57d5662..2592689 100644
--- a/tests/unit/src/com/android/settings/core/LifecycleEventHandlingTest.java
+++ b/tests/unit/src/com/android/settings/core/LifecycleEventHandlingTest.java
@@ -36,6 +36,7 @@
import com.android.settingslib.core.instrumentation.Instrumentable;
import org.junit.Before;
+import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -60,6 +61,7 @@
@Test
@Presubmit
+ @Ignore("b/133334887")
public void launchDashboard_shouldSeeFooter() {
new SubSettingLauncher(mContext)
.setDestination(FeatureFlagsDashboard.class.getName())
diff --git a/tests/unit/src/com/android/settings/fuelgauge/PowerUsageSummaryTest.java b/tests/unit/src/com/android/settings/fuelgauge/PowerUsageSummaryTest.java
deleted file mode 100644
index 2c80a82..0000000
--- a/tests/unit/src/com/android/settings/fuelgauge/PowerUsageSummaryTest.java
+++ /dev/null
@@ -1,57 +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.fuelgauge;
-
-import static androidx.test.espresso.Espresso.onView;
-import static androidx.test.espresso.action.ViewActions.click;
-import static androidx.test.espresso.matcher.ViewMatchers.withText;
-
-import android.app.Instrumentation;
-import android.content.Intent;
-
-import androidx.test.InstrumentationRegistry;
-import androidx.test.filters.SmallTest;
-import androidx.test.runner.AndroidJUnit4;
-
-import com.android.settings.R;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-@RunWith(AndroidJUnit4.class)
-@SmallTest
-public class PowerUsageSummaryTest {
- private static final String BATTERY_INTENT = "android.intent.action.POWER_USAGE_SUMMARY";
-
- @Before
- public void SetUp() {
- Instrumentation instrumentation = InstrumentationRegistry.getInstrumentation();
- instrumentation.startActivitySync(new Intent(BATTERY_INTENT));
- }
-
- @Test
- public void testClickLastFullCharge_shouldNotCrash() {
- onView(withText(R.string.battery_last_full_charge)).perform(click());
- }
-
- @Test
- public void testClickScreenUsage_shouldNotCrash() {
- onView(withText(R.string.device_screen_usage)).perform(click());
- }
-
-}
diff --git a/tests/unit/src/com/android/settings/fuelgauge/batterytip/RestrictAppTest.java b/tests/unit/src/com/android/settings/fuelgauge/batterytip/RestrictAppTest.java
index d9874f4..355a7e4 100644
--- a/tests/unit/src/com/android/settings/fuelgauge/batterytip/RestrictAppTest.java
+++ b/tests/unit/src/com/android/settings/fuelgauge/batterytip/RestrictAppTest.java
@@ -27,6 +27,7 @@
import android.content.Context;
import android.content.Intent;
import android.content.pm.PackageManager;
+import android.support.test.uiautomator.UiDevice;
import androidx.test.InstrumentationRegistry;
import androidx.test.filters.SmallTest;
@@ -42,6 +43,7 @@
@RunWith(AndroidJUnit4.class)
@SmallTest
public class RestrictAppTest {
+ private static final String WM_DISMISS_KEYGUARD_COMMAND = "wm dismiss-keyguard";
private static final String BATTERY_INTENT = "android.intent.action.POWER_USAGE_SUMMARY";
private static final String PACKAGE_SETTINGS = "com.android.settings";
private static final String PACKAGE_SYSTEM_UI = "com.android.systemui";
@@ -50,10 +52,16 @@
private BatteryDatabaseManager mBatteryDatabaseManager;
private PackageManager mPackageManager;
+ private UiDevice mUiDevice;
@Before
- public void setUp() {
+ public void setUp() throws Exception {
final Context context = InstrumentationRegistry.getTargetContext();
+
+ mUiDevice = UiDevice.getInstance(InstrumentationRegistry.getInstrumentation());
+ mUiDevice.wakeUp();
+ mUiDevice.executeShellCommand(WM_DISMISS_KEYGUARD_COMMAND);
+
mPackageManager = context.getPackageManager();
mBatteryDatabaseManager = BatteryDatabaseManager.getInstance(context);
mBatteryDatabaseManager.deleteAllAnomaliesBeforeTimeStamp(System.currentTimeMillis() +
@@ -68,7 +76,7 @@
AnomalyDatabaseHelper.State.NEW, System.currentTimeMillis());
Instrumentation instrumentation = InstrumentationRegistry.getInstrumentation();
- instrumentation.startActivitySync(new Intent(BATTERY_INTENT));
+ instrumentation.startActivitySync(createBatteryIntent());
onView(withText("Restrict 1 app")).check(matches(isDisplayed()));
}
@@ -83,26 +91,11 @@
AnomalyDatabaseHelper.State.NEW, System.currentTimeMillis());
Instrumentation instrumentation = InstrumentationRegistry.getInstrumentation();
- instrumentation.startActivitySync(new Intent(BATTERY_INTENT));
+ instrumentation.startActivitySync(createBatteryIntent());
onView(withText("Restrict 2 apps")).check(matches(isDisplayed()));
}
@Test
- public void batterySettings_hasAutoHandledAnomalies_showAutoHandled() throws
- PackageManager.NameNotFoundException {
- mBatteryDatabaseManager.insertAnomaly(mPackageManager.getPackageUid(PACKAGE_SETTINGS, 0),
- PACKAGE_SETTINGS, 1,
- AnomalyDatabaseHelper.State.AUTO_HANDLED, System.currentTimeMillis());
- mBatteryDatabaseManager.insertAnomaly(mPackageManager.getPackageUid(PACKAGE_SYSTEM_UI, 0),
- PACKAGE_SYSTEM_UI, 1,
- AnomalyDatabaseHelper.State.AUTO_HANDLED, System.currentTimeMillis());
-
- Instrumentation instrumentation = InstrumentationRegistry.getInstrumentation();
- instrumentation.startActivitySync(new Intent(BATTERY_INTENT));
- onView(withText("2 apps recently restricted")).check(matches(isDisplayed()));
- }
-
- @Test
public void insertDuplicateAnomalies_onlyInsertOnce() throws
PackageManager.NameNotFoundException {
final int uid = mPackageManager.getPackageUid(PACKAGE_SETTINGS, 0);
@@ -123,4 +116,11 @@
.addAnomalyType(ANOMALY_TYPE)
.build());
}
+
+ private Intent createBatteryIntent() {
+ final Intent intent = new Intent(BATTERY_INTENT);
+ intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+
+ return intent;
+ }
}
diff --git a/tests/unit/src/com/android/settings/wifi/dpp/WifiDppConfiguratorActivityTest.java b/tests/unit/src/com/android/settings/wifi/dpp/WifiDppConfiguratorActivityTest.java
index de78828..7c87e7d 100644
--- a/tests/unit/src/com/android/settings/wifi/dpp/WifiDppConfiguratorActivityTest.java
+++ b/tests/unit/src/com/android/settings/wifi/dpp/WifiDppConfiguratorActivityTest.java
@@ -26,10 +26,13 @@
import android.provider.Settings;
import android.support.test.uiautomator.UiDevice;
+import androidx.fragment.app.FragmentManager;
import androidx.test.InstrumentationRegistry;
import androidx.test.rule.ActivityTestRule;
import androidx.test.runner.AndroidJUnit4;
+import com.google.android.setupdesign.GlifLayout;
+
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
@@ -60,8 +63,13 @@
intent.putExtra(WifiDppUtils.EXTRA_WIFI_PRE_SHARED_KEY, "password");
mActivityRule.launchActivity(intent);
+ FragmentManager fragmentManager = mActivityRule.getActivity().getSupportFragmentManager();
+ WifiDppQrCodeScannerFragment fragment =
+ (WifiDppQrCodeScannerFragment) fragmentManager.findFragmentByTag(
+ WifiDppUtils.TAG_FRAGMENT_QR_CODE_SCANNER);
- assertThat(mActivityRule.getActivity().isFinishing()).isEqualTo(false);
+ assertThat(fragment.getView() instanceof GlifLayout).isTrue();
+ assertThat(mActivityRule.getActivity().isFinishing()).isFalse();
}
@Test
@@ -73,8 +81,13 @@
intent.putExtra(WifiDppUtils.EXTRA_WIFI_PRE_SHARED_KEY, "password");
mActivityRule.launchActivity(intent);
+ FragmentManager fragmentManager = mActivityRule.getActivity().getSupportFragmentManager();
+ WifiDppQrCodeGeneratorFragment fragment =
+ (WifiDppQrCodeGeneratorFragment) fragmentManager.findFragmentByTag(
+ WifiDppUtils.TAG_FRAGMENT_QR_CODE_GENERATOR);
- assertThat(mActivityRule.getActivity().isFinishing()).isEqualTo(false);
+ assertThat(fragment.getView() instanceof GlifLayout).isTrue();
+ assertThat(mActivityRule.getActivity().isFinishing()).isFalse();
}
@Test
@@ -84,22 +97,14 @@
mActivityRule.launchActivity(intent);
- assertThat(mActivityRule.getActivity().isFinishing()).isEqualTo(false);
+ assertThat(mActivityRule.getActivity().isFinishing()).isFalse();
}
@Test
public void testActivity_shouldImplementsWifiNetworkConfigRetriever() {
WifiDppConfiguratorActivity activity = mActivityRule.getActivity();
- assertThat(activity instanceof WifiNetworkConfig.Retriever).isEqualTo(true);
- }
-
- @Test
- public void testActivity_shouldImplementsQrCodeGeneratorFragmentCallback() {
- WifiDppConfiguratorActivity activity = mActivityRule.getActivity();
-
- assertThat(activity instanceof WifiDppQrCodeGeneratorFragment
- .OnQrCodeGeneratorFragmentAddButtonClickedListener).isEqualTo(true);
+ assertThat(activity instanceof WifiNetworkConfig.Retriever).isTrue();
}
@Test
@@ -107,7 +112,7 @@
WifiDppConfiguratorActivity activity = mActivityRule.getActivity();
assertThat(activity instanceof WifiDppQrCodeScannerFragment
- .OnScanWifiDppSuccessListener).isEqualTo(true);
+ .OnScanWifiDppSuccessListener).isTrue();
}
@Test
@@ -115,7 +120,7 @@
WifiDppConfiguratorActivity activity = mActivityRule.getActivity();
assertThat(activity instanceof WifiDppAddDeviceFragment
- .OnClickChooseDifferentNetworkListener).isEqualTo(true);
+ .OnClickChooseDifferentNetworkListener).isTrue();
}
@Test
@@ -175,40 +180,4 @@
assertThat(restoredWifiNetworkConfig.getNetworkId()).isEqualTo(0);
assertThat(restoredWifiNetworkConfig.isHotspot()).isTrue();
}
-
- @Test
- public void launchScanner_onNavigateUp_shouldFinish() {
- Intent intent = new Intent(WifiDppConfiguratorActivity.ACTION_CONFIGURATOR_QR_CODE_SCANNER);
- intent.putExtra(WifiDppUtils.EXTRA_WIFI_SECURITY, "WEP");
- intent.putExtra(WifiDppUtils.EXTRA_WIFI_SSID, "GoogleGuest");
- intent.putExtra(WifiDppUtils.EXTRA_WIFI_PRE_SHARED_KEY, "password");
- final Instrumentation instrumentation = InstrumentationRegistry.getInstrumentation();
-
- mActivityRule.launchActivity(intent);
-
- instrumentation.runOnMainSync(() -> {
- mActivityRule.getActivity().onNavigateUp();
-
- assertThat(mActivityRule.getActivity().isFinishing()).isEqualTo(true);
- });
- }
-
- @Test
- public void launchGenerator_onNavigateUp_shouldFinish() {
- Intent intent = new Intent(
- WifiDppConfiguratorActivity.ACTION_CONFIGURATOR_QR_CODE_GENERATOR);
- intent.putExtra(WifiDppUtils.EXTRA_WIFI_SECURITY, "WEP");
- intent.putExtra(WifiDppUtils.EXTRA_WIFI_SSID, "GoogleGuest");
- intent.putExtra(WifiDppUtils.EXTRA_WIFI_PRE_SHARED_KEY, "password");
- final Instrumentation instrumentation = InstrumentationRegistry.getInstrumentation();
-
- mActivityRule.launchActivity(intent);
-
- instrumentation.runOnMainSync(() -> {
- mActivityRule.getActivity().onNavigateUp();
-
- assertThat(mActivityRule.getActivity().isFinishing()).isEqualTo(true);
- });
- }
-
}
diff --git a/tests/unit/src/com/android/settings/wifi/dpp/WifiNetworkListFragmentTest.java b/tests/unit/src/com/android/settings/wifi/dpp/WifiNetworkListFragmentTest.java
index 832f153..fe21596 100644
--- a/tests/unit/src/com/android/settings/wifi/dpp/WifiNetworkListFragmentTest.java
+++ b/tests/unit/src/com/android/settings/wifi/dpp/WifiNetworkListFragmentTest.java
@@ -107,8 +107,6 @@
intent.setData(Uri.parse(uriString));
mActivityRule.launchActivity(intent);
- verify(mWifiTracker).getManager();
-
List<Fragment> fragments =
mActivityRule.getActivity().getSupportFragmentManager().getFragments();
assertThat(fragments.size()).isEqualTo(1);
